fix: register BlueBubbles webhook route before server-info fetch

techfitmaster · techfitmaster · commit c35ee4233e2f · 2026-03-14T10:43:03.000+08:00
Previously, monitorBlueBubblesProvider called fetchBlueBubblesServerInfo (up to 5 s timeout) *before* registering the webhook HTTP route. This created a window on every startup and after every crash-loop restart where POST /bluebubbles-webhook returned 404: the plugin HTTP registry had no matching entry yet so the request fell all the way through the gateway's stage pipeline. Fix: move registerBlueBubblesWebhookTarget to the top of the function, before the async server-info fetch, so the route is reachable as soon as the provider (re)starts. Also fix an off-by-one in server-channels restart accounting: when the crash-loop hit MAX_RESTART_ATTEMPTS + 1 it was reporting reconnectAttempts = MAX + 1 instead of MAX, causing the snapshot to show one extra attempt than the configured cap. Fixes #45620
diff --git a/extensions/bluebubbles/src/monitor.ts b/extensions/bluebubbles/src/monitor.ts
@@ -269,7 +269,21 @@ export async function monitorBlueBubblesProvider(
   const core = getBlueBubblesRuntime();
   const path = options.webhookPath?.trim() || DEFAULT_WEBHOOK_PATH;
 
-  // Fetch and cache server info (for macOS version detection in action gating)
+  // Register the webhook route immediately so that incoming messages are
+  // accepted as soon as the provider starts (or restarts).  Fetching server
+  // info is async and can take up to 5 s; registering after the fetch would
+  // leave a window where POST /bluebubbles-webhook returns 404.
+  const unregister = registerBlueBubblesWebhookTarget({
+    account,
+    config,
+    runtime,
+    core,
+    path,
+    statusSink,
+  });
+
+  // Fetch and cache server info (for macOS version detection in action gating).
+  // Done after registration so the webhook is already reachable.
   const serverInfo = await fetchBlueBubblesServerInfo({
     baseUrl: account.baseUrl,
     password: account.config.password,
@@ -285,15 +299,6 @@ export async function monitorBlueBubblesProvider(
     );
   }
 
-  const unregister = registerBlueBubblesWebhookTarget({
-    account,
-    config,
-    runtime,
-    core,
-    path,
-    statusSink,
-  });
-
   return await new Promise((resolve) => {
     const stop = () => {
       unregister();
diff --git a/src/gateway/server-channels.ts b/src/gateway/server-channels.ts
@@ -258,7 +258,10 @@ export function createChannelManager(opts: ChannelManagerOptions): ChannelManage
               setRuntime(channelId, id, {
                 accountId: id,
                 restartPending: false,
-                reconnectAttempts: attempt,
+                // Cap at MAX_RESTART_ATTEMPTS so callers see the configured
+                // limit rather than an internal over-count (attempt is already
+                // MAX + 1 at this point).
+                reconnectAttempts: MAX_RESTART_ATTEMPTS,
               });
               log.error?.(`[${id}] giving up after ${MAX_RESTART_ATTEMPTS} restart attempts`);
               return;
