fix: custom token expires in doesn't work

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,9 +12,10 @@ body:
       label: Please make sure of the following things
       description: You may select more than one, even select all.
       options:
-        - label: I have read the [documentation](https://alist-doc.nn.ci).
+        - label: I have read the [documentation](https://alist.nn.ci).
         - label: I'm sure there are no duplicate issues or discussions.
         - label: I'm sure it's due to `alist` and not something else(such as `Dependencies` or `Operational`).
+        - label: I'm sure I'm using the latest version
   - type: input
     id: version
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -7,7 +7,7 @@ body:
       label: Please make sure of the following things
       description: You may select more than one, even select all.
       options:
-        - label: I have read the [documentation](https://alist-doc.nn.ci).
+        - label: I have read the [documentation](https://alist.nn.ci).
         - label: I'm sure there are no duplicate issues or discussions.
         - label: I'm sure this feature is not implemented.
         - label: I'm sure it's a reasonable and popular requirement.

.github/workflows/issue_close_inactive.yml

@@ -3,6 +3,7 @@ name: Close inactive
 on:
   schedule:
     - cron: "0 0 */7 * *"
+  workflow_dispatch:
 
 jobs:
   close-inactive:

.github/workflows/issue_close_question.yml

@@ -3,6 +3,7 @@ name: Close need info
 on:
   schedule:
     - cron: "0 0 */7 * *"
+  workflow_dispatch:
 
 jobs:
   close-need-info:

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+i@nn.ci.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Dockerfile

@@ -10,5 +10,6 @@ LABEL MAINTAINER="i@nn.ci"
 VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
 COPY --from=builder /app/bin/alist ./
+RUN apk add ca-certificates
 EXPOSE 5244
 CMD [ "./alist", "server", "--no-prefix" ]

README.md

@@ -29,7 +29,7 @@
 
 ---
 
-English | [中文](./README_cn.md) | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md)
+English | [中文](./README_cn.md) | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
 ## Features
 
@@ -51,6 +51,7 @@ English | [中文](./README_cn.md) | [Contributors](./CONTRIBUTORS.md) | [Contri
     - [x] [YandexDisk](https://disk.yandex.com/)
     - [x] [BaiduNetdisk](http://pan.baidu.com/)
     - [x] [Quark](https://pan.quark.cn)
+    - [x] [Thunder](https://pan.xunlei.com)
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode

README_cn.md

@@ -29,7 +29,7 @@
 
 ---
 
-[English](./README.md) | 中文 | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md)
+[English](./README.md) | 中文 | [Contributors](./CONTRIBUTORS.md) | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
 ## Features
 
@@ -51,6 +51,7 @@
     - [x] [Yandex.Disk](https://disk.yandex.com/)
     - [x] [百度网盘](http://pan.baidu.com/)
     - [x] [夸克网盘](https://pan.quark.cn)
+    - [x] [迅雷网盘](https://pan.xunlei.com)
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览

build.sh

@@ -25,11 +25,11 @@ ldflags="\
 "
 
 FetchWebDev() {
-  curl -L https://codeload.github.com/alist-org/web-dist/tar.gz/refs/heads/main -o web-dist-main.tar.gz
-  tar -zxvf web-dist-main.tar.gz
+  curl -L https://codeload.github.com/alist-org/web-dist/tar.gz/refs/heads/dev -o web-dist-dev.tar.gz
+  tar -zxvf web-dist-dev.tar.gz
   rm -rf public/dist
-  mv -f web-dist-main/dist public
-  rm -rf web-dist-main web-dist-main.tar.gz
+  mv -f web-dist-dev/dist public
+  rm -rf web-dist-dev web-dist-dev.tar.gz
 }
 
 FetchWebRelease() {

cmd/server.go

@@ -88,3 +88,12 @@ func init() {
 	// is called directly, e.g.:
 	// serverCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
+
+// OutAlistInit 暴露用于外部启动server的函数
+func OutAlistInit() {
+	var (
+		cmd  *cobra.Command
+		args []string
+	)
+	serverCmd.Run(cmd, args)
+}

drivers/123/driver.go

@@ -164,7 +164,7 @@ func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
 			"operation":         true,
 			"fileTrashInfoList": []File{f},
 		}
-		_, err := d.request("https://www.123pan.com/a/api/file/trash", http.MethodPost, func(req *resty.Request) {
+		_, err := d.request("https://www.123pan.com/b/api/file/trash", http.MethodPost, func(req *resty.Request) {
 			req.SetBody(data)
 		}, nil)
 		return err
@@ -257,8 +257,4 @@ func (d *Pan123) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	return err
 }
 
-func (d *Pan123) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	return nil, errs.NotSupport
-}
-
 var _ driver.Driver = (*Pan123)(nil)

drivers/139/driver.go

@@ -319,8 +319,4 @@ func (d *Yun139) Put(ctx context.Context, dstDir model.Obj, stream model.FileStr
 	return nil
 }
 
-func (d *Yun139) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	return nil, errs.NotSupport
-}
-
 var _ driver.Driver = (*Yun139)(nil)

drivers/189/driver.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
@@ -208,8 +207,4 @@ func (d *Cloud189) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 	return d.newUpload(dstDir, stream, up)
 }
 
-func (d *Cloud189) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	return nil, errs.NotSupport
-}
-
 var _ driver.Driver = (*Cloud189)(nil)

drivers/189/util.go

@@ -215,6 +215,7 @@ func (d *Cloud189) getFiles(fileId string) ([]model.Obj, error) {
 					ID:       strconv.FormatInt(file.Id, 10),
 					Name:     file.Name,
 					Modified: lastOpTime,
+					Size:     file.Size,
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: file.Icon.SmallUrl},
 			})

drivers/189pc/driver.go

@@ -3,14 +3,11 @@ package _189pc
 import (
 	"context"
 	"net/http"
-	"regexp"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
@@ -134,16 +131,17 @@ func (y *Yun189PC) Link(ctx context.Context, file model.Obj, args model.LinkArgs
 			"User-Agent": []string{base.UserAgent},
 		},
 	}
-
-	// 获取链接有效时常
-	strs := regexp.MustCompile(`(?i)expire[^=]*=([0-9]*)`).FindStringSubmatch(downloadUrl.URL)
-	if len(strs) == 2 {
-		timestamp, err := strconv.ParseInt(strs[1], 10, 64)
-		if err == nil {
-			expired := time.Duration(timestamp-time.Now().Unix()) * time.Second
-			like.Expiration = &expired
+	/*
+		// 获取链接有效时常
+		strs := regexp.MustCompile(`(?i)expire[^=]*=([0-9]*)`).FindStringSubmatch(downloadUrl.URL)
+		if len(strs) == 2 {
+			timestamp, err := strconv.ParseInt(strs[1], 10, 64)
+			if err == nil {
+				expired := time.Duration(timestamp-time.Now().Unix()) * time.Second
+				like.Expiration = &expired
+			}
 		}
-	}
+	*/
 	return like, nil
 }
 
@@ -278,7 +276,3 @@ func (y *Yun189PC) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 	}
 	return y.CommonUpload(ctx, dstDir, stream, up)
 }
-
-func (y *Yun189PC) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	return nil, errs.NotSupport
-}

drivers/189pc/help.go

@@ -78,8 +78,7 @@ func timestamp() int64 {
 }
 
 func MustParseTime(str string) *time.Time {
-	loc, _ := time.LoadLocation("Asia/Shanghai")
-	lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05", str, loc)
+	lastOpTime, _ := time.ParseInLocation("2006-01-02 15:04:05 -07", str+" +08", time.Local)
 	return &lastOpTime
 }
 

drivers/189pc/meta.go

@@ -6,10 +6,10 @@ import (
 )
 
 type Addition struct {
-	Username       string `json:"username" required:"true"`
-	Password       string `json:"password" required:"true"`
-	VCode          string `json:"validate_code"`
-	RootFolderID   string `json:"root_folder_id"`
+	Username string `json:"username" required:"true"`
+	Password string `json:"password" required:"true"`
+	VCode    string `json:"validate_code"`
+	driver.RootID
 	OrderBy        string `json:"order_by" type:"select" options:"filename,filesize,lastOpTime" default:"filename"`
 	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
 	Type           string `json:"type" type:"select" options:"personal,family" default:"personal"`
@@ -17,10 +17,6 @@ type Addition struct {
 	RapidUpload    bool   `json:"rapid_upload"`
 }
 
-func (a Addition) GetRootId() string {
-	return a.RootFolderID
-}
-
 var config = driver.Config{
 	Name:        "189CloudPC",
 	DefaultRoot: "-11",

drivers/189pc/utils.go

@@ -140,13 +140,7 @@ func (y *Yun189PC) getFiles(ctx context.Context, fileId string) ([]model.Obj, er
 	fullUrl += "/listFiles.action"
 
 	res := make([]model.Obj, 0, 130)
-	for pageNum := 1; pageNum < 100; pageNum++ {
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		default:
-		}
-
+	for pageNum := 1; ; pageNum++ {
 		var resp Cloud189FilesResp
 		_, err := y.get(fullUrl, func(r *resty.Request) {
 			r.SetContext(ctx)
@@ -514,7 +508,6 @@ func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.
 		_ = tempFile.Close()
 		_ = os.Remove(tempFile.Name())
 	}()
-	file.SetReadCloser(tempFile)
 
 	const DEFAULT int64 = 10485760
 	count := int(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
@@ -532,14 +525,16 @@ func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.
 		}
 
 		silceMd5.Reset()
-		if _, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5), file, DEFAULT); err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
+		if _, err := io.CopyN(io.MultiWriter(fileMd5, silceMd5), tempFile, DEFAULT); err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
 			return err
 		}
 		md5Byte := silceMd5.Sum(nil)
 		silceMd5Hexs = append(silceMd5Hexs, strings.ToUpper(hex.EncodeToString(md5Byte)))
 		silceMd5Base64s = append(silceMd5Base64s, fmt.Sprint(i, "-", base64.StdEncoding.EncodeToString(md5Byte)))
 	}
-	file.GetReadCloser().(*os.File).Seek(0, io.SeekStart)
+	if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
+		return err
+	}
 
 	fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil)))
 	sliceMd5Hex := fileMd5Hex
@@ -600,7 +595,7 @@ func (y *Yun189PC) FastUpload(ctx context.Context, dstDir model.Obj, file model.
 				SetContext(ctx).
 				SetQueryParams(clientSuffix()).
 				SetHeaders(ParseHttpHeader(uploadData.RequestHeader)).
-				SetBody(io.LimitReader(file, DEFAULT)).
+				SetBody(io.LimitReader(tempFile, DEFAULT)).
 				Put(uploadData.RequestURL)
 			if err != nil {
 				return err

drivers/aliyundrive/driver.go

@@ -234,7 +234,10 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 		buf := make([]byte, 8)
 		r, _ := new(big.Int).SetString(utils.GetMD5Encode(d.AccessToken)[:16], 16)
 		i := new(big.Int).SetInt64(file.GetSize())
-		o := r.Mod(r, i)
+		o := new(big.Int).SetInt64(0)
+		if file.GetSize() > 0 {
+			o = r.Mod(r, i)
+		}
 		n, _ := io.NewSectionReader(tempFile, o.Int64(), 8).Read(buf[:8])
 		reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
 
@@ -264,7 +267,9 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 			return err
 		}
 		res.Body.Close()
-		up(i * 100 / count)
+		if count > 0 {
+			up(i * 100 / count)
+		}
 	}
 	var resp2 base.Json
 	_, err, e = d.request("https://api.aliyundrive.com/v2/file/complete", http.MethodPost, func(req *resty.Request) {
@@ -284,7 +289,29 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 }
 
 func (d *AliDrive) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
-	return nil, errs.NotSupport
+	var resp base.Json
+	var url string
+	data := base.Json{
+		"drive_id": d.DriveId,
+		"file_id":  args.Obj.GetID(),
+	}
+	switch args.Method {
+	case "doc_preview":
+		url = "https://api.aliyundrive.com/v2/file/get_office_preview_url"
+		data["access_token"] = d.AccessToken
+	case "video_preview":
+		url = "https://api.aliyundrive.com/v2/file/get_video_preview_play_info"
+		data["category"] = "live_transcoding"
+	default:
+		return nil, errs.NotSupport
+	}
+	_, err, _ := d.request(url, http.MethodPost, func(req *resty.Request) {
+		req.SetBody(data)
+	}, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
 }
 
 var _ driver.Driver = (*AliDrive)(nil)

drivers/aliyundrive/types.go

@@ -40,6 +40,7 @@ func fileToObj(f File) *model.ObjThumb {
 			Modified: f.UpdatedAt,
 			IsFolder: f.Type == "folder",
 		},
+		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbnail},
 	}
 }