@holochain/client 0.18.0-dev.9 → 0.19.0-dev.1

package/README.md

@@ -15,12 +15,12 @@ A JavaScript client for the Holochain Conductor API (works with browsers as well
 
 ## Installation
 
+**JS client v0.19.x** is compatible with **Holochain v0.5.x**.
+
 **JS client v0.18.x** is compatible with **Holochain v0.4.x**.
 
 **JS client v0.17.x** is compatible with **Holochain v0.3.x**.
 
-**JS client v0.16.x** is compatible with **Holochain v0.2.x**.
-
 To install from NPM, run
 ```bash
 npm install --save-exact @holochain/client
@@ -179,8 +179,9 @@ You need `holochain` and `hc` on your path, best to get them from nix with `nix-
 
 To perform the pre-requisite DNA compilation steps, and run the Nodejs test, run:
 ```bash
-nix-shell
-./run-test.sh
+nix develop
+./build-fixture.sh
+npm run test
 ```
 
 ## Contribute

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

@@ -120,6 +120,7 @@ export type AppInfo = {
     installed_app_id: InstalledAppId;
     cell_info: Record<RoleName, Array<CellInfo>>;
     status: InstalledAppInfoStatus;
+    installed_at: Timestamp;
 };
 /**
  * @public
@@ -180,6 +181,22 @@ export type GenerateAgentPubKeyRequest = void;
  * @public
  */
 export type GenerateAgentPubKeyResponse = AgentPubKey;
+/**
+ * @public
+ */
+export type RevokeAgentKeyRequest = {
+    agent_key: AgentPubKey;
+    app_id: InstalledAppId;
+};
+/**
+ * Contains a list of errors of the cells where deletion was unsuccessful.
+ *
+ * If the key could not be deleted from all cells, the call
+ * {@link RevokeAgentKeyRequest} can be re-attempted to delete the key from the remaining cells.
+ *
+ * @public
+ */
+export type RevokeAgentKeyResponse = [CellId, string][];
 /**
  * @public
  */
@@ -398,8 +415,11 @@ export type NetworkSeed = string;
 export type InstallAppRequest = {
     /**
      * The agent to use when creating Cells for this App.
+     * If not specified, a new agent will be generated by Holochain.
+     * If DPKI is enabled (default), and the agent key is not specified here,
+     * a new agent key will be derived from the DPKI device seed and registered with DPKI.
      */
-    agent_key: AgentPubKey;
+    agent_key?: AgentPubKey;
     /**
      * The unique identifier for an installed app in this conductor.
      * If not specified, it will be derived from the app name in the bundle manifest.
@@ -523,7 +543,7 @@ export interface DeleteCloneCellRequest {
     /**
      * The clone id or cell id of the clone cell
      */
-    clone_cell_id: RoleName | CellId;
+    clone_cell_id: RoleName | DnaHash;
 }
 /**
  * @public

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

@@ -2,7 +2,7 @@ import { CapSecret, GrantedFunctions } from "../../hdk/index.js";
 import type { AgentPubKey, CellId } from "../../types.js";
 import { WsClient } from "../client.js";
 import { Requester, Transformer, WebsocketConnectionOptions } from "../common.js";
-import { AddAgentInfoRequest, AddAgentInfoResponse, AdminApi, AgentInfoRequest, AgentInfoResponse, AttachAppInterfaceRequest, AttachAppInterfaceResponse, DeleteCloneCellRequest, DeleteCloneCellResponse, DisableAppRequest, DisableAppResponse, DumpFullStateRequest, DumpFullStateResponse, DumpNetworkStatsRequest, DumpNetworkStatsResponse, DumpStateRequest, DumpStateResponse, EnableAppRequest, EnableAppResponse, GenerateAgentPubKeyRequest, GenerateAgentPubKeyResponse, GetCompatibleCellsRequest, GetCompatibleCellsResponse, GetDnaDefinitionRequest, GetDnaDefinitionResponse, GrantZomeCallCapabilityRequest, GrantZomeCallCapabilityResponse, InstallAppRequest, InstallAppResponse, IssueAppAuthenticationTokenRequest, IssueAppAuthenticationTokenResponse, ListAppInterfacesRequest, ListAppInterfacesResponse, ListAppsRequest, ListAppsResponse, ListCellIdsRequest, ListCellIdsResponse, ListDnasRequest, ListDnasResponse, RegisterDnaRequest, RegisterDnaResponse, StorageInfoRequest, StorageInfoResponse, UninstallAppRequest, UninstallAppResponse, UpdateCoordinatorsRequest, UpdateCoordinatorsResponse } from "./types.js";
+import { AddAgentInfoRequest, AddAgentInfoResponse, AdminApi, AgentInfoRequest, AgentInfoResponse, AttachAppInterfaceRequest, AttachAppInterfaceResponse, DeleteCloneCellRequest, DeleteCloneCellResponse, DisableAppRequest, DisableAppResponse, DumpFullStateRequest, DumpFullStateResponse, DumpNetworkStatsRequest, DumpNetworkStatsResponse, DumpStateRequest, DumpStateResponse, EnableAppRequest, EnableAppResponse, GenerateAgentPubKeyRequest, GenerateAgentPubKeyResponse, GetCompatibleCellsRequest, GetCompatibleCellsResponse, GetDnaDefinitionRequest, GetDnaDefinitionResponse, GrantZomeCallCapabilityRequest, GrantZomeCallCapabilityResponse, InstallAppRequest, InstallAppResponse, IssueAppAuthenticationTokenRequest, IssueAppAuthenticationTokenResponse, ListAppInterfacesRequest, ListAppInterfacesResponse, ListAppsRequest, ListAppsResponse, ListCellIdsRequest, ListCellIdsResponse, ListDnasRequest, ListDnasResponse, RegisterDnaRequest, RegisterDnaResponse, RevokeAgentKeyRequest, RevokeAgentKeyResponse, StorageInfoRequest, StorageInfoResponse, UninstallAppRequest, UninstallAppResponse, UpdateCoordinatorsRequest, UpdateCoordinatorsResponse } from "./types.js";
 /**
  * A class for interacting with a conductor's Admin API.
  *
@@ -51,6 +51,10 @@ export declare class AdminWebsocket implements AdminApi {
      * Generate a new agent pub key.
      */
     generateAgentPubKey: Requester<GenerateAgentPubKeyRequest, GenerateAgentPubKeyResponse>;
+    /**
+     * Generate a new agent pub key.
+     */
+    revokeAgentKey: Requester<RevokeAgentKeyRequest, RevokeAgentKeyResponse>;
     /**
      * Register a DNA for later app installation.
      *

package/lib/api/admin/websocket.js

@@ -68,6 +68,10 @@ export class AdminWebsocket {
      * Generate a new agent pub key.
      */
     generateAgentPubKey = this._requester("generate_agent_pub_key");
+    /**
+     * Generate a new agent pub key.
+     */
+    revokeAgentKey = this._requester("revoke_agent_key");
     /**
      * Register a DNA for later app installation.
      *

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

@@ -1,5 +1,5 @@
 import { UnsubscribeFunction } from "emittery";
-import { AgentPubKey, AppAuthenticationToken, AppInfo, CapSecret, CellId, ClonedCell, DnaHash, DnaProperties, FunctionName, InstalledAppId, MembraneProof, MemproofMap, NetworkInfo, NetworkSeed, Nonce256Bit, RoleName, Timestamp, Transformer, WebsocketConnectionOptions, ZomeName } from "../../index.js";
+import { AgentPubKey, AppAuthenticationToken, AppInfo, CapSecret, CellId, ClonedCell, DnaHash, DnaProperties, EntryHash, FunctionName, InstalledAppId, MembraneProof, MemproofMap, NetworkInfo, NetworkSeed, Nonce256Bit, RoleName, Timestamp, Transformer, WebsocketConnectionOptions, ZomeName } from "../../index.js";
 /**
  * @public
  */
@@ -40,7 +40,7 @@ export type AppNetworkInfoRequest = Omit<NetworkInfoRequest, "agent_pub_key">;
  * @public
  */
 export interface AppEvents {
-    signal: AppSignal;
+    signal: Signal;
 }
 /**
  * @public
@@ -152,7 +152,7 @@ export interface DisableCloneCellRequest {
     /**
      * The clone id or cell id of the clone cell
      */
-    clone_cell_id: RoleName | CellId;
+    clone_cell_id: RoleName | DnaHash;
 }
 /**
  * @public
@@ -193,10 +193,18 @@ export declare const SignalType: {
 /**
  * @public
  */
