@lacrous/omnicloud 0.2.12 → 0.2.14

package/dist/index.cjs

@@ -1472,7 +1472,7 @@ var noopActivityRecorder = {
 // ../core/src/utils/filename.ts
 function sanitizeFileName(name) {
   const base = name.split(/[/\\]/).pop() ?? name;
-  const cleaned = base.replace(/[\u0000-\u001f\u007f]/g, "").replace(/[<>:"|?*]/g, "_").trim();
+  const cleaned = base.replace(/[\u0000-\u001f\u007f-\u009f]/g, "").replace(/[\u200B-\u200F\u202A-\u202E\u2066-\u2069\uFEFF]/g, "").replace(/[<>:"|?*]/g, "_").trim();
   if (!cleaned || cleaned === "." || cleaned === "..") return "";
   return cleaned.slice(0, 255);
 }
@@ -1542,6 +1542,7 @@ var FileService = class {
       const record = await this.performUpload(userId, input, {
         onStored: async (stored) => {
           await operations.update(op.id, { telegramMessageId: Number(stored.messageId) });
+          await operations.claim(op.id, "UPLOADING", "COMMITTING");
         }
       });
       await operations.update(op.id, { status: "COMPLETED", fileId: record.id });
@@ -1582,13 +1583,27 @@ var FileService = class {
     const mimeType = mimeFromFilename(name);
     const size = op.size ?? input.spooled?.size ?? input.data?.byteLength ?? 0;
     const sha256 = op.sha256 ?? input.spooled?.sha256 ?? sha256Hex(input.data ?? Buffer.alloc(0));
-    const record = await this.commitRecord(userId, input, {
-      name,
-      mimeType,
-      size,
-      sha256,
-      telegramMessageId: op.telegramMessageId
-    });
+    const claimed = await operations.claim(op.id, "UPLOADING", "COMMITTING");
+    if (!claimed) {
+      const current = await operations.findByOperationId(userId, op.operationId);
+      if (current?.status === "COMPLETED" && current.fileId) {
+        return this.get(userId, current.fileId);
+      }
+      throw new ConflictError("This upload is being committed by another request. Retry shortly.");
+    }
+    let record;
+    try {
+      record = await this.commitRecord(userId, input, {
+        name,
+        mimeType,
+        size,
+        sha256,
+        telegramMessageId: op.telegramMessageId
+      });
+    } catch (error) {
+      await operations.claim(op.id, "COMMITTING", "UPLOADING");
+      throw error;
+    }
     await operations.update(op.id, { status: "COMPLETED", fileId: record.id });
     return record;
   }