bump js-client to 0.19.0-dev.7 and adapt code accordingly

Author: matthme

CHANGELOG.md

@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 ### Removed
 ### Changed
+- Update to `@holochain/[email protected]` and update types accordingly.
 ### Fixed
 
 ## 2025-02-12: v0.18.0-dev.4

docs/tryorama.trycpconductor.adminws.md

@@ -32,7 +32,7 @@ adminWs(): {
         listApps: (request: ListAppsRequest) => Promise<import("@holochain/client").ListAppsResponse>;
         listCellIds: () => Promise<import("@holochain/client").ListCellIdsResponse>;
         listDnas: () => Promise<import("@holochain/client").ListDnasResponse>;
-        registerDna: (request: RegisterDnaRequest & DnaSource) => Promise<DnaHash>;
+        registerDna: (request: RegisterDnaRequest) => Promise<DnaHash>;
         revokeAgentKey: (data: RevokeAgentKeyRequest) => Promise<import("@holochain/client").RevokeAgentKeyResponse>;
         startApp: (request: StartAppRequest) => Promise<boolean>;
         storageInfo: (request: StorageInfoRequest) => Promise<import("@holochain/client").StorageInfo>;
@@ -43,7 +43,7 @@ adminWs(): {
 ```
 **Returns:**
 
-{ addAgentInfo: (request: AddAgentInfoRequest) =&gt; Promise&lt;void&gt;; agentInfo: (req: AgentInfoRequest) =&gt; Promise&lt;import("@holochain/client").AgentInfoResponse&gt;; attachAppInterface: (request?: AttachAppInterfaceRequest) =&gt; Promise&lt;{ port: number; }&gt;; authorizeSigningCredentials: (cellId: CellId, functions?: GrantedFunctions) =&gt; Promise&lt;void&gt;; deleteCloneCell: (request: DeleteCloneCellRequest) =&gt; Promise&lt;void&gt;; disableApp: (request: DisableAppRequest) =&gt; Promise&lt;null&gt;; dumpFullState: (request: DumpFullStateRequest) =&gt; Promise&lt;FullStateDump&gt;; dumpNetworkStats: (request: DumpNetworkStatsRequest) =&gt; Promise&lt;string&gt;; dumpState: (request: DumpStateRequest) =&gt; Promise&lt;\[FullStateDump, string\]&gt;; enableApp: (request: EnableAppRequest) =&gt; Promise&lt;import("@holochain/client").EnableAppResponse&gt;; generateAgentPubKey: () =&gt; Promise&lt;AgentPubKey&gt;; getCompatibleCells: (dnaHash: GetCompatibleCellsRequest) =&gt; Promise&lt;GetCompatibleCellsResponse&gt;; getDnaDefinition: (dnaHash: GetDnaDefinitionRequest) =&gt; Promise&lt;DnaDefinition&gt;; grantSigningKey: (cellId: CellId, functions: GrantedFunctions, signingKey: AgentPubKey) =&gt; Promise&lt;CapSecret&gt;; grantZomeCallCapability: (request: GrantZomeCallCapabilityRequest) =&gt; Promise&lt;void&gt;; installApp: (data: InstallAppRequest) =&gt; Promise&lt;import("@holochain/client").AppInfo&gt;; listAppInterfaces: () =&gt; Promise&lt;import("@holochain/client").ListAppInterfacesResponse&gt;; listApps: (request: ListAppsRequest) =&gt; Promise&lt;import("@holochain/client").ListAppsResponse&gt;; listCellIds: () =&gt; Promise&lt;import("@holochain/client").ListCellIdsResponse&gt;; listDnas: () =&gt; Promise&lt;import("@holochain/client").ListDnasResponse&gt;; registerDna: (request: RegisterDnaRequest &amp; DnaSource) =&gt; Promise&lt;DnaHash&gt;; revokeAgentKey: (data: RevokeAgentKeyRequest) =&gt; Promise&lt;import("@holochain/client").RevokeAgentKeyResponse&gt;; startApp: (request: StartAppRequest) =&gt; Promise&lt;boolean&gt;; storageInfo: (request: StorageInfoRequest) =&gt; Promise&lt;import("@holochain/client").StorageInfo&gt;; uninstallApp: (request: UninstallAppRequest) =&gt; Promise&lt;null&gt;; updateCoordinators: (request: UpdateCoordinatorsRequest) =&gt; Promise&lt;void&gt;; issueAppAuthenticationToken: (request: IssueAppAuthenticationTokenRequest) =&gt; Promise&lt;import("@holochain/client").IssueAppAuthenticationTokenResponse&gt;; }
+{ addAgentInfo: (request: AddAgentInfoRequest) =&gt; Promise&lt;void&gt;; agentInfo: (req: AgentInfoRequest) =&gt; Promise&lt;import("@holochain/client").AgentInfoResponse&gt;; attachAppInterface: (request?: AttachAppInterfaceRequest) =&gt; Promise&lt;{ port: number; }&gt;; authorizeSigningCredentials: (cellId: CellId, functions?: GrantedFunctions) =&gt; Promise&lt;void&gt;; deleteCloneCell: (request: DeleteCloneCellRequest) =&gt; Promise&lt;void&gt;; disableApp: (request: DisableAppRequest) =&gt; Promise&lt;null&gt;; dumpFullState: (request: DumpFullStateRequest) =&gt; Promise&lt;FullStateDump&gt;; dumpNetworkStats: (request: DumpNetworkStatsRequest) =&gt; Promise&lt;string&gt;; dumpState: (request: DumpStateRequest) =&gt; Promise&lt;\[FullStateDump, string\]&gt;; enableApp: (request: EnableAppRequest) =&gt; Promise&lt;import("@holochain/client").EnableAppResponse&gt;; generateAgentPubKey: () =&gt; Promise&lt;AgentPubKey&gt;; getCompatibleCells: (dnaHash: GetCompatibleCellsRequest) =&gt; Promise&lt;GetCompatibleCellsResponse&gt;; getDnaDefinition: (dnaHash: GetDnaDefinitionRequest) =&gt; Promise&lt;DnaDefinition&gt;; grantSigningKey: (cellId: CellId, functions: GrantedFunctions, signingKey: AgentPubKey) =&gt; Promise&lt;CapSecret&gt;; grantZomeCallCapability: (request: GrantZomeCallCapabilityRequest) =&gt; Promise&lt;void&gt;; installApp: (data: InstallAppRequest) =&gt; Promise&lt;import("@holochain/client").AppInfo&gt;; listAppInterfaces: () =&gt; Promise&lt;import("@holochain/client").ListAppInterfacesResponse&gt;; listApps: (request: ListAppsRequest) =&gt; Promise&lt;import("@holochain/client").ListAppsResponse&gt;; listCellIds: () =&gt; Promise&lt;import("@holochain/client").ListCellIdsResponse&gt;; listDnas: () =&gt; Promise&lt;import("@holochain/client").ListDnasResponse&gt;; registerDna: (request: RegisterDnaRequest) =&gt; Promise&lt;DnaHash&gt;; revokeAgentKey: (data: RevokeAgentKeyRequest) =&gt; Promise&lt;import("@holochain/client").RevokeAgentKeyResponse&gt;; startApp: (request: StartAppRequest) =&gt; Promise&lt;boolean&gt;; storageInfo: (request: StorageInfoRequest) =&gt; Promise&lt;import("@holochain/client").StorageInfo&gt;; uninstallApp: (request: UninstallAppRequest) =&gt; Promise&lt;null&gt;; updateCoordinators: (request: UpdateCoordinatorsRequest) =&gt; Promise&lt;void&gt;; issueAppAuthenticationToken: (request: IssueAppAuthenticationTokenRequest) =&gt; Promise&lt;import("@holochain/client").IssueAppAuthenticationTokenResponse&gt;; }
 
 The Admin API web socket.
 

flake.lock

@@ -1,23 +1,17 @@
 {
-  inputs = {
+ inputs = {
     holonix = {
       url = "github:holochain/holonix?ref=main";
-      inputs.crane.follows = "crane";
-      inputs.rust-overlay.follows = "rust-overlay";
     };
 
     nixpkgs.follows = "holonix/nixpkgs";
 
+
     # lib to build a nix package from a rust crate
-    crane = {
-      url = "github:ipetkov/crane";
-    };
+    crane.follows = "holonix/crane";
 
     # Rust toolchain
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "holonix/nixpkgs";
-    };
+    rust-overlay.follows = "holonix/rust-overlay";
   };
 
   outputs = inputs@{ nixpkgs, holonix, crane, rust-overlay, ... }:

flake.nix

@@ -43,7 +43,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@holochain/client": "^0.19.0-dev.6",
+    "@holochain/client": "^0.19.0-dev.7",
     "get-port": "^6.1.2",
     "lodash": "^4.17.21",
     "uuid": "^8.3.2",

package-lock.json

@@ -143,20 +143,14 @@ export const enableAndGetAgentApp = async (
   const namedCells = new Map<RoleName, CallableCell>();
   Object.keys(appInfo.cell_info).forEach((role_name) => {
     appInfo.cell_info[role_name].forEach((cellInfo) => {
-      if (CellType.Provisioned in cellInfo) {
-        const callableCell = getCallableCell(
-          appWs,
-          cellInfo[CellType.Provisioned]
-        );
+      if (cellInfo.type === CellType.Provisioned) {
+        const callableCell = getCallableCell(appWs, cellInfo.value);
         cells.push(callableCell);
         namedCells.set(role_name, callableCell);
-      } else if (
-        CellType.Cloned in cellInfo &&
-        cellInfo[CellType.Cloned].clone_id
-      ) {
-        const callableCell = getCallableCell(appWs, cellInfo[CellType.Cloned]);
+      } else if (cellInfo.type === CellType.Cloned && cellInfo.value.clone_id) {
+        const callableCell = getCallableCell(appWs, cellInfo.value);
         cells.push(callableCell);
-        namedCells.set(cellInfo[CellType.Cloned].clone_id, callableCell);
+        namedCells.set(cellInfo.value.clone_id, callableCell);
       } else {
         throw new Error("Stem cells are not implemented");
       }

package.json

@@ -378,22 +378,13 @@ export class Conductor implements IConductor {
     const installed_app_id = options?.installedAppId ?? `app-${uuidv4()}`;
     const roles_settings = options?.rolesSettings;
     const network_seed = options?.networkSeed;
-    const installAppRequest: InstallAppRequest =
-      "bundle" in appBundleSource
-        ? {
-            bundle: appBundleSource.bundle,
-            agent_key,
-            roles_settings,
-            installed_app_id,
-            network_seed,
-          }
-        : {
-            path: appBundleSource.path,
-            agent_key,
-            roles_settings,
-            installed_app_id,
-            network_seed,
-          };
+    const installAppRequest: InstallAppRequest = {
+      source: appBundleSource,
+      agent_key,
+      roles_settings,
+      installed_app_id,
+      network_seed,
+    };
     logger.debug(
       `installing app with id ${installed_app_id} for agent ${encodeHashToBase64(
         agent_key

ts/src/common.ts

@@ -15,7 +15,6 @@ import {
   DisableCloneCellRequest,
   DnaDefinition,
   DnaHash,
-  DnaSource,
   DumpFullStateRequest,
   DumpNetworkStatsRequest,
   DumpStateRequest,
@@ -29,7 +28,6 @@ import {
   GetDnaDefinitionRequest,
   getSigningCredentials,
   GrantedFunctions,
-  GrantedFunctionsType,
   GrantZomeCallCapabilityRequest,
   InstallAppRequest,
   IssueAppAuthenticationTokenRequest,
@@ -412,7 +410,7 @@ export class TryCpConductor implements IConductor {
      * @returns The registered DNA's {@link HoloHash}.
      */
     const registerDna = async (
-      request: RegisterDnaRequest & DnaSource
+      request: RegisterDnaRequest
     ): Promise<DnaHash> => {
       const response = await this.callAdminApi({
         type: "register_dna",
@@ -800,7 +798,8 @@ export class TryCpConductor implements IConductor {
           tag: "zome-call-signing-key",
           functions,
           access: {
-            Assigned: {
+            type: "assigned",
+            value: {
               secret: capSecret,
               assignees: [signingKey],
             },
@@ -823,7 +822,7 @@ export class TryCpConductor implements IConductor {
       const [keyPair, signingKey] = await generateSigningKeyPair();
       const capSecret = await grantSigningKey(
         cellId,
-        functions || GrantedFunctionsType.All,
+        functions || { type: "all" },
         signingKey
       );
       setSigningCredentials(cellId, { capSecret, keyPair, signingKey });
@@ -1039,22 +1038,13 @@ export class TryCpConductor implements IConductor {
     const roles_settings = options?.rolesSettings;
     const installed_app_id = options?.installedAppId ?? `app-${uuidv4()}`;
     const network_seed = options?.networkSeed;
-    const installAppRequest: InstallAppRequest =
-      "bundle" in appBundleSource
-        ? {
-            bundle: appBundleSource.bundle,
-            agent_key,
-            roles_settings,
-            installed_app_id,
-            network_seed,
-          }
-        : {
-            path: appBundleSource.path,
-            agent_key,
-            roles_settings,
-            installed_app_id,
-            network_seed,
-          };
+    const installAppRequest: InstallAppRequest = {
+      source: appBundleSource,
+      agent_key,
+      roles_settings,
+      installed_app_id,
+      network_seed,
+    };
     return this.adminWs().installApp(installAppRequest);
   }
 
@@ -1073,22 +1063,13 @@ export class TryCpConductor implements IConductor {
         const roles_settings = appForAgent.rolesSettings;
         const installed_app_id = options.installedAppId ?? `app-${uuidv4()}`;
         const network_seed = options.networkSeed;
-        const installAppRequest: InstallAppRequest =
-          "bundle" in appForAgent.app
-            ? {
-                bundle: appForAgent.app.bundle,
-                agent_key,
-                roles_settings,
-                installed_app_id,
-                network_seed,
-              }
-            : {
-                path: appForAgent.app.path,
-                agent_key,
-                roles_settings,
-                installed_app_id,
-                network_seed,
-              };
+        const installAppRequest: InstallAppRequest = {
+          source: appForAgent.app,
+          agent_key,
+          roles_settings,
+          installed_app_id,
+          network_seed,
+        };
 
         logger.debug(
           `installing app with id ${installed_app_id} for agent ${encodeHashToBase64(

ts/src/local/conductor.ts

@@ -1,6 +1,5 @@
-import { SignalCb, CallZomeRequestSigned } from "@holochain/client";
+import { SignalCb } from "@holochain/client";
 import msgpack from "@msgpack/msgpack";
-import cloneDeep from "lodash/cloneDeep.js";
 import assert from "node:assert";
 import { URL } from "node:url";
 import { WebSocket } from "ws";