code update

Author: cyfung1031

packages/filesystem/googledrive/googledrive.test.ts

@@ -165,6 +165,16 @@ describe("GoogleDriveFileSystem", () => {
     });
   });
 
+  it("findFileInDirectory should reject duplicate file names", async () => {
+    const fs = new GoogleDriveFileSystem("/", "token");
+    vi.spyOn(fs, "findFilesInDirectory").mockResolvedValue([{ id: "file-1" }, { id: "file-2" }]);
+
+    await expect(fs.findFileInDirectory("file.txt", "parent-id")).rejects.toMatchObject({
+      provider: "googledrive",
+      conflict: true,
+    });
+  });
+
   it("writer should create createOnly files with a generated Google Drive id", async () => {
     const fs = new GoogleDriveFileSystem("/", "token");
     const writer = await fs.create("file.txt", { createOnly: true });

packages/filesystem/googledrive/googledrive.ts

@@ -362,6 +362,15 @@ export default class GoogleDriveFileSystem implements FileSystem {
   // 辅助方法：在指定目录中查找文件
   async findFileInDirectory(fileName: string, parentId: string): Promise<string | null> {
     const files = await this.findFilesInDirectory(fileName, parentId);
+    if (files.length > 1) {
+      throw new FileSystemError({
+        provider: "googledrive",
+        message: `Duplicate Google Drive files found: ${fileName}`,
+        status: 409,
+        code: "nameAlreadyExists",
+        conflict: true,
+      });
+    }
     return files[0]?.id || null;
   }
 

src/app/service/service_worker/synchronize.test.ts

@@ -866,6 +866,46 @@ console.log("ok");`
     });
   });
 
+  it("retries digest list before falling back to pushed md5", async () => {
+    const fs = createFs({
+      list: vi
+        .fn()
+        .mockResolvedValueOnce([])
+        .mockResolvedValueOnce([
+          {
+            name: "push-uuid.user.js",
+            path: "push-uuid.user.js",
+            size: 1,
+            digest: "etag-user-js",
+            createtime: 1,
+            updatetime: 1,
+          },
+        ]),
+    });
+    const service = new SynchronizeService(
+      {} as any,
+      {} as any,
+      {} as any,
+      {} as any,
+      {} as any,
+      {} as any,
+      {} as any,
+      {
+        scriptCodeDAO: {},
+        all: vi.fn().mockResolvedValue([]),
+      } as any
+    );
+
+    await service.updateFileDigest(fs, {
+      "push-uuid.user.js": "local-md5",
+    });
+
+    expect(fs.list).toHaveBeenCalledTimes(2);
+    await expect((service as any).storage.get("file_digest")).resolves.toEqual({
+      "push-uuid.user.js": "etag-user-js",
+    });
+  });
+
   it("skips status and digest update when a push hits remote conflict", async () => {
     const conflict = new FileSystemError({
       provider: "webdav",
@@ -903,11 +943,18 @@ console.log("ok");`
     );
     vi.spyOn(service, "pushScript").mockRejectedValue(conflict);
     const updateDigestSpy = vi.spyOn(service, "updateFileDigest");
+    const notificationSpy = vi.spyOn(chrome.notifications, "create").mockReturnValue("notification-id" as any);
 
     await service.syncOnce(syncConfig, fs);
 
     expect(updateDigestSpy).not.toHaveBeenCalled();
     expect(fs.create).not.toHaveBeenCalledWith("scriptcat-sync.json", expect.anything());
+    expect(notificationSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        title: "Script Sync Failed",
+        message: expect.stringContaining("remote conflict"),
+      })
+    );
   });
 
   it("skips status and digest update when any push task fails", async () => {
@@ -942,11 +989,18 @@ console.log("ok");`
     );
     vi.spyOn(service, "pushScript").mockRejectedValue(error);
     const updateDigestSpy = vi.spyOn(service, "updateFileDigest");
+    const notificationSpy = vi.spyOn(chrome.notifications, "create").mockReturnValue("notification-id" as any);
 
     await service.syncOnce(syncConfig, fs);
 
     expect(updateDigestSpy).not.toHaveBeenCalled();
     expect(fs.create).not.toHaveBeenCalledWith("scriptcat-sync.json", expect.anything());
+    expect(notificationSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        title: "Script Sync Failed",
+        message: expect.stringContaining("cloud sync changes failed"),
+      })
+    );
   });
 
   it("scriptInstall enters cloud_sync queue and updates digest after push", async () => {

src/app/service/service_worker/synchronize.ts

@@ -505,6 +505,11 @@ export class SynchronizeService {
         conflict: hasConflict,
         failed: rejected.length,
       });
+      const title = i18n.t("notification.script_sync_failed");
+      const message = hasConflict
+        ? i18n.t("notification.script_sync_conflict_desc")
+        : i18n.t("notification.script_sync_failed_desc");
+      InfoNotification(title, message);
       return;
     }
     // 同步状态
@@ -577,7 +582,13 @@ export class SynchronizeService {
   }
 
   async updateFileDigest(fs: FileSystem, knownFileDigestMap: FileDigestMap = {}) {
-    const newList = await fs.list();
+    let newList = await fs.list();
+    if (Object.keys(knownFileDigestMap).some((name) => !newList.some((file) => file.name === name))) {
+      const retryList = await fs.list();
+      if (Array.isArray(retryList)) {
+        newList = retryList;
+      }
+    }
     const newFileDigestMap: FileDigestMap = {};
     for (const file of newList) {
       newFileDigestMap[file.name] = file.digest;

src/locales/de-DE/translation.json

@@ -569,6 +569,9 @@
   "notification": {
     "script_sync_delete": "Skript-Löschsynchronisation",
     "script_sync_delete_desc": "Skript {{scriptName}} wurde gelöscht",
+    "script_sync_failed": "Skriptsynchronisierung fehlgeschlagen",
+    "script_sync_failed_desc": "Einige Cloud-Synchronisierungsänderungen sind fehlgeschlagen. Der lokale Synchronisierungsstatus wurde nicht aktualisiert; bitte prüfen Sie die Protokolle und synchronisieren Sie erneut.",
+    "script_sync_conflict_desc": "Die Cloud-Synchronisierung hat einen Remote-Konflikt erkannt. Der lokale Synchronisierungsstatus wurde nicht aktualisiert; bitte prüfen Sie Änderungen auf anderen Geräten und synchronisieren Sie erneut.",
     "subscribe_update": "Abonnement {{subscribeName}} wurde aktualisiert",
     "subscribe_update_desc": "Neue Skripte: {{newScripts}}\nGelöschte Skripte: {{deletedScripts}}"
   },

src/locales/en-US/translation.json

@@ -569,6 +569,9 @@
   "notification": {
     "script_sync_delete": "Script Sync Delete",
     "script_sync_delete_desc": "Script {{scriptName}} has been deleted",
+    "script_sync_failed": "Script Sync Failed",
+    "script_sync_failed_desc": "Some cloud sync changes failed. Local sync state was not updated; please check the logs and try syncing again.",
+    "script_sync_conflict_desc": "Cloud sync detected a remote conflict. Local sync state was not updated; please review changes on other devices and sync again.",
     "subscribe_update": "Subscribe {{subscribeName}} has been updated",
     "subscribe_update_desc": "New scripts: {{newScripts}}\nDeleted scripts: {{deletedScripts}}"
   },

src/locales/ja-JP/translation.json

@@ -569,6 +569,9 @@
   "notification": {
     "script_sync_delete": "スクリプト同期削除",
     "script_sync_delete_desc": "スクリプト {{scriptName}} が削除されました",
+    "script_sync_failed": "スクリプト同期に失敗しました",
+    "script_sync_failed_desc": "一部のクラウド同期の変更に失敗しました。ローカルの同期状態は更新されていません。ログを確認してから再同期してください。",
+    "script_sync_conflict_desc": "クラウド同期でリモートの競合が検出されました。ローカルの同期状態は更新されていません。他のデバイスでの変更を確認してから再同期してください。",
     "subscribe_update": "サブスクリプション {{subscribeName}} が更新されました",
     "subscribe_update_desc": "新しいスクリプト: {{newScripts}}\n削除されたスクリプト: {{deletedScripts}}"
   },

src/locales/ru-RU/translation.json

@@ -569,6 +569,9 @@
   "notification": {
     "script_sync_delete": "Синхронизация удаления скрипта",
     "script_sync_delete_desc": "Скрипт {{scriptName}} был удален",
+    "script_sync_failed": "Не удалось синхронизировать скрипт",
+    "script_sync_failed_desc": "Не удалось применить часть изменений облачной синхронизации. Локальное состояние синхронизации не обновлено; проверьте журналы и повторите синхронизацию.",
+    "script_sync_conflict_desc": "Облачная синхронизация обнаружила конфликт на удаленной стороне. Локальное состояние синхронизации не обновлено; проверьте изменения на других устройствах и повторите синхронизацию.",
     "subscribe_update": "Подписка {{subscribeName}} была обновлена",
     "subscribe_update_desc": "Новые скрипты: {{newScripts}}\nУдаленные скрипты: {{deletedScripts}}"
   },

src/locales/vi-VN/translation.json

@@ -569,6 +569,9 @@
   "notification": {
     "script_sync_delete": "Đồng bộ xóa script",
     "script_sync_delete_desc": "Script {{scriptName}} đã bị xóa",
+    "script_sync_failed": "Đồng bộ script thất bại",
+    "script_sync_failed_desc": "Một số thay đổi đồng bộ đám mây thất bại. Trạng thái đồng bộ cục bộ chưa được cập nhật; vui lòng kiểm tra nhật ký rồi đồng bộ lại.",
+    "script_sync_conflict_desc": "Đồng bộ đám mây phát hiện xung đột từ xa. Trạng thái đồng bộ cục bộ chưa được cập nhật; vui lòng kiểm tra thay đổi trên các thiết bị khác rồi đồng bộ lại.",
     "subscribe_update": "Đăng ký {{subscribeName}} đã được cập nhật",
     "subscribe_update_desc": "Script mới: {{newScripts}}\nScript đã xóa: {{deletedScripts}}"
   },

src/locales/zh-CN/translation.json

@@ -569,6 +569,9 @@
   "notification": {
     "script_sync_delete": "脚本删除同步",
     "script_sync_delete_desc": "脚本 {{scriptName}} 已被删除",
+    "script_sync_failed": "脚本同步失败",
+    "script_sync_failed_desc": "部分云同步变更失败，本地同步状态未更新，请检查日志后重新同步。",
+    "script_sync_conflict_desc": "云同步检测到远端冲突，本地同步状态未更新，请检查其他设备上的变更后重新同步。",
     "subscribe_update": "订阅 {{subscribeName}} 已更新",
     "subscribe_update_desc": "新增脚本：{{newScripts}}\n删除脚本：{{deletedScripts}}"
   },