Merge branch 'main' into release/v1.3

CodFrm · CodFrm · commit 6b5ed41f0f3b · 2026-01-07T17:10:35.000+08:00
diff --git a/packages/filesystem/baidu/baidu.ts b/packages/filesystem/baidu/baidu.ts
@@ -126,19 +126,38 @@ export default class BaiduFileSystem implements FileSystem {
     });
   }
 
-  list(): Promise<File[]> {
-    return this.request(
-      `https://pan.baidu.com/rest/2.0/xpan/file?method=list&dir=${encodeURIComponent(
-        this.path
-      )}&order=time&access_token=${this.accessToken}`
-    ).then((data) => {
+  async list(): Promise<File[]> {
+    const list: File[] = [];
+    let start = 0;
+    const limit = 200;
+    // 防御性：限制最大分页轮询次数，避免在 API 异常返回时出现无限循环
+    const MAX_ITERATIONS = 100;
+    let iterations = 0;
+
+    while (true) {
+      if (iterations >= MAX_ITERATIONS) {
+        throw new Error(
+          "BaiduFileSystem.list: exceeded max pagination iterations, possible infinite loop from Baidu API response"
+        );
+      }
+      iterations += 1;
+      const data = await this.request(
+        `https://pan.baidu.com/rest/2.0/xpan/file?method=list&dir=${encodeURIComponent(
+          this.path
+        )}&order=time&start=${start}&limit=${limit}&access_token=${this.accessToken}`
+      );
+
       if (data.errno) {
         if (data.errno === -9) {
-          return [];
+          break;
         }
         throw new Error(JSON.stringify(data));
       }
-      const list: File[] = [];
+
+      if (!data.list || data.list.length === 0) {
+        break;
+      }
+
       data.list.forEach((val: any) => {
         list.push({
           fsid: val.fs_id,
@@ -150,8 +169,16 @@ export default class BaiduFileSystem implements FileSystem {
           updatetime: val.server_mtime * 1000,
         });
       });
-      return list;
-    });
+
+      // 如果返回的数据少于limit，说明已经是最后一页
+      if (data.list.length < limit) {
+        break;
+      }
+
+      start += limit;
+    }
+
+    return list;
   }
 
   async getDirUrl(): Promise<string> {
diff --git a/packages/filesystem/dropbox/dropbox.ts b/packages/filesystem/dropbox/dropbox.ts
@@ -149,34 +149,58 @@ export default class DropboxFileSystem implements FileSystem {
     const myHeaders = new Headers();
     myHeaders.append("Content-Type", "application/json");
 
-    const response = await this.request("https://api.dropboxapi.com/2/files/list_folder", {
+    let response = await this.request("https://api.dropboxapi.com/2/files/list_folder", {
       method: "POST",
       headers: myHeaders,
       body: JSON.stringify({
         path: folderPath,
       }),
     }).catch((e) => {
       if (e.message.includes("path/not_found")) {
-        return { entries: [] }; // 返回空数组以避免后续错误
+        return { entries: [], has_more: false }; // 返回空数组以避免后续错误
       }
       throw e;
     });
 
     const list: File[] = [];
-    if (response.entries) {
-      for (const item of response.entries) {
-        // 只包含文件，跳过文件夹
-        if (item[".tag"] === "file") {
-          list.push({
-            name: item.name,
-            path: this.path,
-            size: item.size || 0,
-            digest: item.content_hash || "",
-            createtime: new Date(item.client_modified).getTime(),
-            updatetime: new Date(item.server_modified).getTime(),
-          });
+
+    const MAX_ITERATIONS = 100;
+    let iterationCount = 0;
+
+    while (true) {
+      iterationCount++;
+      if (iterationCount > MAX_ITERATIONS) {
+        throw new Error("Dropbox list pagination exceeded maximum iterations");
+      }
+      if (response.entries) {
+        for (const item of response.entries) {
+          // 只包含文件，跳过文件夹
+          if (item[".tag"] === "file") {
+            list.push({
+              name: item.name,
+              path: this.path,
+              size: item.size || 0,
+              digest: item.content_hash || "",
+              createtime: new Date(item.client_modified).getTime(),
+              updatetime: new Date(item.server_modified).getTime(),
+            });
+          }
         }
       }
+
+      // 检查是否有更多数据
+      if (!response.has_more) {
+        break;
+      }
+
+      // 获取下一页数据
+      response = await this.request("https://api.dropboxapi.com/2/files/list_folder/continue", {
+        method: "POST",
+        headers: myHeaders,
+        body: JSON.stringify({
+          cursor: response.cursor,
+        }),
+      });
     }
 
     return list;
diff --git a/packages/filesystem/googledrive/googledrive.ts b/packages/filesystem/googledrive/googledrive.ts
@@ -220,23 +220,45 @@ export default class GoogleDriveFileSystem implements FileSystem {
       folderId = foundId;
     }
 
-    // 列出目录内容
+    // 列出目录内容，处理分页
+    const list: File[] = [];
+    let pageToken: string | undefined = undefined;
+
     const query = `'${folderId}' in parents and trashed=false`;
-    const response = await this.request(
-      `https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id,name,mimeType,size,md5Checksum,createdTime,modifiedTime)&spaces=appDataFolder`
-    );
+    const MAX_ITERATIONS = 100;
+    let iterations = 0;
 
-    const list: File[] = [];
-    if (response.files) {
-      for (const item of response.files) {
-        list.push({
-          name: item.name,
-          path: this.path,
-          size: item.size ? parseInt(item.size, 10) : 0,
-          digest: item.md5Checksum || "",
-          createtime: new Date(item.createdTime).getTime(),
-          updatetime: new Date(item.modifiedTime).getTime(),
-        });
+    while (true) {
+      iterations += 1;
+      if (iterations > MAX_ITERATIONS) {
+        throw new Error("GoogleDrive list pagination exceeded maximum iterations");
+      }
+      const url = new URL("https://www.googleapis.com/drive/v3/files");
+      url.searchParams.set("q", query);
+      url.searchParams.set("fields", "files(id,name,mimeType,size,md5Checksum,createdTime,modifiedTime),nextPageToken");
+      url.searchParams.set("spaces", "appDataFolder");
+      if (pageToken) {
+        url.searchParams.set("pageToken", pageToken);
+      }
+
+      const response = await this.request(url.toString());
+
+      if (response.files) {
+        for (const item of response.files) {
+          list.push({
+            name: item.name,
+            path: this.path,
+            size: item.size ? parseInt(item.size, 10) : 0,
+            digest: item.md5Checksum || "",
+            createtime: new Date(item.createdTime).getTime(),
+            updatetime: new Date(item.modifiedTime).getTime(),
+          });
+        }
+      }
+
+      pageToken = response.nextPageToken;
+      if (!pageToken) {
+        break;
       }
     }
 
diff --git a/packages/filesystem/limiter.ts b/packages/filesystem/limiter.ts
@@ -31,7 +31,7 @@ export class RateLimiter {
 
     this.running++;
     try {
-      return await fn();
+      return await this.executeWithRetry(fn);
     } finally {
       this.running--;
       // 执行完成后，从队列中取出下一个等待的操作
@@ -41,6 +41,33 @@ export class RateLimiter {
       }
     }
   }
+
+  /**
+   * 执行操作并处理 429 错误重试
+   * @param fn 要执行的操作函数
+   * @returns 操作结果
+   */
+  private async executeWithRetry<T>(fn: () => Promise<T>): Promise<T> {
+    // 最多重试 10 次
+    for (let i = 0; i <= 10; i++) {
+      try {
+        return await fn();
+      } catch (error) {
+        // 检查错误字符串中是否包含 429
+        const errorStr = String(error);
+        if (errorStr.includes("429") && i < 10) {
+          // 遇到 429 错误且未达到重试上限，采用指数退避策略延迟后继续重试
+          const delay = Math.min(2000 * Math.pow(2, i), 60000);
+          await new Promise((resolve) => setTimeout(resolve, delay));
+          // 继续下一次循环重试
+          continue;
+        }
+        // 其他错误或达到重试上限，直接抛出
+        throw error;
+      }
+    }
+    throw new Error("Max retries exceeded");
+  }
 }
 
 // 文件系统限速器，防止并发请求过多达到服务器限制
diff --git a/packages/filesystem/onedrive/onedrive.ts b/packages/filesystem/onedrive/onedrive.ts
@@ -125,17 +125,35 @@ export default class OneDriveFileSystem implements FileSystem {
     } else {
       path = `:${path}:`;
     }
-    const data = await this.request(`https://graph.microsoft.com/v1.0/me/drive/special/approot${path}/children`);
-    const list: File[] = data.value.map((val: any) => {
-      return {
-        name: val.name,
-        path: this.path,
-        size: val.size,
-        digest: val.eTag,
-        createtime: new Date(val.createdDateTime).getTime(),
-        updatetime: new Date(val.lastModifiedDateTime).getTime(),
-      };
-    });
+
+    const list: File[] = [];
+    let nextLink: string | undefined = `https://graph.microsoft.com/v1.0/me/drive/special/approot${path}/children`;
+    let iterationCount = 0;
+    const MAX_ITERATIONS = 100;
+
+    while (nextLink) {
+      iterationCount += 1;
+      if (iterationCount > MAX_ITERATIONS) {
+        throw new Error("OneDrive list pagination exceeded maximum iterations");
+      }
+      const data = await this.request(nextLink);
+
+      if (data.value) {
+        for (const val of data.value) {
+          list.push({
+            name: val.name,
+            path: this.path,
+            size: val.size,
+            digest: val.eTag,
+            createtime: new Date(val.createdDateTime).getTime(),
+            updatetime: new Date(val.lastModifiedDateTime).getTime(),
+          });
+        }
+      }
+
+      nextLink = data["@odata.nextLink"];
+    }
+
     return list;
   }
 
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
@@ -434,12 +434,13 @@ export class ScriptService {
   }
 
   async deleteScript(uuid: string) {
-    const logger = this.logger.with({ uuid });
+    let logger = this.logger.with({ uuid });
     const script = await this.scriptDAO.get(uuid);
     if (!script) {
       logger.error("script not found");
       throw new Error("script not found");
     }
+    logger = logger.with({ name: script.name });
     const storageName = getStorageName(script);
     return this.scriptDAO
       .delete(uuid)
diff --git a/src/app/service/service_worker/synchronize.ts b/src/app/service/service_worker/synchronize.ts
@@ -420,8 +420,9 @@ export class SynchronizeService {
         }
         const updatetime = script.updatetime || script.createtime;
         // 对比脚本更新时间和文件更新时间
-        if (updatetime > file.script!.updatetime) {
-          // 如果脚本更新时间大于文件更新时间,则上传文件
+        if (updatetime > file.script!.updatetime || !file.meta) {
+          // 如果脚本更新时间大于文件更新时间
+          // 或者不存在.meta文件,则上传文件
           result.push(this.pushScript(fs, script));
         } else {
           // 如果脚本更新时间小于文件更新时间,则更新脚本
@@ -433,6 +434,11 @@ export class SynchronizeService {
       }
       // 如果脚本不存在,且文件存在,则安装脚本
       if (file.script) {
+        if (!file.meta) {
+          // 如果.meta文件不存在，则删除脚本文件，并跳过
+          result.push(fs.delete(file.script.name));
+          return;
+        }
         updateScript.set(uuid, true);
         result.push(this.pullScript(fs, file as SyncFiles, cloudStatus[uuid]));
       }
@@ -537,7 +543,6 @@ export class SynchronizeService {
         );
       } else {
         // 直接删除所有相关文件
-        await fs.delete(filename);
         await fs.delete(`${uuid}.meta.json`);
       }
       logger.info("delete success");
diff --git a/src/pkg/config/config.ts b/src/pkg/config/config.ts
@@ -274,7 +274,7 @@ export class SystemConfig {
     return this._get<CATFileStorage>("cat_file_storage", this.defaultCatFileStorage());
   }
 
-  setCatFileStorage(data: CATFileStorage | undefined) {
+  setCatFileStorage(data: CATFileStorage) {
     this._set("cat_file_storage", data);
   }
 
@@ -292,7 +292,7 @@ export class SystemConfig {
 
   setEslintConfig(v: string) {
     if (v === "") {
-      this._set("eslint_config", undefined);
+      this._set("eslint_config", defaultConfig);
       return;
     }
     JSON.parse(v);
@@ -305,7 +305,7 @@ export class SystemConfig {
 
   setEditorConfig(v: string) {
     if (v === "") {
-      this._set("editor_config", undefined);
+      this._set("editor_config", editorDefaultConfig);
       return;
     }
     JSON.parse(v);

Original file line number	Diff line number	Diff line change
`@@ -434,12 +434,13 @@ export class ScriptService {`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`async deleteScript(uuid: string) {`
`437`		`- const logger = this.logger.with({ uuid });`
	`437`	`+ let logger = this.logger.with({ uuid });`
`438`	`438`	`const script = await this.scriptDAO.get(uuid);`
`439`	`439`	`if (!script) {`
`440`	`440`	`logger.error("script not found");`
`441`	`441`	`throw new Error("script not found");`
`442`	`442`	`}`
	`443`	`+ logger = logger.with({ name: script.name });`
`443`	`444`	`const storageName = getStorageName(script);`
`444`	`445`	`return this.scriptDAO`
`445`	`446`	`.delete(uuid)`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ export class SystemConfig {`
`274`	`274`	`return this._get<CATFileStorage>("cat_file_storage", this.defaultCatFileStorage());`
`275`	`275`	`}`
`276`	`276`
`277`		`- setCatFileStorage(data: CATFileStorage \| undefined) {`
	`277`	`+ setCatFileStorage(data: CATFileStorage) {`
`278`	`278`	`this._set("cat_file_storage", data);`
`279`	`279`	`}`
`280`	`280`
`@@ -292,7 +292,7 @@ export class SystemConfig {`
`292`	`292`
`293`	`293`	`setEslintConfig(v: string) {`
`294`	`294`	`if (v === "") {`
`295`		`- this._set("eslint_config", undefined);`
	`295`	`+ this._set("eslint_config", defaultConfig);`
`296`	`296`	`return;`
`297`	`297`	`}`
`298`	`298`	`JSON.parse(v);`
`@@ -305,7 +305,7 @@ export class SystemConfig {`
`305`	`305`
`306`	`306`	`setEditorConfig(v: string) {`
`307`	`307`	`if (v === "") {`
`308`		`- this._set("editor_config", undefined);`
	`308`	`+ this._set("editor_config", editorDefaultConfig);`
`309`	`309`	`return;`
`310`	`310`	`}`
`311`	`311`	`JSON.parse(v);`