@holochain/hc-spin 0.200.4 → 0.200.5

package/dist/main/index.js

@@ -7,11 +7,11 @@ const commander = require("commander");
 const contextMenu = require("electron-context-menu");
 const split = require("split");
 const childProcess = require("child_process");
-const msgpack = require("@msgpack/msgpack");
 const url = require("url");
 const utils = require("@electron-toolkit/utils");
 const net$1 = require("node:net");
 const os = require("node:os");
+const msgpack = require("@msgpack/msgpack");
 const require$$0$3 = require("events");
 const require$$1$1 = require("https");
 const require$$2$1 = require("http");
@@ -11735,25 +11735,34 @@ function validateCliArgs(cliArgs, cliOpts, appDataRootDir) {
     appId,
     holochainPath,
     numAgents,
+    networkSeed: cliOpts.networkSeed,
     uiSource: cliOpts.uiPath ? { type: "path", path: cliOpts.uiPath } : cliOpts.uiPort ? { type: "port", port: cliOpts.uiPort } : { type: "path", path: path.join(appDataRootDir, "apps", appId, "ui") },
+    singalingUrl: cliOpts.signalingUrl,
+    bootstrapUrl: cliOpts.bootstrapUrl,
     happOrWebhappPath: isHapp ? { type: "happ", path: happOrWebhappPath } : { type: "webhapp", path: happOrWebhappPath }
   };
 }
 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 aps during development.").version(`0.200.4 (for holochain 0.2.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(
   "--app-id <string>",
   "Install the app with a specific app id. By default the app id is derived from the name of the .webhapp/.happ file that you pass but this option allows you to set it explicitly"
