@aspalagin/openclaw-max 0.7.3 → 0.8.1

package/dist/src/webhook.js

@@ -75,11 +75,21 @@ export function registerMaxWebhookRoute(params) {
 export function maxUpdateDedupeKey(update) {
     const id = update.callback?.callback_id ??
         update.message?.body?.mid ??
-        (typeof update.message_id === 'string' ? update.message_id : undefined);
+        // A forward-only message has no body; its link carries the original mid.
+        update.message?.link?.message?.mid ??
+        (typeof update.message_id === 'string' ? update.message_id : undefined) ??
+        // Registry updates (bot_started, bot_added, …) carry no message: their chat
+        // and user tell apart two of them in the same millisecond.
+        registryUpdateId(update);
     if (!id && update.timestamp == null)
         return undefined;
     return `${update.update_type}:${update.timestamp ?? ''}:${id ?? ''}`;
 }
+function registryUpdateId(update) {
+    const userId = update.user?.user_id ?? update.user_id;
+    const parts = [update.chat_id, userId].filter((part) => part != null);
+    return parts.length > 0 ? parts.join('/') : undefined;
+}
 /** Returns true when the key was already seen (LRU bounded by DEDUPE_CAPACITY). */
 function rememberUpdate(seen, key) {
     if (seen.has(key)) {
@@ -143,25 +153,34 @@ export async function handleMaxWebhookRequest(req, res) {
         return true;
     }
     const update = raw;
-    // MAX needs 200 within 30 s while an agent turn can take minutes: ack first,
-    // then hand the update to the account task. Errors are logged, never turned
-    // into a non-200 (that would only make MAX redeliver and eventually
-    // unsubscribe the bot). onUpdate must only enqueue: this request's work
-    // admission is released when the handler returns, so agent/session work
-    // started from here would fail with GatewayDrainingError.
-    res.statusCode = 200;
-    res.setHeader('Content-Type', 'application/json');
-    res.end(JSON.stringify({ ok: true }));
     const dedupeKey = maxUpdateDedupeKey(update);
     if (dedupeKey && rememberUpdate(matchedTarget.seen, dedupeKey)) {
         matchedTarget.log?.(`[${matchedTarget.account.accountId}] MAX webhook: duplicate ${dedupeKey} skipped`);
+        res.statusCode = 200;
+        res.setHeader('Content-Type', 'application/json');
+        res.end(JSON.stringify({ ok: true }));
         return true;
     }
-    void Promise.resolve()
-        .then(() => matchedTarget.onUpdate(update))
-        .catch((err) => {
-        matchedTarget.error?.(`[${matchedTarget.account.accountId}] Webhook update processing failed: ${String(err)}`);
-    });
+    // MAX needs 200 within 30 s while an agent turn can take minutes: onUpdate
+    // only records the update (durable journal) and enqueues it for the account
+    // task, then MAX gets its 200. It must not dispatch: this request's work
+    // admission is released when the handler returns, so agent/session work
+    // started from here would fail with GatewayDrainingError. When the update
+    // could not be recorded, 503 makes MAX redeliver it instead of losing it.
+    try {
+        await matchedTarget.onUpdate(update);
+    }
+    catch (err) {
+        if (dedupeKey)
+            matchedTarget.seen.delete(dedupeKey);
+        matchedTarget.error?.(`[${matchedTarget.account.accountId}] MAX webhook: ${update.update_type} not queued, answering 503 for redelivery: ${String(err)}`);
+        res.statusCode = 503;
+        res.end('Service Unavailable');
+        return true;
+    }
+    res.statusCode = 200;
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify({ ok: true }));
     return true;
 }
 /**