-export type Signal = {
+export type RawSignal = {
     [SignalType.App]: EncodedAppSignal;
 } | {
-    [SignalType.System]: unknown;
+    [SignalType.System]: SystemSignal;
+};
+/**
+ * @public
+ */
+export type Signal = {
+    [SignalType.App]: AppSignal;
+} | {
+    [SignalType.System]: SystemSignal;
 };
 /**
  * @public
@@ -217,7 +225,13 @@ export type AppSignal = {
 /**
  * @public
  */
-export type AppSignalCb = (signal: AppSignal) => void;
+export type SystemSignal = {
+    SuccessfulCountersigning: EntryHash;
+};
+/**
+ * @public
+ */
+export type SignalCb = (signal: Signal) => void;
 /**
  * @public
  */
@@ -227,7 +241,7 @@ export type NetworkInfoResponse = NetworkInfo[];
  */
 export interface AppClient {
     callZome(args: AppCallZomeRequest, timeout?: number): Promise<any>;
-    on<Name extends keyof AppEvents>(eventName: Name | readonly Name[], listener: AppSignalCb): UnsubscribeFunction;
+    on<Name extends keyof AppEvents>(eventName: Name | readonly Name[], listener: SignalCb): UnsubscribeFunction;
     appInfo(): Promise<AppInfoResponse>;
     myPubKey: AgentPubKey;
     installedAppId: InstalledAppId;

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

@@ -1,7 +1,7 @@
 import { UnsubscribeFunction } from "emittery";
 import { AgentPubKey, CellId, InstalledAppId, RoleName } from "../../types.js";
 import { AppInfo, MemproofMap } from "../admin/index.js";
-import { AppCallZomeRequest, AppClient, AppEvents, AppNetworkInfoRequest, AppCreateCloneCellRequest, AppDisableCloneCellRequest, AppEnableCloneCellRequest, AppSignalCb, CallZomeRequest, CallZomeRequestSigned, CallZomeResponse, CreateCloneCellResponse, DisableCloneCellResponse, EnableCloneCellResponse, NetworkInfoResponse, AppWebsocketConnectionOptions } from "./types.js";
+import { AppCallZomeRequest, AppClient, AppEvents, AppNetworkInfoRequest, AppCreateCloneCellRequest, AppDisableCloneCellRequest, AppEnableCloneCellRequest, SignalCb, CallZomeRequest, CallZomeRequestSigned, CallZomeResponse, CreateCloneCellResponse, DisableCloneCellResponse, EnableCloneCellResponse, NetworkInfoResponse, AppWebsocketConnectionOptions } from "./types.js";
 import { WsClient } from "../client.js";
 /**
  * A class to establish a websocket connection to an App interface, for a
@@ -16,6 +16,7 @@ export declare class AppWebsocket implements AppClient {
     private readonly defaultTimeout;
     private readonly emitter;
     private readonly callZomeTransform;
+    private readonly appAuthenticationToken;
     cachedAppInfo?: AppInfo | null;
     private readonly appInfoRequester;
     private readonly callZomeRequester;
@@ -101,9 +102,8 @@ export declare class AppWebsocket implements AppClient {
      * @param listener - The function to call when event is triggered.
      * @returns A function to unsubscribe the event listener.
      */
-    on<Name extends keyof AppEvents>(eventName: Name | readonly Name[], listener: AppSignalCb): UnsubscribeFunction;
+    on<Name extends keyof AppEvents>(eventName: Name | readonly Name[], listener: SignalCb): UnsubscribeFunction;
     private static requester;
-    private containsCell;
 }
 /**
  * @public

package/lib/api/app/websocket.js

@@ -1,6 +1,6 @@
 import Emittery from "emittery";
 import { omit } from "lodash-es";
-import { CellType } from "../admin/index.js";
+import { CellType, } from "../admin/index.js";
 import { catchError, DEFAULT_TIMEOUT, getBaseRoleNameFromCloneId, HolochainError, isCloneId, promiseTimeout, requesterTransformer, } from "../common.js";
 import { getHostZomeCallSigner, getLauncherEnvironment, } from "../../environments/launcher.js";
 import { decode, encode } from "@msgpack/msgpack";
@@ -22,6 +22,7 @@ export class AppWebsocket {
     defaultTimeout;
     emitter;
     callZomeTransform;
+    appAuthenticationToken;
     cachedAppInfo;
     appInfoRequester;
     callZomeRequester;
@@ -31,12 +32,13 @@ export class AppWebsocket {
     enableCloneCellRequester;
     disableCloneCellRequester;
     networkInfoRequester;
-    constructor(client, appInfo, callZomeTransform, defaultTimeout) {
+    constructor(client, appInfo, token, callZomeTransform, defaultTimeout) {
         this.client = client;
         this.myPubKey = appInfo.agent_pub_key;
         this.installedAppId = appInfo.installed_app_id;
         this.defaultTimeout = defaultTimeout ?? DEFAULT_TIMEOUT;
         this.callZomeTransform = callZomeTransform ?? defaultCallZomeTransform;
+        this.appAuthenticationToken = token;
         this.emitter = new Emittery();
         this.cachedAppInfo = appInfo;
         this.appInfoRequester = AppWebsocket.requester(this.client, "app_info", this.defaultTimeout);
@@ -57,9 +59,7 @@ export class AppWebsocket {
             }
         });
         this.client.on("signal", (signal) => {
-            if (this.containsCell(signal.cell_id)) {
-                this.emitter.emit("signal", signal).catch(console.error);
-            }
+            this.emitter.emit("signal", signal).catch(console.error);
         });
     }
     /**
@@ -79,21 +79,15 @@ export class AppWebsocket {
             throw new HolochainError("ConnectionUrlMissing", `unable to connect to Conductor API - no url provided and not in a launcher environment.`);
         }
         const client = await WsClient.connect(options.url, options.wsClientOptions);
-        if (env?.APP_INTERFACE_TOKEN) {
-            // Note: This will only work for multiple connections if a single_use = false token is provided
-            await client.authenticate({ token: env.APP_INTERFACE_TOKEN });
-        }
-        else {
-            if (!options.token) {
-                throw new HolochainError("AppAuthenticationTokenMissing", `unable to connect to Conductor API - no app authentication token provided.`);
-            }
-            await client.authenticate({ token: options.token });
-        }
+        const token = options.token ?? env?.APP_INTERFACE_TOKEN;
+        if (!token)
+            throw new HolochainError("AppAuthenticationTokenMissing", `unable to connect to Conductor API - no app authentication token provided.`);
+        await client.authenticate({ token });
         const appInfo = await AppWebsocket.requester(client, "app_info", DEFAULT_TIMEOUT)(null);
         if (!appInfo) {
             throw new HolochainError("AppNotFound", `The app your connection token was issued for was not found. The app needs to be installed and enabled.`);
         }
-        return new AppWebsocket(client, appInfo, options.callZomeTransform, options.defaultTimeout);
+        return new AppWebsocket(client, appInfo, token, options.callZomeTransform, options.defaultTimeout);
     }
     /**
      * Request the app's info, including all cell infos.
@@ -239,25 +233,6 @@ export class AppWebsocket {
     static requester(client, tag, defaultTimeout, transformer) {
         return requesterTransformer((req, timeout) => promiseTimeout(client.request(req), tag, timeout || defaultTimeout).then(catchError), tag, transformer);
     }
-    containsCell(cellId) {
-        const appInfo = this.cachedAppInfo;
-        if (!appInfo) {
-            return false;
-        }
-        for (const roleName of Object.keys(appInfo.cell_info)) {
-            for (const cellInfo of appInfo.cell_info[roleName]) {
-                const currentCellId = CellType.Provisioned in cellInfo
-                    ? cellInfo[CellType.Provisioned].cell_id
-                    : CellType.Cloned in cellInfo
-                        ? cellInfo[CellType.Cloned].cell_id
-                        : undefined;
-                if (currentCellId && isSameCell(currentCellId, cellId)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
 }
 const defaultCallZomeTransform = {
     input: async (request) => {

package/lib/api/client.d.ts

@@ -23,8 +23,8 @@ export declare class WsClient extends Emittery {
     options: WsClientOptions;
     private pendingRequests;
     private index;
+    private authenticationToken;
     constructor(socket: IsoWebSocket, url?: URL, options?: WsClientOptions);
-    private setupSocket;
     /**
      * Instance factory for creating WsClients.
      *
@@ -47,6 +47,10 @@ export declare class WsClient extends Emittery {
      * @param request - The authentication request, containing an app authentication token.
      */
     authenticate(request: AppAuthenticationRequest): Promise<void>;
+    /**
+     * Close the websocket connection.
+     */
+    close(code?: number): Promise<IsoWebSocket.CloseEvent>;
     /**
      * Send requests to the connected websocket.
      *
@@ -56,10 +60,9 @@ export declare class WsClient extends Emittery {
     request<Response>(request: unknown): Promise<Response>;
     private exchange;
     private sendMessage;
+    private registerMessageListener;
+    private registerCloseListener;
+    private reconnectWebsocket;
     private handleResponse;
-    /**
-     * Close the websocket connection.
-     */
-    close(code?: number): Promise<CloseEvent>;
 }
 export { IsoWebSocket };

