@ddd-qc/cell-proxy 0.33.2 → 0.33.4

package/dist/AppProxy.d.ts

@@ -1,4 +1,4 @@
-import { AdminWebsocket, AgentPubKey, AppClient, AppEvents, AppInfoResponse, AppSignal, SignalCb, CallZomeRequest, ClonedCell, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, InstalledAppId, Timestamp, ZomeName, DumpNetworkStatsResponse, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse } from "@holochain/client";
+import { AdminWebsocket, AgentPubKey, AppClient, AppEvents, AppInfoResponse, AppSignal, SignalCb, CallZomeRequest, ClonedCell, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, InstalledAppId, Timestamp, ZomeName, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse } from "@holochain/client";
 import { UnsubscribeFunction } from "emittery";
 import { CellProxy } from "./CellProxy";
 import { BaseRoleName, CellAddress, CellsForRole, RoleCellsMap } from "./types";
@@ -7,6 +7,7 @@ import { Cell } from "./cell";
 import { AgentId } from "./hash";
 import { ZomeSignal } from "./zomeSignals.types";
 import { Signal } from "@holochain/client/lib/api/app/types";
+import { AppDumpNetworkStatsResponse } from "@holochain/client/lib/api/admin";
 export interface SignalUnsubscriber {
     unsubscribe: () => void;
 }
