Add Terms of Use and Privacy Policy links to READMEs

Added links to the Terms of Use and Privacy Policy in the English, Chinese, Japanese, and Dutch README files to provide users with easy access to legal information.

.github/ISSUE_TEMPLATE/00-bug_report_zh.yml

@@ -25,11 +25,11 @@ body:
         - label: |
             我确认我的描述清晰，语法礼貌，能帮助开发者快速定位问题，并符合社区规则。
         - label: |
-            我已确认阅读了[OpenList文档](https://doc.oplist.org)。
+            我已确认阅读了[OpenList文档](https://docs.oplist.org)。
         - label: |
             我已确认没有重复的问题或讨论。
         - label: |
-            我已确认是`OpenList`的问题，而不是其他原因（例如 [网络](https://doc.oplist.org/faq/howto#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host-1) ，`依赖`或`操作`）。
+            我已确认是`OpenList`的问题，而不是其他原因（例如 [网络](https://docs.oplist.org/zh/faq/howto.html#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host) ，`依赖`或`操作`）。
         - label: |
             我认为此问题必须由`OpenList`处理，而非第三方。
         - label: |
@@ -72,7 +72,7 @@ body:
     attributes:
       label: 日志（可选）
       description: |
-        请复制粘贴错误日志，或者截图。(可隐藏隐私字段) [查看方法](https://doc.oplist.org/faq/howto#%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%9A%E4%BD%8Dbug)
+        请复制粘贴错误日志，或者截图。(可隐藏隐私字段)
   - type: textarea
     id: reproduction
     attributes:

.github/ISSUE_TEMPLATE/01-bug_report_en.yml

@@ -25,11 +25,11 @@ body:
         - label: |
             I confirm my description is clear, polite, helps developers quickly locate the issue, and complies with community rules.
         - label: |
-            I have read the [OpenList documentation](https://doc.oplist.org).
+            I have read the [OpenList documentation](https://docs.oplist.org).
         - label: |
             I confirm there are no duplicate issues or discussions.
         - label: |
-            I confirm this is an `OpenList` issue, not caused by other reasons (such as [network](https://doc.oplist.org/faq/howto#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host-1), dependencies, or operation).
+            I confirm this is an `OpenList` issue, not caused by other reasons (such as [network](https://docs.oplist.org/faq/howto.html#tls-handshake-timeout-read-connection-reset-by-peer-dns-lookup-failed-connect-connection-refused-client-timeout-exceeded-while-awaiting-headers-no-such-host), dependencies, or operation).
         - label: |
             I believe this issue must be handled by `OpenList` and not by a third party.
         - label: |
@@ -72,7 +72,7 @@ body:
     attributes:
       label: Logs (optional)
       description: |
-        Please copy and paste any relevant log output or screenshots. (You may mask sensitive fields) [Guide](https://doc.oplist.org/faq/howto#how-to-quickly-locate-bugs)
+        Please copy and paste any relevant log output or screenshots. (You may mask sensitive fields)
   - type: textarea
     id: reproduction
     attributes:

.github/ISSUE_TEMPLATE/02-feature_request_zh.yml

@@ -19,7 +19,7 @@ body:
         - label: |
             我确认我的描述清晰，语法礼貌，能帮助开发者快速定位问题，并符合社区规则。
         - label: |
-            我已确认阅读了[OpenList文档](https://doc.oplist.org)。
+            我已确认阅读了[OpenList文档](https://docs.oplist.org)。
         - label: |
             我已确认没有重复的问题或讨论。
         - label: |

.github/ISSUE_TEMPLATE/03-feature_request_en.yml

@@ -19,7 +19,7 @@ body:
         - label: |
             I confirm my description is clear, polite, helps developers quickly locate the issue, and complies with community rules.
         - label: |
-            I have read the [OpenList documentation](https://doc.oplist.org).
+            I have read the [OpenList documentation](https://docs.oplist.org).
         - label: |
             I confirm there are no duplicate issues or discussions.
         - label: |

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,56 +0,0 @@
-<!--
-  Provide a general summary of your changes in the Title above.
-  The PR title must start with `feat(): `, `docs(): `, `fix(): `, `style(): `, or `refactor(): `, `chore(): `. For example: `feat(component): add new feature`.
-  If it spans multiple components, use the main component as the prefix and enumerate in the title, describe in the body.
--->
-<!--
-  在上方标题中提供您更改的总体摘要。
-  PR 标题需以 `feat(): `, `docs(): `, `fix(): `, `style(): `, `refactor(): `, `chore(): ` 其中之一开头，例如：`feat(component): 新增功能`。
-  如果跨多个组件，请使用主要组件作为前缀，并在标题中枚举、描述中说明。
--->
-
-## Description / 描述
-
-<!-- Describe your changes in detail -->
-<!-- 详细描述您的更改 -->
-
-## Motivation and Context / 背景
-
-<!-- Why is this change required? What problem does it solve? -->
-<!-- 为什么需要此更改？它解决了什么问题？ -->
-
-<!-- If it fixes an open issue, please link to the issue here. -->
-<!-- 如果修复了一个打开的issue，请在此处链接到该issue -->
-
-Closes #XXXX
-
-<!-- or -->
-<!-- 或者 -->
-
-Relates to #XXXX
-
-## How Has This Been Tested? / 测试
-
-<!-- Please describe in detail how you tested your changes. -->
-<!-- 请详细描述您如何测试更改 -->
-
-## Checklist / 检查清单
-
-<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!-- 检查以下所有要点，并在所有适用的框中打`x` -->
-
-<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-<!-- 如果您对其中任何一项不确定，请不要犹豫提问。我们会帮助您！ -->
-
-- [ ] I have read the [CONTRIBUTING](https://github.com/OpenListTeam/OpenList/blob/main/CONTRIBUTING.md) document.
-      我已阅读 [CONTRIBUTING](https://github.com/OpenListTeam/OpenList/blob/main/CONTRIBUTING.md) 文档。
-- [ ] I have formatted my code with `go fmt` or [prettier](https://prettier.io/).
-      我已使用 `go fmt` 或 [prettier](https://prettier.io/) 格式化提交的代码。
-- [ ] I have added appropriate labels to this PR (or mentioned needed labels in the description if lacking permissions).
-      我已为此 PR 添加了适当的标签（如无权限或需要的标签不存在，请在描述中说明，管理员将后续处理）。
-- [ ] I have requested review from relevant code authors using the "Request review" feature when applicable.
-      我已在适当情况下使用"Request review"功能请求相关代码作者进行审查。
-- [ ] I have updated the repository accordingly (If it’s needed).
-      我已相应更新了相关仓库（若适用）。
-  - [ ] [OpenList-Frontend](https://github.com/OpenListTeam/OpenList-Frontend) #XXXX
-  - [ ] [OpenList-Docs](https://github.com/OpenListTeam/OpenList-Docs) #XXXX

.github/config.yml

@@ -0,0 +1,21 @@
+# Configuration for welcome - https://github.com/behaviorbot/welcome
+
+# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
+
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: >
+  Thanks for opening your first issue here! Be sure to follow the issue template!
+
+# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
+
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: >
+  Thanks for opening this pull request! Please check out our contributing guidelines.
+
+# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
+
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+  Congrats on merging your first pull request! We here at behavior bot are proud of you! 
+
+# It is recommend to include as many gifs and emojis as possible

.github/stale.yml

@@ -0,0 +1,21 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 44
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 20
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - accepted
+  - security
+  - working
+  - pr-welcome
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue was closed due to inactive more than 52 days. You can reopen or
+  recreate it if you think it should continue. Thank you for your contributions again.

.github/workflows/beta_release.yml

@@ -2,7 +2,7 @@ name: Beta Release builds
 
 on:
   push:
-    branches: ["main"]
+    branches: [ 'main' ]
   workflow_dispatch:
 
 concurrency:
@@ -14,8 +14,12 @@ permissions:
 
 jobs:
   changelog:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
     name: Beta Release Changelog
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -61,19 +65,17 @@ jobs:
     strategy:
       matrix:
         include:
-          - target: "!(*musl*|*windows-arm64*|*windows7-*|*android*|*freebsd*)" # xgo and loongarch
+          - target: '!(*musl*|*windows-arm64*|*android*|*freebsd*)' # xgo
             hash: "md5"
-          - target: "linux-!(arm*)-musl*" #musl-not-arm
+          - target: 'linux-!(arm*)-musl*' #musl-not-arm
             hash: "md5-linux-musl"
-          - target: "linux-arm*-musl*" #musl-arm
+          - target: 'linux-arm*-musl*' #musl-arm
             hash: "md5-linux-musl-arm"
-          - target: "windows-arm64" #win-arm64
+          - target: 'windows-arm64' #win-arm64
             hash: "md5-windows-arm64"
-          - target: "windows7-*" #win7
-            hash: "md5-windows7"
-          - target: "android-*" #android
+          - target: 'android-*' #android
             hash: "md5-android"
-          - target: "freebsd-*" #freebsd
+          - target: 'freebsd-*' #freebsd
             hash: "md5-freebsd"
 
     name: Beta Release
@@ -87,29 +89,27 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24.5"
+          go-version: '1.22'
 
       - name: Setup web
         run: bash build.sh dev web
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Build
-        uses: OpenListTeam/cgo-actions@v1.2.2
+        uses: OpenListTeam/cgo-actions@v1.1.2
         with:
           targets: ${{ matrix.target }}
           musl-target-format: $os-$musl-$arch
-          github-token: ${{ secrets.GITHUB_TOKEN }}
           out-dir: build
           output: openlist-$target$ext
           musl-base-url: "https://github.com/OpenListTeam/musl-compilers/releases/latest/download/"
           x-flags: |
-            github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit
-            github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag
-            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=rolling
+            github.com/OpenListTeam/OpenList/internal/conf.BuiltAt=$built_at
+            github.com/OpenListTeam/OpenList/internal/conf.GitAuthor=OpenList
+            github.com/OpenListTeam/OpenList/internal/conf.GitCommit=$git_commit
+            github.com/OpenListTeam/OpenList/internal/conf.Version=$tag
+            github.com/OpenListTeam/OpenList/internal/conf.WebVersion=dev
 
       - name: Compress
         run: |

.github/workflows/build.yml

@@ -1,8 +1,10 @@
 name: Test Build
 
 on:
+  push:
+    branches: [ 'main' ]
   pull_request:
-    branches: ["main"]
+    branches: [ 'main' ]
   workflow_dispatch:
 
 concurrency:
@@ -13,6 +15,7 @@ jobs:
   build:
     strategy:
       matrix:
+        platform: [ubuntu-latest]
         target: 
           - darwin-amd64
           - darwin-arm64
@@ -21,9 +24,10 @@ jobs:
           - linux-amd64-musl
           - windows-arm64
           - android-arm64
-    name: Build ${{ matrix.target }}
-    runs-on: ubuntu-latest
+    name: Build
+    runs-on: ${{ matrix.platform }}
     steps:
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -33,31 +37,28 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24.5"
+          go-version: '1.22'
 
       - name: Setup web
         run: bash build.sh dev web
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Build
-        uses: OpenListTeam/cgo-actions@v1.2.2
+        uses: OpenListTeam/cgo-actions@v1.1.2
         with:
           targets: ${{ matrix.target }}
           musl-target-format: $os-$musl-$arch
-          github-token: ${{ secrets.GITHUB_TOKEN }}
           out-dir: build
           x-flags: |
-            github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit
-            github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag
-            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=rolling
-          output: openlist$ext
+            github.com/OpenListTeam/OpenList/internal/conf.BuiltAt=$built_at
+            github.com/OpenListTeam/OpenList/internal/conf.GitAuthor=OpenList
+            github.com/OpenListTeam/OpenList/internal/conf.GitCommit=$git_commit
+            github.com/OpenListTeam/OpenList/internal/conf.Version=$tag
+            github.com/OpenListTeam/OpenList/internal/conf.WebVersion=dev
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: openlist_${{ steps.short-sha.outputs.sha }}_${{ matrix.target }}
+          name: openlist_${{ env.SHA }}_${{ matrix.target }}
           path: build/*

.github/workflows/changelog.yml

@@ -1,4 +1,4 @@
-name: Release Automatic changelog
+name: Automatic changelog
 
 on:
   push:

.github/workflows/issue_pr_comment.yml

@@ -1,61 +0,0 @@
-name: Issue or PR Auto Reply
-
-on:
-  issues:
-    types: [opened]
-  pull_request:
-    types: [opened]
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  auto-reply:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'issues'
-    steps:
-      - name: Check issue for unchecked tasks and reply
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const issueBody = context.payload.issue.body || "";
-            const unchecked = /- \[ \] /.test(issueBody);
-            let comment = "感谢您联系OpenList。我们会尽快回复您。\n";
-            comment += "Thanks for contacting OpenList. We will reply to you as soon as possible.\n\n";
-            if (unchecked) {
-              comment += "由于您提出的 Issue 中包含部分未确认的项目，为了更好地管理项目，在人工审核后可能会直接关闭此问题。\n";
-              comment += "如果您能确认并补充相关未确认项目的信息，欢迎随时重新提交。我们会及时关注并处理。感谢您的理解与支持！\n";
-              comment += "Since your issue contains some unchecked tasks, it may be closed after manual review.\n";
-              comment += "If you can confirm and provide information for the unchecked tasks, feel free to resubmit.\n";
-              comment += "We will pay attention and handle it in a timely manner.\n\n";
-              comment += "感谢您的理解与支持！\n";
-              comment += "Thank you for your understanding and support!\n";
-            }
-            await github.rest.issues.createComment({
-              ...context.repo,
-              issue_number: context.issue.number,
-              body: comment
-            });
-
-  pr-title-check:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
-    steps:
-      - name: Check PR title for required prefix and comment
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const title = context.payload.pull_request.title || "";
-            const ok = /^(feat|docs|fix|style|refactor|chore)\(.+?\): /i.test(title);
-            if (!ok) {
-              let comment = "⚠️ PR 标题需以 `feat(): `, `docs(): `, `fix(): `, `style(): `, `refactor(): `, `chore(): ` 其中之一开头，例如：`feat(component): 新增功能`。\n";
-              comment += "⚠️ The PR title must start with `feat(): `, `docs(): `, `fix(): `, `style(): `, or `refactor(): `, `chore(): `. For example: `feat(component): add new feature`.\n\n";
-              comment += "如果跨多个组件，请使用主要组件作为前缀，并在标题中枚举、描述中说明。\n";
-              comment += "If it spans multiple components, use the main component as the prefix and enumerate in the title, describe in the body.\n\n";
-              await github.rest.issues.createComment({
-                ...context.repo,
-                issue_number: context.issue.number,
-                body: comment
-              });
-            }

.github/workflows/release.yml

@@ -8,34 +8,24 @@ permissions:
   contents: write
 
 jobs:
-  # Set release to prerelease first
-  prerelease:
-    name: Set Prerelease
-    runs-on: ubuntu-latest
-    steps:
-      - name: Prerelease
-        uses: irongut/EditRelease@v1.2.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          id: ${{ github.event.release.id }}
-          prerelease: true
-
-  # Main release job for all platforms
   release:
-    needs: prerelease
     strategy:
       matrix:
-        build-type: [ 'standard', 'lite' ]
-        target-platform: [ '', 'android', 'freebsd', 'linux_musl', 'linux_musl_arm' ]
-    name: Release ${{ matrix.target-platform && format('{0} ', matrix.target-platform) || '' }}${{ matrix.build-type == 'lite' && 'Lite' || '' }}
-    runs-on: ubuntu-latest
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
     steps:
 
       - name: Free Disk Space (Ubuntu)
-        if: matrix.target-platform == ''
         uses: jlumbroso/free-disk-space@main
         with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
           tool-cache: false
+          
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
           android: true
           dotnet: true
           haskell: true
@@ -43,10 +33,17 @@ jobs:
           docker-images: true
           swap-storage: true
 
+      - name: Prerelease
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: true
+
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: ${{ matrix.go-version }}
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -54,7 +51,6 @@ jobs:
           fetch-depth: 0
 
       - name: Install dependencies
-        if: matrix.target-platform == ''
         run: |
           sudo snap install zig --classic --beta
           docker pull crazymax/xgo:latest
@@ -63,10 +59,70 @@ jobs:
 
       - name: Build
         run: |
-          bash build.sh release ${{ matrix.build-type == 'lite' && 'lite' || '' }} ${{ matrix.target-platform }}
+          bash build.sh release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+          prerelease: false
+
+  release-lite:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release Lite
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+          
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
+      - name: Prerelease
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: true
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install dependencies
+        run: |
+          sudo snap install zig --classic --beta
+          docker pull crazymax/xgo:latest
+          go install github.com/crazy-max/xgo@latest
+          sudo apt install upx
+
+      - name: Build
+        run: |
+          bash build.sh release lite
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload assets
         uses: softprops/action-gh-release@v2

.github/workflows/release_android.yml

@@ -0,0 +1,69 @@
+name: Release builds (Android)
+
+on:
+  release:
+    types: [ published ]
+    
+permissions:
+  contents: write
+
+jobs:
+  release_android:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release android
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_android_lite:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release lite android
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*

.github/workflows/release_docker.yml

@@ -31,8 +31,11 @@ env:
   REGISTRY: ghcr.io
   ARTIFACT_NAME: 'binaries_docker_release'
   ARTIFACT_NAME_LITE: 'binaries_docker_release_lite'
-  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/ppc64le,linux/riscv64,linux/loong64' ### Temporarily disable Docker builds for linux/s390x architectures for unknown reasons.
+  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64'
   IMAGE_PUSH: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+  IMAGE_IS_PROD: ${{ github.ref_type == 'tag' || github.event.inputs.as_latest == 'true' }}
+  IMAGE_TAGS_BETA: |
+    type=raw,value=beta,enable={{is_default_branch}}
 
 permissions:
   packages: write
@@ -62,11 +65,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build go binary (beta)
+        if: env.IMAGE_IS_PROD != 'true'
+        run: bash build.sh beta docker-multiplatform
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build go binary (release)
+        if: env.IMAGE_IS_PROD == 'true'
         run: bash build.sh release docker-multiplatform
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -79,7 +88,7 @@ jobs:
             !build/musl-libs/**
 
   build_binary_lite:
-    name: Build Binaries for Docker Release (Lite)
+    name: Build Binaries for Docker Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -102,11 +111,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build go binary (beta)
+        if: env.IMAGE_IS_PROD != 'true'
+        run: bash build.sh beta lite docker-multiplatform
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build go binary (release)
+        if: env.IMAGE_IS_PROD == 'true'
         run: bash build.sh release lite docker-multiplatform
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -127,19 +142,15 @@ jobs:
         image: ["latest", "ffmpeg", "aria2", "aio"]
         include:
           - image: "latest"
-            base_image_tag: "base"
             build_arg: ""
             tag_favor: ""
           - image: "ffmpeg"
-            base_image_tag: "ffmpeg"
             build_arg: INSTALL_FFMPEG=true
             tag_favor: "suffix=-ffmpeg,onlatest=true"
           - image: "aria2"
-            base_image_tag: "aria2"
             build_arg: INSTALL_ARIA2=true
             tag_favor: "suffix=-aria2,onlatest=true"
           - image: "aio"
-            base_image_tag: "aio"
             build_arg: |
               INSTALL_FFMPEG=true
               INSTALL_ARIA2=true
@@ -170,7 +181,7 @@ jobs:
         if: env.IMAGE_PUSH == 'true'
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
+          username: ${{ env.DOCKERHUB_ORG_NAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
@@ -181,11 +192,13 @@ jobs:
             ${{ env.REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
             ${{ env.DOCKERHUB_ORG_NAME }}/${{ env.IMAGE_NAME_DOCKERHUB }}
           tags: >
-            ${{ github.event_name == 'workflow_dispatch'
+            ${{ env.IMAGE_IS_PROD == 'true' && (
+              github.event_name == 'workflow_dispatch'
                 && format('type=raw,value={0}', github.event.inputs.manual_tag)
-              || format('type=raw,value={0}', github.ref_name) }}
+              || format('type=raw,value={0}', github.ref_name)
+            ) || env.IMAGE_TAGS_BETA }}
           flavor: |
-            latest=${{ github.event_name == 'push' || github.event.inputs.as_latest == 'true' }}
+            latest=${{ env.IMAGE_IS_PROD }}
             ${{ matrix.tag_favor }}
 
       - name: Build and push
@@ -195,35 +208,29 @@ jobs:
           context: .
           file: Dockerfile.ci
           push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: |
-            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
-            ${{ matrix.build_arg }}
+          build-args: ${{ matrix.build_arg }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ env.RELEASE_PLATFORMS }}
 
   release_docker_lite:
     needs: build_binary_lite
-    name: Release Docker image (Lite)
+    name: Release Docker image
     runs-on: ubuntu-latest
     strategy:
       matrix:
         image: ["latest", "ffmpeg", "aria2", "aio"]
         include:
           - image: "latest"
-            base_image_tag: "base"
             build_arg: ""
             tag_favor: "suffix=-lite,onlatest=true"
           - image: "ffmpeg"
-            base_image_tag: "ffmpeg"
             build_arg: INSTALL_FFMPEG=true
             tag_favor: "suffix=-lite-ffmpeg,onlatest=true"
           - image: "aria2"
-            base_image_tag: "aria2"
             build_arg: INSTALL_ARIA2=true
             tag_favor: "suffix=-lite-aria2,onlatest=true"
           - image: "aio"
-            base_image_tag: "aio"
             build_arg: |
               INSTALL_FFMPEG=true
               INSTALL_ARIA2=true
@@ -254,7 +261,7 @@ jobs:
         if: env.IMAGE_PUSH == 'true'
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
+          username: ${{ env.DOCKERHUB_ORG_NAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
@@ -265,11 +272,13 @@ jobs:
             ${{ env.REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
             ${{ env.DOCKERHUB_ORG_NAME }}/${{ env.IMAGE_NAME_DOCKERHUB }}
           tags: >
-            ${{ github.event_name == 'workflow_dispatch'
+            ${{ env.IMAGE_IS_PROD == 'true' && (
+              github.event_name == 'workflow_dispatch'
                 && format('type=raw,value={0}', github.event.inputs.manual_tag)
-              || format('type=raw,value={0}', github.ref_name) }}
+              || format('type=raw,value={0}', github.ref_name)
+            ) || env.IMAGE_TAGS_BETA }}
           flavor: |
-            latest=${{ github.event_name == 'push' || github.event.inputs.as_latest == 'true' }}
+            latest=${{ env.IMAGE_IS_PROD }}
             ${{ matrix.tag_favor }}
 
       - name: Build and push
@@ -279,9 +288,7 @@ jobs:
           context: .
           file: Dockerfile.ci
           push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: |
-            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
-            ${{ matrix.build_arg }}
+          build-args: ${{ matrix.build_arg }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ env.RELEASE_PLATFORMS }}

.github/workflows/release_freebsd.yml

@@ -0,0 +1,69 @@
+name: Release builds (Freebsd)
+
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: write
+
+jobs:
+  release_freebsd:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release freebsd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_freebsd_lite:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release lite freebsd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*

.github/workflows/release_linux_musl.yml

@@ -0,0 +1,69 @@
+name: Release builds (linux_musl)
+
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: write
+
+jobs:
+  release_linux_musl:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release linux_musl
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_linux_musl_lite:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release lite linux_musl
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*

.github/workflows/release_linux_musl_arm.yml

@@ -0,0 +1,70 @@
+name: Release builds (linux_musl_arm)
+
+on:
+  release:
+    types: [ published ]
+    
+permissions:
+  contents: write
+
+jobs:
+  release_linux_musl_arm:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release linux_musl_arm
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*
+
+  release_linux_musl_arm_lite:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        go-version: [ '1.21' ]
+    name: Release
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build
+        run: |
+          bash build.sh release lite linux_musl_arm
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload assets
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/compress/*      
+ 

.github/workflows/sync_repo.yml

@@ -1,38 +0,0 @@
-name: Sync to Gitee
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    name: Sync GitHub to Gitee
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.GITEE_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan gitee.com >> ~/.ssh/known_hosts
-
-      - name: Create single commit and push
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          
-          # Create a new branch
-          git checkout --orphan new-main
-          git add .
-          git commit -m "Sync from GitHub: $(date)"
-
-          # Add Gitee remote and force push
-          git remote add gitee ${{ vars.GITEE_REPO_URL }}
-          git push --force gitee new-main:main

.github/workflows/test_docker.yml

@@ -1,4 +1,4 @@
-name: Beta Release (Docker)
+name: Docker Beta Release
 
 on:
   workflow_dispatch:
@@ -20,7 +20,8 @@ env:
   IMAGE_NAME_DOCKERHUB: openlist
   REGISTRY: ghcr.io
   ARTIFACT_NAME: 'binaries_docker_release'
-  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/ppc64le,linux/riscv64,linux/loong64' ### Temporarily disable Docker builds for linux/s390x architectures for unknown reasons.
+  ARTIFACT_NAME_LITE: 'binaries_docker_release_lite'
+  RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64'
   IMAGE_PUSH: ${{ github.event_name == 'push' }}
   IMAGE_TAGS_BETA: |
     type=ref,event=pr
@@ -28,7 +29,7 @@ env:
 
 jobs:
   build_binary:
-    name: Build Binaries for Docker Release (Beta)
+    name: Build Binaries for Docker Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -55,7 +56,6 @@ jobs:
         run: bash build.sh beta docker-multiplatform
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FRONTEND_REPO: ${{ vars.FRONTEND_REPO }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -69,7 +69,7 @@ jobs:
 
   release_docker:
     needs: build_binary
-    name: Release Docker image (Beta)
+    name: Release Docker image
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -78,19 +78,15 @@ jobs:
         image: ["latest", "ffmpeg", "aria2", "aio"]
         include:
           - image: "latest"
-            base_image_tag: "base"
             build_arg: ""
             tag_favor: ""
           - image: "ffmpeg"
-            base_image_tag: "ffmpeg"
             build_arg: INSTALL_FFMPEG=true
             tag_favor: "suffix=-ffmpeg,onlatest=true"
           - image: "aria2"
-            base_image_tag: "aria2"
             build_arg: INSTALL_ARIA2=true
             tag_favor: "suffix=-aria2,onlatest=true"
           - image: "aio"
-            base_image_tag: "aio"
             build_arg: |
               INSTALL_FFMPEG=true
               INSTALL_ARIA2=true
@@ -121,7 +117,7 @@ jobs:
         if: env.IMAGE_PUSH == 'true'
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_ORG_NAME_BACKUP || env.DOCKERHUB_ORG_NAME }}
+          username: ${{ env.DOCKERHUB_ORG_NAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
@@ -142,9 +138,7 @@ jobs:
           context: .
           file: Dockerfile.ci
           push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: |
-            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
-            ${{ matrix.build_arg }}
+          build-args: ${{ matrix.build_arg }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ env.RELEASE_PLATFORMS }}

.github/workflows/trigger-makefile-update.yml

@@ -19,7 +19,7 @@ jobs:
         uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.EXTERNAL_REPO_TOKEN_LUCI_APP_OPENLIST }}
-          repository: ${{ vars.HOOK_REPO || 'OpenListTeam/OpenList-OpenWRT' }}
+          repository: ${{ vars.HOOK_REPO || 'OpenListTeam/luci-app-openlist' }}
           event-type: update-hashes
           client-payload: |
             {

CONTRIBUTING.md

@@ -2,76 +2,106 @@
 
 ## Setup your machine
 
-`OpenList` is written in [Go](https://golang.org/) and [SolidJS](https://www.solidjs.com/).
+`OpenList` is written in [Go](https://golang.org/) and [React](https://reactjs.org/).
 
 Prerequisites:
 
 - [git](https://git-scm.com)
-- [Go 1.24+](https://golang.org/doc/install)
+- [Go 1.20+](https://golang.org/doc/install)
 - [gcc](https://gcc.gnu.org/)
 - [nodejs](https://nodejs.org/)
 
-## Cloning a fork
-
-Fork and clone `OpenList` and `OpenList-Frontend` anywhere:
+Clone `OpenList` and `OpenList-Frontend` anywhere:
 
 ```shell
-$ git clone https://github.com/<your-username>/OpenList.git
-$ git clone --recurse-submodules https://github.com/<your-username>/OpenList-Frontend.git
-```
-
-## Creating a branch
-
-Create a new branch from the `main` branch, with an appropriate name.
-
-```shell
-$ git checkout -b <branch-name>
+$ git clone https://github.com/OpenListTeam/OpenList.git
+$ git clone --recurse-submodules https://github.com/OpenListTeam/OpenList-Frontend.git
 ```
+You should switch to the `main` branch for development.
 
 ## Preview your change
-
 ### backend
-
 ```shell
 $ go run main.go
 ```
-
 ### frontend
-
 ```shell
 $ pnpm dev
 ```
 
 ## Add a new driver
-
 Copy `drivers/template` folder and rename it, and follow the comments in it.
 
 ## Create a commit
 
 Commit messages should be well formatted, and to make that "standardized".
 
-Submit your pull request. For PR titles, follow [Conventional Commits](https://www.conventionalcommits.org).
+### Commit Message Format
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:
 
-https://github.com/OpenListTeam/OpenList/issues/376
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
 
-It's suggested to sign your commits. See: [How to sign commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits)
+The **header** is mandatory and the **scope** of the header is optional.
+
+Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier
+to read on GitHub as well as in various git tools.
+
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header
+of the reverted commit.
+In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit
+being reverted.
+
+### Type
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+  semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug nor adds a feature
+* **perf**: A code change that improves performance
+* **test**: Adding missing or correcting existing tests
+* **build**: Affects project builds or dependency modifications
+* **revert**: Restore the previous commit
+* **ci**: Continuous integration of related file modifications
+* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+  generation
+* **release**: Release a new version
+
+### Scope
+The scope could be anything specifying place of the commit change. For example `$location`,
+`$browser`, `$compile`, `$rootScope`, `ngHref`, `ngClick`, `ngView`, etc...
+
+You can use `*` when the change affects more than a single scope.
+
+### Subject
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* no dot (.) at the end
+
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
+
+### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to
+[reference GitHub issues that this commit closes](https://help.github.com/articles/closing-issues-via-commit-messages/).
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines.
+The rest of the commit message is then used for this.
 
 ## Submit a pull request
 
-Please make sure your code has been formatted with `go fmt` or [prettier](https://prettier.io/) before submitting.
-
-Push your branch to your `openlist` fork and open a pull request against the `main` branch.
-
-## Merge your pull request
-
-Your pull request will be merged after review. Please wait for the maintainer to merge your pull request after review.
-
-At least 1 approving review is required by reviewers with write access. You can also request a review from maintainers.
-
-## Delete your branch
-
-(Optional) After your pull request is merged, you can delete your branch.
-
----
-
-Thank you for your contribution! Let's make OpenList better together!
+Push your branch to your `openlist` fork and open a pull request against the
+`main` branch.

Dockerfile

@@ -1,7 +1,4 @@
-### Default image is base. You can add other support by modifying BASE_IMAGE_TAG. The following parameters are supported: base (default), aria2, ffmpeg, aio
-ARG BASE_IMAGE_TAG=base
-
-FROM alpine:edge AS builder
+FROM docker.io/library/alpine:edge AS builder
 LABEL stage=go-builder
 WORKDIR /app/
 RUN apk add --no-cache bash curl jq gcc git go musl-dev
@@ -10,27 +7,36 @@ RUN go mod download
 COPY ./ ./
 RUN bash build.sh release docker
 
-FROM openlistteam/openlist-base-image:${BASE_IMAGE_TAG}
-LABEL MAINTAINER="OpenList"
+FROM alpine:edge
+
 ARG INSTALL_FFMPEG=false
 ARG INSTALL_ARIA2=false
-ARG USER=openlist
-ARG UID=1001
-ARG GID=1001
+LABEL MAINTAINER="OpenList"
 
 WORKDIR /opt/openlist/
 
-RUN addgroup -g ${GID} ${USER} && \
-    adduser -D -u ${UID} -G ${USER} ${USER} && \
-    mkdir -p /opt/openlist/data
+RUN apk update && \
+    apk upgrade --no-cache && \
+    apk add --no-cache bash ca-certificates su-exec tzdata; \
+    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
+    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
+        mkdir -p /opt/aria2/.aria2 && \
+        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
+        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
+        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
+        touch /opt/aria2/.aria2/aria2.session && \
+        /opt/aria2/.aria2/tracker.sh ; \
+    rm -rf /var/cache/apk/*
 
-COPY --from=builder --chmod=755 --chown=${UID}:${GID} /app/bin/openlist ./
-COPY --chmod=755 --chown=${UID}:${GID} entrypoint.sh /entrypoint.sh
-
-USER ${USER}
+COPY --chmod=755 --from=builder /app/bin/openlist ./
+COPY --chmod=755 entrypoint.sh /entrypoint.sh
 RUN /entrypoint.sh version
 
-ENV UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
+ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
 VOLUME /opt/openlist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

Dockerfile.ci

@@ -1,26 +1,34 @@
-ARG BASE_IMAGE_TAG=base
-FROM ghcr.io/openlistteam/openlist-base-image:${BASE_IMAGE_TAG}
-LABEL MAINTAINER="OpenList"
+FROM docker.io/library/alpine:edge
+
 ARG TARGETPLATFORM
 ARG INSTALL_FFMPEG=false
 ARG INSTALL_ARIA2=false
-ARG USER=openlist
-ARG UID=1001
-ARG GID=1001
+LABEL MAINTAINER="OpenList"
 
 WORKDIR /opt/openlist/
 
-RUN addgroup -g ${GID} ${USER} && \
-    adduser -D -u ${UID} -G ${USER} ${USER} && \
-    mkdir -p /opt/openlist/data
+RUN apk update && \
+    apk upgrade --no-cache && \
+    apk add --no-cache bash ca-certificates su-exec tzdata; \
+    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
+    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
+        mkdir -p /opt/aria2/.aria2 && \
+        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
+        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
+        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
+        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
+        touch /opt/aria2/.aria2/aria2.session && \
+        /opt/aria2/.aria2/tracker.sh ; \
+    rm -rf /var/cache/apk/*
 
-COPY --chmod=755 --chown=${UID}:${GID} /build/${TARGETPLATFORM}/openlist ./
-COPY --chmod=755 --chown=${UID}:${GID} entrypoint.sh /entrypoint.sh
-
-USER ${USER}
+COPY --chmod=755 /build/${TARGETPLATFORM}/openlist ./
+COPY --chmod=755 entrypoint.sh /entrypoint.sh
 RUN /entrypoint.sh version
 
-ENV UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
+ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
 VOLUME /opt/openlist/data/
 EXPOSE 5244 5245
 CMD [ "/entrypoint.sh" ]

README.md

@@ -20,34 +20,6 @@
 - [CODE OF CONDUCT](./CODE_OF_CONDUCT.md)
 - [LICENSE](./LICENSE)
 
-## Disclaimer
-
-OpenList is an open-source project independently maintained by the OpenList Team, following the AGPL-3.0 license and committed to maintaining complete code openness and modification transparency.
-
-We have noticed the emergence of some third-party projects in the community with names similar to this project, such as OpenListApp/OpenListApp, as well as some paid proprietary software using the same or similar naming. To avoid user confusion, we hereby declare:
-
-- OpenList has no official association with any third-party derivative projects.
-
-- All software, code, and services of this project are maintained by the OpenList Team and are freely available on GitHub.
-
-- Project documentation and API services primarily rely on charitable resources provided by Cloudflare. There are currently no paid plans or commercial deployments, and the use of existing features does not involve any costs.
-
-We respect the community's rights to free use and derivative development, but we also strongly urge downstream projects:
-
-- Should not use the "OpenList" name for impersonation promotion or commercial gain;
-
-- Must not distribute OpenList-based code in a closed-source manner or violate AGPL license terms.
-
-To better maintain healthy ecosystem development, we recommend:
-
-- Clearly indicate the project source and choose appropriate open-source licenses in accordance with the open-source spirit;
-
-- If involving commercial use, please avoid using "OpenList" or any confusing naming as the project name;
-
-- If you need to use materials located under OpenListTeam/Logo, you may modify and use them under compliance with the agreement.
-
-Thank you for your support and understanding of the OpenList project.
-
 ## Features
 
 - [x] Multiple storages
@@ -106,9 +78,10 @@ Thank you for your support and understanding of the OpenList project.
 
 ## Document
 
-- 📘 [Global Site](https://doc.oplist.org)
-- 📚 [Backup Site](https://doc.openlist.team)
-- 🌏 [CN Site](https://doc.oplist.org.cn)
+- 📘 [Docs & Install Guide](https://docs.oplist.org)
+- 📚 [Backup Docs Site](https://docs.openlist.team)
+- ⚖️ [Terms of Use](https://docs.oplist.org/terms)
+- 🔒 [Privacy Policy](https://docs.oplist.org/privacy)
 
 ## Demo
 

README_cn.md

@@ -20,34 +20,6 @@
 - [行为准则](./CODE_OF_CONDUCT.md)
 - [许可证](./LICENSE)
 
-## 免责声明
-
-OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3.0 许可证，致力于保持完整的代码开放性和修改透明性。
-
-我们注意到社区中出现了一些与本项目名称相似的第三方项目，如 OpenListApp/OpenListApp，以及部分采用相同或近似命名的收费专有软件。为避免用户误解，现声明如下：
-
-- OpenList 与任何第三方衍生项目无官方关联。
-
-- 本项目的全部软件、代码与服务由 OpenList 团队维护，可在 GitHub 免费获取。
-
-- 项目文档与 API 服务均主要依托于 Cloudflare 提供的公益资源，目前无任何收费计划或商业部署，现有功能使用不涉及任何支出。
-
-我们尊重社区的自由使用与衍生开发权利，但也强烈呼吁下游项目：
-
-- 不应以“OpenList”名义进行冒名宣传或获取商业利益；
-
-- 不得将基于 OpenList 的代码进行闭源分发或违反 AGPL 许可证条款。
-
-为了更好地维护生态健康发展，我们建议：
-
-- 明确注明项目来源，并以符合开源精神的方式选择适当的开源许可证；
-
-- 如涉及商业用途，请避免使用“OpenList”或任何会产生混淆的方式作为项目名称；
-
-- 若需使用本项目位于 OpenListTeam/Logo 下的素材，可在遵守协议的前提下进行修改后使用。
-
-感谢您对 OpenList 项目的支持与理解。
-
 ## 功能
 
 - [x] 多种存储
@@ -106,9 +78,10 @@ OpenList 是一个由 OpenList 团队独立维护的开源项目，遵循 AGPL-3
 
 ## 文档
 
-- 🌏 [国内站点](https://doc.oplist.org.cn)
-- 📘 [海外站点](https://doc.oplist.org)
-- 📚 [备用站点](https://doc.openlist.team)
+- 📘 [文档与安装指南](https://docs.oplist.org)
+- 📚 [备用文档站点](https://docs.openlist.team)
+- ⚖️ [使用条款](https://docs.oplist.org/terms)
+- 🔒 [隐私政策](https://docs.oplist.org/privacy)
 
 ## 演示
 

README_ja.md

@@ -20,34 +20,6 @@
 - [行動規範](./CODE_OF_CONDUCT.md)
 - [ライセンス](./LICENSE)
 
-## 免責事項
-
-OpenListは、OpenListチームが独立して維持するオープンソースプロジェクトであり、AGPL-3.0ライセンスに従い、完全なコードの開放性と変更の透明性を維持することに専念しています。
-
-コミュニティ内で、OpenListApp/OpenListAppなど、本プロジェクトと類似した名称を持つサードパーティプロジェクトや、同一または類似した命名を採用する有料専有ソフトウェアが出現していることを確認しています。ユーザーの誤解を避けるため、以下のように宣言いたします：
-
-- OpenListは、いかなるサードパーティ派生プロジェクトとも公式な関連性はありません。
-
-- 本プロジェクトのすべてのソフトウェア、コード、サービスはOpenListチームによって維持され、GitHubで無料で取得できます。
-
-- プロジェクトドキュメントとAPIサービスは主にCloudflareが提供する公益リソースに依存しており、現在有料プランや商業展開はなく、既存機能の使用に費用は発生しません。
-
-私たちはコミュニティの自由な使用と派生開発の権利を尊重しますが、下流プロジェクトに強く呼びかけます：
-
-- 「OpenList」の名前で偽装宣伝や商業利益を得るべきではありません；
-
-- OpenListベースのコードをクローズドソースで配布したり、AGPLライセンス条項に違反してはいけません。
-
-エコシステムの健全な発展をより良く維持するため、以下を推奨します：
-
-- プロジェクトの出典を明確に示し、オープンソース精神に合致する適切なオープンソースライセンスを選択する；
-
-- 商業用途が関わる場合は、「OpenList」や混乱を招く可能性のある名前をプロジェクト名として使用することを避ける；
-
-- OpenListTeam/Logo下の素材を使用する必要がある場合は、協定を遵守した上で修正して使用できます。
-
-OpenListプロジェクトへのご支援とご理解をありがとうございます。
-
 ## 特徴
 
 - [x] 複数ストレージ
@@ -106,9 +78,10 @@ OpenListプロジェクトへのご支援とご理解をありがとうござい
 
 ## ドキュメント
 
-- 📘 [グローバルサイト](https://doc.oplist.org)
-- 📚 [バックアップサイト](https://doc.openlist.team)
-- 🌏 [CNサイト](https://doc.oplist.org.cn)
+- 📘 [ドキュメント・インストールガイド](https://docs.oplist.org)
+- 📚 [バックアップドキュメントサイト](https://docs.openlist.team)
+- ⚖️ [利用規約](https://docs.oplist.org/terms)
+- 🔒 [プライバシーポリシー](https://docs.oplist.org/privacy)
 
 ## デモ
 

README_nl.md

@@ -20,34 +20,6 @@
 - [Gedragscode](./CODE_OF_CONDUCT.md)
 - [Licentie](./LICENSE)
 
-## Disclaimer
-
-OpenList is een open-source project dat onafhankelijk wordt onderhouden door het OpenList Team, volgend op de AGPL-3.0 licentie en toegewijd aan het behouden van volledige code openheid en transparantie van wijzigingen.
-
-We hebben gemerkt dat er in de gemeenschap enkele derde partij projecten zijn verschenen met namen vergelijkbaar met dit project, zoals OpenListApp/OpenListApp, evenals enkele betaalde eigendomssoftware die dezelfde of soortgelijke naamgeving gebruikt. Om verwarring bij gebruikers te voorkomen, verklaren we hierbij:
-
-- OpenList heeft geen officiële associatie met enige derde partij afgeleide projecten.
-
-- Alle software, code en diensten van dit project worden onderhouden door het OpenList Team en zijn gratis beschikbaar op GitHub.
-
-- Projectdocumentatie en API diensten zijn voornamelijk afhankelijk van liefdadigheidsbronnen verstrekt door Cloudflare. Er zijn momenteel geen betaalplannen of commerciële implementaties, en het gebruik van bestaande functies brengt geen kosten met zich mee.
-
-We respecteren de rechten van de gemeenschap voor vrij gebruik en afgeleide ontwikkeling, maar we roepen downstream projecten ook ten zeerste op:
-
-- Mogen niet de "OpenList" naam gebruiken voor namaakpromotie of commercieel gewin;
-
-- Mogen OpenList-gebaseerde code niet distribueren op een closed-source manier of AGPL licentievoorwaarden schenden.
-
-Om een gezonde ecosysteemontwikkeling beter te onderhouden, bevelen we aan:
-
-- Duidelijk de projectbron aangeven en passende open-source licenties kiezen in overeenstemming met de open-source geest;
-
-- Bij commercieel gebruik, vermijd het gebruik van "OpenList" of enige verwarrende naamgeving als projectnaam;
-
-- Als u materialen onder OpenListTeam/Logo moet gebruiken, kunt u deze wijzigen en gebruiken onder naleving van de overeenkomst.
-
-Dank u voor uw ondersteuning en begrip
-
 ## Functies
 
 - [x] Meerdere opslagmogelijkheden
@@ -106,9 +78,10 @@ Dank u voor uw ondersteuning en begrip
 
 ## Documentatie
 
-- 📘 [Global Site](https://doc.oplist.org)
-- 📚 [Backup Site](https://doc.openlist.team)
-- 🌏 [CN Site](https://doc.oplist.org.cn)
+- 📘 [Documentatie & Installatiegids](https://docs.oplist.org)
+- 📚 [Back-up documentatiesite](https://docs.openlist.team)
+- ⚖️ [Gebruiksvoorwaarden](https://docs.oplist.org/terms)
+- 🔒 [Privacybeleid](https://docs.oplist.org/privacy)
 
 ## Demo
 

build.sh

@@ -4,9 +4,6 @@ builtAt="$(date +'%F %T %z')"
 gitAuthor="The OpenList Projects Contributors <noreply@openlist.team>"
 gitCommit=$(git log --pretty=format:"%h" -1)
 
-# Set frontend repository, default to OpenListTeam/OpenList-Frontend
-frontendRepo="${FRONTEND_REPO:-OpenListTeam/OpenList-Frontend}"
-
 githubAuthArgs=""
 if [ -n "$GITHUB_TOKEN" ]; then
   githubAuthArgs="--header \"Authorization: Bearer $GITHUB_TOKEN\""
@@ -20,15 +17,15 @@ fi
 
 if [ "$1" = "dev" ]; then
   version="dev"
-  webVersion="rolling"
+  webVersion="dev"
 elif [ "$1" = "beta" ]; then
   version="beta"
-  webVersion="rolling"
+  webVersion="dev"
 else
   git tag -d beta || true
   # Always true if there's no tag
   version=$(git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0")
-  webVersion=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/$frontendRepo/releases/latest\"" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+  webVersion=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
 fi
 
 echo "backend version: $version"
@@ -41,28 +38,37 @@ fi
 
 ldflags="\
 -w -s \
--X 'github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$builtAt' \
--X 'github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=$gitAuthor' \
--X 'github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$gitCommit' \
--X 'github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$version' \
--X 'github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=$webVersion' \
+-X 'github.com/OpenListTeam/OpenList/internal/conf.BuiltAt=$builtAt' \
+-X 'github.com/OpenListTeam/OpenList/internal/conf.GitAuthor=$gitAuthor' \
+-X 'github.com/OpenListTeam/OpenList/internal/conf.GitCommit=$gitCommit' \
+-X 'github.com/OpenListTeam/OpenList/internal/conf.Version=$version' \
+-X 'github.com/OpenListTeam/OpenList/internal/conf.WebVersion=$webVersion' \
 "
 
-FetchWebRolling() {
-  pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/$frontendRepo/releases/tags/rolling\"")
+FetchWebDev() {
+  pre_release_tag=$(eval "curl -fsSL --max-time 2 $githubAuthArgs https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases" | jq -r 'map(select(.prerelease)) | first | .tag_name')
+  if [ -z "$pre_release_tag" ] || [ "$pre_release_tag" == "null" ]; then
+    # fall back to latest release
+    pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"")
+  else
+    pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/tags/$pre_release_tag\"")
+  fi
   pre_release_assets=$(echo "$pre_release_json" | jq -r '.assets[].browser_download_url')
   
-  # There is no lite for rolling
-  pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist" | grep -v "lite" | grep "\.tar\.gz$")
+  if [ "$useLite" = true ]; then
+    pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist-lite" | grep "\.tar\.gz$")
+  else
+    pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist" | grep -v "lite" | grep "\.tar\.gz$")
+  fi
   
-  curl -fsSL "$pre_release_tar_url" -o dist.tar.gz
+  curl -fsSL "$pre_release_tar_url" -o web-dist-dev.tar.gz
   rm -rf public/dist && mkdir -p public/dist
-  tar -zxvf dist.tar.gz -C public/dist
-  rm -rf dist.tar.gz
+  tar -zxvf web-dist-dev.tar.gz -C public/dist
+  rm -rf web-dist-dev.tar.gz
 }
 
 FetchWebRelease() {
-  release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/$frontendRepo/releases/latest\"")
+  release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"")
   release_assets=$(echo "$release_json" | jq -r '.assets[].browser_download_url')
   
   if [ "$useLite" = true ]; then
@@ -89,45 +95,6 @@ BuildWinArm64() {
   go build -o "$1" -ldflags="$ldflags" -tags=jsoniter .
 }
 
-BuildWin7() {
-  # Setup Win7 Go compiler (patched version that supports Windows 7)
-  go_version=$(go version | grep -o 'go[0-9]\+\.[0-9]\+\.[0-9]\+' | sed 's/go//')
-  echo "Detected Go version: $go_version"
-  
-  curl -fsSL --retry 3 -o go-win7.zip -H "Authorization: Bearer $GITHUB_TOKEN" \
-    "https://github.com/XTLS/go-win7/releases/download/patched-${go_version}/go-for-win7-linux-amd64.zip"
-  
-  rm -rf go-win7
-  unzip go-win7.zip -d go-win7
-  rm go-win7.zip
-  
-  # Set permissions for all wrapper files
-  chmod +x ./wrapper/zcc-win7
-  chmod +x ./wrapper/zcxx-win7
-  chmod +x ./wrapper/zcc-win7-386
-  chmod +x ./wrapper/zcxx-win7-386
-  
-  # Build for both 386 and amd64 architectures
-  for arch in "386" "amd64"; do
-    echo "building for windows7-${arch}"
-    export GOOS=windows
-    export GOARCH=${arch}
-    export CGO_ENABLED=1
-    
-    # Use architecture-specific wrapper files
-    if [ "$arch" = "386" ]; then
-      export CC=$(pwd)/wrapper/zcc-win7-386
-      export CXX=$(pwd)/wrapper/zcxx-win7-386
-    else
-      export CC=$(pwd)/wrapper/zcc-win7
-      export CXX=$(pwd)/wrapper/zcxx-win7
-    fi
-    
-    # Use the patched Go compiler for Win7 compatibility
-    $(pwd)/go-win7/bin/go build -o "${1}-${arch}.exe" -ldflags="$ldflags" -tags=jsoniter .
-  done
-}
-
 BuildDev() {
   rm -rf .git/
   mkdir -p "dist"
@@ -154,8 +121,8 @@ BuildDev() {
   xgo -targets=windows/amd64,darwin/amd64,darwin/arm64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   mv "$appName"-* dist
   cd dist
-  # cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
-  # upx -9 ./"$appName"-windows-amd64-upx.exe
+  cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
+  upx -9 ./"$appName"-windows-amd64-upx.exe
   find . -type f -print0 | xargs -0 md5sum >md5.txt
   cat md5.txt
 }
@@ -167,7 +134,7 @@ BuildDocker() {
 PrepareBuildDockerMusl() {
   mkdir -p build/musl-libs
   BASE="https://github.com/OpenListTeam/musl-compilers/releases/latest/download/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross loongarch64-linux-musl-cross) ## Disable s390x-linux-musl-cross builds
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross)
   for i in "${FILES[@]}"; do
     url="${BASE}${i}.tgz"
     lib_tgz="build/${i}.tgz"
@@ -186,8 +153,8 @@ BuildDockerMultiplatform() {
   docker_lflags="--extldflags '-static -fpic' $ldflags"
   export CGO_ENABLED=1
 
-  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-riscv64 linux-ppc64le linux-loong64) ## Disable linux-s390x builds
-  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc riscv64-linux-musl-gcc powerpc64le-linux-musl-gcc loongarch64-linux-musl-gcc) ## Disable s390x-linux-musl-gcc builds
+  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x linux-riscv64 linux-ppc64le)
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc s390x-linux-musl-gcc riscv64-linux-musl-gcc powerpc64le-linux-musl-gcc)
   for i in "${!OS_ARCHES[@]}"; do
     os_arch=${OS_ARCHES[$i]}
     cgo_cc=${CGO_ARGS[$i]}
@@ -219,171 +186,12 @@ BuildRelease() {
   rm -rf .git/
   mkdir -p "build"
   BuildWinArm64 ./build/"$appName"-windows-arm64.exe
-  BuildWin7 ./build/"$appName"-windows7
   xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   # why? Because some target platforms seem to have issues with upx compression
-  # upx -9 ./"$appName"-linux-amd64
-  # cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
-  # upx -9 ./"$appName"-windows-amd64-upx.exe
+  upx -9 ./"$appName"-linux-amd64
+  cp ./"$appName"-windows-amd64.exe ./"$appName"-windows-amd64-upx.exe
+  upx -9 ./"$appName"-windows-amd64-upx.exe
   mv "$appName"-* build
-  
-  # Build LoongArch with glibc (both old world abi1.0 and new world abi2.0)
-  # Separate from musl builds to avoid cache conflicts
-  BuildLoongGLIBC ./build/$appName-linux-loong64-abi1.0 abi1.0
-  BuildLoongGLIBC ./build/$appName-linux-loong64 abi2.0
-}
-
-BuildLoongGLIBC() {
-  local target_abi="$2"
-  local output_file="$1"
-  local oldWorldGoVersion="1.24.3"
-  
-  if [ "$target_abi" = "abi1.0" ]; then
-    echo building for linux-loong64-abi1.0
-  else
-    echo building for linux-loong64-abi2.0
-    target_abi="abi2.0"  # Default to abi2.0 if not specified
-  fi
-  
-  # Note: No longer need global cache cleanup since ABI1.0 uses isolated cache directory
-  echo "Using optimized cache strategy: ABI1.0 has isolated cache, ABI2.0 uses standard cache"
-  
-  if [ "$target_abi" = "abi1.0" ]; then
-    # Setup abi1.0 toolchain and patched Go compiler similar to cgo-action implementation
-    echo "Setting up Loongson old-world ABI1.0 toolchain and patched Go compiler..."
-    
-    # Download and setup patched Go compiler for old-world
-    if ! curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-      "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250722/go${oldWorldGoVersion}.linux-amd64.tar.gz" \
-      -o go-loong64-abi1.0.tar.gz; then
-      echo "Error: Failed to download patched Go compiler for old-world ABI1.0"
-      if [ -n "$GITHUB_TOKEN" ]; then
-        echo "Error output from curl:"
-        curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-          "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250722/go${oldWorldGoVersion}.linux-amd64.tar.gz" \
-          -o go-loong64-abi1.0.tar.gz || true
-      fi
-      return 1
-    fi
-    
-    rm -rf go-loong64-abi1.0
-    mkdir go-loong64-abi1.0
-    if ! tar -xzf go-loong64-abi1.0.tar.gz -C go-loong64-abi1.0 --strip-components=1; then
-      echo "Error: Failed to extract patched Go compiler"
-      return 1
-    fi
-    rm go-loong64-abi1.0.tar.gz
-    
-    # Download and setup GCC toolchain for old-world
-    if ! curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-      "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250722/loongson-gnu-toolchain-8.3.novec-x86_64-loongarch64-linux-gnu-rc1.1.tar.xz" \
-      -o gcc8-loong64-abi1.0.tar.xz; then
-      echo "Error: Failed to download GCC toolchain for old-world ABI1.0"
-      if [ -n "$GITHUB_TOKEN" ]; then
-        echo "Error output from curl:"
-        curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-          "https://github.com/loong64/loong64-abi1.0-toolchains/releases/download/20250722/loongson-gnu-toolchain-8.3.novec-x86_64-loongarch64-linux-gnu-rc1.1.tar.xz" \
-          -o gcc8-loong64-abi1.0.tar.xz || true
-      fi
-      return 1
-    fi
-    
-    rm -rf gcc8-loong64-abi1.0
-    mkdir gcc8-loong64-abi1.0
-    if ! tar -Jxf gcc8-loong64-abi1.0.tar.xz -C gcc8-loong64-abi1.0 --strip-components=1; then
-      echo "Error: Failed to extract GCC toolchain"
-      return 1
-    fi
-    rm gcc8-loong64-abi1.0.tar.xz
-    
-    # Setup separate cache directory for ABI1.0 to avoid cache pollution
-    abi1_cache_dir="$(pwd)/go-loong64-abi1.0-cache"
-    mkdir -p "$abi1_cache_dir"
-    echo "Using separate cache directory for ABI1.0: $abi1_cache_dir"
-    
-    # Use patched Go compiler for old-world build (critical for ABI1.0 compatibility)
-    echo "Building with patched Go compiler for old-world ABI1.0..."
-    echo "Using isolated cache directory: $abi1_cache_dir"
-    
-    # Use env command to set environment variables locally without affecting global environment
-    if ! env GOOS=linux GOARCH=loong64 \
-        CC="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc" \
-        CXX="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-g++" \
-        CGO_ENABLED=1 \
-        GOCACHE="$abi1_cache_dir" \
-        $(pwd)/go-loong64-abi1.0/bin/go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-      echo "Error: Build failed with patched Go compiler"
-      echo "Attempting retry with cache cleanup..."
-      env GOCACHE="$abi1_cache_dir" $(pwd)/go-loong64-abi1.0/bin/go clean -cache
-      if ! env GOOS=linux GOARCH=loong64 \
-          CC="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc" \
-          CXX="$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-g++" \
-          CGO_ENABLED=1 \
-          GOCACHE="$abi1_cache_dir" \
-          $(pwd)/go-loong64-abi1.0/bin/go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-        echo "Error: Build failed again after cache cleanup"
-        echo "Build environment details:"
-        echo "GOOS=linux"
-        echo "GOARCH=loong64" 
-        echo "CC=$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc"
-        echo "CXX=$(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-g++"
-        echo "CGO_ENABLED=1"
-        echo "GOCACHE=$abi1_cache_dir"
-        echo "Go version: $($(pwd)/go-loong64-abi1.0/bin/go version)"
-        echo "GCC version: $($(pwd)/gcc8-loong64-abi1.0/bin/loongarch64-linux-gnu-gcc --version | head -1)"
-        return 1
-      fi
-    fi
-  else
-    # Setup abi2.0 toolchain for new world glibc build
-    echo "Setting up new-world ABI2.0 toolchain..."
-    if ! curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-      "https://github.com/loong64/cross-tools/releases/download/20250507/x86_64-cross-tools-loongarch64-unknown-linux-gnu-legacy.tar.xz" \
-      -o gcc12-loong64-abi2.0.tar.xz; then
-      echo "Error: Failed to download GCC toolchain for new-world ABI2.0"
-      if [ -n "$GITHUB_TOKEN" ]; then
-        echo "Error output from curl:"
-        curl -fsSL --retry 3 -H "Authorization: Bearer $GITHUB_TOKEN" \
-          "https://github.com/loong64/cross-tools/releases/download/20250507/x86_64-cross-tools-loongarch64-unknown-linux-gnu-legacy.tar.xz" \
-          -o gcc12-loong64-abi2.0.tar.xz || true
-      fi
-      return 1
-    fi
-    
-    rm -rf gcc12-loong64-abi2.0
-    mkdir gcc12-loong64-abi2.0
-    if ! tar -Jxf gcc12-loong64-abi2.0.tar.xz -C gcc12-loong64-abi2.0 --strip-components=1; then
-      echo "Error: Failed to extract GCC toolchain"
-      return 1
-    fi
-    rm gcc12-loong64-abi2.0.tar.xz
-    
-    export GOOS=linux
-    export GOARCH=loong64
-    export CC=$(pwd)/gcc12-loong64-abi2.0/bin/loongarch64-unknown-linux-gnu-gcc
-    export CXX=$(pwd)/gcc12-loong64-abi2.0/bin/loongarch64-unknown-linux-gnu-g++
-    export CGO_ENABLED=1
-    
-    # Use standard Go compiler for new-world build
-    echo "Building with standard Go compiler for new-world ABI2.0..."
-    if ! go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-      echo "Error: Build failed with standard Go compiler"
-      echo "Attempting retry with cache cleanup..."
-      go clean -cache
-      if ! go build -a -o "$output_file" -ldflags="$ldflags" -tags=jsoniter .; then
-        echo "Error: Build failed again after cache cleanup"
-        echo "Build environment details:"
-        echo "GOOS=$GOOS"
-        echo "GOARCH=$GOARCH"
-        echo "CC=$CC"
-        echo "CXX=$CXX"
-        echo "CGO_ENABLED=$CGO_ENABLED"
-        echo "Go version: $(go version)"
-        echo "GCC version: $($CC --version | head -1)"
-        return 1
-      fi
-    fi
-  fi
 }
 
 BuildReleaseLinuxMusl() {
@@ -441,7 +249,6 @@ BuildReleaseLinuxMuslArm() {
   done
 }
 
-
 BuildReleaseAndroid() {
   rm -rf .git/
   mkdir -p "build"
@@ -471,7 +278,6 @@ BuildReleaseFreeBSD() {
   freebsd_version=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/freebsd/freebsd-src/tags\"" | \
     jq -r '.[].name' | \
     grep '^release/14\.' | \
-    grep -v -- '-p[0-9]*$' | \
     sort -V | \
     tail -1 | \
     sed 's/release\///' | \
@@ -537,7 +343,7 @@ MakeRelease() {
     tar -czvf compress/"$i$liteSuffix".tar.gz "$appName"
     rm -f "$appName"
   done
-  for i in $(find . -type f \( -name "$appName-windows-*" -o -name "$appName-windows7-*" \)); do
+  for i in $(find . -type f -name "$appName-windows-*"); do
     cp "$i" "$appName".exe
     zip compress/$(echo $i | sed 's/\.[^.]*$//')$liteSuffix.zip "$appName".exe
     rm -f "$appName".exe
@@ -584,7 +390,7 @@ for arg in "$@"; do
 done
 
 if [ "$buildType" = "dev" ]; then
-  FetchWebRolling
+  FetchWebDev
   if [ "$dockerType" = "docker" ]; then
     BuildDocker
   elif [ "$dockerType" = "docker-multiplatform" ]; then
@@ -596,7 +402,7 @@ if [ "$buildType" = "dev" ]; then
   fi
 elif [ "$buildType" = "release" -o "$buildType" = "beta" ]; then
   if [ "$buildType" = "beta" ]; then
-    FetchWebRolling
+    FetchWebDev
   else
     FetchWebRelease
   fi
@@ -677,5 +483,4 @@ else
   echo -e "  $0 release"
   echo -e "  $0 release lite"
   echo -e "  $0 release docker lite"
-  echo -e "  $0 release linux_musl"
 fi

cmd/admin.go

@@ -4,8 +4,6 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/internal/setting"
@@ -26,11 +24,10 @@ var AdminCmd = &cobra.Command{
 		if err != nil {
 			utils.Log.Errorf("failed get admin user: %+v", err)
 		} else {
-			utils.Log.Infof("get admin user from CLI")
-			fmt.Println("Admin user's username:", admin.Username)
-			fmt.Println("The password can only be output at the first startup, and then stored as a hash value, which cannot be reversed")
-			fmt.Println("You can reset the password with a random string by running [openlist admin random]")
-			fmt.Println("You can also set a new password by running [openlist admin set NEW_PASSWORD]")
+			utils.Log.Infof("Admin user's username: %s", admin.Username)
+			utils.Log.Infof("The password can only be output at the first startup, and then stored as a hash value, which cannot be reversed")
+			utils.Log.Infof("You can reset the password with a random string by running [openlist admin random]")
+			utils.Log.Infof("You can also set a new password by running [openlist admin set NEW_PASSWORD]")
 		}
 	},
 }
@@ -39,7 +36,6 @@ var RandomPasswordCmd = &cobra.Command{
 	Use:   "random",
 	Short: "Reset admin user's password to a random string",
 	Run: func(cmd *cobra.Command, args []string) {
-		utils.Log.Infof("reset admin user's password to a random string from CLI")
 		newPwd := random.String(8)
 		setAdminPassword(newPwd)
 	},
@@ -48,12 +44,12 @@ var RandomPasswordCmd = &cobra.Command{
 var SetPasswordCmd = &cobra.Command{
 	Use:   "set",
 	Short: "Set admin user's password",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
-			return fmt.Errorf("Please enter the new password")
+			utils.Log.Errorf("Please enter the new password")
+			return
 		}
 		setAdminPassword(args[0])
-		return nil
 	},
 }
 
@@ -64,8 +60,7 @@ var ShowTokenCmd = &cobra.Command{
 		Init()
 		defer Release()
 		token := setting.GetStr(conf.Token)
-		utils.Log.Infof("show admin token from CLI")
-		fmt.Println("Admin token:", token)
+		utils.Log.Infof("Admin token: %s", token)
 	},
 }
 
@@ -82,10 +77,9 @@ func setAdminPassword(pwd string) {
 		utils.Log.Errorf("failed update admin user: %+v", err)
 		return
 	}
-	utils.Log.Infof("admin user has been update from CLI")
-	fmt.Println("admin user has been updated:")
-	fmt.Println("username:", admin.Username)
-	fmt.Println("password:", pwd)
+	utils.Log.Infof("admin user has been updated:")
+	utils.Log.Infof("username: %s", admin.Username)
+	utils.Log.Infof("password: %s", pwd)
 	DelAdminCacheOnline()
 }
 

cmd/cancel2FA.go

@@ -4,8 +4,6 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/spf13/cobra"
@@ -26,8 +24,7 @@ var Cancel2FACmd = &cobra.Command{
 			if err != nil {
 				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
 			} else {
-				utils.Log.Infof("2FA is canceled from CLI")
-				fmt.Println("2FA canceled")
+				utils.Log.Info("2FA canceled")
 				DelAdminCacheOnline()
 			}
 		}

cmd/root.go

@@ -16,7 +16,7 @@ var RootCmd = &cobra.Command{
 	Short: "A file list program that supports multiple storage.",
 	Long: `A file list program that supports multiple storage,
 built with love by OpenListTeam.
-Complete documentation is available at https://doc.oplist.org/`,
+Complete documentation is available at https://docs.openlist.team/`,
 }
 
 func Execute() {

cmd/server.go

@@ -19,7 +19,6 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/fs"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/OpenListTeam/OpenList/v4/server"
-	"github.com/OpenListTeam/OpenList/v4/server/middlewares"
 	"github.com/OpenListTeam/sftpd-openlist"
 	ftpserver "github.com/fclairamb/ftpserverlib"
 	"github.com/gin-gonic/gin"
@@ -48,15 +47,7 @@ the address is defined in config file`,
 			gin.SetMode(gin.ReleaseMode)
 		}
 		r := gin.New()
-
-		// gin log
-		if conf.Conf.Log.Filter.Enable {
-			r.Use(middlewares.FilteredLogger())
-		} else {
-			r.Use(gin.LoggerWithWriter(log.StandardLogger().Out))
-		}
-		r.Use(gin.RecoveryWithWriter(log.StandardLogger().Out))
-
+		r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
 		server.Init(r)
 		var httpHandler http.Handler = r
 		if conf.Conf.Scheme.EnableH2c {
@@ -65,7 +56,6 @@ the address is defined in config file`,
 		var httpSrv, httpsSrv, unixSrv *http.Server
 		if conf.Conf.Scheme.HttpPort != -1 {
 			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpPort)
-			fmt.Printf("start HTTP server @ %s\n", httpBase)
 			utils.Log.Infof("start HTTP server @ %s", httpBase)
 			httpSrv = &http.Server{Addr: httpBase, Handler: httpHandler}
 			go func() {
@@ -77,7 +67,6 @@ the address is defined in config file`,
 		}
 		if conf.Conf.Scheme.HttpsPort != -1 {
 			httpsBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpsPort)
-			fmt.Printf("start HTTPS server @ %s\n", httpsBase)
 			utils.Log.Infof("start HTTPS server @ %s", httpsBase)
 			httpsSrv = &http.Server{Addr: httpsBase, Handler: r}
 			go func() {
@@ -88,7 +77,6 @@ the address is defined in config file`,
 			}()
 		}
 		if conf.Conf.Scheme.UnixFile != "" {
-			fmt.Printf("start unix server @ %s\n", conf.Conf.Scheme.UnixFile)
 			utils.Log.Infof("start unix server @ %s", conf.Conf.Scheme.UnixFile)
 			unixSrv = &http.Server{Handler: httpHandler}
 			go func() {
@@ -117,7 +105,6 @@ the address is defined in config file`,
 			s3r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
 			server.InitS3(s3r)
 			s3Base := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.S3.Port)
-			fmt.Printf("start S3 server @ %s\n", s3Base)
 			utils.Log.Infof("start S3 server @ %s", s3Base)
 			go func() {
 				var err error
@@ -142,7 +129,6 @@ the address is defined in config file`,
 			if err != nil {
 				utils.Log.Fatalf("failed to start ftp driver: %s", err.Error())
 			} else {
-				fmt.Printf("start ftp server on %s\n", conf.Conf.FTP.Listen)
 				utils.Log.Infof("start ftp server on %s", conf.Conf.FTP.Listen)
 				go func() {
 					ftpServer = ftpserver.NewFtpServer(ftpDriver)
@@ -161,7 +147,6 @@ the address is defined in config file`,
 			if err != nil {
 				utils.Log.Fatalf("failed to start sftp driver: %s", err.Error())
 			} else {
-				fmt.Printf("start sftp server on %s", conf.Conf.SFTP.Listen)
 				utils.Log.Infof("start sftp server on %s", conf.Conf.SFTP.Listen)
 				go func() {
 					sftpServer = sftpd.NewSftpServer(sftpDriver)

cmd/storage.go

@@ -4,7 +4,6 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 
@@ -23,61 +22,28 @@ var storageCmd = &cobra.Command{
 }
 
 var disableStorageCmd = &cobra.Command{
-	Use:   "disable [mount path]",
-	Short: "Disable a storage by mount path",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	Use:   "disable",
+	Short: "Disable a storage",
+	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) < 1 {
-			return fmt.Errorf("mount path is required")
+			utils.Log.Errorf("mount path is required")
+			return
 		}
 		mountPath := args[0]
 		Init()
 		defer Release()
 		storage, err := db.GetStorageByMountPath(mountPath)
 		if err != nil {
-			return fmt.Errorf("failed to query storage: %+v", err)
-		}
-		storage.Disabled = true
-		err = db.UpdateStorage(storage)
-		if err != nil {
-			return fmt.Errorf("failed to update storage: %+v", err)
-		}
-		utils.Log.Infof("Storage with mount path [%s] has been disabled from CLI", mountPath)
-		fmt.Printf("Storage with mount path [%s] has been disabled\n", mountPath)
-		return nil
-	},
-}
-
-var deleteStorageCmd = &cobra.Command{
-	Use:   "delete [id]",
-	Short: "Delete a storage by id",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		if len(args) < 1 {
-			return fmt.Errorf("id is required")
-		}
-		id, err := strconv.Atoi(args[0])
-		if err != nil {
-			return fmt.Errorf("id must be a number")
-		}
-
-		if force, _ := cmd.Flags().GetBool("force"); force {
-			fmt.Printf("Are you sure you want to delete storage with id [%d]? [y/N]: ", id)
-			var confirm string
-			fmt.Scanln(&confirm)
-			if confirm != "y" && confirm != "Y" {
-				fmt.Println("Delete operation cancelled.")
-				return nil
+			utils.Log.Errorf("failed to query storage: %+v", err)
+		} else {
+			storage.Disabled = true
+			err = db.UpdateStorage(storage)
+			if err != nil {
+				utils.Log.Errorf("failed to update storage: %+v", err)
+			} else {
+				utils.Log.Infof("Storage with mount path [%s] have been disabled", mountPath)
 			}
 		}
-
-		Init()
-		defer Release()
-		err = db.DeleteStorageById(uint(id))
-		if err != nil {
-			return fmt.Errorf("failed to delete storage by id: %+v", err)
-		}
-		utils.Log.Infof("Storage with id [%d] have been deleted from CLI", id)
-		fmt.Printf("Storage with id [%d] have been deleted\n", id)
-		return nil
 	},
 }
 
@@ -122,14 +88,14 @@ var storageTableHeight int
 var listStorageCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List all storages",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	Run: func(cmd *cobra.Command, args []string) {
 		Init()
 		defer Release()
 		storages, _, err := db.GetStorages(1, -1)
 		if err != nil {
-			return fmt.Errorf("failed to query storages: %+v", err)
+			utils.Log.Errorf("failed to query storages: %+v", err)
 		} else {
-			fmt.Printf("Found %d storages\n", len(storages))
+			utils.Log.Infof("Found %d storages", len(storages))
 			columns := []table.Column{
 				{Title: "ID", Width: 4},
 				{Title: "Driver", Width: 16},
@@ -172,11 +138,10 @@ var listStorageCmd = &cobra.Command{
 
 			m := model{t}
 			if _, err := tea.NewProgram(m).Run(); err != nil {
-				fmt.Printf("failed to run program: %+v\n", err)
+				utils.Log.Errorf("failed to run program: %+v", err)
 				os.Exit(1)
 			}
 		}
-		return nil
 	},
 }
 
@@ -186,8 +151,6 @@ func init() {
 	storageCmd.AddCommand(disableStorageCmd)
 	storageCmd.AddCommand(listStorageCmd)
 	storageCmd.PersistentFlags().IntVarP(&storageTableHeight, "height", "H", 10, "Table height")
-	storageCmd.AddCommand(deleteStorageCmd)
-	deleteStorageCmd.Flags().BoolP("force", "f", false, "Force delete without confirmation")
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command

docker-compose.yml

@@ -6,9 +6,10 @@ services:
     ports:
       - '5244:5244'
       - '5245:5245'
-    user: '0:0'
     environment:
+      - PUID=0
+      - PGID=0
       - UMASK=022
-      - TZ=Asia/Shanghai
+      - TZ=UTC
     container_name: openlist
     image: 'openlistteam/openlist:latest'

drivers/115/appver.go

@@ -1,60 +1,43 @@
 package _115
 
 import (
-	"errors"
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
 	log "github.com/sirupsen/logrus"
 )
 
 var (
 	md5Salt = "Qclm8MGWUv59TnrR0XPg"
-	appVer  = "35.6.0.3"
+	appVer  = "27.0.5.7"
 )
 
-func (d *Pan115) getAppVersion() (string, error) {
-	result := VersionResp{}
-	res, err := base.RestyClient.R().Get(driver115.ApiGetVersion)
+func (d *Pan115) getAppVersion() ([]driver115.AppVersion, error) {
+	result := driver115.VersionResp{}
+	resp, err := base.RestyClient.R().Get(driver115.ApiGetVersion)
+
+	err = driver115.CheckErr(err, &result, resp)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
-	err = utils.Json.Unmarshal(res.Body(), &result)
-	if err != nil {
-		return "", err
-	}
-	if len(result.Error) > 0 {
-		return "", errors.New(result.Error)
-	}
-	return result.Data.Win.Version, nil
+
+	return result.Data.GetAppVersions(), nil
 }
 
 func (d *Pan115) getAppVer() string {
-	ver, err := d.getAppVersion()
+	// todo add some cache？
+	vers, err := d.getAppVersion()
 	if err != nil {
 		log.Warnf("[115] get app version failed: %v", err)
 		return appVer
 	}
-	if len(ver) > 0 {
-		return ver
+	for _, ver := range vers {
+		if ver.AppName == "win" {
+			return ver.Version
+		}
 	}
 	return appVer
 }
 
 func (d *Pan115) initAppVer() {
 	appVer = d.getAppVer()
-	log.Debugf("use app version: %v", appVer)
-}
-
-type VersionResp struct {
-	Error string   `json:"error,omitempty"`
-	Data  Versions `json:"data"`
-}
-
-type Versions struct {
-	Win Version `json:"win"`
-}
-
-type Version struct {
-	Version string `json:"version_code"`
 }

drivers/115/driver.go

@@ -186,7 +186,7 @@ func (d *Pan115) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	preHash = strings.ToUpper(preHash)
 	fullHash := stream.GetHash().GetHash(utils.SHA1)
 	if len(fullHash) != utils.SHA1.Width {
-		_, fullHash, err = streamPkg.CacheFullAndHash(stream, &up, utils.SHA1)
+		_, fullHash, err = streamPkg.CacheFullInTempFileAndHash(stream, utils.SHA1)
 		if err != nil {
 			return nil, err
 		}

drivers/115/meta.go

@@ -18,6 +18,7 @@ var config = driver.Config{
 	Name:        "115 Cloud",
 	DefaultRoot: "0",
 	// OnlyProxy:   true,
+	// OnlyLocal:         true,
 	// NoOverwriteUpload: true,
 }
 

drivers/115/util.go

@@ -321,7 +321,7 @@ func (d *Pan115) UploadByMultipart(ctx context.Context, params *driver115.Upload
 		err       error
 	)
 
-	tmpF, err := s.CacheFullAndWriter(&up, nil)
+	tmpF, err := s.CacheFullInTempFile()
 	if err != nil {
 		return nil, err
 	}

drivers/115_open/driver.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	sdk "github.com/OpenListTeam/115-sdk-go"
 	"github.com/OpenListTeam/OpenList/v4/cmd/flags"
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
@@ -17,6 +16,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
+	sdk "github.com/OpenListTeam/115-sdk-go"
 	"golang.org/x/time/rate"
 )
 
@@ -131,23 +131,6 @@ func (d *Open115) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 	}, nil
 }
 
-func (d *Open115) GetObjInfo(ctx context.Context, path string) (model.Obj, error) {
-	if err := d.WaitLimit(ctx); err != nil {
-		return nil, err
-	}
-	resp, err := d.client.GetFolderInfoByPath(ctx, path)
-	if err != nil {
-		return nil, err
-	}
-	return &Obj{
-		Fid:  resp.FileID,
-		Fn:   resp.FileName,
-		Fc:   resp.FileCategory,
-		Sha1: resp.Sha1,
-		Pc:   resp.PickCode,
-	}, nil
-}
-
 func (d *Open115) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
 	if err := d.WaitLimit(ctx); err != nil {
 		return nil, err
@@ -239,7 +222,7 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 	}
 	sha1 := file.GetHash().GetHash(utils.SHA1)
 	if len(sha1) != utils.SHA1.Width {
-		_, sha1, err = stream.CacheFullAndHash(file, &up, utils.SHA1)
+		_, sha1, err = stream.CacheFullInTempFileAndHash(file, utils.SHA1)
 		if err != nil {
 			return err
 		}
@@ -269,7 +252,6 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 		return err
 	}
 	if resp.Status == 2 {
-		up(100)
 		return nil
 	}
 	// 2. two way verify
@@ -304,7 +286,6 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 			return err
 		}
 		if resp.Status == 2 {
-			up(100)
 			return nil
 		}
 	}
@@ -321,22 +302,6 @@ func (d *Open115) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 	return nil
 }
 
-func (d *Open115) OfflineDownload(ctx context.Context, uris []string, dstDir model.Obj) ([]string, error) {
-	return d.client.AddOfflineTaskURIs(ctx, uris, dstDir.GetID())
-}
-
-func (d *Open115) DeleteOfflineTask(ctx context.Context, infoHash string, deleteFiles bool) error {
-	return d.client.DeleteOfflineTask(ctx, infoHash, deleteFiles)
-}
-
-func (d *Open115) OfflineList(ctx context.Context) (*sdk.OfflineTaskListResp, error) {
-	resp, err := d.client.OfflineTaskList(ctx, 1)
-	if err != nil {
-		return nil, err
-	}
-	return resp, nil
-}
-
 // func (d *Open115) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
 // 	// TODO get archive file meta-info, return errs.NotImplement to use an internal archive tool, optional
 // 	return nil, errs.NotImplement

drivers/115_open/meta.go

@@ -11,14 +11,23 @@ type Addition struct {
 	// define other
 	OrderBy        string  `json:"order_by" type:"select" options:"file_name,file_size,user_utime,file_type"`
 	OrderDirection string  `json:"order_direction" type:"select" options:"asc,desc"`
-	LimitRate      float64 `json:"limit_rate" type:"float" default:"1" help:"limit all api request rate ([limit]r/1s)"`
+	LimitRate      float64  `json:"limit_rate,string" type:"float" default:"1" help:"limit all api request rate ([limit]r/1s)"`
 	AccessToken    string  `json:"access_token" required:"true"`
 	RefreshToken   string  `json:"refresh_token" required:"true"`
 }
 
 var config = driver.Config{
-	Name:        "115 Open",
-	DefaultRoot: "0",
+	Name:              "115 Open",
+	LocalSort:         false,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          false,
+	NeedMs:            false,
+	DefaultRoot:       "0",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/115_open/upload.go

@@ -6,13 +6,12 @@ import (
 	"io"
 	"time"
 
-	sdk "github.com/OpenListTeam/115-sdk-go"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	streamPkg "github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/avast/retry-go"
+	sdk "github.com/OpenListTeam/115-sdk-go"
 )
 
 func calPartSize(fileSize int64) int64 {
@@ -70,6 +69,9 @@ func (d *Open115) singleUpload(ctx context.Context, tempF model.File, tokenResp
 // }
 
 func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer, up driver.UpdateProgress, tokenResp *sdk.UploadGetTokenResp, initResp *sdk.UploadInitResp) error {
+	fileSize := stream.GetSize()
+	chunkSize := calPartSize(fileSize)
+
 	ossClient, err := oss.New(tokenResp.Endpoint, tokenResp.AccessKeyId, tokenResp.AccessKeySecret, oss.SecurityToken(tokenResp.SecurityToken))
 	if err != nil {
 		return err
@@ -84,13 +86,6 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 		return err
 	}
 
-	fileSize := stream.GetSize()
-	chunkSize := calPartSize(fileSize)
-	ss, err := streamPkg.NewStreamSectionReader(stream, int(chunkSize), &up)
-	if err != nil {
-		return err
-	}
-
 	partNum := (stream.GetSize() + chunkSize - 1) / chunkSize
 	parts := make([]oss.UploadPart, partNum)
 	offset := int64(0)
@@ -103,13 +98,10 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 		if i == partNum {
 			partSize = fileSize - (i-1)*chunkSize
 		}
-		rd, err := ss.GetSectionReader(offset, partSize)
-		if err != nil {
-			return err
-		}
-		rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
+		rd := utils.NewMultiReadable(io.LimitReader(stream, partSize))
 		err = retry.Do(func() error {
-			rd.Seek(0, io.SeekStart)
+			_ = rd.Reset()
+			rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
 			part, err := bucket.UploadPart(imur, rateLimitedRd, partSize, int(i))
 			if err != nil {
 				return err
@@ -120,7 +112,6 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 			retry.Attempts(3),
 			retry.DelayType(retry.BackOffDelay),
 			retry.Delay(time.Second))
-		ss.FreeSectionReader(rd)
 		if err != nil {
 			return err
 		}
@@ -130,7 +121,7 @@ func (d *Open115) multpartUpload(ctx context.Context, stream model.FileStreamer,
 		} else {
 			offset += partSize
 		}
-		up(float64(offset) * 100 / float64(fileSize))
+		up(float64(offset) / float64(fileSize))
 	}
 
 	// callbackRespBytes := make([]byte, 1024)

drivers/115_share/meta.go

@@ -19,7 +19,12 @@ type Addition struct {
 var config = driver.Config{
 	Name:        "115 Share",
 	DefaultRoot: "0",
-	NoUpload:    true,
+	// OnlyProxy:   true,
+	// OnlyLocal:         true,
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: true,
+	NoUpload:          true,
 }
 
 func init() {

drivers/123/driver.go

@@ -64,6 +64,14 @@ func (d *Pan123) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 
 func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	if f, ok := file.(File); ok {
+		//var resp DownResp
+		var headers map[string]string
+		if !utils.IsLocalIPAddr(args.IP) {
+			headers = map[string]string{
+				//"X-Real-IP":       "1.1.1.1",
+				"X-Forwarded-For": args.IP,
+			}
+		}
 		data := base.Json{
 			"driveId":   0,
 			"etag":      f.Etag,
@@ -75,27 +83,25 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		}
 		resp, err := d.Request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
 
-			req.SetBody(data)
+			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {
 			return nil, err
 		}
 		downloadUrl := utils.Json.Get(resp, "data", "DownloadUrl").ToString()
-		ou, err := url.Parse(downloadUrl)
+		u, err := url.Parse(downloadUrl)
 		if err != nil {
 			return nil, err
 		}
-		u_ := ou.String()
-		nu := ou.Query().Get("params")
+		nu := u.Query().Get("params")
 		if nu != "" {
 			du, _ := base64.StdEncoding.DecodeString(nu)
-			u, err := url.Parse(string(du))
+			u, err = url.Parse(string(du))
 			if err != nil {
 				return nil, err
 			}
-			u_ = u.String()
 		}
-
+		u_ := u.String()
 		log.Debug("download url: ", u_)
 		res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
 		if err != nil {
@@ -112,7 +118,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
 		}
 		link.Header = http.Header{
-			"Referer": []string{fmt.Sprintf("%s://%s/", ou.Scheme, ou.Host)},
+			"Referer": []string{"https://www.123pan.com/"},
 		}
 		return &link, nil
 	} else {
@@ -182,7 +188,7 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, file model.FileStrea
 	etag := file.GetHash().GetHash(utils.MD5)
 	var err error
 	if len(etag) < utils.MD5.Width {
-		_, etag, err = stream.CacheFullAndHash(file, &up, utils.MD5)
+		_, etag, err = stream.CacheFullInTempFileAndHash(file, utils.MD5)
 		if err != nil {
 			return err
 		}

drivers/123/meta.go

@@ -11,8 +11,7 @@ type Addition struct {
 	driver.RootID
 	//OrderBy        string `json:"order_by" type:"select" options:"file_id,file_name,size,update_at" default:"file_name"`
 	//OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	AccessToken  string
-	UploadThread int `json:"UploadThread" type:"number" default:"3" help:"the threads of upload"`
+	AccessToken string
 }
 
 var config = driver.Config{
@@ -23,11 +22,6 @@ var config = driver.Config{
 
 func init() {
 	op.RegisterDriver(func() driver.Driver {
-		// 新增默认选项 要在RegisterDriver初始化设置 才会对正在使用的用户生效
-		return &Pan123{
-			Addition: Addition{
-				UploadThread: 3,
-			},
-		}
+		return &Pan123{}
 	})
 }

drivers/123/upload.go

@@ -6,16 +6,11 @@ import (
 	"io"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
-	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
-	"github.com/OpenListTeam/OpenList/v4/pkg/singleflight"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/avast/retry-go"
 	"github.com/go-resty/resty/v2"
 )
 
@@ -74,21 +69,18 @@ func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp, file model.F
 }
 
 func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.FileStreamer, up driver.UpdateProgress) error {
-	// fetch s3 pre signed urls
-	size := file.GetSize()
-	chunkSize := int64(16 * utils.MB)
-	chunkCount := 1
-	if size > chunkSize {
-		chunkCount = int((size + chunkSize - 1) / chunkSize)
-	}
-
-	ss, err := stream.NewStreamSectionReader(file, int(chunkSize), &up)
+	tmpF, err := file.CacheFullInTempFile()
 	if err != nil {
 		return err
 	}
-
+	// fetch s3 pre signed urls
+	size := file.GetSize()
+	chunkSize := min(size, 16*utils.MB)
+	chunkCount := int(size / chunkSize)
 	lastChunkSize := size % chunkSize
-	if lastChunkSize == 0 {
+	if lastChunkSize > 0 {
+		chunkCount++
+	} else {
 		lastChunkSize = chunkSize
 	}
 	// only 1 batch is allowed
@@ -98,99 +90,73 @@ func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.Fi
 		batchSize = 10
 		getS3UploadUrl = d.getS3PreSignedUrls
 	}
-
-	thread := min(int(chunkCount), d.UploadThread)
-	threadG, uploadCtx := errgroup.NewOrderedGroupWithContext(ctx, thread,
-		retry.Attempts(3),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
 	for i := 1; i <= chunkCount; i += batchSize {
-		if utils.IsCanceled(uploadCtx) {
-			break
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
 		}
 		start := i
 		end := min(i+batchSize, chunkCount+1)
-		s3PreSignedUrls, err := getS3UploadUrl(uploadCtx, upReq, start, end)
+		s3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, start, end)
 		if err != nil {
 			return err
 		}
 		// upload each chunk
-		for cur := start; cur < end; cur++ {
-			if utils.IsCanceled(uploadCtx) {
-				break
+		for j := start; j < end; j++ {
+			if utils.IsCanceled(ctx) {
+				return ctx.Err()
 			}
-			offset := int64(cur-1) * chunkSize
 			curSize := chunkSize
-			if cur == chunkCount {
+			if j == chunkCount {
 				curSize = lastChunkSize
 			}
-			var reader *stream.SectionReader
-			var rateLimitedRd io.Reader
-			threadG.GoWithLifecycle(errgroup.Lifecycle{
-				Before: func(ctx context.Context) error {
-					if reader == nil {
-						var err error
-						reader, err = ss.GetSectionReader(offset, curSize)
-						if err != nil {
-							return err
-						}
-						rateLimitedRd = driver.NewLimitedUploadStream(ctx, reader)
-					}
-					return nil
-				},
-				Do: func(ctx context.Context) error {
-					reader.Seek(0, io.SeekStart)
-					uploadUrl := s3PreSignedUrls.Data.PreSignedUrls[strconv.Itoa(cur)]
-					if uploadUrl == "" {
-						return fmt.Errorf("upload url is empty, s3PreSignedUrls: %+v", s3PreSignedUrls)
-					}
-					reader.Seek(0, io.SeekStart)
-					req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadUrl, rateLimitedRd)
-					if err != nil {
-						return err
-					}
-					req.ContentLength = curSize
-					//req.Header.Set("Content-Length", strconv.FormatInt(curSize, 10))
-					res, err := base.HttpClient.Do(req)
-					if err != nil {
-						return err
-					}
-					defer res.Body.Close()
-					if res.StatusCode == http.StatusForbidden {
-						singleflight.AnyGroup.Do(fmt.Sprintf("Pan123.newUpload_%p", threadG), func() (any, error) {
-							newS3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, cur, end)
-							if err != nil {
-								return nil, err
-							}
-							s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls
-							return nil, nil
-						})
-						if err != nil {
-							return err
-						}
-						return fmt.Errorf("upload s3 chunk %d failed, status code: %d", cur, res.StatusCode)
-					}
-					if res.StatusCode != http.StatusOK {
-						body, err := io.ReadAll(res.Body)
-						if err != nil {
-							return err
-						}
-						return fmt.Errorf("upload s3 chunk %d failed, status code: %d, body: %s", cur, res.StatusCode, body)
-					}
-					progress := 10.0 + 85.0*float64(threadG.Success())/float64(chunkCount)
-					up(progress)
-					return nil
-				},
-				After: func(err error) {
-					ss.FreeSectionReader(reader)
-				},
-			})
+			err = d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, j, end, io.NewSectionReader(tmpF, chunkSize*int64(j-1), curSize), curSize, false, getS3UploadUrl)
+			if err != nil {
+				return err
+			}
+			up(float64(j) * 100 / float64(chunkCount))
 		}
 	}
-	if err := threadG.Wait(); err != nil {
-		return err
-	}
-	defer up(100)
 	// complete s3 upload
 	return d.completeS3(ctx, upReq, file, chunkCount > 1)
 }
+
+func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSignedUrls *S3PreSignedURLs, cur, end int, reader *io.SectionReader, curSize int64, retry bool, getS3UploadUrl func(ctx context.Context, upReq *UploadResp, start int, end int) (*S3PreSignedURLs, error)) error {
+	uploadUrl := s3PreSignedUrls.Data.PreSignedUrls[strconv.Itoa(cur)]
+	if uploadUrl == "" {
+		return fmt.Errorf("upload url is empty, s3PreSignedUrls: %+v", s3PreSignedUrls)
+	}
+	req, err := http.NewRequest("PUT", uploadUrl, driver.NewLimitedUploadStream(ctx, reader))
+	if err != nil {
+		return err
+	}
+	req = req.WithContext(ctx)
+	req.ContentLength = curSize
+	//req.Header.Set("Content-Length", strconv.FormatInt(curSize, 10))
+	res, err := base.HttpClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	if res.StatusCode == http.StatusForbidden {
+		if retry {
+			return fmt.Errorf("upload s3 chunk %d failed, status code: %d", cur, res.StatusCode)
+		}
+		// refresh s3 pre signed urls
+		newS3PreSignedUrls, err := getS3UploadUrl(ctx, upReq, cur, end)
+		if err != nil {
+			return err
+		}
+		s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls
+		// retry
+		reader.Seek(0, io.SeekStart)
+		return d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, cur, end, reader, curSize, true, getS3UploadUrl)
+	}
+	if res.StatusCode != http.StatusOK {
+		body, err := io.ReadAll(res.Body)
+		if err != nil {
+			return err
+		}
+		return fmt.Errorf("upload s3 chunk %d failed, status code: %d, body: %s", cur, res.StatusCode, body)
+	}
+	return nil
+}

drivers/123_open/driver.go

@@ -2,9 +2,7 @@ package _123_open
 
 import (
 	"context"
-	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
@@ -17,7 +15,6 @@ import (
 type Open123 struct {
 	model.Storage
 	Addition
-	UID uint64
 }
 
 func (d *Open123) Config() driver.Config {
@@ -70,45 +67,13 @@ func (d *Open123) List(ctx context.Context, dir model.Obj, args model.ListArgs)
 func (d *Open123) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	fileId, _ := strconv.ParseInt(file.GetID(), 10, 64)
 
-	if d.DirectLink {
-		res, err := d.getDirectLink(fileId)
-		if err != nil {
-			return nil, err
-		}
-
-		if d.DirectLinkPrivateKey == "" {
-			duration := 365 * 24 * time.Hour // 缓存1年
-			return &model.Link{
-				URL:        res.Data.URL,
-				Expiration: &duration,
-			}, nil
-		}
-
-		uid, err := d.getUID()
-		if err != nil {
-			return nil, err
-		}
-
-		duration := time.Duration(d.DirectLinkValidDuration) * time.Minute
-
-		newURL, err := d.SignURL(res.Data.URL, d.DirectLinkPrivateKey,
-			uid, duration)
-		if err != nil {
-			return nil, err
-		}
-
-		return &model.Link{
-			URL:        newURL,
-			Expiration: &duration,
-		}, nil
-	}
-
 	res, err := d.getDownloadInfo(fileId)
 	if err != nil {
 		return nil, err
 	}
 
-	return &model.Link{URL: res.Data.DownloadUrl}, nil
+	link := model.Link{URL: res.Data.DownloadUrl}
+	return &link, nil
 }
 
 func (d *Open123) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
@@ -130,22 +95,6 @@ func (d *Open123) Rename(ctx context.Context, srcObj model.Obj, newName string)
 }
 
 func (d *Open123) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
-	// 尝试使用上传+MD5秒传功能实现复制
-	// 1. 创建文件
-	// parentFileID 父目录id，上传到根目录时填写 0
-	parentFileId, err := strconv.ParseInt(dstDir.GetID(), 10, 64)
-	if err != nil {
-		return fmt.Errorf("parse parentFileID error: %v", err)
-	}
-	etag := srcObj.(File).Etag
-	createResp, err := d.create(parentFileId, srcObj.GetName(), etag, srcObj.GetSize(), 2, false)
-	if err != nil {
-		return err
-	}
-	// 是否秒传
-	if createResp.Data.Reuse {
-		return nil
-	}
 	return errs.NotSupport
 }
 
@@ -155,64 +104,26 @@ func (d *Open123) Remove(ctx context.Context, obj model.Obj) error {
 	return d.trash(fileId)
 }
 
-func (d *Open123) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) (model.Obj, error) {
-	// 1. 创建文件
-	// parentFileID 父目录id，上传到根目录时填写 0
+func (d *Open123) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
 	parentFileId, err := strconv.ParseInt(dstDir.GetID(), 10, 64)
-	if err != nil {
-		return nil, fmt.Errorf("parse parentFileID error: %v", err)
-	}
-	// etag 文件md5
 	etag := file.GetHash().GetHash(utils.MD5)
+
 	if len(etag) < utils.MD5.Width {
-		_, etag, err = stream.CacheFullAndHash(file, &up, utils.MD5)
+		_, etag, err = stream.CacheFullInTempFileAndHash(file, utils.MD5)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 	createResp, err := d.create(parentFileId, file.GetName(), etag, file.GetSize(), 2, false)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	// 是否秒传
 	if createResp.Data.Reuse {
-		// 秒传成功才会返回正确的 FileID，否则为 0
-		if createResp.Data.FileID != 0 {
-			return File{
-				FileName: file.GetName(),
-				Size:     file.GetSize(),
-				FileId:   createResp.Data.FileID,
-				Type:     2,
-				Etag:     etag,
-			}, nil
-		}
+		return nil
 	}
+	up(10)
 
-	// 2. 上传分片
-	err = d.Upload(ctx, file, createResp, up)
-	if err != nil {
-		return nil, err
-	}
-
-	// 3. 上传完毕
-	for range 60 {
-		uploadCompleteResp, err := d.complete(createResp.Data.PreuploadID)
-		// 返回错误代码未知，如：20103，文档也没有具体说
-		if err == nil && uploadCompleteResp.Data.Completed && uploadCompleteResp.Data.FileID != 0 {
-			up(100)
-			return File{
-				FileName: file.GetName(),
-				Size:     file.GetSize(),
-				FileId:   uploadCompleteResp.Data.FileID,
-				Type:     2,
-				Etag:     etag,
-			}, nil
-		}
-		// 若接口返回的completed为 false 时，则需间隔1秒继续轮询此接口，获取上传最终结果。
-		time.Sleep(time.Second)
-	}
-	return nil, fmt.Errorf("upload complete timeout")
+	return d.Upload(ctx, file, createResp, up)
 }
 
 var _ driver.Driver = (*Open123)(nil)
-var _ driver.PutResult = (*Open123)(nil)

drivers/123_open/meta.go

@@ -23,11 +23,6 @@ type Addition struct {
 	//  上传线程数
 	UploadThread int `json:"UploadThread" type:"number" default:"3" help:"the threads of upload"`
 
-	//  使用直链
-	DirectLink              bool   `json:"DirectLink" type:"bool" default:"false" required:"false" help:"use direct link when download file"`
-	DirectLinkPrivateKey    string `json:"DirectLinkPrivateKey" required:"false" help:"private key for direct link, if URL authentication is enabled"`
-	DirectLinkValidDuration int64  `json:"DirectLinkValidDuration" type:"number" default:"30" required:"false" help:"minutes, if URL authentication is enabled"`
-
 	driver.RootID
 }
 

drivers/123_open/types.go

@@ -73,9 +73,7 @@ func (f File) GetName() string {
 }
 
 func (f File) CreateTime() time.Time {
-	// 返回的时间没有时区信息，默认 UTC+8
-	loc := time.FixedZone("UTC+8", 8*60*60)
-	parsedTime, err := time.ParseInLocation("2006-01-02 15:04:05", f.CreateAt, loc)
+	parsedTime, err := time.Parse("2006-01-02 15:04:05", f.CreateAt)
 	if err != nil {
 		return time.Now()
 	}
@@ -83,9 +81,7 @@ func (f File) CreateTime() time.Time {
 }
 
 func (f File) ModTime() time.Time {
-	// 返回的时间没有时区信息，默认 UTC+8
-	loc := time.FixedZone("UTC+8", 8*60*60)
-	parsedTime, err := time.ParseInLocation("2006-01-02 15:04:05", f.UpdateAt, loc)
+	parsedTime, err := time.Parse("2006-01-02 15:04:05", f.UpdateAt)
 	if err != nil {
 		return time.Now()
 	}
@@ -127,19 +123,19 @@ type RefreshTokenResp struct {
 type UserInfoResp struct {
 	BaseResp
 	Data struct {
-		UID uint64 `json:"uid"`
-		// Username       string `json:"username"`
-		// DisplayName    string `json:"displayName"`
-		// HeadImage      string `json:"headImage"`
-		// Passport       string `json:"passport"`
-		// Mail           string `json:"mail"`
-		// SpaceUsed      int64  `json:"spaceUsed"`
-		// SpacePermanent int64  `json:"spacePermanent"`
-		// SpaceTemp      int64  `json:"spaceTemp"`
-		// SpaceTempExpr  int64  `json:"spaceTempExpr"`
-		// Vip            bool   `json:"vip"`
-		// DirectTraffic  int64  `json:"directTraffic"`
-		// IsHideUID      bool   `json:"isHideUID"`
+		UID            int64  `json:"uid"`
+		Username       string `json:"username"`
+		DisplayName    string `json:"displayName"`
+		HeadImage      string `json:"headImage"`
+		Passport       string `json:"passport"`
+		Mail           string `json:"mail"`
+		SpaceUsed      int64  `json:"spaceUsed"`
+		SpacePermanent int64  `json:"spacePermanent"`
+		SpaceTemp      int64  `json:"spaceTemp"`
+		SpaceTempExpr  string `json:"spaceTempExpr"`
+		Vip            bool   `json:"vip"`
+		DirectTraffic  int64  `json:"directTraffic"`
+		IsHideUID      bool   `json:"isHideUID"`
 	} `json:"data"`
 }
 
@@ -158,30 +154,52 @@ type DownloadInfoResp struct {
 	} `json:"data"`
 }
 
-type DirectLinkResp struct {
-	BaseResp
-	Data struct {
-		URL string `json:"url"`
-	} `json:"data"`
-}
-
-// 创建文件V2返回
 type UploadCreateResp struct {
 	BaseResp
 	Data struct {
-		FileID      int64    `json:"fileID"`
-		PreuploadID string   `json:"preuploadID"`
-		Reuse       bool     `json:"reuse"`
-		SliceSize   int64    `json:"sliceSize"`
-		Servers     []string `json:"servers"`
+		FileID      int64  `json:"fileID"`
+		PreuploadID string `json:"preuploadID"`
+		Reuse       bool   `json:"reuse"`
+		SliceSize   int64  `json:"sliceSize"`
 	} `json:"data"`
 }
 
-// 上传完毕V2返回
+type UploadUrlResp struct {
+	BaseResp
+	Data struct {
+		PresignedURL string `json:"presignedURL"`
+	}
+}
+
 type UploadCompleteResp struct {
+	BaseResp
+	Data struct {
+		Async     bool  `json:"async"`
+		Completed bool  `json:"completed"`
+		FileID    int64 `json:"fileID"`
+	} `json:"data"`
+}
+
+type UploadAsyncResp struct {
 	BaseResp
 	Data struct {
 		Completed bool  `json:"completed"`
 		FileID    int64 `json:"fileID"`
 	} `json:"data"`
 }
+
+type UploadResp struct {
+	BaseResp
+	Data struct {
+		AccessKeyId     string `json:"AccessKeyId"`
+		Bucket          string `json:"Bucket"`
+		Key             string `json:"Key"`
+		SecretAccessKey string `json:"SecretAccessKey"`
+		SessionToken    string `json:"SessionToken"`
+		FileId          int64  `json:"FileId"`
+		Reuse           bool   `json:"Reuse"`
+		EndPoint        string `json:"EndPoint"`
+		StorageNode     string `json:"StorageNode"`
+		UploadId        string `json:"UploadId"`
+	} `json:"data"`
+}

drivers/123_open/upload.go

@@ -1,28 +1,21 @@
 package _123_open
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"mime/multipart"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
+	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/avast/retry-go"
 	"github.com/go-resty/resty/v2"
 )
 
-// 创建文件 V2
 func (d *Open123) create(parentFileID int64, filename string, etag string, size int64, duplicate int, containDir bool) (*UploadCreateResp, error) {
 	var resp UploadCreateResp
 	_, err := d.Request(UploadCreate, http.MethodPost, func(req *resty.Request) {
@@ -41,136 +34,21 @@ func (d *Open123) create(parentFileID int64, filename string, etag string, size
 	return &resp, nil
 }
 
-// 上传分片 V2
-func (d *Open123) Upload(ctx context.Context, file model.FileStreamer, createResp *UploadCreateResp, up driver.UpdateProgress) error {
-	uploadDomain := createResp.Data.Servers[0]
-	size := file.GetSize()
-	chunkSize := createResp.Data.SliceSize
-
-	ss, err := stream.NewStreamSectionReader(file, int(chunkSize), &up)
-	if err != nil {
-		return err
-	}
-
-	uploadNums := (size + chunkSize - 1) / chunkSize
-	thread := min(int(uploadNums), d.UploadThread)
-	threadG, uploadCtx := errgroup.NewOrderedGroupWithContext(ctx, thread,
-		retry.Attempts(3),
-		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay))
-
-	for partIndex := range uploadNums {
-		if utils.IsCanceled(uploadCtx) {
-			break
-		}
-		partIndex := partIndex
-		partNumber := partIndex + 1 // 分片号从1开始
-		offset := partIndex * chunkSize
-		size := min(chunkSize, size-offset)
-		var reader *stream.SectionReader
-		var rateLimitedRd io.Reader
-		sliceMD5 := ""
-		// 表单
-		b := bytes.NewBuffer(make([]byte, 0, 2048))
-		threadG.GoWithLifecycle(errgroup.Lifecycle{
-			Before: func(ctx context.Context) error {
-				if reader == nil {
-					var err error
-					// 每个分片一个reader
-					reader, err = ss.GetSectionReader(offset, size)
-					if err != nil {
-						return err
-					}
-					// 计算当前分片的MD5
-					sliceMD5, err = utils.HashReader(utils.MD5, reader)
-					if err != nil {
-						return err
-					}
-				}
-				return nil
-			},
-			Do: func(ctx context.Context) error {
-				// 重置分片reader位置，因为HashReader、上一次失败已经读取到分片EOF
-				reader.Seek(0, io.SeekStart)
-
-				b.Reset()
-				w := multipart.NewWriter(b)
-				// 添加表单字段
-				err = w.WriteField("preuploadID", createResp.Data.PreuploadID)
-				if err != nil {
-					return err
-				}
-				err = w.WriteField("sliceNo", strconv.FormatInt(partNumber, 10))
-				if err != nil {
-					return err
-				}
-				err = w.WriteField("sliceMD5", sliceMD5)
-				if err != nil {
-					return err
-				}
-				// 写入文件内容
-				_, err = w.CreateFormFile("slice", fmt.Sprintf("%s.part%d", file.GetName(), partNumber))
-				if err != nil {
-					return err
-				}
-				headSize := b.Len()
-				err = w.Close()
-				if err != nil {
-					return err
-				}
-				head := bytes.NewReader(b.Bytes()[:headSize])
-				tail := bytes.NewReader(b.Bytes()[headSize:])
-				rateLimitedRd = driver.NewLimitedUploadStream(ctx, io.MultiReader(head, reader, tail))
-				// 创建请求并设置header
-				req, err := http.NewRequestWithContext(ctx, http.MethodPost, uploadDomain+"/upload/v2/file/slice", rateLimitedRd)
-				if err != nil {
-					return err
-				}
-
-				// 设置请求头
-				req.Header.Add("Authorization", "Bearer "+d.AccessToken)
-				req.Header.Add("Content-Type", w.FormDataContentType())
-				req.Header.Add("Platform", "open_platform")
-
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				defer res.Body.Close()
-				if res.StatusCode != 200 {
-					return fmt.Errorf("slice %d upload failed, status code: %d", partNumber, res.StatusCode)
-				}
-				var resp BaseResp
-				respBody, err := io.ReadAll(res.Body)
-				if err != nil {
-					return err
-				}
-				err = json.Unmarshal(respBody, &resp)
-				if err != nil {
-					return err
-				}
-				if resp.Code != 0 {
-					return fmt.Errorf("slice %d upload failed: %s", partNumber, resp.Message)
-				}
-
-				progress := 10.0 + 85.0*float64(threadG.Success())/float64(uploadNums)
-				up(progress)
-				return nil
-			},
-			After: func(err error) {
-				ss.FreeSectionReader(reader)
-			},
+func (d *Open123) url(preuploadID string, sliceNo int64) (string, error) {
+	// get upload url
+	var resp UploadUrlResp
+	_, err := d.Request(UploadUrl, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"preuploadId": preuploadID,
+			"sliceNo":     sliceNo,
 		})
+	}, &resp)
+	if err != nil {
+		return "", err
 	}
-
-	if err := threadG.Wait(); err != nil {
-		return err
-	}
-
-	return nil
+	return resp.Data.PresignedURL, nil
 }
 
-// 上传完毕
 func (d *Open123) complete(preuploadID string) (*UploadCompleteResp, error) {
 	var resp UploadCompleteResp
 	_, err := d.Request(UploadComplete, http.MethodPost, func(req *resty.Request) {
@@ -183,3 +61,91 @@ func (d *Open123) complete(preuploadID string) (*UploadCompleteResp, error) {
 	}
 	return &resp, nil
 }
+
+func (d *Open123) async(preuploadID string) (*UploadAsyncResp, error) {
+	var resp UploadAsyncResp
+	_, err := d.Request(UploadAsync, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(base.Json{
+			"preuploadID": preuploadID,
+		})
+	}, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
+func (d *Open123) Upload(ctx context.Context, file model.FileStreamer, createResp *UploadCreateResp, up driver.UpdateProgress) error {
+	size := file.GetSize()
+	chunkSize := createResp.Data.SliceSize
+	uploadNums := (size + chunkSize - 1) / chunkSize
+	threadG, uploadCtx := errgroup.NewGroupWithContext(ctx, d.UploadThread,
+		retry.Attempts(3),
+		retry.Delay(time.Second),
+		retry.DelayType(retry.BackOffDelay))
+
+	for partIndex := int64(0); partIndex < uploadNums; partIndex++ {
+		if utils.IsCanceled(uploadCtx) {
+			return ctx.Err()
+		}
+		partIndex := partIndex
+		partNumber := partIndex + 1 // 分片号从1开始
+		offset := partIndex * chunkSize
+		size := min(chunkSize, size-offset)
+		limitedReader, err := file.RangeRead(http_range.Range{
+			Start:  offset,
+			Length: size})
+		if err != nil {
+			return err
+		}
+		limitedReader = driver.NewLimitedUploadStream(ctx, limitedReader)
+
+		threadG.Go(func(ctx context.Context) error {
+			uploadPartUrl, err := d.url(createResp.Data.PreuploadID, partNumber)
+			if err != nil {
+				return err
+			}
+
+			req, err := http.NewRequestWithContext(ctx, "PUT", uploadPartUrl, limitedReader)
+			if err != nil {
+				return err
+			}
+			req = req.WithContext(ctx)
+			req.ContentLength = size
+
+			res, err := base.HttpClient.Do(req)
+			if err != nil {
+				return err
+			}
+			_ = res.Body.Close()
+
+			progress := 10.0 + 85.0*float64(threadG.Success())/float64(uploadNums)
+			up(progress)
+			return nil
+		})
+	}
+
+	if err := threadG.Wait(); err != nil {
+		return err
+	}
+
+	uploadCompleteResp, err := d.complete(createResp.Data.PreuploadID)
+	if err != nil {
+		return err
+	}
+	if uploadCompleteResp.Data.Async == false || uploadCompleteResp.Data.Completed {
+		return nil
+	}
+
+	for {
+		uploadAsyncResp, err := d.async(createResp.Data.PreuploadID)
+		if err != nil {
+			return err
+		}
+		if uploadAsyncResp.Data.Completed {
+			break
+		}
+	}
+	up(100)
+	return nil
+}

drivers/123_open/util.go

@@ -1,20 +1,15 @@
 package _123_open
 
 import (
-	"crypto/md5"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"net/http"
-	"net/url"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/go-resty/resty/v2"
-	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -24,15 +19,16 @@ var ( //不同情况下获取的AccessTokenQPS限制不同 如下模块化易于
 	AccessToken    = InitApiInfo(Api+"/api/v1/access_token", 1)
 	RefreshToken   = InitApiInfo(Api+"/api/v1/oauth2/access_token", 1)
 	UserInfo       = InitApiInfo(Api+"/api/v1/user/info", 1)
-	FileList       = InitApiInfo(Api+"/api/v2/file/list", 3)
-	DownloadInfo   = InitApiInfo(Api+"/api/v1/file/download_info", 5)
-	DirectLink     = InitApiInfo(Api+"/api/v1/direct-link/url", 5)
+	FileList       = InitApiInfo(Api+"/api/v2/file/list", 4)
+	DownloadInfo   = InitApiInfo(Api+"/api/v1/file/download_info", 0)
 	Mkdir          = InitApiInfo(Api+"/upload/v1/file/mkdir", 2)
 	Move           = InitApiInfo(Api+"/api/v1/file/move", 1)
 	Rename         = InitApiInfo(Api+"/api/v1/file/name", 1)
 	Trash          = InitApiInfo(Api+"/api/v1/file/trash", 2)
-	UploadCreate   = InitApiInfo(Api+"/upload/v2/file/create", 2)
-	UploadComplete = InitApiInfo(Api+"/upload/v2/file/upload_complete", 0)
+	UploadCreate   = InitApiInfo(Api+"/upload/v1/file/create", 2)
+	UploadUrl      = InitApiInfo(Api+"/upload/v1/file/get_upload_url", 0)
+	UploadComplete = InitApiInfo(Api+"/upload/v1/file/upload_complete", 0)
+	UploadAsync    = InitApiInfo(Api+"/upload/v1/file/upload_async_result", 1)
 )
 
 func (d *Open123) Request(apiInfo *ApiInfo, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
@@ -86,24 +82,8 @@ func (d *Open123) Request(apiInfo *ApiInfo, method string, callback base.ReqCall
 }
 
 func (d *Open123) flushAccessToken() error {
-	if d.ClientID != "" {
-		if d.RefreshToken != "" {
-			var resp RefreshTokenResp
-			_, err := d.Request(RefreshToken, http.MethodPost, func(req *resty.Request) {
-				req.SetQueryParam("client_id", d.ClientID)
-				if d.ClientSecret != "" {
-					req.SetQueryParam("client_secret", d.ClientSecret)
-				}
-				req.SetQueryParam("grant_type", "refresh_token")
-				req.SetQueryParam("refresh_token", d.RefreshToken)
-			}, &resp)
-			if err != nil {
-				return err
-			}
-			d.AccessToken = resp.AccessToken
-			d.RefreshToken = resp.RefreshToken
-			op.MustSaveDriverStorage(d)
-		} else if d.ClientSecret != "" {
+	if d.Addition.ClientID != "" {
+		if d.Addition.ClientSecret != "" {
 			var resp AccessTokenResp
 			_, err := d.Request(AccessToken, http.MethodPost, func(req *resty.Request) {
 				req.SetBody(base.Json{
@@ -116,38 +96,24 @@ func (d *Open123) flushAccessToken() error {
 			}
 			d.AccessToken = resp.Data.AccessToken
 			op.MustSaveDriverStorage(d)
+		} else if d.Addition.RefreshToken != "" {
+			var resp RefreshTokenResp
+			_, err := d.Request(RefreshToken, http.MethodPost, func(req *resty.Request) {
+				req.SetQueryParam("client_id", d.ClientID)
+				req.SetQueryParam("grant_type", "refresh_token")
+				req.SetQueryParam("refresh_token", d.Addition.RefreshToken)
+			}, &resp)
+			if err != nil {
+				return err
+			}
+			d.AccessToken = resp.AccessToken
+			d.RefreshToken = resp.RefreshToken
+			op.MustSaveDriverStorage(d)
 		}
 	}
 	return nil
 }
 
-func (d *Open123) SignURL(originURL, privateKey string, uid uint64, validDuration time.Duration) (newURL string, err error) {
-	// 生成Unix时间戳
-	ts := time.Now().Add(validDuration).Unix()
-
-	// 生成随机数（建议使用UUID，不能包含中划线（-））
-	rand := strings.ReplaceAll(uuid.New().String(), "-", "")
-
-	// 解析URL
-	objURL, err := url.Parse(originURL)
-	if err != nil {
-		return "", err
-	}
-
-	// 待签名字符串，格式：path-timestamp-rand-uid-privateKey
-	unsignedStr := fmt.Sprintf("%s-%d-%s-%d-%s", objURL.Path, ts, rand, uid, privateKey)
-	md5Hash := md5.Sum([]byte(unsignedStr))
-	// 生成鉴权参数，格式：timestamp-rand-uid-md5hash
-	authKey := fmt.Sprintf("%d-%s-%d-%x", ts, rand, uid, md5Hash)
-
-	// 添加鉴权参数到URL查询参数
-	v := objURL.Query()
-	v.Add("auth_key", authKey)
-	objURL.RawQuery = v.Encode()
-
-	return objURL.String(), nil
-}
-
 func (d *Open123) getUserInfo() (*UserInfoResp, error) {
 	var resp UserInfoResp
 
@@ -158,18 +124,6 @@ func (d *Open123) getUserInfo() (*UserInfoResp, error) {
 	return &resp, nil
 }
 
-func (d *Open123) getUID() (uint64, error) {
-	if d.UID != 0 {
-		return d.UID, nil
-	}
-	resp, err := d.getUserInfo()
-	if err != nil {
-		return 0, err
-	}
-	d.UID = resp.Data.UID
-	return resp.Data.UID, nil
-}
-
 func (d *Open123) getFiles(parentFileId int64, limit int, lastFileId int64) (*FileListResp, error) {
 	var resp FileListResp
 
@@ -207,21 +161,6 @@ func (d *Open123) getDownloadInfo(fileId int64) (*DownloadInfoResp, error) {
 	return &resp, nil
 }
 
-func (d *Open123) getDirectLink(fileId int64) (*DirectLinkResp, error) {
-	var resp DirectLinkResp
-
-	_, err := d.Request(DirectLink, http.MethodGet, func(req *resty.Request) {
-		req.SetQueryParams(map[string]string{
-			"fileID": strconv.FormatInt(fileId, 10),
-		})
-	}, &resp)
-	if err != nil {
-		return nil, err
-	}
-
-	return &resp, nil
-}
-
 func (d *Open123) mkdir(parentID int64, name string) error {
 	_, err := d.Request(Mkdir, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{

drivers/123_share/driver.go

@@ -70,6 +70,14 @@ func (d *Pan123Share) List(ctx context.Context, dir model.Obj, args model.ListAr
 func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	// TODO return link of file, required
 	if f, ok := file.(File); ok {
+		//var resp DownResp
+		var headers map[string]string
+		if !utils.IsLocalIPAddr(args.IP) {
+			headers = map[string]string{
+				//"X-Real-IP":       "1.1.1.1",
+				"X-Forwarded-For": args.IP,
+			}
+		}
 		data := base.Json{
 			"shareKey":  d.ShareKey,
 			"SharePwd":  d.SharePwd,
@@ -79,27 +87,25 @@ func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkA
 			"size":      f.Size,
 		}
 		resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
-			req.SetBody(data)
+			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {
 			return nil, err
 		}
 		downloadUrl := utils.Json.Get(resp, "data", "DownloadURL").ToString()
-		ou, err := url.Parse(downloadUrl)
+		u, err := url.Parse(downloadUrl)
 		if err != nil {
 			return nil, err
 		}
-		u_ := ou.String()
-		nu := ou.Query().Get("params")
+		nu := u.Query().Get("params")
 		if nu != "" {
 			du, _ := base64.StdEncoding.DecodeString(nu)
-			u, err := url.Parse(string(du))
+			u, err = url.Parse(string(du))
 			if err != nil {
 				return nil, err
 			}
-			u_ = u.String()
 		}
-
+		u_ := u.String()
 		log.Debug("download url: ", u_)
 		res, err := base.NoRedirectClient.R().SetHeader("Referer", "https://www.123pan.com/").Get(u_)
 		if err != nil {
@@ -116,7 +122,7 @@ func (d *Pan123Share) Link(ctx context.Context, file model.Obj, args model.LinkA
 			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
 		}
 		link.Header = http.Header{
-			"Referer": []string{fmt.Sprintf("%s://%s/", ou.Scheme, ou.Host)},
+			"Referer": []string{"https://www.123pan.com/"},
 		}
 		return &link, nil
 	}

drivers/123_share/meta.go

@@ -15,10 +15,17 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "123PanShare",
-	LocalSort:   true,
-	NoUpload:    true,
-	DefaultRoot: "0",
+	Name:              "123PanShare",
+	LocalSort:         true,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          true,
+	NeedMs:            false,
+	DefaultRoot:       "0",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/139/driver.go

@@ -522,27 +522,30 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		var err error
 		fullHash := stream.GetHash().GetHash(utils.SHA256)
 		if len(fullHash) != utils.SHA256.Width {
-			_, fullHash, err = streamPkg.CacheFullAndHash(stream, &up, utils.SHA256)
+			_, fullHash, err = streamPkg.CacheFullInTempFileAndHash(stream, utils.SHA256)
 			if err != nil {
 				return err
 			}
 		}
 
 		size := stream.GetSize()
-		partSize := d.getPartSize(size)
-		part := int64(1)
-		if size > partSize {
-			part = (size + partSize - 1) / partSize
+		var partSize = d.getPartSize(size)
+		part := size / partSize
+		if size%partSize > 0 {
+			part++
+		} else if part == 0 {
+			part = 1
 		}
-
-		// 生成所有 partInfos
 		partInfos := make([]PartInfo, 0, part)
 		for i := int64(0); i < part; i++ {
 			if utils.IsCanceled(ctx) {
 				return ctx.Err()
 			}
 			start := i * partSize
-			byteSize := min(size-start, partSize)
+			byteSize := size - start
+			if byteSize > partSize {
+				byteSize = partSize
+			}
 			partNumber := i + 1
 			partInfo := PartInfo{
 				PartNumber: partNumber,
@@ -590,20 +593,17 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		// resp.Data.RapidUpload: true 支持快传，但此处直接检测是否返回分片的上传地址
 		// 快传的情况下同样需要手动处理冲突
 		if resp.Data.PartInfos != nil {
-			// Progress
-			p := driver.NewProgress(size, up)
-			rateLimited := driver.NewLimitedUploadStream(ctx, stream)
+			// 读取前100个分片的上传地址
+			uploadPartInfos := resp.Data.PartInfos
 
-			// 先上传前100个分片
-			err = d.uploadPersonalParts(ctx, partInfos, resp.Data.PartInfos, rateLimited, p)
-			if err != nil {
-				return err
-			}
-
-			// 如果还有剩余分片，分批获取上传地址并上传
-			for i := 100; i < len(partInfos); i += 100 {
-				end := min(i+100, len(partInfos))
+			// 获取后续分片的上传地址
+			for i := 101; i < len(partInfos); i += 100 {
+				end := i + 100
+				if end > len(partInfos) {
+					end = len(partInfos)
+				}
 				batchPartInfos := partInfos[i:end]
+
 				moredata := base.Json{
 					"fileId":    resp.Data.FileId,
 					"uploadId":  resp.Data.UploadId,
@@ -619,13 +619,45 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 				if err != nil {
 					return err
 				}
-				err = d.uploadPersonalParts(ctx, partInfos, moreresp.Data.PartInfos, rateLimited, p)
+				uploadPartInfos = append(uploadPartInfos, moreresp.Data.PartInfos...)
+			}
+
+			// Progress
+			p := driver.NewProgress(size, up)
+
+			rateLimited := driver.NewLimitedUploadStream(ctx, stream)
+			// 上传所有分片
+			for _, uploadPartInfo := range uploadPartInfos {
+				index := uploadPartInfo.PartNumber - 1
+				partSize := partInfos[index].PartSize
+				log.Debugf("[139] uploading part %+v/%+v", index, len(uploadPartInfos))
+				limitReader := io.LimitReader(rateLimited, partSize)
+
+				// Update Progress
+				r := io.TeeReader(limitReader, p)
+
+				req, err := http.NewRequest("PUT", uploadPartInfo.UploadUrl, r)
 				if err != nil {
 					return err
 				}
+				req = req.WithContext(ctx)
+				req.Header.Set("Content-Type", "application/octet-stream")
+				req.Header.Set("Content-Length", fmt.Sprint(partSize))
+				req.Header.Set("Origin", "https://yun.139.com")
+				req.Header.Set("Referer", "https://yun.139.com/")
+				req.ContentLength = partSize
+
+				res, err := base.HttpClient.Do(req)
+				if err != nil {
+					return err
+				}
+				_ = res.Body.Close()
+				log.Debugf("[139] uploaded: %+v", res)
+				if res.StatusCode != http.StatusOK {
+					return fmt.Errorf("unexpected status code: %d", res.StatusCode)
+				}
 			}
 
-			// 全部分片上传完毕后，complete
 			data = base.Json{
 				"contentHash":          fullHash,
 				"contentHashAlgorithm": "SHA256",
@@ -754,10 +786,12 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		size := stream.GetSize()
 		// Progress
 		p := driver.NewProgress(size, up)
-		partSize := d.getPartSize(size)
-		part := int64(1)
-		if size > partSize {
-			part = (size + partSize - 1) / partSize
+		var partSize = d.getPartSize(size)
+		part := size / partSize
+		if size%partSize > 0 {
+			part++
+		} else if part == 0 {
+			part = 1
 		}
 		rateLimited := driver.NewLimitedUploadStream(ctx, stream)
 		for i := int64(0); i < part; i++ {
@@ -771,10 +805,12 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 			limitReader := io.LimitReader(rateLimited, byteSize)
 			// Update Progress
 			r := io.TeeReader(limitReader, p)
-			req, err := http.NewRequestWithContext(ctx, http.MethodPost, resp.Data.UploadResult.RedirectionURL, r)
+			req, err := http.NewRequest("POST", resp.Data.UploadResult.RedirectionURL, r)
 			if err != nil {
 				return err
 			}
+
+			req = req.WithContext(ctx)
 			req.Header.Set("Content-Type", "text/plain;name="+unicode(stream.GetName()))
 			req.Header.Set("contentSize", strconv.FormatInt(size, 10))
 			req.Header.Set("range", fmt.Sprintf("bytes=%d-%d", start, start+byteSize-1))

drivers/139/util.go

@@ -1,11 +1,9 @@
 package _139
 
 import (
-	"context"
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io"
 	"net/http"
 	"net/url"
 	"path"
@@ -15,7 +13,6 @@ import (
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
@@ -626,47 +623,3 @@ func (d *Yun139) getPersonalCloudHost() string {
 	}
 	return d.PersonalCloudHost
 }
-
-func (d *Yun139) uploadPersonalParts(ctx context.Context, partInfos []PartInfo, uploadPartInfos []PersonalPartInfo, rateLimited *driver.RateLimitReader, p *driver.Progress) error {
-	// 确保数组以 PartNumber 从小到大排序
-	sort.Slice(uploadPartInfos, func(i, j int) bool {
-		return uploadPartInfos[i].PartNumber < uploadPartInfos[j].PartNumber
-	})
-
-	for _, uploadPartInfo := range uploadPartInfos {
-		index := uploadPartInfo.PartNumber - 1
-		if index < 0 || index >= len(partInfos) {
-			return fmt.Errorf("invalid PartNumber %d: index out of bounds (partInfos length: %d)", uploadPartInfo.PartNumber, len(partInfos))
-		}
-		partSize := partInfos[index].PartSize
-		log.Debugf("[139] uploading part %+v/%+v", index, len(partInfos))
-		limitReader := io.LimitReader(rateLimited, partSize)
-		r := io.TeeReader(limitReader, p)
-		req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadPartInfo.UploadUrl, r)
-		if err != nil {
-			return err
-		}
-		req.Header.Set("Content-Type", "application/octet-stream")
-		req.Header.Set("Content-Length", fmt.Sprint(partSize))
-		req.Header.Set("Origin", "https://yun.139.com")
-		req.Header.Set("Referer", "https://yun.139.com/")
-		req.ContentLength = partSize
-		err = func() error {
-			res, err := base.HttpClient.Do(req)
-			if err != nil {
-				return err
-			}
-			defer res.Body.Close()
-			log.Debugf("[139] uploaded: %+v", res)
-			if res.StatusCode != http.StatusOK {
-				body, _ := io.ReadAll(res.Body)
-				return fmt.Errorf("unexpected status code: %d, body: %s", res.StatusCode, string(body))
-			}
-			return nil
-		}()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

drivers/189/util.go

@@ -365,10 +365,11 @@ func (d *Cloud189) newUpload(ctx context.Context, dstDir model.Obj, file model.F
 		log.Debugf("uploadData: %+v", uploadData)
 		requestURL := uploadData.RequestURL
 		uploadHeaders := strings.Split(decodeURIComponent(uploadData.RequestHeader), "&")
-		req, err := http.NewRequestWithContext(ctx, http.MethodPut, requestURL, driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
+		req, err := http.NewRequest(http.MethodPut, requestURL, driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
 		if err != nil {
 			return err
 		}
+		req = req.WithContext(ctx)
 		for _, v := range uploadHeaders {
 			i := strings.Index(v, "=")
 			req.Header.Set(v[0:i], v[i+1:])

drivers/189_tv/utils.go

@@ -5,19 +5,17 @@ import (
 	"encoding/base64"
 	"encoding/xml"
 	"fmt"
+	"github.com/skip2/go-qrcode"
 	"io"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/skip2/go-qrcode"
-
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 
 	"github.com/go-resty/resty/v2"
@@ -131,7 +129,6 @@ func (y *Cloud189TV) put(ctx context.Context, url string, headers map[string]str
 		}
 	}
 
-	// 请求完成后http.Client会Close Request.Body
 	resp, err := base.HttpClient.Do(req)
 	if err != nil {
 		return nil, err
@@ -314,14 +311,11 @@ func (y *Cloud189TV) RapidUpload(ctx context.Context, dstDir model.Obj, stream m
 
 // 旧版本上传，家庭云不支持覆盖
 func (y *Cloud189TV) OldUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, isFamily bool, overwrite bool) (model.Obj, error) {
-	fileMd5 := file.GetHash().GetHash(utils.MD5)
-	var tempFile = file.GetFile()
-	var err error
-	if len(fileMd5) != utils.MD5.Width {
-		tempFile, fileMd5, err = stream.CacheFullAndHash(file, &up, utils.MD5)
-	} else if tempFile == nil {
-		tempFile, err = file.CacheFullAndWriter(&up, nil)
+	tempFile, err := file.CacheFullInTempFile()
+	if err != nil {
+		return nil, err
 	}
+	fileMd5, err := utils.HashFile(utils.MD5, tempFile)
 	if err != nil {
 		return nil, err
 	}
@@ -334,10 +328,6 @@ func (y *Cloud189TV) OldUpload(ctx context.Context, dstDir model.Obj, file model
 
 	// 网盘中不存在该文件，开始上传
 	status := GetUploadFileStatusResp{CreateUploadFileResp: *uploadInfo}
-	// driver.RateLimitReader会尝试Close底层的reader
-	// 但这里的tempFile是一个*os.File，Close后就没法继续读了
-	// 所以这里用io.NopCloser包一层
-	rateLimitedRd := driver.NewLimitedUploadStream(ctx, io.NopCloser(tempFile))
 	for status.GetSize() < file.GetSize() && status.FileDataExists != 1 {
 		if utils.IsCanceled(ctx) {
 			return nil, ctx.Err()
@@ -355,7 +345,7 @@ func (y *Cloud189TV) OldUpload(ctx context.Context, dstDir model.Obj, file model
 			header["Edrive-UploadFileId"] = fmt.Sprint(status.UploadFileId)
 		}
 
-		_, err := y.put(ctx, status.FileUploadUrl, header, true, rateLimitedRd, isFamily)
+		_, err := y.put(ctx, status.FileUploadUrl, header, true, io.NopCloser(tempFile), isFamily)
 		if err, ok := err.(*RespErr); ok && err.Code != "InputStreamReadError" {
 			return nil, err
 		}

drivers/189pc/utils.go

@@ -7,7 +7,6 @@ import (
 	"encoding/hex"
 	"encoding/xml"
 	"fmt"
-	"hash"
 	"io"
 	"net/http"
 	"net/http/cookiejar"
@@ -472,16 +471,14 @@ func (y *Cloud189PC) refreshSession() (err error) {
 // 普通上传
 // 无法上传大小为0的文件
 func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, isFamily bool, overwrite bool) (model.Obj, error) {
-	// 文件大小
-	fileSize := file.GetSize()
-	// 分片大小，不得为文件大小
-	sliceSize := partSize(fileSize)
+	size := file.GetSize()
+	sliceSize := partSize(size)
 
 	params := Params{
 		"parentFolderId": dstDir.GetID(),
 		"fileName":       url.QueryEscape(file.GetName()),
-		"fileSize":       fmt.Sprint(fileSize),
-		"sliceSize":      fmt.Sprint(sliceSize), // 必须为特定分片大小
+		"fileSize":       fmt.Sprint(file.GetSize()),
+		"sliceSize":      fmt.Sprint(sliceSize),
 		"lazyCheck":      "1",
 	}
 
@@ -503,101 +500,66 @@ func (y *Cloud189PC) StreamUpload(ctx context.Context, dstDir model.Obj, file mo
 		return nil, err
 	}
 
-	ss, err := stream.NewStreamSectionReader(file, int(sliceSize), &up)
-	if err != nil {
-		return nil, err
-	}
-
-	threadG, upCtx := errgroup.NewOrderedGroupWithContext(ctx, y.uploadThread,
+	threadG, upCtx := errgroup.NewGroupWithContext(ctx, y.uploadThread,
 		retry.Attempts(3),
 		retry.Delay(time.Second),
 		retry.DelayType(retry.BackOffDelay))
 
-	count := 1
-	if fileSize > sliceSize {
-		count = int((fileSize + sliceSize - 1) / sliceSize)
-	}
-	lastPartSize := fileSize % sliceSize
-	if lastPartSize == 0 {
+	count := int(size / sliceSize)
+	lastPartSize := size % sliceSize
+	if lastPartSize > 0 {
+		count++
+	} else {
 		lastPartSize = sliceSize
 	}
-
-	silceMd5Hexs := make([]string, 0, count)
+	fileMd5 := utils.MD5.NewFunc()
 	silceMd5 := utils.MD5.NewFunc()
-	var writers io.Writer = silceMd5
-
-	fileMd5Hex := file.GetHash().GetHash(utils.MD5)
-	var fileMd5 hash.Hash
-	if len(fileMd5Hex) != utils.MD5.Width {
-		fileMd5 = utils.MD5.NewFunc()
-		writers = io.MultiWriter(silceMd5, fileMd5)
-	}
+	silceMd5Hexs := make([]string, 0, count)
+	teeReader := io.TeeReader(file, io.MultiWriter(fileMd5, silceMd5))
+	byteSize := sliceSize
 	for i := 1; i <= count; i++ {
 		if utils.IsCanceled(upCtx) {
 			break
 		}
-		offset := int64((i)-1) * sliceSize
-		partSize := sliceSize
 		if i == count {
-			partSize = lastPartSize
+			byteSize = lastPartSize
+		}
+		byteData := make([]byte, byteSize)
+		// 读取块
+		silceMd5.Reset()
+		if _, err := io.ReadFull(teeReader, byteData); err != io.EOF && err != nil {
+			return nil, err
 		}
-		partInfo := ""
-		var reader *stream.SectionReader
-		var rateLimitedRd io.Reader
-		threadG.GoWithLifecycle(errgroup.Lifecycle{
-			Before: func(ctx context.Context) error {
-				if reader == nil {
-					var err error
-					reader, err = ss.GetSectionReader(offset, partSize)
-					if err != nil {
-						return err
-					}
-					silceMd5.Reset()
-					w, err := utils.CopyWithBuffer(writers, reader)
-					if w != partSize {
-						return fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", partSize, w, err)
-					}
-					// 计算块md5并进行hex和base64编码
-					md5Bytes := silceMd5.Sum(nil)
-					silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Bytes)))
-					partInfo = fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes))
 
-					rateLimitedRd = driver.NewLimitedUploadStream(ctx, reader)
-				}
-				return nil
-			},
-			Do: func(ctx context.Context) error {
-				reader.Seek(0, io.SeekStart)
-				uploadUrls, err := y.GetMultiUploadUrls(ctx, isFamily, initMultiUpload.Data.UploadFileID, partInfo)
-				if err != nil {
-					return err
-				}
+		// 计算块md5并进行hex和base64编码
+		md5Bytes := silceMd5.Sum(nil)
+		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Bytes)))
+		partInfo := fmt.Sprintf("%d-%s", i, base64.StdEncoding.EncodeToString(md5Bytes))
 
-				// step.4 上传切片
-				uploadUrl := uploadUrls[0]
-				_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false,
-					driver.NewLimitedUploadStream(ctx, rateLimitedRd), isFamily)
-				if err != nil {
-					return err
-				}
-				up(float64(threadG.Success()) * 100 / float64(count))
-				return nil
-			},
-			After: func(err error) {
-				ss.FreeSectionReader(reader)
-			},
-		},
-		)
+		threadG.Go(func(ctx context.Context) error {
+			uploadUrls, err := y.GetMultiUploadUrls(ctx, isFamily, initMultiUpload.Data.UploadFileID, partInfo)
+			if err != nil {
+				return err
+			}
+
+			// step.4 上传切片
+			uploadUrl := uploadUrls[0]
+			_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false,
+				driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)), isFamily)
+			if err != nil {
+				return err
+			}
+			up(float64(threadG.Success()) * 100 / float64(count))
+			return nil
+		})
 	}
 	if err = threadG.Wait(); err != nil {
 		return nil, err
 	}
 
-	if fileMd5 != nil {
-		fileMd5Hex = strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
-	}
+	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
 	sliceMd5Hex := fileMd5Hex
-	if fileSize > sliceSize {
+	if file.GetSize() > sliceSize {
 		sliceMd5Hex = strings.ToUpper(utils.GetMD5EncodeStr(strings.Join(silceMd5Hexs, "\n")))
 	}
 
@@ -658,12 +620,11 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 		cache = tmpF
 	}
 	sliceSize := partSize(size)
-	count := 1
-	if size > sliceSize {
-		count = int((size + sliceSize - 1) / sliceSize)
-	}
+	count := int(size / sliceSize)
 	lastSliceSize := size % sliceSize
-	if lastSliceSize == 0 {
+	if lastSliceSize > 0 {
+		count++
+	} else {
 		lastSliceSize = sliceSize
 	}
 
@@ -777,8 +738,7 @@ func (y *Cloud189PC) FastUpload(ctx context.Context, dstDir model.Obj, file mode
 				}
 
 				// step.4 上传切片
-				rateLimitedRd := driver.NewLimitedUploadStream(ctx, io.NewSectionReader(cache, offset, byteSize))
-				_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, rateLimitedRd, isFamily)
+				_, err = y.put(ctx, uploadUrl.RequestURL, uploadUrl.Headers, false, io.NewSectionReader(cache, offset, byteSize), isFamily)
 				if err != nil {
 					return err
 				}
@@ -860,7 +820,7 @@ func (y *Cloud189PC) GetMultiUploadUrls(ctx context.Context, isFamily bool, uplo
 
 // 旧版本上传，家庭云不支持覆盖
 func (y *Cloud189PC) OldUpload(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, isFamily bool, overwrite bool) (model.Obj, error) {
-	tempFile, fileMd5, err := stream.CacheFullAndHash(file, &up, utils.MD5)
+	tempFile, fileMd5, err := stream.CacheFullInTempFileAndHash(file, utils.MD5)
 	if err != nil {
 		return nil, err
 	}

drivers/alias/driver.go

@@ -3,9 +3,7 @@ package alias
 import (
 	"context"
 	"errors"
-	"fmt"
 	"io"
-	"net/url"
 	stdpath "path"
 	"strings"
 
@@ -13,11 +11,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/fs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-	"github.com/OpenListTeam/OpenList/v4/internal/sign"
 	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/OpenListTeam/OpenList/v4/server/common"
 )
 
 type Alias struct {
@@ -80,18 +75,10 @@ func (d *Alias) Get(ctx context.Context, path string) (model.Obj, error) {
 		return nil, errs.ObjectNotFound
 	}
 	for _, dst := range dsts {
-		obj, err := fs.Get(ctx, stdpath.Join(dst, sub), &fs.GetArgs{NoLog: true})
-		if err != nil {
-			continue
+		obj, err := d.get(ctx, path, dst, sub)
+		if err == nil {
+			return obj, nil
 		}
-		return &model.Object{
-			Path:     path,
-			Name:     obj.GetName(),
-			Size:     obj.GetSize(),
-			Modified: obj.ModTime(),
-			IsFolder: obj.IsDir(),
-			HashInfo: obj.GetHash(),
-		}, nil
 	}
 	return nil, errs.ObjectNotFound
 }
@@ -109,27 +96,7 @@ func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 	var objs []model.Obj
 	fsArgs := &fs.ListArgs{NoLog: true, Refresh: args.Refresh}
 	for _, dst := range dsts {
-		tmp, err := fs.List(ctx, stdpath.Join(dst, sub), fsArgs)
-		if err == nil {
-			tmp, err = utils.SliceConvert(tmp, func(obj model.Obj) (model.Obj, error) {
-				thumb, ok := model.GetThumb(obj)
-				objRes := model.Object{
-					Name:     obj.GetName(),
-					Size:     obj.GetSize(),
-					Modified: obj.ModTime(),
-					IsFolder: obj.IsDir(),
-				}
-				if !ok {
-					return &objRes, nil
-				}
-				return &model.ObjThumb{
-					Object: objRes,
-					Thumbnail: model.Thumbnail{
-						Thumbnail: thumb,
-					},
-				}, nil
-			})
-		}
+		tmp, err := d.list(ctx, dst, sub, fsArgs)
 		if err == nil {
 			objs = append(objs, tmp...)
 		}
@@ -143,45 +110,21 @@ func (d *Alias) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 	if !ok {
 		return nil, errs.ObjectNotFound
 	}
-	// proxy || ftp,s3
-	if common.GetApiUrl(ctx) == "" {
-		args.Redirect = false
-	}
 	for _, dst := range dsts {
-		reqPath := stdpath.Join(dst, sub)
-		link, fi, err := d.link(ctx, reqPath, args)
-		if err != nil {
-			continue
+		link, err := d.link(ctx, dst, sub, args)
+		if err == nil {
+			if !args.Redirect && len(link.URL) > 0 {
+				// 正常情况下 多并发 仅支持返回URL的驱动
+				// alias套娃alias 可以让crypt、mega等驱动(不返回URL的) 支持并发
+				if d.DownloadConcurrency > 0 {
+					link.Concurrency = d.DownloadConcurrency
+				}
+				if d.DownloadPartSize > 0 {
+					link.PartSize = d.DownloadPartSize * utils.KB
+				}
+			}
+			return link, nil
 		}
-		if link == nil {
-			// 重定向且需要通过代理
-			return &model.Link{
-				URL: fmt.Sprintf("%s/p%s?sign=%s",
-					common.GetApiUrl(ctx),
-					utils.EncodePath(reqPath, true),
-					sign.Sign(reqPath)),
-			}, nil
-		}
-
-		resultLink := *link
-		resultLink.SyncClosers = utils.NewSyncClosers(link)
-		if args.Redirect {
-			return &resultLink, nil
-		}
-
-		if resultLink.ContentLength == 0 {
-			resultLink.ContentLength = fi.GetSize()
-		}
-		if resultLink.MFile != nil {
-			return &resultLink, nil
-		}
-		if d.DownloadConcurrency > 0 {
-			resultLink.Concurrency = d.DownloadConcurrency
-		}
-		if d.DownloadPartSize > 0 {
-			resultLink.PartSize = d.DownloadPartSize * utils.KB
-		}
-		return &resultLink, nil
 	}
 	return nil, errs.ObjectNotFound
 }
@@ -223,8 +166,7 @@ func (d *Alias) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 	}
 	if len(srcPath) == len(dstPath) {
 		for i := range srcPath {
-			_, e := fs.Move(ctx, *srcPath[i], *dstPath[i])
-			err = errors.Join(err, e)
+			err = errors.Join(err, fs.Move(ctx, *srcPath[i], *dstPath[i]))
 		}
 		return err
 	} else {
@@ -308,29 +250,20 @@ func (d *Alias) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer,
 	reqPath, err := d.getReqPath(ctx, dstDir, true)
 	if err == nil {
 		if len(reqPath) == 1 {
-			storage, reqActualPath, err := op.GetStorageAndActualPath(*reqPath[0])
-			if err != nil {
-				return err
-			}
-			return op.Put(ctx, storage, reqActualPath, &stream.FileStream{
-				Obj:      s,
-				Mimetype: s.GetMimetype(),
-				Reader:   s,
-			}, up)
+			return fs.PutDirectly(ctx, *reqPath[0], s)
 		} else {
-			file, err := s.CacheFullAndWriter(nil, nil)
+			defer s.Close()
+			file, err := s.CacheFullInTempFile()
 			if err != nil {
 				return err
 			}
-			count := float64(len(reqPath) + 1)
-			up(100 / count)
-			for i, path := range reqPath {
+			for _, path := range reqPath {
 				err = errors.Join(err, fs.PutDirectly(ctx, *path, &stream.FileStream{
-					Obj:      s,
-					Mimetype: s.GetMimetype(),
-					Reader:   file,
+					Obj:          s,
+					Mimetype:     s.GetMimetype(),
+					WebPutAsTask: s.NeedStore(),
+					Reader:       file,
 				}))
-				up(float64(i+2) / float64(count) * 100)
 				_, e := file.Seek(0, io.SeekStart)
 				if e != nil {
 					return errors.Join(err, e)
@@ -402,24 +335,18 @@ func (d *Alias) Extract(ctx context.Context, obj model.Obj, args model.ArchiveIn
 		return nil, errs.ObjectNotFound
 	}
 	for _, dst := range dsts {
-		reqPath := stdpath.Join(dst, sub)
-		link, err := d.extract(ctx, reqPath, args)
-		if err != nil {
-			continue
+		link, err := d.extract(ctx, dst, sub, args)
+		if err == nil {
+			if !args.Redirect && len(link.URL) > 0 {
+				if d.DownloadConcurrency > 0 {
+					link.Concurrency = d.DownloadConcurrency
+				}
+				if d.DownloadPartSize > 0 {
+					link.PartSize = d.DownloadPartSize * utils.KB
+				}
+			}
+			return link, nil
 		}
-		if link == nil {
-			return &model.Link{
-				URL: fmt.Sprintf("%s/ap%s?inner=%s&pass=%s&sign=%s",
-					common.GetApiUrl(ctx),
-					utils.EncodePath(reqPath, true),
-					utils.EncodePath(args.InnerPath, true),
-					url.QueryEscape(args.Password),
-					sign.SignArchive(reqPath)),
-			}, nil
-		}
-		resultLink := *link
-		resultLink.SyncClosers = utils.NewSyncClosers(link)
-		return &resultLink, nil
 	}
 	return nil, errs.NotImplement
 }

drivers/alias/util.go

@@ -2,6 +2,8 @@ package alias
 
 import (
 	"context"
+	"fmt"
+	"net/url"
 	stdpath "path"
 	"strings"
 
@@ -10,6 +12,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/fs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
+	"github.com/OpenListTeam/OpenList/v4/internal/sign"
+	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/OpenListTeam/OpenList/v4/server/common"
 )
 
@@ -50,22 +54,79 @@ func (d *Alias) getRootAndPath(path string) (string, string) {
 	return parts[0], parts[1]
 }
 
-func (d *Alias) link(ctx context.Context, reqPath string, args model.LinkArgs) (*model.Link, model.Obj, error) {
+func (d *Alias) get(ctx context.Context, path string, dst, sub string) (model.Obj, error) {
+	obj, err := fs.Get(ctx, stdpath.Join(dst, sub), &fs.GetArgs{NoLog: true})
+	if err != nil {
+		return nil, err
+	}
+	return &model.Object{
+		Path:     path,
+		Name:     obj.GetName(),
+		Size:     obj.GetSize(),
+		Modified: obj.ModTime(),
+		IsFolder: obj.IsDir(),
+		HashInfo: obj.GetHash(),
+	}, nil
+}
+
+func (d *Alias) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]model.Obj, error) {
+	objs, err := fs.List(ctx, stdpath.Join(dst, sub), args)
+	// the obj must implement the model.SetPath interface
+	// return objs, err
+	if err != nil {
+		return nil, err
+	}
+	return utils.SliceConvert(objs, func(obj model.Obj) (model.Obj, error) {
+		thumb, ok := model.GetThumb(obj)
+		objRes := model.Object{
+			Name:     obj.GetName(),
+			Size:     obj.GetSize(),
+			Modified: obj.ModTime(),
+			IsFolder: obj.IsDir(),
+		}
+		if !ok {
+			return &objRes, nil
+		}
+		return &model.ObjThumb{
+			Object: objRes,
+			Thumbnail: model.Thumbnail{
+				Thumbnail: thumb,
+			},
+		}, nil
+	})
+}
+
+func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs) (*model.Link, error) {
+	reqPath := stdpath.Join(dst, sub)
+	// 参考 crypt 驱动
 	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	if !args.Redirect {
-		return op.Link(ctx, storage, reqActualPath, args)
+	useRawLink := len(common.GetApiUrl(ctx)) == 0 // ftp、s3
+	if !useRawLink {
+		_, ok := storage.(*Alias)
+		useRawLink = !ok && !args.Redirect
 	}
-	obj, err := fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
+	if useRawLink {
+		link, _, err := op.Link(ctx, storage, reqActualPath, args)
+		return link, err
+	}
+	_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	if common.ShouldProxy(storage, stdpath.Base(reqPath)) {
-		return nil, obj, nil
+	if common.ShouldProxy(storage, stdpath.Base(sub)) {
+		link := &model.Link{
+			URL: fmt.Sprintf("%s/p%s?sign=%s",
+				common.GetApiUrl(ctx),
+				utils.EncodePath(reqPath, true),
+				sign.Sign(reqPath)),
+		}
+		return link, nil
 	}
-	return op.Link(ctx, storage, reqActualPath, args)
+	link, _, err := op.Link(ctx, storage, reqActualPath, args)
+	return link, err
 }
 
 func (d *Alias) getReqPath(ctx context.Context, obj model.Obj, isParent bool) ([]*string, error) {
@@ -136,7 +197,8 @@ func (d *Alias) listArchive(ctx context.Context, dst, sub string, args model.Arc
 	return nil, errs.NotImplement
 }
 
-func (d *Alias) extract(ctx context.Context, reqPath string, args model.ArchiveInnerArgs) (*model.Link, error) {
+func (d *Alias) extract(ctx context.Context, dst, sub string, args model.ArchiveInnerArgs) (*model.Link, error) {
+	reqPath := stdpath.Join(dst, sub)
 	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
 	if err != nil {
 		return nil, err
@@ -144,12 +206,20 @@ func (d *Alias) extract(ctx context.Context, reqPath string, args model.ArchiveI
 	if _, ok := storage.(driver.ArchiveReader); !ok {
 		return nil, errs.NotImplement
 	}
-	if args.Redirect && common.ShouldProxy(storage, stdpath.Base(reqPath)) {
-		_, err := fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
-		if err == nil {
+	if args.Redirect && common.ShouldProxy(storage, stdpath.Base(sub)) {
+		_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
+		if err != nil {
 			return nil, err
 		}
-		return nil, nil
+		link := &model.Link{
+			URL: fmt.Sprintf("%s/ap%s?inner=%s&pass=%s&sign=%s",
+				common.GetApiUrl(ctx),
+				utils.EncodePath(reqPath, true),
+				utils.EncodePath(args.InnerPath, true),
+				url.QueryEscape(args.Password),
+				sign.SignArchive(reqPath)),
+		}
+		return link, nil
 	}
 	link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
 	return link, err

drivers/aliyundrive/driver.go

@@ -165,7 +165,7 @@ func (d *AliDrive) Remove(ctx context.Context, obj model.Obj) error {
 }
 
 func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.FileStreamer, up driver.UpdateProgress) error {
-	file := &stream.FileStream{
+	file := stream.FileStream{
 		Obj:      streamer,
 		Reader:   streamer,
 		Mimetype: streamer.GetMimetype(),
@@ -209,7 +209,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 				io.Closer
 			}{
 				Reader: io.MultiReader(buf, file),
-				Closer: file,
+				Closer: &file,
 			}
 		}
 	} else {
@@ -297,10 +297,11 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, streamer model.Fil
 		if d.InternalUpload {
 			url = partInfo.InternalUploadUrl
 		}
-		req, err := http.NewRequestWithContext(ctx, http.MethodPut, url, io.LimitReader(rateLimited, DEFAULT))
+		req, err := http.NewRequest("PUT", url, io.LimitReader(rateLimited, DEFAULT))
 		if err != nil {
 			return err
 		}
+		req = req.WithContext(ctx)
 		res, err := base.HttpClient.Do(req)
 		if err != nil {
 			return err

drivers/aliyundrive_open/driver.go

@@ -3,6 +3,7 @@ package aliyundrive_open
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"path/filepath"
 	"time"
@@ -12,6 +13,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
+	"github.com/OpenListTeam/rateg"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 )
@@ -22,8 +24,9 @@ type AliyundriveOpen struct {
 
 	DriveId string
 
-	limiter *limiter
-	ref     *AliyundriveOpen
+	limitList func(ctx context.Context, data base.Json) (*Files, error)
+	limitLink func(ctx context.Context, file model.Obj) (*model.Link, error)
+	ref       *AliyundriveOpen
 }
 
 func (d *AliyundriveOpen) Config() driver.Config {
@@ -35,23 +38,25 @@ func (d *AliyundriveOpen) GetAddition() driver.Additional {
 }
 
 func (d *AliyundriveOpen) Init(ctx context.Context) error {
-	d.limiter = getLimiterForUser(globalLimiterUserID) // First create a globally shared limiter to limit the initial requests.
 	if d.LIVPDownloadFormat == "" {
 		d.LIVPDownloadFormat = "jpeg"
 	}
 	if d.DriveType == "" {
 		d.DriveType = "default"
 	}
-	res, err := d.request(ctx, limiterOther, "/adrive/v1.0/user/getDriveInfo", http.MethodPost, nil)
+	res, err := d.request("/adrive/v1.0/user/getDriveInfo", http.MethodPost, nil)
 	if err != nil {
-		d.limiter.free()
-		d.limiter = nil
 		return err
 	}
 	d.DriveId = utils.Json.Get(res, d.DriveType+"_drive_id").ToString()
-	userid := utils.Json.Get(res, "user_id").ToString()
-	d.limiter.free()
-	d.limiter = getLimiterForUser(userid) // Allocate a corresponding limiter for each user.
+	d.limitList = rateg.LimitFnCtx(d.list, rateg.LimitFnOption{
+		Limit:  4,
+		Bucket: 1,
+	})
+	d.limitLink = rateg.LimitFnCtx(d.link, rateg.LimitFnOption{
+		Limit:  1,
+		Bucket: 1,
+	})
 	return nil
 }
 
@@ -65,8 +70,6 @@ func (d *AliyundriveOpen) InitReference(storage driver.Driver) error {
 }
 
 func (d *AliyundriveOpen) Drop(ctx context.Context) error {
-	d.limiter.free()
-	d.limiter = nil
 	d.ref = nil
 	return nil
 }
@@ -84,6 +87,9 @@ func (d *AliyundriveOpen) GetRoot(ctx context.Context) (model.Obj, error) {
 }
 
 func (d *AliyundriveOpen) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	if d.limitList == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
 	files, err := d.getFiles(ctx, dir.GetID())
 	if err != nil {
 		return nil, err
@@ -101,8 +107,8 @@ func (d *AliyundriveOpen) List(ctx context.Context, dir model.Obj, args model.Li
 	return objs, err
 }
 
-func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	res, err := d.request(ctx, limiterLink, "/adrive/v1.0/openFile/getDownloadUrl", http.MethodPost, func(req *resty.Request) {
+func (d *AliyundriveOpen) link(ctx context.Context, file model.Obj) (*model.Link, error) {
+	res, err := d.request("/adrive/v1.0/openFile/getDownloadUrl", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":   d.DriveId,
 			"file_id":    file.GetID(),
@@ -126,10 +132,17 @@ func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.L
 	}, nil
 }
 
+func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	if d.limitLink == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
+	return d.limitLink(ctx, file)
+}
+
 func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) (model.Obj, error) {
 	nowTime, _ := getNowTime()
 	newDir := File{CreatedAt: nowTime, UpdatedAt: nowTime}
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":        d.DriveId,
 			"parent_file_id":  parentDir.GetID(),
@@ -155,7 +168,7 @@ func (d *AliyundriveOpen) MakeDir(ctx context.Context, parentDir model.Obj, dirN
 
 func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
 	var resp MoveOrCopyResp
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/move", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/move", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":          d.DriveId,
 			"file_id":           srcObj.GetID(),
@@ -185,7 +198,7 @@ func (d *AliyundriveOpen) Move(ctx context.Context, srcObj, dstDir model.Obj) (m
 
 func (d *AliyundriveOpen) Rename(ctx context.Context, srcObj model.Obj, newName string) (model.Obj, error) {
 	var newFile File
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/update", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/update", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id": d.DriveId,
 			"file_id":  srcObj.GetID(),
@@ -217,7 +230,7 @@ func (d *AliyundriveOpen) Rename(ctx context.Context, srcObj model.Obj, newName
 
 func (d *AliyundriveOpen) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 	var resp MoveOrCopyResp
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/copy", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/copy", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":          d.DriveId,
 			"file_id":           srcObj.GetID(),
@@ -243,7 +256,7 @@ func (d *AliyundriveOpen) Remove(ctx context.Context, obj model.Obj) error {
 	if d.RemoveWay == "delete" {
 		uri = "/adrive/v1.0/openFile/delete"
 	}
-	_, err := d.request(ctx, limiterOther, uri, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id": d.DriveId,
 			"file_id":  obj.GetID(),
@@ -282,7 +295,7 @@ func (d *AliyundriveOpen) Other(ctx context.Context, args model.OtherArgs) (inte
 	default:
 		return nil, errs.NotSupport
 	}
-	_, err := d.request(ctx, limiterOther, uri, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetResult(&resp)
 	})
 	if err != nil {

drivers/aliyundrive_open/limiter.go

@@ -1,96 +0,0 @@
-package aliyundrive_open
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"golang.org/x/time/rate"
-)
-
-// See document https://www.yuque.com/aliyundrive/zpfszx/mqocg38hlxzc5vcd
-// See issue https://github.com/OpenListTeam/OpenList/issues/724
-// We got limit per user per app, so the limiter should be global.
-
-type limiterType int
-
-const (
-	limiterList limiterType = iota
-	limiterLink
-	limiterOther
-)
-
-const (
-	listRateLimit       = 3.9  // 4 per second in document, but we use 3.9 per second to be safe
-	linkRateLimit       = 0.9  // 1 per second in document, but we use 0.9 per second to be safe
-	otherRateLimit      = 14.9 // 15 per second in document, but we use 14.9 per second to be safe
-	globalLimiterUserID = ""   // Global limiter user ID, used to limit the initial requests.
-)
-
-type limiter struct {
-	usedBy int
-	list   *rate.Limiter
-	link   *rate.Limiter
-	other  *rate.Limiter
-}
-
-var limiters = make(map[string]*limiter)
-var limitersLock = &sync.Mutex{}
-
-func getLimiterForUser(userid string) *limiter {
-	limitersLock.Lock()
-	defer limitersLock.Unlock()
-	defer func() {
-		// Clean up limiters that are no longer used.
-		for id, lim := range limiters {
-			if lim.usedBy <= 0 && id != globalLimiterUserID { // Do not delete the global limiter.
-				delete(limiters, id)
-			}
-		}
-	}()
-	if lim, ok := limiters[userid]; ok {
-		lim.usedBy++
-		return lim
-	}
-	lim := &limiter{
-		usedBy: 1,
-		list:   rate.NewLimiter(rate.Limit(listRateLimit), 1),
-		link:   rate.NewLimiter(rate.Limit(linkRateLimit), 1),
-		other:  rate.NewLimiter(rate.Limit(otherRateLimit), 1),
-	}
-	limiters[userid] = lim
-	return lim
-}
-
-func (l *limiter) wait(ctx context.Context, typ limiterType) error {
-	if l == nil {
-		return fmt.Errorf("driver not init")
-	}
-	switch typ {
-	case limiterList:
-		return l.list.Wait(ctx)
-	case limiterLink:
-		return l.link.Wait(ctx)
-	case limiterOther:
-		return l.other.Wait(ctx)
-	default:
-		return fmt.Errorf("unknown limiter type")
-	}
-}
-func (l *limiter) free() {
-	if l == nil {
-		return
-	}
-	limitersLock.Lock()
-	defer limitersLock.Unlock()
-	l.usedBy--
-}
-func (d *AliyundriveOpen) wait(ctx context.Context, typ limiterType) error {
-	if d == nil {
-		return fmt.Errorf("driver not init")
-	}
-	if d.ref != nil {
-		return d.ref.wait(ctx, typ) // If this is a reference driver, wait on the reference driver.
-	}
-	return d.limiter.wait(ctx, typ)
-}

drivers/aliyundrive_open/meta.go

@@ -12,7 +12,6 @@ type Addition struct {
 	OrderBy            string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
 	OrderDirection     string `json:"order_direction" type:"select" options:"ASC,DESC"`
 	UseOnlineAPI       bool   `json:"use_online_api" default:"true"`
-	AlipanType         string `json:"alipan_type" required:"true" type:"select" default:"default" options:"default,alipanTV"`
 	APIAddress         string `json:"api_url_address" default:"https://api.oplist.org/alicloud/renewapi"`
 	ClientID           string `json:"client_id" help:"Keep it empty if you don't have one"`
 	ClientSecret       string `json:"client_secret" help:"Keep it empty if you don't have one"`
@@ -25,6 +24,12 @@ type Addition struct {
 
 var config = driver.Config{
 	Name:              "AliyundriveOpen",
+	LocalSort:         false,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          false,
+	NeedMs:            false,
 	DefaultRoot:       "root",
 	NoOverwriteUpload: true,
 }

drivers/aliyundrive_open/upload.go

@@ -50,10 +50,10 @@ func calPartSize(fileSize int64) int64 {
 	return partSize
 }
 
-func (d *AliyundriveOpen) getUploadUrl(ctx context.Context, count int, fileId, uploadId string) ([]PartInfo, error) {
+func (d *AliyundriveOpen) getUploadUrl(count int, fileId, uploadId string) ([]PartInfo, error) {
 	partInfoList := makePartInfos(count)
 	var resp CreateResp
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/getUploadUrl", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/getUploadUrl", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":       d.DriveId,
 			"file_id":        fileId,
@@ -69,7 +69,7 @@ func (d *AliyundriveOpen) uploadPart(ctx context.Context, r io.Reader, partInfo
 	if d.InternalUpload {
 		uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
 	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadUrl, r)
+	req, err := http.NewRequestWithContext(ctx, "PUT", uploadUrl, r)
 	if err != nil {
 		return err
 	}
@@ -84,10 +84,10 @@ func (d *AliyundriveOpen) uploadPart(ctx context.Context, r io.Reader, partInfo
 	return nil
 }
 
-func (d *AliyundriveOpen) completeUpload(ctx context.Context, fileId, uploadId string) (model.Obj, error) {
+func (d *AliyundriveOpen) completeUpload(fileId, uploadId string) (model.Obj, error) {
 	// 3. complete
 	var newFile File
-	_, err := d.request(ctx, limiterOther, "/adrive/v1.0/openFile/complete", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/complete", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id":  d.DriveId,
 			"file_id":   fileId,
@@ -137,8 +137,11 @@ func (d *AliyundriveOpen) calProofCode(stream model.FileStreamer) (string, error
 	}
 	buf := make([]byte, length)
 	n, err := io.ReadFull(reader, buf)
-	if n != int(length) {
-		return "", fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", length, n, err)
+	if err == io.ErrUnexpectedEOF {
+		return "", fmt.Errorf("can't read data, expected=%d, got=%d", len(buf), n)
+	}
+	if err != nil {
+		return "", err
 	}
 	return base64.StdEncoding.EncodeToString(buf), nil
 }
@@ -180,7 +183,7 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 		createData["pre_hash"] = hash
 	}
 	var createResp CreateResp
-	_, err, e := d.requestReturnErrResp(ctx, limiterOther, "/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
+	_, err, e := d.requestReturnErrResp("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(createData).SetResult(&createResp)
 	})
 	if err != nil {
@@ -191,7 +194,7 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 
 		hash := stream.GetHash().GetHash(utils.SHA1)
 		if len(hash) != utils.SHA1.Width {
-			_, hash, err = streamPkg.CacheFullAndHash(stream, &up, utils.SHA1)
+			_, hash, err = streamPkg.CacheFullInTempFileAndHash(stream, utils.SHA1)
 			if err != nil {
 				return nil, err
 			}
@@ -205,7 +208,7 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 		if err != nil {
 			return nil, fmt.Errorf("cal proof code error: %s", err.Error())
 		}
-		_, err = d.request(ctx, limiterOther, "/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
+		_, err = d.request("/adrive/v1.0/openFile/create", http.MethodPost, func(req *resty.Request) {
 			req.SetBody(createData).SetResult(&createResp)
 		})
 		if err != nil {
@@ -216,20 +219,17 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 	if !createResp.RapidUpload {
 		// 2. normal upload
 		log.Debugf("[aliyundive_open] normal upload")
-		ss, err := streamPkg.NewStreamSectionReader(stream, int(partSize), &up)
-		if err != nil {
-			return nil, err
-		}
 
 		preTime := time.Now()
 		var offset, length int64 = 0, partSize
+		//var length
 		for i := 0; i < len(createResp.PartInfoList); i++ {
 			if utils.IsCanceled(ctx) {
 				return nil, ctx.Err()
 			}
 			// refresh upload url if 50 minutes passed
 			if time.Since(preTime) > 50*time.Minute {
-				createResp.PartInfoList, err = d.getUploadUrl(ctx, count, createResp.FileId, createResp.UploadId)
+				createResp.PartInfoList, err = d.getUploadUrl(count, createResp.FileId, createResp.UploadId)
 				if err != nil {
 					return nil, err
 				}
@@ -238,19 +238,22 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 			if remain := stream.GetSize() - offset; length > remain {
 				length = remain
 			}
-			rd, err := ss.GetSectionReader(offset, length)
-			if err != nil {
-				return nil, err
+			rd := utils.NewMultiReadable(io.LimitReader(stream, partSize))
+			if rapidUpload {
+				srd, err := stream.RangeRead(http_range.Range{Start: offset, Length: length})
+				if err != nil {
+					return nil, err
+				}
+				rd = utils.NewMultiReadable(srd)
 			}
-			rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
 			err = retry.Do(func() error {
-				rd.Seek(0, io.SeekStart)
+				_ = rd.Reset()
+				rateLimitedRd := driver.NewLimitedUploadStream(ctx, rd)
 				return d.uploadPart(ctx, rateLimitedRd, createResp.PartInfoList[i])
 			},
 				retry.Attempts(3),
 				retry.DelayType(retry.BackOffDelay),
 				retry.Delay(time.Second))
-			ss.FreeSectionReader(rd)
 			if err != nil {
 				return nil, err
 			}
@@ -263,5 +266,5 @@ func (d *AliyundriveOpen) upload(ctx context.Context, dstDir model.Obj, stream m
 
 	log.Debugf("[aliyundrive_open] create file success, resp: %+v", createResp)
 	// 3. complete
-	return d.completeUpload(ctx, createResp.FileId, createResp.UploadId)
+	return d.completeUpload(createResp.FileId, createResp.UploadId)
 }

drivers/aliyundrive_open/util.go

@@ -19,7 +19,7 @@ import (
 
 // do others that not defined in Driver interface
 
-func (d *AliyundriveOpen) _refreshToken(ctx context.Context) (string, string, error) {
+func (d *AliyundriveOpen) _refreshToken() (string, string, error) {
 	if d.UseOnlineAPI && d.APIAddress != "" {
 		u := d.APIAddress
 		var resp struct {
@@ -27,23 +27,13 @@ func (d *AliyundriveOpen) _refreshToken(ctx context.Context) (string, string, er
 			AccessToken  string `json:"access_token"`
 			ErrorMessage string `json:"text"`
 		}
-
-		// 根据AlipanType选项设置driver_txt
-		driverTxt := "alicloud_qr"
-		if d.AlipanType == "alipanTV" {
-			driverTxt = "alicloud_tv"
-		}
-		err := d.wait(ctx, limiterOther)
-		if err != nil {
-			return "", "", err
-		}
-		_, err = base.RestyClient.R().
+		_, err := base.RestyClient.R().
 			SetHeader("User-Agent", "Mozilla/5.0 (Macintosh; Apple macOS 15_5) AppleWebKit/537.36 (KHTML, like Gecko) Safari/537.36 Chrome/138.0.0.0 Openlist/425.6.30").
 			SetResult(&resp).
 			SetQueryParams(map[string]string{
 				"refresh_ui": d.RefreshToken,
 				"server_use": "true",
-				"driver_txt": driverTxt,
+				"driver_txt": "alicloud_qr",
 			}).
 			Get(u)
 		if err != nil {
@@ -53,18 +43,15 @@ func (d *AliyundriveOpen) _refreshToken(ctx context.Context) (string, string, er
 			if resp.ErrorMessage != "" {
 				return "", "", fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
 			}
-			return "", "", fmt.Errorf("empty token returned from official API, a wrong refresh token may have been used")
+			return "", "", fmt.Errorf("empty token returned from official API")
 		}
 		return resp.RefreshToken, resp.AccessToken, nil
 	}
+
 	// 本地刷新逻辑，必须要求 client_id 和 client_secret
 	if d.ClientID == "" || d.ClientSecret == "" {
 		return "", "", fmt.Errorf("empty ClientID or ClientSecret")
 	}
-	err := d.wait(ctx, limiterOther)
-	if err != nil {
-		return "", "", err
-	}
 	url := API_URL + "/oauth/access_token"
 	//var resp base.TokenResp
 	var e ErrResp
@@ -116,18 +103,18 @@ func getSub(token string) (string, error) {
 	return utils.Json.Get(bs, "sub").ToString(), nil
 }
 
-func (d *AliyundriveOpen) refreshToken(ctx context.Context) error {
+func (d *AliyundriveOpen) refreshToken() error {
 	if d.ref != nil {
-		return d.ref.refreshToken(ctx)
+		return d.ref.refreshToken()
 	}
-	refresh, access, err := d._refreshToken(ctx)
+	refresh, access, err := d._refreshToken()
 	for i := 0; i < 3; i++ {
 		if err == nil {
 			break
 		} else {
 			log.Errorf("[ali_open] failed to refresh token: %s", err)
 		}
-		refresh, access, err = d._refreshToken(ctx)
+		refresh, access, err = d._refreshToken()
 	}
 	if err != nil {
 		return err
@@ -138,12 +125,12 @@ func (d *AliyundriveOpen) refreshToken(ctx context.Context) error {
 	return nil
 }
 
-func (d *AliyundriveOpen) request(ctx context.Context, limitTy limiterType, uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
-	b, err, _ := d.requestReturnErrResp(ctx, limitTy, uri, method, callback, retry...)
+func (d *AliyundriveOpen) request(uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error) {
+	b, err, _ := d.requestReturnErrResp(uri, method, callback, retry...)
 	return b, err
 }
 
-func (d *AliyundriveOpen) requestReturnErrResp(ctx context.Context, limitTy limiterType, uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error, *ErrResp) {
+func (d *AliyundriveOpen) requestReturnErrResp(uri, method string, callback base.ReqCallback, retry ...bool) ([]byte, error, *ErrResp) {
 	req := base.RestyClient.R()
 	// TODO check whether access_token is expired
 	req.SetHeader("Authorization", "Bearer "+d.getAccessToken())
@@ -155,10 +142,6 @@ func (d *AliyundriveOpen) requestReturnErrResp(ctx context.Context, limitTy limi
 	}
 	var e ErrResp
 	req.SetError(&e)
-	err := d.wait(ctx, limitTy)
-	if err != nil {
-		return nil, err, nil
-	}
 	res, err := req.Execute(method, API_URL+uri)
 	if err != nil {
 		if res != nil {
@@ -169,11 +152,11 @@ func (d *AliyundriveOpen) requestReturnErrResp(ctx context.Context, limitTy limi
 	isRetry := len(retry) > 0 && retry[0]
 	if e.Code != "" {
 		if !isRetry && (utils.SliceContains([]string{"AccessTokenInvalid", "AccessTokenExpired", "I400JD"}, e.Code) || d.getAccessToken() == "") {
-			err = d.refreshToken(ctx)
+			err = d.refreshToken()
 			if err != nil {
 				return nil, err, nil
 			}
-			return d.requestReturnErrResp(ctx, limitTy, uri, method, callback, true)
+			return d.requestReturnErrResp(uri, method, callback, true)
 		}
 		return nil, fmt.Errorf("%s:%s", e.Code, e.Message), &e
 	}
@@ -182,7 +165,7 @@ func (d *AliyundriveOpen) requestReturnErrResp(ctx context.Context, limitTy limi
 
 func (d *AliyundriveOpen) list(ctx context.Context, data base.Json) (*Files, error) {
 	var resp Files
-	_, err := d.request(ctx, limiterList, "/adrive/v1.0/openFile/list", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("/adrive/v1.0/openFile/list", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetResult(&resp)
 	})
 	if err != nil {
@@ -211,7 +194,7 @@ func (d *AliyundriveOpen) getFiles(ctx context.Context, fileId string) ([]File,
 			//"video_thumbnail_width": 480,
 			//"image_thumbnail_width": 480,
 		}
-		resp, err := d.list(ctx, data)
+		resp, err := d.limitList(ctx, data)
 		if err != nil {
 			return nil, err
 		}

drivers/aliyundrive_share/driver.go

@@ -2,6 +2,7 @@ package aliyundrive_share
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -11,6 +12,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/cron"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
+	"github.com/OpenListTeam/rateg"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 )
@@ -23,7 +25,8 @@ type AliyundriveShare struct {
 	DriveId     string
 	cron        *cron.Cron
 
-	limiter *limiter
+	limitList func(ctx context.Context, dir model.Obj) ([]model.Obj, error)
+	limitLink func(ctx context.Context, file model.Obj) (*model.Link, error)
 }
 
 func (d *AliyundriveShare) Config() driver.Config {
@@ -35,26 +38,29 @@ func (d *AliyundriveShare) GetAddition() driver.Additional {
 }
 
 func (d *AliyundriveShare) Init(ctx context.Context) error {
-	d.limiter = getLimiter()
-	err := d.refreshToken(ctx)
+	err := d.refreshToken()
 	if err != nil {
-		d.limiter.free()
-		d.limiter = nil
 		return err
 	}
-	err = d.getShareToken(ctx)
+	err = d.getShareToken()
 	if err != nil {
-		d.limiter.free()
-		d.limiter = nil
 		return err
 	}
 	d.cron = cron.NewCron(time.Hour * 2)
 	d.cron.Do(func() {
-		err := d.refreshToken(ctx)
+		err := d.refreshToken()
 		if err != nil {
 			log.Errorf("%+v", err)
 		}
 	})
+	d.limitList = rateg.LimitFnCtx(d.list, rateg.LimitFnOption{
+		Limit:  4,
+		Bucket: 1,
+	})
+	d.limitLink = rateg.LimitFnCtx(d.link, rateg.LimitFnOption{
+		Limit:  1,
+		Bucket: 1,
+	})
 	return nil
 }
 
@@ -62,14 +68,19 @@ func (d *AliyundriveShare) Drop(ctx context.Context) error {
 	if d.cron != nil {
 		d.cron.Stop()
 	}
-	d.limiter.free()
-	d.limiter = nil
 	d.DriveId = ""
 	return nil
 }
 
 func (d *AliyundriveShare) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	files, err := d.getFiles(ctx, dir.GetID())
+	if d.limitList == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
+	return d.limitList(ctx, dir)
+}
+
+func (d *AliyundriveShare) list(ctx context.Context, dir model.Obj) ([]model.Obj, error) {
+	files, err := d.getFiles(dir.GetID())
 	if err != nil {
 		return nil, err
 	}
@@ -79,6 +90,13 @@ func (d *AliyundriveShare) List(ctx context.Context, dir model.Obj, args model.L
 }
 
 func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	if d.limitLink == nil {
+		return nil, fmt.Errorf("driver not init")
+	}
+	return d.limitLink(ctx, file)
+}
+
+func (d *AliyundriveShare) link(ctx context.Context, file model.Obj) (*model.Link, error) {
 	data := base.Json{
 		"drive_id": d.DriveId,
 		"file_id":  file.GetID(),
@@ -87,7 +105,7 @@ func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.
 		"share_id":   d.ShareId,
 	}
 	var resp ShareLinkResp
-	_, err := d.request(ctx, limiterLink, "https://api.alipan.com/v2/file/get_share_link_download_url", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request("https://api.alipan.com/v2/file/get_share_link_download_url", http.MethodPost, func(req *resty.Request) {
 		req.SetHeader(CanaryHeaderKey, CanaryHeaderValue).SetBody(data).SetResult(&resp)
 	})
 	if err != nil {
@@ -117,7 +135,7 @@ func (d *AliyundriveShare) Other(ctx context.Context, args model.OtherArgs) (int
 	default:
 		return nil, errs.NotSupport
 	}
-	_, err := d.request(ctx, limiterOther, url, http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(url, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetResult(&resp)
 	})
 	if err != nil {

drivers/aliyundrive_share/limiter.go

@@ -1,67 +0,0 @@
-package aliyundrive_share
-
-import (
-	"context"
-	"fmt"
-
-	"golang.org/x/time/rate"
-)
-
-// See issue https://github.com/OpenListTeam/OpenList/issues/724
-// Seems there is no limit per user.
-
-type limiterType int
-
-const (
-	limiterList limiterType = iota
-	limiterLink
-	limiterOther
-)
-
-const (
-	listRateLimit  = 3.9  // 4 per second in document, but we use 3.9 per second to be safe
-	linkRateLimit  = 0.9  // 1 per second in document, but we use 0.9 per second to be safe
-	otherRateLimit = 14.9 // 15 per second in document, but we use 14.9 per second to be safe
-)
-
-type limiter struct {
-	list  *rate.Limiter
-	link  *rate.Limiter
-	other *rate.Limiter
-}
-
-func getLimiter() *limiter {
-	return &limiter{
-		list:  rate.NewLimiter(rate.Limit(listRateLimit), 1),
-		link:  rate.NewLimiter(rate.Limit(linkRateLimit), 1),
-		other: rate.NewLimiter(rate.Limit(otherRateLimit), 1),
-	}
-}
-
-func (l *limiter) wait(ctx context.Context, typ limiterType) error {
-	if l == nil {
-		return fmt.Errorf("driver not init")
-	}
-	switch typ {
-	case limiterList:
-		return l.list.Wait(ctx)
-	case limiterLink:
-		return l.link.Wait(ctx)
-	case limiterOther:
-		return l.other.Wait(ctx)
-	default:
-		return fmt.Errorf("unknown limiter type")
-	}
-}
-func (l *limiter) free() {
-
-}
-func (d *AliyundriveShare) wait(ctx context.Context, typ limiterType) error {
-	if d == nil {
-		return fmt.Errorf("driver not init")
-	}
-	//if d.ref != nil {
-	//	return d.ref.wait(ctx, typ) // If this is a reference driver, wait on the reference driver.
-	//}
-	return d.limiter.wait(ctx, typ)
-}

drivers/aliyundrive_share/util.go

@@ -1,7 +1,6 @@
 package aliyundrive_share
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
@@ -16,15 +15,11 @@ const (
 	CanaryHeaderValue = "client=web,app=share,version=v2.3.1"
 )
 
-func (d *AliyundriveShare) refreshToken(ctx context.Context) error {
-	err := d.wait(ctx, limiterOther)
-	if err != nil {
-		return err
-	}
+func (d *AliyundriveShare) refreshToken() error {
 	url := "https://auth.alipan.com/v2/account/token"
 	var resp base.TokenResp
 	var e ErrorResp
-	_, err = base.RestyClient.R().
+	_, err := base.RestyClient.R().
 		SetBody(base.Json{"refresh_token": d.RefreshToken, "grant_type": "refresh_token"}).
 		SetResult(&resp).
 		SetError(&e).
@@ -41,11 +36,7 @@ func (d *AliyundriveShare) refreshToken(ctx context.Context) error {
 }
 
 // do others that not defined in Driver interface
-func (d *AliyundriveShare) getShareToken(ctx context.Context) error {
-	err := d.wait(ctx, limiterOther)
-	if err != nil {
-		return err
-	}
+func (d *AliyundriveShare) getShareToken() error {
 	data := base.Json{
 		"share_id": d.ShareId,
 	}
@@ -54,7 +45,7 @@ func (d *AliyundriveShare) getShareToken(ctx context.Context) error {
 	}
 	var e ErrorResp
 	var resp ShareTokenResp
-	_, err = base.RestyClient.R().
+	_, err := base.RestyClient.R().
 		SetResult(&resp).SetError(&e).SetBody(data).
 		Post("https://api.alipan.com/v2/share_link/get_share_token")
 	if err != nil {
@@ -67,7 +58,7 @@ func (d *AliyundriveShare) getShareToken(ctx context.Context) error {
 	return nil
 }
 
-func (d *AliyundriveShare) request(ctx context.Context, limitTy limiterType, url, method string, callback base.ReqCallback) ([]byte, error) {
+func (d *AliyundriveShare) request(url, method string, callback base.ReqCallback) ([]byte, error) {
 	var e ErrorResp
 	req := base.RestyClient.R().
 		SetError(&e).
@@ -80,10 +71,6 @@ func (d *AliyundriveShare) request(ctx context.Context, limitTy limiterType, url
 	} else {
 		req.SetBody("{}")
 	}
-	err := d.wait(ctx, limitTy)
-	if err != nil {
-		return nil, err
-	}
 	resp, err := req.Execute(method, url)
 	if err != nil {
 		return nil, err
@@ -91,14 +78,14 @@ func (d *AliyundriveShare) request(ctx context.Context, limitTy limiterType, url
 	if e.Code != "" {
 		if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
 			if e.Code == "AccessTokenInvalid" {
-				err = d.refreshToken(ctx)
+				err = d.refreshToken()
 			} else {
-				err = d.getShareToken(ctx)
+				err = d.getShareToken()
 			}
 			if err != nil {
 				return nil, err
 			}
-			return d.request(ctx, limitTy, url, method, callback)
+			return d.request(url, method, callback)
 		} else {
 			return nil, errors.New(e.Code + ": " + e.Message)
 		}
@@ -106,7 +93,7 @@ func (d *AliyundriveShare) request(ctx context.Context, limitTy limiterType, url
 	return resp.Body(), nil
 }
 
-func (d *AliyundriveShare) getFiles(ctx context.Context, fileId string) ([]File, error) {
+func (d *AliyundriveShare) getFiles(fileId string) ([]File, error) {
 	files := make([]File, 0)
 	data := base.Json{
 		"image_thumbnail_process": "image/resize,w_160/format,jpeg",
@@ -123,10 +110,6 @@ func (d *AliyundriveShare) getFiles(ctx context.Context, fileId string) ([]File,
 		if data["marker"] == "first" {
 			data["marker"] = ""
 		}
-		err := d.wait(ctx, limiterList)
-		if err != nil {
-			return nil, err
-		}
 		var e ErrorResp
 		var resp ListResp
 		res, err := base.RestyClient.R().
@@ -140,11 +123,11 @@ func (d *AliyundriveShare) getFiles(ctx context.Context, fileId string) ([]File,
 		log.Debugf("aliyundrive share get files: %s", res.String())
 		if e.Code != "" {
 			if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
-				err = d.getShareToken(ctx)
+				err = d.getShareToken()
 				if err != nil {
 					return nil, err
 				}
-				return d.getFiles(ctx, fileId)
+				return d.getFiles(fileId)
 			}
 			return nil, errors.New(e.Message)
 		}

drivers/all.go

@@ -23,7 +23,6 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/cloudreve"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/cloudreve_v4"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/crypt"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/degoo"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/doubao"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/doubao_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/dropbox"
@@ -49,7 +48,6 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/onedrive_app"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/onedrive_sharelink"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/openlist"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/openlist_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/pikpak"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/pikpak_share"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/quark_open"
@@ -59,13 +57,12 @@ import (
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/seafile"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/sftp"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/smb"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/strm"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/teambition"
-	_ "github.com/OpenListTeam/OpenList/v4/drivers/teldrive"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/terabox"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/thunder"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/thunder_browser"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/thunderx"
+	_ "github.com/OpenListTeam/OpenList/v4/drivers/trainbit"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/url_tree"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/uss"
 	_ "github.com/OpenListTeam/OpenList/v4/drivers/virtual"

drivers/baidu_netdisk/driver.go

@@ -203,12 +203,11 @@ func (d *BaiduNetdisk) Put(ctx context.Context, dstDir model.Obj, stream model.F
 
 	streamSize := stream.GetSize()
 	sliceSize := d.getSliceSize(streamSize)
-	count := 1
-	if streamSize > sliceSize {
-		count = int((streamSize + sliceSize - 1) / sliceSize)
-	}
+	count := int(streamSize / sliceSize)
 	lastBlockSize := streamSize % sliceSize
-	if lastBlockSize == 0 {
+	if lastBlockSize > 0 {
+		count++
+	} else {
 		lastBlockSize = sliceSize
 	}
 

drivers/baidu_netdisk/util.go

@@ -55,7 +55,7 @@ func (d *BaiduNetdisk) _refreshToken() error {
 			if resp.ErrorMessage != "" {
 				return fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
 			}
-			return fmt.Errorf("empty token returned from official API, a wrong refresh token may have been used")
+			return fmt.Errorf("empty token returned from official API")
 		}
 		d.AccessToken = resp.AccessToken
 		d.RefreshToken = resp.RefreshToken

drivers/baidu_photo/driver.go

@@ -262,12 +262,11 @@ func (d *BaiduPhoto) Put(ctx context.Context, dstDir model.Obj, stream model.Fil
 
 	// 计算需要的数据
 	streamSize := stream.GetSize()
-	count := 1
-	if streamSize > DEFAULT {
-		count = int((streamSize + DEFAULT - 1) / DEFAULT)
-	}
+	count := int(streamSize / DEFAULT)
 	lastBlockSize := streamSize % DEFAULT
-	if lastBlockSize == 0 {
+	if lastBlockSize > 0 {
+		count++
+	} else {
 		lastBlockSize = DEFAULT
 	}
 

drivers/chaoxing/driver.go

@@ -255,7 +255,7 @@ func (d *ChaoXing) Put(ctx context.Context, dstDir model.Obj, file model.FileStr
 		},
 		UpdateProgress: up,
 	})
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, "https://pan-yz.chaoxing.com/upload", r)
+	req, err := http.NewRequestWithContext(ctx, "POST", "https://pan-yz.chaoxing.com/upload", r)
 	if err != nil {
 		return err
 	}

drivers/chaoxing/meta.go

@@ -32,6 +32,7 @@ func init() {
 			config: driver.Config{
 				Name:              "ChaoXingGroupDrive",
 				OnlyProxy:         true,
+				OnlyLocal:         false,
 				DefaultRoot:       "-1",
 				NoOverwriteUpload: true,
 			},

drivers/chaoxing/util.go

@@ -167,7 +167,7 @@ func (d *ChaoXing) Login() (string, error) {
 		return "", err
 	}
 	// Create the request
-	req, err := http.NewRequest(http.MethodPost, "https://passport2.chaoxing.com/fanyalogin", body)
+	req, err := http.NewRequest("POST", "https://passport2.chaoxing.com/fanyalogin", body)
 	if err != nil {
 		return "", err
 	}

drivers/cloudreve/meta.go

@@ -20,7 +20,6 @@ type Addition struct {
 var config = driver.Config{
 	Name:        "Cloudreve",
 	DefaultRoot: "/",
-	LocalSort:   true,
 }
 
 func init() {

drivers/cloudreve/util.go

@@ -18,10 +18,8 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/setting"
-	streamPkg "github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/cookie"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/avast/retry-go"
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 )
@@ -237,16 +235,13 @@ func (d *Cloudreve) upLocal(ctx context.Context, stream model.FileStreamer, u Up
 }
 
 func (d *Cloudreve) upRemote(ctx context.Context, stream model.FileStreamer, u UploadInfo, up driver.UpdateProgress) error {
-	DEFAULT := int64(u.ChunkSize)
-	ss, err := streamPkg.NewStreamSectionReader(stream, int(DEFAULT), &up)
-	if err != nil {
-		return err
-	}
-
 	uploadUrl := u.UploadURLs[0]
 	credential := u.Credential
 	var finish int64 = 0
 	var chunk int = 0
+	DEFAULT := int64(u.ChunkSize)
+	retryCount := 0
+	maxRetries := 3
 	for finish < stream.GetSize() {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -254,67 +249,69 @@ func (d *Cloudreve) upRemote(ctx context.Context, stream model.FileStreamer, u U
 		left := stream.GetSize() - finish
 		byteSize := min(left, DEFAULT)
 		utils.Log.Debugf("[Cloudreve-Remote] upload range: %d-%d/%d", finish, finish+byteSize-1, stream.GetSize())
-		rd, err := ss.GetSectionReader(finish, byteSize)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(stream, byteData)
+		utils.Log.Debug(err, n)
 		if err != nil {
 			return err
 		}
-		err = retry.Do(
-			func() error {
-				rd.Seek(0, io.SeekStart)
-				req, err := http.NewRequestWithContext(ctx, http.MethodPost, uploadUrl+"?chunk="+strconv.Itoa(chunk),
-					driver.NewLimitedUploadStream(ctx, rd))
-				if err != nil {
-					return err
-				}
-				req.ContentLength = byteSize
-				req.Header.Set("Authorization", fmt.Sprint(credential))
-				req.Header.Set("User-Agent", d.getUA())
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				defer res.Body.Close()
-				if res.StatusCode != 200 {
-					return fmt.Errorf("server error: %d", res.StatusCode)
-				}
-				body, err := io.ReadAll(res.Body)
-				if err != nil {
-					return err
-				}
-				var up Resp
-				err = json.Unmarshal(body, &up)
-				if err != nil {
-					return err
-				}
-				if up.Code != 0 {
-					return errors.New(up.Msg)
-				}
-				return nil
-			},
-			retry.Attempts(3),
-			retry.DelayType(retry.BackOffDelay),
-			retry.Delay(time.Second),
-		)
-		ss.FreeSectionReader(rd)
+		req, err := http.NewRequest("POST", uploadUrl+"?chunk="+strconv.Itoa(chunk),
+			driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
 		if err != nil {
 			return err
 		}
-		finish += byteSize
-		up(float64(finish) * 100 / float64(stream.GetSize()))
-		chunk++
+		req = req.WithContext(ctx)
+		req.ContentLength = byteSize
+		// req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
+		req.Header.Set("Authorization", fmt.Sprint(credential))
+		req.Header.Set("User-Agent", d.getUA())
+		err = func() error {
+			res, err := base.HttpClient.Do(req)
+			if err != nil {
+				return err
+			}
+			defer res.Body.Close()
+			if res.StatusCode != 200 {
+				return errors.New(res.Status)
+			}
+			body, err := io.ReadAll(res.Body)
+			if err != nil {
+				return err
+			}
+			var up Resp
+			err = json.Unmarshal(body, &up)
+			if err != nil {
+				return err
+			}
+			if up.Code != 0 {
+				return errors.New(up.Msg)
+			}
+			return nil
+		}()
+		if err == nil {
+			retryCount = 0
+			finish += byteSize
+			up(float64(finish) * 100 / float64(stream.GetSize()))
+			chunk++
+		} else {
+			retryCount++
+			if retryCount > maxRetries {
+				return fmt.Errorf("upload failed after %d retries due to server errors, error: %s", maxRetries, err)
+			}
+			backoff := time.Duration(1<<retryCount) * time.Second
+			utils.Log.Warnf("[Cloudreve-Remote] server errors while uploading, retrying after %v...", backoff)
+			time.Sleep(backoff)
+		}
 	}
 	return nil
 }
 
 func (d *Cloudreve) upOneDrive(ctx context.Context, stream model.FileStreamer, u UploadInfo, up driver.UpdateProgress) error {
-	DEFAULT := int64(u.ChunkSize)
-	ss, err := streamPkg.NewStreamSectionReader(stream, int(DEFAULT), &up)
-	if err != nil {
-		return err
-	}
-
 	uploadUrl := u.UploadURLs[0]
 	var finish int64 = 0
+	DEFAULT := int64(u.ChunkSize)
+	retryCount := 0
+	maxRetries := 3
 	for finish < stream.GetSize() {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -322,45 +319,46 @@ func (d *Cloudreve) upOneDrive(ctx context.Context, stream model.FileStreamer, u
 		left := stream.GetSize() - finish
 		byteSize := min(left, DEFAULT)
 		utils.Log.Debugf("[Cloudreve-OneDrive] upload range: %d-%d/%d", finish, finish+byteSize-1, stream.GetSize())
-		rd, err := ss.GetSectionReader(finish, byteSize)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(stream, byteData)
+		utils.Log.Debug(err, n)
 		if err != nil {
 			return err
 		}
-		err = retry.Do(
-			func() error {
-				rd.Seek(0, io.SeekStart)
-				req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadUrl, driver.NewLimitedUploadStream(ctx, rd))
-				if err != nil {
-					return err
-				}
-				req.ContentLength = byteSize
-				req.Header.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", finish, finish+byteSize-1, stream.GetSize()))
-				req.Header.Set("User-Agent", d.getUA())
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				defer res.Body.Close()
-				// https://learn.microsoft.com/zh-cn/onedrive/developer/rest-api/api/driveitem_createuploadsession
-				switch {
-				case res.StatusCode >= 500 && res.StatusCode <= 504:
-					return fmt.Errorf("server error: %d", res.StatusCode)
-				case res.StatusCode != 201 && res.StatusCode != 202 && res.StatusCode != 200:
-					data, _ := io.ReadAll(res.Body)
-					return errors.New(string(data))
-				default:
-					return nil
-				}
-			}, retry.Attempts(3),
-			retry.DelayType(retry.BackOffDelay),
-			retry.Delay(time.Second),
-		)
-		ss.FreeSectionReader(rd)
+		req, err := http.NewRequest("PUT", uploadUrl, driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
 		if err != nil {
 			return err
 		}
-		finish += byteSize
-		up(float64(finish) * 100 / float64(stream.GetSize()))
+		req = req.WithContext(ctx)
+		req.ContentLength = byteSize
+		// req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
+		req.Header.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", finish, finish+byteSize-1, stream.GetSize()))
+		req.Header.Set("User-Agent", d.getUA())
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		// https://learn.microsoft.com/zh-cn/onedrive/developer/rest-api/api/driveitem_createuploadsession
+		switch {
+		case res.StatusCode >= 500 && res.StatusCode <= 504:
+			retryCount++
+			if retryCount > maxRetries {
+				res.Body.Close()
+				return fmt.Errorf("upload failed after %d retries due to server errors, error %d", maxRetries, res.StatusCode)
+			}
+			backoff := time.Duration(1<<retryCount) * time.Second
+			utils.Log.Warnf("[Cloudreve-OneDrive] server errors %d while uploading, retrying after %v...", res.StatusCode, backoff)
+			time.Sleep(backoff)
+		case res.StatusCode != 201 && res.StatusCode != 202 && res.StatusCode != 200:
+			data, _ := io.ReadAll(res.Body)
+			res.Body.Close()
+			return errors.New(string(data))
+		default:
+			res.Body.Close()
+			retryCount = 0
+			finish += byteSize
+			up(float64(finish) * 100 / float64(stream.GetSize()))
+		}
 	}
 	// 上传成功发送回调请求
 	return d.request(http.MethodPost, "/callback/onedrive/finish/"+u.SessionID, func(req *resty.Request) {
@@ -369,15 +367,12 @@ func (d *Cloudreve) upOneDrive(ctx context.Context, stream model.FileStreamer, u
 }
 
 func (d *Cloudreve) upS3(ctx context.Context, stream model.FileStreamer, u UploadInfo, up driver.UpdateProgress) error {
-	DEFAULT := int64(u.ChunkSize)
-	ss, err := streamPkg.NewStreamSectionReader(stream, int(DEFAULT), &up)
-	if err != nil {
-		return err
-	}
-
 	var finish int64 = 0
 	var chunk int = 0
 	var etags []string
+	DEFAULT := int64(u.ChunkSize)
+	retryCount := 0
+	maxRetries := 3
 	for finish < stream.GetSize() {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -385,47 +380,45 @@ func (d *Cloudreve) upS3(ctx context.Context, stream model.FileStreamer, u Uploa
 		left := stream.GetSize() - finish
 		byteSize := min(left, DEFAULT)
 		utils.Log.Debugf("[Cloudreve-S3] upload range: %d-%d/%d", finish, finish+byteSize-1, stream.GetSize())
-		rd, err := ss.GetSectionReader(finish, byteSize)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(stream, byteData)
+		utils.Log.Debug(err, n)
 		if err != nil {
 			return err
 		}
-		err = retry.Do(
-			func() error {
-				rd.Seek(0, io.SeekStart)
-				req, err := http.NewRequestWithContext(ctx, http.MethodPut, u.UploadURLs[chunk],
-					driver.NewLimitedUploadStream(ctx, rd))
-				if err != nil {
-					return err
-				}
-				req.ContentLength = byteSize
-				req.Header.Set("User-Agent", d.getUA())
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				etag := res.Header.Get("ETag")
-				res.Body.Close()
-				switch {
-				case res.StatusCode != 200:
-					return fmt.Errorf("server error: %d", res.StatusCode)
-				case etag == "":
-					return errors.New("failed to get ETag from header")
-				default:
-					etags = append(etags, etag)
-					return nil
-				}
-			}, retry.Attempts(3),
-			retry.DelayType(retry.BackOffDelay),
-			retry.Delay(time.Second),
-		)
-		ss.FreeSectionReader(rd)
+		req, err := http.NewRequest("PUT", u.UploadURLs[chunk],
+			driver.NewLimitedUploadStream(ctx, bytes.NewBuffer(byteData)))
 		if err != nil {
 			return err
 		}
-		finish += byteSize
-		up(float64(finish) * 100 / float64(stream.GetSize()))
-		chunk++
+		req = req.WithContext(ctx)
+		req.ContentLength = byteSize
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		etag := res.Header.Get("ETag")
+		res.Body.Close()
+		switch {
+		case res.StatusCode != 200:
+			retryCount++
+			if retryCount > maxRetries {
+				return fmt.Errorf("upload failed after %d retries due to server errors, error %d", maxRetries, res.StatusCode)
+			}
+			backoff := time.Duration(1<<retryCount) * time.Second
+			utils.Log.Warnf("[Cloudreve-S3] server errors %d while uploading, retrying after %v...", res.StatusCode, backoff)
+			time.Sleep(backoff)
+		case etag == "":
+			return errors.New("failed to get ETag from header")
+		default:
+			retryCount = 0
+			etags = append(etags, etag)
+			finish += byteSize
+			up(float64(finish) * 100 / float64(stream.GetSize()))
+			chunk++
+		}
 	}
+
 	// s3LikeFinishUpload
 	// https://github.com/cloudreve/frontend/blob/b485bf297974cbe4834d2e8e744ae7b7e5b2ad39/src/component/Uploader/core/api/index.ts#L204-L252
 	bodyBuilder := &strings.Builder{}
@@ -438,8 +431,8 @@ func (d *Cloudreve) upS3(ctx context.Context, stream model.FileStreamer, u Uploa
 		))
 	}
 	bodyBuilder.WriteString("</CompleteMultipartUpload>")
-	req, err := http.NewRequestWithContext(ctx,
-		http.MethodPost,
+	req, err := http.NewRequest(
+		"POST",
 		u.CompleteURL,
 		strings.NewReader(bodyBuilder.String()),
 	)

drivers/cloudreve_v4/driver.go

@@ -20,9 +20,7 @@ import (
 type CloudreveV4 struct {
 	model.Storage
 	Addition
-	ref            *CloudreveV4
-	AccessExpires  string
-	RefreshExpires string
+	ref *CloudreveV4
 }
 
 func (d *CloudreveV4) Config() driver.Config {
@@ -46,17 +44,13 @@ func (d *CloudreveV4) Init(ctx context.Context) error {
 	if d.ref != nil {
 		return nil
 	}
-	if d.canLogin() {
-		return d.login()
-	}
-	if d.RefreshToken != "" {
+	if d.AccessToken == "" && d.RefreshToken != "" {
 		return d.refreshToken()
 	}
-	if d.AccessToken == "" {
-		return errors.New("no way to authenticate. At least AccessToken is required")
+	if d.Username != "" {
+		return d.login()
 	}
-	// ensure AccessToken is valid
-	return d.parseJWT(d.AccessToken, &AccessJWT{})
+	return nil
 }
 
 func (d *CloudreveV4) InitReference(storage driver.Driver) error {

drivers/cloudreve_v4/meta.go

@@ -26,8 +26,15 @@ type Addition struct {
 
 var config = driver.Config{
 	Name:              "Cloudreve V4",
+	LocalSort:         false,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          false,
+	NeedMs:            false,
 	DefaultRoot:       "cloudreve://my",
 	CheckStatus:       true,
+	Alert:             "",
 	NoOverwriteUpload: true,
 }
 

drivers/cloudreve_v4/types.go

@@ -47,13 +47,7 @@ type BasicConfigResp struct {
 
 type SiteLoginConfigResp struct {
 	LoginCaptcha bool `json:"login_captcha"`
-	// RegCaptcha bool `json:"reg_captcha"`
-	// ForgetCaptcha bool `json:"forget_captcha"`
-	// RegisterEnabled bool `json:"register_enabled"`
-	// TosURL string `json:"tos_url"`
-	// PrivacyPolicyURL string `json:"privacy_policy_url"`
-	// SsoDisplayName string `json:"sso_display_name"`
-	// OidcDisplayName string `json:"oidc_display_name"`
+	Authn        bool `json:"authn"`
 }
 
 type PrepareLoginResp struct {
@@ -66,27 +60,11 @@ type CaptchaResp struct {
 	Ticket string `json:"ticket"`
 }
 
-type AccessJWT struct {
-	TokenType string `json:"token_type"`
-	Sub       string `json:"sub"`
-	Exp       int64  `json:"exp"`
-	Nbf       int64  `json:"nbf"`
-}
-
-type RefreshJWT struct {
-	TokenType   string `json:"token_type"`
-	Sub         string `json:"sub"`
-	Exp         int    `json:"exp"`
-	Nbf         int    `json:"nbf"`
-	StateHash   string `json:"state_hash"`
-	RootTokenID string `json:"root_token_id"`
-}
-
 type Token struct {
-	AccessToken    string `json:"access_token"`
-	RefreshToken   string `json:"refresh_token"`
-	AccessExpires  string `json:"access_expires"`
-	RefreshExpires string `json:"refresh_expires"`
+	AccessToken    string    `json:"access_token"`
+	RefreshToken   string    `json:"refresh_token"`
+	AccessExpires  time.Time `json:"access_expires"`
+	RefreshExpires time.Time `json:"refresh_expires"`
 }
 
 type TokenResponse struct {

drivers/cloudreve_v4/util.go

@@ -19,24 +19,13 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/op"
 	"github.com/OpenListTeam/OpenList/v4/internal/setting"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	"github.com/avast/retry-go"
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
 )
 
 // do others that not defined in Driver interface
 
-const (
-	CodeLoginRequired     = http.StatusUnauthorized
-	CodeCredentialInvalid = 40020 // Failed to issue token
-)
-
-var (
-	ErrorIssueToken = errors.New("failed to issue token")
-)
-
 func (d *CloudreveV4) getUA() string {
 	if d.CustomUA != "" {
 		return d.CustomUA
@@ -48,23 +37,6 @@ func (d *CloudreveV4) request(method string, path string, callback base.ReqCallb
 	if d.ref != nil {
 		return d.ref.request(method, path, callback, out)
 	}
-
-	// ensure token
-	if d.isTokenExpired() {
-		err := d.refreshToken()
-		if err != nil {
-			return err
-		}
-	}
-
-	return d._request(method, path, callback, out)
-}
-
-func (d *CloudreveV4) _request(method string, path string, callback base.ReqCallback, out any) error {
-	if d.ref != nil {
-		return d.ref._request(method, path, callback, out)
-	}
-
 	u := d.Address + "/api/v4" + path
 	req := base.RestyClient.R()
 	req.SetHeaders(map[string]string{
@@ -91,17 +63,15 @@ func (d *CloudreveV4) _request(method string, path string, callback base.ReqCall
 	}
 
 	if r.Code != 0 {
-		if r.Code == CodeLoginRequired && d.canLogin() && path != "/session/token/refresh" {
-			err = d.login()
+		if r.Code == 401 && d.RefreshToken != "" && path != "/session/token/refresh" {
+			// try to refresh token
+			err = d.refreshToken()
 			if err != nil {
 				return err
 			}
 			return d.request(method, path, callback, out)
 		}
-		if r.Code == CodeCredentialInvalid {
-			return ErrorIssueToken
-		}
-		return fmt.Errorf("%d: %s", r.Code, r.Msg)
+		return errors.New(r.Msg)
 	}
 
 	if out != nil && r.Data != nil {
@@ -119,18 +89,17 @@ func (d *CloudreveV4) _request(method string, path string, callback base.ReqCall
 	return nil
 }
 
-func (d *CloudreveV4) canLogin() bool {
-	return d.Username != "" && d.Password != ""
-}
-
 func (d *CloudreveV4) login() error {
 	var siteConfig SiteLoginConfigResp
-	err := d._request(http.MethodGet, "/site/config/login", nil, &siteConfig)
+	err := d.request(http.MethodGet, "/site/config/login", nil, &siteConfig)
 	if err != nil {
 		return err
 	}
+	if !siteConfig.Authn {
+		return errors.New("authn not support")
+	}
 	var prepareLogin PrepareLoginResp
-	err = d._request(http.MethodGet, "/session/prepare?email="+d.Addition.Username, nil, &prepareLogin)
+	err = d.request(http.MethodGet, "/session/prepare?email="+d.Addition.Username, nil, &prepareLogin)
 	if err != nil {
 		return err
 	}
@@ -160,7 +129,7 @@ func (d *CloudreveV4) doLogin(needCaptcha bool) error {
 	}
 	if needCaptcha {
 		var config BasicConfigResp
-		err = d._request(http.MethodGet, "/site/config/basic", nil, &config)
+		err = d.request(http.MethodGet, "/site/config/basic", nil, &config)
 		if err != nil {
 			return err
 		}
@@ -168,7 +137,7 @@ func (d *CloudreveV4) doLogin(needCaptcha bool) error {
 			return fmt.Errorf("captcha type %s not support", config.CaptchaType)
 		}
 		var captcha CaptchaResp
-		err = d._request(http.MethodGet, "/site/captcha", nil, &captcha)
+		err = d.request(http.MethodGet, "/site/captcha", nil, &captcha)
 		if err != nil {
 			return err
 		}
@@ -194,22 +163,20 @@ func (d *CloudreveV4) doLogin(needCaptcha bool) error {
 		loginBody["captcha"] = captchaCode
 	}
 	var token TokenResponse
-	err = d._request(http.MethodPost, "/session/token", func(req *resty.Request) {
+	err = d.request(http.MethodPost, "/session/token", func(req *resty.Request) {
 		req.SetBody(loginBody)
 	}, &token)
 	if err != nil {
 		return err
 	}
 	d.AccessToken, d.RefreshToken = token.Token.AccessToken, token.Token.RefreshToken
-	d.AccessExpires, d.RefreshExpires = token.Token.AccessExpires, token.Token.RefreshExpires
 	op.MustSaveDriverStorage(d)
 	return nil
 }
 
 func (d *CloudreveV4) refreshToken() error {
-	// if no refresh token, try to login if possible
 	if d.RefreshToken == "" {
-		if d.canLogin() {
+		if d.Username != "" {
 			err := d.login()
 			if err != nil {
 				return fmt.Errorf("cannot login to get refresh token, error: %s", err)
@@ -217,127 +184,20 @@ func (d *CloudreveV4) refreshToken() error {
 		}
 		return nil
 	}
-
-	// parse jwt to check if refresh token is valid
-	var jwt RefreshJWT
-	err := d.parseJWT(d.RefreshToken, &jwt)
-	if err != nil {
-		// if refresh token is invalid, try to login if possible
-		if d.canLogin() {
-			return d.login()
-		}
-		d.GetStorage().SetStatus(fmt.Sprintf("Invalid RefreshToken: %s", err.Error()))
-		op.MustSaveDriverStorage(d)
-		return fmt.Errorf("invalid refresh token: %w", err)
-	}
-
-	// do refresh token
 	var token Token
-	err = d._request(http.MethodPost, "/session/token/refresh", func(req *resty.Request) {
+	err := d.request(http.MethodPost, "/session/token/refresh", func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"refresh_token": d.RefreshToken,
 		})
 	}, &token)
 	if err != nil {
-		if errors.Is(err, ErrorIssueToken) {
-			if d.canLogin() {
-				// try to login again
-				return d.login()
-			}
-			d.GetStorage().SetStatus("This session is no longer valid")
-			op.MustSaveDriverStorage(d)
-			return ErrorIssueToken
-		}
 		return err
 	}
 	d.AccessToken, d.RefreshToken = token.AccessToken, token.RefreshToken
-	d.AccessExpires, d.RefreshExpires = token.AccessExpires, token.RefreshExpires
 	op.MustSaveDriverStorage(d)
 	return nil
 }
 
-func (d *CloudreveV4) parseJWT(token string, jwt any) error {
-	split := strings.Split(token, ".")
-	if len(split) != 3 {
-		return fmt.Errorf("invalid token length: %d, ensure the token is a valid JWT", len(split))
-	}
-	data, err := base64.RawURLEncoding.DecodeString(split[1])
-	if err != nil {
-		return fmt.Errorf("invalid token encoding: %w, ensure the token is a valid JWT", err)
-	}
-	err = json.Unmarshal(data, &jwt)
-	if err != nil {
-		return fmt.Errorf("invalid token content: %w, ensure the token is a valid JWT", err)
-	}
-	return nil
-}
-
-// check if token is expired
-// https://github.com/cloudreve/frontend/blob/ddfacc1c31c49be03beb71de4cc114c8811038d6/src/session/index.ts#L177-L200
-func (d *CloudreveV4) isTokenExpired() bool {
-	if d.RefreshToken == "" {
-		// login again if username and password is set
-		if d.canLogin() {
-			return true
-		}
-		// no refresh token, cannot refresh
-		return false
-	}
-	if d.AccessToken == "" {
-		return true
-	}
-	var (
-		err     error
-		expires time.Time
-	)
-	// check if token is expired
-	if d.AccessExpires != "" {
-		// use expires field if possible to prevent timezone issue
-		// only available after login or refresh token
-		// 2025-08-28T02:43:07.645109985+08:00
-		expires, err = time.Parse(time.RFC3339Nano, d.AccessExpires)
-		if err != nil {
-			return false
-		}
-	} else {
-		// fallback to parse jwt
-		// if failed, disable the storage
-		var jwt AccessJWT
-		err = d.parseJWT(d.AccessToken, &jwt)
-		if err != nil {
-			d.GetStorage().SetStatus(fmt.Sprintf("Invalid AccessToken: %s", err.Error()))
-			op.MustSaveDriverStorage(d)
-			return false
-		}
-		// may be have timezone issue
-		expires = time.Unix(jwt.Exp, 0)
-	}
-	// add a 10 minutes safe margin
-	ddl := time.Now().Add(10 * time.Minute)
-	if expires.Before(ddl) {
-		// current access token expired, check if refresh token is expired
-		// warning: cannot parse refresh token from jwt, because the exp field is not standard
-		if d.RefreshExpires != "" {
-			refreshExpires, err := time.Parse(time.RFC3339Nano, d.RefreshExpires)
-			if err != nil {
-				return false
-			}
-			if refreshExpires.Before(time.Now()) {
-				// This session is no longer valid
-				if d.canLogin() {
-					// try to login again
-					return true
-				}
-				d.GetStorage().SetStatus("This session is no longer valid")
-				op.MustSaveDriverStorage(d)
-				return false
-			}
-		}
-		return true
-	}
-	return false
-}
-
 func (d *CloudreveV4) upLocal(ctx context.Context, file model.FileStreamer, u FileUploadResp, up driver.UpdateProgress) error {
 	var finish int64 = 0
 	var chunk int = 0
@@ -393,16 +253,13 @@ func (d *CloudreveV4) upLocal(ctx context.Context, file model.FileStreamer, u Fi
 }
 
 func (d *CloudreveV4) upRemote(ctx context.Context, file model.FileStreamer, u FileUploadResp, up driver.UpdateProgress) error {
-	DEFAULT := int64(u.ChunkSize)
-	ss, err := stream.NewStreamSectionReader(file, int(DEFAULT), &up)
-	if err != nil {
-		return err
-	}
-
 	uploadUrl := u.UploadUrls[0]
 	credential := u.Credential
 	var finish int64 = 0
 	var chunk int = 0
+	DEFAULT := int64(u.ChunkSize)
+	retryCount := 0
+	maxRetries := 3
 	for finish < file.GetSize() {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -410,67 +267,69 @@ func (d *CloudreveV4) upRemote(ctx context.Context, file model.FileStreamer, u F
 		left := file.GetSize() - finish
 		byteSize := min(left, DEFAULT)
 		utils.Log.Debugf("[CloudreveV4-Remote] upload range: %d-%d/%d", finish, finish+byteSize-1, file.GetSize())
-		rd, err := ss.GetSectionReader(finish, byteSize)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(file, byteData)
+		utils.Log.Debug(err, n)
 		if err != nil {
 			return err
 		}
-		err = retry.Do(
-			func() error {
-				rd.Seek(0, io.SeekStart)
-				req, err := http.NewRequestWithContext(ctx, http.MethodPost, uploadUrl+"?chunk="+strconv.Itoa(chunk),
-					driver.NewLimitedUploadStream(ctx, rd))
-				if err != nil {
-					return err
-				}
-
-				req.ContentLength = byteSize
-				req.Header.Set("Authorization", fmt.Sprint(credential))
-				req.Header.Set("User-Agent", d.getUA())
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				defer res.Body.Close()
-				if res.StatusCode != 200 {
-					return fmt.Errorf("server error: %d", res.StatusCode)
-				}
-				body, err := io.ReadAll(res.Body)
-				if err != nil {
-					return err
-				}
-				var up Resp
-				err = json.Unmarshal(body, &up)
-				if err != nil {
-					return err
-				}
-				if up.Code != 0 {
-					return errors.New(up.Msg)
-				}
-				return nil
-			}, retry.Attempts(3),
-			retry.DelayType(retry.BackOffDelay),
-			retry.Delay(time.Second),
-		)
-		ss.FreeSectionReader(rd)
+		req, err := http.NewRequest("POST", uploadUrl+"?chunk="+strconv.Itoa(chunk),
+			driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
 		if err != nil {
 			return err
 		}
-		finish += byteSize
-		up(float64(finish) * 100 / float64(file.GetSize()))
-		chunk++
+		req = req.WithContext(ctx)
+		req.ContentLength = byteSize
+		// req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
+		req.Header.Set("Authorization", fmt.Sprint(credential))
+		req.Header.Set("User-Agent", d.getUA())
+		err = func() error {
+			res, err := base.HttpClient.Do(req)
+			if err != nil {
+				return err
+			}
+			defer res.Body.Close()
+			if res.StatusCode != 200 {
+				return errors.New(res.Status)
+			}
+			body, err := io.ReadAll(res.Body)
+			if err != nil {
+				return err
+			}
+			var up Resp
+			err = json.Unmarshal(body, &up)
+			if err != nil {
+				return err
+			}
+			if up.Code != 0 {
+				return errors.New(up.Msg)
+			}
+			return nil
+		}()
+		if err == nil {
+			retryCount = 0
+			finish += byteSize
+			up(float64(finish) * 100 / float64(file.GetSize()))
+			chunk++
+		} else {
+			retryCount++
+			if retryCount > maxRetries {
+				return fmt.Errorf("upload failed after %d retries due to server errors, error: %s", maxRetries, err)
+			}
+			backoff := time.Duration(1<<retryCount) * time.Second
+			utils.Log.Warnf("[Cloudreve-Remote] server errors while uploading, retrying after %v...", backoff)
+			time.Sleep(backoff)
+		}
 	}
 	return nil
 }
 
 func (d *CloudreveV4) upOneDrive(ctx context.Context, file model.FileStreamer, u FileUploadResp, up driver.UpdateProgress) error {
-	DEFAULT := int64(u.ChunkSize)
-	ss, err := stream.NewStreamSectionReader(file, int(DEFAULT), &up)
-	if err != nil {
-		return err
-	}
-
 	uploadUrl := u.UploadUrls[0]
 	var finish int64 = 0
+	DEFAULT := int64(u.ChunkSize)
+	retryCount := 0
+	maxRetries := 3
 	for finish < file.GetSize() {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -478,46 +337,46 @@ func (d *CloudreveV4) upOneDrive(ctx context.Context, file model.FileStreamer, u
 		left := file.GetSize() - finish
 		byteSize := min(left, DEFAULT)
 		utils.Log.Debugf("[CloudreveV4-OneDrive] upload range: %d-%d/%d", finish, finish+byteSize-1, file.GetSize())
-		rd, err := ss.GetSectionReader(finish, byteSize)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(file, byteData)
+		utils.Log.Debug(err, n)
 		if err != nil {
 			return err
 		}
-		err = retry.Do(
-			func() error {
-				rd.Seek(0, io.SeekStart)
-				req, err := http.NewRequestWithContext(ctx, http.MethodPut, uploadUrl, driver.NewLimitedUploadStream(ctx, rd))
-				if err != nil {
-					return err
-				}
-
-				req.ContentLength = byteSize
-				req.Header.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", finish, finish+byteSize-1, file.GetSize()))
-				req.Header.Set("User-Agent", d.getUA())
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				defer res.Body.Close()
-				// https://learn.microsoft.com/zh-cn/onedrive/developer/rest-api/api/driveitem_createuploadsession
-				switch {
-				case res.StatusCode >= 500 && res.StatusCode <= 504:
-					return fmt.Errorf("server error: %d", res.StatusCode)
-				case res.StatusCode != 201 && res.StatusCode != 202 && res.StatusCode != 200:
-					data, _ := io.ReadAll(res.Body)
-					return errors.New(string(data))
-				default:
-					return nil
-				}
-			}, retry.Attempts(3),
-			retry.DelayType(retry.BackOffDelay),
-			retry.Delay(time.Second),
-		)
-		ss.FreeSectionReader(rd)
+		req, err := http.NewRequest(http.MethodPut, uploadUrl, driver.NewLimitedUploadStream(ctx, bytes.NewReader(byteData)))
 		if err != nil {
 			return err
 		}
-		finish += byteSize
-		up(float64(finish) * 100 / float64(file.GetSize()))
+		req = req.WithContext(ctx)
+		req.ContentLength = byteSize
+		// req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
+		req.Header.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", finish, finish+byteSize-1, file.GetSize()))
+		req.Header.Set("User-Agent", d.getUA())
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		// https://learn.microsoft.com/zh-cn/onedrive/developer/rest-api/api/driveitem_createuploadsession
+		switch {
+		case res.StatusCode >= 500 && res.StatusCode <= 504:
+			retryCount++
+			if retryCount > maxRetries {
+				res.Body.Close()
+				return fmt.Errorf("upload failed after %d retries due to server errors, error %d", maxRetries, res.StatusCode)
+			}
+			backoff := time.Duration(1<<retryCount) * time.Second
+			utils.Log.Warnf("[CloudreveV4-OneDrive] server errors %d while uploading, retrying after %v...", res.StatusCode, backoff)
+			time.Sleep(backoff)
+		case res.StatusCode != 201 && res.StatusCode != 202 && res.StatusCode != 200:
+			data, _ := io.ReadAll(res.Body)
+			res.Body.Close()
+			return errors.New(string(data))
+		default:
+			res.Body.Close()
+			retryCount = 0
+			finish += byteSize
+			up(float64(finish) * 100 / float64(file.GetSize()))
+		}
 	}
 	// 上传成功发送回调请求
 	return d.request(http.MethodPost, "/callback/onedrive/"+u.SessionID+"/"+u.CallbackSecret, func(req *resty.Request) {
@@ -526,15 +385,12 @@ func (d *CloudreveV4) upOneDrive(ctx context.Context, file model.FileStreamer, u
 }
 
 func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileUploadResp, up driver.UpdateProgress) error {
-	DEFAULT := int64(u.ChunkSize)
-	ss, err := stream.NewStreamSectionReader(file, int(DEFAULT), &up)
-	if err != nil {
-		return err
-	}
-
 	var finish int64 = 0
 	var chunk int = 0
 	var etags []string
+	DEFAULT := int64(u.ChunkSize)
+	retryCount := 0
+	maxRetries := 3
 	for finish < file.GetSize() {
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
@@ -542,47 +398,43 @@ func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileU
 		left := file.GetSize() - finish
 		byteSize := min(left, DEFAULT)
 		utils.Log.Debugf("[CloudreveV4-S3] upload range: %d-%d/%d", finish, finish+byteSize-1, file.GetSize())
-		rd, err := ss.GetSectionReader(finish, byteSize)
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(file, byteData)
+		utils.Log.Debug(err, n)
 		if err != nil {
 			return err
 		}
-		err = retry.Do(
-			func() error {
-				rd.Seek(0, io.SeekStart)
-				req, err := http.NewRequestWithContext(ctx, http.MethodPut, u.UploadUrls[chunk],
-					driver.NewLimitedUploadStream(ctx, rd))
-				if err != nil {
-					return err
-				}
-				req.ContentLength = byteSize
-				req.Header.Set("User-Agent", d.getUA())
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				etag := res.Header.Get("ETag")
-				res.Body.Close()
-				switch {
-				case res.StatusCode != 200:
-					return fmt.Errorf("server error: %d", res.StatusCode)
-				case etag == "":
-					return errors.New("failed to get ETag from header")
-				default:
-					etags = append(etags, etag)
-					return nil
-				}
-			},
-			retry.Attempts(3),
-			retry.DelayType(retry.BackOffDelay),
-			retry.Delay(time.Second),
-		)
-		ss.FreeSectionReader(rd)
+		req, err := http.NewRequest(http.MethodPut, u.UploadUrls[chunk],
+			driver.NewLimitedUploadStream(ctx, bytes.NewBuffer(byteData)))
 		if err != nil {
 			return err
 		}
-		finish += byteSize
-		up(float64(finish) * 100 / float64(file.GetSize()))
-		chunk++
+		req = req.WithContext(ctx)
+		req.ContentLength = byteSize
+		res, err := base.HttpClient.Do(req)
+		if err != nil {
+			return err
+		}
+		etag := res.Header.Get("ETag")
+		res.Body.Close()
+		switch {
+		case res.StatusCode != 200:
+			retryCount++
+			if retryCount > maxRetries {
+				return fmt.Errorf("upload failed after %d retries due to server errors", maxRetries)
+			}
+			backoff := time.Duration(1<<retryCount) * time.Second
+			utils.Log.Warnf("server error %d, retrying after %v...", res.StatusCode, backoff)
+			time.Sleep(backoff)
+		case etag == "":
+			return errors.New("failed to get ETag from header")
+		default:
+			retryCount = 0
+			etags = append(etags, etag)
+			finish += byteSize
+			up(float64(finish) * 100 / float64(file.GetSize()))
+			chunk++
+		}
 	}
 
 	// s3LikeFinishUpload
@@ -596,8 +448,8 @@ func (d *CloudreveV4) upS3(ctx context.Context, file model.FileStreamer, u FileU
 		))
 	}
 	bodyBuilder.WriteString("</CompleteMultipartUpload>")
-	req, err := http.NewRequestWithContext(ctx,
-		http.MethodPost,
+	req, err := http.NewRequest(
+		"POST",
 		u.CompleteURL,
 		strings.NewReader(bodyBuilder.String()),
 	)

drivers/crypt/driver.go

@@ -1,14 +1,12 @@
 package crypt
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"io"
 	stdpath "path"
 	"regexp"
 	"strings"
-	"sync"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
@@ -112,7 +110,7 @@ func (d *Crypt) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 	//return d.list(ctx, d.RemotePath, path)
 	//remoteFull
 
-	objs, err := fs.List(ctx, d.getPathForRemote(path, true), &fs.ListArgs{NoLog: true, Refresh: args.Refresh})
+	objs, err := fs.List(ctx, d.getPathForRemote(path, true), &fs.ListArgs{NoLog: true})
 	// the obj must implement the model.SetPath interface
 	// return objs, err
 	if err != nil {
@@ -243,9 +241,6 @@ func (d *Crypt) Get(ctx context.Context, path string) (model.Obj, error) {
 	//return nil, errs.ObjectNotFound
 }
 
-// https://github.com/rclone/rclone/blob/v1.67.0/backend/crypt/cipher.go#L37
-const fileHeaderSize = 32
-
 func (d *Crypt) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	dstDirActualPath, err := d.getActualPathForRemote(file.GetPath(), false)
 	if err != nil {
@@ -256,69 +251,61 @@ func (d *Crypt) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 		return nil, err
 	}
 
-	remoteSize := remoteLink.ContentLength
-	if remoteSize <= 0 {
-		remoteSize = remoteFile.GetSize()
-	}
-	rrf, err := stream.GetRangeReaderFromLink(remoteSize, remoteLink)
-	if err != nil {
-		_ = remoteLink.Close()
+	if remoteLink.RangeReadCloser == nil && remoteLink.MFile == nil && len(remoteLink.URL) == 0 {
 		return nil, fmt.Errorf("the remote storage driver need to be enhanced to support encrytion")
 	}
-
-	mu := &sync.Mutex{}
-	var fileHeader []byte
-	rangeReaderFunc := func(ctx context.Context, offset, limit int64) (io.ReadCloser, error) {
-		length := limit
-		if offset == 0 && limit > 0 {
-			mu.Lock()
-			if limit <= fileHeaderSize {
-				defer mu.Unlock()
-				if fileHeader != nil {
-					return io.NopCloser(bytes.NewReader(fileHeader[:limit])), nil
-				}
-				length = fileHeaderSize
-			} else if fileHeader == nil {
-				defer mu.Unlock()
-			} else {
-				mu.Unlock()
-			}
+	remoteFileSize := remoteFile.GetSize()
+	remoteClosers := utils.EmptyClosers()
+	rangeReaderFunc := func(ctx context.Context, underlyingOffset, underlyingLength int64) (io.ReadCloser, error) {
+		length := underlyingLength
+		if underlyingLength >= 0 && underlyingOffset+underlyingLength >= remoteFileSize {
+			length = -1
 		}
-
-		remoteReader, err := rrf.RangeRead(ctx, http_range.Range{Start: offset, Length: length})
-		if err != nil {
-			return nil, err
-		}
-
-		if offset == 0 && limit > 0 {
-			fileHeader = make([]byte, fileHeaderSize)
-			n, err := io.ReadFull(remoteReader, fileHeader)
-			if n != fileHeaderSize {
-				fileHeader = nil
-				return nil, fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", fileHeaderSize, n, err)
-			}
-			if limit <= fileHeaderSize {
-				remoteReader.Close()
-				return io.NopCloser(bytes.NewReader(fileHeader[:limit])), nil
-			} else {
-				remoteReader = utils.ReadCloser{
-					Reader: io.MultiReader(bytes.NewReader(fileHeader), remoteReader),
-					Closer: remoteReader,
-				}
-			}
-		}
-		return remoteReader, nil
-	}
-	return &model.Link{
-		RangeReader: stream.RangeReaderFunc(func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
-			readSeeker, err := d.cipher.DecryptDataSeek(ctx, rangeReaderFunc, httpRange.Start, httpRange.Length)
+		rrc := remoteLink.RangeReadCloser
+		if len(remoteLink.URL) > 0 {
+			var converted, err = stream.GetRangeReadCloserFromLink(remoteFileSize, remoteLink)
 			if err != nil {
 				return nil, err
 			}
-			return readSeeker, nil
-		}),
-		SyncClosers: utils.NewSyncClosers(remoteLink),
-	}, nil
+			rrc = converted
+		}
+		if rrc != nil {
+			remoteReader, err := rrc.RangeRead(ctx, http_range.Range{Start: underlyingOffset, Length: length})
+			remoteClosers.AddClosers(rrc.GetClosers())
+			if err != nil {
+				return nil, err
+			}
+			return remoteReader, nil
+		}
+		if remoteLink.MFile != nil {
+			_, err := remoteLink.MFile.Seek(underlyingOffset, io.SeekStart)
+			if err != nil {
+				return nil, err
+			}
+			//keep reuse same MFile and close at last.
+			remoteClosers.Add(remoteLink.MFile)
+			return io.NopCloser(remoteLink.MFile), nil
+		}
+
+		return nil, errs.NotSupport
+
+	}
+	resultRangeReader := func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
+		readSeeker, err := d.cipher.DecryptDataSeek(ctx, rangeReaderFunc, httpRange.Start, httpRange.Length)
+		if err != nil {
+			return nil, err
+		}
+		return readSeeker, nil
+	}
+
+	resultRangeReadCloser := &model.RangeReadCloser{RangeReader: resultRangeReader, Closers: remoteClosers}
+	resultLink := &model.Link{
+		RangeReadCloser: resultRangeReadCloser,
+		Expiration:      remoteLink.Expiration,
+	}
+
+	return resultLink, nil
+
 }
 
 func (d *Crypt) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
@@ -401,6 +388,7 @@ func (d *Crypt) Put(ctx context.Context, dstDir model.Obj, streamer model.FileSt
 		},
 		Reader:            wrappedIn,
 		Mimetype:          "application/octet-stream",
+		WebPutAsTask:      streamer.NeedStore(),
 		ForceStreamUpload: true,
 		Exist:             streamer.GetExist(),
 	}

drivers/crypt/meta.go

@@ -26,12 +26,17 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "Crypt",
-	LocalSort:   true,
-	OnlyProxy:   true,
-	NoCache:     true,
-	DefaultRoot: "/",
-	NoLinkURL:   true,
+	Name:              "Crypt",
+	LocalSort:         true,
+	OnlyLocal:         true,
+	OnlyProxy:         true,
+	NoCache:           true,
+	NoUpload:          false,
+	NeedMs:            false,
+	DefaultRoot:       "/",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/degoo/driver.go

@@ -1,203 +0,0 @@
-package degoo
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/errs"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-)
-
-type Degoo struct {
-	model.Storage
-	Addition
-	client *http.Client
-}
-
-func (d *Degoo) Config() driver.Config {
-	return config
-}
-
-func (d *Degoo) GetAddition() driver.Additional {
-	return &d.Addition
-}
-
-func (d *Degoo) Init(ctx context.Context) error {
-
-	d.client = base.HttpClient
-
-	// Ensure we have a valid token (will login if needed or refresh if expired)
-	if err := d.ensureValidToken(ctx); err != nil {
-		return fmt.Errorf("failed to initialize token: %w", err)
-	}
-
-	return d.getDevices(ctx)
-}
-
-func (d *Degoo) Drop(ctx context.Context) error {
-	return nil
-}
-
-func (d *Degoo) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
-	items, err := d.getAllFileChildren5(ctx, dir.GetID())
-	if err != nil {
-		return nil, err
-	}
-	return utils.MustSliceConvert(items, func(s DegooFileItem) model.Obj {
-		isFolder := s.Category == 2 || s.Category == 1 || s.Category == 10
-
-		createTime, modTime, _ := humanReadableTimes(s.CreationTime, s.LastModificationTime, s.LastUploadTime)
-
-		size, err := strconv.ParseInt(s.Size, 10, 64)
-		if err != nil {
-			size = 0 // Default to 0 if size parsing fails
-		}
-
-		return &model.Object{
-			ID:       s.ID,
-			Path:     s.FilePath,
-			Name:     s.Name,
-			Size:     size,
-			Modified: modTime,
-			Ctime:    createTime,
-			IsFolder: isFolder,
-		}
-	}), nil
-}
-
-func (d *Degoo) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	item, err := d.getOverlay4(ctx, file.GetID())
-	if err != nil {
-		return nil, err
-	}
-
-	return &model.Link{URL: item.URL}, nil
-}
-
-func (d *Degoo) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
-	// This is done by calling the setUploadFile3 API with a special checksum and size.
-	const query = `mutation SetUploadFile3($Token: String!, $FileInfos: [FileInfoUpload3]!) { setUploadFile3(Token: $Token, FileInfos: $FileInfos) }`
-
-	variables := map[string]interface{}{
-		"Token": d.AccessToken,
-		"FileInfos": []map[string]interface{}{
-			{
-				"Checksum":     folderChecksum,
-				"Name":         dirName,
-				"CreationTime": time.Now().UnixMilli(),
-				"ParentID":     parentDir.GetID(),
-				"Size":         0,
-			},
-		},
-	}
-
-	_, err := d.apiCall(ctx, "SetUploadFile3", query, variables)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *Degoo) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	const query = `mutation SetMoveFile($Token: String!, $Copy: Boolean, $NewParentID: String!, $FileIDs: [String]!) { setMoveFile(Token: $Token, Copy: $Copy, NewParentID: $NewParentID, FileIDs: $FileIDs) }`
-
-	variables := map[string]interface{}{
-		"Token":       d.AccessToken,
-		"Copy":        false,
-		"NewParentID": dstDir.GetID(),
-		"FileIDs":     []string{srcObj.GetID()},
-	}
-
-	_, err := d.apiCall(ctx, "SetMoveFile", query, variables)
-	if err != nil {
-		return nil, err
-	}
-
-	return srcObj, nil
-}
-
-func (d *Degoo) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	const query = `mutation SetRenameFile($Token: String!, $FileRenames: [FileRenameInfo]!) { setRenameFile(Token: $Token, FileRenames: $FileRenames) }`
-
-	variables := map[string]interface{}{
-		"Token": d.AccessToken,
-		"FileRenames": []DegooFileRenameInfo{
-			{
-				ID:      srcObj.GetID(),
-				NewName: newName,
-			},
-		},
-	}
-
-	_, err := d.apiCall(ctx, "SetRenameFile", query, variables)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Degoo) Copy(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj, error) {
-	// Copy is not implemented, Degoo API does not support direct copy.
-	return nil, errs.NotImplement
-}
-
-func (d *Degoo) Remove(ctx context.Context, obj model.Obj) error {
-	// Remove deletes a file or folder (moves to trash).
-	const query = `mutation SetDeleteFile5($Token: String!, $IsInRecycleBin: Boolean!, $IDs: [IDType]!) { setDeleteFile5(Token: $Token, IsInRecycleBin: $IsInRecycleBin, IDs: $IDs) }`
-
-	variables := map[string]interface{}{
-		"Token":          d.AccessToken,
-		"IsInRecycleBin": false,
-		"IDs":            []map[string]string{{"FileID": obj.GetID()}},
-	}
-
-	_, err := d.apiCall(ctx, "SetDeleteFile5", query, variables)
-	return err
-}
-
-func (d *Degoo) Put(ctx context.Context, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress) error {
-	tmpF, err := file.CacheFullAndWriter(&up, nil)
-	if err != nil {
-		return err
-	}
-
-	parentID := dstDir.GetID()
-
-	// Calculate the checksum for the file.
-	checksum, err := d.checkSum(tmpF)
-	if err != nil {
-		return err
-	}
-
-	// 1. Get upload authorization via getBucketWriteAuth4.
-	auths, err := d.getBucketWriteAuth4(ctx, file, parentID, checksum)
-	if err != nil {
-		return err
-	}
-
-	// 2. Upload file.
-	// support rapid upload
-	if auths.GetBucketWriteAuth4[0].Error != "Already exist!" {
-		err = d.uploadS3(ctx, auths, tmpF, file, checksum)
-		if err != nil {
-			return err
-		}
-	}
-
-	// 3. Register metadata with setUploadFile3.
-	data, err := d.SetUploadFile3(ctx, file, parentID, checksum)
-	if err != nil {
-		return err
-	}
-	if !data.SetUploadFile3 {
-		return fmt.Errorf("setUploadFile3 failed: %v", data)
-	}
-	return nil
-}

drivers/degoo/meta.go

@@ -1,27 +0,0 @@
-package degoo
-
-import (
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-)
-
-type Addition struct {
-	driver.RootID
-	Username     string `json:"username" help:"Your Degoo account email"`
-	Password     string `json:"password" help:"Your Degoo account password"`
-	RefreshToken string `json:"refresh_token" help:"Refresh token for automatic token renewal, obtained automatically"`
-	AccessToken  string `json:"access_token" help:"Access token for Degoo API, obtained automatically"`
-}
-
-var config = driver.Config{
-	Name:              "Degoo",
-	LocalSort:         true,
-	DefaultRoot:       "0",
-	NoOverwriteUpload: true,
-}
-
-func init() {
-	op.RegisterDriver(func() driver.Driver {
-		return &Degoo{}
-	})
-}

drivers/degoo/types.go

@@ -1,110 +0,0 @@
-package degoo
-
-import (
-	"encoding/json"
-)
-
-// DegooLoginRequest represents the login request body.
-type DegooLoginRequest struct {
-	GenerateToken bool   `json:"GenerateToken"`
-	Username      string `json:"Username"`
-	Password      string `json:"Password"`
-}
-
-// DegooLoginResponse represents a successful login response.
-type DegooLoginResponse struct {
-	Token        string `json:"Token"`
-	RefreshToken string `json:"RefreshToken"`
-}
-
-// DegooAccessTokenRequest represents the token refresh request body.
-type DegooAccessTokenRequest struct {
-	RefreshToken string `json:"RefreshToken"`
-}
-
-// DegooAccessTokenResponse represents the token refresh response.
-type DegooAccessTokenResponse struct {
-	AccessToken string `json:"AccessToken"`
-}
-
-// DegooFileItem represents a Degoo file or folder.
-type DegooFileItem struct {
-	ID                   string `json:"ID"`
-	ParentID             string `json:"ParentID"`
-	Name                 string `json:"Name"`
-	Category             int    `json:"Category"`
-	Size                 string `json:"Size"`
-	URL                  string `json:"URL"`
-	CreationTime         string `json:"CreationTime"`
-	LastModificationTime string `json:"LastModificationTime"`
-	LastUploadTime       string `json:"LastUploadTime"`
-	MetadataID           string `json:"MetadataID"`
-	DeviceID             int64  `json:"DeviceID"`
-	FilePath             string `json:"FilePath"`
-	IsInRecycleBin       bool   `json:"IsInRecycleBin"`
-}
-
-type DegooErrors struct {
-	Path      []string    `json:"path"`
-	Data      interface{} `json:"data"`
-	ErrorType string      `json:"errorType"`
-	ErrorInfo interface{} `json:"errorInfo"`
-	Message   string      `json:"message"`
-}
-
-// DegooGraphqlResponse is the common structure for GraphQL API responses.
-type DegooGraphqlResponse struct {
-	Data   json.RawMessage `json:"data"`
-	Errors []DegooErrors   `json:"errors,omitempty"`
-}
-
-// DegooGetChildren5Data is the data field for getFileChildren5.
-type DegooGetChildren5Data struct {
-	GetFileChildren5 struct {
-		Items     []DegooFileItem `json:"Items"`
-		NextToken string          `json:"NextToken"`
-	} `json:"getFileChildren5"`
-}
-
-// DegooGetOverlay4Data is the data field for getOverlay4.
-type DegooGetOverlay4Data struct {
-	GetOverlay4 DegooFileItem `json:"getOverlay4"`
-}
-
-// DegooFileRenameInfo represents a file rename operation.
-type DegooFileRenameInfo struct {
-	ID      string `json:"ID"`
-	NewName string `json:"NewName"`
-}
-
-// DegooFileIDs represents a list of file IDs for move operations.
-type DegooFileIDs struct {
-	FileIDs []string `json:"FileIDs"`
-}
-
-// DegooGetBucketWriteAuth4Data is the data field for GetBucketWriteAuth4.
-type DegooGetBucketWriteAuth4Data struct {
-	GetBucketWriteAuth4 []struct {
-		AuthData struct {
-			PolicyBase64 string `json:"PolicyBase64"`
-			Signature    string `json:"Signature"`
-			BaseURL      string `json:"BaseURL"`
-			KeyPrefix    string `json:"KeyPrefix"`
-			AccessKey    struct {
-				Key   string `json:"Key"`
-				Value string `json:"Value"`
-			} `json:"AccessKey"`
-			ACL            string `json:"ACL"`
-			AdditionalBody []struct {
-				Key   string `json:"Key"`
-				Value string `json:"Value"`
-			} `json:"AdditionalBody"`
-		} `json:"AuthData"`
-		Error interface{} `json:"Error"`
-	} `json:"getBucketWriteAuth4"`
-}
-
-// DegooSetUploadFile3Data is the data field for SetUploadFile3.
-type DegooSetUploadFile3Data struct {
-	SetUploadFile3 bool `json:"setUploadFile3"`
-}

drivers/degoo/upload.go

@@ -1,198 +0,0 @@
-package degoo
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha1"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"mime/multipart"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-)
-
-func (d *Degoo) getBucketWriteAuth4(ctx context.Context, file model.FileStreamer, parentID string, checksum string) (*DegooGetBucketWriteAuth4Data, error) {
-	const query = `query GetBucketWriteAuth4(
-    $Token: String!
-    $ParentID: String!
-    $StorageUploadInfos: [StorageUploadInfo2]
-  ) {
-    getBucketWriteAuth4(
-      Token: $Token
-      ParentID: $ParentID
-      StorageUploadInfos: $StorageUploadInfos
-    ) {
-      AuthData {
-        PolicyBase64
-        Signature
-        BaseURL
-        KeyPrefix
-        AccessKey {
-          Key
-          Value
-        }
-        ACL
-        AdditionalBody {
-          Key
-          Value
-        }
-      }
-      Error
-    }
-  }`
-
-	variables := map[string]interface{}{
-		"Token":    d.AccessToken,
-		"ParentID": parentID,
-		"StorageUploadInfos": []map[string]string{{
-			"FileName": file.GetName(),
-			"Checksum": checksum,
-			"Size":     strconv.FormatInt(file.GetSize(), 10),
-		}}}
-
-	data, err := d.apiCall(ctx, "GetBucketWriteAuth4", query, variables)
-	if err != nil {
-		return nil, err
-	}
-
-	var resp DegooGetBucketWriteAuth4Data
-	err = json.Unmarshal(data, &resp)
-	if err != nil {
-		return nil, err
-	}
-
-	return &resp, nil
-}
-
-// checkSum calculates the SHA1-based checksum for Degoo upload API.
-func (d *Degoo) checkSum(file io.Reader) (string, error) {
-	seed := []byte{13, 7, 2, 2, 15, 40, 75, 117, 13, 10, 19, 16, 29, 23, 3, 36}
-	hasher := sha1.New()
-	hasher.Write(seed)
-
-	if _, err := utils.CopyWithBuffer(hasher, file); err != nil {
-		return "", err
-	}
-
-	cs := hasher.Sum(nil)
-
-	csBytes := []byte{10, byte(len(cs))}
-	csBytes = append(csBytes, cs...)
-	csBytes = append(csBytes, 16, 0)
-
-	return strings.ReplaceAll(base64.StdEncoding.EncodeToString(csBytes), "/", "_"), nil
-}
-
-func (d *Degoo) uploadS3(ctx context.Context, auths *DegooGetBucketWriteAuth4Data, tmpF model.File, file model.FileStreamer, checksum string) error {
-	a := auths.GetBucketWriteAuth4[0].AuthData
-
-	_, err := tmpF.Seek(0, io.SeekStart)
-	if err != nil {
-		return err
-	}
-
-	ext := utils.Ext(file.GetName())
-	key := fmt.Sprintf("%s%s/%s.%s", a.KeyPrefix, ext, checksum, ext)
-
-	var b bytes.Buffer
-	w := multipart.NewWriter(&b)
-	err = w.WriteField("key", key)
-	if err != nil {
-		return err
-	}
-	err = w.WriteField("acl", a.ACL)
-	if err != nil {
-		return err
-	}
-	err = w.WriteField("policy", a.PolicyBase64)
-	if err != nil {
-		return err
-	}
-	err = w.WriteField("signature", a.Signature)
-	if err != nil {
-		return err
-	}
-	err = w.WriteField(a.AccessKey.Key, a.AccessKey.Value)
-	if err != nil {
-		return err
-	}
-	for _, additional := range a.AdditionalBody {
-		err = w.WriteField(additional.Key, additional.Value)
-		if err != nil {
-			return err
-		}
-	}
-	err = w.WriteField("Content-Type", "")
-	if err != nil {
-		return err
-	}
-
-	_, err = w.CreateFormFile("file", key)
-	if err != nil {
-		return err
-	}
-
-	headSize := b.Len()
-	err = w.Close()
-	if err != nil {
-		return err
-	}
-	head := bytes.NewReader(b.Bytes()[:headSize])
-	tail := bytes.NewReader(b.Bytes()[headSize:])
-
-	rateLimitedRd := driver.NewLimitedUploadStream(ctx, io.MultiReader(head, tmpF, tail))
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, a.BaseURL, rateLimitedRd)
-	if err != nil {
-		return err
-	}
-	req.Header.Add("ngsw-bypass", "1")
-	req.Header.Add("Content-Type", w.FormDataContentType())
-
-	res, err := d.client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusNoContent {
-		return fmt.Errorf("upload failed with status code %d", res.StatusCode)
-	}
-	return nil
-}
-
-var _ driver.Driver = (*Degoo)(nil)
-
-func (d *Degoo) SetUploadFile3(ctx context.Context, file model.FileStreamer, parentID string, checksum string) (*DegooSetUploadFile3Data, error) {
-	const query = `mutation SetUploadFile3($Token: String!, $FileInfos: [FileInfoUpload3]!) {
-    setUploadFile3(Token: $Token, FileInfos: $FileInfos)
-  }`
-
-	variables := map[string]interface{}{
-		"Token": d.AccessToken,
-		"FileInfos": []map[string]string{{
-			"Checksum":     checksum,
-			"CreationTime": strconv.FormatInt(file.CreateTime().UnixMilli(), 10),
-			"Name":         file.GetName(),
-			"ParentID":     parentID,
-			"Size":         strconv.FormatInt(file.GetSize(), 10),
-		}}}
-
-	data, err := d.apiCall(ctx, "SetUploadFile3", query, variables)
-	if err != nil {
-		return nil, err
-	}
-
-	var resp DegooSetUploadFile3Data
-	err = json.Unmarshal(data, &resp)
-	if err != nil {
-		return nil, err
-	}
-
-	return &resp, nil
-}

drivers/degoo/util.go

@@ -1,462 +0,0 @@
-package degoo
-
-import (
-	"bytes"
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/OpenListTeam/OpenList/v4/drivers/base"
-	"github.com/OpenListTeam/OpenList/v4/internal/op"
-)
-
-// Thanks to https://github.com/bernd-wechner/Degoo for API research.
-
-const (
-	// API endpoints
-	loginURL       = "https://rest-api.degoo.com/login"
-	accessTokenURL = "https://rest-api.degoo.com/access-token/v2"
-	apiURL         = "https://production-appsync.degoo.com/graphql"
-
-	// API configuration
-	apiKey         = "da2-vs6twz5vnjdavpqndtbzg3prra"
-	folderChecksum = "CgAQAg"
-
-	// Token management
-	tokenRefreshThreshold = 5 * time.Minute
-
-	// Rate limiting
-	minRequestInterval = 1 * time.Second
-
-	// Error messages
-	errRateLimited  = "rate limited (429), please try again later"
-	errUnauthorized = "unauthorized access"
-)
-
-var (
-	// Global rate limiting - protects against concurrent API calls
-	lastRequestTime time.Time
-	requestMutex    sync.Mutex
-)
-
-// JWT payload structure for token expiration checking
-type JWTPayload struct {
-	UserID string `json:"userID"`
-	Exp    int64  `json:"exp"`
-	Iat    int64  `json:"iat"`
-}
-
-// Rate limiting helper functions
-
-// applyRateLimit ensures minimum interval between API requests
-func applyRateLimit() {
-	requestMutex.Lock()
-	defer requestMutex.Unlock()
-
-	if !lastRequestTime.IsZero() {
-		if elapsed := time.Since(lastRequestTime); elapsed < minRequestInterval {
-			time.Sleep(minRequestInterval - elapsed)
-		}
-	}
-	lastRequestTime = time.Now()
-}
-
-// HTTP request helper functions
-
-// createJSONRequest creates a new HTTP request with JSON body
-func createJSONRequest(ctx context.Context, method, url string, body interface{}) (*http.Request, error) {
-	jsonBody, err := json.Marshal(body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal request body: %w", err)
-	}
-
-	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewBuffer(jsonBody))
-	if err != nil {
-		return nil, fmt.Errorf("failed to create request: %w", err)
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("User-Agent", base.UserAgent)
-	return req, nil
-}
-
-// checkHTTPResponse checks for common HTTP error conditions
-func checkHTTPResponse(resp *http.Response, operation string) error {
-	if resp.StatusCode == http.StatusTooManyRequests {
-		return fmt.Errorf("%s %s", operation, errRateLimited)
-	}
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("%s failed: %s", operation, resp.Status)
-	}
-	return nil
-}
-
-// isTokenExpired checks if the JWT token is expired or will expire soon
-func (d *Degoo) isTokenExpired() bool {
-	if d.AccessToken == "" {
-		return true
-	}
-
-	payload, err := extractJWTPayload(d.AccessToken)
-	if err != nil {
-		return true // Invalid token format
-	}
-
-	// Check if token expires within the threshold
-	expireTime := time.Unix(payload.Exp, 0)
-	return time.Now().Add(tokenRefreshThreshold).After(expireTime)
-}
-
-// extractJWTPayload extracts and parses JWT payload
-func extractJWTPayload(token string) (*JWTPayload, error) {
-	parts := strings.Split(token, ".")
-	if len(parts) != 3 {
-		return nil, fmt.Errorf("invalid JWT format")
-	}
-
-	// Decode the payload (second part)
-	payload, err := base64.RawURLEncoding.DecodeString(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode JWT payload: %w", err)
-	}
-
-	var jwtPayload JWTPayload
-	if err := json.Unmarshal(payload, &jwtPayload); err != nil {
-		return nil, fmt.Errorf("failed to parse JWT payload: %w", err)
-	}
-
-	return &jwtPayload, nil
-}
-
-// refreshToken attempts to refresh the access token using the refresh token
-func (d *Degoo) refreshToken(ctx context.Context) error {
-	if d.RefreshToken == "" {
-		return fmt.Errorf("no refresh token available")
-	}
-
-	// Create request
-	tokenReq := DegooAccessTokenRequest{RefreshToken: d.RefreshToken}
-	req, err := createJSONRequest(ctx, "POST", accessTokenURL, tokenReq)
-	if err != nil {
-		return fmt.Errorf("failed to create refresh token request: %w", err)
-	}
-
-	// Execute request
-	resp, err := d.client.Do(req)
-	if err != nil {
-		return fmt.Errorf("refresh token request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	// Check response
-	if err := checkHTTPResponse(resp, "refresh token"); err != nil {
-		return err
-	}
-
-	var accessTokenResp DegooAccessTokenResponse
-	if err := json.NewDecoder(resp.Body).Decode(&accessTokenResp); err != nil {
-		return fmt.Errorf("failed to parse access token response: %w", err)
-	}
-
-	if accessTokenResp.AccessToken == "" {
-		return fmt.Errorf("empty access token received")
-	}
-
-	d.AccessToken = accessTokenResp.AccessToken
-	// Save the updated token to storage
-	op.MustSaveDriverStorage(d)
-
-	return nil
-}
-
-// ensureValidToken ensures we have a valid, non-expired token
-func (d *Degoo) ensureValidToken(ctx context.Context) error {
-	// Check if token is expired or will expire soon
-	if d.isTokenExpired() {
-		// Try to refresh token first if we have a refresh token
-		if d.RefreshToken != "" {
-			if refreshErr := d.refreshToken(ctx); refreshErr == nil {
-				return nil // Successfully refreshed
-			} else {
-				// If refresh failed, fall back to full login
-				fmt.Printf("Token refresh failed, falling back to full login: %v\n", refreshErr)
-			}
-		}
-
-		// Perform full login
-		if d.Username != "" && d.Password != "" {
-			return d.login(ctx)
-		}
-	}
-
-	return nil
-}
-
-// login performs the login process and retrieves the access token.
-func (d *Degoo) login(ctx context.Context) error {
-	if d.Username == "" || d.Password == "" {
-		return fmt.Errorf("username or password not provided")
-	}
-
-	creds := DegooLoginRequest{
-		GenerateToken: true,
-		Username:      d.Username,
-		Password:      d.Password,
-	}
-
-	jsonCreds, err := json.Marshal(creds)
-	if err != nil {
-		return fmt.Errorf("failed to serialize login credentials: %w", err)
-	}
-
-	req, err := http.NewRequestWithContext(ctx, "POST", loginURL, bytes.NewBuffer(jsonCreds))
-	if err != nil {
-		return fmt.Errorf("failed to create login request: %w", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("User-Agent", base.UserAgent)
-	req.Header.Set("Origin", "https://app.degoo.com")
-
-	resp, err := d.client.Do(req)
-	if err != nil {
-		return fmt.Errorf("login request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	// Handle rate limiting (429 Too Many Requests)
-	if resp.StatusCode == http.StatusTooManyRequests {
-		return fmt.Errorf("login rate limited (429), please try again later")
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("login failed: %s", resp.Status)
-	}
-
-	var loginResp DegooLoginResponse
-	if err := json.NewDecoder(resp.Body).Decode(&loginResp); err != nil {
-		return fmt.Errorf("failed to parse login response: %w", err)
-	}
-
-	if loginResp.RefreshToken != "" {
-		tokenReq := DegooAccessTokenRequest{RefreshToken: loginResp.RefreshToken}
-		jsonTokenReq, err := json.Marshal(tokenReq)
-		if err != nil {
-			return fmt.Errorf("failed to serialize access token request: %w", err)
-		}
-
-		tokenReqHTTP, err := http.NewRequestWithContext(ctx, "POST", accessTokenURL, bytes.NewBuffer(jsonTokenReq))
-		if err != nil {
-			return fmt.Errorf("failed to create access token request: %w", err)
-		}
-
-		tokenReqHTTP.Header.Set("User-Agent", base.UserAgent)
-
-		tokenResp, err := d.client.Do(tokenReqHTTP)
-		if err != nil {
-			return fmt.Errorf("failed to get access token: %w", err)
-		}
-		defer tokenResp.Body.Close()
-
-		var accessTokenResp DegooAccessTokenResponse
-		if err := json.NewDecoder(tokenResp.Body).Decode(&accessTokenResp); err != nil {
-			return fmt.Errorf("failed to parse access token response: %w", err)
-		}
-		d.AccessToken = accessTokenResp.AccessToken
-		d.RefreshToken = loginResp.RefreshToken // Save refresh token
-	} else if loginResp.Token != "" {
-		d.AccessToken = loginResp.Token
-		d.RefreshToken = "" // Direct token, no refresh token available
-	} else {
-		return fmt.Errorf("login failed, no valid token returned")
-	}
-
-	// Save the updated tokens to storage
-	op.MustSaveDriverStorage(d)
-
-	return nil
-}
-
-// apiCall performs a Degoo GraphQL API request.
-func (d *Degoo) apiCall(ctx context.Context, operationName, query string, variables map[string]interface{}) (json.RawMessage, error) {
-	// Apply rate limiting
-	applyRateLimit()
-
-	// Ensure we have a valid token before making the API call
-	if err := d.ensureValidToken(ctx); err != nil {
-		return nil, fmt.Errorf("failed to ensure valid token: %w", err)
-	}
-
-	// Update the Token in variables if it exists (after potential refresh)
-	d.updateTokenInVariables(variables)
-
-	return d.executeGraphQLRequest(ctx, operationName, query, variables)
-}
-
-// updateTokenInVariables updates the Token field in GraphQL variables
-func (d *Degoo) updateTokenInVariables(variables map[string]interface{}) {
-	if variables != nil {
-		if _, hasToken := variables["Token"]; hasToken {
-			variables["Token"] = d.AccessToken
-		}
-	}
-}
-
-// executeGraphQLRequest executes a GraphQL request with retry logic
-func (d *Degoo) executeGraphQLRequest(ctx context.Context, operationName, query string, variables map[string]interface{}) (json.RawMessage, error) {
-	reqBody := map[string]interface{}{
-		"operationName": operationName,
-		"query":         query,
-		"variables":     variables,
-	}
-
-	// Create and configure request
-	req, err := createJSONRequest(ctx, "POST", apiURL, reqBody)
-	if err != nil {
-		return nil, err
-	}
-
-	// Set Degoo-specific headers
-	req.Header.Set("x-api-key", apiKey)
-	if d.AccessToken != "" {
-		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", d.AccessToken))
-	}
-
-	// Execute request
-	resp, err := d.client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("GraphQL API request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	// Check for HTTP errors
-	if err := checkHTTPResponse(resp, "GraphQL API"); err != nil {
-		return nil, err
-	}
-
-	// Parse GraphQL response
-	var degooResp DegooGraphqlResponse
-	if err := json.NewDecoder(resp.Body).Decode(&degooResp); err != nil {
-		return nil, fmt.Errorf("failed to decode GraphQL response: %w", err)
-	}
-
-	// Handle GraphQL errors
-	if len(degooResp.Errors) > 0 {
-		return d.handleGraphQLError(ctx, degooResp.Errors[0], operationName, query, variables)
-	}
-
-	return degooResp.Data, nil
-}
-
-// handleGraphQLError handles GraphQL-level errors with retry logic
-func (d *Degoo) handleGraphQLError(ctx context.Context, gqlError DegooErrors, operationName, query string, variables map[string]interface{}) (json.RawMessage, error) {
-	if gqlError.ErrorType == "Unauthorized" {
-		// Re-login and retry
-		if err := d.login(ctx); err != nil {
-			return nil, fmt.Errorf("%s, login failed: %w", errUnauthorized, err)
-		}
-
-		// Update token in variables and retry
-		d.updateTokenInVariables(variables)
-		return d.apiCall(ctx, operationName, query, variables)
-	}
-
-	return nil, fmt.Errorf("GraphQL API error: %s", gqlError.Message)
-}
-
-// humanReadableTimes converts Degoo timestamps to Go time.Time.
-func humanReadableTimes(creation, modification, upload string) (cTime, mTime, uTime time.Time) {
-	cTime, _ = time.Parse(time.RFC3339, creation)
-	if modification != "" {
-		modMillis, _ := strconv.ParseInt(modification, 10, 64)
-		mTime = time.Unix(0, modMillis*int64(time.Millisecond))
-	}
-	if upload != "" {
-		upMillis, _ := strconv.ParseInt(upload, 10, 64)
-		uTime = time.Unix(0, upMillis*int64(time.Millisecond))
-	}
-	return cTime, mTime, uTime
-}
-
-// getDevices fetches and caches top-level devices and folders.
-func (d *Degoo) getDevices(ctx context.Context) error {
-	const query = `query GetFileChildren5($Token: String! $ParentID: String $AllParentIDs: [String] $Limit: Int! $Order: Int! $NextToken: String ) { getFileChildren5(Token: $Token ParentID: $ParentID AllParentIDs: $AllParentIDs Limit: $Limit Order: $Order NextToken: $NextToken) { Items { ParentID } NextToken } }`
-	variables := map[string]interface{}{
-		"Token":    d.AccessToken,
-		"ParentID": "0",
-		"Limit":    10,
-		"Order":    3,
-	}
-	data, err := d.apiCall(ctx, "GetFileChildren5", query, variables)
-	if err != nil {
-		return err
-	}
-	var resp DegooGetChildren5Data
-	if err := json.Unmarshal(data, &resp); err != nil {
-		return fmt.Errorf("failed to parse device list: %w", err)
-	}
-	if d.RootFolderID == "0" {
-		if len(resp.GetFileChildren5.Items) > 0 {
-			d.RootFolderID = resp.GetFileChildren5.Items[0].ParentID
-		}
-		op.MustSaveDriverStorage(d)
-	}
-	return nil
-}
-
-// getAllFileChildren5 fetches all children of a directory with pagination.
-func (d *Degoo) getAllFileChildren5(ctx context.Context, parentID string) ([]DegooFileItem, error) {
-	const query = `query GetFileChildren5($Token: String! $ParentID: String $AllParentIDs: [String] $Limit: Int! $Order: Int! $NextToken: String ) { getFileChildren5(Token: $Token ParentID: $ParentID AllParentIDs: $AllParentIDs Limit: $Limit Order: $Order NextToken: $NextToken) { Items { ID ParentID Name Category Size CreationTime LastModificationTime LastUploadTime FilePath IsInRecycleBin DeviceID MetadataID } NextToken } }`
-	var allItems []DegooFileItem
-	nextToken := ""
-	for {
-		variables := map[string]interface{}{
-			"Token":    d.AccessToken,
-			"ParentID": parentID,
-			"Limit":    1000,
-			"Order":    3,
-		}
-		if nextToken != "" {
-			variables["NextToken"] = nextToken
-		}
-		data, err := d.apiCall(ctx, "GetFileChildren5", query, variables)
-		if err != nil {
-			return nil, err
-		}
-		var resp DegooGetChildren5Data
-		if err := json.Unmarshal(data, &resp); err != nil {
-			return nil, err
-		}
-		allItems = append(allItems, resp.GetFileChildren5.Items...)
-		if resp.GetFileChildren5.NextToken == "" {
-			break
-		}
-		nextToken = resp.GetFileChildren5.NextToken
-	}
-	return allItems, nil
-}
-
-// getOverlay4 fetches metadata for a single item by ID.
-func (d *Degoo) getOverlay4(ctx context.Context, id string) (DegooFileItem, error) {
-	const query = `query GetOverlay4($Token: String!, $ID: IDType!) { getOverlay4(Token: $Token, ID: $ID) { ID ParentID Name Category Size CreationTime LastModificationTime LastUploadTime URL FilePath IsInRecycleBin DeviceID MetadataID } }`
-	variables := map[string]interface{}{
-		"Token": d.AccessToken,
-		"ID": map[string]string{
-			"FileID": id,
-		},
-	}
-	data, err := d.apiCall(ctx, "GetOverlay4", query, variables)
-	if err != nil {
-		return DegooFileItem{}, err
-	}
-	var resp DegooGetOverlay4Data
-	if err := json.Unmarshal(data, &resp); err != nil {
-		return DegooFileItem{}, fmt.Errorf("failed to parse item metadata: %w", err)
-	}
-	return resp.GetOverlay4, nil
-}

drivers/doubao/driver.go

@@ -236,7 +236,7 @@ func (d *Doubao) Put(ctx context.Context, dstDir model.Obj, file model.FileStrea
 
 	// 根据文件大小选择上传方式
 	if file.GetSize() <= 1*utils.MB { // 小于1MB，使用普通模式上传
-		return d.Upload(ctx, &uploadConfig, dstDir, file, up, dataType)
+		return d.Upload(&uploadConfig, dstDir, file, up, dataType)
 	}
 	// 大文件使用分片上传
 	return d.UploadByMultipart(ctx, &uploadConfig, file.GetSize(), dstDir, file, up, dataType)

drivers/doubao/meta.go

@@ -16,9 +16,17 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "Doubao",
-	LocalSort:   true,
-	DefaultRoot: "0",
+	Name:              "Doubao",
+	LocalSort:         true,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          false,
+	NeedMs:            false,
+	DefaultRoot:       "0",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/doubao/types.go

@@ -129,7 +129,7 @@ type BuiAuditInfo struct {
 	AuditInfo      AuditInfo `json:"audit_info"`
 	IsAuditing     bool      `json:"is_auditing"`
 	AuditStatus    int       `json:"audit_status"`
-	LastUpdateTime int64     `json:"last_update_time"`
+	LastUpdateTime int       `json:"last_update_time"`
 	UnpassReason   string    `json:"unpass_reason"`
 	Details        Details   `json:"details"`
 }
@@ -184,7 +184,7 @@ type UserInfo struct {
 	SecUserID             string                `json:"sec_user_id"`
 	SessionKey            string                `json:"session_key"`
 	UseHmRegion           bool                  `json:"use_hm_region"`
-	UserCreateTime        int64                 `json:"user_create_time"`
+	UserCreateTime        int                   `json:"user_create_time"`
 	UserID                int64                 `json:"user_id"`
 	UserIDStr             string                `json:"user_id_str"`
 	UserVerified          bool                  `json:"user_verified"`

drivers/doubao/util.go

@@ -14,7 +14,7 @@ import (
 	"math/rand"
 	"net/http"
 	"net/url"
-	stdpath "path"
+	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
@@ -24,7 +24,6 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
 	"github.com/OpenListTeam/OpenList/v4/pkg/errgroup"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/avast/retry-go"
@@ -354,7 +353,7 @@ func (d *Doubao) getUploadConfig(upConfig *UploadConfig, dataType string, file m
 				"ServiceId":     d.UploadToken.Alice[dataType].ServiceID,
 				"NeedFallback":  "true",
 				"FileSize":      strconv.FormatInt(file.GetSize(), 10),
-				"FileExtension": stdpath.Ext(file.GetName()),
+				"FileExtension": filepath.Ext(file.GetName()),
 				"s":             randomString(),
 			}
 		}
@@ -448,67 +447,41 @@ func (d *Doubao) uploadNode(uploadConfig *UploadConfig, dir model.Obj, file mode
 }
 
 // Upload 普通上传实现
-func (d *Doubao) Upload(ctx context.Context, config *UploadConfig, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, dataType string) (model.Obj, error) {
-	ss, err := stream.NewStreamSectionReader(file, int(file.GetSize()), &up)
-	if err != nil {
-		return nil, err
-	}
-
-	reader, err := ss.GetSectionReader(0, file.GetSize())
+func (d *Doubao) Upload(config *UploadConfig, dstDir model.Obj, file model.FileStreamer, up driver.UpdateProgress, dataType string) (model.Obj, error) {
+	data, err := io.ReadAll(file)
 	if err != nil {
 		return nil, err
 	}
 
 	// 计算CRC32
 	crc32Hash := crc32.NewIEEE()
-	w, err := utils.CopyWithBuffer(crc32Hash, reader)
-	if w != file.GetSize() {
-		return nil, fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", file.GetSize(), w, err)
-	}
+	crc32Hash.Write(data)
 	crc32Value := hex.EncodeToString(crc32Hash.Sum(nil))
 
 	// 构建请求路径
 	uploadNode := config.InnerUploadAddress.UploadNodes[0]
 	storeInfo := uploadNode.StoreInfos[0]
 	uploadUrl := fmt.Sprintf("https://%s/upload/v1/%s", uploadNode.UploadHost, storeInfo.StoreURI)
-	rateLimitedRd := driver.NewLimitedUploadStream(ctx, reader)
-	err = d._retryOperation("Upload", func() error {
-		reader.Seek(0, io.SeekStart)
-		req, err := http.NewRequestWithContext(ctx, http.MethodPost, uploadUrl, rateLimitedRd)
-		if err != nil {
-			return err
-		}
-		req.Header = map[string][]string{
-			"Referer":             {BaseURL + "/"},
-			"Origin":              {BaseURL},
-			"User-Agent":          {UserAgent},
-			"X-Storage-U":         {d.UserId},
-			"Authorization":       {storeInfo.Auth},
-			"Content-Type":        {"application/octet-stream"},
-			"Content-Crc32":       {crc32Value},
-			"Content-Length":      {fmt.Sprintf("%d", file.GetSize())},
-			"Content-Disposition": {fmt.Sprintf("attachment; filename=%s", url.QueryEscape(storeInfo.StoreURI))},
-		}
-		res, err := base.HttpClient.Do(req)
-		if err != nil {
-			return err
-		}
-		defer res.Body.Close()
-		bytes, _ := io.ReadAll(res.Body)
-		resp := UploadResp{}
-		utils.Json.Unmarshal(bytes, &resp)
-		if resp.Code != 2000 {
-			return fmt.Errorf("upload part failed: %s", resp.Message)
-		} else if resp.Data.Crc32 != crc32Value {
-			return fmt.Errorf("upload part failed: crc32 mismatch, expected %s, got %s", crc32Value, resp.Data.Crc32)
-		}
-		return nil
-	})
-	ss.FreeSectionReader(reader)
-	if err != nil {
+
+	uploadResp := UploadResp{}
+
+	if _, err = d.uploadRequest(uploadUrl, http.MethodPost, storeInfo, func(req *resty.Request) {
+		req.SetHeaders(map[string]string{
+			"Content-Type":        "application/octet-stream",
+			"Content-Crc32":       crc32Value,
+			"Content-Length":      fmt.Sprintf("%d", len(data)),
+			"Content-Disposition": fmt.Sprintf("attachment; filename=%s", url.QueryEscape(storeInfo.StoreURI)),
+		})
+
+		req.SetBody(data)
+	}, &uploadResp); err != nil {
 		return nil, err
 	}
 
+	if uploadResp.Code != 2000 {
+		return nil, fmt.Errorf("upload failed: %s", uploadResp.Message)
+	}
+
 	uploadNodeResp, err := d.uploadNode(config, dstDir, file, dataType)
 	if err != nil {
 		return nil, err
@@ -543,107 +516,69 @@ func (d *Doubao) UploadByMultipart(ctx context.Context, config *UploadConfig, fi
 	if config.InnerUploadAddress.AdvanceOption.SliceSize > 0 {
 		chunkSize = int64(config.InnerUploadAddress.AdvanceOption.SliceSize)
 	}
-	ss, err := stream.NewStreamSectionReader(file, int(chunkSize), &up)
-	if err != nil {
-		return nil, err
-	}
-
 	totalParts := (fileSize + chunkSize - 1) / chunkSize
 	// 创建分片信息组
 	parts := make([]UploadPart, totalParts)
-
+	// 缓存文件
+	tempFile, err := file.CacheFullInTempFile()
+	if err != nil {
+		return nil, fmt.Errorf("failed to cache file: %w", err)
+	}
+	defer tempFile.Close()
 	up(10.0) // 更新进度
 	// 设置并行上传
-	thread := min(int(totalParts), d.uploadThread)
-	threadG, uploadCtx := errgroup.NewOrderedGroupWithContext(ctx, thread,
-		retry.Attempts(MaxRetryAttempts),
+	threadG, uploadCtx := errgroup.NewGroupWithContext(ctx, d.uploadThread,
+		retry.Attempts(1),
 		retry.Delay(time.Second),
-		retry.DelayType(retry.BackOffDelay),
-		retry.MaxJitter(200*time.Millisecond),
-	)
+		retry.DelayType(retry.BackOffDelay))
 
 	var partsMutex sync.Mutex
 	// 并行上传所有分片
-	hash := crc32.NewIEEE()
-	for partIndex := range totalParts {
+	for partIndex := int64(0); partIndex < totalParts; partIndex++ {
 		if utils.IsCanceled(uploadCtx) {
 			break
 		}
+		partIndex := partIndex
 		partNumber := partIndex + 1 // 分片编号从1开始
 
-		// 计算此分片的大小和偏移
-		offset := partIndex * chunkSize
-		size := chunkSize
-		if partIndex == totalParts-1 {
-			size = fileSize - offset
-		}
-		var reader *stream.SectionReader
-		var rateLimitedRd io.Reader
-		crc32Value := ""
-		threadG.GoWithLifecycle(errgroup.Lifecycle{
-			Before: func(ctx context.Context) error {
-				if reader == nil {
-					var err error
-					reader, err = ss.GetSectionReader(offset, size)
-					if err != nil {
-						return err
-					}
-					hash.Reset()
-					w, err := utils.CopyWithBuffer(hash, reader)
-					if w != size {
-						return fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", size, w, err)
-					}
-					crc32Value = hex.EncodeToString(hash.Sum(nil))
-					rateLimitedRd = driver.NewLimitedUploadStream(ctx, reader)
-				}
-				return nil
-			},
-			Do: func(ctx context.Context) error {
-				reader.Seek(0, io.SeekStart)
-				req, err := http.NewRequestWithContext(ctx, http.MethodPost, fmt.Sprintf("%s?uploadid=%s&part_number=%d&phase=transfer", uploadUrl, uploadID, partNumber), rateLimitedRd)
-				if err != nil {
-					return err
-				}
-				req.Header = map[string][]string{
-					"Referer":             {BaseURL + "/"},
-					"Origin":              {BaseURL},
-					"User-Agent":          {UserAgent},
-					"X-Storage-U":         {d.UserId},
-					"Authorization":       {storeInfo.Auth},
-					"Content-Type":        {"application/octet-stream"},
-					"Content-Crc32":       {crc32Value},
-					"Content-Length":      {fmt.Sprintf("%d", size)},
-					"Content-Disposition": {fmt.Sprintf("attachment; filename=%s", url.QueryEscape(storeInfo.StoreURI))},
-				}
-				res, err := base.HttpClient.Do(req)
-				if err != nil {
-					return err
-				}
-				defer res.Body.Close()
-				bytes, _ := io.ReadAll(res.Body)
-				uploadResp := UploadResp{}
-				utils.Json.Unmarshal(bytes, &uploadResp)
-				if uploadResp.Code != 2000 {
-					return fmt.Errorf("upload part failed: %s", uploadResp.Message)
-				} else if uploadResp.Data.Crc32 != crc32Value {
-					return fmt.Errorf("upload part failed: crc32 mismatch, expected %s, got %s", crc32Value, uploadResp.Data.Crc32)
-				}
-				// 记录成功上传的分片
-				partsMutex.Lock()
-				parts[partIndex] = UploadPart{
-					PartNumber: strconv.FormatInt(partNumber, 10),
-					Etag:       uploadResp.Data.Etag,
-					Crc32:      crc32Value,
-				}
-				partsMutex.Unlock()
-				// 更新进度
-				progress := 10.0 + 90.0*float64(threadG.Success()+1)/float64(totalParts)
-				up(math.Min(progress, 95.0))
-				return nil
-			},
-			After: func(err error) {
-				ss.FreeSectionReader(reader)
-			},
+		threadG.Go(func(ctx context.Context) error {
+			// 计算此分片的大小和偏移
+			offset := partIndex * chunkSize
+			size := chunkSize
+			if partIndex == totalParts-1 {
+				size = fileSize - offset
+			}
+
+			limitedReader := driver.NewLimitedUploadStream(ctx, io.NewSectionReader(tempFile, offset, size))
+			// 读取数据到内存
+			data, err := io.ReadAll(limitedReader)
+			if err != nil {
+				return fmt.Errorf("failed to read part %d: %w", partNumber, err)
+			}
+			// 计算CRC32
+			crc32Value := calculateCRC32(data)
+			// 使用_retryOperation上传分片
+			var uploadPart UploadPart
+			if err = d._retryOperation(fmt.Sprintf("Upload part %d", partNumber), func() error {
+				var err error
+				uploadPart, err = d.uploadPart(config, uploadUrl, uploadID, partNumber, data, crc32Value)
+				return err
+			}); err != nil {
+				return fmt.Errorf("part %d upload failed: %w", partNumber, err)
+			}
+			// 记录成功上传的分片
+			partsMutex.Lock()
+			parts[partIndex] = UploadPart{
+				PartNumber: strconv.FormatInt(partNumber, 10),
+				Etag:       uploadPart.Etag,
+				Crc32:      crc32Value,
+			}
+			partsMutex.Unlock()
+			// 更新进度
+			progress := 10.0 + 90.0*float64(threadG.Success()+1)/float64(totalParts)
+			up(math.Min(progress, 95.0))
+
+			return nil
 		})
 	}
 
@@ -746,6 +681,42 @@ func (d *Doubao) initMultipartUpload(config *UploadConfig, uploadUrl string, sto
 	return uploadResp.Data.UploadId, nil
 }
 
+// 分片上传实现
+func (d *Doubao) uploadPart(config *UploadConfig, uploadUrl, uploadID string, partNumber int64, data []byte, crc32Value string) (resp UploadPart, err error) {
+	uploadResp := UploadResp{}
+	storeInfo := config.InnerUploadAddress.UploadNodes[0].StoreInfos[0]
+
+	_, err = d.uploadRequest(uploadUrl, http.MethodPost, storeInfo, func(req *resty.Request) {
+		req.SetHeaders(map[string]string{
+			"Content-Type":        "application/octet-stream",
+			"Content-Crc32":       crc32Value,
+			"Content-Length":      fmt.Sprintf("%d", len(data)),
+			"Content-Disposition": fmt.Sprintf("attachment; filename=%s", url.QueryEscape(storeInfo.StoreURI)),
+		})
+
+		req.SetQueryParams(map[string]string{
+			"uploadid":    uploadID,
+			"part_number": strconv.FormatInt(partNumber, 10),
+			"phase":       "transfer",
+		})
+
+		req.SetBody(data)
+		req.SetContentLength(true)
+	}, &uploadResp)
+
+	if err != nil {
+		return resp, err
+	}
+
+	if uploadResp.Code != 2000 {
+		return resp, fmt.Errorf("upload part failed: %s", uploadResp.Message)
+	} else if uploadResp.Data.Crc32 != crc32Value {
+		return resp, fmt.Errorf("upload part failed: crc32 mismatch, expected %s, got %s", crc32Value, uploadResp.Data.Crc32)
+	}
+
+	return uploadResp.Data, nil
+}
+
 // 完成分片上传
 func (d *Doubao) completeMultipartUpload(config *UploadConfig, uploadUrl, uploadID string, parts []UploadPart) error {
 	uploadResp := UploadResp{}
@@ -814,6 +785,13 @@ func (d *Doubao) commitMultipartUpload(uploadConfig *UploadConfig) error {
 	return nil
 }
 
+// 计算CRC32
+func calculateCRC32(data []byte) string {
+	hash := crc32.NewIEEE()
+	hash.Write(data)
+	return hex.EncodeToString(hash.Sum(nil))
+}
+
 // _retryOperation 操作重试
 func (d *Doubao) _retryOperation(operation string, fn func() error) error {
 	return retry.Do(

drivers/doubao_share/meta.go

@@ -12,10 +12,17 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "DoubaoShare",
-	LocalSort:   true,
-	NoUpload:    true,
-	DefaultRoot: "/",
+	Name:              "DoubaoShare",
+	LocalSort:         true,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          true,
+	NeedMs:            false,
+	DefaultRoot:       "/",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/doubao_share/types.go

@@ -79,11 +79,11 @@ type ShareInfo struct {
 		RiskReviewStatus    int    `json:"risk_review_status"`
 		ConversationID      string `json:"conversation_id"`
 		ParentID            string `json:"parent_id"`
-		CreateTime          int64  `json:"create_time"`
-		UpdateTime          int64  `json:"update_time"`
+		CreateTime          int    `json:"create_time"`
+		UpdateTime          int    `json:"update_time"`
 	} `json:"first_node"`
 	NodeCount      int    `json:"node_count"`
-	CreateTime     int64  `json:"create_time"`
+	CreateTime     int    `json:"create_time"`
 	Channel        string `json:"channel"`
 	InfluencerType int    `json:"influencer_type"`
 }
@@ -111,8 +111,8 @@ type FilePath []struct {
 	RiskReviewStatus    int    `json:"risk_review_status"`
 	ConversationID      string `json:"conversation_id"`
 	ParentID            string `json:"parent_id"`
-	CreateTime          int64  `json:"create_time"`
-	UpdateTime          int64  `json:"update_time"`
+	CreateTime          int    `json:"create_time"`
+	UpdateTime          int    `json:"update_time"`
 }
 
 type GetFileUrlResp struct {

drivers/dropbox/driver.go

@@ -192,11 +192,12 @@ func (d *Dropbox) Put(ctx context.Context, dstDir model.Obj, stream model.FileSt
 
 		url := d.contentBase + "/2/files/upload_session/append_v2"
 		reader := driver.NewLimitedUploadStream(ctx, io.LimitReader(stream, PartSize))
-		req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, reader)
+		req, err := http.NewRequest(http.MethodPost, url, reader)
 		if err != nil {
 			log.Errorf("failed to update file when append to upload session, err: %+v", err)
 			return err
 		}
+		req = req.WithContext(ctx)
 		req.Header.Set("Content-Type", "application/octet-stream")
 		req.Header.Set("Authorization", "Bearer "+d.AccessToken)
 

drivers/dropbox/meta.go

@@ -13,11 +13,18 @@ type Addition struct {
 	ClientSecret    string `json:"client_secret" required:"false" help:"Keep it empty if you don't have one"`
 	AccessToken     string
 	RefreshToken    string `json:"refresh_token" required:"true"`
-	RootNamespaceId string `json:"RootNamespaceId" required:"false"`
+	RootNamespaceId string
 }
 
 var config = driver.Config{
 	Name:              "Dropbox",
+	LocalSort:         false,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          false,
+	NeedMs:            false,
+	DefaultRoot:       "",
 	NoOverwriteUpload: true,
 }
 

drivers/dropbox/util.go

@@ -39,7 +39,7 @@ func (d *Dropbox) refreshToken() error {
 			if resp.ErrorMessage != "" {
 				return fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
 			}
-			return fmt.Errorf("empty token returned from official API, a wrong refresh token may have been used")
+			return fmt.Errorf("empty token returned from official API")
 		}
 		d.AccessToken = resp.AccessToken
 		d.RefreshToken = resp.RefreshToken
@@ -169,19 +169,13 @@ func (d *Dropbox) getFiles(ctx context.Context, path string) ([]File, error) {
 
 func (d *Dropbox) finishUploadSession(ctx context.Context, toPath string, offset int64, sessionId string) error {
 	url := d.contentBase + "/2/files/upload_session/finish"
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, nil)
+	req, err := http.NewRequest(http.MethodPost, url, nil)
 	if err != nil {
 		return err
 	}
+	req = req.WithContext(ctx)
 	req.Header.Set("Content-Type", "application/octet-stream")
 	req.Header.Set("Authorization", "Bearer "+d.AccessToken)
-	if d.RootNamespaceId != "" {
-	apiPathRootJson, err := d.buildPathRootHeader()
-	if err != nil {
-	    return err
-	}
-	req.Header.Set("Dropbox-API-Path-Root", apiPathRootJson)
-}
 
 	uploadFinishArgs := UploadFinishArgs{
 		Commit: struct {
@@ -220,19 +214,13 @@ func (d *Dropbox) finishUploadSession(ctx context.Context, toPath string, offset
 
 func (d *Dropbox) startUploadSession(ctx context.Context) (string, error) {
 	url := d.contentBase + "/2/files/upload_session/start"
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, nil)
+	req, err := http.NewRequest(http.MethodPost, url, nil)
 	if err != nil {
 		return "", err
 	}
+	req = req.WithContext(ctx)
 	req.Header.Set("Content-Type", "application/octet-stream")
 	req.Header.Set("Authorization", "Bearer "+d.AccessToken)
-	if d.RootNamespaceId != "" {
-	apiPathRootJson, err := d.buildPathRootHeader()
-	if err != nil {
-	    return "", err
-	}
-	req.Header.Set("Dropbox-API-Path-Root", apiPathRootJson)
-}
 	req.Header.Set("Dropbox-API-Arg", "{\"close\":false}")
 
 	res, err := base.HttpClient.Do(req)
@@ -247,11 +235,3 @@ func (d *Dropbox) startUploadSession(ctx context.Context) (string, error) {
 	_ = res.Body.Close()
 	return sessionId, nil
 }
-
-func (d *Dropbox) buildPathRootHeader() (string, error) {
-    return utils.Json.MarshalToString(map[string]interface{}{
-        ".tag": "root",
-        "root": d.RootNamespaceId,
-    })
-}
-

drivers/febbox/meta.go

@@ -16,9 +16,17 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "FebBox",
-	NoUpload:    true,
-	DefaultRoot: "0",
+	Name:              "FebBox",
+	LocalSort:         false,
+	OnlyLocal:         false,
+	OnlyProxy:         false,
+	NoCache:           false,
+	NoUpload:          true,
+	NeedMs:            false,
+	DefaultRoot:       "0",
+	CheckStatus:       false,
+	Alert:             "",
+	NoOverwriteUpload: false,
 }
 
 func init() {

drivers/febbox/oauth2.go

@@ -31,13 +31,13 @@ func (c *customTokenSource) Token() (*oauth2.Token, error) {
 	v.Set("client_id", c.config.ClientID)
 	v.Set("client_secret", c.config.ClientSecret)
 
-	req, err := http.NewRequestWithContext(c.ctx, http.MethodPost, c.config.TokenURL, strings.NewReader(v.Encode()))
+	req, err := http.NewRequest("POST", c.config.TokenURL, strings.NewReader(v.Encode()))
 	if err != nil {
 		return nil, err
 	}
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 
-	resp, err := http.DefaultClient.Do(req)
+	resp, err := http.DefaultClient.Do(req.WithContext(c.ctx))
 	if err != nil {
 		return nil, err
 	}

drivers/ftp/driver.go

@@ -2,16 +2,11 @@ package ftp
 
 import (
 	"context"
-	"errors"
-	"io"
 	stdpath "path"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
-	"github.com/OpenListTeam/OpenList/v4/internal/stream"
-	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
-	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 	"github.com/jlaffaye/ftp"
 )
 
@@ -19,9 +14,6 @@ type FTP struct {
 	model.Storage
 	Addition
 	conn *ftp.ServerConn
-
-	ctx    context.Context
-	cancel context.CancelFunc
 }
 
 func (d *FTP) Config() driver.Config {
@@ -33,16 +25,12 @@ func (d *FTP) GetAddition() driver.Additional {
 }
 
 func (d *FTP) Init(ctx context.Context) error {
-	d.ctx, d.cancel = context.WithCancel(context.Background())
-	var err error
-	d.conn, err = d._login(ctx)
-	return err
+	return d.login()
 }
 
 func (d *FTP) Drop(ctx context.Context) error {
 	if d.conn != nil {
-		_ = d.conn.Quit()
-		d.cancel()
+		_ = d.conn.Logout()
 	}
 	return nil
 }
@@ -72,52 +60,15 @@ func (d *FTP) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
 }
 
 func (d *FTP) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	conn, err := d._login(ctx)
-	if err != nil {
+	if err := d.login(); err != nil {
 		return nil, err
 	}
 
-	path := encode(file.GetPath(), d.Encoding)
-	size := file.GetSize()
-	resultRangeReader := func(context context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
-		length := httpRange.Length
-		if length < 0 || httpRange.Start+length > size {
-			length = size - httpRange.Start
-		}
-		var c *ftp.ServerConn
-		if ctx == context {
-			c = conn
-		} else {
-			var err error
-			c, err = d._login(context)
-			if err != nil {
-				return nil, err
-			}
-		}
-		resp, err := c.RetrFrom(path, uint64(httpRange.Start))
-		if err != nil {
-			return nil, err
-		}
-		var close utils.CloseFunc
-		if context == ctx {
-			close = resp.Close
-		} else {
-			close = func() error {
-				return errors.Join(resp.Close(), c.Quit())
-			}
-		}
-		return utils.ReadCloser{
-			Reader: io.LimitReader(resp, length),
-			Closer: close,
-		}, nil
+	r := NewFileReader(d.conn, encode(file.GetPath(), d.Encoding), file.GetSize())
+	link := &model.Link{
+		MFile: r,
 	}
-
-	return &model.Link{
-		RangeReader: &model.FileRangeReader{
-			RangeReaderIF: stream.RateLimitRangeReaderFunc(resultRangeReader),
-		},
-		SyncClosers: utils.NewSyncClosers(utils.CloseFunc(conn.Quit)),
-	}, nil
+	return link, nil
 }
 
 func (d *FTP) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {