@xyo-network/bridge-http-express 5.3.22 → 5.3.24

package/dist/neutral/HttpBridge.d.ts

@@ -39,7 +39,7 @@ export declare class HttpBridgeExpress<TParams extends HttpBridgeExpressParams>
     protected callLocalModule(address: Address, query: QueryBoundWitness, payloads: Payload[]): Promise<ModuleQueryResult | null>;
     protected handleGet(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response): Promise<void>;
     protected handlePost(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response): Promise<express.Response<any, Record<string, any>> | undefined>;
-    protected initializeApp(): import("express-serve-static-core").Express;
+    protected initializeApp(): Application;
     protected startHttpServer(): Promise<boolean>;
     protected stopHttpServer(): Promise<boolean>;
 }

package/dist/neutral/HttpBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpBridge.d.ts","sourceRoot":"","sources":["../../src/HttpBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAWlC,OAAO,EACL,OAAO,EAER,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAuB,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACxF,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,EACL,mBAAmB,EAAE,YAAY,EAAE,qBAAqB,EACzD,MAAM,2BAA2B,CAAA;AAElC,OAAO,EACL,eAAe,EAAmB,cAAc,EAAE,iBAAiB,EACpE,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACK,OAAO,EAAE,MAAM,EAC1B,MAAM,4BAA4B,CAAA;AACnC,OAAO,OAAO,EAAE,EACd,WAAW,EAAE,OAAO,EAAE,QAAQ,EAC/B,MAAM,SAAS,CAAA;AAGhB;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;GAEG;AACH,KAAK,sBAAsB,GAAG,CAAC,iBAAiB,EAAE,SAAS,GAAG,OAAO,EAAE,CAAC,CAAA;AASxE,eAAO,MAAM,6BAA6B;;CAA2D,CAAA;AACrG,MAAM,MAAM,6BAA6B,GAAG,OAAO,6BAA6B,CAAA;AAEhF,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB,CAAC,EAAE,EAAE,6BAA6B,CAAC;CAAG;AAEvG,MAAM,WAAW,uBAAwB,SAAQ,YAAY,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;CAAG;AAE1G,qBACa,iBAAiB,CAAC,OAAO,SAAS,uBAAuB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;IACjG,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAA0D;IAC1G,SAAS,CAAC,IAAI,CAAC,EAAE,WAAW,CAAA;IAC5B,SAAS,CAAC,eAAe,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAK;IACzD,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;IAE1B,SAAS,KAAK,GAAG,wBAGhB;IAEK,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAgB7F,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAY3G,cAAc,IAAI,OAAO,EAAE;IAIrB,YAAY;IAKZ,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;IAKzC,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;cAkBxG,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;cAKnH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,sBAAsB,CAAC,EAAE,GAAG,EAAE,QAAQ;cAoBnG,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,sBAAsB,CAAC,EAAE,GAAG,EAAE,QAAQ;IA4BpH,SAAS,CAAC,aAAa;IAgCvB,SAAS,CAAC,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ7C,SAAS,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;CAiB7C"}
+{"version":3,"file":"HttpBridge.d.ts","sourceRoot":"","sources":["../../src/HttpBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAWlC,OAAO,EACL,OAAO,EAER,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAuB,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACxF,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,EACL,mBAAmB,EAAE,YAAY,EAAE,qBAAqB,EACzD,MAAM,2BAA2B,CAAA;AAElC,OAAO,EACL,eAAe,EAAmB,cAAc,EAAE,iBAAiB,EACpE,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACK,OAAO,EAAE,MAAM,EAC1B,MAAM,4BAA4B,CAAA;AACnC,OAAO,OAAO,EAAE,EACd,WAAW,EAAE,OAAO,EAAE,QAAQ,EAC/B,MAAM,SAAS,CAAA;AAGhB;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;GAEG;AACH,KAAK,sBAAsB,GAAG,CAAC,iBAAiB,EAAE,SAAS,GAAG,OAAO,EAAE,CAAC,CAAA;AASxE,eAAO,MAAM,6BAA6B;;CAA2D,CAAA;AACrG,MAAM,MAAM,6BAA6B,GAAG,OAAO,6BAA6B,CAAA;AAEhF,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB,CAAC,EAAE,EAAE,6BAA6B,CAAC;CAAG;AAEvG,MAAM,WAAW,uBAAwB,SAAQ,YAAY,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;CAAG;AAE1G,qBACa,iBAAiB,CAAC,OAAO,SAAS,uBAAuB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;IACjG,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAA0D;IAC1G,SAAS,CAAC,IAAI,CAAC,EAAE,WAAW,CAAA;IAC5B,SAAS,CAAC,eAAe,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAK;IACzD,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;IAE1B,SAAS,KAAK,GAAG,wBAGhB;IAEK,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAgB7F,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAY3G,cAAc,IAAI,OAAO,EAAE;IAIrB,YAAY;IAKZ,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;IAKzC,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;cAkBxG,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;cAKnH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,sBAAsB,CAAC,EAAE,GAAG,EAAE,QAAQ;cAoBnG,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,sBAAsB,CAAC,EAAE,GAAG,EAAE,QAAQ;IA4BpH,SAAS,CAAC,aAAa,IAAI,WAAW;IAgCtC,SAAS,CAAC,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ7C,SAAS,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;CAiB7C"}

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HttpBridge.ts"],"sourcesContent":["import { Server } from 'node:http'\n\nimport {\n  asyncHandler,\n  customPoweredByHeader,\n  disableCaseSensitiveRouting,\n  disableExpressDefaultPoweredByHeader,\n  jsonBodyParser,\n  responseProfiler,\n  useRequestCounters,\n} from '@xylabs/express'\nimport {\n  Address, assertEx,\n  exists, toSafeJsonString,\n} from '@xylabs/sdk-js'\nimport { isQueryBoundWitness, QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { HttpBridge, HttpBridgeConfig } from '@xyo-network/bridge-http'\nimport {\n  BridgeExposeOptions, BridgeParams, BridgeUnexposeOptions,\n} from '@xyo-network/bridge-model'\n// import { standardResponses } from '@xyo-network/express-node-middleware'\nimport {\n  AnyConfigSchema, creatableModule, ModuleInstance, ModuleQueryResult, resolveAddressToInstanceUp,\n} from '@xyo-network/module-model'\nimport {\n  asSchema, Payload, Schema,\n} from '@xyo-network/payload-model'\nimport express, {\n  Application, Request, Response,\n} from 'express'\nimport { StatusCodes } from 'http-status-codes'\n\n/**\n * The type of the path parameters for the address path.\n */\ntype AddressPathParams = {\n  address: Address\n}\n\n/**\n * The type of the request body for the address path.\n */\ntype PostAddressRequestBody = [QueryBoundWitness, undefined | Payload[]]\n\n// TODO: This does not match the error response shape of the legacy bridge BUT it its the\n// shape this bridge is currently returning.  Massage this into the standard\n// error shape constructed via middleware.\n/* type ErrorResponseBody = {\n  error: string\n} */\n\nexport const HttpBridgeExpressConfigSchema = asSchema('network.xyo.bridge.http.express.config', true)\nexport type HttpBridgeExpressConfigSchema = typeof HttpBridgeExpressConfigSchema\n\nexport interface HttpBridgeExpressConfig extends HttpBridgeConfig<{}, HttpBridgeExpressConfigSchema> {}\n\nexport interface HttpBridgeExpressParams extends BridgeParams<AnyConfigSchema<HttpBridgeExpressConfig>> {}\n\n@creatableModule()\nexport class HttpBridgeExpress<TParams extends HttpBridgeExpressParams> extends HttpBridge<TParams> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, HttpBridgeExpressConfigSchema]\n  protected _app?: Application\n  protected _exposedModules: WeakRef<ModuleInstance>[] = []\n  protected _server?: Server\n\n  protected get app() {\n    if (!this._app) this._app = this.initializeApp()\n    return assertEx(this._app, () => 'App not initialized')\n  }\n\n  async exposeChild(mod: ModuleInstance, options?: BridgeExposeOptions | undefined): Promise<ModuleInstance[]> {\n    const { maxDepth = 5 } = options ?? {}\n    assertEx(this.config.host, () => 'Not configured as a host')\n    this._exposedModules.push(new WeakRef(mod))\n    const children = maxDepth > 0 ? ((await mod.publicChildren?.()) ?? []) : []\n    this.logger?.log(`childrenToExpose [${mod.id}][${mod.address}]: ${toSafeJsonString(children.map(child => child.id))}`)\n    const exposedChildren = (await Promise.all(children.map(child => this.exposeChild(child, { maxDepth: maxDepth - 1, required: false }))))\n      .flat()\n      .filter(exists)\n    const allExposed = [mod, ...exposedChildren]\n\n    for (const exposedMod of allExposed) this.logger?.log(`exposed: ${exposedMod.address} [${mod.id}]`)\n\n    return allExposed\n  }\n\n  override async exposeHandler(address: Address, options?: BridgeExposeOptions | undefined): Promise<ModuleInstance[]> {\n    const { required = true } = options ?? {}\n    const mod = await resolveAddressToInstanceUp(this, address)\n    if (required && !mod) {\n      throw new Error(`Unable to find required module: ${address}`)\n    }\n    if (mod) {\n      return this.exposeChild(mod, options)\n    }\n    return []\n  }\n\n  override exposedHandler(): Address[] {\n    return this._exposedModules.map(ref => ref.deref()?.address).filter(exists)\n  }\n\n  override async startHandler() {\n    await super.startHandler()\n    await this.startHttpServer()\n  }\n\n  override async stopHandler(_timeout?: number | undefined) {\n    await super.stopHandler()\n    await this.stopHttpServer()\n  }\n\n  override async unexposeHandler(address: Address, options?: BridgeUnexposeOptions | undefined): Promise<ModuleInstance[]> {\n    const { maxDepth = 2, required = true } = options ?? {}\n    assertEx(this.config.host, () => 'Not configured as a host')\n    const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()\n    assertEx(!required || mod, () => `Module not exposed: ${address}`)\n    this._exposedModules = this._exposedModules.filter(ref => ref.deref()?.address !== address)\n    if (mod) {\n      const children = maxDepth > 0 ? ((await mod.publicChildren?.()) ?? []) : []\n      const exposedChildren = (\n        await Promise.all(children.map(child => this.unexposeHandler(child.address, { maxDepth: maxDepth - 1, required: false })))\n      )\n        .flat()\n        .filter(exists)\n      return [mod, ...exposedChildren]\n    }\n    return []\n  }\n\n  protected async callLocalModule(address: Address, query: QueryBoundWitness, payloads: Payload[]): Promise<ModuleQueryResult | null> {\n    const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()\n    return mod ? await mod.query(query, payloads) : null\n  }\n\n  protected async handleGet(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response) {\n    const { address } = req.params\n    try {\n      if (address == this.address) {\n        res.json(await this.stateQuery(this.account))\n      } else {\n        const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()\n        // TODO: Use standard errors middleware\n        if (mod) {\n          res.json(await mod.stateQuery(this.account))\n        } else {\n          res.status(StatusCodes.NOT_FOUND).json({ error: 'Module not found' })\n        }\n      }\n    } catch (ex) {\n      // TODO: Sanitize message\n      res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error: (ex as Error).message })\n    }\n  }\n\n  protected async handlePost(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response) {\n    const { address } = req.params\n    const [bw, payloads = []] = Array.isArray(req.body) ? req.body : []\n    const query = isQueryBoundWitness(bw) ? bw : undefined\n    if (!query) {\n      // TODO: Use standard errors middleware\n      res.status(StatusCodes.BAD_REQUEST).json({ error: 'No query provided' })\n      return\n    }\n    try {\n      if (address == this.address) {\n        const result = await this.query(query, payloads)\n        return res.json(result)\n      } else {\n        const result = await this.callLocalModule(address, query, payloads)\n        // TODO: Use standard errors middleware\n        if (result === null) {\n          res.status(StatusCodes.NOT_FOUND).json({ error: 'Module not found' })\n        } else {\n          res.json(result)\n        }\n      }\n    } catch (ex) {\n      // TODO: Sanitize message\n      res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error: (ex as Error).message })\n    }\n  }\n\n  protected initializeApp() {\n    // Create the express app\n    const app = express()\n\n    // Add middleware\n    app.use(responseProfiler)\n    app.use(jsonBodyParser)\n    // removed for now since this causes a cycle\n    // app.use(standardResponses)\n    disableExpressDefaultPoweredByHeader(app)\n    app.use(customPoweredByHeader)\n    disableCaseSensitiveRouting(app)\n    useRequestCounters(app)\n\n    // Add routes\n    // Redirect all requests to the root to this module's address\n    app.get('/', (_req, res) => res.redirect(StatusCodes.MOVED_TEMPORARILY, `/${this.address}`))\n    app.post('/', (_req, res) => res.redirect(StatusCodes.TEMPORARY_REDIRECT, `/${this.address}`))\n\n    app.get<AddressPathParams, ModuleQueryResult>(\n      '/:address',\n\n      asyncHandler(async (req, res) => await this.handleGet(req, res)),\n    )\n    app.post<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>(\n      '/:address',\n\n      asyncHandler(async (req, res) => { await this.handlePost(req, res) }),\n    )\n    return app\n  }\n\n  protected startHttpServer(): Promise<boolean> {\n    if (this.config.host) {\n      assertEx(!this._server, () => 'Server already started')\n      this._server = this.app.listen(this.config.host?.port ?? 3030)\n    }\n    return Promise.resolve(true)\n  }\n\n  protected stopHttpServer(): Promise<boolean> {\n    if (this.config.host) {\n      return new Promise((resolve, reject) => {\n        if (this._server) {\n          this._server.close((err) => {\n            if (err) {\n              reject(err)\n            } else {\n              this._server = undefined\n              resolve(true)\n            }\n          })\n        }\n      })\n    }\n    return Promise.resolve(true)\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAEA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACW;AAAA,EACT;AAAA,EAAQ;AAAA,OACH;AACP,SAAS,2BAA8C;AACvD,SAAS,kBAAoC;AAK7C;AAAA,EACmB;AAAA,EAAoD;AAAA,OAChE;AACP;AAAA,EACE;AAAA,OACK;AACP,OAAO,aAEA;AACP,SAAS,mBAAmB;AAqBrB,IAAM,gCAAgC,SAAS,0CAA0C,IAAI;AAQ7F,IAAM,oBAAN,cAAyE,WAAoB;AAAA,EAExF;AAAA,EACA,kBAA6C,CAAC;AAAA,EAC9C;AAAA,EAEV,IAAc,MAAM;AAClB,QAAI,CAAC,KAAK,KAAM,MAAK,OAAO,KAAK,cAAc;AAC/C,WAAO,SAAS,KAAK,MAAM,MAAM,qBAAqB;AAAA,EACxD;AAAA,EAEA,MAAM,YAAY,KAAqB,SAAsE;AAC3G,UAAM,EAAE,WAAW,EAAE,IAAI,WAAW,CAAC;AACrC,aAAS,KAAK,OAAO,MAAM,MAAM,0BAA0B;AAC3D,SAAK,gBAAgB,KAAK,IAAI,QAAQ,GAAG,CAAC;AAC1C,UAAM,WAAW,WAAW,IAAM,MAAM,IAAI,iBAAiB,KAAM,CAAC,IAAK,CAAC;AAC1E,SAAK,QAAQ,IAAI,qBAAqB,IAAI,EAAE,KAAK,IAAI,OAAO,MAAM,iBAAiB,SAAS,IAAI,WAAS,MAAM,EAAE,CAAC,CAAC,EAAE;AACrH,UAAM,mBAAmB,MAAM,QAAQ,IAAI,SAAS,IAAI,WAAS,KAAK,YAAY,OAAO,EAAE,UAAU,WAAW,GAAG,UAAU,MAAM,CAAC,CAAC,CAAC,GACnI,KAAK,EACL,OAAO,MAAM;AAChB,UAAM,aAAa,CAAC,KAAK,GAAG,eAAe;AAE3C,eAAW,cAAc,WAAY,MAAK,QAAQ,IAAI,YAAY,WAAW,OAAO,KAAK,IAAI,EAAE,GAAG;AAElG,WAAO;AAAA,EACT;AAAA,EAEA,MAAe,cAAc,SAAkB,SAAsE;AACnH,UAAM,EAAE,WAAW,KAAK,IAAI,WAAW,CAAC;AACxC,UAAM,MAAM,MAAM,2BAA2B,MAAM,OAAO;AAC1D,QAAI,YAAY,CAAC,KAAK;AACpB,YAAM,IAAI,MAAM,mCAAmC,OAAO,EAAE;AAAA,IAC9D;AACA,QAAI,KAAK;AACP,aAAO,KAAK,YAAY,KAAK,OAAO;AAAA,IACtC;AACA,WAAO,CAAC;AAAA,EACV;AAAA,EAES,iBAA4B;AACnC,WAAO,KAAK,gBAAgB,IAAI,SAAO,IAAI,MAAM,GAAG,OAAO,EAAE,OAAO,MAAM;AAAA,EAC5E;AAAA,EAEA,MAAe,eAAe;AAC5B,UAAM,MAAM,aAAa;AACzB,UAAM,KAAK,gBAAgB;AAAA,EAC7B;AAAA,EAEA,MAAe,YAAY,UAA+B;AACxD,UAAM,MAAM,YAAY;AACxB,UAAM,KAAK,eAAe;AAAA,EAC5B;AAAA,EAEA,MAAe,gBAAgB,SAAkB,SAAwE;AACvH,UAAM,EAAE,WAAW,GAAG,WAAW,KAAK,IAAI,WAAW,CAAC;AACtD,aAAS,KAAK,OAAO,MAAM,MAAM,0BAA0B;AAC3D,UAAM,MAAM,KAAK,gBAAgB,KAAK,SAAO,IAAI,MAAM,GAAG,YAAY,OAAO,GAAG,MAAM;AACtF,aAAS,CAAC,YAAY,KAAK,MAAM,uBAAuB,OAAO,EAAE;AACjE,SAAK,kBAAkB,KAAK,gBAAgB,OAAO,SAAO,IAAI,MAAM,GAAG,YAAY,OAAO;AAC1F,QAAI,KAAK;AACP,YAAM,WAAW,WAAW,IAAM,MAAM,IAAI,iBAAiB,KAAM,CAAC,IAAK,CAAC;AAC1E,YAAM,mBACJ,MAAM,QAAQ,IAAI,SAAS,IAAI,WAAS,KAAK,gBAAgB,MAAM,SAAS,EAAE,UAAU,WAAW,GAAG,UAAU,MAAM,CAAC,CAAC,CAAC,GAExH,KAAK,EACL,OAAO,MAAM;AAChB,aAAO,CAAC,KAAK,GAAG,eAAe;AAAA,IACjC;AACA,WAAO,CAAC;AAAA,EACV;AAAA,EAEA,MAAgB,gBAAgB,SAAkB,OAA0B,UAAwD;AAClI,UAAM,MAAM,KAAK,gBAAgB,KAAK,SAAO,IAAI,MAAM,GAAG,YAAY,OAAO,GAAG,MAAM;AACtF,WAAO,MAAM,MAAM,IAAI,MAAM,OAAO,QAAQ,IAAI;AAAA,EAClD;AAAA,EAEA,MAAgB,UAAU,KAA4E,KAAe;AACnH,UAAM,EAAE,QAAQ,IAAI,IAAI;AACxB,QAAI;AACF,UAAI,WAAW,KAAK,SAAS;AAC3B,YAAI,KAAK,MAAM,KAAK,WAAW,KAAK,OAAO,CAAC;AAAA,MAC9C,OAAO;AACL,cAAM,MAAM,KAAK,gBAAgB,KAAK,SAAO,IAAI,MAAM,GAAG,YAAY,OAAO,GAAG,MAAM;AAEtF,YAAI,KAAK;AACP,cAAI,KAAK,MAAM,IAAI,WAAW,KAAK,OAAO,CAAC;AAAA,QAC7C,OAAO;AACL,cAAI,OAAO,YAAY,SAAS,EAAE,KAAK,EAAE,OAAO,mBAAmB,CAAC;AAAA,QACtE;AAAA,MACF;AAAA,IACF,SAAS,IAAI;AAEX,UAAI,OAAO,YAAY,qBAAqB,EAAE,KAAK,EAAE,OAAQ,GAAa,QAAQ,CAAC;AAAA,IACrF;AAAA,EACF;AAAA,EAEA,MAAgB,WAAW,KAA4E,KAAe;AACpH,UAAM,EAAE,QAAQ,IAAI,IAAI;AACxB,UAAM,CAAC,IAAI,WAAW,CAAC,CAAC,IAAI,MAAM,QAAQ,IAAI,IAAI,IAAI,IAAI,OAAO,CAAC;AAClE,UAAM,QAAQ,oBAAoB,EAAE,IAAI,KAAK;AAC7C,QAAI,CAAC,OAAO;AAEV,UAAI,OAAO,YAAY,WAAW,EAAE,KAAK,EAAE,OAAO,oBAAoB,CAAC;AACvE;AAAA,IACF;AACA,QAAI;AACF,UAAI,WAAW,KAAK,SAAS;AAC3B,cAAM,SAAS,MAAM,KAAK,MAAM,OAAO,QAAQ;AAC/C,eAAO,IAAI,KAAK,MAAM;AAAA,MACxB,OAAO;AACL,cAAM,SAAS,MAAM,KAAK,gBAAgB,SAAS,OAAO,QAAQ;AAElE,YAAI,WAAW,MAAM;AACnB,cAAI,OAAO,YAAY,SAAS,EAAE,KAAK,EAAE,OAAO,mBAAmB,CAAC;AAAA,QACtE,OAAO;AACL,cAAI,KAAK,MAAM;AAAA,QACjB;AAAA,MACF;AAAA,IACF,SAAS,IAAI;AAEX,UAAI,OAAO,YAAY,qBAAqB,EAAE,KAAK,EAAE,OAAQ,GAAa,QAAQ,CAAC;AAAA,IACrF;AAAA,EACF;AAAA,EAEU,gBAAgB;AAExB,UAAM,MAAM,QAAQ;AAGpB,QAAI,IAAI,gBAAgB;AACxB,QAAI,IAAI,cAAc;AAGtB,yCAAqC,GAAG;AACxC,QAAI,IAAI,qBAAqB;AAC7B,gCAA4B,GAAG;AAC/B,uBAAmB,GAAG;AAItB,QAAI,IAAI,KAAK,CAAC,MAAM,QAAQ,IAAI,SAAS,YAAY,mBAAmB,IAAI,KAAK,OAAO,EAAE,CAAC;AAC3F,QAAI,KAAK,KAAK,CAAC,MAAM,QAAQ,IAAI,SAAS,YAAY,oBAAoB,IAAI,KAAK,OAAO,EAAE,CAAC;AAE7F,QAAI;AAAA,MACF;AAAA,MAEA,aAAa,OAAO,KAAK,QAAQ,MAAM,KAAK,UAAU,KAAK,GAAG,CAAC;AAAA,IACjE;AACA,QAAI;AAAA,MACF;AAAA,MAEA,aAAa,OAAO,KAAK,QAAQ;AAAE,cAAM,KAAK,WAAW,KAAK,GAAG;AAAA,MAAE,CAAC;AAAA,IACtE;AACA,WAAO;AAAA,EACT;AAAA,EAEU,kBAAoC;AAC5C,QAAI,KAAK,OAAO,MAAM;AACpB,eAAS,CAAC,KAAK,SAAS,MAAM,wBAAwB;AACtD,WAAK,UAAU,KAAK,IAAI,OAAO,KAAK,OAAO,MAAM,QAAQ,IAAI;AAAA,IAC/D;AACA,WAAO,QAAQ,QAAQ,IAAI;AAAA,EAC7B;AAAA,EAEU,iBAAmC;AAC3C,QAAI,KAAK,OAAO,MAAM;AACpB,aAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,YAAI,KAAK,SAAS;AAChB,eAAK,QAAQ,MAAM,CAAC,QAAQ;AAC1B,gBAAI,KAAK;AACP,qBAAO,GAAG;AAAA,YACZ,OAAO;AACL,mBAAK,UAAU;AACf,sBAAQ,IAAI;AAAA,YACd;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF,CAAC;AAAA,IACH;AACA,WAAO,QAAQ,QAAQ,IAAI;AAAA,EAC7B;AACF;AApLE,cADW,mBACc,iBAA0B,CAAC,GAAG,iDAAM,kBAAe,6BAA6B;AAD9F,oBAAN;AAAA,EADN,gBAAgB;AAAA,GACJ;","names":[]}
+{"version":3,"sources":["../../src/HttpBridge.ts"],"sourcesContent":["import { Server } from 'node:http'\n\nimport {\n  asyncHandler,\n  customPoweredByHeader,\n  disableCaseSensitiveRouting,\n  disableExpressDefaultPoweredByHeader,\n  jsonBodyParser,\n  responseProfiler,\n  useRequestCounters,\n} from '@xylabs/express'\nimport {\n  Address, assertEx,\n  exists, toSafeJsonString,\n} from '@xylabs/sdk-js'\nimport { isQueryBoundWitness, QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { HttpBridge, HttpBridgeConfig } from '@xyo-network/bridge-http'\nimport {\n  BridgeExposeOptions, BridgeParams, BridgeUnexposeOptions,\n} from '@xyo-network/bridge-model'\n// import { standardResponses } from '@xyo-network/express-node-middleware'\nimport {\n  AnyConfigSchema, creatableModule, ModuleInstance, ModuleQueryResult, resolveAddressToInstanceUp,\n} from '@xyo-network/module-model'\nimport {\n  asSchema, Payload, Schema,\n} from '@xyo-network/payload-model'\nimport express, {\n  Application, Request, Response,\n} from 'express'\nimport { StatusCodes } from 'http-status-codes'\n\n/**\n * The type of the path parameters for the address path.\n */\ntype AddressPathParams = {\n  address: Address\n}\n\n/**\n * The type of the request body for the address path.\n */\ntype PostAddressRequestBody = [QueryBoundWitness, undefined | Payload[]]\n\n// TODO: This does not match the error response shape of the legacy bridge BUT it its the\n// shape this bridge is currently returning.  Massage this into the standard\n// error shape constructed via middleware.\n/* type ErrorResponseBody = {\n  error: string\n} */\n\nexport const HttpBridgeExpressConfigSchema = asSchema('network.xyo.bridge.http.express.config', true)\nexport type HttpBridgeExpressConfigSchema = typeof HttpBridgeExpressConfigSchema\n\nexport interface HttpBridgeExpressConfig extends HttpBridgeConfig<{}, HttpBridgeExpressConfigSchema> {}\n\nexport interface HttpBridgeExpressParams extends BridgeParams<AnyConfigSchema<HttpBridgeExpressConfig>> {}\n\n@creatableModule()\nexport class HttpBridgeExpress<TParams extends HttpBridgeExpressParams> extends HttpBridge<TParams> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, HttpBridgeExpressConfigSchema]\n  protected _app?: Application\n  protected _exposedModules: WeakRef<ModuleInstance>[] = []\n  protected _server?: Server\n\n  protected get app() {\n    if (!this._app) this._app = this.initializeApp()\n    return assertEx(this._app, () => 'App not initialized')\n  }\n\n  async exposeChild(mod: ModuleInstance, options?: BridgeExposeOptions | undefined): Promise<ModuleInstance[]> {\n    const { maxDepth = 5 } = options ?? {}\n    assertEx(this.config.host, () => 'Not configured as a host')\n    this._exposedModules.push(new WeakRef(mod))\n    const children = maxDepth > 0 ? ((await mod.publicChildren?.()) ?? []) : []\n    this.logger?.log(`childrenToExpose [${mod.id}][${mod.address}]: ${toSafeJsonString(children.map(child => child.id))}`)\n    const exposedChildren = (await Promise.all(children.map(child => this.exposeChild(child, { maxDepth: maxDepth - 1, required: false }))))\n      .flat()\n      .filter(exists)\n    const allExposed = [mod, ...exposedChildren]\n\n    for (const exposedMod of allExposed) this.logger?.log(`exposed: ${exposedMod.address} [${mod.id}]`)\n\n    return allExposed\n  }\n\n  override async exposeHandler(address: Address, options?: BridgeExposeOptions | undefined): Promise<ModuleInstance[]> {\n    const { required = true } = options ?? {}\n    const mod = await resolveAddressToInstanceUp(this, address)\n    if (required && !mod) {\n      throw new Error(`Unable to find required module: ${address}`)\n    }\n    if (mod) {\n      return this.exposeChild(mod, options)\n    }\n    return []\n  }\n\n  override exposedHandler(): Address[] {\n    return this._exposedModules.map(ref => ref.deref()?.address).filter(exists)\n  }\n\n  override async startHandler() {\n    await super.startHandler()\n    await this.startHttpServer()\n  }\n\n  override async stopHandler(_timeout?: number | undefined) {\n    await super.stopHandler()\n    await this.stopHttpServer()\n  }\n\n  override async unexposeHandler(address: Address, options?: BridgeUnexposeOptions | undefined): Promise<ModuleInstance[]> {\n    const { maxDepth = 2, required = true } = options ?? {}\n    assertEx(this.config.host, () => 'Not configured as a host')\n    const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()\n    assertEx(!required || mod, () => `Module not exposed: ${address}`)\n    this._exposedModules = this._exposedModules.filter(ref => ref.deref()?.address !== address)\n    if (mod) {\n      const children = maxDepth > 0 ? ((await mod.publicChildren?.()) ?? []) : []\n      const exposedChildren = (\n        await Promise.all(children.map(child => this.unexposeHandler(child.address, { maxDepth: maxDepth - 1, required: false })))\n      )\n        .flat()\n        .filter(exists)\n      return [mod, ...exposedChildren]\n    }\n    return []\n  }\n\n  protected async callLocalModule(address: Address, query: QueryBoundWitness, payloads: Payload[]): Promise<ModuleQueryResult | null> {\n    const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()\n    return mod ? await mod.query(query, payloads) : null\n  }\n\n  protected async handleGet(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response) {\n    const { address } = req.params\n    try {\n      if (address == this.address) {\n        res.json(await this.stateQuery(this.account))\n      } else {\n        const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()\n        // TODO: Use standard errors middleware\n        if (mod) {\n          res.json(await mod.stateQuery(this.account))\n        } else {\n          res.status(StatusCodes.NOT_FOUND).json({ error: 'Module not found' })\n        }\n      }\n    } catch (ex) {\n      // TODO: Sanitize message\n      res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error: (ex as Error).message })\n    }\n  }\n\n  protected async handlePost(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response) {\n    const { address } = req.params\n    const [bw, payloads = []] = Array.isArray(req.body) ? req.body : []\n    const query = isQueryBoundWitness(bw) ? bw : undefined\n    if (!query) {\n      // TODO: Use standard errors middleware\n      res.status(StatusCodes.BAD_REQUEST).json({ error: 'No query provided' })\n      return\n    }\n    try {\n      if (address == this.address) {\n        const result = await this.query(query, payloads)\n        return res.json(result)\n      } else {\n        const result = await this.callLocalModule(address, query, payloads)\n        // TODO: Use standard errors middleware\n        if (result === null) {\n          res.status(StatusCodes.NOT_FOUND).json({ error: 'Module not found' })\n        } else {\n          res.json(result)\n        }\n      }\n    } catch (ex) {\n      // TODO: Sanitize message\n      res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error: (ex as Error).message })\n    }\n  }\n\n  protected initializeApp(): Application {\n    // Create the express app\n    const app = express()\n\n    // Add middleware\n    app.use(responseProfiler)\n    app.use(jsonBodyParser)\n    // removed for now since this causes a cycle\n    // app.use(standardResponses)\n    disableExpressDefaultPoweredByHeader(app)\n    app.use(customPoweredByHeader)\n    disableCaseSensitiveRouting(app)\n    useRequestCounters(app)\n\n    // Add routes\n    // Redirect all requests to the root to this module's address\n    app.get('/', (_req, res) => res.redirect(StatusCodes.MOVED_TEMPORARILY, `/${this.address}`))\n    app.post('/', (_req, res) => res.redirect(StatusCodes.TEMPORARY_REDIRECT, `/${this.address}`))\n\n    app.get<AddressPathParams, ModuleQueryResult>(\n      '/:address',\n\n      asyncHandler(async (req, res) => await this.handleGet(req, res)),\n    )\n    app.post<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>(\n      '/:address',\n\n      asyncHandler(async (req, res) => { await this.handlePost(req, res) }),\n    )\n    return app\n  }\n\n  protected startHttpServer(): Promise<boolean> {\n    if (this.config.host) {\n      assertEx(!this._server, () => 'Server already started')\n      this._server = this.app.listen(this.config.host?.port ?? 3030)\n    }\n    return Promise.resolve(true)\n  }\n\n  protected stopHttpServer(): Promise<boolean> {\n    if (this.config.host) {\n      return new Promise((resolve, reject) => {\n        if (this._server) {\n          this._server.close((err) => {\n            if (err) {\n              reject(err)\n            } else {\n              this._server = undefined\n              resolve(true)\n            }\n          })\n        }\n      })\n    }\n    return Promise.resolve(true)\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/bridge-http-express",
-  "version": "5.3.22",
+  "version": "5.3.24",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -30,61 +30,57 @@
   "types": "dist/neutral/index.d.ts",
   "files": [
     "dist",
-    "src",
     "README.md",
     "LICENSE",
     "package.json"
   ],
   "dependencies": {
-    "@xylabs/express": "~5.0.91",
-    "@xyo-network/boundwitness-model": "~5.3.22",
-    "@xyo-network/bridge-http": "~5.3.22",
-    "@xyo-network/bridge-model": "~5.3.22",
-    "@xyo-network/module-model": "~5.3.22",
-    "@xyo-network/payload-model": "~5.3.22",
-    "http-status-codes": "~2.3.0"
+    "@xylabs/express": "~5.0.93",
+    "http-status-codes": "~2.3.0",
+    "@xyo-network/boundwitness-model": "~5.3.24",
+    "@xyo-network/bridge-http": "~5.3.24",
+    "@xyo-network/bridge-model": "~5.3.24",
+    "@xyo-network/module-model": "~5.3.24",
+    "@xyo-network/payload-model": "~5.3.24"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@types/express": "~5.0.6",
     "@types/node": "^25.5.0",
-    "@xylabs/express": "~5.0.91",
-    "@xylabs/sdk-js": "^5.0.91",
-    "@xylabs/ts-scripts-common": "~7.6.8",
-    "@xylabs/ts-scripts-yarn3": "~7.6.8",
-    "@xylabs/tsconfig": "~7.6.8",
-    "@xylabs/vitest-extended": "~5.0.91",
-    "@xyo-network/api-models": "~5.3.22",
-    "@xyo-network/archivist-model": "~5.3.22",
-    "@xyo-network/boundwitness-model": "~5.3.22",
-    "@xyo-network/bridge-abstract": "~5.3.22",
-    "@xyo-network/bridge-http": "~5.3.22",
-    "@xyo-network/bridge-model": "~5.3.22",
-    "@xyo-network/bridge-pub-sub": "~5.3.22",
-    "@xyo-network/diviner-model": "~5.3.22",
-    "@xyo-network/module-model": "~5.3.22",
-    "@xyo-network/module-resolver": "~5.3.22",
-    "@xyo-network/node-memory": "~5.3.22",
-    "@xyo-network/node-model": "~5.3.22",
-    "@xyo-network/payload-builder": "~5.3.22",
-    "@xyo-network/payload-model": "~5.3.22",
-    "@xyo-network/payload-wrapper": "~5.3.22",
-    "@xyo-network/wallet": "~5.3.22",
+    "@xylabs/express": "~5.0.93",
+    "@xylabs/sdk-js": "^5.0.93",
+    "@xylabs/ts-scripts-common": "~7.6.16",
+    "@xylabs/ts-scripts-pnpm": "~7.6.16",
+    "@xylabs/tsconfig": "~7.6.16",
+    "@xylabs/vitest-extended": "~5.0.93",
     "acorn": "^8.16.0",
     "axios": "^1.14.0",
-    "cosmiconfig": "^9.0.1",
-    "esbuild": "^0.27.4",
-    "eslint": "^10.1.0",
+    "esbuild": "^0.28.0",
     "ethers": "^6.16.0",
     "express": "^5.2.1",
     "get-port-please": "~3.2.0",
     "http-status-codes": "~2.3.0",
-    "rollup": "^4.60.1",
     "tslib": "^2.8.1",
     "typescript": "~5.9.3",
     "vite": "^8.0.3",
     "vitest": "~4.1.2",
-    "zod": "^4.3.6"
+    "zod": "^4.3.6",
+    "@xyo-network/archivist-model": "~5.3.24",
+    "@xyo-network/bridge-abstract": "~5.3.24",
+    "@xyo-network/api-models": "~5.3.24",
+    "@xyo-network/bridge-pub-sub": "~5.3.24",
+    "@xyo-network/diviner-model": "~5.3.24",
+    "@xyo-network/module-resolver": "~5.3.24",
+    "@xyo-network/boundwitness-model": "~5.3.24",
+    "@xyo-network/bridge-http": "~5.3.24",
+    "@xyo-network/node-memory": "~5.3.24",
+    "@xyo-network/node-model": "~5.3.24",
+    "@xyo-network/payload-model": "~5.3.24",
+    "@xyo-network/payload-builder": "~5.3.24",
+    "@xyo-network/bridge-model": "~5.3.24",
+    "@xyo-network/module-model": "~5.3.24",
+    "@xyo-network/payload-wrapper": "~5.3.24",
+    "@xyo-network/wallet": "~5.3.24"
   },
   "peerDependencies": {
     "@xylabs/sdk-js": "^5",
@@ -97,4 +93,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/HttpBridge.ts

@@ -1,241 +0,0 @@
-import { Server } from 'node:http'
-
-import {
-  asyncHandler,
-  customPoweredByHeader,
-  disableCaseSensitiveRouting,
-  disableExpressDefaultPoweredByHeader,
-  jsonBodyParser,
-  responseProfiler,
-  useRequestCounters,
-} from '@xylabs/express'
-import {
-  Address, assertEx,
-  exists, toSafeJsonString,
-} from '@xylabs/sdk-js'
-import { isQueryBoundWitness, QueryBoundWitness } from '@xyo-network/boundwitness-model'
-import { HttpBridge, HttpBridgeConfig } from '@xyo-network/bridge-http'
-import {
-  BridgeExposeOptions, BridgeParams, BridgeUnexposeOptions,
-} from '@xyo-network/bridge-model'
-// import { standardResponses } from '@xyo-network/express-node-middleware'
-import {
-  AnyConfigSchema, creatableModule, ModuleInstance, ModuleQueryResult, resolveAddressToInstanceUp,
-} from '@xyo-network/module-model'
-import {
-  asSchema, Payload, Schema,
-} from '@xyo-network/payload-model'
-import express, {
-  Application, Request, Response,
-} from 'express'
-import { StatusCodes } from 'http-status-codes'
-
-/**
- * The type of the path parameters for the address path.
- */
-type AddressPathParams = {
-  address: Address
-}
-
-/**
- * The type of the request body for the address path.
- */
-type PostAddressRequestBody = [QueryBoundWitness, undefined | Payload[]]
-
-// TODO: This does not match the error response shape of the legacy bridge BUT it its the
-// shape this bridge is currently returning.  Massage this into the standard
-// error shape constructed via middleware.
-/* type ErrorResponseBody = {
-  error: string
-} */
-
-export const HttpBridgeExpressConfigSchema = asSchema('network.xyo.bridge.http.express.config', true)
-export type HttpBridgeExpressConfigSchema = typeof HttpBridgeExpressConfigSchema
-
-export interface HttpBridgeExpressConfig extends HttpBridgeConfig<{}, HttpBridgeExpressConfigSchema> {}
-
-export interface HttpBridgeExpressParams extends BridgeParams<AnyConfigSchema<HttpBridgeExpressConfig>> {}
-
-@creatableModule()
-export class HttpBridgeExpress<TParams extends HttpBridgeExpressParams> extends HttpBridge<TParams> {
-  static override readonly configSchemas: Schema[] = [...super.configSchemas, HttpBridgeExpressConfigSchema]
-  protected _app?: Application
-  protected _exposedModules: WeakRef<ModuleInstance>[] = []
-  protected _server?: Server
-
-  protected get app() {
-    if (!this._app) this._app = this.initializeApp()
-    return assertEx(this._app, () => 'App not initialized')
-  }
-
-  async exposeChild(mod: ModuleInstance, options?: BridgeExposeOptions | undefined): Promise<ModuleInstance[]> {
-    const { maxDepth = 5 } = options ?? {}
-    assertEx(this.config.host, () => 'Not configured as a host')
-    this._exposedModules.push(new WeakRef(mod))
-    const children = maxDepth > 0 ? ((await mod.publicChildren?.()) ?? []) : []
-    this.logger?.log(`childrenToExpose [${mod.id}][${mod.address}]: ${toSafeJsonString(children.map(child => child.id))}`)
-    const exposedChildren = (await Promise.all(children.map(child => this.exposeChild(child, { maxDepth: maxDepth - 1, required: false }))))
-      .flat()
-      .filter(exists)
-    const allExposed = [mod, ...exposedChildren]
-
-    for (const exposedMod of allExposed) this.logger?.log(`exposed: ${exposedMod.address} [${mod.id}]`)
-
-    return allExposed
-  }
-
-  override async exposeHandler(address: Address, options?: BridgeExposeOptions | undefined): Promise<ModuleInstance[]> {
-    const { required = true } = options ?? {}
-    const mod = await resolveAddressToInstanceUp(this, address)
-    if (required && !mod) {
-      throw new Error(`Unable to find required module: ${address}`)
-    }
-    if (mod) {
-      return this.exposeChild(mod, options)
-    }
-    return []
-  }
-
-  override exposedHandler(): Address[] {
-    return this._exposedModules.map(ref => ref.deref()?.address).filter(exists)
-  }
-
-  override async startHandler() {
-    await super.startHandler()
-    await this.startHttpServer()
-  }
-
-  override async stopHandler(_timeout?: number | undefined) {
-    await super.stopHandler()
-    await this.stopHttpServer()
-  }
-
-  override async unexposeHandler(address: Address, options?: BridgeUnexposeOptions | undefined): Promise<ModuleInstance[]> {
-    const { maxDepth = 2, required = true } = options ?? {}
-    assertEx(this.config.host, () => 'Not configured as a host')
-    const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()
-    assertEx(!required || mod, () => `Module not exposed: ${address}`)
-    this._exposedModules = this._exposedModules.filter(ref => ref.deref()?.address !== address)
-    if (mod) {
-      const children = maxDepth > 0 ? ((await mod.publicChildren?.()) ?? []) : []
-      const exposedChildren = (
-        await Promise.all(children.map(child => this.unexposeHandler(child.address, { maxDepth: maxDepth - 1, required: false })))
-      )
-        .flat()
-        .filter(exists)
-      return [mod, ...exposedChildren]
-    }
-    return []
-  }
-
-  protected async callLocalModule(address: Address, query: QueryBoundWitness, payloads: Payload[]): Promise<ModuleQueryResult | null> {
-    const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()
-    return mod ? await mod.query(query, payloads) : null
-  }
-
-  protected async handleGet(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response) {
-    const { address } = req.params
-    try {
-      if (address == this.address) {
-        res.json(await this.stateQuery(this.account))
-      } else {
-        const mod = this._exposedModules.find(ref => ref.deref()?.address === address)?.deref()
-        // TODO: Use standard errors middleware
-        if (mod) {
-          res.json(await mod.stateQuery(this.account))
-        } else {
-          res.status(StatusCodes.NOT_FOUND).json({ error: 'Module not found' })
-        }
-      }
-    } catch (ex) {
-      // TODO: Sanitize message
-      res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error: (ex as Error).message })
-    }
-  }
-
-  protected async handlePost(req: Request<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>, res: Response) {
-    const { address } = req.params
-    const [bw, payloads = []] = Array.isArray(req.body) ? req.body : []
-    const query = isQueryBoundWitness(bw) ? bw : undefined
-    if (!query) {
-      // TODO: Use standard errors middleware
-      res.status(StatusCodes.BAD_REQUEST).json({ error: 'No query provided' })
-      return
-    }
-    try {
-      if (address == this.address) {
-        const result = await this.query(query, payloads)
-        return res.json(result)
-      } else {
-        const result = await this.callLocalModule(address, query, payloads)
-        // TODO: Use standard errors middleware
-        if (result === null) {
-          res.status(StatusCodes.NOT_FOUND).json({ error: 'Module not found' })
-        } else {
-          res.json(result)
-        }
-      }
-    } catch (ex) {
-      // TODO: Sanitize message
-      res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error: (ex as Error).message })
-    }
-  }
-
-  protected initializeApp() {
-    // Create the express app
-    const app = express()
-
-    // Add middleware
-    app.use(responseProfiler)
-    app.use(jsonBodyParser)
-    // removed for now since this causes a cycle
-    // app.use(standardResponses)
-    disableExpressDefaultPoweredByHeader(app)
-    app.use(customPoweredByHeader)
-    disableCaseSensitiveRouting(app)
-    useRequestCounters(app)
-
-    // Add routes
-    // Redirect all requests to the root to this module's address
-    app.get('/', (_req, res) => res.redirect(StatusCodes.MOVED_TEMPORARILY, `/${this.address}`))
-    app.post('/', (_req, res) => res.redirect(StatusCodes.TEMPORARY_REDIRECT, `/${this.address}`))
-
-    app.get<AddressPathParams, ModuleQueryResult>(
-      '/:address',
-
-      asyncHandler(async (req, res) => await this.handleGet(req, res)),
-    )
-    app.post<AddressPathParams, ModuleQueryResult, PostAddressRequestBody>(
-      '/:address',
-
-      asyncHandler(async (req, res) => { await this.handlePost(req, res) }),
-    )
-    return app
-  }
-
-  protected startHttpServer(): Promise<boolean> {
-    if (this.config.host) {
-      assertEx(!this._server, () => 'Server already started')
-      this._server = this.app.listen(this.config.host?.port ?? 3030)
-    }
-    return Promise.resolve(true)
-  }
-
-  protected stopHttpServer(): Promise<boolean> {
-    if (this.config.host) {
-      return new Promise((resolve, reject) => {
-        if (this._server) {
-          this._server.close((err) => {
-            if (err) {
-              reject(err)
-            } else {
-              this._server = undefined
-              resolve(true)
-            }
-          })
-        }
-      })
-    }
-    return Promise.resolve(true)
-  }
-}

package/src/index.ts

@@ -1 +0,0 @@
-export * from './HttpBridge.ts'

package/src/spec/HttpBridge.baddns.spec.ts

@@ -1,42 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import { MemoryNode } from '@xyo-network/node-memory'
-import {
-  describe, expect, it,
-} from 'vitest'
-
-import { HttpBridgeExpress, HttpBridgeExpressConfigSchema } from '../HttpBridge.ts'
-
-/**
- * @group module
- * @group bridge
- */
-
-describe('HttpBridge', () => {
-  const baseUrl = 'https://sfjhskjdsfhdsk.com'
-
-  console.log(`HttpBridge:baseUrl ${baseUrl}`)
-  const cases = [
-    ['/', `${baseUrl}`],
-    /* ['/node', `${baseUrl}/node`], */
-  ]
-
-  it.each(cases)('HttpBridge: %s', async (_, nodeUrl) => {
-    const memNode = await MemoryNode.create({ account: 'random' })
-
-    const bridge = await HttpBridgeExpress.create({
-      account: 'random',
-      config: {
-        client: { url: nodeUrl }, schema: HttpBridgeExpressConfigSchema, security: { allowAnonymous: true },
-      },
-    })
-
-    await bridge?.start?.()
-
-    await memNode.register(bridge)
-    await memNode.attach(bridge.address, true)
-
-    const modules = await memNode.resolve('*')
-    expect(modules.length).toBe(2)
-  })
-})

package/src/spec/HttpBridge.copilot.spec.ts

@@ -1,62 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import type { Address } from '@xylabs/sdk-js'
-import {
-  beforeEach,
-  describe, expect, it,
-} from 'vitest'
-
-import type { HttpBridgeExpressParams } from '../HttpBridge.ts'
-import { HttpBridgeExpress, HttpBridgeExpressConfigSchema } from '../HttpBridge.ts'
-
-describe('HttpBridgeExpress', () => {
-  let httpBridge: HttpBridgeExpress<HttpBridgeExpressParams>
-
-  beforeEach(async () => {
-    httpBridge = await HttpBridgeExpress.create({
-      account: 'random',
-      config: {
-        name: 'TestBridge', client: { url: 'http://localhost:8080' }, schema: HttpBridgeExpressConfigSchema, security: { allowAnonymous: true },
-      },
-    })
-  })
-
-  it('should create an instance of HttpBridgeExpress', () => {
-    expect(httpBridge).toBeInstanceOf(HttpBridgeExpress)
-  })
-
-  it('should have axios instance', () => {
-    expect(httpBridge.axios).toBeDefined()
-  })
-
-  it('should have nodeUrl defined', () => {
-    expect(httpBridge.clientUrl).toBe('http://localhost:8080')
-  })
-
-  it('should have resolver defined', () => {
-    expect(httpBridge.resolver).toBeDefined()
-  })
-
-  it('should return correct moduleUrl', () => {
-    const address = '0x1234' as Address
-    expect(httpBridge.moduleUrl(address).toString()).toBe('http://localhost:8080/0x1234')
-  })
-
-  it('should throw error on call to exposeHandler', async () => {
-    try {
-      await httpBridge.exposeHandler('test' as Address)
-      expect('').toBe('exposeHandler should have thrown an error')
-    } catch (error) {
-      expect(error).toBeInstanceOf(Error)
-    }
-  })
-
-  it('should throw error on call to unexposeHandler', async () => {
-    try {
-      await httpBridge.unexposeHandler('test' as Address)
-      expect('').toBe('unexposeHandler should have thrown an error')
-    } catch (error) {
-      expect(error).toBeInstanceOf(Error)
-    }
-  })
-})

package/src/spec/HttpBridge.host-resolve.spec.ts

@@ -1,89 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import type { CreatableName } from '@xylabs/sdk-js'
-import { HttpBridge, HttpBridgeConfigSchema } from '@xyo-network/bridge-http'
-import type {
-  AsyncQueryBusIntersectConfig,
-  PubSubBridgeConfig,
-  PubSubBridgeParams,
-} from '@xyo-network/bridge-pub-sub'
-import {
-  PubSubBridge,
-  PubSubBridgeConfigSchema,
-} from '@xyo-network/bridge-pub-sub'
-import { MemoryNode } from '@xyo-network/node-memory'
-import { NodeConfigSchema } from '@xyo-network/node-model'
-import {
-  describe, expect, it,
-} from 'vitest'
-
-/**
- * @group module
- * @group bridge
- */
-
-describe.skip('HttpBridge with PubSubBridge', () => {
-  const httpBaseUrl = process.env.XNS_API_DOMAIN ?? 'https://beta.xns.xyo.network' // ?? 'http://localhost:80'
-
-  console.log(`HttpBridge:baseUrl ${httpBaseUrl}`)
-  const cases = [
-    ['/', `${httpBaseUrl}`],
-    /* ['/node', `${baseUrl}/node`], */
-  ]
-
-  it.each(cases)('HttpBridge: %s', async (_, nodeUrl) => {
-    const memNode = await MemoryNode.create({ account: 'random', config: { name: 'MemNodeArie', schema: NodeConfigSchema } })
-    const intersect: AsyncQueryBusIntersectConfig = {
-      queries: { archivist: 'MemNodeArie:XNS:Intersect:QueryArchivist', boundWitnessDiviner: 'MemNodeArie:XNS:Intersect:QueryBoundWitnessDiviner' },
-      responses: {
-        archivist: 'MemNodeArie:XNS:Intersect:ResponseArchivist',
-        boundWitnessDiviner: 'MemNodeArie:XNS:Intersect:ResponseBoundWitnessDiviner',
-      },
-    }
-
-    const bridge = await HttpBridge.create({
-      account: 'random',
-      config: {
-        name: 'TestBridge', client: { url: nodeUrl, discoverRoots: 'start' }, schema: HttpBridgeConfigSchema, security: { allowAnonymous: true },
-      },
-    })
-
-    await bridge?.start?.()
-    await memNode.register(bridge)
-    await memNode.attach(bridge?.address, true)
-
-    const config: PubSubBridgeConfig = {
-      client: { intersect }, host: { intersect }, name: 'PubSubBridgeArie', schema: PubSubBridgeConfigSchema,
-    }
-    const psParams: PubSubBridgeParams = {
-      account: 'random', config, name: 'PubSubBridge' as CreatableName,
-    }
-    const psBridge = await PubSubBridge.create(psParams)
-    await memNode.register(psBridge)
-    await memNode.attach(psBridge?.address, true)
-
-    await psBridge.start()
-    console.log(`Exposing: ${memNode.address}`)
-    await bridge.expose(memNode.address)
-
-    const subNodeInstance = await memNode?.resolve('PubSubBridgeArie')
-    expect(subNodeInstance).toBeDefined()
-
-    const testBridgeInstance = await memNode?.resolve('PubSubBridgeArie:TestBridge')
-    expect(testBridgeInstance).toBeDefined()
-
-    const xns1 = await testBridgeInstance?.resolve('XNS')
-    expect(xns1).toBeDefined()
-
-    const xns = await memNode?.resolve('PubSubBridgeArie:TestBridge:XNS')
-    expect(xns).toBeDefined()
-
-    const intersectNode = await memNode?.resolve('PubSubBridgeArie:TestBridge:XNS:Intersect')
-    expect(intersectNode).toBeDefined()
-
-    const queryArchivist = await memNode?.resolve('XNS:Intersect:QueryArchivist')
-    expect(queryArchivist?.id).toBe('QueryArchivist')
-
-    await psBridge.unexpose(memNode.address)
-  })
-})

package/src/spec/HttpBridge.host.spec.ts

@@ -1,156 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import type { HttpBridgeConfig, HttpBridgeParams } from '@xyo-network/bridge-http'
-import { HttpBridge, HttpBridgeConfigSchema } from '@xyo-network/bridge-http'
-import type { ModuleDescriptionPayload } from '@xyo-network/module-model'
-import { ModuleDescriptionSchema } from '@xyo-network/module-model'
-import { MemoryNode } from '@xyo-network/node-memory'
-import { asAttachableNodeInstance } from '@xyo-network/node-model'
-import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
-import { getPort } from 'get-port-please'
-import {
-  beforeAll,
-  beforeEach,
-  describe, expect, it,
-} from 'vitest'
-
-import type { HttpBridgeExpressConfig, HttpBridgeExpressParams } from '../HttpBridge.ts'
-import { HttpBridgeExpress, HttpBridgeExpressConfigSchema } from '../HttpBridge.ts'
-
-const account = 'random'
-const hostSchema = HttpBridgeExpressConfigSchema
-const clientSchema = HttpBridgeConfigSchema
-const security = { allowAnonymous: true }
-
-/**
- * @group module
- * @group bridge
- */
-describe('HttpBridgeExpress', () => {
-  let port: number
-  let url: string
-  let hostBridge: HttpBridgeExpress<HttpBridgeExpressParams>
-  let clientBridge: HttpBridge<HttpBridgeParams>
-  let hostNode: MemoryNode
-  let clientNode: MemoryNode
-  let hostSibling: MemoryNode
-  let clientSibling: MemoryNode
-  let hostDescendent: MemoryNode
-  let clientDescendent: MemoryNode
-
-  beforeAll(async () => {
-    // Create Host/Client Nodes
-    hostNode = await MemoryNode.create({ account })
-    clientNode = await MemoryNode.create({ account })
-
-    // Create Host/Client Bridges
-    port = await getPort()
-    url = `http://localhost:${port}`
-
-    const host: HttpBridgeExpressConfig['host'] = { port }
-    const client: HttpBridgeConfig['client'] = { discoverRoots: 'start', url }
-    hostBridge = await HttpBridgeExpress.create({
-      account,
-      config: {
-        host, name: 'TestBridgeHost', schema: hostSchema, security,
-      },
-    })
-    clientBridge = await HttpBridge.create({
-      account,
-      config: {
-        client, name: 'TestBridgeClient', schema: clientSchema, security,
-      },
-    })
-
-    // Register Host/Client Bridges
-    await hostNode.register(hostBridge)
-    await hostNode.attach(hostBridge.address, true)
-    await clientNode.register(clientBridge)
-    await clientNode.attach(clientBridge.address, true)
-
-    // Create Host/Client Sibling Nodes
-    hostSibling = await MemoryNode.create({ account })
-    clientSibling = await MemoryNode.create({ account })
-
-    // Register Host/Client Siblings
-    await hostNode.register(hostSibling)
-    await hostNode.attach(hostSibling.address, true)
-    await clientNode.register(clientSibling)
-    await clientNode.attach(clientSibling.address, true)
-
-    // Create Host/Client Descendent Nodes
-    hostDescendent = await MemoryNode.create({ account })
-    clientDescendent = await MemoryNode.create({ account })
-
-    // Register Host/Client Siblings
-    await hostSibling.register(hostDescendent)
-    await hostSibling.attach(hostDescendent.address, true)
-    await clientSibling.register(clientDescendent)
-    await clientSibling.attach(clientDescendent.address, true)
-  })
-
-  describe('exposed module behavior', () => {
-    const cases: [string, () => MemoryNode][] = [
-      ['parent', () => hostNode],
-      ['sibling', () => hostSibling],
-      ['descendent', () => hostDescendent],
-    ]
-    describe.each(cases)('with %s module', (_, getSutModule) => {
-      let exposedMod: MemoryNode
-      beforeEach(() => {
-        exposedMod = getSutModule()
-      })
-      describe('before expose', () => {
-        it('should not be exposed', async () => {
-          expect(await hostBridge.exposed()).toBeEmpty()
-        })
-        it('should not be resolvable', async () => {
-          expect(await clientBridge.resolve(exposedMod.address)).toBeUndefined()
-        })
-      })
-      describe('after expose', () => {
-        beforeEach(async () => {
-          await hostBridge.expose(exposedMod.address)
-        })
-        it('should be exposed on host', async () => {
-          expect((await hostBridge.exposed()).includes(exposedMod.address)).toBeTrue()
-        })
-        it.skip('should be resolvable from client', async () => {
-          // TODO: Implement .connect on HttpBridgeExpress and call here before resolving
-          const result = await clientBridge.resolve(exposedMod.address)
-          expect(result).toBeDefined()
-          expect(asAttachableNodeInstance(result, () => `Failed to resolve correct object type [${result?.constructor.name}]`)).toBeDefined()
-        })
-        it.skip('should be queryable from client', async () => {
-          const bridgedHostedModule = await clientBridge.resolve(exposedMod.address)
-          expect(bridgedHostedModule).toBeDefined()
-
-          const bridgedHostedNode = asAttachableNodeInstance(
-            bridgedHostedModule,
-            () => `Failed to resolve correct object type [${bridgedHostedModule?.constructor.name}]`,
-          )
-
-          if (bridgedHostedNode) {
-            const state = await bridgedHostedNode.state()
-            const description = state.find(isPayloadOfSchemaType<ModuleDescriptionPayload>(ModuleDescriptionSchema))
-            expect(description?.children).toBeArray()
-            expect(description?.queries).toBeArray()
-            expect(description?.queries?.length).toBeGreaterThan(0)
-          }
-        })
-      })
-      describe('after unexpose', () => {
-        beforeEach(async () => {
-          await hostBridge.expose(exposedMod.address)
-          await hostBridge.unexpose(exposedMod.address)
-        })
-        it('should not be exposed', async () => {
-          expect(await hostBridge.exposed()).toBeEmpty()
-        })
-        it('should not be resolvable', async () => {
-          expect(await clientBridge.resolve(exposedMod.address)).toBeUndefined()
-        })
-      })
-    })
-  })
-})

package/src/spec/HttpBridge.legacy.spec.ts

@@ -1,55 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import { MemoryNode } from '@xyo-network/node-memory'
-import type { NodeInstance } from '@xyo-network/node-model'
-import { NodeConfigSchema } from '@xyo-network/node-model'
-import {
-  describe, expect, it,
-} from 'vitest'
-
-import { HttpBridgeExpress, HttpBridgeExpressConfigSchema } from '../HttpBridge.ts'
-
-/**
- * @group module
- * @group bridge
- */
-
-describe('HttpBridgeExpress', () => {
-  const baseUrl = `${process.env.API_DOMAIN ?? 'http://localhost:8080'}`
-
-  console.log(`HttpBridgeExpress:baseUrl ${baseUrl}`)
-  it('Discover', async () => {
-    const nodeUrl = `${baseUrl}/`
-    const memNode = await MemoryNode.create({ account: 'random', config: { name: 'MemoryNode', schema: NodeConfigSchema } })
-
-    const bridge = await HttpBridgeExpress.create({
-      account: 'random',
-      config: {
-        name: 'HttpBridgeExpress', client: { url: nodeUrl, discoverRoots: 'start' }, schema: HttpBridgeExpressConfigSchema, security: { allowAnonymous: true },
-      },
-    })
-
-    await memNode.register(bridge)
-    await memNode.attach(bridge.address, true)
-
-    const publicNode = await bridge.resolve<NodeInstance>('XYOPublic')
-    expect(publicNode).toBeDefined()
-
-    if (publicNode) {
-      console.log(`publicNode[${publicNode.address}]: ${publicNode.modName}`)
-      const publicNodeModules = await publicNode.resolve('*', { direction: 'down' })
-      expect(publicNodeModules).toBeArray()
-      expect(publicNodeModules.length).toBeGreaterThan(0)
-    }
-
-    const bridgeModules = await bridge.resolve('*', { direction: 'down' })
-    expect(bridgeModules).toBeArray()
-    expect(bridgeModules.length).toBeGreaterThan(0)
-
-    /*
-    const modules = await memNode.resolve('*')
-    expect(modules).toBeArray()
-    expect(modules.length).toBeGreaterThan(20)
-    */
-  })
-})

package/src/spec/HttpBridge.spec.ts

@@ -1,207 +0,0 @@
-/* eslint-disable complexity */
-/* eslint-disable max-statements */
-
-import '@xylabs/vitest-extended'
-
-import { assertEx, isString } from '@xylabs/sdk-js'
-import type { ApiConfig } from '@xyo-network/api-models'
-import type { AttachableArchivistInstance } from '@xyo-network/archivist-model'
-import {
-  asArchivistInstance,
-  asAttachableArchivistInstance,
-  isAttachableArchivistInstance,
-} from '@xyo-network/archivist-model'
-import type { ModuleDescriptionPayload } from '@xyo-network/module-model'
-import {
-  isModuleInstance, isQueryableModule, isQueryableModuleObject,
-  ModuleDescriptionSchema,
-} from '@xyo-network/module-model'
-import { MemoryNode } from '@xyo-network/node-memory'
-import { asAttachableNodeInstance, isNodeInstance } from '@xyo-network/node-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { Payload } from '@xyo-network/payload-model'
-import { asSchema, isPayloadOfSchemaType } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-import { HDWallet } from '@xyo-network/wallet'
-import {
-  describe, expect, it,
-} from 'vitest'
-
-import { HttpBridgeExpress, HttpBridgeExpressConfigSchema } from '../HttpBridge.ts'
-
-const archivistName = 'XYOPublic:Archivist' // TODO: This should be configurable
-const discoverRoots = 'start'
-const schema = HttpBridgeExpressConfigSchema
-const security = { allowAnonymous: true }
-
-export const getApiConfig = (): ApiConfig => {
-  return { apiDomain: process.env.ARCHIVIST_API_DOMAIN ?? 'https://beta.api.archivist.xyo.network' }
-}
-
-export const getArchivist = async (config: ApiConfig = getApiConfig()): Promise<AttachableArchivistInstance> => {
-  return assertEx(await tryGetArchivist(config), () => 'Archivist not found')
-}
-
-export const tryGetArchivist = async (config: ApiConfig = getApiConfig()): Promise<AttachableArchivistInstance | undefined> => {
-  const url = isString(config.root) ? `${config.apiDomain}/${config.root}` : config.apiDomain
-  const account = await HDWallet.random()
-  const bridge = await HttpBridgeExpress.create({
-    account,
-    config: {
-      client: { discoverRoots, url }, schema, security,
-    },
-  })
-  await bridge.start()
-  const mod = await bridge.resolve(archivistName)
-  return isAttachableArchivistInstance(mod) ? mod : undefined
-}
-
-/**
- * @group module
- * @group bridge
- */
-
-describe('HttpBridgeExpress', () => {
-  const baseUrl = `${process.env.API_DOMAIN ?? 'http://localhost:8080'}`
-
-  console.log(`HttpBridgeExpress:baseUrl ${baseUrl}`)
-  const cases = [
-    ['/', `${baseUrl}`],
-    /* ['/node', `${baseUrl}/node`], */
-  ]
-
-  it.each(cases)('HttpBridgeExpress: %s', async (_, nodeUrl) => {
-    const memNode = await MemoryNode.create({ account: 'random' })
-    const extraMemNode = await MemoryNode.create({ account: 'random' })
-
-    const bridge = await HttpBridgeExpress.create({
-      account: 'random',
-      config: {
-        name: 'TestBridge', client: { url: nodeUrl, discoverRoots: 'start' }, schema: HttpBridgeExpressConfigSchema, security: { allowAnonymous: true },
-      },
-    })
-
-    await bridge?.start?.()
-    await memNode.register(bridge)
-    await memNode.attach(bridge?.address, true)
-
-    const resolvedBridge = await memNode.resolve(bridge.id)
-    expect(resolvedBridge).toBeDefined()
-
-    const rootModule = await bridge?.resolve('XYOPublic')
-    expect(rootModule).toBeDefined()
-
-    const remoteNode = asAttachableNodeInstance(
-      rootModule,
-      () => `Failed to resolve correct object type [XYOPublic] [${rootModule?.constructor.name}]`,
-      { required: true },
-    )
-
-    const state = await remoteNode.state()
-    const description = state.find(isPayloadOfSchemaType<ModuleDescriptionPayload>(ModuleDescriptionSchema))
-    expect(description?.children).toBeArray()
-    expect(description?.children?.length).toBeGreaterThan(0)
-    expect(description?.queries).toBeArray()
-    expect(description?.queries?.length).toBeGreaterThan(0)
-
-    const archivistByName1 = await rootModule?.resolve('Archivist')
-    expect(archivistByName1).toBeDefined()
-    const archivistByName2 = await bridge.resolve('XYOPublic:Archivist')
-    expect(archivistByName2).toBeDefined()
-    const publicXyo = await bridge.resolve('XYOPublic')
-    expect(publicXyo).toBeDefined()
-    const publicXyoSelfResolve = publicXyo?.resolve('XYOPublic')
-    expect(publicXyoSelfResolve).toBeDefined()
-    if (publicXyo) {
-      const bridgedArchivist = await getArchivist()
-      expect(bridgedArchivist).toBeDefined()
-      if (bridgedArchivist) {
-        const attachablePublicXyo = asAttachableArchivistInstance(archivistByName2, 'Failed to cast publicXyo')
-        expect(attachablePublicXyo).toBeDefined()
-        await extraMemNode.register(bridgedArchivist)
-        await extraMemNode.attach(bridgedArchivist.address, true)
-        const publicXyoNodeResolveAddress = await extraMemNode?.resolve(bridgedArchivist.address)
-        expect(publicXyoNodeResolveAddress).toBeDefined()
-        const publicXyoNodeResolve = await extraMemNode?.resolve('Archivist')
-        expect(publicXyoNodeResolve).toBeDefined()
-      }
-    }
-    const archivistByName3 = await publicXyo?.resolve('Archivist')
-    expect(archivistByName3).toBeDefined()
-    expect(archivistByName3).toEqual(archivistByName1)
-    expect(archivistByName3).toEqual(archivistByName2)
-    expect(archivistByName2).toBeDefined()
-    const archivistInstance = asArchivistInstance(archivistByName2, 'Failed to cast archivist', { required: true })
-    expect(archivistInstance).toBeDefined()
-    const knownPayload = PayloadWrapper.parse({ schema: 'network.xyo.test' })?.payload as Payload
-    expect(knownPayload).toBeDefined()
-    const knownHash = await PayloadBuilder.dataHash(knownPayload as Payload)
-    const insertResult = await archivistInstance.insert([knownPayload])
-    expect(insertResult).toBeDefined()
-    const roundTripPayload = (await archivistInstance.get([knownHash]))[0]
-    expect(roundTripPayload).toBeDefined()
-  })
-  it.each(cases)('HttpBridgeExpress - Nested: %s', async (_, nodeUrl) => {
-    const memNode1 = await MemoryNode.create({ account: 'random', config: { schema: asSchema('network.xyo.node.config', true) } })
-    const memNode2 = await MemoryNode.create({ account: 'random', config: { schema: asSchema('network.xyo.node.config', true) } })
-    const memNode3 = await MemoryNode.create({ account: 'random', config: { schema: asSchema('network.xyo.node.config', true) } })
-
-    await memNode1.register(memNode2)
-    await memNode1.attach(memNode2.address, true)
-    await memNode2.register(memNode3)
-    await memNode2.attach(memNode3.address, true)
-
-    const bridge = await HttpBridgeExpress.create({
-      account: 'random',
-      config: {
-        client: { url: nodeUrl }, schema: HttpBridgeExpressConfigSchema, security: { allowAnonymous: true },
-      },
-    })
-
-    await bridge.getRoots()
-    const mod = await bridge.resolve('XYOPublic')
-
-    expect(mod).toBeDefined()
-    expect(isQueryableModule(mod)).toBeTrue()
-    expect(isQueryableModuleObject(mod)).toBeTrue()
-
-    const remoteNode = asAttachableNodeInstance(
-      mod,
-      `Failed to resolve [XYOPublic] - ${mod?.address} [${mod?.id}] [${mod?.constructor.name}]`,
-      { required: true },
-    )
-
-    expect(isNodeInstance(remoteNode)).toBeTrue()
-    expect(isModuleInstance(remoteNode)).toBeTrue()
-
-    await memNode3.register(remoteNode)
-    await memNode3.attach(remoteNode?.address, true)
-    const description = (await remoteNode.state()).find(isPayloadOfSchemaType<ModuleDescriptionPayload>(ModuleDescriptionSchema))
-    expect(description?.children).toBeArray()
-    expect(description?.children?.length).toBeGreaterThan(0)
-    expect(description?.queries).toBeArray()
-    expect(description?.queries?.length).toBeGreaterThan(0)
-
-    // Works if you supply the known address for 'Archivist'
-    // const [archivistByAddress] = await memNode.resolve({ address: ['461fd6970770e97d9f66c71658f4b96212581f0b'] })
-    // expect(archivistByAddress).toBeDefined()
-
-    /* const mods = await bridge.resolve('*')
-    for (const mod of mods) {
-      console.log(`module [${mod.address}]: ${mod.modName}`)
-    } */
-
-    const node = await bridge.resolve('XYOPublic')
-    expect(node).toBeDefined()
-
-    const archivistByName1 = await node?.resolve('Archivist')
-    expect(archivistByName1).toBeDefined()
-
-    const archivistByName2 = (await node?.resolve('Archivist'))
-    expect(archivistByName2).toBeDefined()
-    const payloadStatsDivinerByName = (await node?.resolve('PayloadStatsDiviner'))
-    expect(payloadStatsDivinerByName).toBeDefined()
-    const boundwitnessStatsDivinerByName = (await node?.resolve('BoundWitnessStatsDiviner'))
-    expect(boundwitnessStatsDivinerByName).toBeDefined()
-  })
-})

package/src/spec/HttpBridge.tests.spec.ts

@@ -1,85 +0,0 @@
-/* eslint-disable max-nested-callbacks */
-import '@xylabs/vitest-extended'
-
-import type { AbstractBridge } from '@xyo-network/bridge-abstract'
-import {
-  describe, expect, it,
-} from 'vitest'
-
-// TODO: Implement standard test suite for all Bridges here and then run
-// against specific bridges
-export const generateBridgeTests = (title: string, _bridge: AbstractBridge) => {
-  describe(title, () => {
-    describe('HttpBridge', () => {
-      describe('By name', () => {
-        it('should handle the case by name', () => {
-          // Add your test logic here
-        })
-      })
-
-      describe('By address', () => {
-        it('should handle the case by address', () => {
-          // Add your test logic here
-        })
-      })
-
-      describe('By exposed/unexposed', () => {
-        describe('Pre Exposed', () => {
-          it('should handle the case when pre exposed', () => {
-            // Add your test logic here
-          })
-        })
-
-        describe('Post Exposed', () => {
-          it('should handle the case when post exposed', () => {
-            // Add your test logic here
-          })
-        })
-
-        describe('Post Unexposed', () => {
-          it('should handle the case when post unexposed', () => {
-            // Add your test logic here
-          })
-        })
-      })
-
-      describe('By parent/sibling/child/grandchild', () => {
-        describe('ParentNode', () => {
-          it('should handle the case for ParentNode', () => {
-            // Add your test logic here
-          })
-
-          describe('Bridge', () => {
-            it('should handle the case for Bridge', () => {
-              // Add your test logic here
-            })
-          })
-
-          describe('SiblingNode', () => {
-            it('should handle the case for SiblingNode', () => {
-              // Add your test logic here
-            })
-
-            describe('ChildNode', () => {
-              it('should handle the case for ChildNode', () => {
-                // Add your test logic here
-              })
-            })
-          })
-        })
-
-        describe('GrandchildNode', () => {
-          it('should handle the case for GrandchildNode', () => {
-            // Add your test logic here
-          })
-        })
-      })
-    })
-  })
-}
-
-describe('HttpBridge', () => {
-  it('No tests', () => {
-    expect(true).toBeTruthy()
-  })
-})

package/src/spec/HttpBridge.xns.spec.ts

@@ -1,57 +0,0 @@
-import '@xylabs/vitest-extended'
-
-import { asDivinerInstance } from '@xyo-network/diviner-model'
-import { ResolveHelper } from '@xyo-network/module-model'
-import { NameRegistrarTransformer } from '@xyo-network/module-resolver'
-import { MemoryNode } from '@xyo-network/node-memory'
-import { asAttachableNodeInstance } from '@xyo-network/node-model'
-import {
-  describe, expect, it,
-} from 'vitest'
-
-import { HttpBridgeExpress, HttpBridgeExpressConfigSchema } from '../HttpBridge.ts'
-
-/**
- * @group module
- * @group bridge
- */
-
-describe('HttpBridgeExpress - Xns', () => {
-  it('HttpBridgeExpress-Xns: Simple Resolve', async () => {
-    const memNode = await MemoryNode.create({ account: 'random' })
-
-    const bridge = await HttpBridgeExpress.create({
-      account: 'random',
-      config: {
-        name: 'TestBridge',
-        client: { url: 'https://beta.xns.xyo.network', discoverRoots: 'start' },
-        schema: HttpBridgeExpressConfigSchema,
-        security: { allowAnonymous: true },
-      },
-    })
-
-    await bridge?.start?.()
-    await memNode.register(bridge)
-    await memNode.attach(bridge?.address, true)
-    const resolvedBridge = await memNode.resolve(bridge.id)
-    expect(resolvedBridge).toBeDefined()
-
-    const rootModule = await bridge?.resolve('XNS')
-    expect(rootModule).toBeDefined()
-
-    const remoteNode = asAttachableNodeInstance(
-      rootModule,
-      () => `Failed to resolve correct object type [XYO] [${rootModule?.constructor.name}]`,
-      { required: true },
-    )
-
-    const registrarDiviner = asDivinerInstance(await remoteNode.resolve('XNS:AddressRecords:AddressRecordIndexDiviner'))
-    expect(registrarDiviner).toBeDefined()
-    if (registrarDiviner) {
-      const transformer = new NameRegistrarTransformer(registrarDiviner, 'xyo')
-      ResolveHelper.transformers = [transformer]
-      const address = await transformer.transform('nippyflight.xyo')
-      expect(address).toBe('c5fa710300a8a43568678d0fe72810e34d880357')
-    }
-  })
-})