fix: prefer browser recognized mime type over file extension lookup

juliusmarminge commented 5 days ago

Prefer file.type when matching route config type. Fallback to lookup based on extension

File { name: 'foo.png', type: 'image/png' } => image/png File { name: 'foo', type: 'image/png' } => image/png File { name: 'foo.jpg', type: 'image/png' } => image/png File { name: 'foo.jpg', type: '' } => image/jpg

x-ref: https://discord.com/channels/966627436387266600/1102510616326967306/1289998476721262623

Summary by CodeRabbit

New Features
- Introduced a function to consolidate default configuration values for file types, enhancing reusability.
- Improved file type resolution accuracy by incorporating MIME type checks.
- Added a maximum file count of 10 for blob file uploads.
- Enhanced upload progress tracking with clearer status updates.
Bug Fixes
- Enhanced validation for file size and count against route configurations, ensuring more accurate error reporting for uploads.
- Refined error handling for upload actions, providing clearer feedback on mismatches.
- Improved handling of file types in various upload scenarios, ensuring robust MIME type identification.

changeset-bot[bot] commented 5 days ago

🦋 Changeset detected

Latest commit: 22d0820d1774a005d288796118c25af76f385f85

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 8 packages

| Name | Type | | ------------------- | ----- | | @uploadthing/shared | Patch | | uploadthing | Patch | | @uploadthing/expo | Patch | | @uploadthing/react | Patch | | @uploadthing/solid | Patch | | @uploadthing/svelte | Patch | | @uploadthing/vue | Patch | | @uploadthing/nuxt | Patch |

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

vercel[bot] commented 5 days ago

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
docs-uploadthing	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 1, 2024 7:17pm

1 Skipped Deployment

coderabbitai[bot] commented 5 days ago

[!WARNING]

Rate limit exceeded

@juliusmarminge has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 6 minutes and 38 seconds before requesting another review.

⌛ How to resolve this issue?
After the wait time has elapsed, a review can be triggered using the `@coderabbitai review` command as a PR comment. Alternatively, push new commits to this PR. We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?
CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our [FAQ](https://coderabbit.ai/docs/faq) for further information.

📥 Commits
Files that changed from the base of the PR and between 77c86b2bc45a75eb74eb4145216bfa7aaaf4d096 and 22d0820d1774a005d288796118c25af76f385f85.

Walkthrough

The changes introduce a new function, getDefaultRouteConfigValues, which centralizes default configuration values for file types. The fillInputRouteConfig function is updated to use this new function, reducing redundancy. Additionally, the getTypeFromFileName function is enhanced to accept an optional fallbackType parameter. The assertFilesMeetConfig function is modified to improve file type and size validation, enhancing accuracy in type resolution and error handling.

Changes

Files	Change Summary
packages/shared/src/utils.ts	Added `getDefaultRouteConfigValues(type: FileRouterInputKey)` method. Updated `getTypeFromFileName` to accept an optional `fallbackType` parameter.
packages/uploadthing/src/internal/...	Modified `assertFilesMeetConfig` to include `file.type` in `getTypeFromFileName` calls. Enhanced file size validation logic and error handling for mismatches.
examples/minimal-appdir/src/server/...	Added `maxFileCount: 10` to the `blob` configuration in `uploadRouter`.
packages/uploadthing/src/client.ts	Updated `isValidFileType` and `isValidFileSize` functions to include `file.type` in their signatures. Refined upload handling logic in `genUploader`.
packages/uploadthing/src/internal/...	Updated `handleUploadAction` to include `file.type` in `getTypeFromFileName` calls. Enhanced error handling and logging throughout the upload process.

Possibly related PRs

#954: The changes in this PR involve updating the getTypeFromFileName function to include a file.type parameter, which directly relates to the modifications made in the main PR where the getTypeFromFileName function was updated to accept an optional fallbackType parameter.
#987: This PR modifies the withUt function to improve module resolution, which indirectly relates to the overall functionality of file handling and routing, similar to the changes made in the main PR regarding file type configurations.
#988: The documentation updates in this PR include renaming the OurFileRouter type to UploadRouter, which aligns with the changes in the main PR that focus on enhancing the structure and maintainability of file handling functions.

Suggested labels

📚 documentation, @uploadthing/react

Suggested reviewers

markflorkowski

Poem

In the code where rabbits hop,
New functions bloom, and changes crop.
Default values, neat and bright,
Help our files take flight!
With types and sizes all in line,
Happy coding, oh how fine! 🐇✨

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

- [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)

🪧 Tips

### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit , please review it.` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` - `@coderabbitai help me debug CodeRabbit configuration file.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (Invoked using PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai full review` to do a full review from scratch and review all the files again. - `@coderabbitai summary` to regenerate the summary of the PR. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai configuration` to show the current CodeRabbit configuration for the repository. - `@coderabbitai help` to get help. ### Other keywords and placeholders - Add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. - Add `@coderabbitai summary` to generate the high-level summary at a specific location in the PR description. - Add `@coderabbitai` anywhere in the PR title to generate the title automatically. ### CodeRabbit Configuration File (`.coderabbit.yaml`) - You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository. - Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information. - If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json` ### Documentation and Community - Visit our [Documentation](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit. - Join our [Discord Community](http://discord.gg/coderabbit) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.

github-actions[bot] commented 5 days ago

📦 Bundle size comparison

Bundle	Size (gzip)	Visualization
Main	26.03KB	See Treemap 📊
PR (6cea6555aa4c845ca5e3badd7a65529afa4d33d6)	26.03KB	See Treemap 📊
Diff	No change

pkg-pr-new[bot] commented 5 days ago

Open in Stackblitz

More templates

- [@example/minimal-appdir](https://pkg.pr.new/template/20528a64-24b8-4fc3-a543-861ccc1d1cab) - [@example/minimal-astro-react](https://pkg.pr.new/template/d4c73da7-3b32-4178-a5b5-25955c2c3941) - [@example/minimal-expo](https://pkg.pr.new/template/596a5e90-e421-4739-a11e-c85bb059daff) - [@example/minimal-nuxt](https://pkg.pr.new/template/525d1613-f257-484b-933e-17cfcb197c80) - [@example/minimal-pagedir](https://pkg.pr.new/template/575b532d-1410-4edb-aa11-7b87f495e066) - [@example/minimal-solidstart](https://pkg.pr.new/template/5c1b3b7b-8d6f-41fc-baa9-4595238a0566) - [@example/minimal-sveltekit](https://pkg.pr.new/template/f62148ac-7bae-4471-b145-66c0dc6c8122) - [@example/minimal-tanstack-start](https://pkg.pr.new/template/6bfcb4e2-53ab-428c-b37d-c953c1de3bf9)

pnpm add https://pkg.pr.new/pingdotgg/uploadthing/@uploadthing/shared@991

pnpm add https://pkg.pr.new/pingdotgg/uploadthing@991

commit: 22d0820

pingdotgg / uploadthing