feat(deps): update alpine to 3.18

Co-authored-by: Andy Hsu <i@nn.ci>

.github/stale.yml

@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 44
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 8
+daysUntilClose: 10
 # Issues with these labels will never be considered stale
 exemptLabels:
   - accepted
@@ -16,4 +16,4 @@ markComment: >
 # 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.
+  recreate it if you think it should continue. Thank you for your contributions again.

.github/workflows/auto_lang.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        go-version: [ 1.19 ]
+        go-version: [ '1.20' ]
     name: auto generate lang.json
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        go-version: [1.19]
+        go-version: [ '1.20' ]
     name: Build
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/issue_close_question.yml

@@ -2,7 +2,7 @@ name: Close need info
 
 on:
   schedule:
-    - cron: "0 0 */7 * *"
+    - cron: "0 0 */1 * *"
   workflow_dispatch:
 
 jobs:
@@ -15,8 +15,8 @@ jobs:
           actions: 'close-issues'
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: 'question'
-          inactive-day: 7
+          inactive-day: 3
           close-reason: 'not_planned'
           body: |
-            Hello @${{ github.event.issue.user.login }}, this issue was closed due to no activities in 7 days.
-            你好 @${{ github.event.issue.user.login }}，此issue因超过7天未回复被关闭。
+            Hello @${{ github.event.issue.user.login }}, this issue was closed due to no activities in 3 days.
+            你好 @${{ github.event.issue.user.login }}，此issue因超过3天未回复被关闭。

.github/workflows/issue_close_stale.yml

@@ -0,0 +1,21 @@
+name: Close inactive
+
+on:
+  schedule:
+    - cron: "0 0 */7 * *"
+  workflow_dispatch:
+
+jobs:
+  close-inactive:
+    runs-on: ubuntu-latest
+    steps:
+      - name: close-issues
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'close-issues'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: 'stale'
+          inactive-day: 8
+          close-reason: 'not_planned'
+          body: |
+            Hello @${{ github.event.issue.user.login }}, this issue was closed due to inactive more than 52 days. You can reopen or recreate it if you think it should continue.

.github/workflows/issue_question.yml

@@ -16,5 +16,5 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           body: |
-            Hello @${{ github.event.issue.user.login }}, please input issue by template and add detail. Issues labeled by `question` will be closed if no activities in 7 days.
-            你好 @${{ github.event.issue.user.login }}，请按照issue模板填写, 并详细说明问题/复现步骤/复现链接/实现思路或提供更多信息等, 7天内未回复issue自动关闭。
+            Hello @${{ github.event.issue.user.login }}, please input issue by template and add detail. Issues labeled by `question` will be closed if no activities in 3 days.
+            你好 @${{ github.event.issue.user.login }}，请按照issue模板填写, 并详细说明问题/日志记录/复现步骤/复现链接/实现思路或提供更多信息等, 3天内未回复issue自动关闭。

.github/workflows/release.yml

@@ -9,11 +9,11 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        go-version: [ 1.19 ]
+        go-version: [ '1.20' ]
     name: Release
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: prerelease
+      - name: Prerelease
         uses: irongut/EditRelease@v1.2.0
         with:
           token: ${{ secrets.MY_TOKEN }}
@@ -41,14 +41,14 @@ jobs:
         run: |
           bash build.sh release
 
-      - name: prerelease
+      - name: Release latest
         uses: irongut/EditRelease@v1.2.0
         with:
           token: ${{ secrets.MY_TOKEN }}
           id: ${{ github.event.release.id }}
           prerelease: false
 
