openclaw-quiubo 2.6.7 → 2.6.11

package/dist/index.js

@@ -12470,6 +12470,11 @@ var RealtimeGateway = class {
   pollTimer = null;
   polling = false;
   cursors = /* @__PURE__ */ new Map();
+  /** Message IDs already dispatched (Pusher + poll dedup). Capped to prevent unbounded growth. */
+  dispatched = /* @__PURE__ */ new Set();
+  // Cached directory group IDs from listAgentGroups (refreshed every 60s)
+  agentGroupsCache = null;
+  AGENT_GROUPS_TTL = 6e4;
   // Bot config cache (per group)
   botConfigCache = /* @__PURE__ */ new Map();
   // Owner takeover suppression: groupId → suppressedUntil timestamp
@@ -12503,6 +12508,13 @@ var RealtimeGateway = class {
   setBotConfig(groupId, config) {
     this.botConfigCache.set(groupId, config);
   }
+  /** Track a dispatched message ID (capped at 500 to prevent unbounded growth) */
+  markDispatched(messageId) {
+    this.dispatched.add(messageId);
+    if (this.dispatched.size > 500) {
+      this.dispatched.clear();
+    }
+  }
   /** Get bot config for a group (for outbound scope checks) */
   getBotConfig(groupId) {
     return this.botConfigCache.get(groupId);
@@ -12599,12 +12611,13 @@ var RealtimeGateway = class {
    */
   async start() {
     this.stopped = false;
+    console.log(`[gw:start] botIdentityId=${this.botIdentityId} pusher=${!!this.pusherConfig} agentId=${this.agentId}`);
+    this.startPolling();
+    if (this.agentId) this.startHeartbeat();
     if (this.pusherConfig) {
       await this.startPusher();
     } else {
-      this.log.info?.("No Pusher config \u2014 using polling only");
-      this.startPolling();
-      if (this.agentId) this.startHeartbeat();
+      console.log("[gw:start] No Pusher config \u2014 polling only");
     }
   }
   /**
@@ -12638,6 +12651,7 @@ var RealtimeGateway = class {
   // ── Pusher ──────────────────────────────────────────────────────
   async startPusher() {
     if (!this.pusherConfig) return;
+    console.log(`[gw:startPusher] botIdentityId=${this.botIdentityId} key=${this.pusherConfig.key} cluster=${this.pusherConfig.cluster}`);
     this.log.info?.(`[gateway] startPusher called for botIdentityId=${this.botIdentityId}`);
     const { key, cluster } = this.pusherConfig;
     const apiClient = this.client;
@@ -12659,12 +12673,13 @@ var RealtimeGateway = class {
       })
     });
     this.pusherClient.connection.bind("state_change", (states) => {
+      console.log(`[gw:pusher] state: ${states.previous} \u2192 ${states.current}`);
       log.info?.(`Pusher state: ${states.previous} \u2192 ${states.current}`);
     });
     this.pusherClient.connection.bind("connected", () => {
       this.pusherConnected = true;
-      log.info?.("Pusher connected");
-      this.stopPolling();
+      console.log("[gw:pusher] connected");
+      log.info?.("Pusher connected (polling continues as safety net)");
       if (this.agentId) this.startHeartbeat();
     });
     this.pusherClient.connection.bind("disconnected", () => {
@@ -12754,16 +12769,18 @@ var RealtimeGateway = class {
         agentDisplayName: this.agentDisplayName ?? void 0,
         securityMode: data.securityMode
       });
+      this.agentGroupsCache = null;
     });
     channel.bind("agent:group-removed", (data) => {
       log.info?.(`agent:group-removed for group ${data.groupId}`);
       this.botConfigCache.delete(data.groupId);
+      this.agentGroupsCache = null;
     });
     channel.bind_global((eventName, data) => {
-      if (eventName.startsWith("pusher:") || eventName.startsWith("pusher_")) return;
-      log.info?.(`[pusher:raw] event=${eventName} data=${JSON.stringify(data).slice(0, 300)}`);
+      console.log(`[gw:pusher:raw] event=${eventName} data=${JSON.stringify(data).slice(0, 200)}`);
     });
     channel.bind("new-group-message", (data) => {
+      console.log(`[gw:pusher:msg] messageId=${data.messageId} groupId=${data.groupId} sender=${data.senderUsername} plaintext=${!!data.plaintext} ciphertext=${!!data.ciphertext}`);
       log.info?.(`Pusher event: messageId=${data.messageId} groupId=${data.groupId} sender=${data.senderUsername} plaintext=${!!data.plaintext} ciphertext=${!!data.ciphertext} botId=${this.botIdentityId}`);
       if (data.senderId === this.botIdentityId) return;
       this.shouldProcessMessage(data.groupId, data.senderId, {
@@ -12778,6 +12795,7 @@ var RealtimeGateway = class {
         if (!shouldProcess) return;
         if (data.plaintext) {
           this.cursors.set(data.groupId, data.messageId);
+          this.markDispatched(data.messageId);
           Promise.resolve(this.onMessage({
             messageId: data.messageId,
             groupId: data.groupId,
@@ -12805,6 +12823,7 @@ var RealtimeGateway = class {
                 const plaintext = decryptGroupMessage(data.ciphertext, cached.key);
                 log.info?.(`[e2ee:pusher] group=${data.groupId} decrypted OK: ${plaintext?.length} chars \u2014 routing to onMessage`);
                 this.cursors.set(data.groupId, data.messageId);
+                this.markDispatched(data.messageId);
                 return Promise.resolve(this.onMessage({
                   messageId: data.messageId,
                   groupId: data.groupId,
@@ -12856,6 +12875,8 @@ var RealtimeGateway = class {
         this.log.warn?.(`Message ${messageId} has no plaintext`);
         return;
       }
+      if (this.dispatched.has(msg.id)) return;
+      this.markDispatched(msg.id);
       await this.onMessage({
         messageId: msg.id,
         groupId,
@@ -12877,6 +12898,7 @@ var RealtimeGateway = class {
   // ── Polling (fallback) ──────────────────────────────────────────
   startPolling() {
     if (this.pollTimer) return;
+    console.log(`[gw:startPolling] botIdentityId=${this.botIdentityId} interval=${this.pollIntervalMs}ms`);
     this.log.info?.(`[gateway] startPolling called for botIdentityId=${this.botIdentityId}`);
     this.poll();
     this.pollTimer = setInterval(() => this.poll(), this.pollIntervalMs);
@@ -12887,8 +12909,57 @@ var RealtimeGateway = class {
       this.pollTimer = null;
     }
   }
+  /**
+   * Get directory group IDs, refreshing from API every AGENT_GROUPS_TTL ms.
+   * Falls back to botConfigCache if the API call fails.
+   * Pusher agent:group-added/removed events also invalidate the cache.
+   */
+  async getDirectoryGroupIds() {
+    if (!this.agentId) {
+      const ids = /* @__PURE__ */ new Set();
+      for (const [gid, config] of this.botConfigCache) {
+        if (config.source === "directory" && config.enabled) ids.add(gid);
+      }
+      return ids;
+    }
+    const now = Date.now();
+    if (this.agentGroupsCache && now - this.agentGroupsCache.fetchedAt < this.AGENT_GROUPS_TTL) {
+      return this.agentGroupsCache.groupIds;
+    }
+    try {
+      const { groups: agentGroups } = await this.client.listAgentGroups(this.agentId);
+      const ids = /* @__PURE__ */ new Set();
+      for (const ag of agentGroups) {
+        if (ag.source === "directory" && (ag.enabled ?? true)) {
+          ids.add(ag.groupId);
+          if (!this.botConfigCache.has(ag.groupId)) {
+            this.botConfigCache.set(ag.groupId, {
+              enabled: ag.enabled ?? true,
+              suppressionMinutes: 10,
+              ownerIdentityId: "",
+              groupType: ag.groupType ?? "standard",
+              source: "directory",
+              grantedScopes: ag.grantedScopes,
+              agentDisplayName: ag.agentDisplayName ?? this.agentDisplayName ?? void 0,
+              securityMode: ag.securityMode
+            });
+          }
+        }
+      }
+      this.agentGroupsCache = { groupIds: ids, fetchedAt: now };
+      return ids;
+    } catch (err) {
+      this.log.warn?.(`listAgentGroups failed: ${err}, using cache`);
+      if (this.agentGroupsCache) return this.agentGroupsCache.groupIds;
+      const ids = /* @__PURE__ */ new Set();
+      for (const [gid, config] of this.botConfigCache) {
+        if (config.source === "directory" && config.enabled) ids.add(gid);
+      }
+      return ids;
+    }
+  }
   async poll() {
-    if (this.polling || this.pusherConnected) return;
+    if (this.polling) return;
     this.polling = true;
     try {
       this.clearStaleSuppression();
@@ -12906,11 +12977,9 @@ var RealtimeGateway = class {
         }
       }
       const groupIds = new Set(groups.map((g) => g.id));
-      for (const [gid, config] of this.botConfigCache) {
-        if (config.source === "directory" && config.enabled) {
-          groupIds.add(gid);
-        }
-      }
+      const directoryIds = await this.getDirectoryGroupIds();
+      for (const gid of directoryIds) groupIds.add(gid);
+      console.log(`[gw:poll] partner=${groups.length} directory=${directoryIds.size} total=${groupIds.size} groups=[${[...groupIds].join(", ")}]`);
       await Promise.allSettled(
         [...groupIds].map((gid) => this.pollGroup(gid))
       );
@@ -12923,7 +12992,7 @@ var RealtimeGateway = class {
   async pollGroup(groupId) {
     try {
       const cursor = this.cursors.get(groupId);
-      this.log.info?.(`[poll] polling group=${groupId} cursor=${cursor ?? "none"}`);
+      console.log(`[gw:pollGroup] group=${groupId} cursor=${cursor ?? "none"}`);
       const { messages } = await this.client.listMessages(groupId, cursor);
       if (messages.length === 0) return;
       const lastMessage = messages[messages.length - 1];
@@ -12947,8 +13016,17 @@ var RealtimeGateway = class {
         }
         if (!plaintext) continue;
         const shouldProcess = await this.shouldProcessMessage(groupId, msg.senderIdentityId, { plaintext });
-        if (!shouldProcess) continue;
+        if (!shouldProcess) {
+          console.log(`[gw:pollGroup] skipping msg=${msg.id} in group=${groupId} (shouldProcess=false)`);
+          continue;
+        }
+        if (this.dispatched.has(msg.id)) {
+          console.log(`[gw:pollGroup] skipping msg=${msg.id} in group=${groupId} (already dispatched)`);
+          continue;
+        }
         try {
+          console.log(`[gw:pollGroup] dispatching msg=${msg.id} group=${groupId} text=${plaintext?.slice(0, 60)}`);
+          this.markDispatched(msg.id);
           await this.onMessage({
             messageId: msg.id,
             groupId,