@persistica/flux-agent 0.0.16 → 0.0.17

package/index.js

@@ -8,18 +8,20 @@ var NetworkAuthorityNotFoundError = class _NetworkAuthorityNotFoundError extends
 };
 
 // libs/flux/shared/types/src/lib/channel.type.ts
+var InvaliChannelNameError = class extends Error {
+};
 var validateChannelNameOrThrow = (channelName) => {
   if (channelName.includes(":")) {
-    throw new Error("Channel name cannot contain :");
+    throw new InvaliChannelNameError("Channel name cannot contain :");
   }
   if (channelName.includes("/")) {
-    throw new Error("Channel name cannot contain /");
+    throw new InvaliChannelNameError("Channel name cannot contain /");
   }
   if (!/^[A-Za-z0-9-]+$/.test(channelName)) {
-    throw new Error("Channel name can only contain letters, numbers and dashes ('-')");
+    throw new InvaliChannelNameError("Channel name can only contain letters, numbers and dashes ('-')");
   }
   if (channelName.length > 100) {
-    throw new Error("Channel name cannot be longer than 100 characters");
+    throw new InvaliChannelNameError("Channel name cannot be longer than 100 characters");
   }
   return true;
 };
@@ -86,7 +88,9 @@ var validateNetworkIdOrThrow = (networkId) => {
 var NANOID_LENGTH = 21;
 var NANOID_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz-";
 var isNanoId = (id) => {
-  if (typeof id !== "string") return false;
+  if (typeof id !== "string") {
+    return false;
+  }
   const regex = new RegExp(`^[${NANOID_ALPHABET}]{${NANOID_LENGTH}}$`);
   return regex.test(id);
 };
@@ -506,9 +510,9 @@ var createWSConnection = (id, ticket, stateManager, onReconnectCallback, options
     stateManager,
     ticket,
     {
+      domain: options?.domain,
       secretKey: options?.secretKey,
-      retries: options?.retries,
-      port: options?.domain ? new URL(options.domain).port ? Number.parseInt(new URL(options.domain).port) : void 0 : void 0
+      retries: options?.retries
     }
   );
 };
@@ -520,13 +524,16 @@ var FluxWebSocketConnection = class {
     this.token = token;
     this.options = options;
     this.options = {
+      domain: this.options?.domain,
       secretKey: this.options?.secretKey,
-      retries: this.options?.retries ?? 1e4,
-      port: this.options?.port ?? 5100
+      retries: this.options?.retries ?? 1e4
     };
+    const url = new URL(this.options?.domain ?? "http://localhost:5100");
+    url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+    url.searchParams.set("token", this.token);
     this.socket = new FluxWebSocketClientConnection(
       {
-        url: `ws://localhost:${this.options.port}?token=${this.token}`,
+        url: url.toString(),
         autoReconnect: true,
         reconnectDelay: 2e3,
         retries: this.options.retries
@@ -616,14 +623,14 @@ var FluxWebSocketConnection = class {
   /**
    * Registers an authority to the network.
    */
-  async registerAuthority(cb, authorizeNetworkChannel) {
+  async registerAuthority(authorizeAgentConnection, authorizeChannelAccess) {
     const webSocketClient = await this.connect();
-    webSocketClient.registerMethod("authorize", (messageWithType) => {
+    webSocketClient.registerMethod("authorizeAgentConnection", (messageWithType) => {
       const dataType = messageWithType.split(":")[0];
       const message = messageWithType.substring(messageWithType.indexOf(":") + 1);
-      return cb(dataType === "json" ? JSON.parse(message) : message);
+      return authorizeAgentConnection(dataType === "json" ? JSON.parse(message) : message);
     });
-    webSocketClient.registerMethod("authorizeNetworkChannel", authorizeNetworkChannel);
+    webSocketClient.registerMethod("authorizeChannelAccess", authorizeChannelAccess);
     return Promise.resolve(void 0);
   }
   /**
@@ -1025,13 +1032,16 @@ var authenticateAgentOrThrow = async (networkId, domain, unknownIdentificationPa
     body: customPayload
   });
   if (!response.ok) {
+    const textResponse = await response.text();
     if (response.status === 401) {
-      const textResponse = await response.text();
       if (textResponse.startsWith(NetworkAuthorityNotFoundError.message)) {
         throw new NetworkAuthorityNotFoundError(networkId);
       }
     }
-    throw new Error(`Auth failed: ${response.status}`);
+    if (response.status === 404) {
+      throw new Error(`Mesh server not found at ${url.origin}.`);
+    }
+    throw new Error(textResponse ? `Auth failed: ${response.status} - ${textResponse}` : `Auth failed: ${response.status}`);
   }
   const result = await response.text();
   if (!checkAuthTicketShape(result)) {
@@ -1059,6 +1069,7 @@ var FluxClientData = class {
 globalThis.agentLoadCount ??= 0;
 globalThis.agentLoadCount++;
 console.log(`[flux-agent] Reloaded ${globalThis.agentLoadCount} time(s)`);
+var DEFAULT_FLUX_DOMAIN = "https://mesh.persistica.io";
 var FluxAgent = class {
   constructor(networkId, options) {
     this.networkId = networkId;
@@ -1078,6 +1089,7 @@ var FluxAgent = class {
    * @returns { Promise<FluxAgentNetworkConnection> } The network connection
    */
   async connect(identification, clientUId) {
+    const domain = this.options?.domain ?? DEFAULT_FLUX_DOMAIN;
     this.stateManager.emitNetworkState("authorizing");
     if (clientUId && !validateAgentUIDOrThrow(clientUId)) {
       throw new Error("Will never be thrown");
@@ -1087,7 +1099,7 @@ var FluxAgent = class {
         async () => {
           return authenticateAgentOrThrow(
             this.networkId,
-            this.options?.domain ?? "http://localhost:5100",
+            domain,
             identification,
             {
               clientUId,
@@ -1120,6 +1132,7 @@ var FluxAgent = class {
       const fluxNetworkConnection = await this.fluxWebSocketConnection.connectToNetwork();
       return fluxNetworkConnection;
     } catch (error) {
+      this.stateManager.emitNetworkState("auth-error");
       return Promise.reject(error);
     }
   }

package/package.json

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

package/src/lib/connector/rpc/NOT-USED-network-authority.class.d.ts

@@ -1,4 +1,4 @@
 import { RPCServer } from '@flux/shared/ws';
-export declare class AuthorityClient extends RPCServer<'authorize'> {
-    authorize(fn: (jwt: unknown) => boolean): void;
+export declare class AuthorityClient extends RPCServer<'authorizeAgentConnection'> {
+    authorizeAgentConnection(fn: (jwt: unknown) => boolean): void;
 }