@@ -45,7 +46,7 @@ export declare class AppProxy implements AppClient {
     createCloneCell(_request: CreateCloneCellRequest): Promise<ClonedCell>;
     enableCloneCell(_request: EnableCloneCellRequest): Promise<ClonedCell>;
     disableCloneCell(_request: DisableCloneCellRequest): Promise<void>;
-    dumpNetworkStats(_timeout?: number): Promise<DumpNetworkStatsResponse>;
+    dumpNetworkStats(): Promise<AppDumpNetworkStatsResponse>;
     dumpNetworkMetrics(_req: DumpNetworkMetricsRequest, _timeout?: number): Promise<DumpNetworkMetricsResponse>;
     constructor(defaultTimeout: number, appId: InstalledAppId, agentId: AgentId, adminWs?: AdminWebsocket);
     fetchCell(appId: InstalledAppId, cellAddr: CellAddress): Promise<Cell>;

package/dist/AppProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppProxy.d.ts","sourceRoot":"","sources":["../src/AppProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAAE,WAAW,EAC3B,SAAS,EACT,SAAS,EACT,eAAe,EACf,SAAS,EACT,QAAQ,EACR,eAAe,EAEf,UAAU,EACV,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,cAAc,EAEd,SAAS,EAAE,QAAQ,EAAc,wBAAwB,EAAE,yBAAyB,EAAE,0BAA0B,EACjH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EACL,YAAY,EAAE,WAAW,EACzB,YAAY,EACZ,YAAY,EACb,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAC,GAAG,EAAE,SAAS,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAC,OAAO,EAAQ,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAC,MAAM,EAAC,MAAM,qCAAqC,CAAC;AAI3D,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB;AAGD,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,SAAS,CAAC;IACd,QAAQ,EAAE,WAAW,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;CACxB;AASD,qBAAa,QAAS,YAAW,SAAS;IAIjC,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,cAAc,GAAG,SAAS,CAAa;IAGvD,OAAO,CAAC,WAAW,CAAmB;IAEtC,OAAO,CAAC,WAAW,CAAkC;IAErD,OAAO,CAAC,OAAO,CAA2B;IAE1C,OAAO,CAAC,eAAe,CAAgC;IAEvD,OAAO,CAAC,YAAY,CAA+B;IAInD,OAAO,CAAC,UAAU,CAA2B;IAK7C,IAAI,YAAY,IAAI,cAAc,GAAG,SAAS,CAAqB;IAGnE,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS;IAK5D,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAGzC,IAAI,UAAU,IAAI,SAAS,EAAE,CAA6B;IAE1D,SAAS;IAGT,YAAY,CAAC,GAAG,EAAE,WAAW,GAAG,GAAG,EAAE,GAAG,SAAS;IAKjD,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAiBvB,YAAY,CAAC,WAAW,EAAE,GAAG,GAAG,WAAW,GAAG,SAAS;IAevD,WAAW,CAAC,cAAc,EAAE,cAAc,GAAG,YAAY,EAAE,GAAG,SAAS;IAYvE,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,GAAG,UAAU,EAAE;IAW1E,QAAQ,EAAE,WAAW,CAAC;IACtB,cAAc,EAAE,cAAc,CAAC;IAEzB,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1E,EAAE,CAAC,IAAI,SAAS,MAAM,SAAS,EAC7B,UAAU,EAAE,IAAI,GAAG,SAAS,IAAI,EAAE,EAClC,SAAS,EAAE,QAAQ,GAClB,mBAAmB;IAIhB,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAInC,eAAe,CAAC,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAItE,eAAe,CAAC,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAItE,gBAAgB,CAAC,QAAQ,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAItE,kBAAkB,CACtB,IAAI,EAAE,yBAAyB,EAC/B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,0BAA0B,CAAC;gBASZ,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc;IAY7G,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBtE,UAAU,CAAC,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IA0C1F,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI;IAsB/C,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS;IA6BxD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IA2B9B,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,SAAS,GAAG,kBAAkB;IAyBxE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAuBzC,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS;IAa5D,cAAc,CAAC,aAAa,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,QAAQ;CAgHnF"}
+{"version":3,"file":"AppProxy.d.ts","sourceRoot":"","sources":["../src/AppProxy.ts"],"names":[],"mappings":"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"}

package/dist/AppProxy.js

@@ -82,7 +82,7 @@ export class AppProxy {
     async disableCloneCell(_request) {
         throw new Error("Method not implemented.");
     }
-    async dumpNetworkStats(_timeout) {
+    async dumpNetworkStats() {
         throw new Error("Method not implemented.");
     }
     async dumpNetworkMetrics(_req, _timeout) {

package/dist/AppProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppProxy.js","sourceRoot":"","sources":["../src/AppProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AdminWebsocket, AgentPubKey,\n  AppClient,\n  AppEvents,\n  AppInfoResponse,\n  AppSignal,\n  SignalCb,\n  CallZomeRequest,\n  CellType,\n  ClonedCell,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  InstalledAppId,\n  ProvisionedCell,\n  Timestamp, ZomeName, SignalType, DumpNetworkStatsResponse, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse,\n} from \"@holochain/client\";\nimport {UnsubscribeFunction} from \"emittery\";\nimport {CellProxy} from \"./CellProxy\";\nimport {\n  BaseRoleName, CellAddress,\n  CellsForRole,\n  RoleCellsMap, AppSignalType, SystemPulse,\n} from \"./types\";\nimport {MyDictionary} from \"./utils\";\nimport {HCL, HCLString} from \"./hcl\";\nimport {Cell} from \"./cell\";\nimport {prettyDate, printAppInfo} from \"./pretty\";\nimport {AgentId, enc64} from \"./hash\";\nimport {ZomeSignal} from \"./zomeSignals.types\";\nimport {Signal} from \"@holochain/client/lib/api/app/types\";\n\n\n/** */\nexport interface SignalUnsubscriber {\n  unsubscribe: () => void;\n}\n\n\nexport interface SignalLog {\n  ts: Timestamp,\n  cellAddr: CellAddress,\n  zomeName: string,\n  type: string,\n  pulseCount: number,\n  zomeSignal: ZomeSignal,\n}\n\n/**\n * Creates and holds Cell proxies.\n * Maintains a mapping between CellIds and HCLs\n * Handles SignalHandlers per HCL\n * Stores appSignal logs\n * TODO Implement Singleton per App port?\n */\nexport class AppProxy implements AppClient {\n\n  /** -- Fields -- */\n\n  public defaultTimeout: number;\n  public adminWs: AdminWebsocket | undefined = undefined;\n\n  /** Signal logs */\n  private _signalLogs: SignalLog[] = [];\n  /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */\n  private _cellsByApp: MyDictionary<RoleCellsMap> = {};\n  /** Map cell locations: CellIdStr -> HCL[] */\n  private _hclMap: MyDictionary<HCL[]> = {};\n  /** Store handlers per cell location: HCLString -> SignalCb[] */\n  private _signalHandlers: MyDictionary<SignalCb[]> = {};\n  /** Store cell proxies per cell: CellIdStr -> CellProxy */\n  private _cellProxies: MyDictionary<CellProxy> = {};\n\n\n  /** Map HCLString: CloneId -> CloneName */\n  private _cellNames: MyDictionary<string> = {} // Provisioned cell's name is its baseRoleName so no need to map them\n\n  /** -- Getters -- */\n\n  /** Check this after connecting since AppWebsocket can shamelessly override the provided args. */\n  get appIdOfShame(): InstalledAppId | undefined { return undefined }\n\n  /** */\n  getAppCells(appId: InstalledAppId): RoleCellsMap | undefined {\n    return this._cellsByApp[appId];\n  }\n\n  /** */\n  getCellName(hcl: HCL): string | undefined {return this._cellNames[hcl.toString()]}\n\n\n  get signalLogs(): SignalLog[]  { return this._signalLogs }\n\n  purgeLogs() {this._signalLogs = [] }\n\n  /** */\n  getLocations(adr: CellAddress): HCL[] | undefined {\n    return this._hclMap[adr.str];\n  }\n\n  /** */\n  getCell(hcl: HCL): Cell {\n    const roleCellsMap = this._cellsByApp[hcl.appId];\n    if (!roleCellsMap) throw Error(`getCell() failed. No hApp with ID \"${hcl.appId}\" found.`);\n    const roleCells = roleCellsMap[hcl.baseRoleName];\n    if (!roleCells) throw Error(`getCell() failed: BaseRoleName \"${hcl.baseRoleName}\" not found in happ \"${hcl.appId}\"`);\n    let cell: ProvisionedCell | ClonedCell | undefined = roleCells.provisioned;\n    if (hcl.cloneId !== undefined) {\n      cell = roleCells.clones[hcl.cloneId];\n      if (!cell) {\n        throw Error(`getCell() failed: clone \"${hcl.cloneId}\" not found for role \"${hcl.toString()}\"`);\n      }\n    }\n    return new Cell(cell, hcl.appId, hcl.baseRoleName);\n  }\n\n\n  /** Get stored CellProxy or attempt to create it */\n  getCellProxy(cellIdOrLoc: HCL | CellAddress): CellProxy {\n    if (cellIdOrLoc instanceof HCL) {\n      const cell = this.getCell(cellIdOrLoc);\n      const maybeProxy = this.getCellProxy(cell.address);\n      if (!maybeProxy) throw Error(\"getCellProxy() failed. Proxy not found for cell \" + cell.address.str);\n      return maybeProxy;\n    }\n    const sId = cellIdOrLoc.str;\n    const maybeProxy = this._cellProxies[sId];\n    if (maybeProxy === undefined) throw Error(\"getCellProxy() failed. Proxy not found for cell \" + sId);\n    return maybeProxy;\n  }\n\n\n  /** */\n  getAppRoles(installedAppId: InstalledAppId): BaseRoleName[] | undefined {\n    const cellMap = this._cellsByApp[installedAppId];\n    if (!cellMap) {\n      return undefined;\n    }\n    return Object.values(cellMap).map((roleCells) => {\n      return roleCells.provisioned.name;\n    });\n  }\n\n\n  /** */\n  getClones(appId: InstalledAppId, baseRoleName: BaseRoleName): ClonedCell[] {\n    const maybeApp = this._cellsByApp[appId]\n    if (!maybeApp) return [];\n    const roleInstalledCells = maybeApp[baseRoleName];\n    if (!roleInstalledCells) return [];\n    return Object.values(roleInstalledCells.clones);\n  }\n\n\n  /** -- AppClient -- */\n\n  myPubKey: AgentPubKey;\n  installedAppId: InstalledAppId;\n\n  async callZome(_req: CallZomeRequest, _timeout?: number): Promise<unknown> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  on<Name extends keyof AppEvents>(\n    _eventName: Name | readonly Name[],\n    _listener: SignalCb\n  ): UnsubscribeFunction {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async appInfo(): Promise<AppInfoResponse> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async createCloneCell(_request: CreateCloneCellRequest): Promise<ClonedCell> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async enableCloneCell(_request: EnableCloneCellRequest): Promise<ClonedCell> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async disableCloneCell(_request: DisableCloneCellRequest): Promise<void> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async dumpNetworkStats(_timeout?: number): Promise<DumpNetworkStatsResponse> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async dumpNetworkMetrics(\n    _req: DumpNetworkMetricsRequest,\n    _timeout?: number\n  ): Promise<DumpNetworkMetricsResponse> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n\n\n  /** -- Creation -- */\n\n  /** Ctor */\n  /*protected*/ constructor(defaultTimeout: number, appId: InstalledAppId, agentId: AgentId, adminWs?: AdminWebsocket) {\n    this.defaultTimeout = defaultTimeout;\n    this.adminWs = adminWs;\n    this.installedAppId = appId;\n    this.myPubKey = agentId.hash;\n    /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));\n  }\n\n\n  /** -- Methods -- */\n\n  /** */\n  async fetchCell(appId: InstalledAppId, cellAddr: CellAddress): Promise<Cell> {\n    const appInfo = await this.appInfo();\n    //console.log(\"fetchCell\", appInfo);\n    if (appInfo == null) {\n      return Promise.reject(`getCell() failed. App \"${appId}\" not found\"`);\n    }\n    for (const cellInfos of Object.values(appInfo.cell_info)) {\n      for (const [baseRoleName, cellInfo] of Object.entries(cellInfos)) {\n        let cell: Cell;\n        try {\n          cell = Cell.from(cellInfo, appId, baseRoleName);\n        } catch(e) {\n          // skip stem cell\n          continue;\n        }\n        if (cell.address.equals(cellAddr)) {\n          return cell;\n        }\n      }\n    }\n    return Promise.reject(\"getCell() failed. Cell not found for app.\");\n  }\n\n\n  /** Get all cells for a BaseRole in an app */\n  async fetchCells(appId: InstalledAppId, baseRoleName: BaseRoleName): Promise<CellsForRole> {\n    /** Make sure hApp exists */\n    const appInfo = await this.appInfo();\n    if (appInfo == null) {\n      return Promise.reject(`fetchCells() failed. App \"${appId}\" not found`);\n    }\n    console.log(\"fetchCells() installedAppInfo:\\n\", printAppInfo(appInfo));\n\n    /** Make sure app Object exists */\n    if (!this._cellsByApp[appId]) {\n      this._cellsByApp[appId] = {};\n    }\n    /** Get all cells with that baseRoleName */\n    let provisioned: ProvisionedCell | undefined;\n    let clones: MyDictionary<ClonedCell> = {};\n    for (const [curBaseRoleName, cellInfos] of Object.entries(appInfo.cell_info)) {\n      for (const cellInfo of Object.values(cellInfos)) {\n        if (baseRoleName !== curBaseRoleName || CellType.Stem == cellInfo.type) {\n          continue;\n        }\n        if (CellType.Cloned == cellInfo.type) {\n          const cloned = cellInfo.value as ClonedCell;\n          if (clones[cloned.clone_id]) {\n            console.error(`fetchCells() Entry already exist for clone: \"${cloned.clone_id}\"`)\n          }\n          clones[cloned.clone_id] = cloned;\n        } else {\n          provisioned = cellInfo.value as ProvisionedCell;\n        }\n      }\n    }\n    if (typeof provisioned === 'undefined') {\n      return Promise.reject(\"Provisioned cell not found for role \" + baseRoleName);\n    }\n    let roleInstalledCells: CellsForRole = {provisioned: provisioned!, clones}\n    /** Store it*/\n    this._cellsByApp[appId]![baseRoleName] = roleInstalledCells;\n    return roleInstalledCells;\n  }\n\n\n  /** */\n  addClone(hcl: HCL, cloneCell: ClonedCell): void {\n    if (!this._cellsByApp[hcl.appId]) throw Error(\"addClone() failed. no appId. \" + hcl.toString());\n    if (!this._cellsByApp[hcl.appId]![hcl.baseRoleName]) throw Error(\"addClone() failed. no baseRoleName. \" + hcl.toString());\n    if (hcl.cloneId === undefined) throw Error(\"addClone() failed. Cell is not a CloneCell: \" + hcl.toString());\n\n    // let cloneName = hcl.cloneId;\n    // if (hcl.cloneId === undefined) {\n    //   const cloneIndex: number = Object.keys(this._cellsByApp[hcl.appId][hcl.baseRoleName].clones).length;\n    //   cloneName = createCloneName(hcl.baseRoleName, cloneIndex);\n    // }\n    this._cellsByApp[hcl.appId]![hcl.baseRoleName]!.clones[cloneCell.clone_id] = cloneCell;\n    // const sCellId = CellIdStr(cloneCell.cell_id);\n    // console.log(\"CreateCellProxy() adding to hclMap\", sCellId, cellLoc.asHcl())\n    // if (this._hclMap[sCellId]) {\n    //   this._hclMap[sCellId].push(cellLoc.asHcl());\n    // } else {\n    //   this._hclMap[sCellId] = [cellLoc.asHcl()];\n    // }\n  }\n\n\n  /** */\n  createCellProxy(hcl: HCL, cloneName?: string): CellProxy {\n    console.log(\"createCellProxy() for\", hcl.toString(), cloneName);\n    /** Make sure cell exists */\n    const cell = this.getCell(hcl);\n    const sCellId = cell.address.str;\n    /** Create proxy for this cell if none exist yet, otherwise reuse */\n    let cellProxy = this._cellProxies[sCellId];\n    if (!cellProxy) {\n      /** Create and store Proxy */\n      cellProxy = new CellProxy(this, cell, this.defaultTimeout);\n      this._cellProxies[sCellId] = cellProxy;\n    }\n    /** Create CellAddress -> HCL mapping */\n    //console.log(\"CreateCellProxy() adding to hclMap\", sCellId, hcl.toString())\n    if (this._hclMap[sCellId]) {\n      this._hclMap[sCellId]!.push(hcl);\n    } else {\n      this._hclMap[sCellId] = [hcl];\n    }\n    //console.log(\"createCellProxy() Currently stored hclMap:\", this._hclMap);\n    /** Associate cloneName if any */\n    const name = cloneName?  cloneName : hcl.baseRoleName;\n    this._cellNames[hcl.toString()] = name;\n    /** Done */\n    return cellProxy;\n  }\n\n\n  /** */\n  onSignal(signal: Signal): void {\n    if (SignalType.App != signal.type) {\n      return;\n    }\n    const appSignal: AppSignal = signal.value;\n    /** Grab cell specific handlers */\n    const hcls = this.getLocations(CellAddress.from(appSignal.cell_id));\n    if (!hcls) {\n      return;\n    }\n    const handlerss: (SignalCb[] | undefined)[]  = hcls\n      .map((hcl) => this._signalHandlers[hcl.toString()])\n      .filter((arr) => arr != undefined);\n    //console.log(\"onSignal()\", hcls? hcls.toString() : \"unknown cell: \" + encodeHashToBase64(signal.cell_id[0]), handlerss);\n    /** Grab common handler  */\n    const allHandlers = this._signalHandlers[\"__all\"];\n    if (allHandlers) handlerss.push(allHandlers);\n    /** Send to all handlers */\n    for (const handlers of handlerss) {\n      for (const handler of handlers!) {\n        handler(signal);\n      }\n    }\n  }\n\n\n  /** Store signalHandler to internal handler array */\n  addSignalHandler(handler: SignalCb, hcl?: HCLString): SignalUnsubscriber {\n    //console.log(\"addSignalHandler()\", hcl);\n\n    hcl = hcl? hcl: \"__all\";\n    //console.log(\"addSignalHandler()\", hcl, Object.keys(this._signalHandlers));\n    if (!this._signalHandlers[hcl]) {\n      this._signalHandlers[hcl] = [handler];\n    } else {\n      this._signalHandlers[hcl]!.push(handler);\n    }\n    /* return tailored unsubscribe function to the caller */\n    return {\n      unsubscribe: () => {\n      // FIXME\n      //   const maybeHandler = this._signalHandlers[hcl!]\n      //   if (!maybeHandler) {\n      //     console.warn(\"unsubscribe failed: Couldn't find signalHandler for\", hcl)\n      //     return;\n      //   }\n      //   delete this._signalHandlers[hcl!];\n      }\n    };\n  }\n\n  /** Log all signals received */\n  protected logSignal(signal: Signal): void {\n    if (SignalType.App != signal.type) {\n      return;\n    }\n    const appSignal: AppSignal = signal.value;\n    const zomeSignal = this.intoZomeSignal(appSignal);\n    if (!zomeSignal) {\n      return;\n    }\n    const log: SignalLog = {ts: Date.now(), cellAddr: CellAddress.from(appSignal.cell_id), zomeName: appSignal.zome_name, zomeSignal, type: AppSignalType.Unknown, pulseCount: 1};\n    if (zomeSignal) {\n      log.pulseCount = zomeSignal.pulses.length;\n      if (zomeSignal.pulses.length == 0) {\n        log.type = AppSignalType.Empty;\n      } else {\n        log.type = AppSignalType.Zome;\n      }\n    }\n    this._signalLogs.push(log);\n  }\n\n\n  /** */\n  intoZomeSignal(appSignal: AppSignal): ZomeSignal | undefined {\n    if (typeof appSignal.payload !== 'object' || Array.isArray(appSignal.payload) || appSignal.payload === null) {\n      return;\n    }\n    const payload = appSignal.payload as Object;\n    if (\"pulses\" in payload && \"from\" in payload) {\n      return appSignal.payload as ZomeSignal;\n    }\n    return;\n  }\n\n\n  /** */\n  dumpSignalLogs(canAppSignals: boolean, cellAddr?: CellAddress, zomeName?: ZomeName) {\n    const me = enc64(this.myPubKey);\n    let logs = this._signalLogs;\n    /** Filter by cell and zome */\n    let cellNames;\n    if (cellAddr) {\n      const hcls = this._hclMap[cellAddr.str];\n      cellNames = hcls!.map((hcl) => this.getCellName(hcl));\n      logs = this._signalLogs\n        .filter((log) => log.cellAddr.equals(cellAddr));\n      if (zomeName) {\n        logs = this._signalLogs\n          .filter((log) => log.zomeName == zomeName);\n      }\n    }\n    /** Seperate by type */\n    const unknownSignals = logs.filter((log) => log.type == AppSignalType.Unknown);\n    const zomeSignals = logs.filter((log) => log.type == AppSignalType.Zome);\n    const appSignals = zomeSignals.filter((log) => {\n      const type = Object.keys(log.zomeSignal.pulses[0]!)[0];\n      type != \"System\"\n    });\n    const sysSignals = zomeSignals.filter((log) => {\n      const type = Object.keys(log.zomeSignal.pulses[0]!)[0];\n      type == \"System\"\n    });\n\n    /** Dump unknown signals */\n    if (unknownSignals.length) {\n      let logs;\n      if (zomeName) {\n        console.error(`Unknown signals from zome \"${zomeName}\": ${unknownSignals.length}`);\n        logs = unknownSignals\n          .map((log) => {\n            return {timestamp: prettyDate(new Date(log.ts)), payload: log.zomeSignal}\n          });\n      } else {\n        console.error(`Unknown signals: ${unknownSignals.length}`);\n        logs = unknownSignals\n          .map((log) => {\n            return {timestamp: prettyDate(new Date(log.ts)), zome: log.zomeName, payload: log.zomeSignal}\n          });\n      }\n      console.table(logs);\n    }\n\n    /** Dump System signals */\n    let syslogs: any[] = [];\n    if (cellNames) {\n      if (zomeName) {\n        console.warn(`Unknown signals from zome \"${zomeName}\" in cell \"${cellNames}\"`);\n        sysSignals.map((log) => {\n            for (const pulse of log.zomeSignal.pulses) {\n              const payload = (pulse as SystemPulse).System;\n              syslogs.push({timestamp: prettyDate(new Date(log.ts)), payload});\n            }\n          });\n      } else {\n        console.warn(`System signals from cell \"${cellNames}\"`);\n        sysSignals.map((log) => {\n          for (const pulse of log.zomeSignal.pulses) {\n            const payload = (pulse as SystemPulse).System;\n            syslogs.push({timestamp: prettyDate(new Date(log.ts)), zome: log.zomeName, payload});\n          }\n        });\n      }\n    } else {\n      console.warn(`System signals: ${sysSignals.length}`)\n      sysSignals.map((log) => {\n          const app = this._hclMap[log.cellAddr.str]![0]!.appId;\n          const cell: string = this._hclMap[log.cellAddr.str]![0]!.roleName;\n        for (const pulse of log.zomeSignal.pulses) {\n          const payload = (pulse as SystemPulse).System;\n          syslogs.push({timestamp: prettyDate(new Date(log.ts)), app, cell, zome: log.zomeName, payload});\n        }\n      });\n    }\n    console.table(syslogs);\n\n    /** Dump App signals */\n    if (!canAppSignals) {\n      return;\n    }\n    let appLogs;\n    if (cellNames) {\n      if (zomeName) {\n        console.warn(`App signals from zome \"${zomeName}\" in cell \"${cellNames}\"`);\n        appLogs = appSignals.map((log) => {\n          const pulses = log.zomeSignal.pulses;\n          const from = enc64(log.zomeSignal.from) == me ? \"self\" : enc64(log.zomeSignal.from);\n          return {timestamp: prettyDate(new Date(log.ts)), from, count: pulses.length, payload: pulses}\n        });\n      } else {\n        console.warn(`App signals from cell \"${cellNames}\"`);\n        appLogs = appSignals.map((log) => {\n          const pulses = log.zomeSignal.pulses;\n          const from = enc64(log.zomeSignal.from) == me ? \"self\" : enc64(log.zomeSignal.from);\n          return {timestamp: prettyDate(new Date(log.ts)), zome: log.zomeName, from, count: pulses.length, payload: pulses}\n        });\n      }\n    } else {\n      console.warn(`App signals: ${appSignals.length}`)\n      appLogs = appSignals.map((log) => {\n          const app = this._hclMap[log.cellAddr.str]![0]!.appId;\n          const cell: string = this._hclMap[log.cellAddr.str]![0]!.roleName;\n          const pulses = log.zomeSignal.pulses;\n          const from = enc64(log.zomeSignal.from) == me? \"self\" : enc64(log.zomeSignal.from);\n          return { timestamp: prettyDate(new Date(log.ts)), app, cell, zome: log.zomeName, from, count: pulses.length, payload: pulses};\n        });\n    }\n    console.table(appLogs);\n  }\n}\n\n"]}
+{"version":3,"file":"AppProxy.js","sourceRoot":"","sources":["../src/AppProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AdminWebsocket, AgentPubKey,\n  AppClient,\n  AppEvents,\n  AppInfoResponse,\n  AppSignal,\n  SignalCb,\n  CallZomeRequest,\n  CellType,\n  ClonedCell,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  InstalledAppId,\n  ProvisionedCell,\n  Timestamp, ZomeName, SignalType, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse,\n} from \"@holochain/client\";\nimport {UnsubscribeFunction} from \"emittery\";\nimport {CellProxy} from \"./CellProxy\";\nimport {\n  BaseRoleName, CellAddress,\n  CellsForRole,\n  RoleCellsMap, AppSignalType, SystemPulse,\n} from \"./types\";\nimport {MyDictionary} from \"./utils\";\nimport {HCL, HCLString} from \"./hcl\";\nimport {Cell} from \"./cell\";\nimport {prettyDate, printAppInfo} from \"./pretty\";\nimport {AgentId, enc64} from \"./hash\";\nimport {ZomeSignal} from \"./zomeSignals.types\";\nimport {Signal} from \"@holochain/client/lib/api/app/types\";\nimport {AppDumpNetworkStatsResponse} from \"@holochain/client/lib/api/admin\";\n\n\n/** */\nexport interface SignalUnsubscriber {\n  unsubscribe: () => void;\n}\n\n\nexport interface SignalLog {\n  ts: Timestamp,\n  cellAddr: CellAddress,\n  zomeName: string,\n  type: string,\n  pulseCount: number,\n  zomeSignal: ZomeSignal,\n}\n\n/**\n * Creates and holds Cell proxies.\n * Maintains a mapping between CellIds and HCLs\n * Handles SignalHandlers per HCL\n * Stores appSignal logs\n * TODO Implement Singleton per App port?\n */\nexport class AppProxy implements AppClient {\n\n  /** -- Fields -- */\n\n  public defaultTimeout: number;\n  public adminWs: AdminWebsocket | undefined = undefined;\n\n  /** Signal logs */\n  private _signalLogs: SignalLog[] = [];\n  /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */\n  private _cellsByApp: MyDictionary<RoleCellsMap> = {};\n  /** Map cell locations: CellIdStr -> HCL[] */\n  private _hclMap: MyDictionary<HCL[]> = {};\n  /** Store handlers per cell location: HCLString -> SignalCb[] */\n  private _signalHandlers: MyDictionary<SignalCb[]> = {};\n  /** Store cell proxies per cell: CellIdStr -> CellProxy */\n  private _cellProxies: MyDictionary<CellProxy> = {};\n\n\n  /** Map HCLString: CloneId -> CloneName */\n  private _cellNames: MyDictionary<string> = {} // Provisioned cell's name is its baseRoleName so no need to map them\n\n  /** -- Getters -- */\n\n  /** Check this after connecting since AppWebsocket can shamelessly override the provided args. */\n  get appIdOfShame(): InstalledAppId | undefined { return undefined }\n\n  /** */\n  getAppCells(appId: InstalledAppId): RoleCellsMap | undefined {\n    return this._cellsByApp[appId];\n  }\n\n  /** */\n  getCellName(hcl: HCL): string | undefined {return this._cellNames[hcl.toString()]}\n\n\n  get signalLogs(): SignalLog[]  { return this._signalLogs }\n\n  purgeLogs() {this._signalLogs = [] }\n\n  /** */\n  getLocations(adr: CellAddress): HCL[] | undefined {\n    return this._hclMap[adr.str];\n  }\n\n  /** */\n  getCell(hcl: HCL): Cell {\n    const roleCellsMap = this._cellsByApp[hcl.appId];\n    if (!roleCellsMap) throw Error(`getCell() failed. No hApp with ID \"${hcl.appId}\" found.`);\n    const roleCells = roleCellsMap[hcl.baseRoleName];\n    if (!roleCells) throw Error(`getCell() failed: BaseRoleName \"${hcl.baseRoleName}\" not found in happ \"${hcl.appId}\"`);\n    let cell: ProvisionedCell | ClonedCell | undefined = roleCells.provisioned;\n    if (hcl.cloneId !== undefined) {\n      cell = roleCells.clones[hcl.cloneId];\n      if (!cell) {\n        throw Error(`getCell() failed: clone \"${hcl.cloneId}\" not found for role \"${hcl.toString()}\"`);\n      }\n    }\n    return new Cell(cell, hcl.appId, hcl.baseRoleName);\n  }\n\n\n  /** Get stored CellProxy or attempt to create it */\n  getCellProxy(cellIdOrLoc: HCL | CellAddress): CellProxy {\n    if (cellIdOrLoc instanceof HCL) {\n      const cell = this.getCell(cellIdOrLoc);\n      const maybeProxy = this.getCellProxy(cell.address);\n      if (!maybeProxy) throw Error(\"getCellProxy() failed. Proxy not found for cell \" + cell.address.str);\n      return maybeProxy;\n    }\n    const sId = cellIdOrLoc.str;\n    const maybeProxy = this._cellProxies[sId];\n    if (maybeProxy === undefined) throw Error(\"getCellProxy() failed. Proxy not found for cell \" + sId);\n    return maybeProxy;\n  }\n\n\n  /** */\n  getAppRoles(installedAppId: InstalledAppId): BaseRoleName[] | undefined {\n    const cellMap = this._cellsByApp[installedAppId];\n    if (!cellMap) {\n      return undefined;\n    }\n    return Object.values(cellMap).map((roleCells) => {\n      return roleCells.provisioned.name;\n    });\n  }\n\n\n  /** */\n  getClones(appId: InstalledAppId, baseRoleName: BaseRoleName): ClonedCell[] {\n    const maybeApp = this._cellsByApp[appId]\n    if (!maybeApp) return [];\n    const roleInstalledCells = maybeApp[baseRoleName];\n    if (!roleInstalledCells) return [];\n    return Object.values(roleInstalledCells.clones);\n  }\n\n\n  /** -- AppClient -- */\n\n  myPubKey: AgentPubKey;\n  installedAppId: InstalledAppId;\n\n  async callZome(_req: CallZomeRequest, _timeout?: number): Promise<unknown> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  on<Name extends keyof AppEvents>(\n    _eventName: Name | readonly Name[],\n    _listener: SignalCb\n  ): UnsubscribeFunction {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async appInfo(): Promise<AppInfoResponse> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async createCloneCell(_request: CreateCloneCellRequest): Promise<ClonedCell> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async enableCloneCell(_request: EnableCloneCellRequest): Promise<ClonedCell> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async disableCloneCell(_request: DisableCloneCellRequest): Promise<void> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async dumpNetworkStats(): Promise<AppDumpNetworkStatsResponse> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async dumpNetworkMetrics(\n    _req: DumpNetworkMetricsRequest,\n    _timeout?: number\n  ): Promise<DumpNetworkMetricsResponse> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n\n\n  /** -- Creation -- */\n\n  /** Ctor */\n  /*protected*/ constructor(defaultTimeout: number, appId: InstalledAppId, agentId: AgentId, adminWs?: AdminWebsocket) {\n    this.defaultTimeout = defaultTimeout;\n    this.adminWs = adminWs;\n    this.installedAppId = appId;\n    this.myPubKey = agentId.hash;\n    /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));\n  }\n\n\n  /** -- Methods -- */\n\n  /** */\n  async fetchCell(appId: InstalledAppId, cellAddr: CellAddress): Promise<Cell> {\n    const appInfo = await this.appInfo();\n    //console.log(\"fetchCell\", appInfo);\n    if (appInfo == null) {\n      return Promise.reject(`getCell() failed. App \"${appId}\" not found\"`);\n    }\n    for (const cellInfos of Object.values(appInfo.cell_info)) {\n      for (const [baseRoleName, cellInfo] of Object.entries(cellInfos)) {\n        let cell: Cell;\n        try {\n          cell = Cell.from(cellInfo, appId, baseRoleName);\n        } catch(e) {\n          // skip stem cell\n          continue;\n        }\n        if (cell.address.equals(cellAddr)) {\n          return cell;\n        }\n      }\n    }\n    return Promise.reject(\"getCell() failed. Cell not found for app.\");\n  }\n\n\n  /** Get all cells for a BaseRole in an app */\n  async fetchCells(appId: InstalledAppId, baseRoleName: BaseRoleName): Promise<CellsForRole> {\n    /** Make sure hApp exists */\n    const appInfo = await this.appInfo();\n    if (appInfo == null) {\n      return Promise.reject(`fetchCells() failed. App \"${appId}\" not found`);\n    }\n    console.log(\"fetchCells() installedAppInfo:\\n\", printAppInfo(appInfo));\n\n    /** Make sure app Object exists */\n    if (!this._cellsByApp[appId]) {\n      this._cellsByApp[appId] = {};\n    }\n    /** Get all cells with that baseRoleName */\n    let provisioned: ProvisionedCell | undefined;\n    let clones: MyDictionary<ClonedCell> = {};\n    for (const [curBaseRoleName, cellInfos] of Object.entries(appInfo.cell_info)) {\n      for (const cellInfo of Object.values(cellInfos)) {\n        if (baseRoleName !== curBaseRoleName || CellType.Stem == cellInfo.type) {\n          continue;\n        }\n        if (CellType.Cloned == cellInfo.type) {\n          const cloned = cellInfo.value as ClonedCell;\n          if (clones[cloned.clone_id]) {\n            console.error(`fetchCells() Entry already exist for clone: \"${cloned.clone_id}\"`)\n          }\n          clones[cloned.clone_id] = cloned;\n        } else {\n          provisioned = cellInfo.value as ProvisionedCell;\n        }\n      }\n    }\n    if (typeof provisioned === 'undefined') {\n      return Promise.reject(\"Provisioned cell not found for role \" + baseRoleName);\n    }\n    let roleInstalledCells: CellsForRole = {provisioned: provisioned!, clones}\n    /** Store it*/\n    this._cellsByApp[appId]![baseRoleName] = roleInstalledCells;\n    return roleInstalledCells;\n  }\n\n\n  /** */\n  addClone(hcl: HCL, cloneCell: ClonedCell): void {\n    if (!this._cellsByApp[hcl.appId]) throw Error(\"addClone() failed. no appId. \" + hcl.toString());\n    if (!this._cellsByApp[hcl.appId]![hcl.baseRoleName]) throw Error(\"addClone() failed. no baseRoleName. \" + hcl.toString());\n    if (hcl.cloneId === undefined) throw Error(\"addClone() failed. Cell is not a CloneCell: \" + hcl.toString());\n\n    // let cloneName = hcl.cloneId;\n    // if (hcl.cloneId === undefined) {\n    //   const cloneIndex: number = Object.keys(this._cellsByApp[hcl.appId][hcl.baseRoleName].clones).length;\n    //   cloneName = createCloneName(hcl.baseRoleName, cloneIndex);\n    // }\n    this._cellsByApp[hcl.appId]![hcl.baseRoleName]!.clones[cloneCell.clone_id] = cloneCell;\n    // const sCellId = CellIdStr(cloneCell.cell_id);\n    // console.log(\"CreateCellProxy() adding to hclMap\", sCellId, cellLoc.asHcl())\n    // if (this._hclMap[sCellId]) {\n    //   this._hclMap[sCellId].push(cellLoc.asHcl());\n    // } else {\n    //   this._hclMap[sCellId] = [cellLoc.asHcl()];\n    // }\n  }\n\n\n  /** */\n  createCellProxy(hcl: HCL, cloneName?: string): CellProxy {\n    console.log(\"createCellProxy() for\", hcl.toString(), cloneName);\n    /** Make sure cell exists */\n    const cell = this.getCell(hcl);\n    const sCellId = cell.address.str;\n    /** Create proxy for this cell if none exist yet, otherwise reuse */\n    let cellProxy = this._cellProxies[sCellId];\n    if (!cellProxy) {\n      /** Create and store Proxy */\n      cellProxy = new CellProxy(this, cell, this.defaultTimeout);\n      this._cellProxies[sCellId] = cellProxy;\n    }\n    /** Create CellAddress -> HCL mapping */\n    //console.log(\"CreateCellProxy() adding to hclMap\", sCellId, hcl.toString())\n    if (this._hclMap[sCellId]) {\n      this._hclMap[sCellId]!.push(hcl);\n    } else {\n      this._hclMap[sCellId] = [hcl];\n    }\n    //console.log(\"createCellProxy() Currently stored hclMap:\", this._hclMap);\n    /** Associate cloneName if any */\n    const name = cloneName?  cloneName : hcl.baseRoleName;\n    this._cellNames[hcl.toString()] = name;\n    /** Done */\n    return cellProxy;\n  }\n\n\n  /** */\n  onSignal(signal: Signal): void {\n    if (SignalType.App != signal.type) {\n      return;\n    }\n    const appSignal: AppSignal = signal.value;\n    /** Grab cell specific handlers */\n    const hcls = this.getLocations(CellAddress.from(appSignal.cell_id));\n    if (!hcls) {\n      return;\n    }\n    const handlerss: (SignalCb[] | undefined)[]  = hcls\n      .map((hcl) => this._signalHandlers[hcl.toString()])\n      .filter((arr) => arr != undefined);\n    //console.log(\"onSignal()\", hcls? hcls.toString() : \"unknown cell: \" + encodeHashToBase64(signal.cell_id[0]), handlerss);\n    /** Grab common handler  */\n    const allHandlers = this._signalHandlers[\"__all\"];\n    if (allHandlers) handlerss.push(allHandlers);\n    /** Send to all handlers */\n    for (const handlers of handlerss) {\n      for (const handler of handlers!) {\n        handler(signal);\n      }\n    }\n  }\n\n\n  /** Store signalHandler to internal handler array */\n  addSignalHandler(handler: SignalCb, hcl?: HCLString): SignalUnsubscriber {\n    //console.log(\"addSignalHandler()\", hcl);\n\n    hcl = hcl? hcl: \"__all\";\n    //console.log(\"addSignalHandler()\", hcl, Object.keys(this._signalHandlers));\n    if (!this._signalHandlers[hcl]) {\n      this._signalHandlers[hcl] = [handler];\n    } else {\n      this._signalHandlers[hcl]!.push(handler);\n    }\n    /* return tailored unsubscribe function to the caller */\n    return {\n      unsubscribe: () => {\n      // FIXME\n      //   const maybeHandler = this._signalHandlers[hcl!]\n      //   if (!maybeHandler) {\n      //     console.warn(\"unsubscribe failed: Couldn't find signalHandler for\", hcl)\n      //     return;\n      //   }\n      //   delete this._signalHandlers[hcl!];\n      }\n    };\n  }\n\n  /** Log all signals received */\n  protected logSignal(signal: Signal): void {\n    if (SignalType.App != signal.type) {\n      return;\n    }\n    const appSignal: AppSignal = signal.value;\n    const zomeSignal = this.intoZomeSignal(appSignal);\n    if (!zomeSignal) {\n      return;\n    }\n    const log: SignalLog = {ts: Date.now(), cellAddr: CellAddress.from(appSignal.cell_id), zomeName: appSignal.zome_name, zomeSignal, type: AppSignalType.Unknown, pulseCount: 1};\n    if (zomeSignal) {\n      log.pulseCount = zomeSignal.pulses.length;\n      if (zomeSignal.pulses.length == 0) {\n        log.type = AppSignalType.Empty;\n      } else {\n        log.type = AppSignalType.Zome;\n      }\n    }\n    this._signalLogs.push(log);\n  }\n\n\n  /** */\n  intoZomeSignal(appSignal: AppSignal): ZomeSignal | undefined {\n    if (typeof appSignal.payload !== 'object' || Array.isArray(appSignal.payload) || appSignal.payload === null) {\n      return;\n    }\n    const payload = appSignal.payload as Object;\n    if (\"pulses\" in payload && \"from\" in payload) {\n      return appSignal.payload as ZomeSignal;\n    }\n    return;\n  }\n\n\n  /** */\n  dumpSignalLogs(canAppSignals: boolean, cellAddr?: CellAddress, zomeName?: ZomeName) {\n    const me = enc64(this.myPubKey);\n    let logs = this._signalLogs;\n    /** Filter by cell and zome */\n    let cellNames;\n    if (cellAddr) {\n      const hcls = this._hclMap[cellAddr.str];\n      cellNames = hcls!.map((hcl) => this.getCellName(hcl));\n      logs = this._signalLogs\n        .filter((log) => log.cellAddr.equals(cellAddr));\n      if (zomeName) {\n        logs = this._signalLogs\n          .filter((log) => log.zomeName == zomeName);\n      }\n    }\n    /** Seperate by type */\n    const unknownSignals = logs.filter((log) => log.type == AppSignalType.Unknown);\n    const zomeSignals = logs.filter((log) => log.type == AppSignalType.Zome);\n    const appSignals = zomeSignals.filter((log) => {\n      const type = Object.keys(log.zomeSignal.pulses[0]!)[0];\n      type != \"System\"\n    });\n    const sysSignals = zomeSignals.filter((log) => {\n      const type = Object.keys(log.zomeSignal.pulses[0]!)[0];\n      type == \"System\"\n    });\n\n    /** Dump unknown signals */\n    if (unknownSignals.length) {\n      let logs;\n      if (zomeName) {\n        console.error(`Unknown signals from zome \"${zomeName}\": ${unknownSignals.length}`);\n        logs = unknownSignals\n          .map((log) => {\n            return {timestamp: prettyDate(new Date(log.ts)), payload: log.zomeSignal}\n          });\n      } else {\n        console.error(`Unknown signals: ${unknownSignals.length}`);\n        logs = unknownSignals\n          .map((log) => {\n            return {timestamp: prettyDate(new Date(log.ts)), zome: log.zomeName, payload: log.zomeSignal}\n          });\n      }\n      console.table(logs);\n    }\n\n    /** Dump System signals */\n    let syslogs: any[] = [];\n    if (cellNames) {\n      if (zomeName) {\n        console.warn(`Unknown signals from zome \"${zomeName}\" in cell \"${cellNames}\"`);\n        sysSignals.map((log) => {\n            for (const pulse of log.zomeSignal.pulses) {\n              const payload = (pulse as SystemPulse).System;\n              syslogs.push({timestamp: prettyDate(new Date(log.ts)), payload});\n            }\n          });\n      } else {\n        console.warn(`System signals from cell \"${cellNames}\"`);\n        sysSignals.map((log) => {\n          for (const pulse of log.zomeSignal.pulses) {\n            const payload = (pulse as SystemPulse).System;\n            syslogs.push({timestamp: prettyDate(new Date(log.ts)), zome: log.zomeName, payload});\n          }\n        });\n      }\n    } else {\n      console.warn(`System signals: ${sysSignals.length}`)\n      sysSignals.map((log) => {\n          const app = this._hclMap[log.cellAddr.str]![0]!.appId;\n          const cell: string = this._hclMap[log.cellAddr.str]![0]!.roleName;\n        for (const pulse of log.zomeSignal.pulses) {\n          const payload = (pulse as SystemPulse).System;\n          syslogs.push({timestamp: prettyDate(new Date(log.ts)), app, cell, zome: log.zomeName, payload});\n        }\n      });\n    }\n    console.table(syslogs);\n\n    /** Dump App signals */\n    if (!canAppSignals) {\n      return;\n    }\n    let appLogs;\n    if (cellNames) {\n      if (zomeName) {\n        console.warn(`App signals from zome \"${zomeName}\" in cell \"${cellNames}\"`);\n        appLogs = appSignals.map((log) => {\n          const pulses = log.zomeSignal.pulses;\n          const from = enc64(log.zomeSignal.from) == me ? \"self\" : enc64(log.zomeSignal.from);\n          return {timestamp: prettyDate(new Date(log.ts)), from, count: pulses.length, payload: pulses}\n        });\n      } else {\n        console.warn(`App signals from cell \"${cellNames}\"`);\n        appLogs = appSignals.map((log) => {\n          const pulses = log.zomeSignal.pulses;\n          const from = enc64(log.zomeSignal.from) == me ? \"self\" : enc64(log.zomeSignal.from);\n          return {timestamp: prettyDate(new Date(log.ts)), zome: log.zomeName, from, count: pulses.length, payload: pulses}\n        });\n      }\n    } else {\n      console.warn(`App signals: ${appSignals.length}`)\n      appLogs = appSignals.map((log) => {\n          const app = this._hclMap[log.cellAddr.str]![0]!.appId;\n          const cell: string = this._hclMap[log.cellAddr.str]![0]!.roleName;\n          const pulses = log.zomeSignal.pulses;\n          const from = enc64(log.zomeSignal.from) == me? \"self\" : enc64(log.zomeSignal.from);\n          return { timestamp: prettyDate(new Date(log.ts)), app, cell, zome: log.zomeName, from, count: pulses.length, payload: pulses};\n        });\n    }\n    console.table(appLogs);\n  }\n}\n\n"]}

package/dist/ConductorAppProxy.d.ts

@@ -1,7 +1,8 @@
-import { AppInfoResponse, AppWebsocket, CallZomeRequest, InstalledAppId, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell, AppClient, AppEvents, SignalCb, AdminWebsocket, CreateCloneCellResponse, EnableCloneCellResponse, DumpNetworkStatsResponse, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse } from "@holochain/client";
+import { AppInfoResponse, AppWebsocket, CallZomeRequest, InstalledAppId, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell, AppClient, AppEvents, SignalCb, AdminWebsocket, CreateCloneCellResponse, EnableCloneCellResponse, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse } from "@holochain/client";
 import { UnsubscribeFunction } from "emittery";
 import { AppProxy } from "./AppProxy";
 import { AgentId } from "./hash";
+import { AppDumpNetworkStatsResponse } from "@holochain/client/lib/api/admin";
 export interface CellCloner {
     createCloneCell(req: CreateCloneCellRequest, publicToGroupMembers: boolean): Promise<CreateCloneCellResponse>;
     enableCloneCell(req: EnableCloneCellRequest): Promise<EnableCloneCellResponse>;
@@ -16,7 +17,7 @@ export declare class ConductorAppProxy extends AppProxy implements AppClient {
     createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell>;
     enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell>;
     disableCloneCell(request: DisableCloneCellRequest): Promise<void>;
-    dumpNetworkStats(timeout?: number): Promise<DumpNetworkStatsResponse>;
+    dumpNetworkStats(): Promise<AppDumpNetworkStatsResponse>;
     dumpNetworkMetrics(req: DumpNetworkMetricsRequest, timeout?: number): Promise<DumpNetworkMetricsResponse>;
     static new(port_or_socket: number | AppWebsocket, appId: InstalledAppId, adminUrl?: URL, defaultTimeout?: number): Promise<ConductorAppProxy>;
     private static fromSocket;

package/dist/ConductorAppProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConductorAppProxy.d.ts","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,eAAe,EACf,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,cAAc,EACd,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAI/B,MAAM,WAAW,UAAU;IACf,eAAe,CAAC,GAAG,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC9G,eAAe,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC/E,gBAAgB,CAAC,GAAG,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAWD,qBAAa,iBAAkB,SAAQ,QAAS,YAAW,SAAS;gBAGxC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc;IAOnH,OAAO,CAAC,MAAM,CAAgB;IAWf,QAAQ,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlE,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAIzC,EAAE,CAAC,IAAI,SAAS,MAAM,SAAS,EACtC,SAAS,EAAE,IAAI,GAAG,SAAS,IAAI,EAAE,EACjC,QAAQ,EAAE,QAAQ,GACjB,mBAAmB;IAIP,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAKrE,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAKrE,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjE,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAIrE,kBAAkB,CAC/B,GAAG,EAAE,yBAAyB,EAC9B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,0BAA0B,CAAC;WASzB,GAAG,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;mBAsC9H,UAAU;CAWhC"}
+{"version":3,"file":"ConductorAppProxy.d.ts","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,eAAe,EACf,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,cAAc,EACd,uBAAuB,EACvB,uBAAuB,EACvB,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAC,2BAA2B,EAAC,MAAM,iCAAiC,CAAC;AAG5E,MAAM,WAAW,UAAU;IACf,eAAe,CAAC,GAAG,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC9G,eAAe,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC/E,gBAAgB,CAAC,GAAG,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAWD,qBAAa,iBAAkB,SAAQ,QAAS,YAAW,SAAS;gBAGxC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc;IAOnH,OAAO,CAAC,MAAM,CAAgB;IAWf,QAAQ,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlE,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAIzC,EAAE,CAAC,IAAI,SAAS,MAAM,SAAS,EACtC,SAAS,EAAE,IAAI,GAAG,SAAS,IAAI,EAAE,EACjC,QAAQ,EAAE,QAAQ,GACjB,mBAAmB;IAIP,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAKrE,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAKrE,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjE,gBAAgB,IAAI,OAAO,CAAC,2BAA2B,CAAC;IAIxD,kBAAkB,CAC/B,GAAG,EAAE,yBAAyB,EAC9B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,0BAA0B,CAAC;WASzB,GAAG,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;mBAsC9H,UAAU;CAWhC"}

package/dist/ConductorAppProxy.js

@@ -24,8 +24,8 @@ export class ConductorAppProxy extends AppProxy {
     async disableCloneCell(request) {
         return this._appWs.disableCloneCell(request);
     }
-    async dumpNetworkStats(timeout) {
-        return await this._appWs.dumpNetworkStats(timeout);
+    async dumpNetworkStats() {
+        return await this._appWs.dumpNetworkStats();
     }
     async dumpNetworkMetrics(req, timeout) {
         return await this._appWs.dumpNetworkMetrics(req, timeout);

package/dist/ConductorAppProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAUZ,cAAc,GAMf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAmB/B,MAAM,OAAO,iBAAkB,SAAQ,QAAQ;IAG/B,YAAY,cAAsB,EAAE,KAAqB,EAAE,OAAgB,EAAE,OAAwB;QACjH,KAAK,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAgBQ,KAAK,CAAC,QAAQ,CAAC,GAAoB,EAAE,OAAgB;QAC5D,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAA;QACjD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,OAAO,IAAI,CAAC,MAAO,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IAEQ,EAAE,CACT,SAAiC,EACjC,QAAkB;QAElB,OAAO,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAEQ,KAAK,CAAC,eAAe,CAAC,OAA+B;QAE5D,OAAO,IAAI,CAAC,MAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAEQ,KAAK,CAAC,eAAe,CAAC,OAA+B;QAE5D,OAAO,IAAI,CAAC,MAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAEQ,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QAE9D,OAAO,IAAI,CAAC,MAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAGQ,KAAK,CAAC,gBAAgB,CAAC,OAAgB;QAC9C,OAAO,MAAM,IAAI,CAAC,MAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAEQ,KAAK,CAAC,kBAAkB,CAC/B,GAA8B,EAC9B,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,MAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAOD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,cAAqC,EAAE,KAAqB,EAAE,QAAc,EAAE,cAAuB;QACpH,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC;QAC5D,IAAI,OAAO,cAAc,IAAI,QAAQ,EAAE,CAAC;YACtC,OAAQ,iBAAiB,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,IAAI,KAAK,GAAG,IAAI,GAAG,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;YACxD,IAAI,CAAC;gBACH,IAAI,KAAK,GAAuC,SAAS,CAAC;gBAC1D,IAAI,OAAO,GAA+B,SAAS,CAAC;gBACpD,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAC,GAAG,EAAE,QAAQ,EAAC,CAAC,CAAC;oBACxD,OAAO,CAAC,GAAG,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC;oBACvB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,2BAA2B,CAAC,EAAC,gBAAgB,EAAE,KAAK,EAAC,CAAC,CAAC;oBACpF,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;gBACvB,CAAC;gBACD,MAAM,OAAO,GAAkC;oBAC7C,GAAG,EAAE,KAAK;oBACV,cAAc,EAAE,OAAO;iBACxB,CAAC;gBACF,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;gBACxB,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAClD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAE5C,IAAI,SAAS,GAAG,IAAI,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBACxE,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC;gBACzB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,GAAE,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAA,CAAC,CAAC,CAAC;gBAClE,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,CAAA;gBAC3D,OAAO,OAAO,CAAC,MAAM,CAAC,yCAAyC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;IACH,CAAC;IAIO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAA0B,EAAE,cAAsB;QAChF,IAAI,CAAC;YACH,IAAI,SAAS,GAAG,IAAI,iBAAiB,CAAC,cAAc,EAAE,YAAY,CAAC,cAAc,EAAE,IAAI,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;YACvH,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC;YAChC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,GAAE,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAA,CAAC,CAAC,CAAA;YACjE,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,CAAA;YAC3D,OAAO,OAAO,CAAC,MAAM,CAAC,yCAAyC,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;CACF","sourcesContent":["import {\n  AppInfoResponse,\n  AppWebsocket,\n  CallZomeRequest,\n  InstalledAppId,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  AppClient,\n  AppEvents,\n  SignalCb,\n  AdminWebsocket,\n  CreateCloneCellResponse,\n  EnableCloneCellResponse,\n  DumpNetworkStatsResponse,\n  DumpNetworkMetricsRequest,\n  DumpNetworkMetricsResponse,\n} from \"@holochain/client\";\nimport { UnsubscribeFunction } from \"emittery\";\nimport {AppProxy} from \"./AppProxy\";\nimport {AgentId} from \"./hash\";\nimport {AppWebsocketConnectionOptions, AppAuthenticationToken} from \"@holochain/client\";\n\n\nexport interface CellCloner {\n  /*async*/ createCloneCell(req: CreateCloneCellRequest, publicToGroupMembers: boolean): Promise<CreateCloneCellResponse>,\n  /*async*/ enableCloneCell(req: EnableCloneCellRequest): Promise<EnableCloneCellResponse>,\n  /*async*/ disableCloneCell(req: DisableCloneCellRequest): Promise<void>,\n}\n\n\n/**\n * Creates, connects and holds an appWebsocket.\n * Creates and holds Cell proxies for this appWebsocket.\n * Maintains a mapping between CellIds and HCLs\n * Handles SignalHandlers per HCL\n * Stores appSignal logs\n * TODO Implement Singleton per App port?\n */\nexport class ConductorAppProxy extends AppProxy implements AppClient {\n\n  /** Ctor */\n  /*protected*/ constructor(defaultTimeout: number, appId: InstalledAppId, agentId: AgentId, adminWs?: AdminWebsocket) {\n    super(defaultTimeout, appId, agentId, adminWs);\n  }\n\n\n  /** -- Fields -- */\n\n  private _appWs!: AppWebsocket;\n\n\n  /** -- Getters -- */\n\n  ///** Check this after connecting since AppWebsocket can shamelessly override the provided args. */\n  //get appIdOfShame(): InstalledAppId | undefined { return this._appWs.overrideInstalledAppId;}\n\n\n  /** -- AppClient (Passthrough to appWebsocket) -- */\n\n  override async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appWs.callZome(req, timeout)\n  }\n\n  override async appInfo(): Promise<AppInfoResponse> {\n    return this._appWs!.appInfo();\n  }\n\n  override on<Name extends keyof AppEvents>(\n    eventName: Name | readonly Name[],\n    listener: SignalCb\n  ): UnsubscribeFunction {\n    return this._appWs!.on(eventName, listener);\n  }\n\n  override async createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"createCloneCell() called:\", request)\n    return this._appWs!.createCloneCell(request);\n  }\n\n  override async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"enableCloneCell() called:\", request)\n    return this._appWs!.enableCloneCell(request);\n  }\n\n  override async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    //console.log(\"disableCloneCell() called:\", request)\n    return this._appWs!.disableCloneCell(request);\n  }\n\n\n  override async dumpNetworkStats(timeout?: number): Promise<DumpNetworkStatsResponse> {\n    return await this._appWs!.dumpNetworkStats(timeout);\n  }\n\n  override async dumpNetworkMetrics(\n    req: DumpNetworkMetricsRequest,\n    timeout?: number\n  ): Promise<DumpNetworkMetricsResponse> {\n    return await this._appWs!.dumpNetworkMetrics(req, timeout);\n  }\n\n\n\n  /** -- Creation -- */\n\n  /** async Factory */\n  static async new(port_or_socket: number | AppWebsocket, appId: InstalledAppId, adminUrl?: URL, defaultTimeout?: number): Promise<ConductorAppProxy> {\n    const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n    if (typeof port_or_socket == 'object') {\n      return  ConductorAppProxy.fromSocket(port_or_socket, timeout);\n    } else {\n      let wsUrl = new URL(`ws://localhost:${port_or_socket}`);\n      try {\n        let token: AppAuthenticationToken | undefined = undefined;\n        let adminWs: AdminWebsocket | undefined = undefined;\n        if (adminUrl) {\n          adminWs = await AdminWebsocket.connect({url: adminUrl});\n          console.log({adminWs});\n          const issued = await adminWs.issueAppAuthenticationToken({installed_app_id: appId});\n          token = issued.token;\n        }\n        const options: AppWebsocketConnectionOptions = {\n          url: wsUrl,\n          defaultTimeout: timeout,\n        };\n        if (token) {\n          options.token = token;\n        }\n        const appWs = await AppWebsocket.connect(options);\n        const agentId = new AgentId(appWs.myPubKey);\n        //console.log(\"appWs.myPubKey\", appWs.myPubKey, agentId);\n        let conductor = new ConductorAppProxy(timeout, appId, agentId, adminWs);\n        conductor._appWs = appWs;\n        conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)});\n        return conductor;\n      } catch (e) {\n        console.error(\"ConductorAppProxy initialization failed\", e)\n        return Promise.reject(\"ConductorAppProxy initialization failed\");\n      }\n    }\n  }\n\n\n  /** */\n  private static async fromSocket(appWebsocket: AppWebsocket, defaultTimeout: number): Promise<ConductorAppProxy> {\n    try {\n      let conductor = new ConductorAppProxy(defaultTimeout, appWebsocket.installedAppId, new AgentId(appWebsocket.myPubKey));\n      conductor._appWs = appWebsocket;\n      conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)})\n      return conductor;\n    } catch (e) {\n      console.error(\"ConductorAppProxy initialization failed\", e)\n      return Promise.reject(\"ConductorAppProxy initialization failed\");\n    }\n  }\n}\n\n"]}
+{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AppInfoResponse,\n  AppWebsocket,\n  CallZomeRequest,\n  InstalledAppId,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  AppClient,\n  AppEvents,\n  SignalCb,\n  AdminWebsocket,\n  CreateCloneCellResponse,\n  EnableCloneCellResponse,\n  DumpNetworkMetricsRequest,\n  DumpNetworkMetricsResponse,\n} from \"@holochain/client\";\nimport { UnsubscribeFunction } from \"emittery\";\nimport {AppProxy} from \"./AppProxy\";\nimport {AgentId} from \"./hash\";\nimport {AppWebsocketConnectionOptions, AppAuthenticationToken} from \"@holochain/client\";\nimport {AppDumpNetworkStatsResponse} from \"@holochain/client/lib/api/admin\";\n\n\nexport interface CellCloner {\n  /*async*/ createCloneCell(req: CreateCloneCellRequest, publicToGroupMembers: boolean): Promise<CreateCloneCellResponse>,\n  /*async*/ enableCloneCell(req: EnableCloneCellRequest): Promise<EnableCloneCellResponse>,\n  /*async*/ disableCloneCell(req: DisableCloneCellRequest): Promise<void>,\n}\n\n\n/**\n * Creates, connects and holds an appWebsocket.\n * Creates and holds Cell proxies for this appWebsocket.\n * Maintains a mapping between CellIds and HCLs\n * Handles SignalHandlers per HCL\n * Stores appSignal logs\n * TODO Implement Singleton per App port?\n */\nexport class ConductorAppProxy extends AppProxy implements AppClient {\n\n  /** Ctor */\n  /*protected*/ constructor(defaultTimeout: number, appId: InstalledAppId, agentId: AgentId, adminWs?: AdminWebsocket) {\n    super(defaultTimeout, appId, agentId, adminWs);\n  }\n\n\n  /** -- Fields -- */\n\n  private _appWs!: AppWebsocket;\n\n\n  /** -- Getters -- */\n\n  ///** Check this after connecting since AppWebsocket can shamelessly override the provided args. */\n  //get appIdOfShame(): InstalledAppId | undefined { return this._appWs.overrideInstalledAppId;}\n\n\n  /** -- AppClient (Passthrough to appWebsocket) -- */\n\n  override async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appWs.callZome(req, timeout)\n  }\n\n  override async appInfo(): Promise<AppInfoResponse> {\n    return this._appWs!.appInfo();\n  }\n\n  override on<Name extends keyof AppEvents>(\n    eventName: Name | readonly Name[],\n    listener: SignalCb\n  ): UnsubscribeFunction {\n    return this._appWs!.on(eventName, listener);\n  }\n\n  override async createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"createCloneCell() called:\", request)\n    return this._appWs!.createCloneCell(request);\n  }\n\n  override async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"enableCloneCell() called:\", request)\n    return this._appWs!.enableCloneCell(request);\n  }\n\n  override async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    //console.log(\"disableCloneCell() called:\", request)\n    return this._appWs!.disableCloneCell(request);\n  }\n\n\n  override async dumpNetworkStats(): Promise<AppDumpNetworkStatsResponse> {\n    return await this._appWs!.dumpNetworkStats();\n  }\n\n  override async dumpNetworkMetrics(\n    req: DumpNetworkMetricsRequest,\n    timeout?: number\n  ): Promise<DumpNetworkMetricsResponse> {\n    return await this._appWs!.dumpNetworkMetrics(req, timeout);\n  }\n\n\n\n  /** -- Creation -- */\n\n  /** async Factory */\n  static async new(port_or_socket: number | AppWebsocket, appId: InstalledAppId, adminUrl?: URL, defaultTimeout?: number): Promise<ConductorAppProxy> {\n    const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n    if (typeof port_or_socket == 'object') {\n      return  ConductorAppProxy.fromSocket(port_or_socket, timeout);\n    } else {\n      let wsUrl = new URL(`ws://localhost:${port_or_socket}`);\n      try {\n        let token: AppAuthenticationToken | undefined = undefined;\n        let adminWs: AdminWebsocket | undefined = undefined;\n        if (adminUrl) {\n          adminWs = await AdminWebsocket.connect({url: adminUrl});\n          console.log({adminWs});\n          const issued = await adminWs.issueAppAuthenticationToken({installed_app_id: appId});\n          token = issued.token;\n        }\n        const options: AppWebsocketConnectionOptions = {\n          url: wsUrl,\n          defaultTimeout: timeout,\n        };\n        if (token) {\n          options.token = token;\n        }\n        const appWs = await AppWebsocket.connect(options);\n        const agentId = new AgentId(appWs.myPubKey);\n        //console.log(\"appWs.myPubKey\", appWs.myPubKey, agentId);\n        let conductor = new ConductorAppProxy(timeout, appId, agentId, adminWs);\n        conductor._appWs = appWs;\n        conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)});\n        return conductor;\n      } catch (e) {\n        console.error(\"ConductorAppProxy initialization failed\", e)\n        return Promise.reject(\"ConductorAppProxy initialization failed\");\n      }\n    }\n  }\n\n\n  /** */\n  private static async fromSocket(appWebsocket: AppWebsocket, defaultTimeout: number): Promise<ConductorAppProxy> {\n    try {\n      let conductor = new ConductorAppProxy(defaultTimeout, appWebsocket.installedAppId, new AgentId(appWebsocket.myPubKey));\n      conductor._appWs = appWebsocket;\n      conductor._appWs.on('signal', (sig) => {conductor.onSignal(sig)})\n      return conductor;\n    } catch (e) {\n      console.error(\"ConductorAppProxy initialization failed\", e)\n      return Promise.reject(\"ConductorAppProxy initialization failed\");\n    }\n  }\n}\n\n"]}

package/dist/ExternalAppProxy.d.ts

@@ -1,6 +1,7 @@
-import { AppInfoResponse, CallZomeRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell, AppClient, AppEvents, SignalCb, CreateCloneCellResponse, DumpNetworkStatsResponse, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse, CreateCloneCellRequest } from "@holochain/client";
+import { AppInfoResponse, CallZomeRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell, AppClient, AppEvents, SignalCb, CreateCloneCellResponse, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse, CreateCloneCellRequest } from "@holochain/client";
 import { UnsubscribeFunction } from "emittery";
 import { AppProxy } from "./AppProxy";
+import { AppDumpNetworkStatsResponse } from "@holochain/client/lib/api/admin";
 export declare class ExternalAppProxy extends AppProxy implements AppClient {
     private _appClient;
     constructor(_appClient: AppClient, defaultTimeout: number);
@@ -10,7 +11,7 @@ export declare class ExternalAppProxy extends AppProxy implements AppClient {
     createCloneCell(request: CreateCloneCellRequest): Promise<CreateCloneCellResponse>;
     enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell>;
     disableCloneCell(request: DisableCloneCellRequest): Promise<void>;
-    dumpNetworkStats(_timeout?: number): Promise<DumpNetworkStatsResponse>;
+    dumpNetworkStats(): Promise<AppDumpNetworkStatsResponse>;
     dumpNetworkMetrics(req: DumpNetworkMetricsRequest, _timeout?: number): Promise<DumpNetworkMetricsResponse>;
 }
 //# sourceMappingURL=ExternalAppProxy.d.ts.map

package/dist/ExternalAppProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalAppProxy.d.ts","sourceRoot":"","sources":["../src/ExternalAppProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,uBAAuB,EACvB,sBAAsB,EACtB,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,uBAAuB,EACvB,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,EAAE,sBAAsB,EACnD,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAOpC,qBAAa,gBAAiB,SAAQ,QAAS,YAAW,SAAS;IAGvC,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM;IAWhE,QAAQ,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxE,EAAE,CAAC,IAAI,SAAS,MAAM,SAAS,EACtC,SAAS,EAAE,IAAI,GAAG,SAAS,IAAI,EAAE,EACjC,QAAQ,EAAE,QAAQ,GACjB,mBAAmB;IAIP,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAInC,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAIlF,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAIrE,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAItE,kBAAkB,CAC/B,GAAG,EAAE,yBAAyB,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,0BAA0B,CAAC;CAIvC"}
+{"version":3,"file":"ExternalAppProxy.d.ts","sourceRoot":"","sources":["../src/ExternalAppProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,uBAAuB,EACvB,sBAAsB,EACtB,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,uBAAuB,EACvB,yBAAyB,EACzB,0BAA0B,EAAE,sBAAsB,EACnD,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,2BAA2B,EAAC,MAAM,iCAAiC,CAAC;AAM5E,qBAAa,gBAAiB,SAAQ,QAAS,YAAW,SAAS;IAGvC,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM;IAWhE,QAAQ,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxE,EAAE,CAAC,IAAI,SAAS,MAAM,SAAS,EACtC,SAAS,EAAE,IAAI,GAAG,SAAS,IAAI,EAAE,EACjC,QAAQ,EAAE,QAAQ,GACjB,mBAAmB;IAIP,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAInC,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAIlF,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;IAIrE,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,gBAAgB,IAAI,OAAO,CAAC,2BAA2B,CAAC;IAIxD,kBAAkB,CAC/B,GAAG,EAAE,yBAAyB,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,0BAA0B,CAAC;CAIvC"}

package/dist/ExternalAppProxy.js

@@ -24,7 +24,7 @@ export class ExternalAppProxy extends AppProxy {
     async disableCloneCell(request) {
         return this._appClient.disableCloneCell(request);
     }
-    async dumpNetworkStats(_timeout) {
+    async dumpNetworkStats() {
         return this._appClient.dumpNetworkStats();
     }
     async dumpNetworkMetrics(req, _timeout) {

package/dist/ExternalAppProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalAppProxy.js","sourceRoot":"","sources":["../src/ExternalAppProxy.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAM/B,MAAM,OAAO,gBAAiB,SAAQ,QAAQ;IAG9B,YAAoB,UAAqB,EAAE,cAAsB;QAC7E,KAAK,CAAC,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QADnD,eAAU,GAAV,UAAU,CAAW;IAEvD,CAAC;IASQ,KAAK,CAAC,QAAQ,CAAC,GAAoB,EAAE,OAAgB;QAC5D,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAA;QACjD,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC/C,CAAC;IAEQ,EAAE,CACT,SAAiC,EACjC,QAAkB;QAElB,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAEQ,KAAK,CAAC,eAAe,CAAC,OAA+B;QAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAEQ,KAAK,CAAC,eAAe,CAAC,OAA+B;QAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAEQ,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QAC9D,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAGQ,KAAK,CAAC,gBAAgB,CAAC,QAAiB;QAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAC5C,CAAC;IAEQ,KAAK,CAAC,kBAAkB,CAC/B,GAA8B,EAC9B,QAAiB;QAEjB,OAAO,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;CAEF","sourcesContent":["import {\n  AppInfoResponse,\n  CallZomeRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  AppClient,\n  AppEvents,\n  SignalCb,\n  CreateCloneCellResponse,\n  DumpNetworkStatsResponse,\n  DumpNetworkMetricsRequest,\n  DumpNetworkMetricsResponse, CreateCloneCellRequest,\n} from \"@holochain/client\";\nimport { UnsubscribeFunction } from \"emittery\";\nimport {AppProxy} from \"./AppProxy\";\nimport {AgentId} from \"./hash\";\n\n\n/**\n *\n */\nexport class ExternalAppProxy extends AppProxy implements AppClient {\n\n  /** Ctor */\n  /*protected*/ constructor(private _appClient: AppClient, defaultTimeout: number) {\n    super(defaultTimeout, _appClient.installedAppId, new AgentId(_appClient.myPubKey));\n  }\n\n\n\n  /** -- AppClient (Passthrough to external AppClient) -- */\n\n  //get myPubKey(): AgentPubKey { return this._appClient.myPubKey}\n  //get installedAppId(): InstalledAppId { return this._appClient.installedAppId}\n\n  override async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appClient.callZome(req, timeout)\n  }\n\n  override on<Name extends keyof AppEvents>(\n    eventName: Name | readonly Name[],\n    listener: SignalCb\n  ): UnsubscribeFunction {\n    return this._appClient.on(eventName, listener);\n  }\n\n  override async appInfo(): Promise<AppInfoResponse> {\n    return this._appClient.appInfo();\n  }\n\n  override async createCloneCell(request: CreateCloneCellRequest): Promise<CreateCloneCellResponse> {\n    return this._appClient.createCloneCell(request);\n  }\n\n  override async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    return this._appClient.enableCloneCell(request);\n  }\n\n  override async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    return this._appClient.disableCloneCell(request);\n  }\n\n\n  override async dumpNetworkStats(_timeout?: number): Promise<DumpNetworkStatsResponse> {\n    return this._appClient.dumpNetworkStats();\n  }\n\n  override async dumpNetworkMetrics(\n    req: DumpNetworkMetricsRequest,\n    _timeout?: number\n  ): Promise<DumpNetworkMetricsResponse> {\n    return this._appClient.dumpNetworkMetrics(req);\n  }\n\n}\n\n"]}
+{"version":3,"file":"ExternalAppProxy.js","sourceRoot":"","sources":["../src/ExternalAppProxy.ts"],"names":[],"mappings":"AAcA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAO/B,MAAM,OAAO,gBAAiB,SAAQ,QAAQ;IAG9B,YAAoB,UAAqB,EAAE,cAAsB;QAC7E,KAAK,CAAC,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QADnD,eAAU,GAAV,UAAU,CAAW;IAEvD,CAAC;IASQ,KAAK,CAAC,QAAQ,CAAC,GAAoB,EAAE,OAAgB;QAC5D,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAA;QACjD,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC/C,CAAC;IAEQ,EAAE,CACT,SAAiC,EACjC,QAAkB;QAElB,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAEQ,KAAK,CAAC,eAAe,CAAC,OAA+B;QAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAEQ,KAAK,CAAC,eAAe,CAAC,OAA+B;QAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAEQ,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QAC9D,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAGQ,KAAK,CAAC,gBAAgB;QAC7B,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAC5C,CAAC;IAEQ,KAAK,CAAC,kBAAkB,CAC/B,GAA8B,EAC9B,QAAiB;QAEjB,OAAO,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;CAEF","sourcesContent":["import {\n  AppInfoResponse,\n  CallZomeRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  AppClient,\n  AppEvents,\n  SignalCb,\n  CreateCloneCellResponse,\n  DumpNetworkMetricsRequest,\n  DumpNetworkMetricsResponse, CreateCloneCellRequest,\n} from \"@holochain/client\";\nimport { UnsubscribeFunction } from \"emittery\";\nimport {AppProxy} from \"./AppProxy\";\nimport {AgentId} from \"./hash\";\nimport {AppDumpNetworkStatsResponse} from \"@holochain/client/lib/api/admin\";\n\n\n/**\n *\n */\nexport class ExternalAppProxy extends AppProxy implements AppClient {\n\n  /** Ctor */\n  /*protected*/ constructor(private _appClient: AppClient, defaultTimeout: number) {\n    super(defaultTimeout, _appClient.installedAppId, new AgentId(_appClient.myPubKey));\n  }\n\n\n\n  /** -- AppClient (Passthrough to external AppClient) -- */\n\n  //get myPubKey(): AgentPubKey { return this._appClient.myPubKey}\n  //get installedAppId(): InstalledAppId { return this._appClient.installedAppId}\n\n  override async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appClient.callZome(req, timeout)\n  }\n\n  override on<Name extends keyof AppEvents>(\n    eventName: Name | readonly Name[],\n    listener: SignalCb\n  ): UnsubscribeFunction {\n    return this._appClient.on(eventName, listener);\n  }\n\n  override async appInfo(): Promise<AppInfoResponse> {\n    return this._appClient.appInfo();\n  }\n\n  override async createCloneCell(request: CreateCloneCellRequest): Promise<CreateCloneCellResponse> {\n    return this._appClient.createCloneCell(request);\n  }\n\n  override async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    return this._appClient.enableCloneCell(request);\n  }\n\n  override async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    return this._appClient.disableCloneCell(request);\n  }\n\n\n  override async dumpNetworkStats(): Promise<AppDumpNetworkStatsResponse> {\n    return this._appClient.dumpNetworkStats();\n  }\n\n  override async dumpNetworkMetrics(\n    req: DumpNetworkMetricsRequest,\n    _timeout?: number\n  ): Promise<DumpNetworkMetricsResponse> {\n    return this._appClient.dumpNetworkMetrics(req);\n  }\n\n}\n\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddd-qc/cell-proxy",
-  "version": "0.33.2",
+  "version": "0.33.4",
   "description": "Proxy classes and helpers for managing a Holochain AppWebsocket",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -28,7 +28,7 @@
     "typescript": "~5.5.4"
   },
   "dependencies": {
-    "@holochain/client": "^0.20.0-dev.2",
+    "@holochain/client": "^0.20.0",
     "@bitgo/blake2b": "^3.2.4",
     "libsodium-wrappers-sumo": "^0.7.15",
     "js-base64": "^3.7.5",