-      - name: Release
+      - name: Upload assets
         uses: softprops/action-gh-release@v1
         with:
           files: build/compress/*

CONTRIBUTING.md

@@ -6,7 +6,7 @@
 
 Prerequisites:
 
-- [git](https://nodejs.org/zh-cn/)
+- [git](https://git-scm.com)
 - [Go 1.19+](https://golang.org/doc/install)
 - [gcc](https://gcc.gnu.org/)
 - [nodejs](https://nodejs.org/)

Dockerfile

@@ -1,11 +1,11 @@
-FROM alpine:edge as builder
+FROM alpine:3.18 as builder
 LABEL stage=go-builder
 WORKDIR /app/
 COPY ./ ./
 RUN apk add --no-cache bash curl gcc git go musl-dev; \
     bash build.sh release docker
 
-FROM alpine:edge
+FROM alpine:3.18
 LABEL MAINTAINER="i@nn.ci"
 VOLUME /opt/alist/data/
 WORKDIR /opt/alist/

README.md

@@ -1,6 +1,6 @@
 <div align="center">
   <a href="https://alist.nn.ci"><img height="100px" alt="logo" src="https://cdn.jsdelivr.net/gh/alist-org/logo@main/logo.svg"/></a>
-  <p><em>🗂️A file list program that supports multiple storage, powered by Gin and Solidjs.</em></p>
+  <p><em>🗂️A file list program that supports multiple storages, powered by Gin and Solidjs.</em></p>
 <div>
   <a href="https://goreportcard.com/report/github.com/alist-org/alist/v3">
     <img src="https://goreportcard.com/badge/github.com/alist-org/alist/v3" alt="latest version" />
@@ -62,6 +62,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
     - [x] [YandexDisk](https://disk.yandex.com/)
     - [x] [BaiduNetdisk](http://pan.baidu.com/)
     - [x] [Terabox](https://www.terabox.com/main)
+    - [x] [UC](https://drive.uc.cn)
     - [x] [Quark](https://pan.quark.cn)
     - [x] [Thunder](https://pan.xunlei.com)
     - [x] [Lanzou](https://www.lanzou.com/)

README_cn.md

@@ -61,6 +61,7 @@
     - [x] [和彩云](https://yun.139.com/) (个人云, 家庭云)
     - [x] [Yandex.Disk](https://disk.yandex.com/)
     - [x] [百度网盘](http://pan.baidu.com/)
+    - [x] [UC网盘](https://drive.uc.cn)
     - [x] [夸克网盘](https://pan.quark.cn)
     - [x] [迅雷网盘](https://pan.xunlei.com)
     - [x] [蓝奏云](https://www.lanzou.com/)

build.sh

@@ -59,7 +59,8 @@ BuildDev() {
   mv alist-* dist
   cd dist
   upx -9 ./alist-linux*
-  upx -9 ./alist-windows-amd64.exe
+  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
+  upx -9 ./alist-windows-amd64-upx.exe
   find . -type f -print0 | xargs -0 md5sum >md5.txt
   cat md5.txt
 }
@@ -95,7 +96,8 @@ BuildRelease() {
   xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   # why? Because some target platforms seem to have issues with upx compression
   upx -9 ./alist-linux-amd64
-  upx -9 ./alist-windows-amd64.exe
+  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
+  upx -9 ./alist-windows-amd64-upx.exe
   mv alist-* build
 }
 

cmd/cancel2FA.go

@@ -22,6 +22,8 @@ var Cancel2FACmd = &cobra.Command{
 			err := op.Cancel2FAByUser(admin)
 			if err != nil {
 				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
+			} else {
+				utils.Log.Info("2FA canceled")
 			}
 		}
 	},

drivers/115/driver.go

@@ -44,7 +44,11 @@ func (d *Pan115) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 }
 
 func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	downloadInfo, err := d.client.Download(file.(driver115.File).PickCode)
+	downloadInfo, err := d.client.
+		SetUserAgent(driver115.UA115Browser).
+		Download(file.(driver115.File).PickCode)
+	// recover for upload
+	d.client.SetUserAgent(driver115.UA115Desktop)
 	if err != nil {
 		return nil, err
 	}

drivers/115/util.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/SheltonZhu/115driver/pkg/driver"
+	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/pkg/errors"
 )
 
@@ -15,6 +16,7 @@ func (d *Pan115) login() error {
 		driver.UA(UserAgent),
 	}
 	d.client = driver.New(opts...)
+	d.client.SetHttpClient(base.HttpClient)
 	cr := &driver.Credential{}
 	if d.Addition.QRCodeToken != "" {
 		s := &driver.QRCodeSession{

drivers/123/driver.go

@@ -29,7 +29,6 @@ import (
 type Pan123 struct {
 	model.Storage
 	Addition
-	AccessToken string
 }
 
 func (d *Pan123) Config() driver.Config {
@@ -41,7 +40,8 @@ func (d *Pan123) GetAddition() driver.Additional {
 }
 
 func (d *Pan123) Init(ctx context.Context) error {
-	return d.login()
+	_, err := d.request(UserInfo, http.MethodGet, nil, nil)
+	return err
 }
 
 func (d *Pan123) Drop(ctx context.Context) error {
@@ -77,7 +77,7 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			"size":      f.Size,
 			"type":      f.Type,
 		}
-		resp, err := d.request("https://www.123pan.com/api/file/download_info", http.MethodPost, func(req *resty.Request) {
+		resp, err := d.request(DownloadInfo, http.MethodPost, func(req *resty.Request) {
 			req.SetBody(data).SetHeaders(headers)
 		}, nil)
 		if err != nil {
@@ -97,7 +97,8 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			}
 		}
 		u_ := u.String()
-		res, err := base.NoRedirectClient.R().SetQueryParamsFromValues(u.Query()).Head(u_)
+		log.Debug("download url: ", u_)
+		res, err := base.NoRedirectClient.R().Get(u_)
 		if err != nil {
 			return nil, err
 		}
@@ -108,6 +109,8 @@ func (d *Pan123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 		log.Debugln("res code: ", res.StatusCode())
 		if res.StatusCode() == 302 {
 			link.URL = res.Header().Get("location")
+		} else if res.StatusCode() == 200 {
+			link.URL = utils.Json.Get(res.Body(), "data", "redirect_url").ToString()
 		}
 		return &link, nil
 	} else {
@@ -124,7 +127,7 @@ func (d *Pan123) MakeDir(ctx context.Context, parentDir model.Obj, dirName strin
 		"size":         0,
 		"type":         1,
 	}
-	_, err := d.request("https://www.123pan.com/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(Mkdir, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -135,7 +138,7 @@ func (d *Pan123) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
 		"fileIdList":   []base.Json{{"FileId": srcObj.GetID()}},
 		"parentFileId": dstDir.GetID(),
 	}
-	_, err := d.request("https://www.123pan.com/api/file/mod_pid", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(Move, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -147,7 +150,7 @@ func (d *Pan123) Rename(ctx context.Context, srcObj model.Obj, newName string) e
 		"fileId":   srcObj.GetID(),
 		"fileName": newName,
 	}
-	_, err := d.request("https://www.123pan.com/api/file/rename", http.MethodPost, func(req *resty.Request) {
+	_, err := d.request(Rename, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
 	}, nil)
 	return err
@@ -164,7 +167,7 @@ func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
 			"operation":         true,
 			"fileTrashInfoList": []File{f},
 		}
-		_, err := d.request("https://www.123pan.com/b/api/file/trash", http.MethodPost, func(req *resty.Request) {
+		_, err := d.request(Trash, http.MethodPost, func(req *resty.Request) {
 			req.SetBody(data)
 		}, nil)
 		return err
@@ -220,36 +223,41 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 		"type":         0,
 	}
 	var resp UploadResp
-	_, err := d.request("https://www.123pan.com/a/api/file/upload_request", http.MethodPost, func(req *resty.Request) {
+	res, err := d.request(UploadRequest, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data).SetContext(ctx)
 	}, &resp)
 	if err != nil {
 		return err
 	}
+	log.Debugln("upload request res: ", string(res))
 	if resp.Data.Reuse || resp.Data.Key == "" {
 		return nil
 	}
-	cfg := &aws.Config{
-		Credentials:      credentials.NewStaticCredentials(resp.Data.AccessKeyId, resp.Data.SecretAccessKey, resp.Data.SessionToken),
-		Region:           aws.String("123pan"),
-		Endpoint:         aws.String("file.123pan.com"),
-		S3ForcePathStyle: aws.Bool(true),
+	if resp.Data.AccessKeyId == "" || resp.Data.SecretAccessKey == "" || resp.Data.SessionToken == "" {
+		err = d.newUpload(ctx, &resp, stream, uploadFile, up)
+	} else {
+		cfg := &aws.Config{
+			Credentials:      credentials.NewStaticCredentials(resp.Data.AccessKeyId, resp.Data.SecretAccessKey, resp.Data.SessionToken),
+			Region:           aws.String("123pan"),
+			Endpoint:         aws.String(resp.Data.EndPoint),
+			S3ForcePathStyle: aws.Bool(true),
+		}
+		s, err := session.NewSession(cfg)
+		if err != nil {
+			return err
+		}
+		uploader := s3manager.NewUploader(s)
+		input := &s3manager.UploadInput{
+			Bucket: &resp.Data.Bucket,
+			Key:    &resp.Data.Key,
+			Body:   uploadFile,
+		}
+		_, err = uploader.UploadWithContext(ctx, input)
 	}
-	s, err := session.NewSession(cfg)
 	if err != nil {
 		return err
 	}
-	uploader := s3manager.NewUploader(s)
-	input := &s3manager.UploadInput{
-		Bucket: &resp.Data.Bucket,
-		Key:    &resp.Data.Key,
-		Body:   uploadFile,
-	}
-	_, err = uploader.UploadWithContext(ctx, input)
-	if err != nil {
-		return err
-	}
-	_, err = d.request("https://www.123pan.com/api/file/upload_complete", http.MethodPost, func(req *resty.Request) {
+	_, err = d.request(UploadComplete, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"fileId": resp.Data.FileId,
 		}).SetContext(ctx)

drivers/123/meta.go

@@ -6,14 +6,13 @@ import (
 )
 
 type Addition struct {
-	Username       string `json:"username" required:"true"`
-	Password       string `json:"password" required:"true"`
+	Username string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+	driver.RootID
 	OrderBy        string `json:"order_by" type:"select" options:"file_name,size,update_at" default:"file_name"`
 	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
-	driver.RootID
-	// define other
-	StreamUpload bool `json:"stream_upload"`
-	//Field string `json:"field" type:"select" required:"true" options:"a,b,c" default:"a"`
+	StreamUpload   bool   `json:"stream_upload"`
+	AccessToken    string
 }
 
 var config = driver.Config{

drivers/123/types.go

@@ -74,5 +74,14 @@ type UploadResp struct {
 		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"`
+}
+
+type S3PreSignedURLs struct {
+	Data struct {
+		PreSignedUrls map[string]string `json:"presignedUrls"`
 	} `json:"data"`
 }

drivers/123/upload.go

@@ -0,0 +1,127 @@
+package _123
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"math"
+	"net/http"
+	"strconv"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/go-resty/resty/v2"
+)
+
+func (d *Pan123) getS3PreSignedUrls(ctx context.Context, upReq *UploadResp, start, end int) (*S3PreSignedURLs, error) {
+	data := base.Json{
+		"bucket":          upReq.Data.Bucket,
+		"key":             upReq.Data.Key,
+		"partNumberEnd":   end,
+		"partNumberStart": start,
+		"uploadId":        upReq.Data.UploadId,
+		"StorageNode":     upReq.Data.StorageNode,
+	}
+	var s3PreSignedUrls S3PreSignedURLs
+	_, err := d.request(S3PreSignedUrls, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data).SetContext(ctx)
+	}, &s3PreSignedUrls)
+	if err != nil {
+		return nil, err
+	}
+	return &s3PreSignedUrls, nil
+}
+
+func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp) error {
+	data := base.Json{
+		"bucket":      upReq.Data.Bucket,
+		"key":         upReq.Data.Key,
+		"uploadId":    upReq.Data.UploadId,
+		"StorageNode": upReq.Data.StorageNode,
+	}
+	_, err := d.request(S3Complete, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data).SetContext(ctx)
+	}, nil)
+	return err
+}
+
+func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.FileStreamer, reader io.Reader, up driver.UpdateProgress) error {
+	chunkSize := int64(1024 * 1024 * 5)
+	// fetch s3 pre signed urls
+	chunkCount := int(math.Ceil(float64(file.GetSize()) / float64(chunkSize)))
+	// upload 10 chunks each batch
+	batchSize := 10
+	for i := 1; i <= chunkCount; i += batchSize {
+		if utils.IsCanceled(ctx) {
+			return ctx.Err()
+		}
+		start := i
+		end := i + batchSize
+		if end > chunkCount+1 {
+			end = chunkCount + 1
+		}
+		s3PreSignedUrls, err := d.getS3PreSignedUrls(ctx, upReq, start, end)
+		if err != nil {
+			return err
+		}
+		// upload each chunk
+		for j := start; j < end; j++ {
+			if utils.IsCanceled(ctx) {
+				return ctx.Err()
+			}
+			curSize := chunkSize
+			if j == chunkCount {
+				curSize = file.GetSize() - (int64(chunkCount)-1)*chunkSize
+			}
+			err = d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, j, end, io.LimitReader(reader, chunkSize), curSize, false)
+			if err != nil {
+				return err
+			}
+			up(j * 100 / chunkCount)
+		}
+	}
+	// complete s3 upload
+	return d.completeS3(ctx, upReq)
+}
+
+func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSignedUrls *S3PreSignedURLs, cur, end int, reader io.Reader, curSize int64, retry bool) 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, 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 := d.getS3PreSignedUrls(ctx, upReq, cur, end)
+		if err != nil {
+			return err
+		}
+		s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls
+		// retry
+		return d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, cur, end, reader, curSize, true)
+	}
+	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/util.go

@@ -14,9 +14,24 @@ import (
 
 // do others that not defined in Driver interface
 
+const (
+	API             = "https://www.123pan.com/b/api"
+	SignIn          = API + "/user/sign_in"
+	UserInfo        = API + "/user/info"
+	FileList        = API + "/file/list/new"
+	DownloadInfo    = "https://www.123pan.com/a/api/file/download_info"
+	Mkdir           = API + "/file/upload_request"
+	Move            = API + "/file/mod_pid"
+	Rename          = API + "/file/rename"
+	Trash           = API + "/file/trash"
+	UploadRequest   = API + "/file/upload_request"
+	UploadComplete  = API + "/file/upload_complete"
+	S3PreSignedUrls = API + "/file/s3_repare_upload_parts_batch"
+	S3Complete      = API + "/file/s3_complete_multipart_upload"
+)
+
 func (d *Pan123) login() error {
 	var body base.Json
-	url := "https://www.123pan.com/a/api/user/sign_in"
 	if utils.IsEmailFormat(d.Username) {
 		body = base.Json{
 			"mail":     d.Username,
@@ -30,7 +45,7 @@ func (d *Pan123) login() error {
 		}
 	}
 	res, err := base.RestyClient.R().
-		SetBody(body).Post(url)
+		SetBody(body).Post(SignIn)
 	if err != nil {
 		return err
 	}
@@ -90,7 +105,7 @@ func (d *Pan123) getFiles(parentId string) ([]File, error) {
 			"trashed":        "false",
 			"Page":           strconv.Itoa(page),
 		}
-		_, err := d.request("https://www.123pan.com/api/file/list/new", http.MethodGet, func(req *resty.Request) {
+		_, err := d.request(FileList, http.MethodGet, func(req *resty.Request) {
 			req.SetQueryParams(query)
 		}, &resp)
 		if err != nil {