@holochain/hc-spin 0.200.10 → 0.200.12

package/cli/cli.js

@@ -4,7 +4,11 @@ const path = require('path');
 const fs = require('fs');
 
 let electronBinary;
-let pathStr = '../node_modules/.bin/electron';
+let pathStr =
+  process.platform === 'win32'
+    ? '../node_modules/electron/dist/electron.exe'
+    : '../node_modules/.bin/electron';
+
 // recursively look for electron binary in node_modules folder
 for (let i = 0; i < 7; i++) {
   const maybeElectronBinary = path.resolve(__dirname, pathStr);

package/dist/cli.js

@@ -4,7 +4,11 @@ const path = require('path');
 const fs = require('fs');
 
 let electronBinary;
-let pathStr = '../node_modules/.bin/electron';
+let pathStr =
+  process.platform === 'win32'
+    ? '../node_modules/electron/dist/electron.exe'
+    : '../node_modules/.bin/electron';
+
 // recursively look for electron binary in node_modules folder
 for (let i = 0; i < 7; i++) {
   const maybeElectronBinary = path.resolve(__dirname, pathStr);

package/dist/main/index.js

@@ -6314,8 +6314,10 @@ const randomByteArray = async (length) => {
 };
 const getNonceExpiration = () => (Date.now() + 5 * 60 * 1e3) * 1e3;
 const __HC_LAUNCHER_ENV__ = "__HC_LAUNCHER_ENV__";
+const __HC_ZOME_CALL_SIGNER__ = "__HC_ZOME_CALL_SIGNER__";
 const isLauncher = () => globalThis.window && __HC_LAUNCHER_ENV__ in globalThis.window;
 const getLauncherEnvironment = () => isLauncher() ? globalThis.window[__HC_LAUNCHER_ENV__] : void 0;
+const getHostZomeCallSigner = () => globalThis.window && globalThis.window[__HC_ZOME_CALL_SIGNER__];
 const signZomeCallTauri = async (request) => {
   const zomeCallUnsigned = {
     provenance: Array.from(request.provenance),
@@ -10849,7 +10851,7 @@ class AppWebsocket extends Emittery {
   static async connect(url2, defaultTimeout) {
     const env = getLauncherEnvironment();
     if (env?.APP_INTERFACE_PORT) {
-      url2 = new URL(`ws://127.0.0.1:${env.APP_INTERFACE_PORT}`);
+      url2 = new URL(`ws://localhost:${env.APP_INTERFACE_PORT}`);
     }
     const wsClient = await WsClient.connect(url2);
     const appWebsocket = new AppWebsocket(wsClient, defaultTimeout, env?.INSTALLED_APP_ID);
@@ -10903,13 +10905,19 @@ const callZomeTransform = {
     if ("signature" in request) {
       return request;
     }
-    const env = getLauncherEnvironment();
-    if (!env) {
-      return signZomeCall(request);
-    } else if (env.FRAMEWORK === "electron") {
-      return signZomeCallElectron(request);
+    const hostSigner = getHostZomeCallSigner();
+    if (hostSigner) {
+      return hostSigner.signZomeCall(request);
+    } else {
+      const env = getLauncherEnvironment();
+      if (!env) {
+        return signZomeCall(request);
+      }
+      if (env.FRAMEWORK === "electron") {
+        return signZomeCallElectron(request);
+      }
+      return signZomeCallTauri(request);
     }
-    return signZomeCallTauri(request);
   },
   output: (response) => msgpack.decode(response)
 };
@@ -11794,8 +11802,10 @@ const menu = electron.Menu.buildFromTemplate([
   }
 ]);
 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(`0.200.10 (for holochain 0.2.x)`).argument(
+cli.name("hc-spin").description("CLI to run Holochain aps during development.").version(`${cliPackageJson.version} (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(
@@ -12009,8 +12019,10 @@ electron.app.whenReady().then(async () => {
   for (var i = 0; i < CLI_OPTS.numAgents; i++) {
     const zomeCallSigner = await rustUtils.ZomeCallSigner.connect(lairUrls[i], "pass");
     const appPort = portsInfo[i].app_ports[0];
-    const appWs = await AppWebsocket.connect(new URL(`ws://127.0.0.1:${appPort}`));
+    const appWs = await AppWebsocket.connect(new URL(`ws://localhost:${appPort}`));
     const appInfo = await appWs.appInfo({ installed_app_id: CLI_OPTS.appId });
+    if (!appInfo)
+      throw new Error("AppInfo undefined.");
     const happWindow = await createHappWindow(
       CLI_OPTS.uiSource,
       CLI_OPTS.happOrWebhappPath,

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.200.10",
+  "version": "0.200.12",
+  "holochainVersion": "0.2.x",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
@@ -34,7 +35,7 @@
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
-    "@holochain/client": "^0.16.3",
+    "@holochain/client": "^0.16.11",
     "@holochain/hc-spin-rust-utils": "^0.200.3",
     "@msgpack/msgpack": "^2.8.0",
     "commander": "11.1.0",

package/src/main/index.ts

@@ -23,12 +23,15 @@ import { menu } from './menu';
 
 const rustUtils = require('@holochain/hc-spin-rust-utils');
 
+const cliPackageJsonPath = path.resolve(path.join(app.getAppPath(), '../../package.json'));
+const cliPackageJson = require(cliPackageJsonPath);
+
 const cli = new Command();
 
 cli
   .name('hc-spin')
   .description('CLI to run Holochain aps during development.')
-  .version(`0.200.10 (for holochain 0.2.x)`)
+  .version(`${cliPackageJson.version} (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',
@@ -327,8 +330,9 @@ app.whenReady().then(async () => {
     const zomeCallSigner = await rustUtils.ZomeCallSigner.connect(lairUrls[i], 'pass');
 
     const appPort = portsInfo[i].app_ports[0];
-    const appWs = await AppWebsocket.connect(new URL(`ws://127.0.0.1:${appPort}`));
+    const appWs = await AppWebsocket.connect(new URL(`ws://localhost:${appPort}`));
     const appInfo = await appWs.appInfo({ installed_app_id: CLI_OPTS.appId });
+    if (!appInfo) throw new Error('AppInfo undefined.');
     const happWindow = await createHappWindow(
       CLI_OPTS.uiSource,
       CLI_OPTS.happOrWebhappPath,