@ykurilov/agent-chat-attachments 0.80.0 → 0.81.0

package/dist/index.js

@@ -719,7 +719,8 @@ function createAttachmentRoutes(options) {
       if (!record) return failure("not_found");
       if (method === "GET") return download(record);
       if (record.attached) return failure("attached");
-      await storage.remove(record.id);
+      const removed = await storage.removeUnattached(record.id);
+      if (!removed && await storage.get(record.id)) return failure("attached");
       return new Response(null, { status: 204 });
     }
   };
@@ -739,6 +740,9 @@ var ABANDONED_AFTER_MS = 24 * 60 * 6e4;
 var CLEANUP_EVERY_MS = 15 * 6e4;
 function createAttachments(options) {
   const { storage } = options;
+  if (typeof storage.removeUnattached !== "function") {
+    throw new TypeError("AttachmentStorage: \u043D\u0443\u0436\u0435\u043D \u043C\u0435\u0442\u043E\u0434 removeUnattached(id) \u2014 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u043D\u0435\u043F\u0440\u0438\u043A\u0440\u0435\u043F\u043B\u0451\u043D\u043D\u043E\u0433\u043E \u0444\u0430\u0439\u043B\u0430, \u0430\u0442\u043E\u043C\u0430\u0440\u043D\u043E \u0441 markAttached");
+  }
   const limits = resolveAttachmentLimits(options.limits);
   const now = options.now ?? (() => /* @__PURE__ */ new Date());
   const imagePlans = createImagePlans(limits.imageCacheBytes);
@@ -771,7 +775,7 @@ function createAttachments(options) {
       const record = isAttachmentId(id) ? await storage.get(id) : void 0;
       if (!record || record.chatId !== input.chatId || record.ownerId !== input.userId) throw notFound();
       if (!record.attached && Date.parse(record.createdAt) < now().getTime() - ABANDONED_AFTER_MS) {
-        await storage.remove(record.id);
+        await storage.removeUnattached(record.id);
         throw new AttachmentRejectedError3("attachment_expired", "\u0424\u0430\u0439\u043B \u0445\u0440\u0430\u043D\u0438\u043B\u0441\u044F \u0441\u043B\u0438\u0448\u043A\u043E\u043C \u0434\u043E\u043B\u0433\u043E \u0438 \u0443\u0434\u0430\u043B\u0451\u043D: \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u0435 \u0435\u0433\u043E \u0441\u043D\u043E\u0432\u0430");
       }
       if (acceptedMediaTypes && !acceptedMediaTypes.includes(record.sourceMediaType ?? record.mediaType)) {
@@ -786,8 +790,18 @@ function createAttachments(options) {
     return records.map((record) => ({ type: "file", url: `${PREFIX2}${record.id}`, mediaType: record.mediaType, filename: record.name }));
   }
   async function confirmUserParts(parts) {
-    const ids = new Set(parts.flatMap((part) => part.url.startsWith(PREFIX2) ? [part.url.slice(PREFIX2.length)] : []));
-    await Promise.all([...ids].map((id) => storage.markAttached(id)));
+    const ids = [...new Set(parts.flatMap((part) => part.url.startsWith(PREFIX2) ? [part.url.slice(PREFIX2.length)] : []))];
+    const records = await Promise.all(ids.map(async (id) => {
+      await storage.markAttached(id);
+      return storage.get(id);
+    })).catch((error) => {
+      const unavailable2 = new AttachmentRejectedError3("attachment_unavailable", "\u0424\u0430\u0439\u043B \u0441\u0435\u0439\u0447\u0430\u0441 \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0440\u0438\u043A\u0440\u0435\u043F\u0438\u0442\u044C: \u043E\u0442\u043F\u0440\u0430\u0432\u044C\u0442\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0435\u0449\u0451 \u0440\u0430\u0437");
+      unavailable2.cause = error;
+      throw unavailable2;
+    });
+    if (records.some((record) => record?.attached !== true)) {
+      throw new AttachmentRejectedError3("attachment_not_found", "\u0424\u0430\u0439\u043B \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D: \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u0435 \u0435\u0433\u043E \u0435\u0449\u0451 \u0440\u0430\u0437");
+    }
   }
   return {
     storage,
@@ -850,6 +864,16 @@ function createDiskAttachmentStorage(options) {
   const binPath = (id) => join(directory, `${id}.bin`);
   const jsonPath = (id) => join(directory, `${id}.json`);
   let unsentIndex;
+  const fileQueues = /* @__PURE__ */ new Map();
+  function oneAtATime(id, work) {
+    const done = (fileQueues.get(id) ?? Promise.resolve()).then(work);
+    const settled = done.catch(() => void 0);
+    fileQueues.set(id, settled);
+    void settled.then(() => {
+      if (fileQueues.get(id) === settled) fileQueues.delete(id);
+    });
+    return done;
+  }
   async function writeAtomically(path, data) {
     const temporary = `${path}.${crypto.randomUUID()}.tmp`;
     await writeFile(temporary, data);
@@ -894,6 +918,14 @@ function createDiskAttachmentStorage(options) {
     await Promise.all([rm(jsonPath(id), { force: true }), rm(binPath(id), { force: true })]);
     (await loadedIndex())?.delete(id);
   }
+  function removeIfUnattached(id, stale = () => true) {
+    return oneAtATime(id, async () => {
+      const record = await readRecord(id);
+      if (!record || record.attached || !stale(record)) return false;
+      await removeFiles(id);
+      return true;
+    });
+  }
   async function modifiedBefore(name, before) {
     try {
       return (await stat(join(directory, name))).mtimeMs < before.getTime();
@@ -921,10 +953,12 @@ function createDiskAttachmentStorage(options) {
   return {
     async save(record, bytes) {
       assertAttachmentId(record.id);
-      await mkdir(directory, { recursive: true });
-      await writeAtomically(binPath(record.id), bytes);
-      await writeAtomically(jsonPath(record.id), JSON.stringify(record));
-      if (!record.attached) (await loadedIndex())?.set(record.id, { ownerId: record.ownerId, size: record.size });
+      await oneAtATime(record.id, async () => {
+        await mkdir(directory, { recursive: true });
+        await writeAtomically(binPath(record.id), bytes);
+        await writeAtomically(jsonPath(record.id), JSON.stringify(record));
+        if (!record.attached) (await loadedIndex())?.set(record.id, { ownerId: record.ownerId, size: record.size });
+      });
     },
     get: readRecord,
     async readBytes(id) {
@@ -937,16 +971,22 @@ function createDiskAttachmentStorage(options) {
       }
     },
     async markAttached(id) {
-      const record = await readRecord(id);
-      if (record && !record.attached) await writeAtomically(jsonPath(id), JSON.stringify({ ...record, attached: true }));
-      (await loadedIndex())?.delete(id);
+      if (!isAttachmentId(id)) return;
+      await oneAtATime(id, async () => {
+        const record = await readRecord(id);
+        if (record && !record.attached) await writeAtomically(jsonPath(id), JSON.stringify({ ...record, attached: true }));
+        (await loadedIndex())?.delete(id);
+      });
     },
     async remove(id) {
-      if (isAttachmentId(id)) await removeFiles(id);
+      if (isAttachmentId(id)) await oneAtATime(id, () => removeFiles(id));
+    },
+    async removeUnattached(id) {
+      return isAttachmentId(id) && removeIfUnattached(id);
     },
     async removeAllOfChat(chatId) {
       const mine = (await listRecords()).filter((record) => record.chatId === chatId);
-      for (const record of mine) await removeFiles(record.id);
+      for (const record of mine) await oneAtATime(record.id, () => removeFiles(record.id));
       return mine.length;
     },
     async unattachedTotals(ownerId) {
@@ -967,13 +1007,16 @@ function createDiskAttachmentStorage(options) {
       for (const name of names) {
         if (name.endsWith(".json")) {
           const id = name.slice(0, -".json".length);
-          const record = await readRecord(id).catch(() => void 0);
-          if (record && !record.attached && Date.parse(record.createdAt) < before.getTime()) {
-            await removeFiles(id);
-            removed++;
-          }
-        } else if (name.endsWith(".tmp") || name.endsWith(".bin") && !present.has(`${name.slice(0, -".bin".length)}.json`)) {
+          const stale = (record) => Date.parse(record.createdAt) < before.getTime();
+          if (await removeIfUnattached(id, stale).catch(() => false)) removed++;
+        } else if (name.endsWith(".tmp")) {
           if (await modifiedBefore(name, before)) await rm(join(directory, name), { force: true });
+        } else if (name.endsWith(".bin") && !present.has(`${name.slice(0, -".bin".length)}.json`)) {
+          const id = name.slice(0, -".bin".length);
+          await oneAtATime(id, async () => {
+            const recordAppeared = await readRecord(id).catch(() => void 0) !== void 0;
+            if (!recordAppeared && await modifiedBefore(name, before)) await rm(join(directory, name), { force: true });
+          });
         }
       }
       return removed;
@@ -1003,6 +1046,10 @@ function createMemoryAttachmentStorage() {
     async remove(id) {
       if (isAttachmentId(id)) records.delete(id);
     },
+    async removeUnattached(id) {
+      const entry = isAttachmentId(id) ? records.get(id) : void 0;
+      return entry !== void 0 && !entry.record.attached && records.delete(id);
+    },
     async removeAllOfChat(chatId) {
       let removed = 0;
       for (const [id, { record }] of records) {