trac-msb 0.2.19 → 0.2.21

package/SECURITY.md

@@ -6,13 +6,11 @@ The following table shows which versions of this project are currently receiving
 
 | Version  | Supported          | Pear compatibility |
 | -------- | ------------------ | ------------------ |
-| 0.2.19   | :white_check_mark: | Pear v2 and v3     |
-| 0.2.18   | :white_check_mark: | Pear v2 only       |
-| 0.2.17   | :white_check_mark: | Pear v2 only       |
+| 0.2.21   | :white_check_mark: | Pear v2 and v3     |
 | main     | :warning: unstable | Pear v2 and v3     |
-| < 0.2.17 | :x:               | N/A                |
+| < 0.2.21 | :x:                | N/A                |
 
-Versions older than 0.2.17 are deprecated.
+Versions older than 0.2.21 are deprecated.
 Please upgrade to the latest release to ensure you receive security fixes.
 
 ---

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"

package/src/core/network/Network.js

@@ -39,6 +39,7 @@ class Network extends ReadyResource {
     #wallet;
     #validatorHealthCheckService;
     #logger;
+    #closing = false;
 
     /**
      * @param {State} state
@@ -82,6 +83,7 @@ class Network extends ReadyResource {
 
     async _open() {
         this.#logger.info('Network initialization...');
+        this.#closing = false;
 
         this.setupNetworkListeners();
 
@@ -91,6 +93,7 @@ class Network extends ReadyResource {
 
     async _close() {
         this.#logger.info('Network: closing gracefully...');
+        this.#closing = true;
         await this.transactionPoolService.stopPool();
         await sleep(100);
         await this.#validatorObserverService.stopValidatorObserver();
@@ -104,8 +107,15 @@ class Network extends ReadyResource {
         this.#pendingRequestsService.close();
         this.#transactionCommitService.close();
 
-        if (this.#swarm !== null) {
-            this.#swarm.destroy();
+        const swarm = this.#swarm;
+        if (swarm !== null) {
+            if (typeof swarm.removeAllListeners === 'function') {
+                swarm.removeAllListeners('connection');
+            }
+            await swarm.destroy();
+            if (this.#swarm === swarm) {
+                this.#swarm = null;
+            }
         }
     }
 
@@ -167,8 +177,12 @@ class Network extends ReadyResource {
         store,
         wallet,
     ) {
+        this.#assertCanReplicate();
+
         if (!this.#swarm) {
             const { wallet: wrappedWallet, keyPair } = await this.#getOrGenerateWallet(store, wallet);
+            this.#assertCanReplicate();
+
             this.#wallet = wrappedWallet
             this.#validatorMessageOrchestrator.setWallet(this.#wallet);
 
@@ -193,19 +207,49 @@ class Network extends ReadyResource {
             );
             this.#validatorHealthCheckService = new ValidatorHealthCheckService(this.#config);
             await this.#validatorHealthCheckService.ready();
+            this.#assertCanReplicate();
+
             this.#validatorConnectionManager.subscribeToHealthChecks(this.#validatorHealthCheckService);
 
             this.#logger.info(`Channel: ${b4a.toString(this.#config.channel)}`);
 
             this.#swarm.on('connection', async (connection) => {
-                // Per-peer connection initialization:
-                // - attach Protomux (legacy + v1 channels/messages)
-                // - attach connection.protocolSession (used later by tryConnect / orchestrators to send messages)
-                await this.#networkMessages.setupProtomuxMessages(connection);
+                if (this.#closing) {
+                    this.#destroyConnection(connection);
+                    return;
+                }
 
-                // ATTENTION: Must be called AFTER the protomux init above
-                const stream = store.replicate(connection);
-                wakeup.addStream(stream);
+                try {
+                    // Per-peer connection initialization:
+                    // - attach Protomux (legacy + v1 channels/messages)
+                    // - attach connection.protocolSession (used later by tryConnect / orchestrators to send messages)
+                    await this.#networkMessages.setupProtomuxMessages(connection);
+
+                    // Pear v3 can deliver a late swarm connection while shutdown is
+                    // already closing the Corestore. Do not replicate a connection
+                    // after close has begun; store.replicate would otherwise throw.
+                    if (this.#closing || this.#swarm === null) {
+                        this.#destroyConnection(connection);
+                        return;
+                    }
+
+                    // ATTENTION: Must be called AFTER the protomux init above
+                    const stream = store.replicate(connection);
+                    wakeup.addStream(stream);
+                } catch (error) {
+                    const publicKey = connection.remotePublicKey
+                        ? b4a.toString(connection.remotePublicKey, 'hex')
+                        : 'unknown';
+                    this.#pendingRequestsService.rejectPendingRequestsForPeer(
+                        publicKey,
+                        error ?? new Error('Connection setup failed')
+                    );
+                    this.#destroyConnection(connection);
+                    if (!this.#closing) {
+                        this.#logger.error(error?.message ?? 'Unknown network connection setup error');
+                    }
+                    return;
+                }
 
                 const publicKey = b4a.toString(connection.remotePublicKey, 'hex');
                 if (this.#pendingConnections.has(publicKey)) {
@@ -218,9 +262,13 @@ class Network extends ReadyResource {
                         publicKey,
                         new Error('Connection closed before response')
                     );
-                    this.#swarm.leavePeer(connection.remotePublicKey);
+                    this.#swarm?.leavePeer(connection.remotePublicKey);
                     this.#validatorConnectionManager.remove(publicKey);
-                    connection.protocolSession.close();
+                    if (connection.protocolSession) {
+                        try {
+                            connection.protocolSession.close();
+                        } catch {}
+                    }
                 });
 
                 connection.on('error', (error) => {
@@ -344,6 +392,26 @@ class Network extends ReadyResource {
         this.#pendingConnections.delete(publicKeyHex);
         return true;
     }
+
+    #assertCanReplicate() {
+        if (this.#closing || this.closed) {
+            throw new Error('Network is closing or already closed');
+        }
+    }
+
+    #destroyConnection(connection) {
+        if (!connection) return;
+        if (connection.protocolSession) {
+            try {
+                connection.protocolSession.close();
+            } catch {}
+        }
+        if (typeof connection.destroy === 'function') {
+            connection.destroy();
+        } else if (typeof connection.end === 'function') {
+            connection.end();
+        }
+    }
 }
 
 export default Network;

package/src/core/network/services/ValidatorObserverService.js

@@ -373,8 +373,8 @@ class ValidatorObserverService {
      * Rules:
      * - Skips invalid/malformed entries.
      * - Skips non-admin indexers.
-     * - Deduplicates nodes by mapping their latest state to a unique address.
-     * - Removes stale connections for nodes flagged with 'isRemoved'.
+     * - Deduplicates active writers by wallet address.
+     * - Removes stale connections only when no active writer remains for an address.
      * - Includes only valid and active writer nodes.
      * @param {Object} adminEntry - The current admin node entry.
      * @returns {Promise<Array<Object>>} A promise resolving to the deduplicated array of active writers.
@@ -385,13 +385,13 @@ class ValidatorObserverService {
             this.#keyDecodeCache.clear();
         }
 
-        // Map is used for deduplication, ensuring that each node physical address
-        // occupies only a single slot despite the append-only nature of Autobase
+        // Historical writer keys can share an address with an active replacement.
         const activeMap = new Map();
+        const removedMap = new Map();
 
         try {
             for await (const { key, value } of this.#state.base.system.list()) {
-                if (!this.#shouldRun()) break;
+                if (!this.#shouldRun()) return Array.from(activeMap.values());
 
                 if (!key || b4a.byteLength(key) !== WRITER_BYTE_LENGTH) continue;
                 if (!value) continue;
@@ -426,16 +426,20 @@ class ValidatorObserverService {
 
                 if (value.isIndexer && addr !== adminEntry?.address) continue;
 
-                // Handles soft-delete: drops stale connections and removes the node from the pool
                 if (value.isRemoved) {
-                    this.#enforceNoStaleConnections(publicKey);
-                    activeMap.delete(addr);
+                    removedMap.set(addr, publicKey);
                     continue;
                 }
 
-                // Registers or overwrites to maintain a single source of truth per machine
                 activeMap.set(addr, { key, address: addr, publicKey, publicKeyHex });
             }
+
+            // Writer iteration order does not represent key age. Only a complete scan
+            // can establish that a removed writer has no active replacement.
+            for (const [addr, publicKey] of removedMap) {
+                if (!this.#shouldRun()) break;
+                if (!activeMap.has(addr)) this.#enforceNoStaleConnections(publicKey);
+            }
         } catch (err) {
             this.#logger.error(`Autobase writer scan error: ${err.message}`);
         }
@@ -462,4 +466,4 @@ class ValidatorObserverService {
     }
 }
 
-export default ValidatorObserverService;
+export default ValidatorObserverService;