@holochain/hc-spin 0.200.1 → 0.200.3

package/dist/preload/index.js

@@ -1,5 +1,8 @@
 "use strict";
 const electron = require("electron");
-electron.contextBridge.exposeInMainWorld("electronAPI", {
+electron.contextBridge.exposeInMainWorld("__HC_ZOME_CALL_SIGNER__", {
   signZomeCall: (zomeCall) => electron.ipcRenderer.invoke("sign-zome-call", zomeCall)
 });
+electron.contextBridge.exposeInMainWorld("electronAPI", {
+  signZomeCall: (zomeCall) => electron.ipcRenderer.invoke("sign-zome-call-legacy", zomeCall)
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.200.1",
+  "version": "0.200.3",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
@@ -17,8 +17,7 @@
     "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",
-    "setup": "cd rust-utils && yarn && yarn build && cd .."
+    "build": "rimraf dist && npm run typecheck && electron-vite build && mv ./out ./dist && cp ./cli/cli.js ./dist/cli.js"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
@@ -28,7 +27,8 @@
     "electron": "^28.1.1",
     "electron-context-menu": "3.6.1",
     "get-port": "7.0.0",
-    "hc-spin-rust-utils": "file:./rust-utils/dist",
+    "@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

@@ -6,20 +6,28 @@ import { Command, Option } from 'commander';
 import contextMenu from 'electron-context-menu';
 import split from 'split';
 import * as childProcess from 'child_process';
-import { ZomeCallSigner, ZomeCallUnsignedNapi } from 'hc-spin-rust-utils';
+import { ZomeCallNapi, ZomeCallSigner, ZomeCallUnsignedNapi } from '@holochain/hc-spin-rust-utils';
 import { createHappWindow } from './windows';
 import getPort from 'get-port';
-import { AgentPubKey, AppWebsocket } from '@holochain/client';
+import {
+  AgentPubKey,
+  AppWebsocket,
+  CallZomeRequest,
+  CallZomeRequestSigned,
+  getNonceExpiration,
+  randomNonce,
+} from '@holochain/client';
 import { validateCliArgs } from './validateArgs';
+import { encode } from '@msgpack/msgpack';
 
-const rustUtils = require('hc-spin-rust-utils');
+const rustUtils = require('@holochain/hc-spin-rust-utils');
 
 const cli = new Command();
 
 cli
   .name('hc-spin')
   .description('CLI to run Holochain aps during development.')
-  .version(`${app.getVersion()} (for holochain 0.2.x)`)
+  .version(`0.200.2 (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',
@@ -91,11 +99,50 @@ contextMenu({
   showInspectElement: true,
 });
 
-const handleSignZomeCall = (e: IpcMainInvokeEvent, zomeCall: ZomeCallUnsignedNapi) => {
+const handleSignZomeCall = async (e: IpcMainInvokeEvent, request: CallZomeRequest) => {
   const windowInfo = WINDOW_INFO_MAP[e.sender.id];
-  if (zomeCall.provenance.toString() !== Array.from(windowInfo.agentPubKey).toString())
+  if (request.provenance.toString() !== Array.from(windowInfo.agentPubKey).toString())
     return Promise.reject('Agent public key unauthorized.');
-  return windowInfo.zomeCallSigner.signZomeCall(zomeCall);
+
+  // console.log("Got zome call request: ", request);
+  const zomeCallUnsignedNapi: ZomeCallUnsignedNapi = {
+    provenance: Array.from(request.provenance),
+    cellId: [Array.from(request.cell_id[0]), Array.from(request.cell_id[1])],
+    zomeName: request.zome_name,
+    fnName: request.fn_name,
+    payload: Array.from(encode(request.payload)),
+    nonce: Array.from(await randomNonce()),
+    expiresAt: getNonceExpiration(),
+  };
+
+  const zomeCallSignedNapi: ZomeCallNapi =
+    await windowInfo.zomeCallSigner.signZomeCall(zomeCallUnsignedNapi);
+
+  const zomeCallSigned: CallZomeRequestSigned = {
+    provenance: Uint8Array.from(zomeCallSignedNapi.provenance),
+    cap_secret: null,
+    cell_id: [
+      Uint8Array.from(zomeCallSignedNapi.cellId[0]),
+      Uint8Array.from(zomeCallSignedNapi.cellId[1]),
+    ],
+    zome_name: zomeCallSignedNapi.zomeName,
+    fn_name: zomeCallSignedNapi.fnName,
+    payload: Uint8Array.from(zomeCallSignedNapi.payload),
+    signature: Uint8Array.from(zomeCallSignedNapi.signature),
+    expires_at: zomeCallSignedNapi.expiresAt,
+    nonce: Uint8Array.from(zomeCallSignedNapi.nonce),
+  };
+
+  return zomeCallSigned;
+};
+
+// https://github.com/holochain/holochain-client-js/issues/221
+const handleSignZomeCallLegacy = async (e: IpcMainInvokeEvent, request: ZomeCallUnsignedNapi) => {
+  const windowInfo = WINDOW_INFO_MAP[e.sender.id];
+  if (request.provenance.toString() !== Array.from(windowInfo.agentPubKey).toString())
+    return Promise.reject('Agent public key unauthorized.');
+
+  return windowInfo.zomeCallSigner.signZomeCall(request);
 };
 
 async function startLocalServices(): Promise<[string, string]> {
@@ -212,6 +259,7 @@ async function spawnSandboxes(
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(async () => {
   ipcMain.handle('sign-zome-call', handleSignZomeCall);
+  ipcMain.handle('sign-zome-call-legacy', handleSignZomeCallLegacy);
 
   let happTargetDir: string | undefined;
   // TODO unpack assets to UI dir if webhapp is passed

package/src/preload/index.ts

@@ -1,8 +1,15 @@
 // See the Electron documentation for details on how to use preload scripts:
 // https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
 import { contextBridge, ipcRenderer } from 'electron';
-import { ZomeCallUnsignedNapi } from 'hc-spin-rust-utils';
+import { ZomeCallUnsignedNapi } from '@holochain/hc-spin-rust-utils';
+import { CallZomeRequestUnsigned } from '@holochain/client';
+
+contextBridge.exposeInMainWorld('__HC_ZOME_CALL_SIGNER__', {
+  signZomeCall: (zomeCall: CallZomeRequestUnsigned) =>
+    ipcRenderer.invoke('sign-zome-call', zomeCall),
+});
 
 contextBridge.exposeInMainWorld('electronAPI', {
-  signZomeCall: (zomeCall: ZomeCallUnsignedNapi) => ipcRenderer.invoke('sign-zome-call', zomeCall),
+  signZomeCall: (zomeCall: ZomeCallUnsignedNapi) =>
+    ipcRenderer.invoke('sign-zome-call-legacy', zomeCall),
 });

package/rust-utils/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

package/rust-utils/Cargo.toml

@@ -1,44 +0,0 @@
-[package]
-edition = "2021"
-name = "hc-spin-rust-utils"
-version = "0.0.0"
-
-[workspace]
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-# We keep those holochain dependencies separate from the root project to avoid irrelevant incompatibilities
-holochain_client = "0.4.5-rc.0"
-holochain_conductor_api = "0.2.4"
-holochain_integrity_types = "0.2.4"
-holochain_types = "0.2.4"
-holochain_zome_types = "0.2.4"
-holo_hash = "0.2.4"
-kitsune_p2p_timestamp = "0.2.4"
-lair_keystore_api = "0.3.0"
-
-hex = "0.4.3"
-futures = "0.3"
-nanoid = "0.4.0"
-# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.12.2", default-features = false, features = [
-  "napi4",
-  "tokio_rt",
-  "async",
-  "serde-json",
-] }
-napi-derive = "2.12.2"
-serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.8"
-sodoken = "0.0.9"
-url = "2.2"
-url2 = "0.0.6"
-zip = "0.5.0"
-
-[build-dependencies]
-napi-build = "2.0.1"
-
-[profile.release]
-lto = true

package/rust-utils/build.rs

@@ -1,5 +0,0 @@
-extern crate napi_build;
-
-fn main() {
-  napi_build::setup();
-}

package/rust-utils/index.d.ts

@@ -1,33 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-
-/* auto-generated by NAPI-RS */
-
-export function saveHappOrWebhapp(happOrWebHappPath: string, appId: string, uisDir: string, happsDir: string): Promise<void>
-export interface ZomeCallUnsignedNapi {
-  cellId: Array<Array<number>>
-  zomeName: string
-  fnName: string
-  payload: Array<number>
-  capSecret?: Array<number>
-  provenance: Array<number>
-  nonce: Array<number>
-  expiresAt: number
-}
-export interface ZomeCallNapi {
-  cellId: Array<Array<number>>
-  zomeName: string
-  fnName: string
-  payload: Array<number>
-  capSecret?: Array<number>
-  provenance: Array<number>
-  nonce: Array<number>
-  expiresAt: number
-  signature: Array<number>
-}
-export type JsZomeCallSigner = ZomeCallSigner
-export class ZomeCallSigner {
-  constructor()
-  static connect(connectionUrl: string, passphrase: string): Promise<ZomeCallSigner>
-  signZomeCall(zomeCallUnsignedJs: ZomeCallUnsignedNapi): Promise<ZomeCallNapi>
-}

package/rust-utils/index.js

@@ -1,258 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/* prettier-ignore */
-
-/* auto-generated by NAPI-RS */
-
-const { existsSync, readFileSync } = require('fs')
-const { join } = require('path')
-
-const { platform, arch } = process
-
-let nativeBinding = null
-let localFileExisted = false
-let loadError = null
-
-function isMusl() {
-  // For Node 10
-  if (!process.report || typeof process.report.getReport !== 'function') {
-    try {
-      const lddPath = require('child_process').execSync('which ldd').toString().trim()
-      return readFileSync(lddPath, 'utf8').includes('musl')
-    } catch (e) {
-      return true
-    }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header
-    return !glibcVersionRuntime
-  }
-}
-
-switch (platform) {
-  case 'android':
-    switch (arch) {
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'hc-we-rust-utils.android-arm64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.android-arm64.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-android-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'hc-we-rust-utils.android-arm-eabi.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.android-arm-eabi.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-android-arm-eabi')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Android ${arch}`)
-    }
-    break
-  case 'win32':
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(
-          join(__dirname, 'hc-we-rust-utils.win32-x64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.win32-x64-msvc.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-win32-x64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'ia32':
-        localFileExisted = existsSync(
-          join(__dirname, 'hc-we-rust-utils.win32-ia32-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.win32-ia32-msvc.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-win32-ia32-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'hc-we-rust-utils.win32-arm64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.win32-arm64-msvc.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-win32-arm64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`)
-    }
-    break
-  case 'darwin':
-    localFileExisted = existsSync(join(__dirname, 'hc-we-rust-utils.darwin-universal.node'))
-    try {
-      if (localFileExisted) {
-        nativeBinding = require('./hc-we-rust-utils.darwin-universal.node')
-      } else {
-        nativeBinding = require('hc-spin-rust-utils-darwin-universal')
-      }
-      break
-    } catch {}
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'hc-we-rust-utils.darwin-x64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.darwin-x64.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-darwin-x64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'hc-we-rust-utils.darwin-arm64.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.darwin-arm64.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-darwin-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`)
-    }
-    break
-  case 'freebsd':
-    if (arch !== 'x64') {
-      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
-    }
-    localFileExisted = existsSync(join(__dirname, 'hc-we-rust-utils.freebsd-x64.node'))
-    try {
-      if (localFileExisted) {
-        nativeBinding = require('./hc-we-rust-utils.freebsd-x64.node')
-      } else {
-        nativeBinding = require('hc-spin-rust-utils-freebsd-x64')
-      }
-    } catch (e) {
-      loadError = e
-    }
-    break
-  case 'linux':
-    switch (arch) {
-      case 'x64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'hc-we-rust-utils.linux-x64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./hc-we-rust-utils.linux-x64-musl.node')
-            } else {
-              nativeBinding = require('hc-spin-rust-utils-linux-x64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'hc-we-rust-utils.linux-x64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./hc-we-rust-utils.linux-x64-gnu.node')
-            } else {
-              nativeBinding = require('hc-spin-rust-utils-linux-x64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'hc-we-rust-utils.linux-arm64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./hc-we-rust-utils.linux-arm64-musl.node')
-            } else {
-              nativeBinding = require('hc-spin-rust-utils-linux-arm64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'hc-we-rust-utils.linux-arm64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./hc-we-rust-utils.linux-arm64-gnu.node')
-            } else {
-              nativeBinding = require('hc-spin-rust-utils-linux-arm64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(
-          join(__dirname, 'hc-we-rust-utils.linux-arm-gnueabihf.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./hc-we-rust-utils.linux-arm-gnueabihf.node')
-          } else {
-            nativeBinding = require('hc-spin-rust-utils-linux-arm-gnueabihf')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`)
-    }
-    break
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
-}
-
-if (!nativeBinding) {
-  if (loadError) {
-    throw loadError
-  }
-  throw new Error(`Failed to load native binding`)
-}
-
-const { saveHappOrWebhapp, ZomeCallSigner } = nativeBinding
-
-module.exports.saveHappOrWebhapp = saveHappOrWebhapp
-module.exports.ZomeCallSigner = ZomeCallSigner

package/rust-utils/package.json

@@ -1,31 +0,0 @@
-{
-  "name": "hc-spin-rust-utils",
-  "version": "0.0.1",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "napi": {
-    "name": "hc-we-rust-utils",
-    "triples": {}
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "@napi-rs/cli": "^2.16.5",
-    "rimraf": "5.0.5",
-    "ava": "^5.1.1"
-  },
-  "ava": {
-    "timeout": "3m"
-  },
-  "engines": {
-    "node": ">= 10"
-  },
-  "scripts": {
-    "artifacts": "napi artifacts",
-    "build": "napi build --platform --release && rimraf dist && mkdir dist && cp package.json dist/ && cp index.js dist/ && cp index.d.ts dist/ && cp hc-we-rust-utils* dist/",
-    "build:debug": "napi build --platform",
-    "prepublishOnly": "napi prepublish -t npm",
-    "test": "ava",
-    "universal": "napi universal",
-    "version": "napi version"
-  }
-}

package/rust-utils/src/decode_webhapp.rs

@@ -1,112 +0,0 @@
-use holochain_types::web_app::WebAppBundle;
-use std::fs;
-use std::path::PathBuf;
-
-#[napi]
-pub async fn save_happ_or_webhapp(
-    happ_or_web_happ_path: String,
-    app_id: String,
-    uis_dir: String,
-    happs_dir: String,
-) -> napi::Result<()> {
-    let happ_or_webhapp_bytes = fs::read(happ_or_web_happ_path)?;
-
-    let app_bundle = match WebAppBundle::decode(&happ_or_webhapp_bytes) {
-        Ok(web_app_bundle) => {
-            // extracting ui.zip bytes
-            let web_ui_zip_bytes = web_app_bundle.web_ui_zip_bytes().await.map_err(|e| {
-                napi::Error::from_reason(format!("Failed to extract ui zip bytes: {}", e))
-            })?;
-
-            let ui_target_dir = PathBuf::from(uis_dir);
-            if !path_exists(&ui_target_dir) {
-                fs::create_dir_all(&ui_target_dir)?;
-            }
-
-            let ui_zip_path = PathBuf::from(ui_target_dir.clone()).join("ui.zip");
-
-            // unzip and store UI
-            fs::write(
-                ui_zip_path.clone(),
-                web_ui_zip_bytes.into_owned().into_inner(),
-            )
-            .map_err(|e| {
-                napi::Error::from_reason(format!("Failed to write Web UI Zip file: {}", e))
-            })?;
-
-            let file = fs::File::open(ui_zip_path.clone()).map_err(|e| {
-                napi::Error::from_reason(format!("Failed to read Web UI Zip file: {}", e))
-            })?;
-
-            unzip_file(file, ui_target_dir.into())
-                .map_err(|e| napi::Error::from_reason(format!("Failed to unzip ui.zip: {}", e)))?;
-
-            fs::remove_file(ui_zip_path).map_err(|e| {
-                napi::Error::from_reason(format!("Failed to remove ui.zip after unzipping: {}", e))
-            })?;
-
-            // extracting happ bundle
-            let app_bundle = web_app_bundle.happ_bundle().await.map_err(|e| {
-                napi::Error::from_reason(format!(
-                    "Failed to get happ bundle from webapp bundle bytes: {}",
-                    e
-                ))
-            })?;
-
-            app_bundle
-        }
-        Err(e) => {
-            return Err(napi::Error::from_reason(format!(
-                "Failed to decode .webhapp file: {}",
-                e
-            )))
-        }
-    };
-
-    let happs_dir = PathBuf::from(happs_dir);
-    if !path_exists(&happs_dir) {
-        fs::create_dir_all(&happs_dir)?;
-    }
-
-    let happ_path = happs_dir.join(format!("{}.happ", app_id));
-
-    app_bundle
-        .write_to_file(&happ_path)
-        .await
-        .map_err(|e| napi::Error::from_reason(format!("Failed to write .happ file: {}", e)))?;
-
-    Ok(())
-}
-
-pub fn path_exists(path: &PathBuf) -> bool {
-    std::path::Path::new(path).exists()
-}
-
-pub fn unzip_file(reader: fs::File, outpath: PathBuf) -> Result<(), String> {
-    let mut archive = match zip::ZipArchive::new(reader) {
-        Ok(a) => a,
-        Err(e) => return Err(format!("Failed to unpack zip archive: {}", e)),
-    };
-
-    for i in 0..archive.len() {
-        let mut file = archive.by_index(i).unwrap();
-        let outpath = match file.enclosed_name() {
-            Some(path) => outpath.join(path).to_owned(),
-            None => continue,
-        };
-
-        if (&*file.name()).ends_with('/') {
-            fs::create_dir_all(&outpath).unwrap();
-        } else {
-            if let Some(p) = outpath.parent() {
-                if !p.exists() {
-                    fs::create_dir_all(&p).unwrap();
-                }
-            }
-            let mut outfile = fs::File::create(&outpath).unwrap();
-            std::io::copy(&mut file, &mut outfile).unwrap();
-        }
-    }
-
-    Ok(())
-}

package/rust-utils/src/lib.rs

@@ -1,7 +0,0 @@
-#[macro_use]
-extern crate napi_derive;
-
-pub mod decode_webhapp;
-pub mod types;
-mod utils;
-pub mod zome_call_signer;