@holochain/client 0.11.15 → 0.11.16

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[CellType.Provisioned].cell_id[1];
-            }
-            else if (CellType.Cloned in cell) {
-                return cell[CellType.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;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/client",
-  "version": "0.11.15",
+  "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",