Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: changed return to match shape of error. #2744

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

MichaelUnkey
Copy link
Collaborator

@MichaelUnkey MichaelUnkey commented Dec 12, 2024

What does this PR do?

Fixes # (issue)
ENG-1491

If there is not an issue for this, please create one first. This is used to tracking purposes and also helps use understand why this PR exists

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)
  • Enhancement (small improvements)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How should this be tested?

Returns Correct errors

Checklist

Required

  • Filled out the "How to test" section in this PR
  • Read Contributing Guide
  • Self-reviewed my own code
  • Commented on my code in hard-to-understand areas
  • Ran pnpm build
  • Ran pnpm fmt
  • Checked for warnings, there are none
  • Removed all console.logs
  • Merged the latest changes from main onto my branch with git pull origin main
  • My changes don't cause any responsiveness issues

Appreciated

  • If a UI change was made: Added a screen recording or screenshots to this PR
  • Updated the Unkey Docs if changes were necessary

Summary by CodeRabbit

  • Bug Fixes
    • Improved error handling for fetch responses, simplifying the structure of error messages returned to users.
    • Added a fallback mechanism for cases with no response, providing a consistent error message.

Copy link

linear bot commented Dec 12, 2024

Copy link

changeset-bot bot commented Dec 12, 2024

⚠️ No Changeset found

Latest commit: db2d245

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

Copy link

vercel bot commented Dec 12, 2024

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

Name Status Preview Comments Updated (UTC)
dashboard ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 12, 2024 4:29pm
engineering ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 12, 2024 4:29pm
play ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 12, 2024 4:29pm
www ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 12, 2024 4:29pm

Copy link
Contributor

coderabbitai bot commented Dec 12, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request focus on modifying the error handling logic within the fetch method of the Unkey class in packages/api/src/client.ts. The update simplifies the process by returning the entire response as an ErrorResponse, rather than extracting specific error details from the response JSON. Additionally, it introduces a fallback mechanism to return a generic error when no response is available, enhancing the consistency of error management.

Changes

File Path Change Summary
packages/api/src/client.ts Modified the fetch method in the Unkey class to return the entire response as an ErrorResponse instead of destructuring error details. Updated fallback error handling to return a generic error object with a fixed code "FETCH_ERROR" if no response is available.

Possibly related PRs

Suggested reviewers

  • mcstepp
  • perkinsjr
  • chronark

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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, 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 generate docstrings to generate docstrings for this PR. (Experiment)
  • @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 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 for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

github-actions bot commented Dec 12, 2024

Thank you for following the naming conventions for pull request titles! 🙏

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
packages/api/src/client.ts (1)

Line range hint 200-211: Improve type safety in error handling

The use of @ts-ignore comments suggests underlying type system issues that should be addressed for better maintainability and type safety.

Consider refactoring to improve type safety:

+type FetchError = Error & { message: string };
+
     return {
       error: {
-        // @ts-ignore
         code: "FETCH_ERROR",
-        // @ts-ignore I don't understand why `err` is `never`
-        message: err?.message ?? "No response",
+        message: (err as FetchError)?.message ?? "No response",
         docs: "https://developer.mozilla.org/en-US/docs/Web/API/fetch",
         requestId: "N/A",
       },
     };
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5a95fcd and db2d245.

📒 Files selected for processing (1)
  • packages/api/src/client.ts (1 hunks)
🔇 Additional comments (2)
packages/api/src/client.ts (2)

Line range hint 198-211: LGTM with suggestions for improvement

The changes successfully address the PR objective of matching error shapes by simplifying the error handling logic. While the implementation works, consider the suggested improvements for better type safety and error validation to make the code more robust.


198-198: Consider adding runtime validation for error response structure

While directly returning the response as ErrorResponse simplifies the code, it assumes the response will always match the expected error structure. Consider adding runtime validation to ensure type safety and prevent exposing unexpected error formats to clients.

Consider adding validation:

-      return (await res.json()) as ErrorResponse;
+      const response = await res.json();
+      if (!response?.error?.code || !response?.error?.message) {
+        return {
+          error: {
+            code: "INVALID_ERROR_RESPONSE",
+            message: "Received invalid error response format",
+            docs: "https://docs.unkey.dev/errors",
+            requestId: response?.error?.requestId ?? "N/A"
+          }
+        };
+      }
+      return response as ErrorResponse;

@MichaelUnkey MichaelUnkey added this pull request to the merge queue Dec 12, 2024
Merged via the queue into main with commit cc1c90c Dec 12, 2024
27 of 28 checks passed
@MichaelUnkey MichaelUnkey deleted the eng-1491-ratelimit-unclear-error branch December 12, 2024 16:57
@coderabbitai coderabbitai bot mentioned this pull request Dec 12, 2024
18 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants