@ddd-qc/cell-proxy 0.17.2 → 0.18.0

package/dist/AppProxy.d.ts

@@ -0,0 +1,74 @@
+import { AppApi, AppInfoRequest, AppInfoResponse, AppSignal, AppSignalCb, CallZomeRequest, CellId, InstalledAppId, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell } from "@holochain/client";
+import { CellProxy } from "./CellProxy";
+import { RoleCellsMap, BaseRoleName, CellsForRole } from "./types";
+import { HCL, HCLString } from "./hcl";
+import { Cell } from "./cell";
+/** */
+export interface SignalUnsubscriber {
+    unsubscribe: () => void;
+}
+/**
+ * Creates and holds Cell proxies.
+ * Maintains a mapping between CellIds and HCLs
+ * Handles SignalHandlers per HCL
+ * Stores appSignal logs
+ * TODO Implement Singleton per App port?
+ */
+export declare class AppProxy implements AppApi {
+    defaultTimeout: number;
+    /** -- Fields -- */
+    /** Signal log: [Timestamp, CellIdStr, Signal] */
+    private _signalLogs;
+    /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */
+    private _cellsByApp;
+    /** Map cell locations: CellIdStr -> HCL[] */
+    private _hclMap;
+    /** Store handlers per cell location: HCLString -> AppSignalCb[] */
+    private _signalHandlers;
+    /** Store cell proxies per cell: CellIdStr -> CellProxy */
+    private _cellProxies;
+    /** Map HCLString: CloneId -> CloneName */
+    private _cellNames;
+    /** -- Getters -- */
+    /** Check this after connecting since AppWebsocket can shamelessly override the provided args. */
+    get appIdOfShame(): InstalledAppId | undefined;
+    /** */
+    getAppCells(appId: InstalledAppId): RoleCellsMap | undefined;
+    getCellName(hcl: HCL): string;
+    /** */
+    getLocations(cellId: CellId): HCL[] | undefined;
+    /** */
+    getCell(hcl: HCL): Cell;
+    /** Get stored CellProxy or attempt to create it */
+    getCellProxy(cellIdOrLoc: HCL | CellId): CellProxy;
+    /** */
+    getAppRoles(installedAppId: InstalledAppId): BaseRoleName[] | undefined;
+    /** */
+    getClones(appId: InstalledAppId, baseRoleName: BaseRoleName): ClonedCell[];
+    createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell>;
+    /** -- AppApi -- */
+    enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell>;
+    disableCloneCell(request: DisableCloneCellRequest): Promise<void>;
+    appInfo(args: AppInfoRequest): Promise<AppInfoResponse>;
+    callZome(req: CallZomeRequest, timeout?: number): Promise<unknown>;
+    /** -- Creation -- */
+    /** Ctor */
+    constructor(defaultTimeout: number);
+    /** -- Methods -- */
+    /** */
+    fetchCell(appId: InstalledAppId, cellId: CellId): Promise<Cell>;
+    /** Get all cells for a BaseRole in an app */
+    fetchCells(appId: InstalledAppId, baseRoleName: BaseRoleName): Promise<CellsForRole>;
+    /** */
+    addClone(hcl: HCL, cloneCell: ClonedCell): void;
+    /** */
+    createCellProxy(hcl: HCL, cloneName?: string): CellProxy;
+    /** */
+    onSignal(signal: AppSignal): void;
+    /** Store signalHandler to internal handler array */
+    addSignalHandler(handler: AppSignalCb, hcl?: HCLString): SignalUnsubscriber;
+    /** Log all signals received */
+    protected logSignal(signal: AppSignal): void;
+    /** */
+    dumpSignals(cellId?: CellId): void;
+}

package/dist/AppProxy.js

