@fabriktor/fx 0.0.101 → 0.0.102

package/dist/src/chat/send-queue.d.ts

@@ -53,6 +53,8 @@ export declare class ChatSendQueue {
     private listeners;
     private readonly queue;
     private uploads;
+    private sends;
+    private cancellations;
     private writes;
     private pendingSaves;
     private error?;

package/dist/src/chat/send-queue.js

@@ -26,6 +26,8 @@ export class ChatSendQueue {
     listeners = new Set();
     queue;
     uploads = new Set();
+    sends = new Map();
+    cancellations = new Set();
     writes = Promise.resolve();
     pendingSaves = new Map();
     error;
@@ -213,38 +215,55 @@ export class ChatSendQueue {
         await this.refresh();
     }
     async remove(id) {
-        const entry = this.entries.find((value) => value.id === id);
+        const owner = this.owner, signal = this.controller.signal;
+        let entry = this.entries.find((value) => value.id === id);
         if (!entry ||
-            !this.enabled ||
-            entry.status === ChatSendStatus.Saving ||
-            entry.status === ChatSendStatus.Sending ||
-            entry.status === ChatSendStatus.Uploading) {
+            !this.current(owner, signal) ||
+            !chatSendCanRemove(entry) ||
+            this.cancellations.has(id)) {
             return;
         }
-        if (entry.sequence === undefined) {
-            this.pendingSaves.delete(id);
-            this.entries = this.entries.filter((value) => value.id !== id);
-            this.publish();
-            this.persist();
-            return;
-        }
-        const signal = this.controller.signal, owner = this.owner;
-        const removeStored = async () => {
-            if (!this.current(owner, signal))
+        this.cancellations.add(id);
+        try {
+            // Finish a pending local save before removing its durable record. The
+            // cancellation flag prevents this tab from starting that message meanwhile.
+            if (entry.status === ChatSendStatus.Saving) {
+                await this.writes;
+                entry = this.entries.find((value) => value.id === id);
+            }
+            if (!entry || !this.current(owner, signal) || !chatSendCanRemove(entry)) {
                 return;
-            const stored = (await this.opts.store.list(owner)).find((value) => value.id === id);
-            if (stored && !chatSendCanRemove(stored))
+            }
+            // Cancel only this request. A server response that already arrived wins;
+            // the shared room lock still protects removal from another tab's sender.
+            this.sends.get(id)?.abort();
+            if (entry.sequence === undefined) {
+                this.pendingSaves.delete(id);
+                this.entries = this.entries.filter((value) => value.id !== id);
+                this.publish();
+                this.persist();
                 return;
-            await this.opts.store.remove(id);
-            this.entries = this.entries.filter((value) => value.id !== id);
-            this.publish();
-            this.opts.changed?.();
-        };
-        // Upload retries use their own lock so a slow multipart never holds the
-        // message lane. Discard must coordinate with that same lock.
-        await this.opts.lock(entry.chat ? this.uploadLock(entry) : this.roomLock(entry), signal, removeStored);
-        this.persist();
-        await this.refresh();
+            }
+            const removeStored = async () => {
+                if (!this.current(owner, signal))
+                    return;
+                const stored = (await this.opts.store.list(owner)).find((value) => value.id === id);
+                if (stored && !chatSendCanRemove(stored))
+                    return;
+                await this.opts.store.remove(id);
+                this.entries = this.entries.filter((value) => value.id !== id);
+                this.publish();
+                this.opts.changed?.();
+            };
+            // Upload retries use their own lock so a slow multipart never holds the
+            // message lane. Discard must coordinate with that same lock.
+            await this.opts.lock(entry.chat ? this.uploadLock(entry) : this.roomLock(entry), signal, removeStored);
+        }
+        finally {
+            this.cancellations.delete(id);
+            this.persist();
+            await this.refresh();
+        }
     }
     work(room, owner, signal) {
         this.queue.process({
@@ -264,7 +283,7 @@ export class ChatSendQueue {
                 }
             },
             run: async (entry) => {
-                if (!this.current(owner, signal)) {
+                if (!this.current(owner, signal) || this.cancellations.has(entry.id)) {
                     return false;
                 }
                 if (entry.status === ChatSendStatus.Sending ||
@@ -278,6 +297,9 @@ export class ChatSendQueue {
                     return false;
                 }
                 let current = entry;
+                const request = new AbortController();
+                const requestSignal = AbortSignal.any([signal, request.signal]);
+                this.sends.set(entry.id, request);
                 try {
                     current = {
                         ...entry,
@@ -289,9 +311,10 @@ export class ChatSendQueue {
                         return false;
                     }
                     if (!current.server_id) {
+                        requestSignal.throwIfAborted();
                         const out = await this.opts.chat.insertOneChat({
                             in: current.input,
-                            signal,
+                            signal: requestSignal,
                             idempotency_key: current.id,
                         });
                         current = {
@@ -339,7 +362,7 @@ export class ChatSendQueue {
                     try {
                         await this.save({
                             ...current,
-                            status: signal.aborted
+                            status: requestSignal.aborted
                                 ? ChatSendStatus.Interrupted
                                 : ChatSendStatus.Failed,
                         });
@@ -347,12 +370,15 @@ export class ChatSendQueue {
                     catch (storageError) {
                         this.error = storageError;
                     }
-                    if (this.current(owner, signal)) {
+                    if (this.current(owner, signal) && !request.signal.aborted) {
                         this.error = err;
                         this.publish();
                     }
                     return false;
                 }
+                finally {
+                    this.sends.delete(entry.id);
+                }
                 return true;
             },
         });
@@ -518,5 +544,11 @@ export function chatSendNeedsRetry(entry) {
         entry.status === ChatSendStatus.UploadInterrupted);
 }
 export function chatSendCanRemove(entry) {
-    return entry.status === ChatSendStatus.Queued || chatSendNeedsRetry(entry);
+    if (!entry.chat && entry.server_id) {
+        return false;
+    }
+    return (entry.status === ChatSendStatus.Saving ||
+        entry.status === ChatSendStatus.Queued ||
+        entry.status === ChatSendStatus.Sending ||
+        chatSendNeedsRetry(entry));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.101",
+  "version": "0.0.102",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {