@holochain/client 0.11.8 → 0.11.10

package/README.md

@@ -27,61 +27,79 @@ npm install --save-exact @holochain/client
   const agentPubKey = await admin.generateAgentPubKey()
 ```
 
-### Use AppWebsocket with implicit zome call signing
+### Use AppAgentWebsocket with implicit zome call signing
 ```typescript
   const signalCb = (signal: AppSignal) => {
-    // impl...
+    // implementation of signal handler
     resolve()
   }
 
-  // generate and authorize new key pair for signing zome calls,
-  // specifying zomes and functions to be authorized
-  await authorizeNewSigningKeyPair(admin, cell_id, [
-    ["test_zome", "test_emitter_fn"],
-  ]);
-
   const TIMEOUT = 12000
   // default timeout is set to 12000
-  const client = await AppWebsocket.connect(`ws://127.0.0.1:${appPort}`, TIMEOUT, signalCb)
+  const appWs = await AppWebsocket.connect(`ws://127.0.0.1:${appPort}`, 12000)
+
+  const client = new AppAgentWebsocket(appWs, 'installed_app_id');
+  client.on("signal", signalCb);
 
   // default timeout set here (30000) will overwrite the defaultTimeout(12000) set above
   await client.callZome({
-   cell_id,
+   role_name: 'dnas_role_name', // role_name is unique per app, so you can unambiguously identify your dna with role_name in this client
    zome_name: "test_zome",
    fn_name: 'test_emitter_fn',
-   provenance: agentPubKey,
    payload: null,
   }, 30000)
 ```
 
-### Use AppAgentWebsocket
+### Use AppWebsocket with implicit zome call signing
 ```typescript
   const signalCb = (signal: AppSignal) => {
     // impl...
     resolve()
   }
 
-  // generate and authorize new key pair for signing zome calls,
-  // specifying zomes and functions to be authorized
-  await authorizeNewSigningKeyPair(admin, cell_id, [
-    ["test_zome", "test_emitter_fn"],
-  ]);
-
   const TIMEOUT = 12000
   // default timeout is set to 12000
