@persistica/flux-agent 0.0.23 → 0.0.25

package/index.js

@@ -87,7 +87,7 @@ var validateNetworkIdOrThrow = (networkId) => {
 // libs/flux/shared/types/src/lib/client-id.type.ts
 var NANOID_LENGTH = 21;
 var NANOID_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz-";
-var isNanoId = (id) => {
+var isClientId = (id) => {
   if (typeof id !== "string") {
     return false;
   }
@@ -198,7 +198,7 @@ var WebSocketClient = class extends RPCServer {
           );
           setTimeout(() => {
             this.reconnectAttempts++;
-            this.connect();
+            void this.connect();
           }, delay);
         } else if (this.options.autoReconnect) {
           this.emit("error", new Error("Connection failed: retries exhausted"));
@@ -402,9 +402,7 @@ var FluxAgentNetworkConnection = class {
         this._fluxWebSocketClientConnection,
         this._webRTCStateChange
       );
-      console.log(
-        this.iceConnection ? `RTCPeerConnection is available` : `RTCPeerConnection is not available`
-      );
+      console.log(`RTCPeerConnection is available`);
     } else {
       console.warn("\u2757WebRTC is not available in this environment.");
     }
@@ -442,7 +440,7 @@ var FluxAgentNetworkConnection = class {
    * Connects to a remote agent.
    */
   connectToAgent(clientId) {
-    this._fluxWebSocketConnection.connectToAgent(clientId);
+    void this._fluxWebSocketConnection.connectToAgent(clientId);
     return new FluxRemoteClient(this.iceConnection);
   }
   /**
@@ -458,25 +456,25 @@ var hasOverlap = (a, b) => a && b ? [...a].some((item) => (Array.isArray(b) ? b
 var PicoLogger = /* @__PURE__ */ (() => {
   let allowScopes;
   const configure = (configuration) => {
-    allowScopes = typeof configuration.allowScopes === "string" && configuration.allowScopes === "*" ? "*" : new Set(configuration.allowScopes);
+    allowScopes = configuration.allowScopes === "*" ? "*" : new Set(configuration.allowScopes);
   };
   const log = (message, scopes) => {
     if (allowScopes !== "*" && !hasOverlap(allowScopes, scopes)) {
       return;
     }
-    console.log(`[${scopes}]	${message}`);
+    console.log(`[${scopes?.toString()}]	${message}`);
   };
   const warn = (message, scopes) => {
     if (allowScopes !== "*" && !hasOverlap(allowScopes, scopes)) {
       return;
     }
-    console.warn(`[${scopes}]	${message}`);
+    console.warn(`[${scopes?.toString()}]	${message}`);
   };
   const error = (message, scopes) => {
     if (allowScopes !== "*" && !hasOverlap(allowScopes, scopes)) {
       return;
     }
-    console.error(`[${scopes}]	${message}`);
+    console.error(`[${scopes?.toString()}]	${message}`);
   };
   return {
     configure,
@@ -529,17 +527,16 @@ var ChannelStateManager = class {
           this.connectionTimeouts.delete(channelName);
         }
         const cb = (message) => {
+          const receivedChannelName = message.substring(message.indexOf(":") + 1);
+          if (channelName !== receivedChannelName) {
+            return;
+          }
           const timeout = this.connectionTimeouts.get(channelName);
           if (timeout) {
             clearTimeout(timeout);
             this.connectionTimeouts.delete(channelName);
           }
           fluxWebSocketConnection.removePackageTypeInterceptor(SUBSCRIBED_NETWORK_CHANNEL_NAME, cb);
-          const receivedChannelName = message.substring(message.indexOf(":") + 1);
-          if (channelName !== receivedChannelName) {
-            reject(new Error(`Channel name mismatch: "${channelName}" !== "${receivedChannelName}"`));
-            return;
-          }
           resolve(new FluxNetworkChannel(channelName, fluxWebSocketConnection));
         };
         fluxWebSocketConnection.interceptPackageTypeMessages(
@@ -580,8 +577,8 @@ var createWSConnection = (id, ticket, stateManager, onReconnectCallback, options
     ticket,
     {
       domain: options.domain,
-      secretKey: options?.secretKey,
-      retries: options?.retries
+      secretKey: options.secretKey,
+      retries: options.retries
     }
   );
 };
@@ -594,8 +591,8 @@ var FluxWebSocketConnection = class {
     this.options = options;
     this.options = {
       domain: this.options.domain,
-      secretKey: this.options?.secretKey,
-      retries: this.options?.retries ?? 1e4
+      secretKey: this.options.secretKey,
+      retries: this.options.retries ?? 1e4
     };
     const url = new URL(this.options.domain);
     url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
@@ -789,7 +786,7 @@ var FluxWebSocketConnection = class {
    * Disconnects an agent from the network.
    */
   disconnectAgent(id) {
-    if (!isNanoId(id)) {
+    if (!isClientId(id)) {
       throw new Error(`Invalid agent id: '${id}'`);
     }
     if (this.webSocketClient) {
@@ -820,7 +817,7 @@ var FluxWebSocketConnection = class {
   handleSocketConnecting(retryAttempt) {
     this.stateManager.emitNetworkState("disconnected");
     if (retryAttempt > 0) {
-      PicoLogger.log(`\u{1F504} Connecting attempt: #${retryAttempt} of ${this.options?.retries ?? "none"}`, this.fluxInstanceId);
+      PicoLogger.log(`\u{1F504} Connecting attempt: #${retryAttempt} of ${this.options.retries ?? "none"}`, this.fluxInstanceId);
     } else {
       PicoLogger.log(`\u{1F504} Connecting: ${this.fluxInstanceId}`);
     }
@@ -866,26 +863,26 @@ var FluxWebSocketConnection = class {
             }
           }
         }
-        break;
+        return;
       }
       case RPC_REQUEST: {
         const payload = JSON.parse(message_.substring(message_.indexOf(":") + 1));
-        this.socket.handleMessage(payload, (data) => {
+        void this.socket.handleMessage(payload, (data) => {
           this.socket.send(`${RPC_RESPONSE}:${JSON.stringify(data)}`);
         });
-        break;
+        return;
       }
       case RPC_RESPONSE: {
         const payload = message_.substring(message_.indexOf(":") + 1);
         PicoLogger.log("\u{1F50C} Unhandled type rpc response", "ws-client");
         PicoLogger.log(`payload: ${payload}`, "ws-client");
-        break;
+        return;
       }
       default:
         if (message_.startsWith(`${ERROR}:`)) {
         }
         PicoLogger.log(`\u{1F50C} Unhandled type: "${message_}"`, "ws-client");
-        break;
+        return;
     }
   }
 };
@@ -1022,9 +1019,8 @@ var StateManager = class {
 
 // libs/flux/shared/utils/src/lib/promises.utils.ts
 var retryOrThrow = async (fn, shouldRetry, options) => {
-  let attempt = 0;
   let overrideDelay;
-  while (true) {
+  for (let attempt = 0; attempt <= options.retries; attempt++) {
     try {
       if (attempt > 0) {
         if (options.onRetry) {
@@ -1033,12 +1029,11 @@ var retryOrThrow = async (fn, shouldRetry, options) => {
       }
       return await fn();
     } catch (err) {
-      attempt++;
-      if (attempt > options.retries || !shouldRetry(err)) {
+      if (attempt >= options.retries || !shouldRetry(err)) {
         throw err;
       }
       if (options.delayMs > 0 || overrideDelay && overrideDelay > 0) {
-        let delay = overrideDelay ?? options.delayMs;
+        const delay = overrideDelay ?? options.delayMs;
         await new Promise((res) => setTimeout(
           res,
           delay
@@ -1046,6 +1041,7 @@ var retryOrThrow = async (fn, shouldRetry, options) => {
       }
     }
   }
+  throw new Error("Retry loop exited unexpectedly.");
 };
 
 // libs/flux/shared/utils/src/lib/machine-id.util.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@persistica/flux-agent",
-    "version": "0.0.23",
+    "version": "0.0.25",
     "description": "Persistica Flux Agent",
     "type": "module",
     "keywords": [],