Skip to content
New issue

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

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

Already on GitHub? # to your account

fix: 解决通过路径会下载两次文件 #5319

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

wangwenting-dev
Copy link
Contributor

@wangwenting-dev wangwenting-dev commented Jan 7, 2025

解决Chrome、Safari通过路径一次下载两个文件的BUG

Description

https://github.com/vbenjs/vue-vben-admin/blob/main/packages/%40core/base/shared/src/utils/download.ts
function downloadFileFromUrl(){
....
if (isChrome || isSafari) {
triggerDownload(source, resolveFileName(source, fileName));
return;
}
....
}
通过路径下载 如果在Chrome、Safari中会单独判断,走了triggerDownload去下载, 如果没有return会触发两次下载

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • 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
  • Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Checklist

ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in CONTRIBUTING.

  • If you introduce new functionality, document it. You can run documentation with pnpm run docs:dev command.
  • Run the tests with pnpm test.
  • Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

  • Bug Fixes
    • Improved download functionality for Chrome and Safari browsers by optimizing the download process.
    • Enhanced browser-specific download handling to ensure more reliable file downloads.

解决Chrome、Safari通过路径一次下载两个文件的BUG
Copy link

changeset-bot bot commented Jan 7, 2025

⚠️ No Changeset found

Latest commit: 2fdb043

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
Contributor

coderabbitai bot commented Jan 7, 2025

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

packages/@core/base/shared/src/utils/download.ts

Oops! Something went wrong! :(

ESLint: 9.17.0

Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/node_modules/@vben/eslint-config/dist/index.mjs' imported from /eslint.config.mjs
at finalizeResolution (node:internal/modules/esm/resolve:257:11)
at moduleResolve (node:internal/modules/esm/resolve:914:10)
at defaultResolve (node:internal/modules/esm/resolve:1038:11)
at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:557:12)
at ModuleLoader.resolve (node:internal/modules/esm/loader:525:25)
at ModuleLoader.getModuleJob (node:internal/modules/esm/loader:246:38)
at ModuleJob._link (node:internal/modules/esm/module_job:126:49)

Walkthrough

The pull request modifies the downloadFileFromUrl function in the download utility file, specifically adjusting the download behavior for Chrome and Safari browsers. The change introduces a direct return after triggering the download for these specific browsers, which prevents additional URL processing and ensures a more streamlined download mechanism.

Changes

File Change Summary
packages/@core/base/shared/src/utils/download.ts Modified downloadFileFromUrl function to add an immediate return after download trigger for Chrome and Safari browsers

Poem

🐰 A Rabbit's Download Tale 🌐

In Chrome and Safari, swift and neat
The download triggers, quick and fleet
A return statement, precise and clear
No extra steps, the path is sheer
A bunny's code, both smart and light! 🚀


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. (Beta)
  • @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

@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

🧹 Nitpick comments (3)
packages/@core/base/shared/src/utils/download.ts (3)

Line range hint 13-41: Document browser-specific behavior.

The function implements different download strategies based on the browser, but this isn't clearly documented. Consider adding JSDoc comments explaining:

  • Why Chrome/Safari require a different approach
  • What the ?download parameter does for other browsers
 /**
  * 通过 URL 下载文件,支持跨域
+ * Chrome/Safari: Uses direct download trigger to prevent double downloads
+ * Other browsers: Appends ?download parameter and uses window.open
  * @throws {Error} - 当下载失败时抛出错误
  */

Line range hint 21-35: Consider improving browser detection logic.

The current browser detection using userAgent string is fragile and may break with browser updates. Consider using feature detection instead of browser detection where possible.

-  const isChrome = window.navigator.userAgent.toLowerCase().includes('chrome');
-  const isSafari = window.navigator.userAgent.toLowerCase().includes('safari');
+  // Use more reliable browser detection
+  const isWebKit = 'webkitURL' in window;
+  const isModernBrowser = 'download' in HTMLAnchorElement.prototype;

Line range hint 13-41: Consider refactoring for better maintainability.

The function mixes different download strategies and browser-specific logic. Consider splitting this into separate methods for better maintainability:

function downloadForWebKit(url: string, fileName: string) {
  triggerDownload(url, fileName);
}

function downloadForLegacyBrowsers(url: string, target: string) {
  const downloadUrl = !url.includes('?') ? `${url}?download` : url;
  openWindow(downloadUrl, { target });
}

export async function downloadFileFromUrl({
  fileName,
  source,
  target = '_blank',
}: DownloadOptions): Promise<void> {
  if (!source || typeof source !== 'string') {
    throw new Error('Invalid URL.');
  }

  if (/iP/.test(window.navigator.userAgent)) {
    console.error('Your browser does not support download!');
    return;
  }

  const isWebKit = 'webkitURL' in window;
  return isWebKit
    ? downloadForWebKit(source, resolveFileName(source, fileName))
    : downloadForLegacyBrowsers(source, target);
}
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between bbbdbfa and 2fdb043.

📒 Files selected for processing (1)
  • packages/@core/base/shared/src/utils/download.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: post-update (windows-latest)
  • GitHub Check: post-update (ubuntu-latest)
🔇 Additional comments (2)
packages/@core/base/shared/src/utils/download.ts (2)

34-34: LGTM! The fix addresses the double download issue.

The added return statement prevents the second download by ensuring the function exits immediately after triggering the download in Chrome/Safari browsers.


34-34: Verify the fix across different scenarios.

While the fix addresses the double download issue, please ensure testing covers:

  1. Downloads with and without query parameters
  2. Files with different MIME types
  3. Cross-origin downloads
  4. Different file sizes

Run the following script to find test files that should be updated:

✅ Verification successful

Early return for iOS devices is safe and well-implemented

The early return specifically handles iOS devices where downloads aren't supported, preventing failed download attempts while properly maintaining the specialized Chrome/Safari path and the fallback mechanism for other browsers. No additional checks are needed.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for existing tests related to downloadFileFromUrl
rg -l "downloadFileFromUrl" --type test

# Look for browser-specific test configurations
rg -l "browser.*test" --type test

Length of output: 133


Script:

#!/bin/bash
# Find test files
echo "=== Test files ==="
fd -e test.ts -e test.tsx -e spec.ts -e spec.tsx

# Search for download-related tests
echo -e "\n=== Download tests ==="
rg "describe.*download|test.*download" -A 2

# Find implementation of downloadFileFromUrl
echo -e "\n=== Implementation ==="
ast-grep --pattern 'function downloadFileFromUrl($_) {
  $$$
}'

# Look for browser-specific configurations
echo -e "\n=== Browser configs ==="
rg "browser.*config" -A 2

Length of output: 3206


Script:

#!/bin/bash
# Check the download utility implementation
echo "=== Download Implementation ==="
cat packages/@core/base/shared/src/utils/download.ts

# Look for browser detection patterns
echo -e "\n=== Browser Detection ==="
rg "navigator|userAgent|browser" packages/@core/base/shared/src/utils/download.ts

# Find related download functions
echo -e "\n=== Related Functions ==="
ast-grep --pattern 'function $_(url$_) {
  $$$
}'

Length of output: 4453

@mynetfan mynetfan merged commit 16162c0 into vbenjs:main Jan 8, 2025
5 checks passed
canyanol650 added a commit to canyanol650/vue-vben-admin-electron that referenced this pull request Jan 8, 2025
fix: download from url triggered twice sometimes (vbenjs#5319)
@github-actions github-actions bot locked and limited conversation to collaborators Feb 8, 2025
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants