@hashgraphonline/standards-sdk 0.0.84 → 0.0.85

package/dist/es/hcs-10/connections-manager.d.ts

@@ -37,6 +37,8 @@ export interface Connection {
     closedReason?: string;
     closeMethod?: string;
     uniqueRequestKey?: string;
+    originTopicId?: string;
+    processed: boolean;
 }
 /**
  * Options for the connections manager
@@ -72,6 +74,12 @@ export declare class ConnectionsManager {
      * that might not be visible in our local messages
      */
     private checkTargetInboundTopicsForConfirmations;
+    /**
+     * Checks target agents' inbound topics for confirmations of our outbound connection requests
+     * This complements checkTargetInboundTopicsForConfirmations by looking for confirmations
+     * that might have been sent to the target agent's inbound topic rather than our own
+     */
+    private checkOutboundRequestsForConfirmations;
     /**
      * Fetches profiles for all connected accounts
      * @param accountId - The account ID making the request
@@ -105,10 +113,9 @@ export declare class ConnectionsManager {
     /**
      * Process inbound messages to track connection requests and confirmations
      * @param messages - The messages to process
-     * @param accountId - The account ID that received the messages
      * @returns Array of connections after processing
      */
-    processInboundMessages(messages: HCSMessage[], accountId: string): Connection[];
+    processInboundMessages(messages: HCSMessage[]): Connection[];
     /**
      * Process connection topic messages to update last activity time
      * @param connectionTopicId - The topic ID of the connection
@@ -154,12 +161,6 @@ export declare class ConnectionsManager {
      * @returns The connection with the given topic ID, or undefined if not found
      */
     getConnectionByTopicId(connectionTopicId: string): Connection | undefined;
-    /**
-     * Gets a connection by request ID
-     * @param requestId - The request ID to look up
-     * @returns The connection with the given request ID, or undefined if not found
-     */
-    getConnection(requestId: number, inboundTopicId: string): Connection | undefined;
     /**
      * Gets a connection by account ID
      * @param accountId - The account ID to look up
@@ -181,5 +182,22 @@ export declare class ConnectionsManager {
      * Clears all tracked connections and requests
      */
     clearAll(): void;
+    /**
+     * Checks if a given connection request has been processed already
+     * This uses a combination of topic ID and request ID to uniquely identify requests
+     *
+     * @param inboundTopicId - The inbound topic ID where the request was received
+     * @param requestId - The sequence number (request ID)
+     * @returns True if this specific request has been processed, false otherwise
+     */
+    isConnectionRequestProcessed(inboundTopicId: string, requestId: number): boolean;
+    /**
+     * Marks a specific connection request as processed
+     *
+     * @param inboundTopicId - The inbound topic ID where the request was received
+     * @param requestId - The sequence number (request ID)
+     * @returns True if a matching connection was found and marked, false otherwise
+     */
+    markConnectionRequestProcessed(inboundTopicId: string, requestId: number): boolean;
 }
 //# sourceMappingURL=connections-manager.d.ts.map

package/dist/es/hcs-10/connections-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connections-manager.d.ts","sourceRoot":"","sources":["../../../src/hcs-10/connections-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,UAAU,CAAC;CAC9C;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,oBAAoB,GAAG,QAAQ,CAAC;IACpE,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC;IACd,YAAY,CAAC,EAAE,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,cAAc,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IAC/C,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,UAAU,EAAE,eAAe,CAAC;CAC7B;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,eAAe,CAA6C;IACpE,OAAO,CAAC,YAAY,CAA0C;IAC9D,OAAO,CAAC,uBAAuB,CAA0B;IACzD,OAAO,CAAC,UAAU,CAAkB;IAEpC;;OAEG;gBACS,OAAO,EAAE,yBAAyB;IAmB9C;;;;OAIG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAiCnE;;;OAGG;YACW,wCAAwC;IAwGtD;;;OAGG;YACW,2BAA2B;IAmCzC;;;;OAIG;IACH,OAAO,CAAC,uCAAuC;IAsB/C;;;;OAIG;YACW,uBAAuB;IAyBrC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAY3B;;;;;OAKG;IACH,uBAAuB,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,MAAM,GAChB,UAAU,EAAE;IA8Kf;;;;;OAKG;IACH,sBAAsB,CACpB,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,MAAM,GAChB,UAAU,EAAE;IAoHf;;;;;OAKG;IACH,yBAAyB,CACvB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,UAAU,EAAE,GACrB,UAAU,GAAG,SAAS;IAwCzB;;;;OAIG;IACH,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAkBrD;;;OAGG;IACH,iBAAiB,IAAI,UAAU,EAAE;IAUjC;;;OAGG;IACH,kBAAkB,IAAI,UAAU,EAAE;IAUlC;;;;OAIG;IACH,OAAO,CAAC,mCAAmC;IAO3C;;;OAGG;IACH,oBAAoB,IAAI,UAAU,EAAE;IAMpC;;;OAGG;IACH,iCAAiC,IAAI,UAAU,EAAE;IASjD;;;;OAIG;IACH,sBAAsB,CAAC,iBAAiB,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIzE;;;;OAIG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAQhF;;;;OAIG;IACH,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAOnE;;;;OAIG;IACH,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,EAAE;IAM1D;;;OAGG;IACH,qBAAqB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAInD;;OAEG;IACH,QAAQ,IAAI,IAAI;CAIjB"}
+{"version":3,"file":"connections-manager.d.ts","sourceRoot":"","sources":["../../../src/hcs-10/connections-manager.ts"],"names":[],"mappings":"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"}

package/dist/es/standards-sdk.es10.js