@@ -0,0 +1,298 @@
+import { CellType, encodeHashToBase64, } from "@holochain/client";
+import { CellProxy } from "./CellProxy";
+import { CellIdStr } from "./types";
+import { areCellsEqual, prettyDate, printAppInfo } from "./utils";
+import { HCL } from "./hcl";
+import { Cell } from "./cell";
+/**
+ * Creates and holds Cell proxies.
+ * Maintains a mapping between CellIds and HCLs
+ * Handles SignalHandlers per HCL
+ * Stores appSignal logs
+ * TODO Implement Singleton per App port?
+ */
+export class AppProxy {
+    /** -- Getters -- */
+    /** Check this after connecting since AppWebsocket can shamelessly override the provided args. */
+    get appIdOfShame() { return undefined; }
+    /** */
+    getAppCells(appId) {
+        return this._cellsByApp[appId];
+    }
+    getCellName(hcl) { return this._cellNames[hcl.toString()]; }
+    /** */
+    getLocations(cellId) {
+        return this._hclMap[CellIdStr(cellId)];
+    }
+    /** */
+    getCell(hcl) {
+        const roleCellsMap = this._cellsByApp[hcl.appId];
+        if (!roleCellsMap)
+            throw Error(`getCell() failed. No hApp with ID "${hcl.appId}" found.`);
+        const roleCells = roleCellsMap[hcl.baseRoleName];
+        if (!roleCells)
+            throw Error(`getCell() failed: BaseRoleName "${hcl.baseRoleName}" not found in happ "${hcl.appId}"`);
+        let cell = roleCells.provisioned;
+        if (hcl.cloneId !== undefined) {
+            cell = roleCells.clones[hcl.cloneId];
+            if (!cell) {
+                throw Error(`getCell() failed: clone "${hcl.cloneId}" not found for role "${hcl.toString()}"`);
+            }
+        }
+        return new Cell(cell, hcl.appId, hcl.baseRoleName);
+    }
+    /** Get stored CellProxy or attempt to create it */
+    getCellProxy(cellIdOrLoc) {
+        if (cellIdOrLoc instanceof HCL) {
+            const cell = this.getCell(cellIdOrLoc);
+            const maybeProxy = this.getCellProxy(cell.id);
+            if (!maybeProxy)
+                throw Error("getCellProxy() failed. Proxy not found for cell " + CellIdStr(cell.id));
+            return maybeProxy;
+        }
+        const sId = CellIdStr(cellIdOrLoc);
+        const maybeProxy = this._cellProxies[sId];
+        if (maybeProxy === undefined)
+            throw Error("getCellProxy() failed. Proxy not found for cell " + sId);
+        return maybeProxy;
+    }
+    /** */
+    getAppRoles(installedAppId) {
+        if (!this._cellsByApp[installedAppId])
+            return undefined;
+        return Object.values(this._cellsByApp[installedAppId]).map((roleCells) => {
+            return roleCells.provisioned.name;
+        });
+    }
+    /** */
+    getClones(appId, baseRoleName) {
+        const maybeApp = this._cellsByApp[appId];
+        if (!maybeApp)
+            return [];
+        const roleInstalledCells = maybeApp[baseRoleName];
+        if (!roleInstalledCells)
+            return [];
+        return Object.values(roleInstalledCells.clones);
+    }
+    async createCloneCell(request) {
+        throw new Error("Method not implemented.");
+    }
+    /** -- AppApi -- */
+    async enableCloneCell(request) {
+        throw new Error("Method not implemented.");
+    }
+    async disableCloneCell(request) {
+        throw new Error("Method not implemented.");
+    }
+    async appInfo(args) {
+        throw new Error("Method not implemented.");
+    }
+    async callZome(req, timeout) {
+        throw new Error("Method not implemented.");
+    }
+    /** -- Creation -- */
+    /** Ctor */
+    /*protected*/ constructor(defaultTimeout) {
+        this.defaultTimeout = defaultTimeout;
+        /** -- Fields -- */
+        /** Signal log: [Timestamp, CellIdStr, Signal] */
+        this._signalLogs = [];
+        /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */
+        this._cellsByApp = {};
+        /** Map cell locations: CellIdStr -> HCL[] */
+        this._hclMap = {};
+        /** Store handlers per cell location: HCLString -> AppSignalCb[] */
+        this._signalHandlers = {};
+        /** Store cell proxies per cell: CellIdStr -> CellProxy */
+        this._cellProxies = {};
+        /** Map HCLString: CloneId -> CloneName */
+        this._cellNames = {}; // Provisioned cell's name is its baseRoleName so no need to map them
+        /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));
+    }
+    /** -- Methods -- */
+    /** */
+    async fetchCell(appId, cellId) {
+        const appInfo = await this.appInfo({ installed_app_id: appId });
+        //console.log("fetchCell", appInfo);
+        if (appInfo == null) {
+            return Promise.reject(`getCell() failed. App "${appId}" not found"`);
+        }
+        for (const cellInfos of Object.values(appInfo.cell_info)) {
+            for (const [baseRoleName, cellInfo] of Object.entries(cellInfos)) {
+                let cell;
+                try {
+                    cell = Cell.from(cellInfo, appId, baseRoleName);
+                }
+                catch (e) {
+                    // skip stem cell
+                    continue;
+                }
+                if (areCellsEqual(cell.id, cellId)) {
+                    return cell;
+                }
+            }
+        }
+        return Promise.reject("getCell() failed. Cell not found for app.");
+    }
+    /** Get all cells for a BaseRole in an app */
+    async fetchCells(appId, baseRoleName) {
+        /** Make sure hApp exists */
+        const appInfo = await this.appInfo({ installed_app_id: appId });
+        if (appInfo == null) {
+            return Promise.reject(`fetchCells() failed. App "${appId}" not found`);
+        }
+        console.log("fetchCells() installedAppInfo:\n", printAppInfo(appInfo));
+        /** Make sure app Object exists */
+        if (!this._cellsByApp[appId]) {
+            this._cellsByApp[appId] = {};
+        }
+        /** Get all cells with that baseRoleName */
+        let provisioned;
+        let clones = {};
+        for (const [curBaseRoleName, cellInfos] of Object.entries(appInfo.cell_info)) {
+            for (const cellInfo of Object.values(cellInfos)) {
+                if (baseRoleName !== curBaseRoleName || CellType.Stem in cellInfo) {
+                    continue;
+                }
+                if (CellType.Cloned in cellInfo) {
+                    if (clones[cellInfo.cloned.clone_id]) {
+                        console.error(`fetchCells() Entry already exist for clone: "${cellInfo.cloned.clone_id}"`);
+                    }
+                    clones[cellInfo.cloned.clone_id] = cellInfo.cloned;
+                }
+                else {
+                    provisioned = cellInfo.provisioned;
+                }
+            }
+        }
+        if (typeof provisioned === 'undefined') {
+            return Promise.reject("Provisioned cell not found for role " + baseRoleName);
+        }
+        let roleInstalledCells = { provisioned: provisioned, clones };
+        /** Store it*/
+        this._cellsByApp[appId][baseRoleName] = roleInstalledCells;
+        return roleInstalledCells;
+    }
+    /** */
+    addClone(hcl, cloneCell) {
+        if (!this._cellsByApp[hcl.appId])
+            throw Error("addClone() failed. no appId. " + hcl.toString());
+        if (!this._cellsByApp[hcl.appId][hcl.baseRoleName])
+            throw Error("addClone() failed. no baseRoleName. " + hcl.toString());
+        if (hcl.cloneId === undefined)
+            throw Error("addClone() failed. Cell is not a CloneCell: " + hcl.toString());
+        // let cloneName = hcl.cloneId;
+        // if (hcl.cloneId === undefined) {
+        //   const cloneIndex: number = Object.keys(this._cellsByApp[hcl.appId][hcl.baseRoleName].clones).length;
+        //   cloneName = createCloneName(hcl.baseRoleName, cloneIndex);
+        // }
+        this._cellsByApp[hcl.appId][hcl.baseRoleName].clones[cloneCell.clone_id] = cloneCell;
+        // const sCellId = CellIdStr(cloneCell.cell_id);
+        // console.log("CreateCellProxy() adding to hclMap", sCellId, cellLoc.asHcl())
+        // if (this._hclMap[sCellId]) {
+        //   this._hclMap[sCellId].push(cellLoc.asHcl());
+        // } else {
+        //   this._hclMap[sCellId] = [cellLoc.asHcl()];
+        // }
+    }
+    /** */
+    createCellProxy(hcl, cloneName) {
+        console.log("createCellProxy() for", hcl.toString(), cloneName);
+        /** Make sure cell exists */
+        const cell = this.getCell(hcl);
+        const sCellId = CellIdStr(cell.id);
+        /** Create proxy for this cell if none exist yet, otherwise reuse */
+        let cellProxy = this._cellProxies[sCellId];
+        if (!cellProxy) {
+            /** Create and store Proxy */
+            cellProxy = new CellProxy(this, cell, this.defaultTimeout);
+            this._cellProxies[sCellId] = cellProxy;
+        }
+        /** Create CellId -> HCL mapping */
+        //console.log("CreateCellProxy() adding to hclMap", sCellId, hcl.toString())
+        if (this._hclMap[sCellId]) {
+            this._hclMap[sCellId].push(hcl);
+        }
+        else {
+            this._hclMap[sCellId] = [hcl];
+        }
+        //console.log("createCellProxy() Currently stored hclMap:", this._hclMap);
+        /** Associate cloneName if any */
+        const name = cloneName ? cloneName : hcl.baseRoleName;
+        this._cellNames[hcl.toString()] = name;
+        /** Done */
+        return cellProxy;
+    }
+    /** */
+    onSignal(signal) {
+        /** Grab cell specific handlers */
+        const hcls = this.getLocations(signal.cell_id);
+        const handlerss = hcls ? hcls.map((hcl) => this._signalHandlers[hcl.toString()]) : [];
+        console.log("onSignal()", hcls ? hcls.toString() : "unknown cell: " + encodeHashToBase64(signal.cell_id[0]), handlerss);
+        /** Grab common handler  */
+        const allHandlers = this._signalHandlers["__all"];
+        if (allHandlers)
+            handlerss.push(allHandlers);
+        /** Send to all handlers */
+        for (const handlers of handlerss) {
+            for (const handler of handlers) {
+                handler(signal);
+            }
+        }
+    }
+    /** Store signalHandler to internal handler array */
+    addSignalHandler(handler, hcl) {
+        console.log("addSignalHandler()", hcl);
+        hcl = hcl ? hcl : "__all";
+        //console.log("addSignalHandler()", hcl, Object.keys(this._signalHandlers));
+        if (!this._signalHandlers[hcl]) {
+            this._signalHandlers[hcl] = [handler];
+        }
+        else {
+            this._signalHandlers[hcl].push(handler);
+        }
+        /* return tailored unsubscribe function to the caller */
+        return {
+            unsubscribe: () => {
+                // FIXME
+                //   const maybeHandler = this._signalHandlers[hcl!]
+                //   if (!maybeHandler) {
+                //     console.warn("unsubscribe failed: Couldn't find signalHandler for", hcl)
+                //     return;
+                //   }
+                //   delete this._signalHandlers[hcl!];
+            }
+        };
+    }
+    /** Log all signals received */
+    logSignal(signal) {
+        this._signalLogs.push([Date.now(), CellIdStr(signal.cell_id), signal]);
+        //console.log("signal logged", this._signalLogs)
+    }
+    /** */
+    dumpSignals(cellId) {
+        if (cellId) {
+            const cellStr = CellIdStr(cellId);
+            const hcls = this._hclMap[cellStr];
+            const names = hcls.map((hcl) => this.getCellName(hcl));
+            console.warn(`Dumping signal logs for cell "${names}"`);
+            const logs = this._signalLogs
+                .filter((log) => log[1] == cellStr)
+                .map((log) => {
+                return { timestamp: prettyDate(new Date(log[0])), zome: log[2].zome_name, payload: log[2].payload };
+            });
+            console.table(logs);
+        }
+        else {
+            console.warn("Dumping all signal logs");
+            const logs = this._signalLogs
+                .map((log) => {
+                const app = this._hclMap[log[1]][0].appId;
+                const cell = this._hclMap[log[1]][0].roleName;
+                return { timestamp: prettyDate(new Date(log[0])), app, cell, zome: log[2].zome_name, payload: log[2].payload };
+            });
+            console.table(logs);
+        }
+    }
+}
+//# sourceMappingURL=AppProxy.js.map

package/dist/AppProxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AppProxy.js","sourceRoot":"","sources":["../src/AppProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AppApi,\n  AppInfoRequest,\n  AppInfoResponse,\n  AppSignal,\n  AppSignalCb,\n  CallZomeRequest,\n  CellId,\n  InstalledAppId,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  CellType,\n  ProvisionedCell,\n  encodeHashToBase64,\n} from \"@holochain/client\";\nimport { CellProxy } from \"./CellProxy\";\nimport {CellIdStr, RoleCellsMap, BaseRoleName, CellsForRole} from \"./types\";\nimport {areCellsEqual, Dictionary, prettyDate, printAppInfo} from \"./utils\";\nimport {HCL, HCLString} from \"./hcl\";\nimport {Cell} from \"./cell\";\n\n\n/** */\nexport interface SignalUnsubscriber {\n  unsubscribe: () => void;\n}\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 AppApi {\n\n  /** -- Fields -- */\n\n  /** Signal log: [Timestamp, CellIdStr, Signal] */\n  private _signalLogs: [number, CellIdStr, AppSignal][] = [];\n  /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */\n  private _cellsByApp: Dictionary<RoleCellsMap> = {};\n  /** Map cell locations: CellIdStr -> HCL[] */\n  private _hclMap: Dictionary<HCL[]> = {};\n  /** Store handlers per cell location: HCLString -> AppSignalCb[] */\n  private _signalHandlers: Dictionary<AppSignalCb[]> = {};\n  /** Store cell proxies per cell: CellIdStr -> CellProxy */\n  private _cellProxies: Dictionary<CellProxy> = {};\n\n\n  /** Map HCLString: CloneId -> CloneName */\n  private _cellNames: Dictionary<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 {return this._cellNames[hcl.toString()]}\n\n\n  /** */\n  getLocations(cellId: CellId): HCL[] | undefined {\n    return this._hclMap[CellIdStr(cellId)];\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 = 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 | CellId): CellProxy {\n    if (cellIdOrLoc instanceof HCL) {\n      const cell = this.getCell(cellIdOrLoc);\n      const maybeProxy = this.getCellProxy(cell.id);\n      if (!maybeProxy) throw Error(\"getCellProxy() failed. Proxy not found for cell \" + CellIdStr(cell.id));\n      return maybeProxy;\n    }\n    const sId = CellIdStr(cellIdOrLoc);\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    if (!this._cellsByApp[installedAppId]) return undefined;\n    return Object.values(this._cellsByApp[installedAppId]).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\n  async createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  /** -- AppApi -- */\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 appInfo(args: AppInfoRequest): Promise<AppInfoResponse> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n\n  /** -- Creation -- */\n\n  /** Ctor */\n  /*protected*/ constructor(public defaultTimeout: number) {\n    /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));\n  }\n\n\n  /** -- Methods -- */\n\n  /** */\n  async fetchCell(appId: InstalledAppId, cellId: CellId): Promise<Cell> {\n    const appInfo = await this.appInfo({installed_app_id: appId});\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 (areCellsEqual(cell.id, cellId)) {\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({installed_app_id: appId});\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: Dictionary<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 in cellInfo) {\n          continue;\n        }\n        if (CellType.Cloned in cellInfo) {\n          if (clones[cellInfo.cloned.clone_id]) {\n            console.error(`fetchCells() Entry already exist for clone: \"${cellInfo.cloned.clone_id}\"`)\n          }\n          clones[cellInfo.cloned.clone_id] = cellInfo.cloned;\n        } else {\n          provisioned = cellInfo.provisioned;\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 = CellIdStr(cell.id);\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 CellId -> 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: AppSignal): void {\n    /** Grab cell specific handlers */\n    const hcls = this.getLocations(signal.cell_id);\n    const handlerss: AppSignalCb[][]  = hcls? hcls.map((hcl) => this._signalHandlers[hcl.toString()]) : [];\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: AppSignalCb, 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: AppSignal): void {\n    this._signalLogs.push([Date.now(), CellIdStr(signal.cell_id), signal])\n    //console.log(\"signal logged\", this._signalLogs)\n  }\n\n\n  /** */\n  dumpSignals(cellId?: CellId) {\n    if (cellId) {\n      const cellStr = CellIdStr(cellId);\n      const hcls = this._hclMap[cellStr];\n      const names = hcls.map((hcl) => this.getCellName(hcl));\n      console.warn(`Dumping signal logs for cell \"${names}\"`);\n      const logs = this._signalLogs\n        .filter((log) => log[1] == cellStr)\n        .map((log) => {\n          return { timestamp: prettyDate(new Date(log[0])), zome: log[2].zome_name, payload: log[2].payload}\n        });\n      console.table(logs);\n    } else {\n      console.warn(\"Dumping all signal logs\", )\n      const logs = this._signalLogs\n        .map((log) => {\n          const app = this._hclMap[log[1]][0].appId\n          const cell: string = this._hclMap[log[1]][0].roleName;\n          return { timestamp: prettyDate(new Date(log[0])), app, cell, zome: log[2].zome_name, payload: log[2].payload}\n        });\n      console.table(logs);\n    }\n  }\n}\n\n"]}

