@holochain/hc-spin 0.100.2 → 0.100.4

package/dist/main/index.js

@@ -129,17 +129,6 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
   });
   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`);
@@ -11752,9 +11741,58 @@ function validateCliArgs(cliArgs, cliOpts, appDataRootDir) {
     openDevtools: cliOpts.openDevtools ? true : false
   };
 }
+const menu = electron.Menu.buildFromTemplate([
+  {
+    label: "Options",
+    submenu: [
+      {
+        label: "toggle dev tools (F12)",
+        click: () => {
+          const focusedWindow = electron.BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.toggleDevTools();
+          }
+        },
+        accelerator: "F12"
+      },
+      {
+        label: "toggle dev tools (Ctrl+Shift+I)",
+        click: () => {
+          const focusedWindow = electron.BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.toggleDevTools();
+          }
+        },
+        visible: false,
+        accelerator: "CommandOrControl+Shift+I"
+      },
+      {
+        label: "Reload (F5)",
+        click: () => {
+          const focusedWindow = electron.BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.reload();
+          }
+        },
+        accelerator: "F5"
+      },
+      {
+        label: "Reload (Ctrl+R)",
+        click: () => {
+          const focusedWindow = electron.BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.reload();
+          }
+        },
+        visible: false,
+        accelerator: "CommandOrControl+R"
+      }
+    ]
+  }
+]);
 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.2 (for holochain 0.1.x)`).argument(
+cli.name("hc-spin").description("CLI to run Holochain apps during development.").version(`0.100.4 (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(
@@ -11790,6 +11828,7 @@ for (const folder of hcSpinFolders) {
 }
 const DATA_ROOT_DIR = path.join(electron.app.getPath("temp"), `hc-spin-${nanoid(8)}`);
 electron.app.setPath("userData", path.join(DATA_ROOT_DIR, "electron"));
+electron.Menu.setApplicationMenu(menu);
 const CLI_OPTS = validateCliArgs(cli.args, cli.opts(), DATA_ROOT_DIR);
 const SANDBOX_PROCESSES = [];
 const WINDOW_INFO_MAP = {};
@@ -11939,14 +11978,17 @@ electron.app.whenReady().then(async () => {
     };
   }
 });
-electron.app.on("window-all-closed", () => {
-  electron.app.quit();
-});
 electron.app.on("quit", () => {
+  cleanup();
+});
+function cleanup() {
+  console.log("[hc-spin]: cleaning up.");
   fs.writeFileSync(
     path.join(DATA_ROOT_DIR, ".abandoned"),
     "I'm not in use anymore by an active hc-spin process."
   );
-  SANDBOX_PROCESSES.forEach((handle) => handle.kill());
+  SANDBOX_PROCESSES.forEach((handle) => {
+    handle.kill("SIGINT");
+  });
   childProcess__namespace.spawnSync("hc", ["sandbox", "clean"]);
-});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.100.2",
+  "version": "0.100.4",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
@@ -23,7 +23,7 @@
     "@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",
+    "@holochain/hc-spin-rust-utils": "^0.100.2",
     "@msgpack/msgpack": "^2.8.0",
     "commander": "11.1.0",
     "electron": "^28.1.1",

package/src/main/index.ts

@@ -1,4 +1,4 @@
-import { app, IpcMainInvokeEvent, ipcMain, protocol } from 'electron';
+import { app, IpcMainInvokeEvent, ipcMain, protocol, Menu } from 'electron';
 import fs from 'fs';
 import path from 'path';
 import { nanoid } from 'nanoid';
@@ -19,6 +19,7 @@ import {
   randomNonce,
 } from '@holochain/client';
 import { validateCliArgs } from './validateArgs';
+import { menu } from './menu';
 
 const rustUtils = require('@holochain/hc-spin-rust-utils');
 
@@ -27,7 +28,7 @@ const cli = new Command();
 cli
   .name('hc-spin')
   .description('CLI to run Holochain apps during development.')
-  .version(`0.100.2 (for holochain 0.1.x)`)
+  .version(`0.100.4 (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',
@@ -84,6 +85,8 @@ const DATA_ROOT_DIR = path.join(app.getPath('temp'), `hc-spin-${nanoid(8)}`);
 
 app.setPath('userData', path.join(DATA_ROOT_DIR, 'electron'));
 
+Menu.setApplicationMenu(menu);
+
 const CLI_OPTS = validateCliArgs(cli.args, cli.opts(), DATA_ROOT_DIR);
 
 // const SANDBOX_DIRECTORIES: Array<string> = [];
@@ -298,19 +301,19 @@ app.whenReady().then(async () => {
   // });
 });
 
-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
-app.on('window-all-closed', () => {
-  app.quit();
+app.on('quit', () => {
+  cleanup();
 });
 
-app.on('quit', () => {
+function cleanup() {
+  console.log('[hc-spin]: cleaning up.');
   fs.writeFileSync(
     path.join(DATA_ROOT_DIR, '.abandoned'),
     "I'm not in use anymore by an active hc-spin process.",
   );
   // clean up sandboxes
-  SANDBOX_PROCESSES.forEach((handle) => handle.kill());
+  SANDBOX_PROCESSES.forEach((handle) => {
+    handle.kill('SIGINT');
+  });
   childProcess.spawnSync('hc', ['sandbox', 'clean']);
-});
+}

package/src/main/menu.ts

@@ -0,0 +1,51 @@
+import { BrowserWindow, Menu } from 'electron';
+
+export const menu = Menu.buildFromTemplate([
+  {
+    label: 'Options',
+    submenu: [
+      {
+        label: 'toggle dev tools (F12)',
+        click: () => {
+          const focusedWindow = BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.toggleDevTools();
+          }
+        },
+        accelerator: 'F12',
+      },
+      {
+        label: 'toggle dev tools (Ctrl+Shift+I)',
+        click: () => {
+          const focusedWindow = BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.toggleDevTools();
+          }
+        },
+        visible: false,
+        accelerator: 'CommandOrControl+Shift+I',
+      },
+      {
+        label: 'Reload (F5)',
+        click: () => {
+          const focusedWindow = BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.reload();
+          }
+        },
+        accelerator: 'F5',
+      },
+      {
+        label: 'Reload (Ctrl+R)',
+        click: () => {
+          const focusedWindow = BrowserWindow.getFocusedWindow();
+          if (focusedWindow) {
+            focusedWindow.webContents.reload();
+          }
+        },
+        visible: false,
+        accelerator: 'CommandOrControl+R',
+      },
+    ],
+  },
+]);

package/src/main/windows.ts

@@ -107,18 +107,6 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
 
   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 {
       // Check whether dev server is responsive and index.html exists