@holochain/hc-spin 0.500.1 → 0.500.2

package/CHANGELOG.md

@@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 ### Removed
 
+## 2025-07-09: v0.500.2
+### Fixed
+- Fixes issue [#31](https://github.com/holochain/hc-spin/issues/30) that made initial zome calls fail in cases where the UI loaded faster than the zome call signing logic was ready (PR [#31](https://github.com/holochain/hc-spin/pull/31))
+
 ## 2025-04-30: v0.500.1
 ### Fixed
 - Fixed an error that could prevent hc-spin to start up properly (`ERROR: error: invalid value 'undefined' for '--bootstrap <BOOTSTRAP>': relative URL without a base`) ([#25](https://github.com/holochain/hc-spin/pull/25))

package/README.md

@@ -25,7 +25,7 @@ npm install --save-dev @holochain/hc-spin@">=0.500.0 <0.600.0"
 ```
 Usage: hc-spin [options] <path>
 
-CLI to run Holochain aps during development.
+CLI to run Holochain apps during development.
 
 Arguments:
   path                       Path to .webhapp or .happ file to launch. If a .happ file is passed, either a UI path must be specified via

package/dist/main/index.js

@@ -62,7 +62,7 @@ function nanoid(size = 21) {
   }
   return id;
 }
-const createHappWindow = async (uiSource, happOrWebhappPath, appId, agentNum, appPort, appAuthToken, appDataRootDir, openDevtools) => {
+async function createHappWindow(uiSource, appId, agentNum, appPort, appAuthToken, appDataRootDir) {
   if (!appPort) throw new Error("App port not defined.");
   const partition = `persist:${agentNum}:${appId}`;
   if (uiSource.type === "path") {
@@ -107,7 +107,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
       console.error("Failed to get icon.png: ", e);
     }
   }
-  const happWindow = new electron.BrowserWindow({
+  return new electron.BrowserWindow({
     width: 1200,
     height: 800,
     show: false,
@@ -118,6 +118,8 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
       partition
     }
   });
+}
+async function loadHappWindow(happWindow, uiSource, happOrWebhappPath, agentNum, openDevtools) {
   const [windowPositionX, windowPositionY] = happWindow.getPosition();
   const windowPositionXMoved = windowPositionX + agentNum * 20;
   const windowPositionYMoved = windowPositionY + agentNum * 20;
@@ -138,8 +140,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
       } else {
         happWindow.loadFile(path.join(__dirname, "../renderer/index.html"));
       }
-      happWindow.show();
-      return happWindow;
+      return;
     }
     await happWindow.loadURL(`http://localhost:${uiSource.port}`);
   } else if (uiSource.type === "path") {
@@ -153,15 +154,13 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
         const notFoundPath = happOrWebhappPath.type === "webhapp" ? path.join(__dirname, "../renderer/indexNotFound1.html") : path.join(__dirname, "../renderer/indexNotFound2.html");
         happWindow.loadFile(notFoundPath);
       }
-      happWindow.show();
-      return happWindow;
+      return;
     }
   } else {
     throw new Error("Unsupported uiSource type: ", uiSource.type);
   }
   happWindow.show();