-  const appWs = await AppWebsocket.connect(`ws://127.0.0.1:${appPort}`, 12000, signalCb)
-
-  const client = new AppAgentWebsocket(appWs, 'installed_app_id')
+  const client = await AppWebsocket.connect(`ws://127.0.0.1:${appPort}`, TIMEOUT, signalCb)
 
   // default timeout set here (30000) will overwrite the defaultTimeout(12000) set above
   await client.callZome({
-   role_name: 'dnas_role_name', // role_name is unique per app, so you can unambiguously identify your dna with role_name in this client
+   cell_id,
    zome_name: "test_zome",
    fn_name: 'test_emitter_fn',
+   provenance: agentPubKey,
    payload: null,
   }, 30000)
 ```
 
+### Managing zome call signing credentials in a pure JavaScript browser application
+
+Here is a pattern to manage signing keys for signing zome calls when running pure JavaScript web hApps in a web browser:
+```typescript
+const cellIdB64 =
+    encodeHashToBase64(cell_id[0]) + encodeHashToBase64(cell_id[1]);
+// in case the zome call signing credentials are stored locally in the browser
+const signingCredentialsJson = localStorage.getItem(cellIdB64);
+let signingCredentials: SigningCredentials | null =
+  signingCredentialsJson && JSON.parse(signingCredentialsJson);
+
+if (!signingCredentials) {
+  const [keyPair, signingKey] = generateSigningKeyPair();
+  const capSecret = await admin.grantSigningKey(
+    cell_id,
+    { [GrantedFunctionsType.All]: null },
+    signingKey
+  );
+  signingCredentials = {
+    capSecret,
+    keyPair,
+    signingKey,
+  };
+}
+setSigningCredentials(cell_id, signingCredentials);
+// possibly store the zome call signing credentials locally in the browser
+localStorage.setItem(cellIdB64, JSON.stringify(signingCredentials));
+```
+
 ## API Reference
 
 See [docs/API.md](docs/API.md)

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Action, DhtOp, Entry, ZomeCallCapGrant } from "../../hdk/index.js";
-import { ActionHash, AgentPubKey, CellId, DnaHash, DnaProperties, HoloHash, HoloHashB64, InstalledAppId, KitsuneAgent, KitsuneSpace, RoleName, Signature, Timestamp, WasmHash } from "../../types.js";
+import { ActionHash, AgentPubKey, CellId, DnaHash, DnaProperties, Duration, HoloHash, HoloHashB64, InstalledAppId, KitsuneAgent, KitsuneSpace, RoleName, Signature, Timestamp, WasmHash } from "../../types.js";
 import { Requester } from "../common.js";
 import { DisableCloneCellRequest } from "../index.js";
 export declare type AttachAppInterfaceRequest = {
@@ -106,6 +106,7 @@ export declare type DnaModifiers = {
     network_seed: NetworkSeed;
     properties: DnaProperties;
     origin_time: Timestamp;
+    quantum_time: Duration;
 };
 export declare type FunctionName = string;
 export declare type ZomeName = string;
@@ -130,7 +131,7 @@ export declare type UninstallAppRequest = {
     installed_app_id: InstalledAppId;
 };
 export declare type UninstallAppResponse = null;
-export declare type ResourceBytes = Buffer;
+export declare type ResourceBytes = number[];
 export declare type ResourceMap = {
     [key: string]: ResourceBytes;
 };
@@ -153,6 +154,13 @@ export declare type CellProvisioning = {
 } | {
     disabled: Record<string, never>;
 };
+export declare type Location = {
+    bundled: string;
+} | {
+    path: string;
+} | {
+    url: string;
+};
 export declare type DnaVersionSpec = Array<HoloHashB64>;
 export declare type DnaVersionFlexible = {
     singleton: HoloHashB64;
@@ -160,11 +168,10 @@ export declare type DnaVersionFlexible = {
     multiple: DnaVersionSpec;
 };
 export declare type AppRoleDnaManifest = {
-    location?: Location;
-    properties?: DnaProperties;
-    network_seed?: NetworkSeed;
+    clone_limit?: number;
+    modifiers?: Partial<DnaModifiers>;
     version?: DnaVersionFlexible;
-};
+} & Location;
 export declare type AppRoleManifest = {
     name: RoleName;
     provisioning?: CellProvisioning;
@@ -256,13 +263,7 @@ export declare type InstallAppDnaPayload = {
     role_name: RoleName;
     membrane_proof?: MembraneProof;
 };
-export declare type ZomeLocation = {
-    bundled: string;
-} | {
-    path: string;
-} | {
-    url: string;
-};
+export declare type ZomeLocation = Location;
 export declare type ZomeManifest = {
     name: string;
     hash?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/admin/types.ts"],"names":[],"mappings":"AAwEA,MAAM,CAAN,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,uCAA2B,CAAA;IAC3B,6BAAiB,CAAA;IACjB,yBAAa,CAAA;AACf,CAAC,EAJW,QAAQ,KAAR,QAAQ,QAInB;AAsKD,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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/admin/types.ts"],"names":[],"mappings":"AAyEA,MAAM,CAAN,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,uCAA2B,CAAA;IAC3B,6BAAiB,CAAA;IACjB,yBAAa,CAAA;AACf,CAAC,EAJW,QAAQ,KAAR,QAAQ,QAInB;AAoLD,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/api/admin/websocket.d.ts

@@ -1,45 +1,49 @@
-/**
- * Defines AdminWebsocket, an easy-to-use websocket implementation of the
- * Conductor Admin API
- *
- *    const client = AdminWebsocket.connect(
- *      'ws://127.0.0.1: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 { CapSecret, GrantedFunctions } from "../../hdk/capabilities.js";
+import type { AgentPubKey, CellId } from "../../types.js";
 import { WsClient } from "../client.js";
-import { Transformer, Requester } from "../common.js";
-export declare class AdminWebsocket implements Api.AdminApi {
+import { Requester, Transformer } from "../common.js";
+import { AddAgentInfoRequest, AddAgentInfoResponse, AdminApi, AgentInfoRequest, AgentInfoResponse, AttachAppInterfaceRequest, AttachAppInterfaceResponse, DeleteCloneCellRequest, DeleteCloneCellResponse, DisableAppRequest, DisableAppResponse, DumpFullStateRequest, DumpFullStateResponse, DumpStateRequest, DumpStateResponse, EnableAppRequest, EnableAppResponse, GenerateAgentPubKeyRequest, GenerateAgentPubKeyResponse, GetDnaDefinitionRequest, GetDnaDefinitionResponse, GrantZomeCallCapabilityRequest, GrantZomeCallCapabilityResponse, InstallAppRequest, InstallAppResponse, ListAppInterfacesRequest, ListAppInterfacesResponse, ListAppsRequest, ListAppsResponse, ListCellIdsRequest, ListCellIdsResponse, ListDnasRequest, ListDnasResponse, RegisterDnaRequest, RegisterDnaResponse, StartAppRequest, StartAppResponse, UninstallAppRequest, UninstallAppResponse } from "./types.js";
+export declare class AdminWebsocket implements AdminApi {
     readonly client: WsClient;
     defaultTimeout: number;
     private constructor();
     static connect(url: string, defaultTimeout?: number): Promise<AdminWebsocket>;
     _requester: <ReqO, ReqI, ResI, ResO>(tag: string, transformer?: Transformer<ReqO, ReqI, ResI, ResO> | undefined) => (req: ReqO, timeout?: number | undefined) => Promise<ResO>;
-    attachAppInterface: Requester<Api.AttachAppInterfaceRequest, Api.AttachAppInterfaceResponse>;
-    enableApp: Requester<Api.EnableAppRequest, Api.EnableAppResponse>;
-    disableApp: Requester<Api.DisableAppRequest, Api.DisableAppResponse>;
-    startApp: Requester<Api.StartAppRequest, Api.StartAppResponse>;
-    dumpState: Requester<Api.DumpStateRequest, Api.DumpStateResponse>;
-    dumpFullState: Requester<Api.DumpFullStateRequest, Api.DumpFullStateResponse>;
-    generateAgentPubKey: Requester<Api.GenerateAgentPubKeyRequest, Api.GenerateAgentPubKeyResponse>;
-    registerDna: Requester<Api.RegisterDnaRequest, Api.RegisterDnaResponse>;
-    getDnaDefinition: Requester<Api.GetDnaDefinitionRequest, Api.GetDnaDefinitionResponse>;
-    uninstallApp: Requester<Api.UninstallAppRequest, Api.UninstallAppResponse>;
-    installApp: Requester<Api.InstallAppRequest, Api.InstallAppResponse>;
-    listDnas: Requester<Api.ListDnasRequest, Api.ListDnasResponse>;
-    listCellIds: Requester<Api.ListCellIdsRequest, Api.ListCellIdsResponse>;
-    listApps: Requester<Api.ListAppsRequest, Api.ListAppsResponse>;
-    listAppInterfaces: Requester<Api.ListAppInterfacesRequest, Api.ListAppInterfacesResponse>;
-    agentInfo: Requester<Api.AgentInfoRequest, Api.AgentInfoResponse>;
-    addAgentInfo: Requester<Api.AddAgentInfoRequest, Api.AddAgentInfoResponse>;
-    deleteCloneCell: Requester<Api.DeleteCloneCellRequest, Api.DeleteCloneCellResponse>;
-    grantZomeCallCapability: Requester<Api.GrantZomeCallCapabilityRequest, Api.GrantZomeCallCapabilityResponse>;
+    attachAppInterface: Requester<AttachAppInterfaceRequest, AttachAppInterfaceResponse>;
+    enableApp: Requester<EnableAppRequest, EnableAppResponse>;
+    disableApp: Requester<DisableAppRequest, DisableAppResponse>;
+    startApp: Requester<StartAppRequest, StartAppResponse>;
+    dumpState: Requester<DumpStateRequest, DumpStateResponse>;
+    dumpFullState: Requester<DumpFullStateRequest, DumpFullStateResponse>;
+    generateAgentPubKey: Requester<GenerateAgentPubKeyRequest, GenerateAgentPubKeyResponse>;
+    registerDna: Requester<RegisterDnaRequest, RegisterDnaResponse>;
+    getDnaDefinition: Requester<GetDnaDefinitionRequest, GetDnaDefinitionResponse>;
+    uninstallApp: Requester<UninstallAppRequest, UninstallAppResponse>;
+    installApp: Requester<InstallAppRequest, InstallAppResponse>;
+    listDnas: Requester<ListDnasRequest, ListDnasResponse>;
+    listCellIds: Requester<ListCellIdsRequest, ListCellIdsResponse>;
+    listApps: Requester<ListAppsRequest, ListAppsResponse>;
+    listAppInterfaces: Requester<ListAppInterfacesRequest, ListAppInterfacesResponse>;
+    agentInfo: Requester<AgentInfoRequest, AgentInfoResponse>;
+    addAgentInfo: Requester<AddAgentInfoRequest, AddAgentInfoResponse>;
+    deleteCloneCell: Requester<DeleteCloneCellRequest, DeleteCloneCellResponse>;
+    grantZomeCallCapability: Requester<GrantZomeCallCapabilityRequest, GrantZomeCallCapabilityResponse>;
+    /**
+     * Grant a capability for signing zome calls.
+     *
+     * @param cellId - The cell to grant the capability for.
+     * @param functions - The zome functions to grant the capability for.
+     * @param signingKey - The assignee of the capability.
+     * @returns The cap secret of the created capability.
+     */
+    grantSigningKey: (cellId: CellId, functions: GrantedFunctions, signingKey: AgentPubKey) => Promise<CapSecret>;
+    /**
+     * Generate and authorize a new key pair for signing zome calls.
+     *
+     * @param cellId - The cell id to create the capability grant for.
+     * @param functions - Zomes and functions to authorize the signing key for
+     * (optional). When no functions are specified, the capability will be
+     * granted for all zomes and functions.
+     */
+    authorizeSigningCredentials: (cellId: CellId, functions?: GrantedFunctions) => Promise<void>;
 }

package/lib/api/admin/websocket.js

@@ -1,24 +1,9 @@
-/**
- * Defines AdminWebsocket, an easy-to-use websocket implementation of the
- * Conductor Admin API
- *
- *    const client = AdminWebsocket.connect(
- *      'ws://127.0.0.1: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";
+import { GrantedFunctionsType, } from "../../hdk/capabilities.js";
+import { WsClient } from "../client.js";
+import { catchError, DEFAULT_TIMEOUT, promiseTimeout, requesterTransformer, } from "../common.js";
+import { generateSigningKeyPair, randomCapSecret, setSigningCredentials, } from "../zome-call-signing.js";
+import { AppStatusFilter, } from "./types.js";
 export class AdminWebsocket {
     client;
     defaultTimeout;
@@ -30,7 +15,7 @@ export class AdminWebsocket {
     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 = getLauncherEnvironment();
-        if (env) {
+        if (env?.ADMIN_INTERFACE_PORT) {
             url = `ws://127.0.0.1:${env.ADMIN_INTERFACE_PORT}`;
         }
         const wsClient = await WsClient.connect(url);
