@lacrous/omnicloud 0.2.22 → 0.2.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lacrous/omnicloud",
-  "version": "0.2.22",
+  "version": "0.2.24",
   "description": "SDK and core building blocks for OmniCloud — self-hosted cloud storage powered by your Telegram account.",
   "license": "MIT",
   "type": "module",
@@ -48,9 +48,9 @@
     "prisma": "^6.2.0"
   },
   "devDependencies": {
-    "@omnicloud/core": "0.2.22",
-    "@omnicloud/shared": "0.2.22",
-    "@omnicloud/telegram": "0.2.22",
+    "@omnicloud/core": "0.2.24",
+    "@omnicloud/shared": "0.2.24",
+    "@omnicloud/telegram": "0.2.24",
     "@types/node": "^22.10.0",
     "esbuild": "0.25.12",
     "tsup": "^8.3.0",

package/server/index.js

@@ -1760,11 +1760,11 @@ var FolderService = class {
     const fileIds = await this.collectFileIds(userId, subtree);
     const batchId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
     const stampedAt = /* @__PURE__ */ new Date();
-    await this.folders.updateMany(
+    await this.folders.trashSubtree(
       subtree.map((folder) => folder.id),
+      fileIds,
       { deletedAt: stampedAt, trashBatchId: batchId }
     );
-    await this.files.updateMany(fileIds, { deletedAt: stampedAt, trashBatchId: batchId });
     await this.activity.record({
       userId,
       action: "trash",
@@ -1799,14 +1799,11 @@ var FolderService = class {
     );
     const restorableFileIds = restorableFiles.map((file) => file.id);
     if (restorableFolders.length > 0) {
-      await this.folders.updateMany(
+      await this.folders.restoreSubtree(
         restorableFolders.map((folder) => folder.id),
-        { deletedAt: null, trashBatchId: null }
+        restorableFileIds,
+        { rootId: id, reparent: { parentId } }
       );
-      await this.folders.update(id, { parentId });
-    }
-    if (restorableFileIds.length > 0) {
-      await this.files.updateMany(restorableFileIds, { deletedAt: null, trashBatchId: null });
     }
     await this.activity.record({
       userId,
@@ -1833,9 +1830,16 @@ var FolderService = class {
     );
     const engine = await this.engineFor(userId);
     const removedFileIds = [];
+    const versionsByFile = await this.files.listVersionsForFiles(affected.map((file) => file.id));
     for (const file of affected) {
       try {
-        await engine.remove({ messageId: String(file.telegramMessageId) });
+        const messageIds = /* @__PURE__ */ new Set([String(file.telegramMessageId)]);
+        for (const version of versionsByFile.get(file.id) ?? []) {
+          messageIds.add(String(version.telegramMessageId));
+        }
+        for (const messageId of messageIds) {
+          await engine.remove({ messageId });
+        }
         removedFileIds.push(file.id);
       } catch {
       }
@@ -2478,6 +2482,13 @@ function mapTelegramError(error, fallbackMessage) {
       case "CHANNEL_INVALID":
       case "CHAT_ID_INVALID":
         return new StorageNotInitializedError();
+      // Permanent: the account cannot write to the channel. Retrying cannot help.
+      case "CHAT_WRITE_FORBIDDEN":
+      case "CHAT_ADMIN_REQUIRED":
+        return new ForbiddenError("OmniCloud cannot write to the storage channel for this account");
+      // Permanent: the stored channel reference is stale. Retrying with the same reference fails too.
+      case "PEER_ID_INVALID":
+        return new StorageNotInitializedError();
       case "MSG_ID_INVALID":
       case "MESSAGE_ID_INVALID":
         return new TelegramFileNotFoundError();
@@ -3784,6 +3795,44 @@ function createFolderRepo(prisma) {
       });
       return mapFolder(folder);
     },
+    async restoreSubtree(folderIds, fileIds, options) {
+      await prisma.$transaction(async (tx) => {
+        if (folderIds.length > 0) {
+          await tx.folder.updateMany({
+            where: { id: { in: folderIds } },
+            data: { deletedAt: null, trashBatchId: null }
+          });
+        }
+        if (options.reparent) {
+          await tx.folder.update({
+            where: { id: options.rootId },
+            data: { parentId: options.reparent.parentId }
+          });
+        }
+        if (fileIds.length > 0) {
+          await tx.file.updateMany({
+            where: { id: { in: fileIds } },
+            data: { deletedAt: null, trashBatchId: null }
+          });
+        }
+      });
+    },
+    async trashSubtree(folderIds, fileIds, stamp) {
+      await prisma.$transaction(async (tx) => {
+        if (folderIds.length > 0) {
+          await tx.folder.updateMany({
+            where: { id: { in: folderIds } },
+            data: { deletedAt: stamp.deletedAt, trashBatchId: stamp.trashBatchId }
+          });
+        }
+        if (fileIds.length > 0) {
+          await tx.file.updateMany({
+            where: { id: { in: fileIds } },
+            data: { deletedAt: stamp.deletedAt, trashBatchId: stamp.trashBatchId }
+          });
+        }
+      });
+    },
     async updateMany(ids, patch) {
       const result = await prisma.folder.updateMany({
         where: { id: { in: ids } },
@@ -5038,7 +5087,7 @@ function encryptionCheck(configured) {
 }
 
 // ../../apps/api/src/routes/storage.ts
-var VERSION = "0.2.22";
+var VERSION = "0.2.24";
 function registerStorageRoutes(app2, container2) {
   app2.get("/api/health", async () => {
     const database = await probeDatabase(container2);