+).option(
+  "--bootstrap-url <url>",
+  "Url of the bootstrap server to use. By default, hc spin spins up a local development bootstrap server for you but this argument allows you to specify a custom one."
 ).option("--holochain-path <path>", "Set the path to the holochain binary [default: holochain].").addOption(
   new commander.Option("-n, --num-agents <number>", "How many agents to spawn the app for.").argParser(
     parseInt
   )
-).option("--ui-path <path>", "Path to the folder containing the index.html of the webhapp's UI.").option(
+).option("--network-seed <string>", "Install the app with a specific network seed.").option("--ui-path <path>", "Path to the folder containing the index.html of the webhapp's UI.").option(
   "--ui-port <number>",
   "Port pointing to a localhost dev server that serves your UI assets."
+).option(
+  "--signaling-url <url>",
+  "Url of the signaling server to use. By default, hc spin spins up a local development signaling server for you but this argument allows you to specify a custom one."
 );
 cli.parse();
 const rl = require("readline").createInterface({
@@ -11827,7 +11836,36 @@ const handleSignZomeCallLegacy = async (e, request) => {
     return Promise.reject("Agent public key unauthorized.");
   return windowInfo.zomeCallSigner.signZomeCall(request);
 };
-async function spawnSandboxes(nAgents, happPath, appId) {
+async function startLocalServices() {
+  const localServicesHandle = childProcess__namespace.spawn("hc", ["run-local-services"]);
+  return new Promise((resolve) => {
+    let bootStrapUrl;
+    let signalUrl;
+    let bootstrapRunning = false;
+    let signalRunnig = false;
+    localServicesHandle.stdout.pipe(split()).on("data", async (line) => {
+      console.log(`[hc-spin] | [hc run-local-services]: ${line}`);
+      if (line.includes("HC BOOTSTRAP - ADDR:")) {
+        bootStrapUrl = line.split("# HC BOOTSTRAP - ADDR:")[1].trim();
+      }
+      if (line.includes("HC SIGNAL - ADDR:")) {
+        signalUrl = line.split("# HC SIGNAL - ADDR:")[1].trim();
+      }
+      if (line.includes("HC BOOTSTRAP - RUNNING")) {
+        bootstrapRunning = true;
+      }
+      if (line.includes("HC SIGNAL - RUNNING")) {
+        signalRunnig = true;
+      }
+      if (bootstrapRunning && signalRunnig)
+        resolve([bootStrapUrl, signalUrl]);
+    });
+    localServicesHandle.stderr.pipe(split()).on("data", async (line) => {
+      console.log(`[hc-spin] | [hc run-local-services] ERROR: ${line}`);
+    });
+  });
+}
+async function spawnSandboxes(nAgents, happPath, bootStrapUrl, signalUrl, appId, networkSeed) {
   const generateArgs = [
     "sandbox",
     "--piped",
@@ -11835,18 +11873,22 @@ async function spawnSandboxes(nAgents, happPath, appId) {
     "--num-sandboxes",
     nAgents.toString(),
     "--app-id",
-    appId
+    appId,
+    "--run"
   ];
-  const appPorts = [];
-  let appPortsString = "";
+  let appPorts = "";
   for (var i = 1; i <= nAgents; i++) {
     const appPort = await getPorts();
-    appPortsString += `${appPort},`;
-    appPorts.push(appPort);
+    appPorts += `${appPort},`;
+  }
+  generateArgs.push(appPorts.slice(0, appPorts.length - 1));
+  if (networkSeed) {
+    generateArgs.push("--network-seed");
+    generateArgs.push(networkSeed);
   }
-  generateArgs.push("--run", appPortsString.slice(0, appPortsString.length - 1));
-  generateArgs.push(happPath, "network", "mdns");
+  generateArgs.push(happPath, "network", "--bootstrap", bootStrapUrl, "webrtc", signalUrl);
   let readyConductors = 0;
+  const portsInfo = {};
   const sandboxPaths = [];
   const sandboxHandle = childProcess__namespace.spawn("hc", generateArgs);
   sandboxHandle.stdin.write("pass");
@@ -11858,10 +11900,17 @@ async function spawnSandboxes(nAgents, happPath, appId) {
         const sanboxPath = line.split("\x1B[1;4;48;5;254;38;5;4m")[1].split("\x1B[0m \x1B[1m")[0].trim();
         sandboxPaths.push(sanboxPath);
       }
-      if (line.includes("Running conductor on admin port")) {
+      if (line.includes("lair-keystore connection_url")) {
+        line.split("#")[2].trim();
+      }
+      if (line.includes("Conductor launched")) {
+        const split1 = line.split("{");
+        const ports = JSON.parse(`{${split1[1]}`);
+        const conductorNum = split1[0].split("#!")[1].trim();
+        portsInfo[conductorNum] = ports;
         readyConductors += 1;
         if (readyConductors === nAgents)
-          resolve([sandboxHandle, sandboxPaths, appPorts]);
+          resolve([sandboxHandle, sandboxPaths, portsInfo]);
       }
     });
     sandboxHandle.stderr.pipe(split()).on("data", async (line) => {
@@ -11883,12 +11932,14 @@ electron.app.whenReady().then(async () => {
       happTargetDir
     );
   }
-  const [sandboxHandle, sandboxPaths, appPorts] = await spawnSandboxes(
+  const [bootstrapUrl, signalingUrl] = await startLocalServices();
+  const [sandboxHandle, sandboxPaths, portsInfo] = await spawnSandboxes(
     CLI_OPTS.numAgents,
     happTargetDir ? happTargetDir : CLI_OPTS.happOrWebhappPath.path,
+    CLI_OPTS.bootstrapUrl ? CLI_OPTS.bootstrapUrl : bootstrapUrl,
+    CLI_OPTS.singalingUrl ? CLI_OPTS.singalingUrl : signalingUrl,
     CLI_OPTS.appId
   );
-  console.log("Got app ports: ", appPorts);
   const lairUrls = [];
   sandboxPaths.forEach((sandbox) => {
     const conductorConfigPath = path.join(sandbox, "conductor-config.yaml");
@@ -11905,14 +11956,15 @@ electron.app.whenReady().then(async () => {
   SANDBOX_PROCESSES.push(sandboxHandle);
   for (var i = 0; i < cli.opts().numAgents; i++) {
     const zomeCallSigner = await rustUtils.ZomeCallSigner.connect(lairUrls[i], "pass");
-    const appWs = await AppWebsocket.connect(new URL(`ws://127.0.0.1:${appPorts[i]}`));
+    const appPort = portsInfo[i].app_ports[0];
+    const appWs = await AppWebsocket.connect(new URL(`ws://127.0.0.1:${appPort}`));
     const appInfo = await appWs.appInfo({ installed_app_id: CLI_OPTS.appId });
     const happWindow = await createHappWindow(
       CLI_OPTS.uiSource,
       CLI_OPTS.happOrWebhappPath,
       CLI_OPTS.appId,
       i + 1,
-      appPorts[i],
+      appPort,
       DATA_ROOT_DIR
     );
     WINDOW_INFO_MAP[happWindow.webContents.id] = {
@@ -11922,7 +11974,9 @@ electron.app.whenReady().then(async () => {
   }
 });
 electron.app.on("window-all-closed", () => {
-  electron.app.quit();
+  if (process.platform !== "darwin") {
+    electron.app.quit();
+  }
 });
 electron.app.on("quit", () => {
   fs.writeFileSync(

package/package.json

@@ -1,9 +1,21 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.200.4",
+  "version": "0.200.5",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/holochain/hc-spin.git"
+  },
+  "keywords": [
+    "holochain",
+    "developer",
+    "tools",
+    "tooling",
+    "developer-tools",
+    "cli"
+  ],
   "license": "MIT",
   "main": "out/main/index.js",
   "bin": {
@@ -23,12 +35,12 @@
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "@holochain/client": "^0.16.3",
+    "@holochain/hc-spin-rust-utils": "0.200.2",
+    "@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.200.2",
-    "@msgpack/msgpack": "^2.8.0",
     "nanoid": "5.0.4",
     "split": "1.0.1"
   },

package/src/main/index.ts

@@ -61,6 +61,21 @@ cli.parse();
 // console.log('Got CLI opts: ', cli.opts());
 // console.log('Got CLI args: ', cli.args);
 
+// In nix shell and on Windows SIGINT does not seem to be emitted so it is read from the command line instead.
+// https://stackoverflow.com/questions/10021373/what-is-the-windows-equivalent-of-process-onsigint-in-node-js
+const rl = require('readline').createInterface({
+  input: process.stdin,
+  output: process.stdout,
+});
+
+rl.on('SIGINT', function () {
+  process.emit('SIGINT');
+});
+
+process.on('SIGINT', () => {
+  app.quit();
+});
+
 // Garbage collect unused directories of previous runs
 const files = fs.readdirSync(app.getPath('temp'));
 const hcSpinFolders = files.filter((file) => file.startsWith(`hc-spin-`));