@holochain/hc-spin 0.300.2 → 0.300.4

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.300.2",
+  "version": "0.300.4",
+  "holochainVersion": "0.3.x",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
@@ -29,16 +30,17 @@
     "typecheck": "npm run typecheck:node && npm run typecheck:web",
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
-    "build": "rimraf dist && npm run typecheck && electron-vite build && mv ./out ./dist && cp ./cli/cli.js ./dist/cli.js"
+    "build": "rimraf dist && npm run typecheck && electron-vite build && mv ./out ./dist && cp ./cli/cli.js ./dist/cli.js && node ./scripts/replace-electron-version.js"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
-    "@holochain/client": "^0.17.0-dev.5",
+    "@holochain/client": "0.17.0-rc.0",
     "@holochain/hc-spin-rust-utils": "^0.300.1",
     "@msgpack/msgpack": "^2.8.0",
+    "bufferutil": "4.0.8",
     "commander": "11.1.0",
-    "electron": "^28.1.1",
+    "electron": "^29.3.1",
     "electron-context-menu": "3.6.1",
     "get-port": "7.0.0",
     "nanoid": "5.0.4",
@@ -49,7 +51,6 @@
     "@electron-toolkit/eslint-config-ts": "^1.0.1",
     "@electron-toolkit/tsconfig": "^1.0.1",
     "@types/node": "^18.19.5",
-    "bufferutil": "4.0.8",
     "electron-builder": "^24.9.1",
     "electron-vite": "https://github.com/matthme/electron-vite.git#forward-cli-args-dist",
     "eslint": "^8.56.0",

package/scripts/replace-electron-version.js

@@ -0,0 +1,11 @@
+const fs = require('fs');
+
+const packageJsonString = fs.readFileSync('package.json');
+const packageJson = JSON.parse(packageJsonString);
+const electronVersion = packageJson.dependencies.electron;
+const majorElectronVersion = electronVersion.replace('^', '').slice(0, 3);
+console.log('electron version: ', majorElectronVersion);
+
+const cliJs = fs.readFileSync('./dist/cli.js', 'utf-8');
+const modifiedCliJs = cliJs.replace('###REPLACE_AT_BUILD_TIME###', majorElectronVersion);
+fs.writeFileSync('./dist/cli.js', modifiedCliJs);

package/src/main/index.ts

@@ -1,4 +1,4 @@
-import { app, IpcMainInvokeEvent, ipcMain, protocol, Menu } from 'electron';
+import { app, IpcMainInvokeEvent, ipcMain, protocol, Menu, BrowserWindow } from 'electron';
 import fs from 'fs';
 import path from 'path';
 import { nanoid } from 'nanoid';
@@ -10,6 +10,7 @@ import { ZomeCallNapi, ZomeCallSigner, ZomeCallUnsignedNapi } from '@holochain/h
 import { createHappWindow } from './windows';
 import getPort from 'get-port';
 import {
+  AdminWebsocket,
   AgentPubKey,
   AppWebsocket,
   CallZomeRequest,
@@ -23,12 +24,15 @@ import { menu } from './menu';
 
 const rustUtils = require('@holochain/hc-spin-rust-utils');
 
+const cliPackageJsonPath = path.resolve(path.join(app.getAppPath(), '../../package.json'));
+const cliPackageJson = require(cliPackageJsonPath);
+
 const cli = new Command();
 
 cli
   .name('hc-spin')
   .description('CLI to run Holochain aps during development.')
-  .version(`0.300.2 (for holochain 0.3.x)`)
+  .version(`${cliPackageJson.version} (built for holochain ${cliPackageJson.holochainVersion})`)
   .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',
@@ -116,6 +120,12 @@ contextMenu({
   showSaveImageAs: true,
   showSearchWithGoogle: false,
   showInspectElement: true,
+  append: (_defaultActions, _parameters, browserWindow) => [
+    {
+      label: 'Reload',
+      click: () => (browserWindow as BrowserWindow).reload(),
+    },
+  ],
 });
 
 const handleSignZomeCall = async (e: IpcMainInvokeEvent, request: CallZomeRequest) => {
@@ -326,15 +336,37 @@ app.whenReady().then(async () => {
   for (var i = 0; i < CLI_OPTS.numAgents; i++) {
     const zomeCallSigner = await rustUtils.ZomeCallSigner.connect(lairUrls[i], 'pass');
 
+    const adminPort = portsInfo[i].admin_port;
+    const adminWs = await AdminWebsocket.connect({
+      url: new URL(`ws://localhost:${adminPort}`),
+      wsClientOptions: {
+        origin: 'hc-spin',
+      },
+    });
+
+    const appAuthTokenResponse = await adminWs.issueAppAuthenticationToken({
+      installed_app_id: CLI_OPTS.appId,
+      single_use: false,
+      expiry_seconds: 999999,
+    });
+
     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 appWs = await AppWebsocket.connect({
+      url: new URL(`ws://localhost:${appPort}`),
+      wsClientOptions: {
+        origin: 'hc-spin',
+      },
+      token: appAuthTokenResponse.token,
+    });
+    const appInfo = await appWs.appInfo();
+    if (!appInfo) throw new Error('AppInfo is null.');
     const happWindow = await createHappWindow(
       CLI_OPTS.uiSource,
       CLI_OPTS.happOrWebhappPath,
       CLI_OPTS.appId,
       i + 1,
       appPort,
+      appAuthTokenResponse.token,
       DATA_ROOT_DIR,
       CLI_OPTS.openDevtools,
     );

package/src/main/menu.ts

@@ -48,4 +48,42 @@ export const menu = Menu.buildFromTemplate([
       },
     ],
   },
+  {
+    label: 'Edit',
+    submenu: [
+      {
+        label: 'Undo',
+        role: 'undo',
+        accelerator: 'CommandOrControl+Z',
+      },
+      {
+        label: 'Redo',
+        role: 'redo',
+        accelerator: 'CommandOrControl+Shift+Z',
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: 'Cut',
+        role: 'cut',
+        accelerator: 'CommandOrControl+X',
+      },
+      {
+        label: 'Copy',
+        role: 'copy',
+        accelerator: 'CommandOrControl+C',
+      },
+      {
+        label: 'Paste',
+        role: 'paste',
+        accelerator: 'CommandOrControl+V',
+      },
+      {
+        label: 'Select All',
+        role: 'selectAll',
+        accelerator: 'CommandOrControl+A',
+      },
+    ],
+  },
 ]);

package/src/main/windows.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import url from 'url';
-import { InstalledAppId } from '@holochain/client';
+import { AppAuthenticationToken, InstalledAppId } from '@holochain/client';
 import { BrowserWindow, NativeImage, nativeImage, net, session, shell } from 'electron';
 import { is } from '@electron-toolkit/utils';
 import { HappOrWebhappPath } from './validateArgs';
@@ -22,6 +22,7 @@ export const createHappWindow = async (
   appId: InstalledAppId,
   agentNum: number,
   appPort: number,
+  appAuthToken: AppAuthenticationToken,
   appDataRootDir: string,
   openDevtools: boolean,
 ): Promise<BrowserWindow> => {
@@ -47,7 +48,7 @@ export const createHappWindow = async (
 electron.contextBridge.exposeInMainWorld("__HC_LAUNCHER_ENV__", {
   APP_INTERFACE_PORT: ${appPort},
   INSTALLED_APP_ID: "${appId}",
-  FRAMEWORK: "electron"
+  APP_INTERFACE_TOKEN: [${appAuthToken}],
 });
     `;