@holochain/hc-spin 0.100.0 → 0.100.2

package/dist/main/index.js

@@ -61,7 +61,7 @@ function nanoid(size = 21) {
   }
   return id;
 }
-const createHappWindow = async (uiSource, happOrWebhappPath, appId, agentNum, appPort, appDataRootDir) => {
+const createHappWindow = async (uiSource, happOrWebhappPath, appId, agentNum, appPort, appDataRootDir, openDevtools) => {
   if (!appPort)
     throw new Error("App port not defined.");
   const partition = `persist:${agentNum}:${appId}`;
@@ -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);
@@ -127,7 +127,19 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
   happWindow.on("page-title-updated", (evt) => {
     evt.preventDefault();
   });
-  happWindow.webContents.openDevTools();
+  if (openDevtools)
+    happWindow.webContents.openDevTools();
+  happWindow.webContents.on("before-input-event", (e, input) => {
+    if (input.code === "F12") {
+      e.preventDefault();
+      if (happWindow.webContents.isDevToolsOpened()) {
+        happWindow.webContents.closeDevTools();
+      } else {
+        happWindow.webContents.openDevTools();
+        happWindow.webContents.focus();
+      }
+    }
+  });
   if (uiSource.type === "port") {
     try {
       await electron.net.fetch(`http://127.0.0.1:${uiSource.port}/index.html`);
@@ -11736,12 +11748,13 @@ function validateCliArgs(cliArgs, cliOpts, appDataRootDir) {
     holochainPath,
     numAgents,
     uiSource: cliOpts.uiPath ? { type: "path", path: cliOpts.uiPath } : cliOpts.uiPort ? { type: "port", port: cliOpts.uiPort } : { type: "path", path: path.join(appDataRootDir, "apps", appId, "ui") },
-    happOrWebhappPath: isHapp ? { type: "happ", path: happOrWebhappPath } : { type: "webhapp", path: happOrWebhappPath }
+    happOrWebhappPath: isHapp ? { type: "happ", path: happOrWebhappPath } : { type: "webhapp", path: happOrWebhappPath },
+    openDevtools: cliOpts.openDevtools ? true : false
   };
 }
 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.2 (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(
@@ -11754,7 +11767,7 @@ cli.name("hc-spin").description("CLI to run Holochain apps during development.")
 ).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("--open-devtools", "Automatically open the devtools on startup.");
 cli.parse();
 const rl = require("readline").createInterface({
   input: process.stdin,
@@ -11844,7 +11857,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 = [];
@@ -11903,7 +11920,7 @@ electron.app.whenReady().then(async () => {
     }
   });
   SANDBOX_PROCESSES.push(sandboxHandle);
-  for (var i = 0; i < cli.opts().numAgents; i++) {
+  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 appInfo = await appWs.appInfo({ installed_app_id: CLI_OPTS.appId });
@@ -11913,7 +11930,8 @@ electron.app.whenReady().then(async () => {
       CLI_OPTS.appId,
       i + 1,
       appPorts[i],
-      DATA_ROOT_DIR
+      DATA_ROOT_DIR,
+      CLI_OPTS.openDevtools
     );
     WINDOW_INFO_MAP[happWindow.webContents.id] = {
       agentPubKey: appInfo.agent_pub_key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.100.0",
+  "version": "0.100.2",
   "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.2 (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',
@@ -46,7 +46,8 @@ cli
   .option(
     '--ui-port <number>',
     'Port pointing to a localhost dev server that serves your UI assets.',
-  );
+  )
+  .option('--open-devtools', 'Automatically open the devtools on startup.');
 
 cli.parse();
 // console.log('Got CLI opts: ', cli.opts());
@@ -173,7 +174,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 = '';
@@ -266,7 +271,7 @@ app.whenReady().then(async () => {
 
   // open browser window for each sandbox
   //
-  for (var i = 0; i < cli.opts().numAgents; i++) {
+  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]}`));
@@ -278,6 +283,7 @@ app.whenReady().then(async () => {
       i + 1,
       appPorts[i],
       DATA_ROOT_DIR,
+      CLI_OPTS.openDevtools,
     );
     WINDOW_INFO_MAP[happWindow.webContents.id] = {
       agentPubKey: appInfo.agent_pub_key,

package/src/main/validateArgs.ts

@@ -8,6 +8,7 @@ export type CliOpts = {
   numAgents?: number;
   uiPath?: string;
   uiPort?: number;
+  openDevtools?: boolean;
 };
 
 export type CliOptsValidated = {
@@ -16,6 +17,7 @@ export type CliOptsValidated = {
   numAgents: number;
   uiSource: UISource;
   happOrWebhappPath: HappOrWebhappPath;
+  openDevtools: boolean;
 };
 
 export type HappOrWebhappPath = {
@@ -77,5 +79,6 @@ export function validateCliArgs(
     happOrWebhappPath: isHapp
       ? { type: 'happ', path: happOrWebhappPath }
       : { type: 'webhapp', path: happOrWebhappPath },
+    openDevtools: cliOpts.openDevtools ? true : false,
   };
 }

package/src/main/windows.ts

@@ -23,6 +23,7 @@ export const createHappWindow = async (
   agentNum: number,
   appPort: number,
   appDataRootDir: string,
+  openDevtools: boolean,
 ): Promise<BrowserWindow> => {
   // TODO create mapping between installed-app-id's and window ids
   if (!appPort) throw new Error('App port not defined.');
@@ -67,12 +68,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);
@@ -104,7 +105,19 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
     evt.preventDefault();
   });
 
-  happWindow.webContents.openDevTools();
+  if (openDevtools) happWindow.webContents.openDevTools();
+
+  happWindow.webContents.on('before-input-event', (e, input) => {
+    if (input.code === 'F12') {
+      e.preventDefault();
+      if (happWindow.webContents.isDevToolsOpened()) {
+        happWindow.webContents.closeDevTools();
+      } else {
+        happWindow.webContents.openDevTools();
+        happWindow.webContents.focus();
+      }
+    }
+  });
 
   if (uiSource.type === 'port') {
     try {