@holochain/client 0.12.7 → 0.12.8

package/lib/api/client.js

@@ -1,34 +1,29 @@
 import { decode, encode } from "@msgpack/msgpack";
 import Emittery from "emittery";
-import IsoWebSocket from "isomorphic-ws";
+import Websocket from "isomorphic-ws";
 import { SignalType } from "./app/types.js";
 /**
- * A WebSocket client which can make requests and receive responses,
+ * A Websocket client which can make requests and receive responses,
  * as well as send and receive signals.
  *
- * Uses Holochain's WireMessage for communication.
+ * Uses Holochain's websocket WireMessage for communication.
  *
  * @public
  */
 export class WsClient extends Emittery {
     socket;
-    url;
     pendingRequests;
     index;
-    constructor(socket, url) {
+    constructor(socket) {
         super();
         this.socket = socket;
-        this.url = url;
         this.pendingRequests = {};
         this.index = 0;
-        this.setupSocket();
-    }
-    setupSocket() {
-        this.socket.onmessage = async (serializedMessage) => {
+        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) {
+            if (typeof window === "object" &&
+                serializedMessage.data instanceof window.Blob) {
                 deserializedData = await serializedMessage.data.arrayBuffer();
             }
             else {
@@ -69,7 +64,7 @@ export class WsClient extends Emittery {
                 console.error(`Got unrecognized Websocket message type: ${message.type}`);
             }
         };
-        this.socket.onclose = (event) => {
+        socket.onclose = (event) => {
             const pendingRequestIds = Object.keys(this.pendingRequests).map((id) => parseInt(id));
             if (pendingRequestIds.length) {
                 pendingRequestIds.forEach((id) => {
@@ -83,17 +78,20 @@ export class WsClient extends Emittery {
     /**
      * Instance factory for creating WsClients.
      *
-     * @param url - The WebSocket URL to connect to.
+     * @param url - The `ws://` URL to connect to.
      * @returns An new instance of the WsClient.
      */
     static connect(url) {
         return new Promise((resolve, reject) => {
-            const socket = new IsoWebSocket(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
             socket.onerror = () => {
                 reject(new Error(`could not connect to holochain conductor, please check that a conductor service is running and available at ${url}`));
             };
             socket.onopen = () => {
-                const client = new WsClient(socket, url);
+                const client = new WsClient(socket);
                 resolve(client);
             };
         });
@@ -116,43 +114,25 @@ export class WsClient extends Emittery {
      * @param request - The request to send over the websocket.
      * @returns
      */
-    async request(request) {
+    request(request) {
         if (this.socket.readyState === this.socket.OPEN) {
+            const id = this.index;
+            const encodedMsg = encode({
+                id,
+                type: "request",
+                data: encode(request),
+            });
             const promise = new Promise((resolve, reject) => {
-                this.sendMessage(request, resolve, reject);
+                this.pendingRequests[id] = { resolve, reject };
             });
+            this.socket.send(encodedMsg);
+            this.index += 1;
             return promise;
         }
-        else if (this.url) {
-            const response = new Promise((resolve, reject) => {
-                // typescript forgets in this promise scope that this.url is not undefined
-                const socket = new IsoWebSocket(this.url);
-                this.socket = socket;
-                socket.onerror = () => {
-                    reject(new Error(`could not connect to Holochain conductor, please check that a conductor service is running and available at ${this.url}`));
-                };
-                socket.onopen = () => {
-                    this.sendMessage(request, resolve, reject);
-                };
-                this.setupSocket();
-            });
-            return response;
-        }
         else {
             return Promise.reject(new Error("Socket is not open"));
         }
     }
-    sendMessage(request, resolve, reject) {
-        const id = this.index;
-        const encodedMsg = encode({
-            id,
-            type: "request",
-            data: encode(request),
-        });
-        this.socket.send(encodedMsg);
-        this.pendingRequests[id] = { resolve, reject };
-        this.index += 1;
-    }
     handleResponse(msg) {
         const id = msg.id;
         if (this.pendingRequests[id]) {
@@ -171,14 +151,8 @@ export class WsClient extends Emittery {
     /**
      * 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))
-        // }
-        );
+    close(code) {
+        const closedPromise = new Promise((resolve) => this.socket.on("close", resolve));
         this.socket.close(code);
         return closedPromise;
     }
@@ -200,4 +174,3 @@ function assertHolochainSignal(signal) {
     }
     throw new Error(`unknown signal format ${JSON.stringify(signal, null, 4)}`);
 }
-export { IsoWebSocket };

package/lib/api/common.d.ts

@@ -1,5 +1,5 @@
 import { RoleName } from "../types.js";
-export declare const DEFAULT_TIMEOUT = 60000;
+export declare const DEFAULT_TIMEOUT = 15000;
 /**
  * @public
  */
@@ -30,14 +30,6 @@ export type Tagged<T> = {
  * @public
  */
 export declare const requesterTransformer: <ReqI, ReqO, ResI, ResO>(requester: Requester<Tagged<ReqO>, Tagged<ResI>>, tag: string, transform?: Transformer<ReqI, ReqO, ResI, ResO>) => (req: ReqI, timeout?: number) => Promise<ResO>;
-/**
- * Error thrown when response from Holochain is an error.
- *
- * @public
- */
-export declare class HolochainError extends Error {
-    constructor(name: string, message: string);
-}
 export declare const catchError: (res: any) => Promise<any>;
 export declare const promiseTimeout: (promise: Promise<unknown>, tag: string, ms: number) => Promise<unknown>;
 /**

package/lib/api/common.js

@@ -1,5 +1,5 @@
 const ERROR_TYPE = "error";
-export const DEFAULT_TIMEOUT = 60000;
+export const DEFAULT_TIMEOUT = 15000;
 /**
  * Take a Requester function which deals with tagged requests and responses,
  * and return a Requester which deals only with the inner data types, also
@@ -19,32 +19,16 @@ const identityTransformer = {
     input: identity,
     output: identity,
 };
-/**
- * Error thrown when response from Holochain is an error.
- *
- * @public
- */
-export class HolochainError extends Error {
-    constructor(name, message) {
-        super();
-        this.name = name;
-        this.message = message;
-    }
-}
-// this determines the error format of all error responses
 export const catchError = (res) => {
-    if (res.type === ERROR_TYPE) {
-        const error = new HolochainError(res.data.type, res.data.data);
-        return Promise.reject(error);
-    }
-    else {
-        return Promise.resolve(res);
-    }
+    return res.type === ERROR_TYPE ? Promise.reject(res) : Promise.resolve(res);
 };
 export const promiseTimeout = (promise, tag, ms) => {
     let id;
     const timeout = new Promise((_, reject) => {
-        id = setTimeout(() => reject(new Error(`Timed out in ${ms}ms: ${tag}`)), ms);
+        id = setTimeout(() => {
+            clearTimeout(id);
+            reject(new Error(`Timed out in ${ms}ms: ${tag}`));
+        }, ms);
     });
     return new Promise((res, rej) => {
         Promise.race([promise, timeout])

package/lib/api/index.d.ts

@@ -2,6 +2,6 @@ export { hashZomeCall } from "@holochain/serialization";
 export * from "./admin/index.js";
 export * from "./app-agent/index.js";
 export * from "./app/index.js";
-export { IsoWebSocket, WsClient } from "./client.js";
-export { CloneId, HolochainError, Requester, Transformer, getBaseRoleNameFromCloneId, isCloneId, } from "./common.js";
+export { CloneId, Requester, Transformer } from "./common.js";
+export { WsClient } from "./client.js";
 export * from "./zome-call-signing.js";

package/lib/api/index.js

@@ -2,6 +2,6 @@ export { hashZomeCall } from "@holochain/serialization";
 export * from "./admin/index.js";
 export * from "./app-agent/index.js";
 export * from "./app/index.js";
-export { IsoWebSocket, WsClient } from "./client.js";
-export { CloneId, HolochainError, getBaseRoleNameFromCloneId, isCloneId, } from "./common.js";
+export { CloneId } from "./common.js";
+export { WsClient } from "./client.js";
 export * from "./zome-call-signing.js";

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

@@ -1,6 +1,6 @@
-import { type KeyPair } from "libsodium-wrappers";
-import type { CapSecret } from "../hdk/capabilities.js";
-import type { AgentPubKey, CellId } from "../types.js";
+import nacl from "tweetnacl";
+import { CapSecret } from "../hdk/capabilities.js";
+import { AgentPubKey, CellId } from "../types.js";
 /**
  * @public
  */
@@ -10,7 +10,7 @@ export type Nonce256Bit = Uint8Array;
  */
 export interface SigningCredentials {
     capSecret: CapSecret;
-    keyPair: KeyPair;
+    keyPair: nacl.SignKeyPair;
     signingKey: AgentPubKey;
 }
 /**
@@ -33,13 +33,14 @@ 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: (agentPubKey?: AgentPubKey) => Promise<[KeyPair, AgentPubKey]>;
+export declare const generateSigningKeyPair: () => [
+    nacl.SignKeyPair,
+    AgentPubKey
+];
 /**
  * @public
  */

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

@@ -1,4 +1,4 @@
-import _sodium from "libsodium-wrappers";
+import nacl from "tweetnacl";
 import { encodeHashToBase64 } from "../utils/base64.js";
 const signingCredentials = new Map();
 /**
@@ -27,24 +27,19 @@ 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 (agentPubKey) => {
-    await _sodium.ready;
-    const sodium = _sodium;
-    const keyPair = sodium.crypto_sign_keypair();
-    const locationBytes = agentPubKey ? agentPubKey.subarray(35) : [0, 0, 0, 0];
-    const signingKey = new Uint8Array([132, 32, 36].concat(...keyPair.publicKey).concat(...locationBytes));
+export const generateSigningKeyPair = () => {
+    const keyPair = nacl.sign.keyPair();
+    const signingKey = new Uint8Array([132, 32, 36].concat(...keyPair.publicKey).concat(...[0, 0, 0, 0]));
     return [keyPair, signingKey];
 };
 /**
  * @public
  */
-export const randomCapSecret = async () => randomByteArray(64);
+export const randomCapSecret = () => randomByteArray(64);
 /**
  * @public
  */
@@ -53,12 +48,15 @@ export const randomNonce = async () => randomByteArray(32);
  * @public
  */
 export const randomByteArray = async (length) => {
-    if (globalThis.crypto && "getRandomValues" in globalThis.crypto) {
-        return globalThis.crypto.getRandomValues(new Uint8Array(length));
+    if (typeof window !== "undefined" &&
+        "crypto" in window &&
+        "getRandomValues" in window.crypto) {
+        return window.crypto.getRandomValues(new Uint8Array(length));
+    }
+    else {
+        const crypto = await import("crypto");
+        return new Uint8Array(crypto.randomBytes(length));
     }
-    await _sodium.ready;
-    const sodium = _sodium;
-    return sodium.randombytes_buf(length);
 };
 /**
  * @public

package/lib/environments/launcher.d.ts

@@ -1,45 +1,23 @@
-import { CallZomeRequest } from "../api/app/types.js";
-import { CallZomeRequestSigned, CallZomeRequestUnsigned } from "../api/app/websocket.js";
 import { InstalledAppId } from "../types.js";
+import { CallZomeRequest, CallZomeRequestSigned } from "../api/index.js";
 export interface LauncherEnvironment {
     APP_INTERFACE_PORT?: number;
     ADMIN_INTERFACE_PORT?: number;
     INSTALLED_APP_ID?: InstalledAppId;
-    FRAMEWORK?: "tauri" | "electron";
 }
 export interface HostZomeCallSigner {
     signZomeCall: (request: CallZomeRequest) => Promise<CallZomeRequestSigned>;
 }
 declare const __HC_LAUNCHER_ENV__ = "__HC_LAUNCHER_ENV__";
 declare const __HC_ZOME_CALL_SIGNER__ = "__HC_ZOME_CALL_SIGNER__";
-export declare const isLauncher: () => boolean;
+export declare const isLauncher: boolean;
 export declare const getLauncherEnvironment: () => LauncherEnvironment | undefined;
 export declare const getHostZomeCallSigner: () => HostZomeCallSigner | undefined;
 declare global {
     interface Window {
-        [__HC_LAUNCHER_ENV__]?: LauncherEnvironment;
+        [__HC_LAUNCHER_ENV__]: LauncherEnvironment | undefined;
         [__HC_ZOME_CALL_SIGNER__]?: HostZomeCallSigner;
-        electronAPI?: {
-            signZomeCall: (data: CallZomeRequestUnsignedElectron) => CallZomeRequestSignedElectron;
-        };
     }
 }
-interface CallZomeRequestSignedElectron extends Omit<CallZomeRequestSigned, "cap_secret" | "cell_id" | "provenance" | "nonce" | "zome_name" | "fn_name" | "expires_at"> {
-    cellId: [Array<number>, Array<number>];
-    provenance: Array<number>;
-    zomeName: string;
-    fnName: string;
-    nonce: Array<number>;
-    expiresAt: number;
-}
-interface CallZomeRequestUnsignedElectron extends Omit<CallZomeRequestUnsigned, "cap_secret" | "cell_id" | "provenance" | "nonce" | "zome_name" | "fn_name" | "expires_at"> {
-    cellId: [Array<number>, Array<number>];
-    provenance: Array<number>;
-    zomeName: string;
-    fnName: string;
-    nonce: Array<number>;
-    expiresAt: number;
-}
 export declare const signZomeCallTauri: (request: CallZomeRequest) => Promise<CallZomeRequestSigned>;
-export declare const signZomeCallElectron: (request: CallZomeRequest) => Promise<CallZomeRequestSigned>;
 export {};

package/lib/environments/launcher.js

@@ -1,10 +1,10 @@
-import { encode } from "@msgpack/msgpack";
 import { invoke } from "@tauri-apps/api/tauri";
-import { getNonceExpiration, randomNonce } from "../api/zome-call-signing.js";
+import { getNonceExpiration, randomNonce, } from "../api/index.js";
+import { encode } from "@msgpack/msgpack";
 const __HC_LAUNCHER_ENV__ = "__HC_LAUNCHER_ENV__";
 const __HC_ZOME_CALL_SIGNER__ = "__HC_ZOME_CALL_SIGNER__";
-export const isLauncher = () => globalThis.window && __HC_LAUNCHER_ENV__ in globalThis.window;
-export const getLauncherEnvironment = () => isLauncher() ? globalThis.window[__HC_LAUNCHER_ENV__] : undefined;
+export const isLauncher = typeof window === "object" && __HC_LAUNCHER_ENV__ in window;
+export const getLauncherEnvironment = () => isLauncher ? window[__HC_LAUNCHER_ENV__] : undefined;
 export const getHostZomeCallSigner = () => globalThis.window && globalThis.window[__HC_ZOME_CALL_SIGNER__];
 export const signZomeCallTauri = async (request) => {
     const zomeCallUnsigned = {
@@ -33,33 +33,3 @@ export const signZomeCallTauri = async (request) => {
     };
     return signedZomeCall;
 };
-export const signZomeCallElectron = async (request) => {
-    if (!window.electronAPI) {
-        throw Error("Unable to signZomeCallElectron. window.electronAPI not defined");
-    }
-    const zomeCallUnsignedElectron = {
-        provenance: Array.from(request.provenance),
-        cellId: [Array.from(request.cell_id[0]), Array.from(request.cell_id[1])],
-        zomeName: request.zome_name,
-        fnName: request.fn_name,
-        payload: Array.from(encode(request.payload)),
-        nonce: Array.from(await randomNonce()),
-        expiresAt: getNonceExpiration(),
-    };
-    const zomeCallSignedElectron = await window.electronAPI.signZomeCall(zomeCallUnsignedElectron);
-    const zomeCallSigned = {
-        provenance: Uint8Array.from(zomeCallSignedElectron.provenance),
-        cap_secret: null,
-        cell_id: [
-            Uint8Array.from(zomeCallSignedElectron.cellId[0]),
-            Uint8Array.from(zomeCallSignedElectron.cellId[1]),
-        ],
-        zome_name: zomeCallSignedElectron.zomeName,
-        fn_name: zomeCallSignedElectron.fnName,
-        payload: Uint8Array.from(zomeCallSignedElectron.payload),
-        signature: Uint8Array.from(zomeCallSignedElectron.signature),
-        expires_at: zomeCallSignedElectron.expiresAt,
-        nonce: Uint8Array.from(zomeCallSignedElectron.nonce),
-    };
-    return zomeCallSigned;
-};

package/lib/hdk/action.d.ts

@@ -1,6 +1,5 @@
 import { AgentPubKey, DnaHash, EntryHash, ActionHash, HoloHashed, Signature, Timestamp } from "../types.js";
-import { Entry, EntryType } from "./entry.js";
-import { LinkTag, LinkType, RateWeight } from "./link.js";
+import { EntryType } from "./entry.js";
 /**
  * @public
  */
@@ -8,13 +7,6 @@ export interface SignedActionHashed<H extends Action = Action> {
     hashed: HoloHashed<H>;
     signature: Signature;
 }
-/**
- * @public
- */
-export interface RegisterAgentActivity {
-    action: SignedActionHashed;
-    cached_entry?: Entry;
-}
 /**
  * @public
  */
@@ -83,10 +75,8 @@ export interface CreateLink {
     prev_action: ActionHash;
     base_address: EntryHash;
     target_address: EntryHash;
-    zome_index: number;
-    link_type: LinkType;
-    tag: LinkTag;
-    weight: RateWeight;
+    zome_id: number;
+    tag: any;
 }
 /**
  * @public

package/lib/hdk/capabilities.d.ts

@@ -1,4 +1,4 @@
-import { FunctionName, ZomeName } from "../api/admin/types.js";
+import { FunctionName, ZomeName } from "../api/index.js";
 import { AgentPubKey } from "../types.js";
 /**
  * @public
@@ -38,22 +38,12 @@ export interface ZomeCallCapGrant {
 /**
  * @public
  */
-export declare enum CapAccessType {
-    Unrestricted = "Unrestricted",
-    Transferable = "Transferable",
-    Assigned = "Assigned"
-}
-/**
- * @public
- */
-export type CapAccess = {
-    [CapAccessType.Unrestricted]: null;
-} | {
-    [CapAccessType.Transferable]: {
+export type CapAccess = "Unrestricted" | {
+    Transferable: {
         secret: CapSecret;
     };
 } | {
-    [CapAccessType.Assigned]: {
+    Assigned: {
         secret: CapSecret;
         assignees: AgentPubKey[];
     };

package/lib/hdk/capabilities.js

@@ -6,12 +6,3 @@ export var GrantedFunctionsType;
     GrantedFunctionsType["All"] = "All";
     GrantedFunctionsType["Listed"] = "Listed";
 })(GrantedFunctionsType || (GrantedFunctionsType = {}));
-/**
- * @public
- */
-export var CapAccessType;
-(function (CapAccessType) {
-    CapAccessType["Unrestricted"] = "Unrestricted";
-    CapAccessType["Transferable"] = "Transferable";
-    CapAccessType["Assigned"] = "Assigned";
-})(CapAccessType || (CapAccessType = {}));

package/lib/hdk/index.d.ts

@@ -3,5 +3,4 @@ export * from "./capabilities.js";
 export * from "./countersigning.js";
 export * from "./dht-ops.js";
 export * from "./entry.js";
-export * from "./link.js";
 export * from "./record.js";

package/lib/hdk/index.js

@@ -3,5 +3,4 @@ export * from "./capabilities.js";
 export * from "./countersigning.js";
 export * from "./dht-ops.js";
 export * from "./entry.js";
-export * from "./link.js";
 export * from "./record.js";

package/lib/tsdoc-metadata.json

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

package/lib/types.d.ts

@@ -26,10 +26,6 @@ export type ActionHash = HoloHash;
  * @public
  */
 export type AnyDhtHash = HoloHash;
-/**
- * @public
- */
-export type ExternalHash = HoloHash;
 /**
  * @public
  */
@@ -82,7 +78,7 @@ export type CellId = [DnaHash, AgentPubKey];
 /**
  * @public
  */
-export type DnaProperties = unknown;
+export type DnaProperties = any;
 /**
  * @public
  */
@@ -117,11 +113,6 @@ export interface HoloHashed<T> {
  */
 export interface NetworkInfo {
     fetch_pool_info: FetchPoolInfo;
-    current_number_of_peers: number;
-    arc_size: number;
-    total_network_peers: number;
-    bytes_since_last_time_queried: number;
-    completed_rounds_since_last_time_queried: number;
 }
 /**
  * @public

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

@@ -4,36 +4,32 @@ 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 {@link EntryHash}.
  *
  * @public
  */
-export declare function fakeEntryHash(coreByte?: number | undefined): Promise<EntryHash>;
+export declare function fakeEntryHash(): Promise<EntryHash>;
 /**
  * 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 {@link AgentPubKey}.
  *
  * @public
  */
-export declare function fakeAgentPubKey(coreByte?: number | undefined): Promise<AgentPubKey>;
+export declare function fakeAgentPubKey(): Promise<AgentPubKey>;
 /**
  * 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 {@link ActionHash}.
  *
  * @public
  */
-export declare function fakeActionHash(coreByte?: number | undefined): Promise<ActionHash>;
+export declare function fakeActionHash(): Promise<ActionHash>;
 /**
  * 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 {@link DnaHash}.
  *
  * @public
  */
-export declare function fakeDnaHash(coreByte?: number | undefined): Promise<DnaHash>;
+export declare function fakeDnaHash(): Promise<DnaHash>;