@lacrous/omnicloud 0.2.21 → 0.2.23

package/dist/index.d.cts

@@ -909,6 +909,14 @@ interface FolderRepository {
         deletedAt?: Date | null;
         trashBatchId?: string | null;
     }): Promise<number>;
+    /**
+     * Trashes a folder subtree and the files inside it in one atomic step, so a
+     * failure cannot leave the folders trashed while their files stay active.
+     */
+    trashSubtree(folderIds: string[], fileIds: string[], stamp: {
+        deletedAt: Date;
+        trashBatchId: string;
+    }): Promise<void>;
     deleteMany(ids: string[]): Promise<void>;
     countByUser(userId: string): Promise<number>;
 }

package/dist/index.d.ts

@@ -909,6 +909,14 @@ interface FolderRepository {
         deletedAt?: Date | null;
         trashBatchId?: string | null;
     }): Promise<number>;
+    /**
+     * Trashes a folder subtree and the files inside it in one atomic step, so a
+     * failure cannot leave the folders trashed while their files stay active.
+     */
+    trashSubtree(folderIds: string[], fileIds: string[], stamp: {
+        deletedAt: Date;
+        trashBatchId: string;
+    }): Promise<void>;
     deleteMany(ids: string[]): Promise<void>;
     countByUser(userId: string): Promise<number>;
 }

package/dist/index.js

@@ -2114,11 +2114,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",
@@ -2187,9 +2187,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 {
       }
@@ -2626,11 +2633,15 @@ function mapTelegramError(error, fallbackMessage) {
   if (error instanceof DomainError) return error;
   if (isTelegramRpcError(error)) {
     const msg = error.errorMessage ?? "";
-    if (msg.startsWith("FLOOD_WAIT_")) {
-      const seconds = Number(msg.slice("FLOOD_WAIT_".length)) || 60;
-      return new RateLimitedError(`Telegram rate limit reached \u2014 retry in ${seconds} seconds`, {
-        retryAfterSeconds: seconds
-      });
+    const seconds = error.seconds;
+    const floodSeconds = typeof seconds === "number" ? seconds : msg.startsWith("FLOOD_WAIT_") ? Number(msg.slice("FLOOD_WAIT_".length)) : null;
+    if (msg.startsWith("FLOOD") && floodSeconds !== null && floodSeconds > 0) {
+      return new RateLimitedError(
+        `Telegram rate limit reached \u2014 retry in ${floodSeconds} seconds`,
+        {
+          retryAfterSeconds: floodSeconds
+        }
+      );
     }
     switch (msg) {
       case "PHONE_NUMBER_INVALID":
@@ -2660,6 +2671,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();
@@ -3064,7 +3082,9 @@ var TelegramStorageProvider = class {
     try {
       await this.client.deleteMessages(this.peer, [Number(ref.messageId)], { revoke: true });
     } catch (error) {
-      throw mapTelegramError(error, "Telegram delete failed");
+      const mapped = mapTelegramError(error, "Telegram delete failed");
+      if (mapped instanceof TelegramFileNotFoundError) return;
+      throw mapped;
     }
   }
   async exists(ref) {