dsh-tg-bridge 1.2.8 → 1.2.9

package/bridge.mjs

@@ -22,6 +22,7 @@ import dns from 'node:dns';
 import net from 'node:net';
 dns.setDefaultResultOrder('ipv4first');
 net.setDefaultAutoSelectFamily(false);
+import { noticeIsObsolete } from './queue-notice.mjs';
 import { handleControl, CONTROL_COMMANDS } from './control.mjs';
 import { renderPrices } from './prices.mjs';
 import { t, resolveLang } from './i18n.mjs';
@@ -1751,6 +1752,10 @@ async function main() {
       // handled inline and must stay silent about it.
       msg.text || msg.caption
         ? async () => {
+            // Which turn was running when this message was queued: if that
+            // value changes, the queued turn has started and the notice is
+            // already obsolete.
+            const turnWhenQueued = turnStartedAt.get(queueKey);
             await new Promise((resolve) => setTimeout(resolve, Number(config.busyNoticeMs ?? 45000)));
             if (!queues.has(queueKey)) return; // already finished
             // One notice per topic: a second queued message must not add a
@@ -1767,8 +1772,11 @@ async function main() {
               thread,
             );
             if (messageId) busyNotices.set(queueKey, { chatId: msg.chat.id, messageId });
-            // The turn may have started while the notice was in flight.
-            if (!queues.has(queueKey)) await clearBusyNotice(queueKey);
+            // The queued turn may have started while the notice was in flight;
+            // in that case nothing else will delete it until the turn ends.
+            if (noticeIsObsolete(turnWhenQueued, turnStartedAt.get(queueKey), queues.has(queueKey))) {
+              await clearBusyNotice(queueKey);
+            }
           }
         : undefined,
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tg-bridge",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "Telegram bridge for DeepSeek Harness: text, voice, photos and project-per-topic sessions without opening the desktop app",
   "type": "module",
   "main": "bridge.mjs",
@@ -12,7 +12,8 @@
     "setup": "node setup.mjs",
     "check": "node setup.mjs --check",
     "menu": "node bot-menu.mjs",
-    "doctor": "node bridge-kick.mjs"
+    "doctor": "node bridge-kick.mjs",
+    "test": "node --test"
   },
   "engines": {
     "node": ">=20"
@@ -43,6 +44,7 @@
     "README.md",
     "LICENSE",
     "config.example.json",
-    "patches/"
+    "patches/",
+    "queue-notice.mjs"
   ]
 }

package/queue-notice.mjs

@@ -0,0 +1,10 @@
+// When is a "your message is queued" notice already obsolete?
+//
+// It was written for a specific running turn (`turnWhenQueued`). It must go as
+// soon as that turn is no longer the one in front: either the queue drained, or
+// the queued turn started (its start time differs). Kept in its own module so
+// the rule can be tested without starting the bridge or talking to Telegram.
+
+export function noticeIsObsolete(turnWhenQueued, turnNow, stillQueued) {
+  return !stillQueued || turnNow !== turnWhenQueued;
+}