@ddd-qc/cell-proxy 0.9.8 → 0.10.1

package/README.md

@@ -1,5 +1,9 @@
 # cell-proxy
 
+**Compatible with:**
+- **HDK v0.1.0-beta-rc.1** & **HDI v0.2.0-beta-rc.1**
+- **@holochain/client v0.11.9**
+- 
 Proxy classes and helpers for managing a [Holochain](https://www.npmjs.com/package/@holochain/client) AppWebsocket and calling zome functions on cells.
 The intent is to make the development of web UI of Holochain apps in javascript / typescript faster & easier by providing a straightforward API for communicating with a Conductor, and some basic logging features.
 

package/dist/CellProxy.d.ts

@@ -1,7 +1,6 @@
-import { CallZomeRequest, CapSecret, CellId, InstalledCell, ZomeName } from "@holochain/client";
-import { AgentPubKeyB64, DnaHashB64 } from "@holochain-open-dev/core-types";
+import { CallZomeRequest, CapSecret, ZomeName, Cell } from "@holochain/client";
 import { ConductorAppProxy } from "./ConductorAppProxy";
-import { IInstalledCell, RoleInstanceId } from "./types";
+import { Empty } from "./mixins";
 export interface RequestLog {
     request: CallZomeRequest;
     timeout: number;
@@ -14,28 +13,29 @@ export interface ResponseLog {
     timestamp: number;
     requestIndex: number;
 }
+declare const CellProxy_base: (abstract new (...args: any[]) => {
+    _cell?: Cell;
+    readonly cell: Cell;
+    readonly cellId: import("@holochain/client").CellId;
+    readonly dnaHash: string;
+    readonly agentPubKey: string; /** -- Fields -- */
+}) & typeof Empty;
 /**
  * Proxy for a running DNA.
  * It logs and queues ZomeCalls.
  * It holds a reference to its ConductorAppProxy and its InstalledCell.
  * This class is expected to be used by ZomeProxies.
  */
-export declare class CellProxy implements IInstalledCell {
+export declare class CellProxy extends CellProxy_base {
     private _conductor;
-    readonly installedCell: InstalledCell;
     /** Ctor */
-    constructor(_conductor: ConductorAppProxy, installedCell: InstalledCell, defaultTimeout?: number);
+    constructor(_conductor: ConductorAppProxy, cell: Cell, defaultTimeout?: number);
     /** -- Fields -- */
     defaultTimeout: number;
     /** append only logs */
     private _requestLog;
     private _responseLog;
     private _canCallBlocking;
-    /** -- InstalledCell interface -- */
-    get roleInstanceId(): RoleInstanceId;
-    get cellId(): CellId;
-    get dnaHash(): DnaHashB64;
-    get agentPubKey(): AgentPubKeyB64;
     /** -- Methods -- */
     dumpSignals(): void;
     /** Pass call request to conductor proxy and log it */
@@ -55,3 +55,4 @@ export declare class CellProxy implements IInstalledCell {
     /**  */
     dumpLogs(zomeName?: ZomeName): void;
 }
+export {};

package/dist/CellProxy.js

@@ -1,124 +1,135 @@
-import { serializeHash } from "@holochain-open-dev/utils";
+import { __awaiter } from "tslib";
+import { encodeHashToBase64 } from "@holochain/client";
 import { anyToB64, delay, prettyDate, prettyDuration } from "./utils";
+import { CellMixin, Empty } from "./mixins";
 /**
  * Proxy for a running DNA.
  * It logs and queues ZomeCalls.
  * It holds a reference to its ConductorAppProxy and its InstalledCell.
  * This class is expected to be used by ZomeProxies.
  */
-export class CellProxy {
+export class CellProxy extends CellMixin(Empty) {
     /** Ctor */
-    constructor(_conductor, installedCell, 
+    constructor(_conductor, cell, 
     //public readonly dnaDef: MyDnaDef,
     defaultTimeout) {
+        super();
         this._conductor = _conductor;
-        this.installedCell = installedCell;
         //private _blockingRequestQueue: Queue<RequestLog> = new Queue();
         /** append only logs */
         this._requestLog = [];
         this._responseLog = [];
         this._canCallBlocking = true;
+        this._cell = cell;
+        console.log(`CellProxy.ctor`, cell);
         this.defaultTimeout = defaultTimeout ? defaultTimeout : 10 * 1000;
     }
-    /** -- InstalledCell interface -- */
-    get roleInstanceId() { return this.installedCell.role_id; }
-    get cellId() { return this.installedCell.cell_id; }
-    get dnaHash() { return serializeHash(this.installedCell.cell_id[0]); }
-    get agentPubKey() { return serializeHash(this.installedCell.cell_id[1]); }
+    // /** -- ICell interface -- */
+    //
+    // get dnaHash(): DnaHashB64 { return encodeHashToBase64(this.cell.cell_id[0]) }
+    // get agentPubKey(): AgentPubKeyB64 { return encodeHashToBase64(this.cell.cell_id[1]) }
     /** -- Methods -- */
     // /** */
     // addSignalHandler(handler: AppSignalCb): SignalUnsubscriber {
     //   return this._conductor.addSignalHandler(handler, this.cellId);
     // }
     dumpSignals() {
-        this._conductor.dumpSignals(this.cellId);
+        this._conductor.dumpSignals(this.cell.cell_id);
     }
     /** Pass call request to conductor proxy and log it */
-    async executeZomeCall(reqLog) {
-        reqLog.executionTimestamp = Date.now();
-        const requestIndex = this._requestLog.length;
-        this._requestLog.push(reqLog);
-        try {
-            const response = await this._conductor.callZome(reqLog.request, reqLog.timeout);
-            const respLog = { requestIndex, success: response, timestamp: Date.now() };
-            this._responseLog.push(respLog);
-            return respLog;
-        }
-        catch (e) {
-            const respLog = { requestIndex, failure: e, timestamp: Date.now() };
-            this._responseLog.push(respLog);
-            return respLog;
-        }
+    executeZomeCall(reqLog) {
+        return __awaiter(this, void 0, void 0, function* () {
+            reqLog.executionTimestamp = Date.now();
+            const requestIndex = this._requestLog.length;
+            this._requestLog.push(reqLog);
+            try {
+                const response = yield this._conductor.callZome(reqLog.request, reqLog.timeout);
+                const respLog = { requestIndex, success: response, timestamp: Date.now() };
+                this._responseLog.push(respLog);
+                return respLog;
+            }
+            catch (e) {
+                const respLog = { requestIndex, failure: e, timestamp: Date.now() };
+                this._responseLog.push(respLog);
+                return respLog;
+            }
+        });
     }
     /**
      * callZome() with "Mutex" (for calls that writes to source-chain)
      * TODO: Implement call queue instead of mutex
      */
-    async callZomeBlocking(zome_name, fn_name, payload, cap_secret, timeout) {
-        timeout = timeout ? timeout : this.defaultTimeout;
-        const req = {
-            cap_secret, zome_name, fn_name, payload,
-            cell_id: this.installedCell.cell_id,
-            provenance: this.installedCell.cell_id[1],
-        };
-        const log = { request: req, timeout, requestTimestamp: Date.now() };
-        while (!this._canCallBlocking && Date.now() - log.requestTimestamp < timeout) {
-            await delay(1);
-        }
-        if (Date.now() - log.requestTimestamp >= timeout) {
-            console.warn({ requestLogs: this._requestLog });
-            return Promise.reject("Waiting for zomeCall execution timed-out");
-        }
-        this._canCallBlocking = false;
-        const respLog = await this.executeZomeCall(log);
-        this._canCallBlocking = true;
-        if (respLog.failure) {
-            this.dumpSignals();
-            this.dumpLogs(zome_name);
-            return Promise.reject(respLog.failure);
-        }
-        return respLog.success;
+    callZomeBlocking(zome_name, fn_name, payload, cap_secret, timeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            timeout = timeout ? timeout : this.defaultTimeout;
+            const req = {
+                cap_secret, zome_name, fn_name, payload,
+                cell_id: this.cell.cell_id,
+                provenance: this.cell.cell_id[1],
+            };
+            const log = { request: req, timeout, requestTimestamp: Date.now() };
+            while (!this._canCallBlocking && Date.now() - log.requestTimestamp < timeout) {
+                yield delay(1);
+            }
+            if (Date.now() - log.requestTimestamp >= timeout) {
+                console.warn({ requestLogs: this._requestLog });
+                return Promise.reject("Waiting for zomeCall execution timed-out");
+            }
+            this._canCallBlocking = false;
+            const respLog = yield this.executeZomeCall(log);
+            this._canCallBlocking = true;
+            if (respLog.failure) {
+                this.dumpSignals();
+                this.dumpLogs(zome_name);
+                return Promise.reject(respLog.failure);
+            }
+            return respLog.success;
+        });
     }
     /** */
-    async callZome(zome_name, fn_name, payload, cap_secret, timeout) {
-        timeout = timeout ? timeout : this.defaultTimeout;
-        const req = {
-            cap_secret, zome_name, fn_name, payload,
-            cell_id: this.installedCell.cell_id,
-            provenance: this.installedCell.cell_id[1],
-        };
-        const log = { request: req, timeout, requestTimestamp: Date.now() };
-        const respLog = await this.executeZomeCall(log);
-        if (respLog.failure) {
-            this.dumpSignals();
-            this.dumpLogs(zome_name);
-            return Promise.reject(respLog.failure);
-        }
-        return respLog.success;
+    callZome(zome_name, fn_name, payload, cap_secret, timeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            timeout = timeout ? timeout : this.defaultTimeout;
+            const req = {
+                cap_secret, zome_name, fn_name, payload,
+                cell_id: this.cell.cell_id,
+                provenance: this.cell.cell_id[1],
+            };
+            const log = { request: req, timeout, requestTimestamp: Date.now() };
+            const respLog = yield this.executeZomeCall(log);
+            if (respLog.failure) {
+                this.dumpSignals();
+                this.dumpLogs(zome_name);
+                return Promise.reject(respLog.failure);
+            }
+            return respLog.success;
+        });
     }
     /**
      * Calls the `entry_defs()` zome function and
      * returns an array of all the zome's AppEntryDefNames and visibility
      */
-    async callEntryDefs(zomeName) {
-        //console.log("callEntryDefs()", zomeName)
-        try {
-            const entryDefs = await this.callZome(zomeName, "entry_defs", null, null, 2 * 1000);
-            //console.debug("getEntryDefs() for " + this.zomeName + " result:")
-            //console.log({entryDefs})
-            let result = [];
-            for (const def of entryDefs.Defs) {
-                const name = def.id.App;
-                result.push([name, def.visibility.hasOwnProperty('Public')]);
+    callEntryDefs(zomeName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            //console.log("callEntryDefs()", zomeName)
+            try {
+                const entryDefs = yield this.callZome(zomeName, "entry_defs", null, null, 2 * 1000);
+                //console.debug("getEntryDefs() for " + this.zomeName + " result:")
+                //console.log({entryDefs})
+                let result = [];
+                for (const def of entryDefs.Defs) {
+                    const name = def.id.App;
+                    result.push([name, def.visibility.hasOwnProperty('Public')]);
+                }
+                //console.log({result})
+                return result;
             }
-            //console.log({result})
-            return result;
-        }
-        catch (e) {
-            console.error("Calling getEntryDefs() on " + zomeName + " failed: ");
-            console.error({ e });
-            return Promise.reject(e);
-        }
+            catch (e) {
+                console.error("Calling getEntryDefs() on " + zomeName + " failed: ");
+                console.error({ e });
+                return Promise.reject(e);
+            }
+        });
     }
     // /** TODO once we have getDnaDefinition() api */
     // dumpAllZomes() {
@@ -138,7 +149,7 @@ export class CellProxy {
             const startTime = prettyDate(new Date(requestLog.requestTimestamp));
             const waitTime = prettyDuration(new Date(requestLog.executionTimestamp - requestLog.requestTimestamp));
             const duration = prettyDuration(new Date(response.timestamp - requestLog.requestTimestamp));
-            const input = requestLog.request.payload instanceof Uint8Array ? serializeHash(requestLog.request.payload) : requestLog.request.payload;
+            const input = requestLog.request.payload instanceof Uint8Array ? encodeHashToBase64(requestLog.request.payload) : requestLog.request.payload;
             const output = anyToB64(response.failure ? response.failure : response.success);
             const log = zomeName
                 ? { startTime, fnName: requestLog.request.fn_name, input, output, duration, waitTime }

package/dist/CellProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"CellProxy.js","sourceRoot":"","sources":["../src/CellProxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CellProxy.js","sourceRoot":"","sources":["../src/CellProxy.ts"],"names":[],"mappings":"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"}

package/dist/ConductorAppProxy.d.ts

@@ -1,7 +1,6 @@
-import { AppApi, AppInfoRequest, AppInfoResponse, AppSignal, AppSignalCb, AppWebsocket, CallZomeRequest, CellId, InstalledAppId, InstalledCell } from "@holochain/client";
+import { AppApi, AppInfoRequest, AppInfoResponse, AppSignal, AppSignalCb, AppWebsocket, CallZomeRequest, CellId, InstalledAppId, InstalledCell, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, Cell } from "@holochain/client";
 import { CellProxy } from "./CellProxy";
-import { CellsMap, BaseRoleName, RoleInstanceId, RoleCells } from "./types";
-import { ArchiveCloneCellRequest, CreateCloneCellRequest } from "@holochain/client/lib/api/app/types";
+import { RoleCellsMap, BaseRoleName, CellsForRole } from "./types";
 import { HCL, HCLString } from "./hcl";
 /** */
 export interface SignalUnsubscriber {
@@ -19,32 +18,33 @@ export declare class ConductorAppProxy implements AppApi {
     defaultTimeout: number;
     /** -- Fields -- */
     private _appWs;
-    /** [Timestamp, CellIdStr, Signal] */
+    /** Signal log: [Timestamp, CellIdStr, Signal] */
     private _signalLogs;
-    /** InstalledAppId -> (BaseRoleName -> RoleInstalledCells) */
-    private _installedCellsByApp;
-    /** CellIdStr -> HCL[] */
+    /** Map cells per App: InstalledAppId -> (BaseRoleName -> RoleInstalledCells) */
+    private _cellsByApp;
+    /** Map cell locations: CellIdStr -> HCL[] */
     private _hclMap;
-    /** HCLString -> AppSignalCb */
+    /** Store handlers per cell locaiton: HCLString -> AppSignalCb */
     private _signalHandlers;
-    /** CellIdStr -> CellProxy */
+    /** Store cell proxies per cell: CellIdStr -> CellProxy */
     private _cellProxies;
     /** -- Getters -- */
     /** */
-    getAppCells(appId: InstalledAppId): CellsMap | undefined;
+    getAppCells(appId: InstalledAppId): RoleCellsMap | undefined;
     /** */
     getLocations(cellId: CellId): HCL[] | undefined;
     /** */
-    getCell(hcl: HCL): InstalledCell;
+    getCell(hcl: HCL): Cell;
     /** Get stored CellProxy or attempt to create it */
     getCellProxy(cellIdOrLoc: HCL | CellId): CellProxy;
     /** */
-    getAppRoleInstanceIds(installedAppId: InstalledAppId): RoleInstanceId[] | undefined;
+    getAppRoles(installedAppId: InstalledAppId): BaseRoleName[] | undefined;
     /** */
-    getClones(appId: InstalledAppId, baseRoleName: BaseRoleName): InstalledCell[];
-    /** -- AppApi (Passthrough to appWebsocket) -- */
+    getClones(appId: InstalledAppId, baseRoleName: BaseRoleName): Cell[];
     createCloneCell(request: CreateCloneCellRequest): Promise<InstalledCell>;
-    archiveCloneCell(request: ArchiveCloneCellRequest): Promise<void>;
+    /** -- AppApi (Passthrough to appWebsocket) -- */
+    enableCloneCell(request: EnableCloneCellRequest): Promise<InstalledCell>;
+    disableCloneCell(request: DisableCloneCellRequest): Promise<void>;
     appInfo(args: AppInfoRequest): Promise<AppInfoResponse>;
     callZome(req: CallZomeRequest, timeout?: number): Promise<any>;
     /** -- Creation -- */
@@ -55,9 +55,12 @@ export declare class ConductorAppProxy implements AppApi {
     /** Ctor */
     private constructor();
     /** -- Methods -- */
-    fetchCells(appId: InstalledAppId, baseRoleName: BaseRoleName): Promise<RoleCells>;
     /** */
-    addClone(hcl: HCL, cloneCell: InstalledCell): void;
+    fetchCell(appId: InstalledAppId, cellId: CellId): Promise<Cell>;
+    /** */
+    fetchCells(appId: InstalledAppId, baseRoleName: BaseRoleName): Promise<CellsForRole>;
+    /** */
+    addClone(hcl: HCL, cloneCell: Cell): void;
     /** */
     createCellProxy(hcl: HCL): CellProxy;
     /** */