@holochain/client 0.3.0 → 0.3.4

package/README.md

@@ -1,16 +1,14 @@
-# holochain-client-js
-
-[![Project](https://img.shields.io/badge/project-holochain-blue.svg?style=flat-square)](http://holochain.org/)
-[![Forum](https://img.shields.io/badge/chat-forum%2eholochain%2enet-blue.svg?style=flat-square)](https://forum.holochain.org)
-
+[![Project](https://img.shields.io/badge/Project-Holochain-blue.svg?style=flat-square)](http://holochain.org/)
+[![Forum](https://img.shields.io/badge/Forum-forum%2eholochain%2enet-blue.svg?style=flat-square)](https://forum.holochain.org)
+[![License: CAL 1.0](https://img.shields.io/badge/License-CAL%201.0-blue.svg)](https://github.com/holochain/cryptographic-autonomy-license)
+![Test](https://github.com/holochain/holochain-client-js/actions/workflows/test.yml/badge.svg?branch=main)
 [![Twitter Follow](https://img.shields.io/twitter/follow/holochain.svg?style=social&label=Follow)](https://twitter.com/holochain)
-License: [![License: CAL 1.0](https://img.shields.io/badge/License-CAL%201.0-blue.svg)](https://github.com/holochain/cryptographic-autonomy-license)
 
-A Nodejs client for the Holochain Conductor API
+# Holochain Client - JavaScript
 
-# Conductor API documentation
+A JavaScript client for the Holochain Conductor API (works with browsers as well as Nodejs).
 
-Holochain's Conductor API is under active development. This client package tracks that development fairly closely but sometimes gets behind.
+> Holochain's Conductor API is under active development. This client package tracks that development fairly closely but sometimes gets behind.
 
 ## Installation
 
@@ -58,11 +56,10 @@ See [docs/API.md](docs/API.md)
 
 # Holochain Compatibility
 
-This version of `@holochain/client` is currently working with
-- `holochain/holochain` at tag [holochain-0.0.121][https://github.com/holochain/holochain/tree/holochain-0.0.121)
-- hdk version [0.0.117 from crates.io](https://crates.io/crates/hdk/0.0.117)
+See [default.nix](./default.nix) for the Holochain version this package is compatible with.
 
-If updating this code, please make changes to the git `rev/sha` above.  (You can get this from `hn-introspect` after updating the holonix-hash)
+If updating the Holochain version included in holonix, please use `niv update` as explained in the
+[Holochain Installation Guide](https://developer.holochain.org/install/#upgrading-the-holochain-version).
 
 ## Running tests
 
@@ -77,16 +74,18 @@ nix-shell
 ```
 
 ## Contribute
+
 Holochain is an open source project.  We welcome all sorts of participation and are actively working on increasing surface area to accept it.  Please see our [contribution guidelines](/CONTRIBUTING.md) for our general practices and protocols on participating in the community, as well as specific expectations around things like code formatting, testing practices, continuous integration, etc.
 
 * Connect with us on our [forum](https://forum.holochain.org)
 
 ## License
+
  [![License: CAL 1.0](https://img.shields.io/badge/License-CAL%201.0-blue.svg)](https://github.com/holochain/cryptographic-autonomy-license)
 
-Copyright (C) 2020-2021, Holochain Foundation
+Copyright (C) 2020-2022, Holochain Foundation
 
 This program is free software: you can redistribute it and/or modify it under the terms of the license
 provided in the LICENSE file (CAL-1.0).  This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+PURPOSE.

package/lib/api/admin/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./types.js";
+export * from "./websocket.js";

package/lib/api/admin/index.js

@@ -0,0 +1,3 @@
+export * from "./types.js";
+export * from "./websocket.js";
+//# sourceMappingURL=index.js.map

package/lib/api/admin/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/admin/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC"}

package/lib/api/{admin.d.ts → admin/types.d.ts}

@@ -1,8 +1,7 @@
 /// <reference types="node" />
-import { Requester } from "./common";
-import { HoloHash, AgentPubKey, DnaProperties, InstalledAppId, CellId, RoleId } from "../types/common";
-import { InstalledAppInfo, MembraneProof } from "./types";
-import { FullStateDump } from "./state-dump";
+import { AgentPubKey, CellId, DnaHash, DnaProperties, HeaderHash, HoloHash, InstalledAppId, InstalledCell, KitsuneAgent, KitsuneSpace, RoleId, Signature } from "../../types.js";
+import { DhtOp, Entry, Header } from "../../hdk/index.js";
+import { Requester } from "../common.js";
 export declare type AttachAppInterfaceRequest = {
     port: number;
 };
@@ -22,6 +21,42 @@ export declare type EnableAppResponse = {
     app: InstalledAppInfo;
     errors: Array<[CellId, string]>;
 };
+export declare type DeactivationReason = {
+    never_activated: null;
+} | {
+    normal: null;
+} | {
+    quarantined: {
+        error: string;
+    };
+};
+export declare type PausedAppReason = {
+    error: string;
+};
+export declare type DisabledAppReason = {
+    never_started: null;
+} | {
+    user: null;
+} | {
+    error: string;
+};
+export declare type InstalledAppInfoStatus = {
+    paused: {
+        reason: PausedAppReason;
+    };
+} | {
+    disabled: {
+        reason: DisabledAppReason;
+    };
+} | {
+    running: null;
+};
+export declare type InstalledAppInfo = {
+    installed_app_id: InstalledAppId;
+    cell_data: Array<InstalledCell>;
+    status: InstalledAppInfoStatus;
+};
+export declare type MembraneProof = Buffer;
 export declare type DisableAppRequest = {
     installed_app_id: InstalledAppId;
 };
@@ -222,3 +257,35 @@ export declare type Zomes = Array<[string, {
 export declare type WasmCode = [HoloHash, {
     code: Array<number>;
 }];
+export interface AgentInfoDump {
+    kitsune_agent: KitsuneAgent;
+    kitsune_space: KitsuneSpace;
+    dump: string;
+}
+export interface P2pAgentsDump {
+    this_agent_info: AgentInfoDump | undefined;
+    this_dna: [DnaHash, KitsuneSpace] | undefined;
+    this_agent: [AgentPubKey, KitsuneAgent] | undefined;
+    peers: Array<AgentInfoDump>;
+}
+export interface FullIntegrationStateDump {
+    validation_limbo: Array<DhtOp>;
+    integration_limbo: Array<DhtOp>;
+    integrated: Array<DhtOp>;
+    dht_ops_cursor: number;
+}
+export interface SourceChainJsonElement {
+    signature: Signature;
+    header_address: HeaderHash;
+    header: Header;
+    entry: Entry | undefined;
+}
+export interface SourceChainJsonDump {
+    elements: Array<SourceChainJsonElement>;
+    published_ops_count: number;
+}
+export interface FullStateDump {
+    peer_dump: P2pAgentsDump;
+    source_chain_dump: SourceChainJsonDump;
+    integration_dump: FullIntegrationStateDump;
+}

package/lib/api/{admin.js → admin/types.js}

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppStatusFilter = void 0;
-var AppStatusFilter;
+export var AppStatusFilter;
 (function (AppStatusFilter) {
     AppStatusFilter["Enabled"] = "enabled";
     AppStatusFilter["Disabled"] = "disabled";
     AppStatusFilter["Running"] = "running";
     AppStatusFilter["Stopped"] = "stopped";
     AppStatusFilter["Paused"] = "paused";
-})(AppStatusFilter = exports.AppStatusFilter || (exports.AppStatusFilter = {}));
-//# sourceMappingURL=admin.js.map
+})(AppStatusFilter || (AppStatusFilter = {}));
+//# sourceMappingURL=types.js.map

package/lib/api/admin/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/admin/types.ts"],"names":[],"mappings":"AAgOA,MAAM,CAAN,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,sCAAmB,CAAA;IACnB,wCAAqB,CAAA;IACrB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACnB,CAAC,EANW,eAAe,KAAf,eAAe,QAM1B"}

package/lib/{websocket/admin.d.ts → api/admin/websocket.d.ts}

@@ -14,9 +14,9 @@
  *        console.error('problem generating agent:', err)
  *      })
  */
-import * as Api from '../api/admin';
-import { WsClient } from './client';
-import { Transformer, Requester } from '../api/common';
+import * as Api from "./types.js";
+import { WsClient } from "../client.js";
+import { Transformer, Requester } from "../common.js";
 export declare class AdminWebsocket implements Api.AdminApi {
     client: WsClient;
     defaultTimeout: number;

package/lib/api/admin/websocket.js

@@ -0,0 +1,107 @@
+/**
+ * Defines AdminWebsocket, an easy-to-use websocket implementation of the
+ * Conductor Admin API
+ *
+ *    const client = AdminWebsocket.connect(
+ *      'ws://localhost:9000'
+ *    )
+ *
+ *    client.generateAgentPubKey()
+ *      .then(agentPubKey => {
+ *        console.log('Agent successfully generated:', agentPubKey)
+ *      })
+ *      .catch(err => {
+ *        console.error('problem generating agent:', err)
+ *      })
+ */
+import * as Api from "./types.js";
+import { WsClient } from "../client.js";
+import { catchError, promiseTimeout, DEFAULT_TIMEOUT } from "../common.js";
+import { requesterTransformer } from "../common.js";
+import { getLauncherEnvironment } from "../../environments/launcher.js";
+export class AdminWebsocket {
+    client;
+    defaultTimeout;
+    constructor(client, defaultTimeout) {
+        this.client = client;
+        this.defaultTimeout =
+            defaultTimeout === undefined ? DEFAULT_TIMEOUT : defaultTimeout;
+    }
+    static async connect(url, defaultTimeout) {
+        // Check if we are in the launcher's environment, and if so, redirect the url to connect to
+        const env = await getLauncherEnvironment();
+        if (env) {
+            url = `ws://localhost:${env.ADMIN_INTERFACE_PORT}`;
+        }
+        const wsClient = await WsClient.connect(url);
+        return new AdminWebsocket(wsClient, defaultTimeout);
+    }
+    _requester = (tag, transformer) => requesterTransformer((req, timeout) => promiseTimeout(this.client.request(req), tag, timeout || this.defaultTimeout).then(catchError), tag, transformer);
+    // the specific request/response types come from the Interface
+    // which this class implements
+    attachAppInterface = this._requester("attach_app_interface");
+    // Deprecated
+    activateApp = this._requester("activate_app");
+    // Deprecated
+    deactivateApp = this._requester("deactivate_app");
+    enableApp = this._requester("enable_app");
+    disableApp = this._requester("disable_app");
+    startApp = this._requester("start_app");
+    dumpState = this._requester("dump_state", dumpStateTransform);
+    dumpFullState = this._requester("dump_full_state");
+    generateAgentPubKey = this._requester("generate_agent_pub_key");
+    registerDna = this._requester("register_dna");
+    installApp = this._requester("install_app");
+    uninstallApp = this._requester("uninstall_app");
+    installAppBundle = this._requester("install_app_bundle");
+    createCloneCell = this._requester("create_clone_cell");
+    listDnas = this._requester("list_dnas");
+    listCellIds = this._requester("list_cell_ids");
+    // Deprecated
+    listActiveApps = this._requester("list_active_apps");
+    listApps = this._requester("list_apps", listAppsTransform);
+    listAppInterfaces = this._requester("list_app_interfaces");
+    requestAgentInfo = this._requester("request_agent_info");
+    addAgentInfo = this._requester("add_agent_info");
+}
+const listAppsTransform = {
+    input: (req) => {
+        const args = {};
+        if (req.status_filter) {
+            args.status_filter = getAppStatusInApiForm(req.status_filter);
+        }
+        return args;
+    },
+    output: (res) => res,
+};
+const dumpStateTransform = {
+    input: (req) => req,
+    output: (res) => {
+        return JSON.parse(res);
+    },
+};
+function getAppStatusInApiForm(status_filter) {
+    switch (status_filter) {
+        case Api.AppStatusFilter.Running:
+            return {
+                Running: null,
+            };
+        case Api.AppStatusFilter.Enabled:
+            return {
+                Enabled: null,
+            };
+        case Api.AppStatusFilter.Paused:
+            return {
+                Paused: null,
+            };
+        case Api.AppStatusFilter.Disabled:
+            return {
+                Disabled: null,
+            };
+        case Api.AppStatusFilter.Stopped:
+            return {
+                Stopped: null,
+            };
+    }
+}
+//# sourceMappingURL=websocket.js.map

package/lib/api/admin/websocket.js.map

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

package/lib/api/app/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./types.js";
+export * from "./websocket.js";

package/lib/api/app/index.js

@@ -0,0 +1,3 @@
+export * from "./types.js";
+export * from "./websocket.js";
+//# sourceMappingURL=index.js.map

package/lib/api/app/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/app/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC"}

package/lib/api/{app.d.ts → app/types.d.ts}

@@ -1,7 +1,7 @@
-import { Requester } from "./common";
-import { CellId, AgentPubKey, InstalledAppId } from "../types/common";
-import { InstalledAppInfo } from "./types";
-import { CapSecret } from "../types/capabilities";
+import { CapSecret } from "../../hdk/capabilities.js";
+import { AgentPubKey, CellId, InstalledAppId } from "../../types.js";
+import { Requester } from "../common.js";
+import { InstalledAppInfo } from "../admin/index.js";
 export declare type CallZomeRequestGeneric<Payload> = {
     cap_secret: CapSecret | null;
     cell_id: CellId;

package/lib/api/app/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/lib/api/app/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/app/types.ts"],"names":[],"mappings":""}

package/lib/{websocket/app.d.ts → api/app/websocket.d.ts}

@@ -1,11 +1,12 @@
-import { AppApi, AppInfoRequest, AppInfoResponse, CallZomeRequestGeneric, CallZomeResponseGeneric, AppSignalCb } from '../api/app';
-import { WsClient } from './client';
-import { Transformer, Requester } from '../api/common';
+import { InstalledAppId } from "../../types.js";
+import { WsClient } from "../client.js";
+import { Requester, Transformer } from "../common.js";
+import { AppApi, AppInfoRequest, AppInfoResponse, AppSignalCb, CallZomeRequestGeneric, CallZomeResponseGeneric } from "./types.js";
 export declare class AppWebsocket implements AppApi {
-    protected overrideInstalledAppId?: string | undefined;
     client: WsClient;
     defaultTimeout: number;
-    constructor(client: WsClient, defaultTimeout?: number, overrideInstalledAppId?: string | undefined);
+    protected overrideInstalledAppId?: InstalledAppId;
+    constructor(client: WsClient, defaultTimeout?: number, overrideInstalledAppId?: InstalledAppId);
     static connect(url: string, defaultTimeout?: number, signalCb?: AppSignalCb): Promise<AppWebsocket>;
     _requester: <ReqO, ReqI, ResI, ResO>(tag: string, transformer?: Transformer<ReqO, ReqI, ResI, ResO> | undefined) => (req: ReqO, timeout?: number | undefined) => Promise<ResO>;
     appInfo: Requester<AppInfoRequest, AppInfoResponse>;

package/lib/{websocket/app.js → api/app/websocket.js}

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppWebsocket = void 0;
 /**
  * Defines AppWebsocket, an easy-to-use websocket implementation of the
  * Conductor API for apps
@@ -18,40 +15,42 @@ exports.AppWebsocket = void 0;
  *        console.error('problem installing DNA:', err)
  *      })
  */
-const msgpack_1 = require("@msgpack/msgpack");
-const client_1 = require("./client");
-const common_1 = require("./common");
-const common_2 = require("../api/common");
-const launcher_1 = require("../environments/launcher");
-class AppWebsocket {
+import { decode, encode } from "@msgpack/msgpack";
+import { getLauncherEnvironment } from "../../environments/launcher.js";
+import { WsClient } from "../client.js";
+import { catchError, DEFAULT_TIMEOUT, promiseTimeout, requesterTransformer, } from "../common.js";
+export class AppWebsocket {
+    client;
+    defaultTimeout;
+    overrideInstalledAppId;
     constructor(client, defaultTimeout, overrideInstalledAppId) {
-        this.overrideInstalledAppId = overrideInstalledAppId;
-        this._requester = (tag, transformer) => (0, common_2.requesterTransformer)((req, timeout) => (0, common_1.promiseTimeout)(this.client.request(req), tag, timeout || this.defaultTimeout).then(common_1.catchError), tag, transformer);
-        this.appInfo = this._requester('app_info', appInfoTransform(this.overrideInstalledAppId));
-        this.callZome = this._requester('zome_call', callZomeTransform);
         this.client = client;
-        this.defaultTimeout = defaultTimeout === undefined ? common_1.DEFAULT_TIMEOUT : defaultTimeout;
+        this.defaultTimeout =
+            defaultTimeout === undefined ? DEFAULT_TIMEOUT : defaultTimeout;
+        this.overrideInstalledAppId = overrideInstalledAppId;
     }
     static async connect(url, defaultTimeout, signalCb) {
         // Check if we are in the launcher's environment, and if so, redirect the url to connect to
-        const env = await (0, launcher_1.getLauncherEnvironment)();
+        const env = await getLauncherEnvironment();
         if (env) {
             url = `ws://localhost:${env.APP_INTERFACE_PORT}`;
         }
-        const wsClient = await client_1.WsClient.connect(url, signalCb);
+        const wsClient = await WsClient.connect(url, signalCb);
         return new AppWebsocket(wsClient, defaultTimeout, env ? env.INSTALLED_APP_ID : undefined);
     }
+    _requester = (tag, transformer) => requesterTransformer((req, timeout) => promiseTimeout(this.client.request(req), tag, timeout || this.defaultTimeout).then(catchError), tag, transformer);
+    appInfo = this._requester("app_info", appInfoTransform(this.overrideInstalledAppId));
+    callZome = this._requester("zome_call", callZomeTransform);
 }
-exports.AppWebsocket = AppWebsocket;
 const callZomeTransform = {
     input: (req) => {
         return {
             ...req,
-            payload: (0, msgpack_1.encode)(req.payload),
+            payload: encode(req.payload),
         };
     },
     output: (res) => {
-        return (0, msgpack_1.decode)(res);
+        return decode(res);
     },
 };
 const appInfoTransform = (overrideInstalledAppId) => ({
@@ -67,4 +66,4 @@ const appInfoTransform = (overrideInstalledAppId) => ({
         return res;
     },
 });
-//# sourceMappingURL=app.js.map
+//# sourceMappingURL=websocket.js.map

package/lib/api/app/websocket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/api/app/websocket.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,UAAU,EACV,eAAe,EACf,cAAc,EAEd,oBAAoB,GAErB,MAAM,cAAc,CAAC;AAUtB,MAAM,OAAO,YAAY;IACvB,MAAM,CAAW;IACjB,cAAc,CAAS;IACb,sBAAsB,CAAkB;IAElD,YACE,MAAgB,EAChB,cAAuB,EACvB,sBAAuC;QAEvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc;YACjB,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;QAClE,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,GAAW,EACX,cAAuB,EACvB,QAAsB;QAEtB,2FAA2F;QAC3F,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAE3C,IAAI,GAAG,EAAE;YACP,GAAG,GAAG,kBAAkB,GAAG,CAAC,kBAAkB,EAAE,CAAC;SAClD;QAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,OAAO,IAAI,YAAY,CACrB,QAAQ,EACR,cAAc,EACd,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CACvC,CAAC;IACJ,CAAC;IAED,UAAU,GAAG,CACX,GAAW,EACX,WAAiD,EACjD,EAAE,CACF,oBAAoB,CAClB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CACf,cAAc,CACZ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EACxB,GAAG,EACH,OAAO,IAAI,IAAI,CAAC,cAAc,CAC/B,CAAC,IAAI,CAAC,UAAU,CAAC,EACpB,GAAG,EACH,WAAW,CACZ,CAAC;IAEJ,OAAO,GAA+C,IAAI,CAAC,UAAU,CACnE,UAAU,EACV,gBAAgB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAC9C,CAAC;IACF,QAAQ,GAGJ,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;CACrD;AAED,MAAM,iBAAiB,GAKnB;IACF,KAAK,EAAE,CACL,GAAgC,EACI,EAAE;QACtC,OAAO;YACL,GAAG,GAAG;YACN,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;SAC7B,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,CACN,GAAwC,EACV,EAAE;QAChC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,sBAAuC,EAMvC,EAAE,CAAC,CAAC;IACJ,KAAK,EAAE,CAAC,GAAmB,EAAkB,EAAE;QAC7C,IAAI,sBAAsB,EAAE;YAC1B,OAAO;gBACL,gBAAgB,EAAE,sBAAsB;aACzC,CAAC;SACH;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,EAAE,CAAC,GAAoB,EAAmB,EAAE;QAChD,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAC,CAAC"}

package/lib/{websocket → api}/client.d.ts

@@ -1,6 +1,6 @@
-import Websocket from "isomorphic-ws";
 import { decode } from "@msgpack/msgpack";
-import { AppSignalCb } from "../api/app";
+import Websocket from "isomorphic-ws";
+import { AppSignalCb } from "./app/types.js";
 /**
  * A Websocket client which can make requests and receive responses,
  * as well as send and receive signals

package/lib/{websocket → api}/client.js

@@ -1,18 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WsClient = void 0;
-const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
-const msgpack_1 = require("@msgpack/msgpack");
+import { decode, encode } from "@msgpack/msgpack";
+import Websocket from "isomorphic-ws";
 /**
  * A Websocket client which can make requests and receive responses,
  * as well as send and receive signals
  *
  * Uses Holochain's websocket WireMessage for communication.
  */
-class WsClient {
+export class WsClient {
+    socket;
+    pendingRequests;
+    index;
+    alreadyWarnedNoSignalCb;
     constructor(socket, signalCb) {
         this.socket = socket;
         this.pendingRequests = {};
@@ -25,10 +23,10 @@ class WsClient {
             if (typeof Buffer === "undefined" || !Buffer.isBuffer(data)) {
                 data = await data.arrayBuffer();
             }
-            const msg = (0, msgpack_1.decode)(data);
+            const msg = decode(data);
             if (msg.type === "Signal") {
                 if (signalCb) {
-                    const decodedMessage = (0, msgpack_1.decode)(msg.data);
+                    const decodedMessage = decode(msg.data);
                     if (!decodedMessage.App) {
                         // We have received a system signal, do nothing
                         return;
@@ -47,11 +45,11 @@ class WsClient {
                 }
                 else {
                     if (!this.alreadyWarnedNoSignalCb)
-                        console.log('Received signal but no signal callback was set in constructor');
+                        console.log("Received signal but no signal callback was set in constructor");
                     this.alreadyWarnedNoSignalCb = true;
                 }
             }
-            else if (msg.type === 'Response') {
+            else if (msg.type === "Response") {
                 this.handleResponse(msg);
             }
             else {
@@ -60,19 +58,19 @@ class WsClient {
         };
     }
     emitSignal(data) {
-        const encodedMsg = (0, msgpack_1.encode)({
-            type: 'Signal',
-            data: (0, msgpack_1.encode)(data),
+        const encodedMsg = encode({
+            type: "Signal",
+            data: encode(data),
         });
         this.socket.send(encodedMsg);
     }
     request(data) {
         const id = this.index;
         this.index += 1;
-        const encodedMsg = (0, msgpack_1.encode)({
+        const encodedMsg = encode({
             id,
-            type: 'Request',
-            data: (0, msgpack_1.encode)(data),
+            type: "Request",
+            data: encode(data),
         });
         const promise = new Promise((fulfill, reject) => {
             this.pendingRequests[id] = { fulfill, reject };
@@ -81,7 +79,7 @@ class WsClient {
             this.socket.send(encodedMsg);
         }
         else {
-            return Promise.reject(new Error('Socket is not open'));
+            return Promise.reject(new Error("Socket is not open"));
         }
         return promise;
     }
@@ -90,10 +88,10 @@ class WsClient {
         if (this.pendingRequests[id]) {
             // resolve response
             if (msg.data === null || msg.data === undefined) {
-                this.pendingRequests[id].reject(new Error('Response canceled by responder'));
+                this.pendingRequests[id].reject(new Error("Response canceled by responder"));
             }
             else {
-                this.pendingRequests[id].fulfill((0, msgpack_1.decode)(msg.data));
+                this.pendingRequests[id].fulfill(decode(msg.data));
             }
         }
         else {
@@ -105,11 +103,11 @@ class WsClient {
         return this.awaitClose();
     }
     awaitClose() {
-        return new Promise((resolve) => this.socket.on('close', resolve));
+        return new Promise((resolve) => this.socket.on("close", resolve));
     }
     static connect(url, signalCb) {
         return new Promise((resolve, reject) => {
-            const socket = new isomorphic_ws_1.default(url);
+            const socket = new Websocket(url);
             // make sure that there are no uncaught connection
             // errors because that causes nodejs thread to crash
             // with uncaught exception
@@ -122,8 +120,7 @@ class WsClient {
         });
     }
 }
-exports.WsClient = WsClient;
 const signalTransform = (res) => {
-    return (0, msgpack_1.decode)(res);
+    return decode(res);
 };
 //# sourceMappingURL=client.js.map

package/lib/api/client.js.map

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

package/lib/api/common.d.ts

@@ -1,9 +1,4 @@
-/**
- * Take a Requester function which deals with tagged requests and responses,
- * and return a Requester which deals only with the inner data types, also
- * with the optional Transformer applied to further modify the input and output.
- */
-export declare const requesterTransformer: <ReqO, ReqI, ResI, ResO>(requester: Requester<Tagged<ReqI>, Tagged<ResI>>, tag: string, transform?: Transformer<ReqO, ReqI, ResI, ResO>) => (req: ReqO, timeout?: number | undefined) => Promise<ResO>;
+export declare const DEFAULT_TIMEOUT = 15000;
 export declare type Transformer<ReqO, ReqI, ResI, ResO> = {
     input: (req: ReqO) => ReqI;
     output: (res: ResI) => ResO;
@@ -14,3 +9,11 @@ export declare type Tagged<T> = {
     type: string;
     data: T;
 };
+/**
+ * Take a Requester function which deals with tagged requests and responses,
+ * and return a Requester which deals only with the inner data types, also
+ * with the optional Transformer applied to further modify the input and output.
+ */
+export declare const requesterTransformer: <ReqO, ReqI, ResI, ResO>(requester: Requester<Tagged<ReqI>, Tagged<ResI>>, tag: string, transform?: Transformer<ReqO, ReqI, ResI, ResO>) => (req: ReqO, timeout?: number) => Promise<ResO>;
+export declare const catchError: (res: any) => Promise<any>;
+export declare const promiseTimeout: (promise: Promise<any>, tag: string, ms: number) => Promise<unknown>;