@@ -58,6 +43,45 @@ export class AdminWebsocket {
     addAgentInfo = this._requester("add_agent_info");
     deleteCloneCell = this._requester("delete_clone_cell");
     grantZomeCallCapability = this._requester("grant_zome_call_capability");
+    // zome call signing related methods
+    /**
+     * Grant a capability for signing zome calls.
+     *
+     * @param cellId - The cell to grant the capability for.
+     * @param functions - The zome functions to grant the capability for.
+     * @param signingKey - The assignee of the capability.
+     * @returns The cap secret of the created capability.
+     */
+    grantSigningKey = async (cellId, functions, signingKey) => {
+        const capSecret = randomCapSecret();
+        await this.grantZomeCallCapability({
+            cell_id: cellId,
+            cap_grant: {
+                tag: "zome-call-signing-key",
+                functions,
+                access: {
+                    Assigned: {
+                        secret: capSecret,
+                        assignees: [signingKey],
+                    },
+                },
+            },
+        });
+        return capSecret;
+    };
+    /**
+     * Generate and authorize a new key pair for signing zome calls.
+     *
+     * @param cellId - The cell id to create the capability grant for.
+     * @param functions - Zomes and functions to authorize the signing key for
+     * (optional). When no functions are specified, the capability will be
+     * granted for all zomes and functions.
+     */
+    authorizeSigningCredentials = async (cellId, functions) => {
+        const [keyPair, signingKey] = generateSigningKeyPair();
+        const capSecret = await this.grantSigningKey(cellId, functions || { [GrantedFunctionsType.All]: null }, signingKey);
+        setSigningCredentials(cellId, { capSecret, keyPair, signingKey });
+    };
 }
 const listAppsTransform = {
     input: (req) => {
@@ -77,23 +101,23 @@ const dumpStateTransform = {
 };
 function getAppStatusInApiForm(status_filter) {
     switch (status_filter) {
-        case Api.AppStatusFilter.Running:
+        case AppStatusFilter.Running:
             return {
                 Running: null,
             };
-        case Api.AppStatusFilter.Enabled:
+        case AppStatusFilter.Enabled:
             return {
                 Enabled: null,
             };
-        case Api.AppStatusFilter.Paused:
+        case AppStatusFilter.Paused:
             return {
                 Paused: null,
             };
-        case Api.AppStatusFilter.Disabled:
+        case AppStatusFilter.Disabled:
             return {
                 Disabled: null,
             };
-        case Api.AppStatusFilter.Stopped:
+        case AppStatusFilter.Stopped:
             return {
                 Stopped: null,
             };

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

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

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

@@ -1,6 +1,6 @@
-import { AgentPubKey, CellId, DnaProperties, InstalledAppId, InstalledCell, RoleName, Timestamp, DnaHash, NetworkInfo } from "../../types.js";
+import { AgentPubKey, CellId, DnaHash, DnaProperties, InstalledAppId, InstalledCell, NetworkInfo, RoleName, Timestamp } from "../../types.js";
+import { AppInfo, FunctionName, MembraneProof, NetworkSeed, ZomeName } from "../admin/index.js";
 import { Requester } from "../common.js";
-import { FunctionName, AppInfo, MembraneProof, NetworkSeed, ZomeName } from "../admin/index.js";
 export declare type CallZomeRequestGeneric<Payload> = {
     cell_id: CellId;
     zome_name: ZomeName;
@@ -67,20 +67,24 @@ export interface DisableCloneCellRequest {
 export declare type DisableCloneCellResponse = void;
 export declare type EnableCloneCellRequest = DisableCloneCellRequest;
 export declare type EnableCloneCellResponse = CreateCloneCellResponse;
-export declare type AppSignal = {
-    type: string;
-    data: {
-        cellId: CellId;
-        payload: any;
-    };
-};
 export interface NetworkInfoRequest {
     /** The DNAs for which to get network info */
     dnas: DnaHash[];
 }
-export declare type NetworkInfoResponse = NetworkInfo[];
+export declare const SignalType: {
+    readonly App: "App";
+    readonly System: "System";
+};
+export declare type Signal = {
+    [SignalType.App]: [CellId, any];
+    [SignalType.System]: unknown;
+};
+export declare type AppSignal = {
+    cell_id: CellId;
+    payload: any;
+};
 export declare type AppSignalCb = (signal: AppSignal) => void;
-export declare type SignalResponseGeneric<Payload> = Payload;
+export declare type NetworkInfoResponse = NetworkInfo[];
 export interface AppApi {
     appInfo: Requester<AppInfoRequest, AppInfoResponse>;
     callZome: Requester<CallZomeRequest, CallZomeResponse>;

package/lib/api/app/types.js

@@ -1,2 +1,5 @@
-export {};
+export const SignalType = {
+    App: "App",
+    System: "System",
+};
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/app/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/app/types.ts"],"names":[],"mappings":"AAkGA,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,KAAK;IACV,MAAM,EAAE,QAAQ;CACR,CAAC"}

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

@@ -4,13 +4,13 @@ import { InstalledAppId } from "../../types.js";
 import { WsClient } from "../client.js";
 import { Requester, Transformer } from "../common.js";
 import { Nonce256Bit } from "../zome-call-signing.js";
-import { AppApi, AppInfoRequest, AppInfoResponse, AppSignalCb, CallZomeRequest, CallZomeResponse, CreateCloneCellRequest, CreateCloneCellResponse, DisableCloneCellRequest, DisableCloneCellResponse, EnableCloneCellRequest, EnableCloneCellResponse, NetworkInfoRequest, NetworkInfoResponse } from "./types.js";
+import { AppApi, AppInfoRequest, AppInfoResponse, CallZomeRequest, CallZomeResponse, CreateCloneCellRequest, CreateCloneCellResponse, DisableCloneCellRequest, DisableCloneCellResponse, EnableCloneCellRequest, EnableCloneCellResponse, NetworkInfoRequest, NetworkInfoResponse } from "./types.js";
 export declare class AppWebsocket extends Emittery implements AppApi {
     readonly client: WsClient;
     defaultTimeout: number;
     overrideInstalledAppId?: InstalledAppId;
     private constructor();
-    static connect(url: string, defaultTimeout?: number, signalCb?: AppSignalCb): Promise<AppWebsocket>;
+    static connect(url: string, defaultTimeout?: number): Promise<AppWebsocket>;
     _requester: <ReqI, ReqO, ResI, ResO>(tag: string, transformer?: Transformer<ReqI, ReqO, ResI, ResO> | undefined) => (req: ReqI, timeout?: number | undefined) => Promise<ResO>;
     appInfo: Requester<AppInfoRequest, AppInfoResponse>;
     callZome: Requester<CallZomeRequest | CallZomeRequestSigned, CallZomeResponse>;
@@ -27,3 +27,4 @@ export interface CallZomeRequestUnsigned extends CallZomeRequest {
 export interface CallZomeRequestSigned extends CallZomeRequestUnsigned {
     signature: Uint8Array;
 }
+export declare const signZomeCall: (request: CallZomeRequest) => Promise<CallZomeRequestSigned>;

package/lib/api/app/websocket.js

@@ -1,9 +1,11 @@
-import { decode } from "@msgpack/msgpack";
+import { hashZomeCall } from "@holochain/serialization";
+import { decode, encode } from "@msgpack/msgpack";
 import Emittery from "emittery";
+import nacl from "tweetnacl";
 import { getLauncherEnvironment, isLauncher, signZomeCallTauri, } from "../../environments/launcher.js";
 import { WsClient } from "../client.js";
 import { catchError, DEFAULT_TIMEOUT, promiseTimeout, requesterTransformer, } from "../common.js";
-import { signZomeCall } from "../zome-call-signing.js";
+import { getNonceExpiration, getSigningCredentials, randomNonce, } from "../zome-call-signing.js";
 export class AppWebsocket extends Emittery {
     client;
     defaultTimeout;
@@ -15,17 +17,14 @@ export class AppWebsocket extends Emittery {
             defaultTimeout === undefined ? DEFAULT_TIMEOUT : defaultTimeout;
         this.overrideInstalledAppId = overrideInstalledAppId;
     }
-    static async connect(url, defaultTimeout, signalCb) {
+    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 = getLauncherEnvironment();
-        if (env) {
+        if (env?.APP_INTERFACE_PORT) {
             url = `ws://127.0.0.1:${env.APP_INTERFACE_PORT}`;
         }
-        if (signalCb) {
-            console.warn("Providing a signal callback on client initialization is deprecated. Instead add an event handler using `.on('signal', signalCb)`.");
-        }
-        const wsClient = await WsClient.connect(url, signalCb);
-        const appWebsocket = new AppWebsocket(wsClient, defaultTimeout, env ? env.INSTALLED_APP_ID : undefined);
+        const wsClient = await WsClient.connect(url);
+        const appWebsocket = new AppWebsocket(wsClient, defaultTimeout, env?.INSTALLED_APP_ID);
         wsClient.on("signal", (signal) => appWebsocket.emit("signal", signal));
         return appWebsocket;
     }
@@ -60,4 +59,29 @@ const appInfoTransform = (appWs) => ({
     },
     output: (response) => response,
 });
+export const signZomeCall = async (request) => {
+    const signingCredentialsForCell = getSigningCredentials(request.cell_id);
+    if (!signingCredentialsForCell) {
+        throw new Error(`cannot sign zome call: no signing credentials have been authorized for cell ${request.cell_id}`);
+    }
+    const unsignedZomeCallPayload = {
+        cap_secret: signingCredentialsForCell.capSecret,
+        cell_id: request.cell_id,
+        zome_name: request.zome_name,
+        fn_name: request.fn_name,
+        provenance: signingCredentialsForCell.signingKey,
+        payload: encode(request.payload),
+        nonce: randomNonce(),
+        expires_at: getNonceExpiration(),
+    };
+    const hashedZomeCall = await hashZomeCall(unsignedZomeCallPayload);
+    const signature = nacl
+        .sign(hashedZomeCall, signingCredentialsForCell.keyPair.secretKey)
+        .subarray(0, nacl.sign.signatureLength);
+    const signedZomeCall = {
+        ...unsignedZomeCallPayload,
+        signature,
+    };
+    return signedZomeCall;
+};
 //# sourceMappingURL=websocket.js.map

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

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

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

@@ -1,7 +1,7 @@
 import { UnsubscribeFunction } from "emittery";
-import { DisableCloneCellResponse, CreateCloneCellRequest, CreateCloneCellResponse } from "../index.js";
 import { AgentPubKey, RoleName } from "../../index.js";
-import { AppInfoResponse, AppSignal, DisableCloneCellRequest, CallZomeRequest, EnableCloneCellRequest, EnableCloneCellResponse, CallZomeRequestSigned } from "../app/index.js";
+import { AppInfoResponse, AppSignal, AppSignalCb, CallZomeRequest, CallZomeRequestSigned, DisableCloneCellRequest, EnableCloneCellRequest, EnableCloneCellResponse } from "../app/index.js";
+import { CreateCloneCellRequest, CreateCloneCellResponse, DisableCloneCellResponse } from "../index.js";
 export declare type NonProvenanceCallZomeRequest = Omit<CallZomeRequest, "provenance">;
 export declare type RoleNameCallZomeRequest = Omit<NonProvenanceCallZomeRequest, "cell_id"> & {
     role_name: RoleName;
@@ -18,7 +18,7 @@ export interface AppAgentEvents {
 }
 export interface AppAgentClient {
     callZome(args: AppAgentCallZomeRequest, timeout?: number): Promise<any>;
-    on<Name extends keyof AppAgentEvents>(eventName: Name | readonly Name[], listener: (eventData: AppAgentEvents[Name]) => void | Promise<void>): UnsubscribeFunction;
+    on<Name extends keyof AppAgentEvents>(eventName: Name | readonly Name[], listener: AppSignalCb): UnsubscribeFunction;
     appInfo(): Promise<AppInfoResponse>;
     myPubKey: AgentPubKey;
     createCloneCell(args: AppCreateCloneCellRequest): Promise<CreateCloneCellResponse>;

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

@@ -1,6 +1,6 @@
 import Emittery, { UnsubscribeFunction } from "emittery";
-import { AgentPubKey, InstalledAppId, RoleName } from "../../types.js";
-import { AppInfo, AppInfoResponse, AppWebsocket, CallZomeResponse, CreateCloneCellResponse, DisableCloneCellResponse, EnableCloneCellResponse } from "../index.js";
+import { AgentPubKey, CellId, InstalledAppId, RoleName } from "../../types.js";
+import { AppInfo, AppSignalCb, AppWebsocket, CallZomeResponse, CreateCloneCellResponse, DisableCloneCellResponse, EnableCloneCellResponse } from "../index.js";
 import { AppAgentCallZomeRequest, AppAgentClient, AppAgentEvents, AppCreateCloneCellRequest, AppDisableCloneCellRequest, AppEnableCloneCellRequest } from "./types.js";
 export declare class AppAgentWebsocket implements AppAgentClient {
     myPubKey: AgentPubKey;
@@ -9,12 +9,13 @@ export declare class AppAgentWebsocket implements AppAgentClient {
     cachedAppInfo?: AppInfo;
     readonly emitter: Emittery<AppAgentEvents>;
     private constructor();
-    appInfo(): Promise<AppInfoResponse>;
-    static connect(appWebsocket: AppWebsocket, installedAppId: InstalledAppId): Promise<AppAgentWebsocket>;
-    getCellIdFromRoleName(roleName: RoleName, appInfo: AppInfo): import("../../types.js").CellId;
+    appInfo(): Promise<AppInfo>;
+    static connect(url: string, installed_app_id: InstalledAppId, defaultTimeout?: number): Promise<AppAgentWebsocket>;
+    getCellIdFromRoleName(roleName: RoleName, appInfo: AppInfo): CellId;
     callZome(request: AppAgentCallZomeRequest, timeout?: number): Promise<CallZomeResponse>;
     createCloneCell(args: AppCreateCloneCellRequest): Promise<CreateCloneCellResponse>;
     enableCloneCell(args: AppEnableCloneCellRequest): Promise<EnableCloneCellResponse>;
     disableCloneCell(args: AppDisableCloneCellRequest): Promise<DisableCloneCellResponse>;
-    on<Name extends keyof AppAgentEvents>(eventName: Name | readonly Name[], listener: (eventData: AppAgentEvents[Name]) => void | Promise<void>): UnsubscribeFunction;
+    on<Name extends keyof AppAgentEvents>(eventName: Name | readonly Name[], listener: AppSignalCb): UnsubscribeFunction;
+    private containsCell;
 }