@holochain/client 0.11.14 → 0.11.16

package/README.md

@@ -8,6 +8,8 @@
 
 A JavaScript client for the Holochain Conductor API (works with browsers as well as Nodejs).
 
+## API Reference
+
 [Complete API reference](./docs/client.md)
 
 ## Installation
@@ -21,12 +23,6 @@ npm install --save-exact @holochain/client
 
 ## Sample usage
 
-### Use AdminWebsocket
-```typescript
-  const admin = await AdminWebsocket.connect(`ws://127.0.0.1:8000`, TIMEOUT)
-  const agentPubKey = await admin.generateAgentPubKey()
-```
-
 ### Use AppAgentWebsocket with implicit zome call signing
 ```typescript
   const signalCb = (signal: AppSignal) => {
@@ -100,17 +96,12 @@ setSigningCredentials(cell_id, signingCredentials);
 localStorage.setItem(cellIdB64, JSON.stringify(signingCredentials));
 ```
 
-## API Reference
-
-See [docs/API.md](docs/API.md)
-
-
 # Holochain Compatibility
 
 See [default.nix](./default.nix) for the Holochain version this package is compatible with.
 
 If updating the Holochain version included in holonix, please use `niv update` as explained in the
-[Holochain Installation Guide](https://developer.holochain.org/install/#upgrading-the-holochain-version).
+[Holochain Installation Guide](https://developer.holochain.org/install-advanced/#upgrading-the-holochain-version).
 
 ## Running tests
 

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

@@ -81,9 +81,18 @@ export interface StemCell {
 /**
  * @public
  */
-export interface Cell {
+export interface ProvisionedCell {
     cell_id: CellId;
-    clone_id?: RoleName;
+    dna_modifiers: DnaModifiers;
+    name: string;
+}
+/**
+ * @public
+ */
+export interface ClonedCell {
+    cell_id: CellId;
+    clone_id: RoleName;
+    original_dna_hash: DnaHash;
     dna_modifiers: DnaModifiers;
     name: string;
     enabled: boolean;
@@ -92,17 +101,17 @@ export interface Cell {
  * @public
  */
 export declare enum CellType {
-    Provisioned = "Provisioned",
-    Cloned = "Cloned",
-    Stem = "Stem"
+    Provisioned = "provisioned",
+    Cloned = "cloned",
+    Stem = "stem"
 }
 /**
  * @public
  */
 export declare type CellInfo = {
-    [CellType.Provisioned]: Cell;
+    [CellType.Provisioned]: ProvisionedCell;
 } | {
-    [CellType.Cloned]: Cell;
+    [CellType.Cloned]: ClonedCell;
 } | {
     [CellType.Stem]: StemCell;
 };
@@ -110,6 +119,7 @@ export declare type CellInfo = {
  * @public
  */
 export declare type AppInfo = {
+    agent_pub_key: AgentPubKey;
     installed_app_id: InstalledAppId;
     cell_info: Record<RoleName, Array<CellInfo>>;
     status: InstalledAppInfoStatus;
@@ -245,7 +255,7 @@ export declare type UninstallAppResponse = null;
 /**
  * @public
  */
-export declare type ResourceBytes = number[];
+export declare type ResourceBytes = Uint8Array;
 /**
  * @public
  */
@@ -621,7 +631,6 @@ export interface AdminApi {
     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>;

package/lib/api/admin/types.js

@@ -3,9 +3,9 @@
  */
 export var CellType;
 (function (CellType) {
-    CellType["Provisioned"] = "Provisioned";
-    CellType["Cloned"] = "Cloned";
-    CellType["Stem"] = "Stem";
+    CellType["Provisioned"] = "provisioned";
+    CellType["Cloned"] = "cloned";
+    CellType["Stem"] = "stem";
 })(CellType || (CellType = {}));
 /**
  * @public

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

@@ -2,7 +2,7 @@ import { CapSecret, GrantedFunctions } from "../../hdk/capabilities.js";
 import type { AgentPubKey, CellId } from "../../types.js";
 import { WsClient } from "../client.js";
 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";
+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, UninstallAppRequest, UninstallAppResponse } from "./types.js";
 /**
  * A class for interacting with a conductor's Admin API.
  *
@@ -39,10 +39,6 @@ export declare class AdminWebsocket implements AdminApi {
      * Disable a running app.
      */
     disableApp: Requester<DisableAppRequest, DisableAppResponse>;
-    /**
-     * Start an app.
-     */
-    startApp: Requester<StartAppRequest, StartAppResponse>;
     /**
      * Dump the state of the specified cell, including its source chain, as JSON.
      */

package/lib/api/admin/websocket.js

@@ -54,10 +54,6 @@ export class AdminWebsocket {
      * Disable a running app.
      */
     disableApp = this._requester("disable_app");
-    /**
-     * Start an app.
-     */
-    startApp = this._requester("start_app");
     /**
      * Dump the state of the specified cell, including its source chain, as JSON.
      */

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

@@ -1,5 +1,5 @@
-import { AgentPubKey, CellId, DnaHash, DnaProperties, InstalledAppId, InstalledCell, NetworkInfo, RoleName, Timestamp } from "../../types.js";
-import { AppInfo, FunctionName, MembraneProof, NetworkSeed, ZomeName } from "../admin/index.js";
+import { AgentPubKey, CellId, DnaHash, DnaProperties, InstalledAppId, NetworkInfo, RoleName, Timestamp } from "../../types.js";
+import { AppInfo, ClonedCell, FunctionName, MembraneProof, NetworkSeed, ZomeName } from "../admin/index.js";
 import { Requester } from "../common.js";
 /**
  * @public
@@ -83,7 +83,7 @@ export interface CreateCloneCellRequest {
 /**
  * @public
  */
-export declare type CreateCloneCellResponse = InstalledCell;
+export declare type CreateCloneCellResponse = ClonedCell;
 /**
  * @public
  */

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

@@ -9,10 +9,10 @@ import { AppAgentCallZomeRequest, AppAgentClient, AppAgentEvents, AppCreateClone
  * @public
  */
 export declare class AppAgentWebsocket implements AppAgentClient {
-    myPubKey: AgentPubKey;
     readonly appWebsocket: AppWebsocket;
     installedAppId: InstalledAppId;
     cachedAppInfo?: AppInfo;
+    myPubKey: AgentPubKey;
     readonly emitter: Emittery<AppAgentEvents>;
     private constructor();
     /**

package/lib/api/app-agent/websocket.js

@@ -3,21 +3,6 @@ import { omit } from "lodash-es";
 import { getLauncherEnvironment } from "../../environments/launcher.js";
 import { getBaseRoleNameFromCloneId, isCloneId } from "../common.js";
 import { AppWebsocket, CellType, } from "../index.js";
-function getPubKey(appInfo) {
-    // This is fine for now cause `UseExisting` as a provisioning strategy doesn't work yet.
-    // TODO: change this when AppInfo contains the `AgentPubKey` for this app, like `return appInfo.my_pub_key`
-    for (const cells of Object.values(appInfo.cell_info)) {
-        for (const cell of cells) {
-            if (CellType.Provisioned in cell) {
-                return cell.Provisioned.cell_id[1];
-            }
-            else if (CellType.Cloned in cell) {
-                return cell.Cloned.cell_id[1];
-            }
-        }
-    }
-    throw new Error(`This app doesn't have any cells, so we can't return the agent public key for it. This is a known issue, and is going to be fixed in the near future.`);
-}
 /**
  * A class to establish a websocket connection to an App interface, for a
  * specific agent and app.
@@ -25,17 +10,17 @@ function getPubKey(appInfo) {
  * @public
  */
 export class AppAgentWebsocket {
-    myPubKey;
     appWebsocket;
     installedAppId;
     cachedAppInfo;
+    myPubKey;
     emitter;
     constructor(appWebsocket, installedAppId, myPubKey) {
-        this.myPubKey = myPubKey;
         this.appWebsocket = appWebsocket;
         this.emitter = new Emittery();
         const env = getLauncherEnvironment();
         this.installedAppId = env?.INSTALLED_APP_ID || installedAppId;
+        this.myPubKey = myPubKey;
         this.appWebsocket.on("signal", (signal) => {
             if (this.containsCell(signal.cell_id)) {
                 this.emitter.emit("signal", signal);
@@ -67,8 +52,7 @@ export class AppAgentWebsocket {
         const appInfo = await appWebsocket.appInfo({
             installed_app_id: installed_app_id,
         });
-        const myPubKey = getPubKey(appInfo);
-        const appAgentWs = new AppAgentWebsocket(appWebsocket, installed_app_id, myPubKey);
+        const appAgentWs = new AppAgentWebsocket(appWebsocket, installed_app_id, appInfo.agent_pub_key);
         appAgentWs.cachedAppInfo = appInfo;
         return appAgentWs;
     }
@@ -85,11 +69,11 @@ export class AppAgentWebsocket {
             if (!(baseRoleName in appInfo.cell_info)) {
                 throw new Error(`No cell found with role_name ${roleName}`);
             }
-            const cloneCell = appInfo.cell_info[baseRoleName].find((c) => CellType.Cloned in c && c.Cloned.clone_id === roleName);
+            const cloneCell = appInfo.cell_info[baseRoleName].find((c) => CellType.Cloned in c && c[CellType.Cloned].clone_id === roleName);
             if (!cloneCell || !(CellType.Cloned in cloneCell)) {
                 throw new Error(`No clone cell found with clone id ${roleName}`);
             }
-            return cloneCell.Cloned.cell_id;
+            return cloneCell[CellType.Cloned].cell_id;
         }
         if (!(roleName in appInfo.cell_info)) {
             throw new Error(`No cell found with role_name ${roleName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/client",
-  "version": "0.11.14",
+  "version": "0.11.16",
   "description": "A JavaScript client for the Holochain Conductor API",
   "author": "Holochain Foundation <info@holochain.org> (http://holochain.org)",
   "license": "CAL-1.0",