package/dist/CellProxy.d.ts

@@ -1,9 +1,9 @@
 import { AppSignalCb, CallZomeRequest, CapSecret, ZomeName } from "@holochain/client";
-import { ConductorAppProxy, SignalUnsubscriber } from "./ConductorAppProxy";
 import { Empty } from "./mixins";
 import { Cell } from "./cell";
 import { DnaInfo, ZomeInfo } from "./types";
 import MutexInterface from "async-mutex/lib/MutexInterface";
+import { AppProxy, SignalUnsubscriber } from "./AppProxy";
 export interface RequestLog {
     request: CallZomeRequest;
     timeout: number;
@@ -24,13 +24,13 @@ declare const CellProxy_base: (abstract new (...args: any[]) => {
 /**
  * Proxy for a running DNA.
  * It logs and queues ZomeCalls.
- * It holds a reference to its ConductorAppProxy and its Cell.
+ * It holds a reference to its AppProxy and its Cell.
  * This class is expected to be used by ZomeProxies.
  */
 export declare class CellProxy extends CellProxy_base {
-    private _conductor;
+    private _appProxy;
     /** Ctor */
-    constructor(_conductor: ConductorAppProxy, cell: Cell, defaultTimeout?: number);
+    constructor(_appProxy: AppProxy, cell: Cell, defaultTimeout?: number);
     /** -- Fields -- */
     defaultTimeout: number;
     protected _callMutex: MutexInterface;

package/dist/CellProxy.js

@@ -5,16 +5,16 @@ import { Mutex, withTimeout } from "async-mutex";
 /**
  * Proxy for a running DNA.
  * It logs and queues ZomeCalls.
- * It holds a reference to its ConductorAppProxy and its Cell.
+ * It holds a reference to its AppProxy and its Cell.
  * This class is expected to be used by ZomeProxies.
  */
 export class CellProxy extends CellMixin(Empty) {
     /** Ctor */
-    constructor(_conductor, cell, 
+    constructor(_appProxy, cell, 
     //public readonly dnaDef: MyDnaDef,
     defaultTimeout) {
         super();
-        this._conductor = _conductor;
+        this._appProxy = _appProxy;
         /** append only logs */
         this._requestLog = [];
         this._responseLog = [];
@@ -26,11 +26,11 @@ export class CellProxy extends CellMixin(Empty) {
     /** -- Methods -- */
     /** */
     addSignalHandler(handler) {
-        return this._conductor.addSignalHandler(handler, this.cell.hcl().toString());
+        return this._appProxy.addSignalHandler(handler, this.cell.hcl().toString());
     }
     /** */
     dumpSignals() {
-        this._conductor.dumpSignals(this.cell.id);
+        this._appProxy.dumpSignals(this.cell.id);
     }
     /** Pass call request to conductor proxy and log it */
     async executeZomeCall(reqLog) {
@@ -38,7 +38,7 @@ export class CellProxy extends CellMixin(Empty) {
         const requestIndex = this._requestLog.length;
         this._requestLog.push(reqLog);
         try {
-            const response = await this._conductor.callZome(reqLog.request, reqLog.timeout);
+            const response = await this._appProxy.callZome(reqLog.request, reqLog.timeout);
             const respLog = { requestIndex, success: response, timestamp: Date.now() };
             this._responseLog.push(respLog);
             return respLog;
@@ -199,7 +199,7 @@ export class CellProxy extends CellMixin(Empty) {
                 : { startTime, zomeName: requestLog.request.zome_name, fnName: requestLog.request.fn_name, input, output, duration, waitTime };
             result.push(log);
         }
-        console.warn(`Dumping logs for cell "${this._conductor.getLocations(this.cell.id)}"`);
+        console.warn(`Dumping logs for cell "${this._appProxy.getLocations(this.cell.id)}"`);
         if (zomeName) {
             console.warn(` - For zome "${zomeName}"`);
         }

package/dist/CellProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"CellProxy.js","sourceRoot":"","sources":["../src/CellProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {AppSignalCb, CallZomeRequest, CapSecret, encodeHashToBase64, ZomeName} from \"@holochain/client\";\nimport {ConductorAppProxy, SignalUnsubscriber} from \"./ConductorAppProxy\";\nimport {anyToB64, prettyDate, prettyDuration} from \"./utils\";\nimport {CellMixin, Empty} from \"./mixins\";\nimport {Cell} from \"./cell\";\nimport {DnaInfo, EntryDefsCallbackResult, ZomeInfo} from \"./types\";\nimport {Mutex, withTimeout} from \"async-mutex\";\nimport MutexInterface from \"async-mutex/lib/MutexInterface\";\n\n\nexport interface RequestLog {\n  request: CallZomeRequest,\n  timeout: number,\n  requestTimestamp: number,\n  executionTimestamp: number,\n}\n\nexport interface ResponseLog {\n  success?: unknown,\n  failure?: unknown,\n  timestamp: number,\n  requestIndex: number;\n}\n\n\nexport type Cb = () => Promise<unknown>\n\n/**\n * Proxy for a running DNA.\n * It logs and queues ZomeCalls.\n * It holds a reference to its ConductorAppProxy and its Cell.\n * This class is expected to be used by ZomeProxies.\n */\nexport class CellProxy extends CellMixin(Empty) {\n\n  /** Ctor */\n  constructor(\n    private _conductor: ConductorAppProxy,\n    cell: Cell,\n    //public readonly dnaDef: MyDnaDef,\n    defaultTimeout?: number) {\n    super();\n    this._cell = cell;\n    console.log(`CellProxy.ctor`, cell);\n    this.defaultTimeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n    this._callMutex = withTimeout(new Mutex(), this.defaultTimeout);\n  }\n\n\n  /** -- Fields -- */\n\n  defaultTimeout: number;\n  protected _callMutex: MutexInterface;\n\n\n\n  /** append only logs */\n  private _requestLog: RequestLog[] = []\n  private _responseLog: ResponseLog[] = []\n\n\n  /** -- Methods -- */\n\n  /** */\n  addSignalHandler(handler: AppSignalCb): SignalUnsubscriber {\n    return this._conductor.addSignalHandler(handler, this.cell.hcl().toString());\n  }\n\n\n  /** */\n  dumpSignals() {\n    this._conductor.dumpSignals(this.cell.id);\n  }\n\n  /** Pass call request to conductor proxy and log it */\n  async executeZomeCall(reqLog: RequestLog): Promise<ResponseLog> {\n    reqLog.executionTimestamp = Date.now();\n    const requestIndex = this._requestLog.length;\n    this._requestLog.push(reqLog);\n    try {\n      const response = await this._conductor.callZome(reqLog.request, reqLog.timeout);\n      const respLog = { requestIndex, success: response, timestamp: Date.now() };\n      this._responseLog.push(respLog);\n      return respLog;\n    } catch (e) {\n      const respLog = { requestIndex, failure: e, timestamp: Date.now() }\n      this._responseLog.push(respLog);\n      return respLog;\n    }\n  }\n\n\n  /** Pass call request to conductor proxy and log it */\n  logCallTimedout(reqLog: RequestLog): ResponseLog {\n    reqLog.executionTimestamp = Date.now();\n    const requestIndex = this._requestLog.length;\n    this._requestLog.push(reqLog);\n    const respLog = { requestIndex, failure: \"Waiting for Mutex timed-out\", timestamp: Date.now() }\n    this._responseLog.push(respLog);\n    return respLog;\n  }\n\n\n  /**\n   * callZome() with Mutex (for calls that writes to source-chain)\n   * TODO: Implement call queue instead of mutex?\n   */\n  async callZomeBlocking(zome_name: ZomeName, fn_name: string, payload: any, cap_secret: CapSecret | null, timeout?: number): Promise<unknown> {\n    timeout = timeout? timeout : this.defaultTimeout;\n    const req = {\n      cap_secret, zome_name, fn_name, payload,\n      cell_id: this.cell.id,\n      provenance: this.cell.id[1],\n    } as CallZomeRequest;\n    const log = { request: req, timeout, requestTimestamp: Date.now() } as RequestLog;\n\n    /** Acquire lock */\n    let release;\n    try {\n      release = await this._callMutex.acquire();\n    } catch(e) {\n      console.warn(\"Waiting for callZomeBlocking mutex timed-out\", e);\n      this.logCallTimedout(log)\n      return Promise.reject(\"Waiting for callZomeBlocking mutex timed-out\");\n    }\n    /** Execute */\n    const respLog = await this.executeZomeCall(log);\n    /** Release */\n    release();\n    if (respLog.failure) {\n      this.dumpSignals();\n      this.dumpLogs(zome_name);\n      return Promise.reject(respLog.failure)\n    }\n    return respLog.success;\n  }\n\n\n  /** */\n  async callZome(zome_name: ZomeName, fn_name: string, payload: any, cap_secret: CapSecret | null, timeout?: number): Promise<unknown> {\n    timeout = timeout? timeout : this.defaultTimeout;\n    const req = {\n      cap_secret, zome_name, fn_name, payload,\n      cell_id: this.cell.id,\n      provenance: this.cell.id[1],\n    } as CallZomeRequest;\n    const log = { request: req, timeout, requestTimestamp: Date.now() } as RequestLog;\n    try {\n      await this._callMutex.waitForUnlock();\n    } catch(e) {\n      console.warn(\"Waiting for callZome mutex timed-out\", e);\n      this.logCallTimedout(log);\n      return Promise.reject(\"Waiting for callZome mutex timed-out\");\n    }\n    const respLog = await this.executeZomeCall(log);\n    if (respLog.failure) {\n      this.dumpSignals();\n      this.dumpLogs(zome_name);\n      return Promise.reject(respLog.failure)\n    }\n    return respLog.success;\n  }\n\n\n  /**\n   * Calls the `entry_defs()` zome function and\n   * returns an array of all the zome's AppEntryDefNames and visibility\n   */\n  async callEntryDefs(zomeName: ZomeName): Promise<[string, boolean][]> {\n    //console.log(\"callEntryDefs()\", zomeName)\n    try {\n      const entryDefs = await this.callZome(zomeName, \"entry_defs\", null, null, 2 * 1000) as EntryDefsCallbackResult;\n      //console.debug(\"getEntryDefs() for \" + this.zomeName + \" result:\")\n      //console.log({entryDefs})\n      let result: [string, boolean][] = []\n      for (const def of entryDefs.Defs) {\n        const name = def.id.App;\n        result.push([name, def.visibility.hasOwnProperty('Public')])\n      }\n      //console.log({result})\n      return result;\n    } catch (e) {\n      console.error(\"Calling getEntryDefs() on \" + zomeName + \" failed: \")\n      console.error({ e })\n      return Promise.reject(e)\n    }\n  }\n\n\n\n  /**\n   * Calls the `zome_info()` zome function\n   */\n  async callZomeInfo(zomeName: ZomeName): Promise<ZomeInfo> {\n    console.log(\"callZomeInfo()\", zomeName)\n    try {\n      const zome_info = await this.callZome(zomeName, \"get_zome_info\", null, null, 10 * 100) as ZomeInfo;\n      //console.debug(\"callZomeInfo() for \" + zomeName + \" result:\")\n      //console.log({zome_info})\n      return zome_info;\n    } catch (e) {\n      console.error(\"Calling callZomeInfo() on \" + zomeName + \" failed. Make sure `get_zome_info()` is implemented in your zome code. Error: \")\n      console.error({ e })\n      return Promise.reject(e)\n    }\n  }\n\n\n  /**\n   * Calls the `dna_info()` zome function\n   */\n  async callDnaInfo(zomeName: ZomeName): Promise<DnaInfo> {\n    console.log(\"callDnaInfo()\", zomeName)\n    try {\n      const dna_info = await this.callZome(zomeName, \"get_dna_info\", null, null, 10 * 100) as DnaInfo;\n      //console.debug(\"callDnaInfo() for \" + zomeName + \" result:\")\n      //console.log({dna_info})\n      return dna_info;\n    } catch (e) {\n      console.error(\"Calling callDnaInfo() on \" + zomeName + \" failed. Make sure `get_dna_info()` is implemented in your zome code. Error: \")\n      console.error({ e })\n      return Promise.reject(e)\n    }\n  }\n\n\n  // /** TODO once we have getDnaDefinition() api */\n  // dumpAllZomes() {\n  //   // FIXME get DNA DEF\n  //   for (const zomeName of dnaDef) {\n  //     this.dumpLogs(zomeName)\n  //   }\n  // }\n\n  /**  */\n  dumpLogs(zomeName?: ZomeName) {\n    let result = [];\n    for (const response of this._responseLog) {\n      const requestLog = this._requestLog[response.requestIndex];\n      if (zomeName && requestLog.request.zome_name != zomeName) {\n        continue;\n      }\n      const startTime = prettyDate(new Date(requestLog.requestTimestamp));\n      const waitTime = prettyDuration(new Date(requestLog.executionTimestamp - requestLog.requestTimestamp));\n      const duration = prettyDuration(new Date(response.timestamp - requestLog.requestTimestamp));\n      const input = requestLog.request.payload instanceof Uint8Array ? encodeHashToBase64(requestLog.request.payload) : requestLog.request.payload;\n      const output = anyToB64(response.failure ? response.failure : response.success);\n      const log = zomeName\n        ? { startTime, fnName: requestLog.request.fn_name, input, output, duration, waitTime }\n        : { startTime, zomeName: requestLog.request.zome_name, fnName: requestLog.request.fn_name, input, output, duration, waitTime }\n      result.push(log);\n    }\n    console.warn(`Dumping logs for cell \"${this._conductor.getLocations(this.cell.id)}\"`)\n    if (zomeName) {\n      console.warn(` - For zome \"${zomeName}\"`);\n    }\n    console.table(result)\n  }\n\n}\n\n"]}
+{"version":3,"file":"CellProxy.js","sourceRoot":"","sources":["../src/CellProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {AppSignalCb, CallZomeRequest, CapSecret, encodeHashToBase64, ZomeName} from \"@holochain/client\";\nimport {anyToB64, prettyDate, prettyDuration} from \"./utils\";\nimport {CellMixin, Empty} from \"./mixins\";\nimport {Cell} from \"./cell\";\nimport {DnaInfo, EntryDefsCallbackResult, ZomeInfo} from \"./types\";\nimport {Mutex, withTimeout} from \"async-mutex\";\nimport MutexInterface from \"async-mutex/lib/MutexInterface\";\nimport {AppProxy, SignalUnsubscriber} from \"./AppProxy\";\n\n\nexport interface RequestLog {\n  request: CallZomeRequest,\n  timeout: number,\n  requestTimestamp: number,\n  executionTimestamp: number,\n}\n\nexport interface ResponseLog {\n  success?: unknown,\n  failure?: unknown,\n  timestamp: number,\n  requestIndex: number;\n}\n\n\nexport type Cb = () => Promise<unknown>\n\n/**\n * Proxy for a running DNA.\n * It logs and queues ZomeCalls.\n * It holds a reference to its AppProxy and its Cell.\n * This class is expected to be used by ZomeProxies.\n */\nexport class CellProxy extends CellMixin(Empty) {\n\n  /** Ctor */\n  constructor(\n    private _appProxy: AppProxy,\n    cell: Cell,\n    //public readonly dnaDef: MyDnaDef,\n    defaultTimeout?: number) {\n    super();\n    this._cell = cell;\n    console.log(`CellProxy.ctor`, cell);\n    this.defaultTimeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n    this._callMutex = withTimeout(new Mutex(), this.defaultTimeout);\n  }\n\n\n  /** -- Fields -- */\n\n  defaultTimeout: number;\n  protected _callMutex: MutexInterface;\n\n\n\n  /** append only logs */\n  private _requestLog: RequestLog[] = []\n  private _responseLog: ResponseLog[] = []\n\n\n  /** -- Methods -- */\n\n  /** */\n  addSignalHandler(handler: AppSignalCb): SignalUnsubscriber {\n    return this._appProxy.addSignalHandler(handler, this.cell.hcl().toString());\n  }\n\n\n  /** */\n  dumpSignals() {\n    this._appProxy.dumpSignals(this.cell.id);\n  }\n\n  /** Pass call request to conductor proxy and log it */\n  async executeZomeCall(reqLog: RequestLog): Promise<ResponseLog> {\n    reqLog.executionTimestamp = Date.now();\n    const requestIndex = this._requestLog.length;\n    this._requestLog.push(reqLog);\n    try {\n      const response = await this._appProxy.callZome(reqLog.request, reqLog.timeout);\n      const respLog = { requestIndex, success: response, timestamp: Date.now() };\n      this._responseLog.push(respLog);\n      return respLog;\n    } catch (e) {\n      const respLog = { requestIndex, failure: e, timestamp: Date.now() }\n      this._responseLog.push(respLog);\n      return respLog;\n    }\n  }\n\n\n  /** Pass call request to conductor proxy and log it */\n  logCallTimedout(reqLog: RequestLog): ResponseLog {\n    reqLog.executionTimestamp = Date.now();\n    const requestIndex = this._requestLog.length;\n    this._requestLog.push(reqLog);\n    const respLog = { requestIndex, failure: \"Waiting for Mutex timed-out\", timestamp: Date.now() }\n    this._responseLog.push(respLog);\n    return respLog;\n  }\n\n\n  /**\n   * callZome() with Mutex (for calls that writes to source-chain)\n   * TODO: Implement call queue instead of mutex?\n   */\n  async callZomeBlocking(zome_name: ZomeName, fn_name: string, payload: any, cap_secret: CapSecret | null, timeout?: number): Promise<unknown> {\n    timeout = timeout? timeout : this.defaultTimeout;\n    const req = {\n      cap_secret, zome_name, fn_name, payload,\n      cell_id: this.cell.id,\n      provenance: this.cell.id[1],\n    } as CallZomeRequest;\n    const log = { request: req, timeout, requestTimestamp: Date.now() } as RequestLog;\n\n    /** Acquire lock */\n    let release;\n    try {\n      release = await this._callMutex.acquire();\n    } catch(e) {\n      console.warn(\"Waiting for callZomeBlocking mutex timed-out\", e);\n      this.logCallTimedout(log)\n      return Promise.reject(\"Waiting for callZomeBlocking mutex timed-out\");\n    }\n    /** Execute */\n    const respLog = await this.executeZomeCall(log);\n    /** Release */\n    release();\n    if (respLog.failure) {\n      this.dumpSignals();\n      this.dumpLogs(zome_name);\n      return Promise.reject(respLog.failure)\n    }\n    return respLog.success;\n  }\n\n\n  /** */\n  async callZome(zome_name: ZomeName, fn_name: string, payload: any, cap_secret: CapSecret | null, timeout?: number): Promise<unknown> {\n    timeout = timeout? timeout : this.defaultTimeout;\n    const req = {\n      cap_secret, zome_name, fn_name, payload,\n      cell_id: this.cell.id,\n      provenance: this.cell.id[1],\n    } as CallZomeRequest;\n    const log = { request: req, timeout, requestTimestamp: Date.now() } as RequestLog;\n    try {\n      await this._callMutex.waitForUnlock();\n    } catch(e) {\n      console.warn(\"Waiting for callZome mutex timed-out\", e);\n      this.logCallTimedout(log);\n      return Promise.reject(\"Waiting for callZome mutex timed-out\");\n    }\n    const respLog = await this.executeZomeCall(log);\n    if (respLog.failure) {\n      this.dumpSignals();\n      this.dumpLogs(zome_name);\n      return Promise.reject(respLog.failure)\n    }\n    return respLog.success;\n  }\n\n\n  /**\n   * Calls the `entry_defs()` zome function and\n   * returns an array of all the zome's AppEntryDefNames and visibility\n   */\n  async callEntryDefs(zomeName: ZomeName): Promise<[string, boolean][]> {\n    //console.log(\"callEntryDefs()\", zomeName)\n    try {\n      const entryDefs = await this.callZome(zomeName, \"entry_defs\", null, null, 2 * 1000) as EntryDefsCallbackResult;\n      //console.debug(\"getEntryDefs() for \" + this.zomeName + \" result:\")\n      //console.log({entryDefs})\n      let result: [string, boolean][] = []\n      for (const def of entryDefs.Defs) {\n        const name = def.id.App;\n        result.push([name, def.visibility.hasOwnProperty('Public')])\n      }\n      //console.log({result})\n      return result;\n    } catch (e) {\n      console.error(\"Calling getEntryDefs() on \" + zomeName + \" failed: \")\n      console.error({ e })\n      return Promise.reject(e)\n    }\n  }\n\n\n\n  /**\n   * Calls the `zome_info()` zome function\n   */\n  async callZomeInfo(zomeName: ZomeName): Promise<ZomeInfo> {\n    console.log(\"callZomeInfo()\", zomeName)\n    try {\n      const zome_info = await this.callZome(zomeName, \"get_zome_info\", null, null, 10 * 100) as ZomeInfo;\n      //console.debug(\"callZomeInfo() for \" + zomeName + \" result:\")\n      //console.log({zome_info})\n      return zome_info;\n    } catch (e) {\n      console.error(\"Calling callZomeInfo() on \" + zomeName + \" failed. Make sure `get_zome_info()` is implemented in your zome code. Error: \")\n      console.error({ e })\n      return Promise.reject(e)\n    }\n  }\n\n\n  /**\n   * Calls the `dna_info()` zome function\n   */\n  async callDnaInfo(zomeName: ZomeName): Promise<DnaInfo> {\n    console.log(\"callDnaInfo()\", zomeName)\n    try {\n      const dna_info = await this.callZome(zomeName, \"get_dna_info\", null, null, 10 * 100) as DnaInfo;\n      //console.debug(\"callDnaInfo() for \" + zomeName + \" result:\")\n      //console.log({dna_info})\n      return dna_info;\n    } catch (e) {\n      console.error(\"Calling callDnaInfo() on \" + zomeName + \" failed. Make sure `get_dna_info()` is implemented in your zome code. Error: \")\n      console.error({ e })\n      return Promise.reject(e)\n    }\n  }\n\n\n  // /** TODO once we have getDnaDefinition() api */\n  // dumpAllZomes() {\n  //   // FIXME get DNA DEF\n  //   for (const zomeName of dnaDef) {\n  //     this.dumpLogs(zomeName)\n  //   }\n  // }\n\n  /**  */\n  dumpLogs(zomeName?: ZomeName) {\n    let result = [];\n    for (const response of this._responseLog) {\n      const requestLog = this._requestLog[response.requestIndex];\n      if (zomeName && requestLog.request.zome_name != zomeName) {\n        continue;\n      }\n      const startTime = prettyDate(new Date(requestLog.requestTimestamp));\n      const waitTime = prettyDuration(new Date(requestLog.executionTimestamp - requestLog.requestTimestamp));\n      const duration = prettyDuration(new Date(response.timestamp - requestLog.requestTimestamp));\n      const input = requestLog.request.payload instanceof Uint8Array ? encodeHashToBase64(requestLog.request.payload) : requestLog.request.payload;\n      const output = anyToB64(response.failure ? response.failure : response.success);\n      const log = zomeName\n        ? { startTime, fnName: requestLog.request.fn_name, input, output, duration, waitTime }\n        : { startTime, zomeName: requestLog.request.zome_name, fnName: requestLog.request.fn_name, input, output, duration, waitTime }\n      result.push(log);\n    }\n    console.warn(`Dumping logs for cell \"${this._appProxy.getLocations(this.cell.id)}\"`)\n    if (zomeName) {\n      console.warn(` - For zome \"${zomeName}\"`);\n    }\n    console.table(result)\n  }\n\n}\n\n"]}

package/dist/ConductorAppProxy.d.ts

@@ -1,52 +1,20 @@
-import { AppApi, AppInfoRequest, AppInfoResponse, AppSignal, AppSignalCb, AppWebsocket, CallZomeRequest, CellId, InstalledAppId, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell } from "@holochain/client";
-import { CellProxy } from "./CellProxy";
-import { RoleCellsMap, BaseRoleName, CellsForRole } from "./types";
-import { HCL, HCLString } from "./hcl";
-import { Cell } from "./cell";
-/** */
-export interface SignalUnsubscriber {
-    unsubscribe: () => void;
-}
+import { AppApi, AppInfoRequest, AppInfoResponse, AppWebsocket, CallZomeRequest, InstalledAppId, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell } from "@holochain/client";
+import { AppProxy } from "./AppProxy";
 /**
- * Creates, connects and holds a appWebsocket.
+ * Creates, connects and holds an appWebsocket.
  * Creates and holds Cell proxies for this appWebsocket.
  * Maintains a mapping between CellIds and HCLs
  * Handles SignalHandlers per HCL
  * Stores appSignal logs
  * TODO Implement Singleton per App port?
  */
-export declare class ConductorAppProxy implements AppApi {
+export declare class ConductorAppProxy extends AppProxy implements AppApi {
     defaultTimeout: number;
     /** -- Fields -- */
     private _appWs;
-    /** Signal log: [Timestamp, CellIdStr, Signal] */
-    private _signalLogs;
-    /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */
-    private _cellsByApp;
-    /** Map cell locations: CellIdStr -> HCL[] */
-    private _hclMap;
-    /** Store handlers per cell location: HCLString -> AppSignalCb[] */
-    private _signalHandlers;
-    /** Store cell proxies per cell: CellIdStr -> CellProxy */
-    private _cellProxies;
-    /** Map HCLString: CloneId -> CloneName */
-    private _cellNames;
     /** -- Getters -- */
     /** Check this after connecting since AppWebsocket can shamelessly override the provided args. */
     get appIdOfShame(): InstalledAppId | undefined;
-    /** */
-    getAppCells(appId: InstalledAppId): RoleCellsMap | undefined;
-    getCellName(hcl: HCL): string;
-    /** */
-    getLocations(cellId: CellId): HCL[] | undefined;
-    /** */
-    getCell(hcl: HCL): Cell;
-    /** Get stored CellProxy or attempt to create it */
-    getCellProxy(cellIdOrLoc: HCL | CellId): CellProxy;
-    /** */
-    getAppRoles(installedAppId: InstalledAppId): BaseRoleName[] | undefined;
-    /** */
-    getClones(appId: InstalledAppId, baseRoleName: BaseRoleName): ClonedCell[];
     createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell>;
     /** -- AppApi (Passthrough to appWebsocket) -- */
     enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell>;
@@ -60,21 +28,4 @@ export declare class ConductorAppProxy implements AppApi {
     private static fromSocket;
     /** Ctor */
     constructor(defaultTimeout: number);
-    /** -- Methods -- */
-    /** */
-    fetchCell(appId: InstalledAppId, cellId: CellId): Promise<Cell>;
-    /** Get all cells for a BaseRole in an app */
-    fetchCells(appId: InstalledAppId, baseRoleName: BaseRoleName): Promise<CellsForRole>;
-    /** */
-    addClone(hcl: HCL, cloneCell: ClonedCell): void;
-    /** */
-    createCellProxy(hcl: HCL, cloneName?: string): CellProxy;
-    /** */
-    onSignal(signal: AppSignal): void;
-    /** Store signalHandler to internal handler array */
-    addSignalHandler(handler: AppSignalCb, hcl?: HCLString): SignalUnsubscriber;
-    /** Log all signals received */
-    private logSignal;
-    /** */
-    dumpSignals(cellId?: CellId): void;
 }

package/dist/ConductorAppProxy.js

@@ -1,80 +1,17 @@
-import { AppWebsocket, CellType, encodeHashToBase64, } from "@holochain/client";
-import { CellProxy } from "./CellProxy";
-import { CellIdStr } from "./types";
-import { areCellsEqual, prettyDate, printAppInfo } from "./utils";
-import { HCL } from "./hcl";
-import { Cell } from "./cell";
+import { AppWebsocket, } from "@holochain/client";
+import { AppProxy } from "./AppProxy";
 /**
- * Creates, connects and holds a appWebsocket.
+ * Creates, connects and holds an appWebsocket.
  * Creates and holds Cell proxies for this appWebsocket.
  * Maintains a mapping between CellIds and HCLs
  * Handles SignalHandlers per HCL
  * Stores appSignal logs
  * TODO Implement Singleton per App port?
  */
-export class ConductorAppProxy {
+export class ConductorAppProxy extends AppProxy {
     /** -- Getters -- */
     /** Check this after connecting since AppWebsocket can shamelessly override the provided args. */
     get appIdOfShame() { return this._appWs.overrideInstalledAppId; }
-    /** */
-    getAppCells(appId) {
-        return this._cellsByApp[appId];
-    }
-    getCellName(hcl) { return this._cellNames[hcl.toString()]; }
-    /** */
-    getLocations(cellId) {
-        return this._hclMap[CellIdStr(cellId)];
-    }
-    /** */
-    getCell(hcl) {
-        const roleCellsMap = this._cellsByApp[hcl.appId];
-        if (!roleCellsMap)
-            throw Error(`getCell() failed. No hApp with ID "${hcl.appId}" found.`);
-        const roleCells = roleCellsMap[hcl.baseRoleName];
-        if (!roleCells)
-            throw Error(`getCell() failed: BaseRoleName "${hcl.baseRoleName}" not found in happ "${hcl.appId}"`);
-        let cell = roleCells.provisioned;
-        if (hcl.cloneId !== undefined) {
-            cell = roleCells.clones[hcl.cloneId];
-            if (!cell) {
-                throw Error(`getCell() failed: clone "${hcl.cloneId}" not found for role "${hcl.toString()}"`);
-            }
-        }
-        return new Cell(cell, hcl.appId, hcl.baseRoleName);
-    }
-    /** Get stored CellProxy or attempt to create it */
-    getCellProxy(cellIdOrLoc) {
-        if (cellIdOrLoc instanceof HCL) {
-            const cell = this.getCell(cellIdOrLoc);
-            const maybeProxy = this.getCellProxy(cell.id);
-            if (!maybeProxy)
-                throw Error("getCellProxy() failed. Proxy not found for cell " + CellIdStr(cell.id));
-            return maybeProxy;
-        }
-        const sId = CellIdStr(cellIdOrLoc);
-        const maybeProxy = this._cellProxies[sId];
-        if (maybeProxy === undefined)
-            throw Error("getCellProxy() failed. Proxy not found for cell " + sId);
-        return maybeProxy;
-    }
-    /** */
-    getAppRoles(installedAppId) {
-        if (!this._cellsByApp[installedAppId])
-            return undefined;
-        return Object.values(this._cellsByApp[installedAppId]).map((roleCells) => {
-            return roleCells.provisioned.name;
-        });
-    }
-    /** */
-    getClones(appId, baseRoleName) {
-        const maybeApp = this._cellsByApp[appId];
-        if (!maybeApp)
-            return [];
-        const roleInstalledCells = maybeApp[baseRoleName];
-        if (!roleInstalledCells)
-            return [];
-        return Object.values(roleInstalledCells.clones);
-    }
     async createCloneCell(request) {
         //console.log("createCloneCell() called:", request)
         return this._appWs.createCloneCell(request);
@@ -131,205 +68,9 @@ export class ConductorAppProxy {
     }
     /** Ctor */
     /*protected*/ constructor(defaultTimeout) {
+        super(defaultTimeout);
         this.defaultTimeout = defaultTimeout;
-        /** Signal log: [Timestamp, CellIdStr, Signal] */
-        this._signalLogs = [];
-        /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */
-        this._cellsByApp = {};
-        /** Map cell locations: CellIdStr -> HCL[] */
-        this._hclMap = {};
-        /** Store handlers per cell location: HCLString -> AppSignalCb[] */
-        this._signalHandlers = {};
-        /** Store cell proxies per cell: CellIdStr -> CellProxy */
-        this._cellProxies = {};
-        /** Map HCLString: CloneId -> CloneName */
-        this._cellNames = {}; // Provisioned cell's name is its baseRoleName so no need to map them
         /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));
     }
-    /** -- Methods -- */
-    /** */
-    async fetchCell(appId, cellId) {
-        const appInfo = await this.appInfo({ installed_app_id: appId });
-        //console.log("fetchCell", appInfo);
-        if (appInfo == null) {
-            return Promise.reject(`getCell() failed. App "${appId}" not found on AppWebsocket "${this._appWs.client.socket.url}"`);
-        }
-        for (const cellInfos of Object.values(appInfo.cell_info)) {
-            for (const [baseRoleName, cellInfo] of Object.entries(cellInfos)) {
-                let cell;
-                try {
-                    cell = Cell.from(cellInfo, appId, baseRoleName);
-                }
-                catch (e) {
-                    // skip stem cell
-                    continue;
-                }
-                if (areCellsEqual(cell.id, cellId)) {
-                    return cell;
-                }
-            }
-        }
-        return Promise.reject("getCell() failed. Cell not found for app.");
-    }
-    /** Get all cells for a BaseRole in an app */
-    async fetchCells(appId, baseRoleName) {
-        /** Make sure hApp exists */
-        const appInfo = await this.appInfo({ installed_app_id: appId });
-        if (appInfo == null) {
-            return Promise.reject(`fetchCells() failed. App "${appId}" not found on AppWebsocket "${this._appWs.client.socket.url}"`);
-        }
-        console.log("fetchCells() installedAppInfo:\n", printAppInfo(appInfo));
-        /** Make sure app Object exists */
-        if (!this._cellsByApp[appId]) {
-            this._cellsByApp[appId] = {};
-        }
-        /** Get all cells with that baseRoleName */
-        let provisioned;
-        let clones = {};
-        for (const [curBaseRoleName, cellInfos] of Object.entries(appInfo.cell_info)) {
-            for (const cellInfo of Object.values(cellInfos)) {
-                if (baseRoleName !== curBaseRoleName || CellType.Stem in cellInfo) {
-                    continue;
-                }
-                if (CellType.Cloned in cellInfo) {
-                    if (clones[cellInfo.cloned.clone_id]) {
-                        console.error(`fetchCells() Entry already exist for clone: "${cellInfo.cloned.clone_id}"`);
-                    }
-                    clones[cellInfo.cloned.clone_id] = cellInfo.cloned;
-                }
-                else {
-                    provisioned = cellInfo.provisioned;
-                }
-            }
-        }
-        if (typeof provisioned === 'undefined') {
-            return Promise.reject("Provisioned cell not found for role " + baseRoleName);
-        }
-        let roleInstalledCells = { provisioned: provisioned, clones };
-        /** Store it*/
-        this._cellsByApp[appId][baseRoleName] = roleInstalledCells;
-        return roleInstalledCells;
-    }
-    /** */
-    addClone(hcl, cloneCell) {
-        if (!this._cellsByApp[hcl.appId])
-            throw Error("addClone() failed. no appId. " + hcl.toString());
-        if (!this._cellsByApp[hcl.appId][hcl.baseRoleName])
-            throw Error("addClone() failed. no baseRoleName. " + hcl.toString());
-        if (hcl.cloneId === undefined)
-            throw Error("addClone() failed. Cell is not a CloneCell: " + hcl.toString());
-        // let cloneName = hcl.cloneId;
-        // if (hcl.cloneId === undefined) {
-        //   const cloneIndex: number = Object.keys(this._cellsByApp[hcl.appId][hcl.baseRoleName].clones).length;
-        //   cloneName = createCloneName(hcl.baseRoleName, cloneIndex);
-        // }
-        this._cellsByApp[hcl.appId][hcl.baseRoleName].clones[cloneCell.clone_id] = cloneCell;
-        // const sCellId = CellIdStr(cloneCell.cell_id);
-        // console.log("CreateCellProxy() adding to hclMap", sCellId, cellLoc.asHcl())
-        // if (this._hclMap[sCellId]) {
-        //   this._hclMap[sCellId].push(cellLoc.asHcl());
-        // } else {
-        //   this._hclMap[sCellId] = [cellLoc.asHcl()];
-        // }
-    }
-    /** */
-    createCellProxy(hcl, cloneName) {
-        console.log("createCellProxy() for", hcl.toString(), cloneName);
-        /** Make sure cell exists */
-        const cell = this.getCell(hcl);
-        const sCellId = CellIdStr(cell.id);
-        /** Create proxy for this cell if none exist yet, otherwise reuse */
-        let cellProxy = this._cellProxies[sCellId];
-        if (!cellProxy) {
-            /** Create and store Proxy */
-            cellProxy = new CellProxy(this, cell, this.defaultTimeout);
-            this._cellProxies[sCellId] = cellProxy;
-        }
-        /** Create CellId -> HCL mapping */
-        //console.log("CreateCellProxy() adding to hclMap", sCellId, hcl.toString())
-        if (this._hclMap[sCellId]) {
-            this._hclMap[sCellId].push(hcl);
-        }
-        else {
-            this._hclMap[sCellId] = [hcl];
-        }
-        //console.log("createCellProxy() Currently stored hclMap:", this._hclMap);
-        /** Associate cloneName if any */
-        const name = cloneName ? cloneName : hcl.baseRoleName;
-        this._cellNames[hcl.toString()] = name;
-        /** Done */
-        return cellProxy;
-    }
-    /** */
-    onSignal(signal) {
-        /** Grab cell specific handlers */
-        const hcls = this.getLocations(signal.cell_id);
-        const handlerss = hcls ? hcls.map((hcl) => this._signalHandlers[hcl.toString()]) : [];
-        console.log("onSignal()", hcls ? hcls.toString() : "unknown cell: " + encodeHashToBase64(signal.cell_id[0]), handlerss);
-        /** Grab common handler  */
-        const allHandlers = this._signalHandlers["__all"];
-        if (allHandlers)
-            handlerss.push(allHandlers);
-        /** Send to all handlers */
-        for (const handlers of handlerss) {
-            for (const handler of handlers) {
-                handler(signal);
-            }
-        }
-    }
-    /** Store signalHandler to internal handler array */
-    addSignalHandler(handler, hcl) {
-        console.log("addSignalHandler()", hcl);
-        hcl = hcl ? hcl : "__all";
-        //console.log("addSignalHandler()", hcl, Object.keys(this._signalHandlers));
-        if (!this._signalHandlers[hcl]) {
-            this._signalHandlers[hcl] = [handler];
-        }
-        else {
-            this._signalHandlers[hcl].push(handler);
-        }
-        /* return tailored unsubscribe function to the caller */
-        return {
-            unsubscribe: () => {
-                // FIXME
-                //   const maybeHandler = this._signalHandlers[hcl!]
-                //   if (!maybeHandler) {
-                //     console.warn("unsubscribe failed: Couldn't find signalHandler for", hcl)
-                //     return;
-                //   }
-                //   delete this._signalHandlers[hcl!];
-            }
-        };
-    }
-    /** Log all signals received */
-    logSignal(signal) {
-        this._signalLogs.push([Date.now(), CellIdStr(signal.cell_id), signal]);
-        //console.log("signal logged", this._signalLogs)
-    }
-    /** */
-    dumpSignals(cellId) {
-        if (cellId) {
-            const cellStr = CellIdStr(cellId);
-            const hcls = this._hclMap[cellStr];
-            const names = hcls.map((hcl) => this.getCellName(hcl));
-            console.warn(`Dumping signal logs for cell "${names}"`);
-            const logs = this._signalLogs
-                .filter((log) => log[1] == cellStr)
-                .map((log) => {
-                return { timestamp: prettyDate(new Date(log[0])), zome: log[2].zome_name, payload: log[2].payload };
-            });
-            console.table(logs);
-        }
-        else {
-            console.warn("Dumping all signal logs");
-            const logs = this._signalLogs
-                .map((log) => {
-                const app = this._hclMap[log[1]][0].appId;
-                const cell = this._hclMap[log[1]][0].roleName;
-                return { timestamp: prettyDate(new Date(log[0])), app, cell, zome: log[2].zome_name, payload: log[2].payload };
-            });
-            console.table(logs);
-        }
-    }
 }
 //# sourceMappingURL=ConductorAppProxy.js.map

package/dist/ConductorAppProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AppApi,\n  AppInfoRequest,\n  AppInfoResponse,\n  AppSignal,\n  AppSignalCb,\n  AppWebsocket,\n  CallZomeRequest,\n  CellId,\n  InstalledAppId,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n  CellType,\n  ProvisionedCell,\n  encodeHashToBase64,\n} from \"@holochain/client\";\nimport { CellProxy } from \"./CellProxy\";\nimport {CellIdStr, RoleCellsMap, BaseRoleName, CellsForRole} from \"./types\";\nimport {areCellsEqual, Dictionary, prettyDate, printAppInfo} from \"./utils\";\nimport {HCL, HCLString} from \"./hcl\";\nimport {Cell} from \"./cell\";\n\n\n/** */\nexport interface SignalUnsubscriber {\n  unsubscribe: () => void;\n}\n\n\n/**\n * Creates, connects and holds a 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 implements AppApi {\n\n  /** -- Fields -- */\n\n  private _appWs!: AppWebsocket;\n\n  /** Signal log: [Timestamp, CellIdStr, Signal] */\n  private _signalLogs: [number, CellIdStr, AppSignal][] = [];\n  /** Map cells per App: InstalledAppId -> (BaseRoleName -> CellsForRole) */\n  private _cellsByApp: Dictionary<RoleCellsMap> = {};\n  /** Map cell locations: CellIdStr -> HCL[] */\n  private _hclMap: Dictionary<HCL[]> = {};\n  /** Store handlers per cell location: HCLString -> AppSignalCb[] */\n  private _signalHandlers: Dictionary<AppSignalCb[]> = {};\n  /** Store cell proxies per cell: CellIdStr -> CellProxy */\n  private _cellProxies: Dictionary<CellProxy> = {};\n\n\n  /** Map HCLString: CloneId -> CloneName */\n  private _cellNames: Dictionary<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 this._appWs.overrideInstalledAppId;}\n\n  /** */\n  getAppCells(appId: InstalledAppId): RoleCellsMap | undefined {\n    return this._cellsByApp[appId];\n  }\n\n\n  getCellName(hcl: HCL): string {return this._cellNames[hcl.toString()]}\n\n\n  /** */\n  getLocations(cellId: CellId): HCL[] | undefined {\n    return this._hclMap[CellIdStr(cellId)];\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 = 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 | CellId): CellProxy {\n    if (cellIdOrLoc instanceof HCL) {\n      const cell = this.getCell(cellIdOrLoc);\n      const maybeProxy = this.getCellProxy(cell.id);\n      if (!maybeProxy) throw Error(\"getCellProxy() failed. Proxy not found for cell \" + CellIdStr(cell.id));\n      return maybeProxy;\n    }\n    const sId = CellIdStr(cellIdOrLoc);\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    if (!this._cellsByApp[installedAppId]) return undefined;\n    return Object.values(this._cellsByApp[installedAppId]).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\n  async createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"createCloneCell() called:\", request)\n    return this._appWs!.createCloneCell(request);\n  }\n\n  /** -- AppApi (Passthrough to appWebsocket) -- */\n\n  async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"enableCloneCell() called:\", request)\n    return this._appWs!.enableCloneCell(request);\n  }\n\n  async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    //console.log(\"disableCloneCell() called:\", request)\n    return this._appWs!.disableCloneCell(request);\n  }\n\n  async appInfo(args: AppInfoRequest): Promise<AppInfoResponse> {\n    return this._appWs!.appInfo(args);\n  }\n\n  async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appWs.callZome(req, timeout)\n  }\n\n\n  /** -- Creation -- */\n\n  /** async Factory */\n  static async new(port_or_socket: number | AppWebsocket, defaultTimeout?: number): Promise<ConductorAppProxy> {\n    if (typeof port_or_socket == 'object') {\n      return  ConductorAppProxy.fromSocket(port_or_socket);\n    } else {\n      const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n      let wsUrl = `ws://localhost:${port_or_socket}`\n      try {\n        let conductor = new ConductorAppProxy(timeout);\n        conductor._appWs = await AppWebsocket.connect(wsUrl, timeout);\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): Promise<ConductorAppProxy> {\n    try {\n      let conductor = new ConductorAppProxy(appWebsocket.defaultTimeout);\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  /** Ctor */\n  /*protected*/ constructor(public defaultTimeout: number) {\n    /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));\n  }\n\n\n  /** -- Methods -- */\n\n  /** */\n  async fetchCell(appId: InstalledAppId, cellId: CellId): Promise<Cell> {\n    const appInfo = await this.appInfo({installed_app_id: appId});\n    //console.log(\"fetchCell\", appInfo);\n    if (appInfo == null) {\n      return Promise.reject(`getCell() failed. App \"${appId}\" not found on AppWebsocket \"${this._appWs.client.socket.url}\"`);\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 (areCellsEqual(cell.id, cellId)) {\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({installed_app_id: appId});\n    if (appInfo == null) {\n      return Promise.reject(`fetchCells() failed. App \"${appId}\" not found on AppWebsocket \"${this._appWs.client.socket.url}\"`);\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: Dictionary<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 in cellInfo) {\n          continue;\n        }\n        if (CellType.Cloned in cellInfo) {\n          if (clones[cellInfo.cloned.clone_id]) {\n            console.error(`fetchCells() Entry already exist for clone: \"${cellInfo.cloned.clone_id}\"`)\n          }\n          clones[cellInfo.cloned.clone_id] = cellInfo.cloned;\n        } else {\n          provisioned = cellInfo.provisioned;\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 = CellIdStr(cell.id);\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 CellId -> 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: AppSignal): void {\n    /** Grab cell specific handlers */\n    const hcls = this.getLocations(signal.cell_id);\n    const handlerss: AppSignalCb[][]  = hcls? hcls.map((hcl) => this._signalHandlers[hcl.toString()]) : [];\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: AppSignalCb, 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  private logSignal(signal: AppSignal): void {\n    this._signalLogs.push([Date.now(), CellIdStr(signal.cell_id), signal])\n    //console.log(\"signal logged\", this._signalLogs)\n  }\n\n\n  /** */\n  dumpSignals(cellId?: CellId) {\n    if (cellId) {\n      const cellStr = CellIdStr(cellId);\n      const hcls = this._hclMap[cellStr];\n      const names = hcls.map((hcl) => this.getCellName(hcl));\n      console.warn(`Dumping signal logs for cell \"${names}\"`);\n      const logs = this._signalLogs\n        .filter((log) => log[1] == cellStr)\n        .map((log) => {\n          return { timestamp: prettyDate(new Date(log[0])), zome: log[2].zome_name, payload: log[2].payload}\n        });\n      console.table(logs);\n    } else {\n      console.warn(\"Dumping all signal logs\", )\n      const logs = this._signalLogs\n        .map((log) => {\n          const app = this._hclMap[log[1]][0].appId\n          const cell: string = this._hclMap[log[1]][0].roleName;\n          return { timestamp: prettyDate(new Date(log[0])), app, cell, zome: log[2].zome_name, payload: log[2].payload}\n        });\n      console.table(logs);\n    }\n  }\n}\n\n"]}
+{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,GAOb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGpC;;;;;;;GAOG;AACH,MAAM,OAAO,iBAAkB,SAAQ,QAAQ;IAO7C,oBAAoB;IAEpB,iGAAiG;IACjG,IAAI,YAAY,KAAiC,OAAO,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA,CAAC;IAG5F,KAAK,CAAC,eAAe,CAAC,OAA+B;QACnD,mDAAmD;QACnD,OAAO,IAAI,CAAC,MAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,iDAAiD;IAEjD,KAAK,CAAC,eAAe,CAAC,OAA+B;QACnD,mDAAmD;QACnD,OAAO,IAAI,CAAC,MAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QACrD,oDAAoD;QACpD,OAAO,IAAI,CAAC,MAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAoB;QAChC,OAAO,IAAI,CAAC,MAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAoB,EAAE,OAAgB;QACnD,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;IAGD,qBAAqB;IAErB,oBAAoB;IACpB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,cAAqC,EAAE,cAAuB;QAC7E,IAAI,OAAO,cAAc,IAAI,QAAQ,EAAE;YACrC,OAAQ,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;SACtD;aAAM;YACL,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC;YAC5D,IAAI,KAAK,GAAG,kBAAkB,cAAc,EAAE,CAAA;YAC9C,IAAI;gBACF,IAAI,SAAS,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC/C,SAAS,CAAC,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC9D,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,GAAE,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAA,CAAC,CAAC,CAAA;gBACjE,OAAO,SAAS,CAAC;aAClB;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,CAAA;gBAC3D,OAAO,OAAO,CAAC,MAAM,CAAC,yCAAyC,CAAC,CAAC;aAClE;SACF;IACH,CAAC;IAGD,MAAM;IACE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAA0B;QACxD,IAAI;YACF,IAAI,SAAS,GAAG,IAAI,iBAAiB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YACnE,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;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,CAAA;YAC3D,OAAO,OAAO,CAAC,MAAM,CAAC,yCAAyC,CAAC,CAAC;SAClE;IACH,CAAC;IAGD,WAAW;IACX,aAAa,CAAC,YAAmB,cAAsB;QACrD,KAAK,CAAC,cAAc,CAAC,CAAC;QADS,mBAAc,GAAd,cAAc,CAAQ;QAErD,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,CAAC;CAEF","sourcesContent":["import {\n  AppApi,\n  AppInfoRequest,\n  AppInfoResponse,\n  AppWebsocket,\n  CallZomeRequest,\n  InstalledAppId,\n  CreateCloneCellRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n} from \"@holochain/client\";\nimport {AppProxy} from \"./AppProxy\";\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 AppApi {\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  async createCloneCell(request: CreateCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"createCloneCell() called:\", request)\n    return this._appWs!.createCloneCell(request);\n  }\n\n  /** -- AppApi (Passthrough to appWebsocket) -- */\n\n  async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"enableCloneCell() called:\", request)\n    return this._appWs!.enableCloneCell(request);\n  }\n\n  async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    //console.log(\"disableCloneCell() called:\", request)\n    return this._appWs!.disableCloneCell(request);\n  }\n\n  async appInfo(args: AppInfoRequest): Promise<AppInfoResponse> {\n    return this._appWs!.appInfo(args);\n  }\n\n  async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appWs.callZome(req, timeout)\n  }\n\n\n  /** -- Creation -- */\n\n  /** async Factory */\n  static async new(port_or_socket: number | AppWebsocket, defaultTimeout?: number): Promise<ConductorAppProxy> {\n    if (typeof port_or_socket == 'object') {\n      return  ConductorAppProxy.fromSocket(port_or_socket);\n    } else {\n      const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;\n      let wsUrl = `ws://localhost:${port_or_socket}`\n      try {\n        let conductor = new ConductorAppProxy(timeout);\n        conductor._appWs = await AppWebsocket.connect(wsUrl, timeout);\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): Promise<ConductorAppProxy> {\n    try {\n      let conductor = new ConductorAppProxy(appWebsocket.defaultTimeout);\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  /** Ctor */\n  /*protected*/ constructor(public defaultTimeout: number) {\n    super(defaultTimeout);\n    /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));\n  }\n\n}\n\n"]}

package/dist/ExternalAppProxy.d.ts

@@ -0,0 +1,15 @@
+import { AppApi, AppInfoRequest, AppInfoResponse, CallZomeRequest, DisableCloneCellRequest, EnableCloneCellRequest, ClonedCell } from "@holochain/client";
+import { AppProxy } from "./AppProxy";
+/**
+ *
+ */
+export declare class ExternalAppProxy extends AppProxy implements AppApi {
+    private _appApi;
+    /** Ctor */
+    constructor(_appApi: AppApi, defaultTimeout: number);
+    /** -- AppApi (Passthrough to external AppApi) -- */
+    enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell>;
+    disableCloneCell(request: DisableCloneCellRequest): Promise<void>;
+    appInfo(args: AppInfoRequest): Promise<AppInfoResponse>;
+    callZome(req: CallZomeRequest, timeout?: number): Promise<unknown>;
+}

package/dist/ExternalAppProxy.js

@@ -0,0 +1,29 @@
+import { AppProxy } from "./AppProxy";
+/**
+ *
+ */
+export class ExternalAppProxy extends AppProxy {
+    /** Ctor */
+    /*protected*/ constructor(_appApi, defaultTimeout) {
+        super(defaultTimeout);
+        this._appApi = _appApi;
+        /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));
+    }
+    /** -- AppApi (Passthrough to external AppApi) -- */
+    async enableCloneCell(request) {
+        //console.log("enableCloneCell() called:", request)
+        return this._appApi.enableCloneCell(request);
+    }
+    async disableCloneCell(request) {
+        //console.log("disableCloneCell() called:", request)
+        return this._appApi.disableCloneCell(request);
+    }
+    async appInfo(args) {
+        return this._appApi.appInfo(args);
+    }
+    async callZome(req, timeout) {
+        timeout = timeout ? timeout : this.defaultTimeout;
+        return this._appApi.callZome(req, timeout);
+    }
+}
+//# sourceMappingURL=ExternalAppProxy.js.map

package/dist/ExternalAppProxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExternalAppProxy.js","sourceRoot":"","sources":["../src/ExternalAppProxy.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGpC;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,QAAQ;IAE5C,WAAW;IACX,aAAa,CAAC,YAAoB,OAAe,EAAE,cAAsB;QACvE,KAAK,CAAC,cAAc,CAAC,CAAC;QADU,YAAO,GAAP,OAAO,CAAQ;QAE/C,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,CAAC;IAID,oDAAoD;IAEpD,KAAK,CAAC,eAAe,CAAC,OAA+B;QACnD,mDAAmD;QACnD,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QACrD,oDAAoD;QACpD,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,IAAoB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAoB,EAAE,OAAgB;QACnD,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAA;QACjD,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAC5C,CAAC;CAGF","sourcesContent":["import {\n  AppApi,\n  AppInfoRequest,\n  AppInfoResponse,\n  CallZomeRequest,\n  DisableCloneCellRequest,\n  EnableCloneCellRequest,\n  ClonedCell,\n} from \"@holochain/client\";\nimport {AppProxy} from \"./AppProxy\";\n\n\n/**\n *\n */\nexport class ExternalAppProxy extends AppProxy implements AppApi {\n\n  /** Ctor */\n  /*protected*/ constructor(private _appApi: AppApi, defaultTimeout: number) {\n    super(defaultTimeout);\n    /*const _unsub =*/ this.addSignalHandler((sig) => this.logSignal(sig));\n  }\n\n\n\n  /** -- AppApi (Passthrough to external AppApi) -- */\n\n  async enableCloneCell(request: EnableCloneCellRequest): Promise<ClonedCell> {\n    //console.log(\"enableCloneCell() called:\", request)\n    return this._appApi.enableCloneCell(request);\n  }\n\n  async disableCloneCell(request: DisableCloneCellRequest): Promise<void> {\n    //console.log(\"disableCloneCell() called:\", request)\n    return this._appApi.disableCloneCell(request);\n  }\n  async appInfo(args: AppInfoRequest): Promise<AppInfoResponse> {\n    return this._appApi.appInfo(args);\n  }\n\n  async callZome(req: CallZomeRequest, timeout?: number): Promise<unknown> {\n    timeout = timeout ? timeout : this.defaultTimeout\n    return this._appApi.callZome(req, timeout)\n  }\n\n\n}\n\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddd-qc/cell-proxy",
-  "version": "0.17.2",
+  "version": "0.18.0",
   "description": "Proxy classes and helpers for managing a Holochain AppWebsocket",
   "main": "dist/index.js",
   "module": "dist/index.js",