package/lib/api/client.js

@@ -17,71 +17,16 @@ export class WsClient extends Emittery {
     options;
     pendingRequests;
     index;
+    authenticationToken;
     constructor(socket, url, options) {
         super();
+        this.registerMessageListener(socket);
+        this.registerCloseListener(socket);
         this.socket = socket;
         this.url = url;
         this.options = options || {};
         this.pendingRequests = {};
         this.index = 0;
-        this.setupSocket();
-    }
-    setupSocket() {
-        this.socket.onmessage = async (serializedMessage) => {
-            // If data is not a buffer (nodejs), it will be a blob (browser)
-            let deserializedData;
-            if (globalThis.window &&
-                serializedMessage.data instanceof globalThis.window.Blob) {
-                deserializedData = await serializedMessage.data.arrayBuffer();
-            }
-            else {
-                if (typeof Buffer !== "undefined" &&
-                    Buffer.isBuffer(serializedMessage.data)) {
-                    deserializedData = serializedMessage.data;
-                }
-                else {
-                    throw new HolochainError("UnknownMessageFormat", `incoming message has unknown message format - ${deserializedData}`);
-                }
-            }
-            const message = decode(deserializedData);
-            assertHolochainMessage(message);
-            if (message.type === "signal") {
-                if (message.data === null) {
-                    throw new HolochainError("UnknownSignalFormat", "incoming signal has no data");
-                }
-                const deserializedSignal = decode(message.data);
-                assertHolochainSignal(deserializedSignal);
-                if (SignalType.System in deserializedSignal) {
-                    // We have received a system signal, do nothing
-                    return;
-                }
-                const encodedAppSignal = deserializedSignal[SignalType.App];
-                // In order to return readable content to the UI, the signal payload must also be deserialized.
-                const payload = decode(encodedAppSignal.signal);
-                const signal = {
-                    cell_id: encodedAppSignal.cell_id,
-                    zome_name: encodedAppSignal.zome_name,
-                    payload,
-                };
-                this.emit("signal", signal);
-            }
-            else if (message.type === "response") {
-                this.handleResponse(message);
-            }
-            else {
-                throw new HolochainError("UnknownMessageType", `incoming message has unknown type - ${message.type}`);
-            }
-        };
-        this.socket.onclose = (event) => {
-            const pendingRequestIds = Object.keys(this.pendingRequests).map((id) => parseInt(id));
-            if (pendingRequestIds.length) {
-                pendingRequestIds.forEach((id) => {
-                    const error = new HolochainError("ClientClosedWithPendingRequests", `client closed with pending requests - close event code: ${event.code}, request id: ${id}`);
-                    this.pendingRequests[id].reject(error);
-                    delete this.pendingRequests[id];
-                });
-            }
-        };
     }
     /**
      * Instance factory for creating WsClients.
@@ -93,13 +38,13 @@ export class WsClient extends Emittery {
     static connect(url, options) {
         return new Promise((resolve, reject) => {
             const socket = new IsoWebSocket(url, options);
-            socket.onerror = (errorEvent) => {
+            socket.addEventListener("error", (errorEvent) => {
                 reject(new HolochainError("ConnectionError", `could not connect to Holochain Conductor API at ${url} - ${errorEvent.error}`));
-            };
-            socket.onopen = () => {
+            });
+            socket.addEventListener("open", (_) => {
                 const client = new WsClient(socket, url, options);
                 resolve(client);
-            };
+            }, { once: true });
         });
     }
     /**
@@ -122,16 +67,35 @@ export class WsClient extends Emittery {
      * @param request - The authentication request, containing an app authentication token.
      */
     async authenticate(request) {
-        return this.exchange(request, (request, resolve) => {
+        this.authenticationToken = request.token;
+        return this.exchange(request, (request, resolve, reject) => {
+            const invalidTokenCloseListener = (closeEvent) => {
+                this.authenticationToken = undefined;
+                reject(new HolochainError("InvalidTokenError", `could not connect to ${this.url} due to an invalid app authentication token - close code ${closeEvent.code}`));
+            };
+            this.socket.addEventListener("close", invalidTokenCloseListener, {
+                once: true,
+            });
             const encodedMsg = encode({
                 type: "authenticate",
                 data: encode(request),
             });
             this.socket.send(encodedMsg);
-            // Message just needs to be sent first, no need to wait for a response or even require a flush
-            resolve(null);
+            // Wait before resolving in case authentication fails.
+            setTimeout(() => {
+                this.socket.removeEventListener("close", invalidTokenCloseListener);
+                resolve(null);
+            }, 10);
         });
     }
+    /**
+     * Close the websocket connection.
+     */
+    close(code = 1000) {
+        const closedPromise = new Promise((resolve) => this.socket.addEventListener("close", (closeEvent) => resolve(closeEvent), { once: true }));
+        this.socket.close(code);
+        return closedPromise;
+    }
     /**
      * Send requests to the connected websocket.
      *
@@ -141,15 +105,22 @@ export class WsClient extends Emittery {
     async request(request) {
         return this.exchange(request, this.sendMessage.bind(this));
     }
-    exchange(request, sendHandler) {
+    async exchange(request, sendHandler) {
         if (this.socket.readyState === this.socket.OPEN) {
             const promise = new Promise((resolve, reject) => {
                 sendHandler(request, resolve, reject);
             });
             return promise;
         }
+        else if (this.url && this.authenticationToken) {
+            await this.reconnectWebsocket(this.url, this.authenticationToken);
+            this.registerMessageListener(this.socket);
+            this.registerCloseListener(this.socket);
+            const promise = new Promise((resolve, reject) => sendHandler(request, resolve, reject));
+            return promise;
+        }
         else {
-            return Promise.reject(new Error("Socket is not open"));
+            return Promise.reject(new HolochainError("WebsocketClosedError", "Websocket is not open"));
         }
     }
     sendMessage(request, resolve, reject) {
@@ -163,6 +134,97 @@ export class WsClient extends Emittery {
         this.pendingRequests[id] = { resolve, reject };
         this.index += 1;
     }
+    registerMessageListener(socket) {
+        socket.onmessage = async (serializedMessage) => {
+            // If data is not a buffer (nodejs), it will be a blob (browser)
+            let deserializedData;
+            if (globalThis.window &&
+                serializedMessage.data instanceof globalThis.window.Blob) {
+                deserializedData = await serializedMessage.data.arrayBuffer();
+            }
+            else {
+                if (typeof Buffer !== "undefined" &&
+                    Buffer.isBuffer(serializedMessage.data)) {
+                    deserializedData = serializedMessage.data;
+                }
+                else {
+                    throw new HolochainError("UnknownMessageFormat", `incoming message has unknown message format - ${deserializedData}`);
+                }
+            }
+            const message = decode(deserializedData);
+            assertHolochainMessage(message);
+            if (message.type === "signal") {
+                if (message.data === null) {
+                    throw new HolochainError("UnknownSignalFormat", "incoming signal has no data");
+                }
+                const deserializedSignal = decode(message.data);
+                assertHolochainSignal(deserializedSignal);
+                if (SignalType.System in deserializedSignal) {
+                    this.emit("signal", {
+                        System: deserializedSignal[SignalType.System],
+                    });
+                }
+                else {
+                    const encodedAppSignal = deserializedSignal[SignalType.App];
+                    // In order to return readable content to the UI, the signal payload must also be deserialized.
+                    const payload = decode(encodedAppSignal.signal);
+                    const signal = {
+                        cell_id: encodedAppSignal.cell_id,
+                        zome_name: encodedAppSignal.zome_name,
+                        payload,
+                    };
+                    this.emit("signal", { App: signal });
+                }
+            }
+            else if (message.type === "response") {
+                this.handleResponse(message);
+            }
+            else {
+                throw new HolochainError("UnknownMessageType", `incoming message has unknown type - ${message.type}`);
+            }
+        };
+    }
+    registerCloseListener(socket) {
+        socket.addEventListener("close", (closeEvent) => {
+            const pendingRequestIds = Object.keys(this.pendingRequests).map((id) => parseInt(id));
+            if (pendingRequestIds.length) {
+                pendingRequestIds.forEach((id) => {
+                    const error = new HolochainError("ClientClosedWithPendingRequests", `client closed with pending requests - close event code: ${closeEvent.code}, request id: ${id}`);
+                    this.pendingRequests[id].reject(error);
+                    delete this.pendingRequests[id];
+                });
+            }
+        }, { once: true });
+    }
+    async reconnectWebsocket(url, token) {
+        return new Promise((resolve, reject) => {
+            this.socket = new IsoWebSocket(url, this.options);
+            // This error event never occurs in tests. Could be removed?
+            this.socket.addEventListener("error", (errorEvent) => {
+                this.authenticationToken = undefined;
+                reject(new HolochainError("ConnectionError", `could not connect to Holochain Conductor API at ${url} - ${errorEvent.message}`));
+            }, { once: true });
+            const invalidTokenCloseListener = (closeEvent) => {
+                this.authenticationToken = undefined;
+                reject(new HolochainError("InvalidTokenError", `could not connect to ${this.url} due to an invalid app authentication token - close code ${closeEvent.code}`));
+            };
+            this.socket.addEventListener("close", invalidTokenCloseListener, {
+                once: true,
+            });
+            this.socket.addEventListener("open", async (_) => {
+                const encodedMsg = encode({
+                    type: "authenticate",
+                    data: encode({ token }),
+                });
+                this.socket.send(encodedMsg);
+                // Wait in case authentication fails.
+                setTimeout(() => {
+                    this.socket.removeEventListener("close", invalidTokenCloseListener);
+                    resolve();
+                }, 10);
+            }, { once: true });
+        });
+    }
     handleResponse(msg) {
         const id = msg.id;
         if (this.pendingRequests[id]) {
@@ -178,20 +240,6 @@ export class WsClient extends Emittery {
             console.error(`got response with no matching request. id = ${id} msg = ${msg}`);
         }
     }
-    /**
-     * Close the websocket connection.
-     */
-    close(code = 1000) {
-        const closedPromise = new Promise((resolve) => 
-        // for an unknown reason "addEventListener" is seen as a non-callable
-        // property and gives a ts2349 error
-        // type assertion as workaround
-        this.socket.addEventListener("close", (event) => resolve(event))
-        // }
-        );
-        this.socket.close(code);
-        return closedPromise;
-    }
 }
 function assertHolochainMessage(message) {
     if (typeof message === "object" &&

package/lib/api/common.js

@@ -52,6 +52,7 @@ export const promiseTimeout = (promise, tag, ms) => {
         return res(a);
     })
         .catch((e) => {
+        clearTimeout(id);
         return rej(e);
     }));
 };

package/lib/api/zome-call-signing.d.ts

@@ -1,7 +1,6 @@
 import { type KeyPair } from "libsodium-wrappers";
 import type { CapSecret } from "../hdk/capabilities.js";
-import type { CellId } from "../types.js";
-import { AgentPubKey } from "../types.js";
+import type { AgentPubKey, CellId } from "../types.js";
 /**
  * @public
  */
@@ -34,14 +33,13 @@ export declare const setSigningCredentials: (cellId: CellId, credentials: Signin
 /**
  * Generates a key pair for signing zome calls.
  *
+ * @param agentPubKey - The agent pub key to take 4 last bytes (= DHT location)
+ * from (optional).
  * @returns The signing key pair and an agent pub key based on the public key.
  *
  * @public
  */
-export declare const generateSigningKeyPair: () => Promise<[
-    KeyPair,
-    AgentPubKey
-]>;
+export declare const generateSigningKeyPair: (agentPubKey?: AgentPubKey) => Promise<[KeyPair, AgentPubKey]>;
 /**
  * @public
  */

package/lib/api/zome-call-signing.js

@@ -1,5 +1,4 @@
 import _sodium from "libsodium-wrappers";
-import { AgentPubKey } from "../types.js";
 import { encodeHashToBase64 } from "../utils/base64.js";
 const signingCredentials = new Map();
 /**
@@ -28,15 +27,18 @@ export const setSigningCredentials = (cellId, credentials) => {
 /**
  * Generates a key pair for signing zome calls.
  *
+ * @param agentPubKey - The agent pub key to take 4 last bytes (= DHT location)
+ * from (optional).
  * @returns The signing key pair and an agent pub key based on the public key.
  *
  * @public
  */
-export const generateSigningKeyPair = async () => {
+export const generateSigningKeyPair = async (agentPubKey) => {
     await _sodium.ready;
     const sodium = _sodium;
     const keyPair = sodium.crypto_sign_keypair();
-    const signingKey = new AgentPubKey(keyPair.publicKey);
+    const locationBytes = agentPubKey ? agentPubKey.subarray(35) : [0, 0, 0, 0];
+    const signingKey = new Uint8Array([132, 32, 36].concat(...keyPair.publicKey).concat(...locationBytes));
     return [keyPair, signingKey];
 };
 /**

package/lib/hdk/countersigning.d.ts

@@ -18,6 +18,23 @@ export interface PreflightRequest {
     action_base: ActionBase;
     preflight_bytes: PreflightBytes;
 }
+/**
+ * @public
+ */
+export interface PreflightResponse {
+    /**
+     * The request associated with this response.
+     */
+    request: PreflightRequest;
+    /**
+     * The chain state declaration for the agent that produced this response.
+     */
+    agent_state: CountersigningAgentState;
+    /**
+     * The signature of this response, by the agent that created it.
+     */
+    signature: Signature;
+}
 /**
  * @public
  */

package/lib/hdk/link.d.ts

@@ -1,4 +1,8 @@
-import { ActionHash, AgentPubKey, Timestamp, AnyLinkableHash } from "../types.js";
+import { ActionHash, AgentPubKey, EntryHash, ExternalHash, Timestamp } from "../types.js";
+/**
+ * @public
+ */
+export type AnyLinkableHash = EntryHash | ActionHash | ExternalHash;
 /**
  * An internal zome index within the DNA, from 0 to 255.
  *

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.47.0"
+      "packageVersion": "7.47.9"
     }
   ]
 }

package/lib/types.d.ts

@@ -1,8 +1,35 @@
-import { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash } from "@spartan-hc/holo-hash";
 /**
  * @public
  */
-export { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash, };
+export type HoloHash = Uint8Array;
+/**
+ * @public
+ */
+export type AgentPubKey = HoloHash;
+/**
+ * @public
+ */
+export type DnaHash = HoloHash;
+/**
+ * @public
+ */
+export type WasmHash = HoloHash;
+/**
+ * @public
+ */
+export type EntryHash = HoloHash;
+/**
+ * @public
+ */
+export type ActionHash = HoloHash;
+/**
+ * @public
+ */
+export type AnyDhtHash = HoloHash;
+/**
+ * @public
+ */
+export type ExternalHash = HoloHash;
 /**
  * @public
  */

package/lib/types.js

@@ -1,5 +1 @@
-import { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash, } from "@spartan-hc/holo-hash";
-/**
- * @public
- */
-export { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash, };
+export {};

package/lib/utils/base64.d.ts

@@ -1,5 +1,4 @@
-import { HoloHashB64 } from "../types.js";
-import { HoloHash } from "@spartan-hc/holo-hash";
+import { HoloHash, HoloHashB64 } from "../types.js";
 /**
  * Decodes a Base64 encoded string to a byte array hash.
  *
@@ -8,7 +7,7 @@ import { HoloHash } from "@spartan-hc/holo-hash";
  *
  * @public
  */
-export declare function decodeHashFromBase64(hash: string): HoloHash;
+export declare function decodeHashFromBase64(hash: HoloHashB64): HoloHash;
 /**
  * Encode a byte array hash to a Base64 string.
  *
@@ -17,4 +16,4 @@ export declare function decodeHashFromBase64(hash: string): HoloHash;
  *
  * @public
  */
-export declare function encodeHashToBase64(hash: Uint8Array): HoloHashB64;
+export declare function encodeHashToBase64(hash: HoloHash): HoloHashB64;

package/lib/utils/base64.js

@@ -1,4 +1,4 @@
-import { HoloHash } from "@spartan-hc/holo-hash";
+import { Base64 } from "js-base64";
 /**
  * Decodes a Base64 encoded string to a byte array hash.
  *
@@ -8,7 +8,7 @@ import { HoloHash } from "@spartan-hc/holo-hash";
  * @public
  */
 export function decodeHashFromBase64(hash) {
-    return new HoloHash(hash);
+    return Base64.toUint8Array(hash.slice(1));
 }
 /**
  * Encode a byte array hash to a Base64 string.
@@ -19,5 +19,5 @@ export function decodeHashFromBase64(hash) {
  * @public
  */
 export function encodeHashToBase64(hash) {
-    return String(new HoloHash(hash));
+    return `u${Base64.fromUint8Array(hash, true)}`;
 }

package/lib/utils/cell.d.ts

@@ -0,0 +1,11 @@
+import { CellId } from "../types.js";
+/**
+ * Check if two cell ids are identical.
+ *
+ * @param cellId1 - Cell id 1 to compare.
+ * @param cellId2 - Cell id 1 to compare.
+ * @returns True if the cell ids are identical.
+ *
+ * @public
+ */
+export declare const isSameCell: (cellId1: CellId, cellId2: CellId) => boolean;

package/lib/utils/cell.js

@@ -0,0 +1,17 @@
+import { encodeHashToBase64 } from "./base64.js";
+/**
+ * Check if two cell ids are identical.
+ *
+ * @param cellId1 - Cell id 1 to compare.
+ * @param cellId2 - Cell id 1 to compare.
+ * @returns True if the cell ids are identical.
+ *
+ * @public
+ */
+export const isSameCell = (cellId1, cellId2) => {
+    const dnaHashB64_1 = encodeHashToBase64(cellId1[0]);
+    const agentPubKeyB64_1 = encodeHashToBase64(cellId1[1]);
+    const dnaHashB64_2 = encodeHashToBase64(cellId2[0]);
+    const agentPubKeyB64_2 = encodeHashToBase64(cellId2[1]);
+    return dnaHashB64_1 === dnaHashB64_2 && agentPubKeyB64_1 === agentPubKeyB64_2;
+};

package/lib/utils/fake-hash.d.ts

@@ -5,7 +5,7 @@ import { DnaHash, ActionHash, AgentPubKey, EntryHash } from "../types.js";
  * From https://github.com/holochain/holochain/blob/develop/crates/holo_hash/src/hash_type/primitive.rs
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An instance of EntryHash.
+ * @returns An {@link EntryHash}.
  *
  * @public
  */
@@ -14,7 +14,7 @@ export declare function fakeEntryHash(coreByte?: number | undefined): Promise<En
  * Generate a valid agent key of a non-existing agent.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An instance ofAgentPubKey.
+ * @returns An {@link AgentPubKey}.
  *
  * @public
  */
@@ -23,7 +23,7 @@ export declare function fakeAgentPubKey(coreByte?: number | undefined): Promise<
  * Generate a valid hash of a non-existing action.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An instance of ActionHash.
+ * @returns An {@link ActionHash}.
  *
  * @public
  */
@@ -32,7 +32,7 @@ export declare function fakeActionHash(coreByte?: number | undefined): Promise<A
  * Generate a valid hash of a non-existing DNA.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns A instance of DnaHash.
+ * @returns A {@link DnaHash}.
  *
  * @public
  */

package/lib/utils/fake-hash.js

@@ -1,57 +1,60 @@
 import { range } from "lodash-es";
 import { randomByteArray } from "../api/zome-call-signing.js";
-import { DnaHash, ActionHash, AgentPubKey, EntryHash } from "../types.js";
+import { dhtLocationFrom32 } from "./hash-parts.js";
+async function fakeValidHash(prefix, coreByte) {
+    let core;
+    if (coreByte === undefined) {
+        core = await randomByteArray(32);
+    }
+    else {
+        core = Uint8Array.from(range(0, 32).map(() => coreByte));
+    }
+    const checksum = dhtLocationFrom32(core);
+    return new Uint8Array([...prefix, ...core, ...Array.from(checksum)]);
+}
 /**
  * Generate a valid hash of a non-existing entry.
  *
  * From https://github.com/holochain/holochain/blob/develop/crates/holo_hash/src/hash_type/primitive.rs
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An instance of EntryHash.
+ * @returns An {@link EntryHash}.
  *
  * @public
  */
 export async function fakeEntryHash(coreByte = undefined) {
-    return new EntryHash(coreByte
-        ? Uint8Array.from(range(0, 32).map(() => coreByte))
-        : await randomByteArray(32));
+    return fakeValidHash([0x84, 0x21, 0x24], coreByte);
 }
 /**
  * Generate a valid agent key of a non-existing agent.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An instance ofAgentPubKey.
+ * @returns An {@link AgentPubKey}.
  *
  * @public
  */
 export async function fakeAgentPubKey(coreByte = undefined) {
-    return new AgentPubKey(coreByte
-        ? Uint8Array.from(range(0, 32).map(() => coreByte))
-        : await randomByteArray(32));
+    return fakeValidHash([0x84, 0x20, 0x24], coreByte);
 }
 /**
  * Generate a valid hash of a non-existing action.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An instance of ActionHash.
+ * @returns An {@link ActionHash}.
  *
  * @public
  */
 export async function fakeActionHash(coreByte = undefined) {
-    return new ActionHash(coreByte
-        ? Uint8Array.from(range(0, 32).map(() => coreByte))
-        : await randomByteArray(32));
+    return fakeValidHash([0x84, 0x29, 0x24], coreByte);
 }
 /**
  * Generate a valid hash of a non-existing DNA.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns A instance of DnaHash.
+ * @returns A {@link DnaHash}.
  *
  * @public
  */
 export async function fakeDnaHash(coreByte = undefined) {
-    return new DnaHash(coreByte
-        ? Uint8Array.from(range(0, 32).map(() => coreByte))
-        : await randomByteArray(32));
+    return fakeValidHash([0x84, 0x2d, 0x24], coreByte);
 }

package/lib/utils/hash-parts.d.ts

@@ -1,4 +1,4 @@
-import { HoloHash } from "../types.js";
+import { ActionHash, AgentPubKey, EntryHash } from "../types.js";
 /**
  * Hash type labels and their 3 byte values (forming the first 3 bytes of hash).
  *
@@ -23,7 +23,7 @@ export declare const HASH_TYPE_PREFIX: {
  *
  * @public
  */
-export declare function sliceHashType(hash: HoloHash | Uint8Array): Uint8Array;
+export declare function sliceHashType(hash: AgentPubKey | EntryHash | ActionHash): Uint8Array;
 /**
  * Get core hash from a Holochain hash (32 bytes).
  *
@@ -34,7 +34,7 @@ export declare function sliceHashType(hash: HoloHash | Uint8Array): Uint8Array;
  *
  * @public
  */
-export declare function sliceCore32(hash: HoloHash | Uint8Array): Uint8Array;
+export declare function sliceCore32(hash: AgentPubKey | EntryHash | ActionHash): Uint8Array;
 /**
  * Get DHT location (last 4 bytes) from a hash.
  *
@@ -45,7 +45,7 @@ export declare function sliceCore32(hash: HoloHash | Uint8Array): Uint8Array;
  *
  * @public
  */
-export declare function sliceDhtLocation(hash: HoloHash | Uint8Array): Uint8Array;
+export declare function sliceDhtLocation(hash: AgentPubKey | EntryHash | ActionHash): Uint8Array;
 /**
  * Generate DHT location (last 4 bytes) from a core hash (middle 32 bytes).
  *
@@ -68,4 +68,4 @@ export declare function dhtLocationFrom32(hashCore: Uint8Array): Uint8Array;
  *
  * @public
  */
-export declare function hashFrom32AndType(hashCore: Uint8Array, hashType: "Agent" | "Entry" | "Dna" | "Action" | "External"): Uint8Array;
+export declare function hashFrom32AndType(hashCore: AgentPubKey | EntryHash | ActionHash, hashType: "Agent" | "Entry" | "Dna" | "Action" | "External"): Uint8Array;

package/lib/utils/hash-parts.js

@@ -1,5 +1,4 @@
 import blake2b from "@bitgo/blake2b";
-import { HoloHash } from "../types.js";
 const HASH_TYPE_START = 0;
 const HASH_TYPE_BYTE_LENGTH = 3;
 const CORE_HASH_BYTE_LENGTH = 32;
@@ -29,9 +28,7 @@ export const HASH_TYPE_PREFIX = {
  * @public
  */
 export function sliceHashType(hash) {
-    if (!(hash instanceof HoloHash))
-        hash = new HoloHash(hash);
-    return hash.getPrefix();
+    return Uint8Array.from(hash.slice(0, 3));
 }
 /**
  * Get core hash from a Holochain hash (32 bytes).
@@ -44,11 +41,9 @@ export function sliceHashType(hash) {
  * @public
  */
 export function sliceCore32(hash) {
-    if (!(hash instanceof HoloHash))
-        hash = new HoloHash(hash);
     const start = HASH_TYPE_START + HASH_TYPE_BYTE_LENGTH;
     const end = start + CORE_HASH_BYTE_LENGTH;
-    return hash.bytes(start, end);
+    return Uint8Array.from(hash.slice(start, end));
 }
 /**
  * Get DHT location (last 4 bytes) from a hash.
@@ -61,11 +56,9 @@ export function sliceCore32(hash) {
  * @public
  */
 export function sliceDhtLocation(hash) {
-    if (hash instanceof Uint8Array)
-        hash = new HoloHash(hash);
     const start = HASH_TYPE_START + HASH_TYPE_BYTE_LENGTH + CORE_HASH_BYTE_LENGTH;
     const end = start + DHT_LOCATION_BYTE_LENGTH;
-    return hash.bytes(start, end);
+    return Uint8Array.from(hash.slice(start, end));
 }
 /**
  * Generate DHT location (last 4 bytes) from a core hash (middle 32 bytes).
@@ -101,5 +94,9 @@ export function dhtLocationFrom32(hashCore) {
  * @public
  */
 export function hashFrom32AndType(hashCore, hashType) {
-    return new HoloHash(hashCore).toType(hashType === "Agent" ? "AgentPubKey" : hashType + "Hash");
+    return Uint8Array.from([
+        ...HASH_TYPE_PREFIX[hashType],
+        ...hashCore,
+        ...dhtLocationFrom32(hashCore),
+    ]);
 }

package/lib/utils/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./base64.js";
 export * from "./fake-hash.js";
 export * from "./hash-parts.js";
+export * from "./cell.js";

package/lib/utils/index.js

@@ -1,3 +1,4 @@
 export * from "./base64.js";
 export * from "./fake-hash.js";
 export * from "./hash-parts.js";
+export * from "./cell.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/client",
-  "version": "0.18.0-dev.9",
+  "version": "0.19.0-dev.1",
   "description": "A JavaScript client for the Holochain Conductor API",
   "author": "Holochain Foundation <info@holochain.org> (https://holochain.org)",
   "license": "CAL-1.0",
@@ -45,7 +45,6 @@
     "@bitgo/blake2b": "^3.2.4",
     "@holochain/serialization": "^0.1.0-beta-rc.3",
     "@msgpack/msgpack": "^2.8.0",
-    "@spartan-hc/holo-hash": "^0.7.0",
     "emittery": "^1.0.1",
     "isomorphic-ws": "^5.0.0",
     "js-base64": "^3.7.5",
@@ -73,4 +72,4 @@
     "tsx": "^4.7.2",
     "typescript": "^4.9.5"
   }
-}
+}