@holochain/hc-spin 0.200.8 → 0.200.10

package/README.md

@@ -20,6 +20,14 @@ To install the latest version compatible with **holochain 0.2.x**:
 npm install --save-dev @holochain/hc-spin@">=0.200.0 <0.300.0"
 ```
 
+To install the latest version compatible with **holochain 0.3.x**:
+
+⚠️ Requires `@holochain/client 0.17.0-dev.5` or newer ⚠️
+
+```
+npm install --save-dev @holochain/hc-spin@">=0.300.0 <0.400.0"
+```
+
 ## Usage (holochain 0.2)
 
 ```

package/cli/cli.js

@@ -28,6 +28,8 @@ const child = spawn(
   },
 );
 
+child.on('error', (err) => console.error('[electron]: ERROR: ', err));
+
 // Handle child process exit
 child.on('exit', (code, _signal) => {
   process.exit(code);

package/dist/cli.js

@@ -28,6 +28,8 @@ const child = spawn(
   },
 );
 
+child.on('error', (err) => console.error('[electron]: ERROR: ', err));
+
 // Handle child process exit
 child.on('exit', (code, _signal) => {
   process.exit(code);

package/dist/main/index.js

@@ -95,7 +95,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
     icon = electron.nativeImage.createFromPath(iconPath);
   } else {
     try {
-      const iconResponse = await electron.net.fetch(`http://127.0.0.1:${uiSource.port}/icon.png`);
+      const iconResponse = await electron.net.fetch(`http://localhost:${uiSource.port}/icon.png`);
       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"
@@ -131,9 +131,9 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
     happWindow.webContents.openDevTools();
   if (uiSource.type === "port") {
     try {
-      await electron.net.fetch(`http://127.0.0.1:${uiSource.port}/index.html`);
+      await electron.net.fetch(`http://localhost:${uiSource.port}/index.html`);
     } catch (e) {
-      console.error(`No index.html file found at http://127.0.0.1:${uiSource.port}/index.html`, e);
+      console.error(`No index.html file found at http://localhost:${uiSource.port}/index.html`, e);
       if (utils.is.dev && process.env["ELECTRON_RENDERER_URL"]) {
         happWindow.loadURL(process.env["ELECTRON_RENDERER_URL"]);
       } else {
@@ -142,7 +142,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
       happWindow.show();
       return happWindow;
     }
-    await happWindow.loadURL(`http://127.0.0.1:${uiSource.port}`);
+    await happWindow.loadURL(`http://localhost:${uiSource.port}`);
   } else if (uiSource.type === "path") {
     try {
       await happWindow.loadURL(`webhapp://webhappwindow/index.html`);
@@ -11795,7 +11795,7 @@ const menu = electron.Menu.buildFromTemplate([
 ]);
 const rustUtils = require("@holochain/hc-spin-rust-utils");
 const cli = new commander.Command();
-cli.name("hc-spin").description("CLI to run Holochain aps during development.").version(`0.200.8 (for holochain 0.2.x)`).argument(
+cli.name("hc-spin").description("CLI to run Holochain aps during development.").version(`0.200.10 (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(
@@ -12026,11 +12026,6 @@ electron.app.whenReady().then(async () => {
     };
   }
 });
-electron.app.on("window-all-closed", () => {
-  if (process.platform !== "darwin") {
-    electron.app.quit();
-  }
-});
 electron.app.on("quit", () => {
   fs.writeFileSync(
     path.join(DATA_ROOT_DIR, ".abandoned"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.200.8",
+  "version": "0.200.10",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",

package/src/main/index.ts

@@ -28,7 +28,7 @@ const cli = new Command();
 cli
   .name('hc-spin')
   .description('CLI to run Holochain aps during development.')
-  .version(`0.200.8 (for holochain 0.2.x)`)
+  .version(`0.200.10 (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',
@@ -351,15 +351,6 @@ 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', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});
-
 app.on('quit', () => {
   fs.writeFileSync(
     path.join(DATA_ROOT_DIR, '.abandoned'),

package/src/main/windows.ts

@@ -67,7 +67,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
     icon = nativeImage.createFromPath(iconPath);
   } else {
     try {
-      const iconResponse = await net.fetch(`http://127.0.0.1:${uiSource.port}/icon.png`);
+      const iconResponse = await net.fetch(`http://localhost:${uiSource.port}/icon.png`);
       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',
@@ -110,9 +110,9 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
   if (uiSource.type === 'port') {
     try {
       // Check whether dev server is responsive and index.html exists
-      await net.fetch(`http://127.0.0.1:${uiSource.port}/index.html`);
+      await net.fetch(`http://localhost:${uiSource.port}/index.html`);
     } catch (e) {
-      console.error(`No index.html file found at http://127.0.0.1:${uiSource.port}/index.html`, e);
+      console.error(`No index.html file found at http://localhost:${uiSource.port}/index.html`, e);
       if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
         happWindow.loadURL(process.env['ELECTRON_RENDERER_URL']);
       } else {
@@ -121,7 +121,7 @@ electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
       happWindow.show();
       return happWindow;
     }
-    await happWindow.loadURL(`http://127.0.0.1:${uiSource.port}`);
+    await happWindow.loadURL(`http://localhost:${uiSource.port}`);
   } else if (uiSource.type === 'path') {
     try {
       await happWindow.loadURL(`webhapp://webhappwindow/index.html`);