-  return happWindow;
-};
+}
 function setLinkOpenHandlers(browserWindow) {
   browserWindow.webContents.on("will-navigate", (e) => {
     if (e.url.startsWith("http://localhost") || e.url.startsWith("http://127.0.0.1")) {
@@ -11617,6 +11616,8 @@ class AppWebsocket {
   callZomeTransform;
   cachedAppInfo;
   appInfoRequester;
+  agentInfoRequester;
+  agentMetaInfoRequester;
   callZomeRequester;
   provideMemproofRequester;
   enableAppRequester;
@@ -11637,6 +11638,8 @@ class AppWebsocket {
     this.emitter = new Emittery();
     this.cachedAppInfo = appInfo;
     this.appInfoRequester = AppWebsocket.requester(this.client, "app_info", this.defaultTimeout);
+    this.agentInfoRequester = AppWebsocket.requester(this.client, "agent_info", this.defaultTimeout);
+    this.agentMetaInfoRequester = AppWebsocket.requester(this.client, "agent_meta_info", this.defaultTimeout);
     this.callZomeRequester = AppWebsocket.requester(this.client, "call_zome", this.defaultTimeout, this.callZomeTransform);
     this.provideMemproofRequester = AppWebsocket.requester(this.client, "provide_memproofs", this.defaultTimeout);
     this.enableAppRequester = AppWebsocket.requester(this.client, "enable_app", this.defaultTimeout);
@@ -11698,6 +11701,26 @@ class AppWebsocket {
     this.cachedAppInfo = appInfo;
     return appInfo;
   }
+  /**
+   * Request the currently known agents of the app.
+   *
+   * @param req - An array of DNA hashes or null
+   * @returns The app's agent infos as JSON string.
+   */
+  async agentInfo(req, timeout2) {
+    const agentInfos = await this.agentInfoRequester(req, timeout2);
+    return agentInfos;
+  }
+  /**
+   * Request agent meta info for an agent by peer Url.
+   *
+   * @param req - The peer Url of the agent and an optional array of DNA hashes
+   * @returns The app's agent infos as JSON string.
+   */
+  async agentMetaInfo(req, timeout2) {
+    const agentInfos = await this.agentMetaInfoRequester(req, timeout2);
+    return agentInfos;
+  }
   /**
    * Request network stats.
    *
@@ -11969,7 +11992,7 @@ class WsClient extends Emittery {
     this.registerCloseListener(socket);
     this.socket = socket;
     this.url = url2;
-    this.options = options || {};
+    this.options = options;
     this.pendingRequests = {};
     this.index = 0;
   }
@@ -12304,6 +12327,10 @@ class AdminWebsocket {
    * Add an existing agent to Holochain.
    */
   addAgentInfo = this._requester("add_agent_info");
+  /**
+   * Request agent meta info about an agent.
+   */
+  agentMetaInfo = this._requester("agent_meta_info");
   /**
    * Delete a disabled clone cell.
    */
@@ -12533,7 +12560,7 @@ const rustUtils = require("@holochain/hc-spin-rust-utils");
 const cliPackageJsonPath = path.resolve(path.join(electron.app.getAppPath(), "../../package.json"));
 const cliPackageJson = require(cliPackageJsonPath);
 const cli = new commander.Command();
-cli.name("hc-spin").description("CLI to run Holochain aps during development.").version(`${cliPackageJson.version} (built for holochain ${cliPackageJson.holochainVersion})`).argument(
+cli.name("hc-spin").description("CLI to run Holochain apps during development.").version(`${cliPackageJson.version} (built for holochain ${cliPackageJson.holochainVersion})`).argument(
   "<path>",
   "Path to .webhapp or .happ file to launch. If a .happ file is passed, either a UI path must be specified via --ui-path or a port pointing to a localhost server via --ui-port"
 ).option(
@@ -12760,18 +12787,23 @@ electron.app.whenReady().then(async () => {
     if (!appInfo) throw new Error("AppInfo is null.");
     const happWindow = await createHappWindow(
       CLI_OPTS.uiSource,
-      CLI_OPTS.happOrWebhappPath,
       CLI_OPTS.appId,
       i + 1,
       appPort,
       appAuthTokenResponse.token,
-      DATA_ROOT_DIR,
-      CLI_OPTS.openDevtools
+      DATA_ROOT_DIR
     );
     WINDOW_INFO_MAP[happWindow.webContents.id] = {
       agentPubKey: appInfo.agent_pub_key,
       zomeCallSigner
     };
+    await loadHappWindow(
+      happWindow,
+      CLI_OPTS.uiSource,
+      CLI_OPTS.happOrWebhappPath,
+      i + 1,
+      CLI_OPTS.openDevtools
+    );
   }
 });
 electron.app.on("quit", () => {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.500.1",
-  "holochainVersion": "0.5.0",
-  "description": "CLI to run Holochain aps during development.",
+  "version": "0.500.2",
+  "holochainVersion": "0.5.3",
+  "description": "CLI to run Holochain apps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
   "repository": {
@@ -35,8 +35,8 @@
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
-    "@holochain/client": "0.19.0",
-    "@holochain/hc-spin-rust-utils": "0.500.0",
+    "@holochain/client": "^0.19.1",
+    "@holochain/hc-spin-rust-utils": "^0.500.0",
     "@msgpack/msgpack": "^2.8.0",
     "bufferutil": "4.0.8",
     "commander": "11.1.0",

package/src/main/index.ts

@@ -7,7 +7,7 @@ import contextMenu from 'electron-context-menu';
 import split from 'split';
 import * as childProcess from 'child_process';
 import { ZomeCallSigner } from '@holochain/hc-spin-rust-utils';
-import { createHappWindow } from './windows';
+import { createHappWindow, loadHappWindow } from './windows';
 import getPort from 'get-port';
 import {
   AdminWebsocket,
@@ -32,7 +32,7 @@ const cli = new Command();
 
 cli
   .name('hc-spin')
-  .description('CLI to run Holochain aps during development.')
+  .description('CLI to run Holochain apps during development.')
   .version(`${cliPackageJson.version} (built for holochain ${cliPackageJson.holochainVersion})`)
   .argument(
     '<path>',
@@ -352,18 +352,26 @@ app.whenReady().then(async () => {
     if (!appInfo) throw new Error('AppInfo is null.');
     const happWindow = await createHappWindow(
       CLI_OPTS.uiSource,
-      CLI_OPTS.happOrWebhappPath,
       CLI_OPTS.appId,
       i + 1,
       appPort,
       appAuthTokenResponse.token,
       DATA_ROOT_DIR,
-      CLI_OPTS.openDevtools,
     );
+    // We need to add the window to the window map before loading its UI, otherwise
+    // zome calls can be made before handleSignZomeCall() can verify that the
+    // zome call is made from an authorized window (https://github.com/holochain/hc-spin/issues/30)
     WINDOW_INFO_MAP[happWindow.webContents.id] = {
       agentPubKey: appInfo.agent_pub_key,
       zomeCallSigner,
     };
+    await loadHappWindow(
+      happWindow,
+      CLI_OPTS.uiSource,
+      CLI_OPTS.happOrWebhappPath,
+      i + 1,
+      CLI_OPTS.openDevtools,
+    );
   }
 
   // app.on('activate', function () {

package/src/main/windows.ts

@@ -16,16 +16,14 @@ export type UISource =
       port: number;
     };
 
-export const createHappWindow = async (
+export async function createHappWindow(
   uiSource: UISource,
-  happOrWebhappPath: HappOrWebhappPath,
   appId: InstalledAppId,
   agentNum: number,
   appPort: number,
   appAuthToken: AppAuthenticationToken,
   appDataRootDir: string,
-  openDevtools: boolean,
-): Promise<BrowserWindow> => {
+): Promise<BrowserWindow> {
   // TODO create mapping between installed-app-id's and window ids
   if (!appPort) throw new Error('App port not defined.');
 
@@ -81,7 +79,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
     }
   }
 
-  const happWindow = new BrowserWindow({
+  return new BrowserWindow({
     width: 1200,
     height: 800,
     show: false,
@@ -92,7 +90,15 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
       partition,
     },
   });
+}
 
+export async function loadHappWindow(
+  happWindow: BrowserWindow,
+  uiSource: UISource,
+  happOrWebhappPath: HappOrWebhappPath,
+  agentNum: number,
+  openDevtools: boolean,
+): Promise<void> {
   const [windowPositionX, windowPositionY] = happWindow.getPosition();
   const windowPositionXMoved = windowPositionX + agentNum * 20;
   const windowPositionYMoved = windowPositionY + agentNum * 20;
@@ -119,8 +125,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
       } else {
         happWindow.loadFile(path.join(__dirname, '../renderer/index.html'));
       }
-      happWindow.show();
-      return happWindow;
+      return;
     }
     await happWindow.loadURL(`http://localhost:${uiSource.port}`);
   } else if (uiSource.type === 'path') {
@@ -138,18 +143,14 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
             : path.join(__dirname, '../renderer/indexNotFound2.html');
         happWindow.loadFile(notFoundPath);
       }
-
-      happWindow.show();
-      return happWindow;
+      return;
     }
   } else {
     throw new Error('Unsupported uiSource type: ', (uiSource as any).type);
   }
 
   happWindow.show();
-
-  return happWindow;
-};
+}
 
 export function setLinkOpenHandlers(browserWindow: BrowserWindow): void {
   // links in happ windows should open in the system default application