@@ -32,6 +32,15 @@ class ConnectionsManager {
       const topicInfo = await this.baseClient.retrieveCommunicationTopics(
         accountId
       );
+      const isValidTopicId = (topicId) => {
+        return Boolean(topicId) && !topicId.includes(":");
+      };
+      if (!isValidTopicId(topicInfo.inboundTopic) || !isValidTopicId(topicInfo.outboundTopic)) {
+        this.logger.warn(
+          "Invalid topic IDs detected in retrieved communication topics"
+        );
+        return this.getAllConnections();
+      }
       const [outboundMessagesResult, inboundMessagesResult] = await Promise.all(
         [
           this.baseClient.getMessages(topicInfo.outboundTopic),
@@ -42,11 +51,15 @@ class ConnectionsManager {
         outboundMessagesResult.messages || [],
         accountId
       );
-      this.processInboundMessages(
-        inboundMessagesResult.messages || [],
-        accountId
+      this.processInboundMessages(inboundMessagesResult.messages || []);
+      const pendingCount = Array.from(this.connections.values()).filter(
+        (conn) => conn.status === "pending" || conn.isPending
+      ).length;
+      this.logger.debug(
+        `Processed ${outboundMessagesResult.messages?.length || 0} outbound and ${inboundMessagesResult.messages?.length || 0} inbound messages. Found ${pendingCount} pending connections.`
       );
       await this.checkTargetInboundTopicsForConfirmations();
+      await this.checkOutboundRequestsForConfirmations();
       await this.fetchProfilesForConnections(accountId);
       await this.fetchConnectionActivity();
       return this.getAllConnections();
@@ -61,7 +74,7 @@ class ConnectionsManager {
    */
   async checkTargetInboundTopicsForConfirmations() {
     const pendingConnections = Array.from(this.connections.values()).filter(
-      (conn) => conn.isPending && conn.targetInboundTopicId
+      (conn) => (conn.isPending || conn.status === "pending") && conn.targetInboundTopicId
     );
     if (pendingConnections.length === 0) {
       return;
@@ -92,16 +105,31 @@ class ConnectionsManager {
             if (!requestId) {
               continue;
             }
-            const confirmationMsg = targetMessages.find(
-              (msg) => msg.op === "connection_created" && msg.connection_id === requestId && msg.connection_topic_id
-            );
+            const confirmationMsg = targetMessages.find((msg) => {
+              if (msg.op !== "connection_created" || !msg.connection_topic_id) {
+                return false;
+              }
+              if (msg.connection_id !== requestId) {
+                return false;
+              }
+              if (conn.uniqueRequestKey) {
+                const keyParts = conn.uniqueRequestKey.split(":");
+                if (keyParts.length > 1) {
+                  const operatorIdPart = keyParts[1];
+                  if (msg.operator_id && msg.operator_id === operatorIdPart) {
+                    return true;
+                  }
+                  if (msg.connected_account_id === conn.targetAccountId) {
+                    return true;
+                  }
+                }
+              }
+              return true;
+            });
             if (confirmationMsg?.connection_topic_id) {
               confirmedAny = true;
               const connectionTopicId = confirmationMsg.connection_topic_id;
-              let pendingKey = conn.connectionTopicId;
-              if (!pendingKey.startsWith("req-") && conn.uniqueRequestKey) {
-                pendingKey = conn.uniqueRequestKey;
-              }
+              let pendingKey = conn.uniqueRequestKey;
               const newConnection = {
                 connectionTopicId,
                 targetAccountId: conn.targetAccountId,
@@ -113,10 +141,12 @@ class ConnectionsManager {
                 created: new Date(confirmationMsg.created || conn.created),
                 profileInfo: conn.profileInfo,
                 connectionRequestId: requestId,
-                uniqueRequestKey: conn.uniqueRequestKey
+                uniqueRequestKey: conn.uniqueRequestKey,
+                originTopicId: conn.originTopicId,
+                processed: conn.processed
               };
               this.connections.set(connectionTopicId, newConnection);
-              if (pendingKey && pendingKey !== connectionTopicId) {
+              if (pendingKey) {
                 this.connections.delete(pendingKey);
               }
               this.logger.debug(
@@ -141,6 +171,115 @@ class ConnectionsManager {
       }
     }
   }
+  /**
+   * Checks target agents' inbound topics for confirmations of our outbound connection requests
+   * This complements checkTargetInboundTopicsForConfirmations by looking for confirmations
+   * that might have been sent to the target agent's inbound topic rather than our own
+   */
+  async checkOutboundRequestsForConfirmations() {
+    const allConnections = Array.from(this.connections.values());
+    this.logger.info(`Total connections in map: ${allConnections.length}`);
+    const pendingByStatus = allConnections.filter(
+      (conn) => conn.status === "pending"
+    );
+    this.logger.info(
+      `Connections with status='pending': ${pendingByStatus.length}`
+    );
+    const pendingConnections = allConnections.filter(
+      (conn) => conn.status === "pending"
+    );
+    if (!Boolean(pendingConnections?.length)) {
+      this.logger.info("No pending connections found");
+      return;
+    }
+    for (const conn of pendingConnections) {
+      this.logger.debug(
+        `Processing pending connection: ${conn.connectionTopicId}`
+      );
+      if (!conn.targetAccountId) {
+        this.logger.debug(
+          `Skipping connection ${conn.connectionTopicId} - no targetAccountId`
+        );
+        continue;
+      }
+      let targetInboundTopicId = conn.targetInboundTopicId;
+      if (!targetInboundTopicId) {
+        try {
+          const profileResponse = await this.baseClient.retrieveProfile(
+            conn.targetAccountId
+          );
+          if (profileResponse?.profile?.inboundTopicId) {
+            targetInboundTopicId = profileResponse.profile.inboundTopicId;
+            this.connections.set(conn.connectionTopicId, {
+              ...conn,
+              targetInboundTopicId
+            });
+            this.logger.debug(
+              `Updated connection ${conn.connectionTopicId} with inbound topic ID: ${targetInboundTopicId}`
+            );
+          } else {
+            this.logger.debug(
+              `Couldn't get inbound topic ID for account ${conn.targetAccountId}`
+            );
+            continue;
+          }
+        } catch (error) {
+          this.logger.debug(
+            `Error fetching profile for ${conn.targetAccountId}: ${error}`
+          );
+          continue;
+        }
+      }
+      if (!targetInboundTopicId || targetInboundTopicId.includes(":")) {
+        this.logger.debug(
+          `Skipping invalid inbound topic format: ${targetInboundTopicId}`
+        );
+        continue;
+      }
+      const requestId = conn.connectionRequestId || conn.inboundRequestId;
+      if (!requestId) {
+        this.logger.debug(
+          `Skipping connection ${conn.connectionTopicId} - no request ID`
+        );
+        continue;
+      }
+      try {
+        this.logger.debug(
+          `Checking for confirmations on topic ${targetInboundTopicId} for request ID ${requestId}`
+        );
+        const targetMessagesResult = await this.baseClient.getMessages(
+          targetInboundTopicId
+        );
+        const targetMessages = targetMessagesResult.messages || [];
+        const confirmationMsg = targetMessages.find(
+          (msg) => msg.op === "connection_created" && msg.connection_id === requestId && msg.connection_topic_id
+        );
+        if (confirmationMsg?.connection_topic_id) {
+          const connectionTopicId = confirmationMsg.connection_topic_id;
+          this.logger.info(
+            `Found confirmation for request #${requestId} to ${conn.targetAccountId} on their inbound topic`
+          );
+          this.connections.set(conn.connectionTopicId, {
+            ...conn,
+            connectionTopicId,
+            status: "established",
+            isPending: false,
+            needsConfirmation: false,
+            created: new Date(confirmationMsg.created || conn.created),
+            lastActivity: new Date(confirmationMsg.created || conn.created)
+          });
+        } else {
+          this.logger.debug(
+            `No confirmation found for request ID ${requestId} on topic ${targetInboundTopicId}`
+          );
+        }
+      } catch (error) {
+        this.logger.warn(
+          `Error checking for confirmations on target inbound topic for ${conn.targetAccountId}: ${error}`
+        );
+      }
+    }
+  }
   /**
    * Fetches profiles for all connected accounts
    * @param accountId - The account ID making the request
@@ -198,16 +337,22 @@ class ConnectionsManager {
    */
   async fetchConnectionActivity() {
     const activeConnections = this.getActiveConnections();
-    const activityPromises = activeConnections.map(async (connection) => {
-      try {
-        const messagesResult = await this.baseClient.getMessages(
-          connection.connectionTopicId
+    const validConnections = activeConnections.filter((connection) => {
+      const topicId = connection.connectionTopicId;
+      if (!topicId || topicId.includes(":") || !topicId.match(/^0\.0\.\d+$/)) {
+        this.logger.debug(
+          `Skipping activity fetch for invalid topic ID format: ${topicId}`
         );
+        return false;
+      }
+      return true;
+    });
+    const activityPromises = validConnections.map(async (connection) => {
+      try {
+        const topicId = connection.connectionTopicId;
+        const messagesResult = await this.baseClient.getMessages(topicId);
         if (messagesResult?.messages?.length > 0) {
-          this.processConnectionMessages(
-            connection.connectionTopicId,
-            messagesResult.messages
-          );
+          this.processConnectionMessages(topicId, messagesResult.messages);
         }
       } catch (error) {
         this.logger.debug(
@@ -239,7 +384,7 @@ class ConnectionsManager {
    * @returns Array of connections after processing
    */
   processOutboundMessages(messages, accountId) {
-    if (!messages || messages.length === 0) {
+    if (!Boolean(messages?.length)) {
       return Array.from(this.connections.values());
     }
     const requestMessages = messages.filter(
@@ -257,11 +402,11 @@ class ConnectionsManager {
         continue;
       }
       const isAlreadyConfirmed = Array.from(this.connections.values()).some(
-        (conn) => conn.connectionRequestId === requestId && !conn.isPending
+        (conn) => conn.connectionRequestId === requestId && !conn.isPending && conn.targetAccountId === targetAccountId
       );
       const pendingKey = `req-${requestId}:${operatorId}`;
       if (!isAlreadyConfirmed && !this.pendingRequests.has(pendingKey)) {
-        this.pendingRequests.set(pendingKey, {
+        const pendingRequest = {
           id: requestId,
           requesterId: accountId,
           requesterTopicId: msg.outbound_topic_id || "",
@@ -272,9 +417,10 @@ class ConnectionsManager {
           created: msg.created || /* @__PURE__ */ new Date(),
           memo: msg.m,
           status: "pending"
-        });
+        };
+        this.pendingRequests.set(pendingKey, pendingRequest);
         if (!this.connections.has(pendingKey)) {
-          this.connections.set(pendingKey, {
+          const pendingConnection = {
             connectionTopicId: pendingKey,
             targetAccountId,
             targetInboundTopicId,
@@ -283,8 +429,11 @@ class ConnectionsManager {
             needsConfirmation: false,
             created: msg.created || /* @__PURE__ */ new Date(),
             connectionRequestId: requestId,
-            uniqueRequestKey: pendingKey
-          });
+            uniqueRequestKey: pendingKey,
+            originTopicId: msg.outbound_topic_id || "",
+            processed: false
+          };
+          this.connections.set(pendingKey, pendingConnection);
         }
       }
     }
@@ -311,14 +460,6 @@ class ConnectionsManager {
       if (this.connections.has(pendingKey)) {
         this.connections.delete(pendingKey);
       }
-      const existingConnections = Array.from(this.connections.entries()).filter(
-        ([_, conn]) => conn.connectionRequestId === requestId
-      );
-      for (const [key, _] of existingConnections) {
-        if (key !== connectionTopicId) {
-          this.connections.delete(key);
-        }
-      }
       if (!this.connections.has(connectionTopicId)) {
         this.connections.set(connectionTopicId, {
           connectionTopicId,
@@ -330,7 +471,9 @@ class ConnectionsManager {
           connectionRequestId: requestId,
           confirmedRequestId: msg.confirmed_request_id,
           requesterOutboundTopicId: msg.outbound_topic_id,
-          uniqueRequestKey: pendingKey
+          uniqueRequestKey: pendingKey,
+          originTopicId: msg.outbound_topic_id || "",
+          processed: false
         });
       } else {
         const conn = this.connections.get(connectionTopicId);
@@ -342,7 +485,9 @@ class ConnectionsManager {
           connectionRequestId: requestId,
           confirmedRequestId: msg.confirmed_request_id,
           requesterOutboundTopicId: msg.outbound_topic_id,
-          uniqueRequestKey: pendingKey
+          uniqueRequestKey: pendingKey,
+          originTopicId: msg.outbound_topic_id || "",
+          processed: false
         });
       }
     }
@@ -365,7 +510,9 @@ class ConnectionsManager {
           lastActivity: msg.created || /* @__PURE__ */ new Date(),
           closedReason: msg.reason,
           closeMethod: msg.close_method,
-          uniqueRequestKey: uniqueKey
+          uniqueRequestKey: uniqueKey,
+          originTopicId: conn.originTopicId,
+          processed: false
         });
       }
     }
@@ -376,11 +523,10 @@ class ConnectionsManager {
   /**
    * Process inbound messages to track connection requests and confirmations
    * @param messages - The messages to process
-   * @param accountId - The account ID that received the messages
    * @returns Array of connections after processing
    */
-  processInboundMessages(messages, accountId) {
-    if (!messages || messages.length === 0) {
+  processInboundMessages(messages) {
+    if (!Boolean(messages?.length)) {
       return Array.from(this.connections.values());
     }
     const requestMessages = messages.filter(
@@ -397,24 +543,21 @@ class ConnectionsManager {
         );
         continue;
       }
-      const isAlreadyConfirmed = messages.some(
-        (confirmMsg) => confirmMsg.op === "connection_created" && confirmMsg.connection_id === sequenceNumber
-      );
-      if (!isAlreadyConfirmed) {
-        const needsConfirmKey = `inb-${sequenceNumber}:${operatorId}`;
-        if (!this.connections.has(needsConfirmKey)) {
-          this.connections.set(needsConfirmKey, {
-            connectionTopicId: needsConfirmKey,
-            targetAccountId: requestorAccountId,
-            targetInboundTopicId: requestorTopicId,
-            status: "needs_confirmation",
-            isPending: false,
-            needsConfirmation: true,
-            created: msg.created || /* @__PURE__ */ new Date(),
-            inboundRequestId: sequenceNumber,
-            uniqueRequestKey: needsConfirmKey
-          });
-        }
+      const needsConfirmKey = `inb-${sequenceNumber}:${operatorId}`;
+      if (!this.connections.has(needsConfirmKey)) {
+        this.connections.set(needsConfirmKey, {
+          connectionTopicId: needsConfirmKey,
+          targetAccountId: requestorAccountId,
+          targetInboundTopicId: requestorTopicId,
+          status: "needs_confirmation",
+          isPending: false,
+          needsConfirmation: true,
+          created: msg.created || /* @__PURE__ */ new Date(),
+          inboundRequestId: sequenceNumber,
+          uniqueRequestKey: needsConfirmKey,
+          originTopicId: requestorTopicId,
+          processed: false
+        });
       }
     }
     const confirmationMessages = messages.filter(
@@ -424,24 +567,17 @@ class ConnectionsManager {
       const sequenceNumber = msg.connection_id;
       const connectionTopicId = msg.connection_topic_id;
       const connectedAccountId = msg.connected_account_id || "";
+      const operatorId = msg.operator_id || "";
       if (this.shouldFilterAccount(connectedAccountId)) {
         this.logger.debug(
           `Filtering out confirmation for account: ${connectedAccountId}`
         );
         continue;
       }
-      const needsConfirmKey = `inb-${sequenceNumber}:${msg.operator_id}`;
+      const needsConfirmKey = `inb-${sequenceNumber}:${operatorId}`;
       if (this.connections.has(needsConfirmKey)) {
         this.connections.delete(needsConfirmKey);
       }
-      const existingConnections = Array.from(this.connections.entries()).filter(
-        ([_, conn]) => conn.inboundRequestId === sequenceNumber
-      );
-      for (const [key, _] of existingConnections) {
-        if (key !== connectionTopicId) {
-          this.connections.delete(key);
-        }
-      }
       if (!this.connections.has(connectionTopicId)) {
         this.connections.set(connectionTopicId, {
           connectionTopicId,
@@ -451,7 +587,9 @@ class ConnectionsManager {
           needsConfirmation: false,
           created: msg.created || /* @__PURE__ */ new Date(),
           inboundRequestId: sequenceNumber,
-          uniqueRequestKey: needsConfirmKey
+          uniqueRequestKey: needsConfirmKey,
+          originTopicId: msg.connection_topic_id,
+          processed: false
         });
       } else {
         const conn = this.connections.get(connectionTopicId);
@@ -461,7 +599,9 @@ class ConnectionsManager {
           isPending: false,
           needsConfirmation: false,
           inboundRequestId: sequenceNumber,
-          uniqueRequestKey: needsConfirmKey
+          uniqueRequestKey: needsConfirmKey,
+          originTopicId: msg.connection_topic_id,
+          processed: false
         });
       }
     }
@@ -529,18 +669,22 @@ class ConnectionsManager {
    * @returns Array of all connections that should be visible
    */
   getAllConnections() {
-    return Array.from(this.connections.values()).filter(
+    const connections = Array.from(this.connections.values()).filter(
       (conn) => conn.status === "established" || conn.status === "closed" || !this.filterPendingAccountIds.has(conn.targetAccountId) || this.hasEstablishedConnectionWithAccount(conn.targetAccountId)
     );
+    return connections;
   }
   /**
    * Gets all pending connection requests
    * @returns Array of pending connection requests
    */
   getPendingRequests() {
-    return Array.from(this.connections.values()).filter((conn) => {
-      return conn.isPending && (!this.filterPendingAccountIds.has(conn.targetAccountId) || this.hasEstablishedConnectionWithAccount(conn.targetAccountId));
-    });
+    const pendingConnections = Array.from(this.connections.values()).filter(
+      (conn) => {
+        return conn.isPending && (!this.filterPendingAccountIds.has(conn.targetAccountId) || this.hasEstablishedConnectionWithAccount(conn.targetAccountId));
+      }
+    );
+    return pendingConnections;
   }
   /**
    * Helper method to check if there's an established connection with an account
@@ -578,16 +722,6 @@ class ConnectionsManager {
   getConnectionByTopicId(connectionTopicId) {
     return this.connections.get(connectionTopicId);
   }
-  /**
-   * Gets a connection by request ID
-   * @param requestId - The request ID to look up
-   * @returns The connection with the given request ID, or undefined if not found
-   */
-  getConnection(requestId, inboundTopicId) {
-    return Array.from(this.connections.values()).find(
-      (conn) => conn.connectionRequestId === requestId || conn.inboundRequestId === requestId
-    );
-  }
   /**
    * Gets a connection by account ID
    * @param accountId - The account ID to look up
@@ -622,6 +756,58 @@ class ConnectionsManager {
     this.connections.clear();
     this.pendingRequests.clear();
   }
+  /**
+   * Checks if a given connection request has been processed already
+   * This uses a combination of topic ID and request ID to uniquely identify requests
+   *
+   * @param inboundTopicId - The inbound topic ID where the request was received
+   * @param requestId - The sequence number (request ID)
+   * @returns True if this specific request has been processed, false otherwise
+   */
+  isConnectionRequestProcessed(inboundTopicId, requestId) {
+    for (const conn of this.connections.values()) {
+      if (conn.originTopicId === inboundTopicId && conn.inboundRequestId === requestId && conn.processed) {
+        return true;
+      }
+      if (conn.originTopicId === inboundTopicId && conn.connectionRequestId === requestId && conn.processed) {
+        return true;
+      }
+    }
+    return false;
+  }
+  /**
+   * Marks a specific connection request as processed
+   *
+   * @param inboundTopicId - The inbound topic ID where the request was received
+   * @param requestId - The sequence number (request ID)
+   * @returns True if a matching connection was found and marked, false otherwise
+   */
+  markConnectionRequestProcessed(inboundTopicId, requestId) {
+    let found = false;
+    for (const [key, conn] of this.connections.entries()) {
+      if (conn.originTopicId === inboundTopicId && conn.inboundRequestId === requestId) {
+        this.connections.set(key, {
+          ...conn,
+          processed: true
+        });
+        found = true;
+        this.logger.debug(
+          `Marked inbound connection request #${requestId} on topic ${inboundTopicId} as processed`
+        );
+      }
+      if (conn.originTopicId === inboundTopicId && conn.connectionRequestId === requestId) {
+        this.connections.set(key, {
+          ...conn,
+          processed: true
+        });
+        found = true;
+        this.logger.debug(
+          `Marked outbound connection request #${requestId} on topic ${inboundTopicId} as processed`
+        );
+      }
+    }
+    return found;
+  }
 }
 export {
   ConnectionsManager