@xyo-network/bridge-websocket 2.99.0 → 2.99.2

package/dist/node/index.js

@@ -10,48 +10,54 @@ var __publicField = (obj, key, value) => {
 var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
 
 // src/Bridge.ts
+import { createServer as createHttpServer } from "node:http";
+import { assertEx as assertEx3 } from "@xylabs/assert";
+import { creatableModule as creatableModule2 } from "@xyo-network/module-model";
+import { Server } from "socket.io";
+
+// src/ClientBridge.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
 import { AbstractBridge } from "@xyo-network/abstract-bridge";
 import { creatableModule } from "@xyo-network/module-model";
+import { Semaphore } from "async-mutex";
+import { LRUCache } from "lru-cache";
 
 // src/Config.ts
 var WebsocketBridgeConfigSchema = "network.xyo.bridge.websocket.config";
 
-// src/ModuleResolver.ts
+// src/WebsocketBridgeModuleResolver.ts
 import { assertEx } from "@xylabs/assert";
 import { isAddress } from "@xylabs/hex";
 import { AbstractBridgeModuleResolver, wrapModuleWithType } from "@xyo-network/abstract-bridge";
 import { Account } from "@xyo-network/account";
 import { ConfigSchema } from "@xyo-network/config-payload-plugin";
-import { asModuleInstance, ModuleConfigSchema } from "@xyo-network/module-model";
+import { asModuleInstance, ModuleConfigSchema, ResolveHelper } from "@xyo-network/module-model";
 
 // src/ModuleProxy/ModuleProxy.ts
 import { AbstractModuleProxy } from "@xyo-network/abstract-bridge";
 var _WebsocketModuleProxy = class _WebsocketModuleProxy extends AbstractModuleProxy {
-  async proxyQueryHandler(query, payloads = []) {
-    var _a;
-    const { maxPayloadSizeWarning } = this.params;
-    const payloadSize = JSON.stringify([
-      query,
-      payloads
-    ]).length;
-    if (maxPayloadSizeWarning && payloadSize > maxPayloadSizeWarning) {
-      (_a = this.logger) == null ? void 0 : _a.warn(`Large targetQuery being sent: ${payloadSize} bytes [${this.address}][${this.moduleAddress}] [${query.schema}] [${payloads == null ? void 0 : payloads.length}]`);
+  constructor(params) {
+    _WebsocketModuleProxy.createCount = _WebsocketModuleProxy.createCount + 1;
+    if (Math.floor(_WebsocketModuleProxy.createCount / 10) === _WebsocketModuleProxy.createCount / 10) {
+      console.log(`WebsocketModuleProxy.createCount: ${_WebsocketModuleProxy.createCount}`);
     }
-    await Promise.resolve();
-    throw new Error("Unsupported");
+    super(params);
+  }
+  async proxyQueryHandler(query, payloads = []) {
+    return await this.params.querySender.sendBridgeQuery(this.params.moduleAddress, query, payloads);
   }
 };
 __name(_WebsocketModuleProxy, "WebsocketModuleProxy");
+__publicField(_WebsocketModuleProxy, "createCount", 0);
 var WebsocketModuleProxy = _WebsocketModuleProxy;
 
-// src/ModuleResolver.ts
+// src/WebsocketBridgeModuleResolver.ts
 var _WebsocketBridgeModuleResolver = class _WebsocketBridgeModuleResolver extends AbstractBridgeModuleResolver {
-  moduleUrl(address) {
-    return new URL(address, this.params.url);
+  get querySender() {
+    return this.params.querySender;
   }
   async resolveHandler(id, options) {
-    var _a;
+    var _a, _b;
     const parentResult = await super.resolveHandler(id, options);
     if (parentResult) {
       return parentResult;
@@ -60,7 +66,8 @@ var _WebsocketBridgeModuleResolver = class _WebsocketBridgeModuleResolver extend
       return [];
     }
     const idParts = id.split(":");
-    const firstPart = assertEx(idParts.shift(), () => "Missing firstPart");
+    const untransformedFirstPart = assertEx(idParts.shift(), () => `Invalid module identifier: ${id}`);
+    const firstPart = await ResolveHelper.transformModuleIdentifier(untransformedFirstPart);
     const moduleAddress = firstPart;
     assertEx(isAddress(firstPart), () => `Invalid module address: ${firstPart}`);
     const remainderParts = idParts.join(":");
@@ -71,33 +78,34 @@ var _WebsocketBridgeModuleResolver = class _WebsocketBridgeModuleResolver extend
       },
       host: this,
       moduleAddress,
-      moduleUrl: this.moduleUrl(moduleAddress).href
+      querySender: this.querySender
     };
+    (_a = this.logger) == null ? void 0 : _a.debug(`creating HttpProxy [${moduleAddress}] ${id}`);
     const proxy = new WebsocketModuleProxy(params);
     if (proxy) {
       const state = await proxy.state();
       if (state) {
-        const configSchema = (_a = state.find((payload) => payload.schema === ConfigSchema)) == null ? void 0 : _a.config;
+        const configSchema = (_b = state.find((payload) => payload.schema === ConfigSchema)) == null ? void 0 : _b.config;
         const config = assertEx(state.find((payload) => payload.schema === configSchema), () => "Unable to locate config");
         proxy.setConfig(config);
       }
     }
     await proxy.start();
     const wrapped = assertEx(wrapModuleWithType(proxy, Account.randomSync()), () => `Failed to wrapModuleWithType [${id}]`);
-    const as = assertEx(asModuleInstance(wrapped, {}), () => `Failed to asModuleInstance [${id}]`);
-    proxy.upResolver.add(as);
-    proxy.downResolver.add(as);
+    const instance = assertEx(asModuleInstance(wrapped, {}), () => `Failed to asModuleInstance [${id}]`);
+    proxy.upResolver.add(instance);
+    proxy.downResolver.add(instance);
     if (remainderParts.length > 0) {
       const result = await wrapped.resolve(remainderParts, options);
       return result;
     }
-    return as;
+    return instance;
   }
 };
 __name(_WebsocketBridgeModuleResolver, "WebsocketBridgeModuleResolver");
 var WebsocketBridgeModuleResolver = _WebsocketBridgeModuleResolver;
 
-// src/Bridge.ts
+// src/ClientBridge.ts
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -109,19 +117,43 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name(_ts_decorate, "_ts_decorate");
-var _WebsocketBridge = class _WebsocketBridge extends AbstractBridge {
+var _WebsocketClientBridge = class _WebsocketClientBridge extends AbstractBridge {
+  _failureTimeCache = new LRUCache({
+    max: _WebsocketClientBridge.maxFailureCacheSize
+  });
+  _querySemaphore;
   _resolver;
+  get client() {
+    return this.config.client;
+  }
+  get failureRetryTime() {
+    var _a;
+    return ((_a = this.client) == null ? void 0 : _a.failureRetryTime) ?? _WebsocketClientBridge.defaultFailureRetryTime;
+  }
+  get maxConnections() {
+    var _a;
+    return ((_a = this.client) == null ? void 0 : _a.maxConnections) ?? _WebsocketClientBridge.defaultMaxConnections;
+  }
+  get maxPayloadSizeWarning() {
+    var _a;
+    return ((_a = this.client) == null ? void 0 : _a.maxPayloadSizeWarning) ?? _WebsocketClientBridge.defaultMaxPayloadSizeWarning;
+  }
+  get querySemaphore() {
+    this._querySemaphore = this._querySemaphore ?? new Semaphore(this.maxConnections);
+    return this._querySemaphore;
+  }
   get resolver() {
     this._resolver = this._resolver ?? new WebsocketBridgeModuleResolver({
       bridge: this,
+      querySender: this,
       root: this,
-      url: this.url,
       wrapperAccount: this.account
     });
     return this._resolver;
   }
   get url() {
-    return assertEx2(this.config.url, () => "No Url Set");
+    var _a;
+    return assertEx2((_a = this.config.client) == null ? void 0 : _a.url, () => "No Url Set");
   }
   async discoverRoots() {
     return await Promise.resolve([]);
@@ -132,6 +164,26 @@ var _WebsocketBridge = class _WebsocketBridge extends AbstractBridge {
   exposedHandler() {
     throw new Error("Unsupported");
   }
+  async sendBridgeQuery(targetAddress, _query, _payloads) {
+    const lastFailureTime = this._failureTimeCache.get(targetAddress);
+    if (lastFailureTime !== void 0) {
+      const now = Date.now();
+      const timeSincePreviousFailure = now - lastFailureTime;
+      if (timeSincePreviousFailure > this.failureRetryTime) {
+        throw new Error(`target module failed recently [${targetAddress}] [${timeSincePreviousFailure}ms ago]`);
+      }
+      this._failureTimeCache.delete(targetAddress);
+    }
+    try {
+      await this.querySemaphore.acquire();
+      throw new Error("Unsupported");
+    } catch (ex) {
+      const error = ex;
+      throw error;
+    } finally {
+      this.querySemaphore.release();
+    }
+  }
   async startHandler() {
     const { discoverRoot = true } = this.config;
     if (discoverRoot) {
@@ -143,18 +195,98 @@ var _WebsocketBridge = class _WebsocketBridge extends AbstractBridge {
     throw new Error("Unsupported");
   }
 };
-__name(_WebsocketBridge, "WebsocketBridge");
-__publicField(_WebsocketBridge, "configSchemas", [
-  ...__superGet(_WebsocketBridge, _WebsocketBridge, "configSchemas"),
+__name(_WebsocketClientBridge, "WebsocketClientBridge");
+__publicField(_WebsocketClientBridge, "configSchemas", [
+  ...__superGet(_WebsocketClientBridge, _WebsocketClientBridge, "configSchemas"),
   WebsocketBridgeConfigSchema
 ]);
-__publicField(_WebsocketBridge, "defaultConfigSchema", WebsocketBridgeConfigSchema);
-__publicField(_WebsocketBridge, "maxPayloadSizeWarning", 256 * 256);
-var WebsocketBridge = _WebsocketBridge;
-WebsocketBridge = _ts_decorate([
+__publicField(_WebsocketClientBridge, "defaultConfigSchema", WebsocketBridgeConfigSchema);
+__publicField(_WebsocketClientBridge, "defaultFailureRetryTime", 1e3 * 60);
+__publicField(_WebsocketClientBridge, "defaultMaxConnections", 4);
+__publicField(_WebsocketClientBridge, "defaultMaxPayloadSizeWarning", 256 * 256);
+__publicField(_WebsocketClientBridge, "maxFailureCacheSize", 1e3);
+var WebsocketClientBridge = _WebsocketClientBridge;
+WebsocketClientBridge = _ts_decorate([
   creatableModule()
+], WebsocketClientBridge);
+
+// src/Bridge.ts
+function _ts_decorate2(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate2, "_ts_decorate");
+var BridgeCommands = {
+  join: "join",
+  query: "query"
+};
+var DEFAULT_HOST_PORT = 8080;
+var _WebsocketBridge = class _WebsocketBridge extends WebsocketClientBridge {
+  httpServer;
+  server;
+  get host() {
+    return this.config.host;
+  }
+  exposeHandler(_id, _options) {
+    throw new Error("Unsupported");
+  }
+  exposedHandler() {
+    throw new Error("Unsupported");
+  }
+  async startHandler() {
+    if (this.host) {
+      this.startServer();
+    }
+    return await super.startHandler();
+  }
+  async stopHandler() {
+    if (this.host) {
+      this.stopServer();
+    }
+    return await super.stopHandler();
+  }
+  startServer() {
+    if (this.httpServer) {
+      throw new Error("Http Server already started");
+    }
+    if (this.server) {
+      throw new Error("Socket Server already started");
+    }
+    const host = assertEx3(this.host, () => "No Host Configured");
+    this.httpServer = createHttpServer();
+    this.server = new Server(this.httpServer);
+    this.server.on("connection", (socket) => {
+      socket.on(BridgeCommands.join, async (address) => {
+        await socket.join(address);
+        console.log(`User ${socket.id} has connected to module ${address}`);
+      });
+      socket.on(BridgeCommands.query, ({ address, query }) => {
+        socket.to(address).emit("message", query);
+      });
+    });
+    this.httpServer.listen(host.port ?? DEFAULT_HOST_PORT);
+  }
+  stopServer() {
+    var _a, _b;
+    (_a = this.server) == null ? void 0 : _a.close();
+    this.server = void 0;
+    (_b = this.httpServer) == null ? void 0 : _b.close();
+    this.httpServer = void 0;
+  }
+};
+__name(_WebsocketBridge, "WebsocketBridge");
+var WebsocketBridge = _WebsocketBridge;
+WebsocketBridge = _ts_decorate2([
+  creatableModule2()
 ], WebsocketBridge);
 export {
+  BridgeCommands,
   WebsocketBridge,
   WebsocketBridgeConfigSchema
 };

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Bridge.ts","../../src/Config.ts","../../src/ModuleResolver.ts","../../src/ModuleProxy/ModuleProxy.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Address } from '@xylabs/hex'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractBridge } from '@xyo-network/abstract-bridge'\nimport { BridgeExposeOptions, BridgeModule, BridgeParams, BridgeUnexposeOptions } from '@xyo-network/bridge-model'\nimport { AnyConfigSchema, creatableModule, ModuleInstance } from '@xyo-network/module-model'\nimport { Schema } from '@xyo-network/payload-model'\n\nimport { WebsocketBridgeConfig, WebsocketBridgeConfigSchema } from './Config'\nimport { WebsocketBridgeModuleResolver } from './ModuleResolver'\n\nexport type WebsocketBridgeParams<TConfig extends AnyConfigSchema<WebsocketBridgeConfig> = AnyConfigSchema<WebsocketBridgeConfig>> =\n  BridgeParams<TConfig>\n\n@creatableModule()\nexport class WebsocketBridge<TParams extends WebsocketBridgeParams> extends AbstractBridge<TParams> implements BridgeModule<TParams> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, WebsocketBridgeConfigSchema]\n  static override readonly defaultConfigSchema: Schema = WebsocketBridgeConfigSchema\n  static maxPayloadSizeWarning = 256 * 256\n\n  private _resolver?: WebsocketBridgeModuleResolver\n\n  override get resolver() {\n    this._resolver = this._resolver ?? new WebsocketBridgeModuleResolver({ bridge: this, root: this, url: this.url, wrapperAccount: this.account })\n    return this._resolver\n  }\n\n  get url() {\n    return assertEx(this.config.url, () => 'No Url Set')\n  }\n\n  override async discoverRoots(): Promise<ModuleInstance[]> {\n    return await Promise.resolve([])\n  }\n\n  override exposeHandler(_id: string, _options?: BridgeExposeOptions | undefined): Promisable<ModuleInstance[]> {\n    throw new Error('Unsupported')\n  }\n\n  override exposedHandler(): Promisable<Address[]> {\n    throw new Error('Unsupported')\n  }\n\n  override async startHandler(): Promise<boolean> {\n    const { discoverRoot = true } = this.config\n    if (discoverRoot) {\n      await this.discoverRoots()\n    }\n    return true\n  }\n\n  override unexposeHandler(_id: string, _options?: BridgeUnexposeOptions | undefined): Promisable<ModuleInstance[]> {\n    throw new Error('Unsupported')\n  }\n}\n","import { EmptyObject } from '@xylabs/object'\nimport { BridgeConfig } from '@xyo-network/bridge-model'\n\nexport const WebsocketBridgeConfigSchema = 'network.xyo.bridge.websocket.config'\nexport type WebsocketBridgeConfigSchema = typeof WebsocketBridgeConfigSchema\n\nexport type WebsocketBridgeConfig<TConfig extends EmptyObject = EmptyObject, TSchema extends string | void = void> = BridgeConfig<\n  {\n    discoverRoot?: boolean\n    /** @deprecated Do not use this for any new development */\n    legacyMode?: boolean\n    schema: WebsocketBridgeConfigSchema\n    url?: string\n  } & TConfig,\n  TSchema extends string ? TSchema : WebsocketBridgeConfigSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { Address, isAddress } from '@xylabs/hex'\nimport { AbstractBridgeModuleResolver, BridgeModuleResolverParams, wrapModuleWithType } from '@xyo-network/abstract-bridge'\nimport { Account } from '@xyo-network/account'\nimport { ConfigPayload, ConfigSchema } from '@xyo-network/config-payload-plugin'\nimport { asModuleInstance, ModuleConfig, ModuleConfigSchema, ModuleFilterOptions, ModuleIdentifier, ModuleInstance } from '@xyo-network/module-model'\n\nimport { WebsocketModuleProxy, WebsocketModuleProxyParams } from './ModuleProxy'\n\nexport interface WebsocketBridgeModuleResolverOptions extends BridgeModuleResolverParams {\n  url: string\n}\n\nexport class WebsocketBridgeModuleResolver<\n  T extends WebsocketBridgeModuleResolverOptions = WebsocketBridgeModuleResolverOptions,\n> extends AbstractBridgeModuleResolver<T> {\n  moduleUrl(address: Address) {\n    return new URL(address, this.params.url)\n  }\n\n  override async resolveHandler<T extends ModuleInstance = ModuleInstance>(\n    id: ModuleIdentifier,\n    options?: ModuleFilterOptions<T>,\n  ): Promise<T | T[] | undefined> {\n    const parentResult = await super.resolveHandler(id, options)\n    if (parentResult) {\n      return parentResult\n    }\n    if (id === '*') {\n      return []\n    }\n    const idParts = id.split(':')\n    const firstPart = assertEx(idParts.shift(), () => 'Missing firstPart')\n    const moduleAddress = firstPart as Address\n    assertEx(isAddress(firstPart), () => `Invalid module address: ${firstPart}`)\n    const remainderParts = idParts.join(':')\n    const params: WebsocketModuleProxyParams = {\n      account: Account.randomSync(),\n      config: { schema: ModuleConfigSchema },\n      host: this,\n      moduleAddress,\n      moduleUrl: this.moduleUrl(moduleAddress).href,\n    }\n\n    //console.log(`creating WebsocketProxy [${moduleAddress}] ${id}`)\n\n    const proxy = new WebsocketModuleProxy<T, WebsocketModuleProxyParams>(params)\n    //calling state here to get the config\n    if (proxy) {\n      const state = await proxy.state()\n      if (state) {\n        const configSchema = (state.find((payload) => payload.schema === ConfigSchema) as ConfigPayload | undefined)?.config\n        const config = assertEx(\n          state.find((payload) => payload.schema === configSchema),\n          () => 'Unable to locate config',\n        ) as ModuleConfig\n        proxy.setConfig(config)\n      }\n    }\n\n    await proxy.start()\n\n    const wrapped = assertEx(wrapModuleWithType(proxy, Account.randomSync()) as unknown as T, () => `Failed to wrapModuleWithType [${id}]`)\n    const as = assertEx(asModuleInstance<T>(wrapped, {}), () => `Failed to asModuleInstance [${id}]`)\n    proxy.upResolver.add(as)\n    proxy.downResolver.add(as)\n\n    if (remainderParts.length > 0) {\n      const result = await wrapped.resolve<T>(remainderParts, options)\n      return result\n    }\n\n    //console.log(`resolved: ${proxy.address} [${wrapped.constructor.name}] [${as.constructor.name}]`)\n    return as\n  }\n}\n","import { AbstractModuleProxy, ModuleProxyParams } from '@xyo-network/abstract-bridge'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleInstance, ModuleQueryResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { io as Client } from 'socket.io-client'\n\nexport type WebsocketModuleProxyParams = ModuleProxyParams & {\n  client?: typeof Client\n  maxPayloadSizeWarning?: number\n  moduleUrl: string\n}\n\nexport class WebsocketModuleProxy<\n    TWrappedModule extends ModuleInstance = ModuleInstance,\n    TParams extends Omit<WebsocketModuleProxyParams, 'config'> & { config: TWrappedModule['config'] } = Omit<WebsocketModuleProxyParams, 'config'> & {\n      config: TWrappedModule['config']\n    },\n  >\n  extends AbstractModuleProxy<TWrappedModule, TParams>\n  implements ModuleInstance<TParams, TWrappedModule['eventData']>\n{\n  async proxyQueryHandler<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads: Payload[] = []): Promise<ModuleQueryResult> {\n    const { maxPayloadSizeWarning } = this.params\n    const payloadSize = JSON.stringify([query, payloads]).length\n    if (maxPayloadSizeWarning && payloadSize > maxPayloadSizeWarning) {\n      this.logger?.warn(\n        `Large targetQuery being sent: ${payloadSize} bytes [${this.address}][${this.moduleAddress}] [${query.schema}] [${payloads?.length}]`,\n      )\n    }\n    await Promise.resolve()\n    throw new Error('Unsupported')\n  }\n}\n"],"mappings":"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","names":["assertEx","AbstractBridge","creatableModule","WebsocketBridgeConfigSchema","assertEx","isAddress","AbstractBridgeModuleResolver","wrapModuleWithType","Account","ConfigSchema","asModuleInstance","ModuleConfigSchema","AbstractModuleProxy","WebsocketModuleProxy","AbstractModuleProxy","proxyQueryHandler","query","payloads","maxPayloadSizeWarning","params","payloadSize","JSON","stringify","length","logger","warn","address","moduleAddress","schema","Promise","resolve","Error","WebsocketBridgeModuleResolver","AbstractBridgeModuleResolver","moduleUrl","address","URL","params","url","resolveHandler","id","options","parentResult","idParts","split","firstPart","assertEx","shift","moduleAddress","isAddress","remainderParts","join","account","Account","randomSync","config","schema","ModuleConfigSchema","host","href","proxy","WebsocketModuleProxy","state","configSchema","find","payload","ConfigSchema","setConfig","start","wrapped","wrapModuleWithType","as","asModuleInstance","upResolver","add","downResolver","length","result","resolve","WebsocketBridge","AbstractBridge","_resolver","resolver","WebsocketBridgeModuleResolver","bridge","root","url","wrapperAccount","account","assertEx","config","discoverRoots","Promise","resolve","exposeHandler","_id","_options","Error","exposedHandler","startHandler","discoverRoot","unexposeHandler","configSchemas","WebsocketBridgeConfigSchema","defaultConfigSchema","maxPayloadSizeWarning","creatableModule"]}
+{"version":3,"sources":["../../src/Bridge.ts","../../src/ClientBridge.ts","../../src/Config.ts","../../src/WebsocketBridgeModuleResolver.ts","../../src/ModuleProxy/ModuleProxy.ts"],"sourcesContent":["import { createServer as createHttpServer, Server as HttpServer } from 'node:http'\n\nimport { assertEx } from '@xylabs/assert'\nimport { Address } from '@xylabs/hex'\nimport { Promisable } from '@xylabs/promise'\nimport { BridgeExposeOptions, BridgeModule } from '@xyo-network/bridge-model'\nimport { AnyConfigSchema, creatableModule, ModuleInstance } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { Server, Socket } from 'socket.io'\n\nimport { WebsocketClientBridge } from './ClientBridge'\nimport { WebsocketBridgeConfig } from './Config'\nimport { WebsocketBridgeParams } from './Params'\n\nexport const BridgeCommands = {\n  join: 'join',\n  query: 'query',\n}\n\nconst DEFAULT_HOST_PORT = 8080\n\n@creatableModule()\nexport class WebsocketBridge<\n    TParams extends WebsocketBridgeParams<AnyConfigSchema<WebsocketBridgeConfig>> = WebsocketBridgeParams<WebsocketBridgeConfig>,\n  >\n  extends WebsocketClientBridge<TParams>\n  implements BridgeModule<TParams>\n{\n  httpServer?: HttpServer\n  server?: Server\n\n  get host() {\n    return this.config.host\n  }\n\n  override exposeHandler(_id: string, _options?: BridgeExposeOptions | undefined): Promisable<ModuleInstance[]> {\n    throw new Error('Unsupported')\n  }\n\n  override exposedHandler(): Promisable<Address[]> {\n    throw new Error('Unsupported')\n  }\n\n  override async startHandler(): Promise<boolean> {\n    if (this.host) {\n      this.startServer()\n    }\n    return await super.startHandler()\n  }\n\n  override async stopHandler(): Promise<boolean> {\n    if (this.host) {\n      this.stopServer()\n    }\n    return await super.stopHandler()\n  }\n\n  private startServer() {\n    if (this.httpServer) {\n      throw new Error('Http Server already started')\n    }\n    if (this.server) {\n      throw new Error('Socket Server already started')\n    }\n    const host = assertEx(this.host, () => 'No Host Configured')\n    this.httpServer = createHttpServer()\n    this.server = new Server(this.httpServer)\n\n    this.server.on('connection', (socket: Socket) => {\n      socket.on(BridgeCommands.join, async (address: Address) => {\n        await socket.join(address)\n        console.log(`User ${socket.id} has connected to module ${address}`)\n      })\n\n      socket.on(BridgeCommands.query, ({ address, query }: { address: Address; query: Payload[] }) => {\n        socket.to(address).emit('message', query)\n      })\n    })\n    this.httpServer.listen(host.port ?? DEFAULT_HOST_PORT)\n  }\n\n  private stopServer() {\n    this.server?.close()\n    this.server = undefined\n    this.httpServer?.close()\n    this.httpServer = undefined\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Address } from '@xylabs/hex'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractBridge } from '@xyo-network/abstract-bridge'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BridgeExposeOptions, BridgeModule, BridgeUnexposeOptions } from '@xyo-network/bridge-model'\nimport { creatableModule, ModuleInstance, ModuleQueryResult } from '@xyo-network/module-model'\nimport { Payload, Schema } from '@xyo-network/payload-model'\nimport { Semaphore } from 'async-mutex'\nimport { LRUCache } from 'lru-cache'\n\nimport { WebsocketBridgeConfigSchema } from './Config'\nimport { WebsocketBridgeQuerySender } from './ModuleProxy'\nimport { WebsocketBridgeParams } from './Params'\nimport { WebsocketBridgeModuleResolver } from './WebsocketBridgeModuleResolver'\n\n@creatableModule()\nexport class WebsocketClientBridge<TParams extends WebsocketBridgeParams = WebsocketBridgeParams>\n  extends AbstractBridge<TParams>\n  implements BridgeModule<TParams>, WebsocketBridgeQuerySender\n{\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, WebsocketBridgeConfigSchema]\n  static override readonly defaultConfigSchema: Schema = WebsocketBridgeConfigSchema\n  static defaultFailureRetryTime = 1000 * 60\n  static defaultMaxConnections = 4\n  static defaultMaxPayloadSizeWarning = 256 * 256\n  static maxFailureCacheSize = 1000\n\n  private _failureTimeCache = new LRUCache<Address, number>({ max: WebsocketClientBridge.maxFailureCacheSize })\n  private _querySemaphore?: Semaphore\n\n  private _resolver?: WebsocketBridgeModuleResolver\n\n  get client() {\n    return this.config.client\n  }\n\n  get failureRetryTime() {\n    return this.client?.failureRetryTime ?? WebsocketClientBridge.defaultFailureRetryTime\n  }\n\n  get maxConnections() {\n    return this.client?.maxConnections ?? WebsocketClientBridge.defaultMaxConnections\n  }\n\n  get maxPayloadSizeWarning() {\n    return this.client?.maxPayloadSizeWarning ?? WebsocketClientBridge.defaultMaxPayloadSizeWarning\n  }\n\n  get querySemaphore() {\n    this._querySemaphore = this._querySemaphore ?? new Semaphore(this.maxConnections)\n    return this._querySemaphore\n  }\n\n  override get resolver() {\n    this._resolver =\n      this._resolver ?? new WebsocketBridgeModuleResolver({ bridge: this, querySender: this, root: this, wrapperAccount: this.account })\n    return this._resolver\n  }\n\n  get url() {\n    return assertEx(this.config.client?.url, () => 'No Url Set')\n  }\n\n  override async discoverRoots(): Promise<ModuleInstance[]> {\n    return await Promise.resolve([])\n  }\n\n  override exposeHandler(_id: string, _options?: BridgeExposeOptions | undefined): Promisable<ModuleInstance[]> {\n    throw new Error('Unsupported')\n  }\n\n  override exposedHandler(): Promisable<Address[]> {\n    throw new Error('Unsupported')\n  }\n\n  async sendBridgeQuery<TOut extends Payload = Payload, TQuery extends QueryBoundWitness = QueryBoundWitness, TIn extends Payload = Payload>(\n    targetAddress: Address,\n    _query: TQuery,\n    _payloads?: TIn[],\n  ): Promise<ModuleQueryResult<TOut>> {\n    const lastFailureTime = this._failureTimeCache.get(targetAddress)\n    if (lastFailureTime !== undefined) {\n      const now = Date.now()\n      const timeSincePreviousFailure = now - lastFailureTime\n      if (timeSincePreviousFailure > this.failureRetryTime) {\n        throw new Error(`target module failed recently [${targetAddress}] [${timeSincePreviousFailure}ms ago]`)\n      }\n      this._failureTimeCache.delete(targetAddress)\n    }\n    try {\n      await this.querySemaphore.acquire()\n      throw new Error('Unsupported')\n    } catch (ex) {\n      const error = ex as Error\n      throw error\n    } finally {\n      this.querySemaphore.release()\n    }\n  }\n\n  override async startHandler(): Promise<boolean> {\n    const { discoverRoot = true } = this.config\n    if (discoverRoot) {\n      await this.discoverRoots()\n    }\n    return true\n  }\n\n  override unexposeHandler(_id: string, _options?: BridgeUnexposeOptions | undefined): Promisable<ModuleInstance[]> {\n    throw new Error('Unsupported')\n  }\n}\n","import { EmptyObject } from '@xylabs/object'\nimport { BridgeConfig } from '@xyo-network/bridge-model'\n\nexport const WebsocketBridgeConfigSchema = 'network.xyo.bridge.websocket.config'\nexport type WebsocketBridgeConfigSchema = typeof WebsocketBridgeConfigSchema\n\nexport type WebsocketBridgeConfig<TConfig extends EmptyObject = EmptyObject, TSchema extends string | void = void> = BridgeConfig<\n  {\n    discoverRoot?: boolean\n    schema: WebsocketBridgeConfigSchema\n  } & TConfig,\n  TSchema extends string ? TSchema : WebsocketBridgeConfigSchema,\n  {\n    failureRetryTime?: number\n    failureTimeCacheMax?: number\n    maxConnections?: number\n    maxPayloadSizeWarning?: number\n    url: string\n  },\n  {\n    port?: number\n  }\n>\n","import { assertEx } from '@xylabs/assert'\nimport { Address, isAddress } from '@xylabs/hex'\nimport { AbstractBridgeModuleResolver, BridgeModuleResolverParams, wrapModuleWithType } from '@xyo-network/abstract-bridge'\nimport { Account } from '@xyo-network/account'\nimport { ConfigPayload, ConfigSchema } from '@xyo-network/config-payload-plugin'\nimport {\n  asModuleInstance,\n  ModuleConfig,\n  ModuleConfigSchema,\n  ModuleFilterOptions,\n  ModuleIdentifier,\n  ModuleInstance,\n  ResolveHelper,\n} from '@xyo-network/module-model'\n\nimport { WebsocketBridgeQuerySender, WebsocketModuleProxy, WebsocketModuleProxyParams } from './ModuleProxy'\n\nexport interface WebsocketBridgeModuleResolverParams extends BridgeModuleResolverParams {\n  querySender: WebsocketBridgeQuerySender\n}\n\nexport class WebsocketBridgeModuleResolver<\n  T extends WebsocketBridgeModuleResolverParams = WebsocketBridgeModuleResolverParams,\n> extends AbstractBridgeModuleResolver<T> {\n  get querySender() {\n    return this.params.querySender\n  }\n\n  override async resolveHandler<T extends ModuleInstance = ModuleInstance>(\n    id: ModuleIdentifier,\n    options?: ModuleFilterOptions<T>,\n  ): Promise<T | T[] | undefined> {\n    const parentResult = await super.resolveHandler(id, options)\n    if (parentResult) {\n      return parentResult\n    }\n    if (id === '*') {\n      return []\n    }\n    const idParts = id.split(':')\n    const untransformedFirstPart = assertEx(idParts.shift(), () => `Invalid module identifier: ${id}`)\n    const firstPart = await ResolveHelper.transformModuleIdentifier(untransformedFirstPart)\n    const moduleAddress = firstPart as Address\n    assertEx(isAddress(firstPart), () => `Invalid module address: ${firstPart}`)\n    const remainderParts = idParts.join(':')\n    const params: WebsocketModuleProxyParams = {\n      account: Account.randomSync(),\n      config: { schema: ModuleConfigSchema },\n      host: this,\n      moduleAddress,\n      querySender: this.querySender,\n    }\n\n    this.logger?.debug(`creating HttpProxy [${moduleAddress}] ${id}`)\n\n    const proxy = new WebsocketModuleProxy<T, WebsocketModuleProxyParams>(params)\n    //calling state here to get the config\n    if (proxy) {\n      const state = await proxy.state()\n      if (state) {\n        const configSchema = (state.find((payload) => payload.schema === ConfigSchema) as ConfigPayload | undefined)?.config\n        const config = assertEx(\n          state.find((payload) => payload.schema === configSchema),\n          () => 'Unable to locate config',\n        ) as ModuleConfig\n        proxy.setConfig(config)\n      }\n    }\n\n    await proxy.start()\n\n    const wrapped = assertEx(wrapModuleWithType(proxy, Account.randomSync()) as unknown as T, () => `Failed to wrapModuleWithType [${id}]`)\n    const instance = assertEx(asModuleInstance<T>(wrapped, {}), () => `Failed to asModuleInstance [${id}]`)\n    proxy.upResolver.add(instance)\n    proxy.downResolver.add(instance)\n\n    if (remainderParts.length > 0) {\n      const result = await wrapped.resolve<T>(remainderParts, options)\n      return result\n    }\n\n    //console.log(`resolved: ${proxy.address} [${wrapped.constructor.name}] [${as.constructor.name}]`)\n    return instance\n  }\n}\n","import { Address } from '@xylabs/hex'\nimport { AbstractModuleProxy, ModuleProxyParams } from '@xyo-network/abstract-bridge'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleInstance, ModuleQueryResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport interface WebsocketBridgeQuerySender {\n  sendBridgeQuery: <TOut extends Payload = Payload, TQuery extends QueryBoundWitness = QueryBoundWitness, TIn extends Payload = Payload>(\n    targetAddress: Address,\n    query: TQuery,\n    payloads?: TIn[],\n  ) => Promise<ModuleQueryResult<TOut>>\n}\n\nexport type WebsocketModuleProxyParams = ModuleProxyParams & {\n  querySender: WebsocketBridgeQuerySender\n}\n\nexport class WebsocketModuleProxy<\n    TWrappedModule extends ModuleInstance = ModuleInstance,\n    TParams extends Omit<WebsocketModuleProxyParams, 'config'> & { config: TWrappedModule['config'] } = Omit<WebsocketModuleProxyParams, 'config'> & {\n      config: TWrappedModule['config']\n    },\n  >\n  extends AbstractModuleProxy<TWrappedModule, TParams>\n  implements ModuleInstance<TParams, TWrappedModule['eventData']>\n{\n  static createCount = 0\n\n  constructor(params: TParams) {\n    WebsocketModuleProxy.createCount = WebsocketModuleProxy.createCount + 1\n    if (Math.floor(WebsocketModuleProxy.createCount / 10) === WebsocketModuleProxy.createCount / 10) {\n      console.log(`WebsocketModuleProxy.createCount: ${WebsocketModuleProxy.createCount}`)\n    }\n    super(params)\n  }\n\n  async proxyQueryHandler<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads: Payload[] = []): Promise<ModuleQueryResult> {\n    return await this.params.querySender.sendBridgeQuery(this.params.moduleAddress, query, payloads)\n  }\n}\n"],"mappings":"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","names":["createServer","createHttpServer","assertEx","creatableModule","Server","assertEx","AbstractBridge","creatableModule","Semaphore","LRUCache","WebsocketBridgeConfigSchema","assertEx","isAddress","AbstractBridgeModuleResolver","wrapModuleWithType","Account","ConfigSchema","asModuleInstance","ModuleConfigSchema","ResolveHelper","AbstractModuleProxy","WebsocketModuleProxy","AbstractModuleProxy","constructor","params","createCount","Math","floor","console","log","proxyQueryHandler","query","payloads","querySender","sendBridgeQuery","moduleAddress","WebsocketBridgeModuleResolver","AbstractBridgeModuleResolver","querySender","params","resolveHandler","id","options","parentResult","idParts","split","untransformedFirstPart","assertEx","shift","firstPart","ResolveHelper","transformModuleIdentifier","moduleAddress","isAddress","remainderParts","join","account","Account","randomSync","config","schema","ModuleConfigSchema","host","logger","debug","proxy","WebsocketModuleProxy","state","configSchema","find","payload","ConfigSchema","setConfig","start","wrapped","wrapModuleWithType","instance","asModuleInstance","upResolver","add","downResolver","length","result","resolve","WebsocketClientBridge","AbstractBridge","_failureTimeCache","LRUCache","max","maxFailureCacheSize","_querySemaphore","_resolver","client","config","failureRetryTime","defaultFailureRetryTime","maxConnections","defaultMaxConnections","maxPayloadSizeWarning","defaultMaxPayloadSizeWarning","querySemaphore","Semaphore","resolver","WebsocketBridgeModuleResolver","bridge","querySender","root","wrapperAccount","account","url","assertEx","discoverRoots","Promise","resolve","exposeHandler","_id","_options","Error","exposedHandler","sendBridgeQuery","targetAddress","_query","_payloads","lastFailureTime","get","undefined","now","Date","timeSincePreviousFailure","delete","acquire","ex","error","release","startHandler","discoverRoot","unexposeHandler","configSchemas","WebsocketBridgeConfigSchema","defaultConfigSchema","creatableModule","BridgeCommands","join","query","DEFAULT_HOST_PORT","WebsocketBridge","WebsocketClientBridge","httpServer","server","host","config","exposeHandler","_id","_options","Error","exposedHandler","startHandler","startServer","stopHandler","stopServer","assertEx","createHttpServer","Server","on","socket","address","console","log","id","to","emit","listen","port","close","undefined","creatableModule"]}

package/package.json

@@ -10,30 +10,30 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.1.10",
-    "@xylabs/hex": "^3.1.10",
-    "@xylabs/object": "^3.1.10",
-    "@xylabs/promise": "^3.1.10",
-    "@xyo-network/abstract-bridge": "~2.99.0",
-    "@xyo-network/account": "~2.99.0",
-    "@xyo-network/boundwitness-model": "~2.99.0",
-    "@xyo-network/bridge-model": "~2.99.0",
-    "@xyo-network/config-payload-plugin": "~2.99.0",
-    "@xyo-network/module-model": "~2.99.0",
-    "@xyo-network/payload-model": "~2.99.0",
-    "socket.io": "^4.7.5",
-    "socket.io-client": "^4.7.5"
+    "@xylabs/assert": "^3.1.11",
+    "@xylabs/hex": "^3.1.11",
+    "@xylabs/object": "^3.1.11",
+    "@xylabs/promise": "^3.1.11",
+    "@xyo-network/abstract-bridge": "~2.99.2",
+    "@xyo-network/account": "~2.99.2",
+    "@xyo-network/boundwitness-model": "~2.99.2",
+    "@xyo-network/bridge-model": "~2.99.2",
+    "@xyo-network/config-payload-plugin": "~2.99.2",
+    "@xyo-network/module-model": "~2.99.2",
+    "@xyo-network/payload-model": "~2.99.2",
+    "async-mutex": "^0.5.0",
+    "lru-cache": "^10.2.2",
+    "socket.io": "^4.7.5"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.9.1",
     "@xylabs/tsconfig": "^3.9.1",
-    "@xyo-network/account": "~2.99.0",
-    "@xyo-network/archivist-model": "~2.99.0",
-    "@xyo-network/node-memory": "~2.99.0",
-    "@xyo-network/node-model": "~2.99.0",
-    "@xyo-network/payload-builder": "~2.99.0",
-    "@xyo-network/payload-wrapper": "~2.99.0",
-    "socket.io-client": "^4.7.5",
+    "@xyo-network/account": "~2.99.2",
+    "@xyo-network/archivist-model": "~2.99.2",
+    "@xyo-network/node-memory": "~2.99.2",
+    "@xyo-network/node-model": "~2.99.2",
+    "@xyo-network/payload-builder": "~2.99.2",
+    "@xyo-network/payload-wrapper": "~2.99.2",
     "typescript": "^5.4.5"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -42,12 +42,12 @@
     ".": {
       "browser": {
         "require": {
-          "types": "./dist/browser/index.d.cts",
-          "default": "./dist/browser/index.cjs"
+          "types": "./dist/browser/index-browser.d.cts",
+          "default": "./dist/browser/index-browser.cjs"
         },
         "import": {
-          "types": "./dist/browser/index.d.mts",
-          "default": "./dist/browser/index.js"
+          "types": "./dist/browser/index-browser.d.mts",
+          "default": "./dist/browser/index-browser.js"
         }
       },
       "node": {
@@ -75,6 +75,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.99.0",
+  "version": "2.99.2",
   "type": "module"
 }

package/src/Bridge.ts

@@ -1,36 +1,36 @@
+import { createServer as createHttpServer, Server as HttpServer } from 'node:http'
+
 import { assertEx } from '@xylabs/assert'
 import { Address } from '@xylabs/hex'
 import { Promisable } from '@xylabs/promise'
-import { AbstractBridge } from '@xyo-network/abstract-bridge'
-import { BridgeExposeOptions, BridgeModule, BridgeParams, BridgeUnexposeOptions } from '@xyo-network/bridge-model'
+import { BridgeExposeOptions, BridgeModule } from '@xyo-network/bridge-model'
 import { AnyConfigSchema, creatableModule, ModuleInstance } from '@xyo-network/module-model'
-import { Schema } from '@xyo-network/payload-model'
-
-import { WebsocketBridgeConfig, WebsocketBridgeConfigSchema } from './Config'
-import { WebsocketBridgeModuleResolver } from './ModuleResolver'
+import { Payload } from '@xyo-network/payload-model'
+import { Server, Socket } from 'socket.io'
 
-export type WebsocketBridgeParams<TConfig extends AnyConfigSchema<WebsocketBridgeConfig> = AnyConfigSchema<WebsocketBridgeConfig>> =
-  BridgeParams<TConfig>
+import { WebsocketClientBridge } from './ClientBridge'
+import { WebsocketBridgeConfig } from './Config'
+import { WebsocketBridgeParams } from './Params'
 
-@creatableModule()
-export class WebsocketBridge<TParams extends WebsocketBridgeParams> extends AbstractBridge<TParams> implements BridgeModule<TParams> {
-  static override readonly configSchemas: Schema[] = [...super.configSchemas, WebsocketBridgeConfigSchema]
-  static override readonly defaultConfigSchema: Schema = WebsocketBridgeConfigSchema
-  static maxPayloadSizeWarning = 256 * 256
+export const BridgeCommands = {
+  join: 'join',
+  query: 'query',
+}
 
-  private _resolver?: WebsocketBridgeModuleResolver
+const DEFAULT_HOST_PORT = 8080
 
-  override get resolver() {
-    this._resolver = this._resolver ?? new WebsocketBridgeModuleResolver({ bridge: this, root: this, url: this.url, wrapperAccount: this.account })
-    return this._resolver
-  }
-
-  get url() {
-    return assertEx(this.config.url, () => 'No Url Set')
-  }
+@creatableModule()
+export class WebsocketBridge<
+    TParams extends WebsocketBridgeParams<AnyConfigSchema<WebsocketBridgeConfig>> = WebsocketBridgeParams<WebsocketBridgeConfig>,
+  >
+  extends WebsocketClientBridge<TParams>
+  implements BridgeModule<TParams>
+{
+  httpServer?: HttpServer
+  server?: Server
 
-  override async discoverRoots(): Promise<ModuleInstance[]> {
-    return await Promise.resolve([])
+  get host() {
+    return this.config.host
   }
 
   override exposeHandler(_id: string, _options?: BridgeExposeOptions | undefined): Promisable<ModuleInstance[]> {
@@ -42,14 +42,47 @@ export class WebsocketBridge<TParams extends WebsocketBridgeParams> extends Abst
   }
 
   override async startHandler(): Promise<boolean> {
-    const { discoverRoot = true } = this.config
-    if (discoverRoot) {
-      await this.discoverRoots()
+    if (this.host) {
+      this.startServer()
     }
-    return true
+    return await super.startHandler()
   }
 
-  override unexposeHandler(_id: string, _options?: BridgeUnexposeOptions | undefined): Promisable<ModuleInstance[]> {
-    throw new Error('Unsupported')
+  override async stopHandler(): Promise<boolean> {
+    if (this.host) {
+      this.stopServer()
+    }
+    return await super.stopHandler()
+  }
+
+  private startServer() {
+    if (this.httpServer) {
+      throw new Error('Http Server already started')
+    }
+    if (this.server) {
+      throw new Error('Socket Server already started')
+    }
+    const host = assertEx(this.host, () => 'No Host Configured')
+    this.httpServer = createHttpServer()
+    this.server = new Server(this.httpServer)
+
+    this.server.on('connection', (socket: Socket) => {
+      socket.on(BridgeCommands.join, async (address: Address) => {
+        await socket.join(address)
+        console.log(`User ${socket.id} has connected to module ${address}`)
+      })
+
+      socket.on(BridgeCommands.query, ({ address, query }: { address: Address; query: Payload[] }) => {
+        socket.to(address).emit('message', query)
+      })
+    })
+    this.httpServer.listen(host.port ?? DEFAULT_HOST_PORT)
+  }
+
+  private stopServer() {
+    this.server?.close()
+    this.server = undefined
+    this.httpServer?.close()
+    this.httpServer = undefined
   }
 }