@inetafrica/open-claudia 2.6.43 → 2.6.44

package/channels/telegram/adapter.js

@@ -19,11 +19,16 @@ class TelegramAdapter {
     this.token = token;
     this.ownerChatId = ownerChatId;
     this.chatIds = chatIds || [];
+    // Own the HTTP(S) agent so we can drop dead keep-alive sockets on reconnect.
+    this._agent = new https.Agent({ keepAlive: true });
     this.bot = new TelegramBot(token, {
       polling: { autoStart: false, params: { timeout: 30 } },
+      request: { agent: this._agent },
     });
     this._listeners = { message: new Set(), action: new Set() };
     this._reconnectTimer = null;
+    this._recoveryTimer = null;
+    this._reconnectAttempts = 0;
     this._wireInbound();
   }
 
@@ -45,9 +50,49 @@ class TelegramAdapter {
   }
 
   async stop() {
+    if (this._reconnectTimer) { clearTimeout(this._reconnectTimer); this._reconnectTimer = null; }
+    if (this._recoveryTimer) { clearTimeout(this._recoveryTimer); this._recoveryTimer = null; }
     try { await this.bot.stopPolling(); } catch (e) {}
   }
 
+  // Recover from a wedged poll loop. The library reuses one keep-alive socket;
+  // after a sleep/wake or network blip that socket dies and every poll then
+  // ETIMEDOUTs forever — restarting polling alone reuses the same dead socket.
+  // So we destroy the agent (forcing a fresh connection), back off, and if we
+  // still can't recover after several tries we exit so launchd (KeepAlive)
+  // relaunches a fully clean process.
+  _scheduleReconnect() {
+    if (this._reconnectTimer) return; // one cycle in flight; swallow the flood
+    if (this._recoveryTimer) { clearTimeout(this._recoveryTimer); this._recoveryTimer = null; }
+    this._reconnectAttempts += 1;
+    const MAX = 6;
+    if (this._reconnectAttempts > MAX) {
+      console.error(`Polling unrecoverable after ${MAX} attempts — exiting for supervisor restart.`);
+      process.exit(1);
+    }
+    const delay = Math.min(30000, 1000 * 2 ** this._reconnectAttempts); // 2s,4s,8s,16s,30s,30s
+    console.log(`Network lost. Reconnecting in ${Math.round(delay / 1000)}s (attempt ${this._reconnectAttempts}/${MAX})...`);
+    this._reconnectTimer = setTimeout(async () => {
+      this._reconnectTimer = null;
+      try {
+        try { await this.bot.stopPolling(); } catch (e) {}
+        try { this._agent.destroy(); } catch (e) {} // drop the dead pooled socket
+        await new Promise((r) => setTimeout(r, 1000));
+        await this.bot.startPolling();
+        console.log("Polling restarted.");
+        // No fresh error within 30s ⇒ genuinely recovered; reset the counter.
+        this._recoveryTimer = setTimeout(() => {
+          this._recoveryTimer = null;
+          if (this._reconnectAttempts) console.log("Connection healthy again.");
+          this._reconnectAttempts = 0;
+        }, 30000);
+      } catch (e) {
+        console.error("Reconnect attempt failed:", e.message);
+        this._scheduleReconnect(); // back off and retry; don't die on first miss
+      }
+    }, delay);
+  }
+
   _wireInbound() {
     this.bot.on("polling_error", (err) => {
       const msg = err.message || "";
@@ -56,21 +101,8 @@ class TelegramAdapter {
         console.error("Another instance is polling. Exiting.");
         process.exit(1);
       }
-      if (msg.includes("ETIMEDOUT") || msg.includes("ECONNRESET") || msg.includes("ENOTFOUND") || msg.includes("EFATAL")) {
-        if (this._reconnectTimer) return;
-        console.log("Network lost. Reconnecting in 10s...");
-        this._reconnectTimer = setTimeout(async () => {
-          this._reconnectTimer = null;
-          try {
-            await this.bot.stopPolling();
-            await new Promise((r) => setTimeout(r, 2000));
-            await this.bot.startPolling();
-            console.log("Reconnected.");
-          } catch (e) {
-            console.error("Reconnect failed:", e.message);
-            process.exit(1);
-          }
-        }, 10000);
+      if (/ETIMEDOUT|ECONNRESET|ENOTFOUND|ENETUNREACH|EAI_AGAIN|EFATAL|socket hang up/i.test(msg)) {
+        this._scheduleReconnect();
       }
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inetafrica/open-claudia",
-  "version": "2.6.43",
+  "version": "2.6.44",
   "description": "Your always-on AI coding assistant — Claude Code, Cursor Agent, and OpenAI Codex via Telegram or Kazee Chat",
   "main": "bot.js",
   "bin": {