@holochain/hc-spin 0.100.0 → 0.100.1

package/dist/main/index.js

@@ -96,12 +96,12 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
   } else {
     try {
       const iconResponse = await electron.net.fetch(`http://127.0.0.1:${uiSource.port}/icon.png`);
-      const buffer = await iconResponse.arrayBuffer();
-      if (buffer.byteLength === 0 && agentNum === 1) {
+      if (iconResponse.status === 404 && agentNum === 1) {
         console.warn(
           "\n\n+++++ WARNING +++++\n[hc-spin] No icon.png found. It is recommended to put an icon.png file (1024x1024 pixel) in the root of your UI assets directory which can be used by the Holochain Launcher.\n+++++++++++++++++++\n\n"
         );
       }
+      const buffer = await iconResponse.arrayBuffer();
       icon = electron.nativeImage.createFromBuffer(Buffer.from(buffer));
     } catch (e) {
       console.error("Failed to get icon.png: ", e);
@@ -11741,7 +11741,7 @@ function validateCliArgs(cliArgs, cliOpts, appDataRootDir) {
 }
 const rustUtils = require("@holochain/hc-spin-rust-utils");
 const cli = new commander.Command();
-cli.name("hc-spin").description("CLI to run Holochain apps during development.").version(`0.100.0 (for holochain 0.1.x)`).argument(
+cli.name("hc-spin").description("CLI to run Holochain apps during development.").version(`0.100.1 (for holochain 0.1.x)`).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(
@@ -11844,7 +11844,11 @@ async function spawnSandboxes(nAgents, happPath, appId) {
     appPortsString += `${appPort},`;
     appPorts.push(appPort);
   }
-  generateArgs.push("--run", appPortsString.slice(0, appPortsString.length - 1));
+  if (nAgents === 1) {
+    generateArgs.push(`--run=${appPortsString.slice(0, appPortsString.length - 1)}`);
+  } else {
+    generateArgs.push("--run", appPortsString.slice(0, appPortsString.length - 1));
+  }
   generateArgs.push(happPath, "network", "mdns");
   let readyConductors = 0;
   const sandboxPaths = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.100.0",
+  "version": "0.100.1",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
@@ -23,12 +23,12 @@
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "@holochain/client": "^0.16.3",
+    "@holochain/hc-spin-rust-utils": "0.100.1",
+    "@msgpack/msgpack": "^2.8.0",
     "commander": "11.1.0",
     "electron": "^28.1.1",
     "electron-context-menu": "3.6.1",
     "get-port": "7.0.0",
-    "@holochain/hc-spin-rust-utils": "0.100.1",
-    "@msgpack/msgpack": "^2.8.0",
     "nanoid": "5.0.4",
     "split": "1.0.1"
   },

package/src/main/index.ts

@@ -27,7 +27,7 @@ const cli = new Command();
 cli
   .name('hc-spin')
   .description('CLI to run Holochain apps during development.')
-  .version(`0.100.0 (for holochain 0.1.x)`)
+  .version(`0.100.1 (for holochain 0.1.x)`)
   .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',
@@ -173,7 +173,11 @@ async function spawnSandboxes(
     appPortsString += `${appPort},`;
     appPorts.push(appPort);
   }
-  generateArgs.push('--run', appPortsString.slice(0, appPortsString.length - 1));
+  if (nAgents === 1) {
+    generateArgs.push(`--run=${appPortsString.slice(0, appPortsString.length - 1)}`);
+  } else {
+    generateArgs.push('--run', appPortsString.slice(0, appPortsString.length - 1));
+  }
 
   // const adminPorts: number[] = [];
   // let adminPortsString = '';

package/src/main/windows.ts

@@ -67,12 +67,12 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
   } else {
     try {
       const iconResponse = await net.fetch(`http://127.0.0.1:${uiSource.port}/icon.png`);
-      const buffer = await iconResponse.arrayBuffer();
-      if (buffer.byteLength === 0 && agentNum === 1) {
+      if (iconResponse.status === 404 && agentNum === 1) {
         console.warn(
           '\n\n+++++ WARNING +++++\n[hc-spin] No icon.png found. It is recommended to put an icon.png file (1024x1024 pixel) in the root of your UI assets directory which can be used by the Holochain Launcher.\n+++++++++++++++++++\n\n',
         );
       }
+      const buffer = await iconResponse.arrayBuffer();
       icon = nativeImage.createFromBuffer(Buffer.from(buffer));
     } catch (e) {
       console.error('Failed to get icon.png: ', e);