@the-open-engine/zeroshot 6.2.0 → 6.4.0

package/src/lib/gc.js

@@ -9,6 +9,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { readClustersFileSync } = require('../../lib/clusters-registry');
 
 const DEFAULT_STORAGE_DIR = path.join(os.homedir(), '.zeroshot');
 
@@ -35,10 +36,8 @@ function resolveActiveClusterIdFromEnv() {
  */
 function readKnownClusterIds(storageDir) {
   const ids = new Set();
-  const clustersFile = path.join(storageDir, 'clusters.json');
   try {
-    if (!fs.existsSync(clustersFile)) return ids;
-    const raw = JSON.parse(fs.readFileSync(clustersFile, 'utf8'));
+    const raw = readClustersFileSync(storageDir);
     for (const id of Object.keys(raw)) ids.add(id);
   } catch {
     // Corrupt/missing — treat as empty (safe: nothing deleted incorrectly)

package/src/message-bus.js

@@ -24,12 +24,14 @@ class MessageBus extends EventEmitter {
     this.setMaxListeners(MAX_LISTENERS);
     this.ledger = ledger || new Ledger();
     this.wsClients = new Set();
+    this._closed = false;
 
     // Forward ledger events
-    this.ledger.on('message', (message) => {
+    this._forwardLedgerMessage = (message) => {
       this.emit('message', message);
       this._broadcastToWebSocket(message);
-    });
+    };
+    this.ledger.on('message', this._forwardLedgerMessage);
   }
 
   /**
@@ -180,6 +182,16 @@ class MessageBus extends EventEmitter {
     return this.ledger.getTokensByRole(cluster_id);
   }
 
+  /**
+   * Read messageCount and tokensByRole as one consistent point-in-time view
+   * (passthrough to ledger)
+   * @param {String} cluster_id - Cluster ID
+   * @returns {{ messageCount: number, tokensByRole: Object }}
+   */
+  readSnapshot(cluster_id) {
+    return this.ledger.readSnapshot(cluster_id);
+  }
+
   /**
    * Register a WebSocket client for broadcasts
    * @param {WebSocket} ws - WebSocket connection
@@ -231,6 +243,14 @@ class MessageBus extends EventEmitter {
    * Close the message bus
    */
   close() {
+    if (this._closed) {
+      return;
+    }
+    this._closed = true;
+
+    this.ledger.off('message', this._forwardLedgerMessage);
+    this.removeAllListeners();
+
     // Close all WebSocket connections
     for (const ws of this.wsClients) {
       try {