@holochain/hc-spin 0.600.1-rc.0 → 0.600.2-rc.0

package/dist/main/index.js

@@ -12442,7 +12442,8 @@ function validateCliArgs(cliArgs, cliOpts, appDataRootDir) {
     singalingUrl: cliOpts.signalingUrl,
     bootstrapUrl: cliOpts.bootstrapUrl,
     happOrWebhappPath: isHapp ? { type: "happ", path: happOrWebhappPath } : { type: "webhapp", path: happOrWebhappPath },
-    openDevtools: cliOpts.openDevtools ? true : false
+    openDevtools: cliOpts.openDevtools ? true : false,
+    transport: cliOpts.transport || "quic"
   };
 }
 async function createHappWindow(uiSource, appId, agentNum, appPort, appAuthToken, appDataRootDir) {
@@ -12563,7 +12564,7 @@ function setLinkOpenHandlers(browserWindow) {
 }
 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.600.0"} (built for holochain ${"0.6.0"})`).argument(
+cli.name("hc-spin").description("CLI to run Holochain apps during development.").version(`${"0.600.2-rc.0"} (built for holochain ${"0.6.1-rc.0"})`).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(
@@ -12587,7 +12588,10 @@ cli.name("hc-spin").description("CLI to run Holochain apps during development.")
 ).option(
   "--signaling-url <url>",
   "Url of the signaling server to use. By default, hc spin spins up a local development signaling server for you but this argument allows you to specify a custom one."
-).option("--open-devtools", "Automatically open the devtools on startup.");
+).option("--open-devtools", "Automatically open the devtools on startup.").option(
+  "--transport <quic|webrtc>",
+  "Configure network transport. Defaults to quic, compatible with the iroh transport used in in Holochain by default. Set to `webrtc` for tx5 transport."
+);
 cli.parse();
 const rl = require("readline").createInterface({
   input: process.stdin,
@@ -12660,7 +12664,7 @@ const handleSignZomeCall = async (e, request) => {
   };
   return signedZomeCall;
 };
-async function startLocalServices() {
+async function startLocalServices(transport) {
   const localServicesHandle = childProcess__namespace.spawn("kitsune2-bootstrap-srv");
   return new Promise((resolve) => {
     let bootStrapUrl;
@@ -12672,7 +12676,7 @@ async function startLocalServices() {
       if (line.includes("#kitsune2_bootstrap_srv#listening#")) {
         const hostAndPort = line.split("#kitsune2_bootstrap_srv#listening#")[1].split("#")[0];
         bootStrapUrl = `http://${hostAndPort}`;
-        signalUrl = `ws://${hostAndPort}`;
+        signalUrl = transport === "quic" ? `http://${hostAndPort}` : `ws://${hostAndPort}`;
       }
       if (line.includes("#kitsune2_bootstrap_srv#running#")) {
         bootstrapRunning = true;
@@ -12686,7 +12690,7 @@ async function startLocalServices() {
     });
   });
 }
-async function spawnSandboxes(nAgents, happPath, bootStrapUrl, signalUrl, appId, networkSeed, targetArcFactor) {
+async function spawnSandboxes(nAgents, happPath, bootStrapUrl, signalUrl, appId, transport, networkSeed, targetArcFactor) {
   const generateArgs = [
     "sandbox",
     "--piped",
@@ -12711,7 +12715,7 @@ async function spawnSandboxes(nAgents, happPath, bootStrapUrl, signalUrl, appId,
   if (targetArcFactor !== void 0) {
     generateArgs.push("--target-arc-factor", targetArcFactor.toString());
   }
-  generateArgs.push("--bootstrap", bootStrapUrl, "webrtc", signalUrl);
+  generateArgs.push("--bootstrap", bootStrapUrl, transport, signalUrl);
   let readyConductors = 0;
   const portsInfo = {};
   const sandboxPaths = [];
@@ -12755,13 +12759,14 @@ electron.app.whenReady().then(async () => {
       happTargetDir
     );
   }
-  const [bootstrapUrl, signalingUrl] = await startLocalServices();
+  const [bootstrapUrl, signalingUrl] = await startLocalServices(CLI_OPTS.transport);
   const [sandboxHandle, sandboxPaths, portsInfo] = await spawnSandboxes(
     CLI_OPTS.numAgents,
     happTargetDir ? happTargetDir : CLI_OPTS.happOrWebhappPath.path,
     CLI_OPTS.bootstrapUrl ? CLI_OPTS.bootstrapUrl : bootstrapUrl,
     CLI_OPTS.singalingUrl ? CLI_OPTS.singalingUrl : signalingUrl,
     CLI_OPTS.appId,
+    CLI_OPTS.transport,
     CLI_OPTS.networkSeed,
     CLI_OPTS.targetArcFactor
   );

package/flake.lock

@@ -36,16 +36,16 @@
     "hc-scaffold": {
       "flake": false,
       "locked": {
-        "lastModified": 1764163563,
-        "narHash": "sha256-KigJ3h25yNJfeQunPm5QYFPtLSk6nU3IEEvZY8w01Vo=",
+        "lastModified": 1769104114,
+        "narHash": "sha256-Ebh8YW7J4VRAwhK9XQDf98nWAIvciddzdx7LbhZiwdI=",
         "owner": "holochain",
         "repo": "scaffolding",
-        "rev": "87e997a7361d4aa7c1bb96261483ebba50223bd0",
+        "rev": "6749c80d54306e4c1ad5831ce2dbdbb9a283ee0c",
         "type": "github"
       },
       "original": {
         "owner": "holochain",
-        "ref": "v0.600.1",
+        "ref": "v0.600.1-rc.0",
         "repo": "scaffolding",
         "type": "github"
       }
@@ -79,11 +79,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1769045727,
-        "narHash": "sha256-sYGlDJ6pNt3n+Tu5F86Lsr8ki+TfGMRGeSrDz+MSv+w=",
+        "lastModified": 1769121828,
+        "narHash": "sha256-o1GUUg9FUADcTOU4gzDDtiuJo61PyrQHCn0e64HRJYU=",
         "owner": "holochain",
         "repo": "holonix",
-        "rev": "7b46630e1bd47b25d1f6385d8e921435f453c1a7",
+        "rev": "3e2a4b96b177aaaa233fd744ba82bfe308e85635",
         "type": "github"
       },
       "original": {
@@ -96,16 +96,16 @@
     "kitsune2": {
       "flake": false,
       "locked": {
-        "lastModified": 1767421208,
-        "narHash": "sha256-hPIesp4R8/8sA+Qqw1ECgsgCOKlyX5coGR+7QDoavWw=",
+        "lastModified": 1768402558,
+        "narHash": "sha256-v7uEmcVGC6tDjrkEZHMJa9DdXnqXwwVxJx9GkZq9P/U=",
         "owner": "holochain",
         "repo": "kitsune2",
-        "rev": "77471c1fb4b6f926609bf82152dc97e26457b4d9",
+        "rev": "2b809bcf0bff3d493cd5ba230677240432fff58a",
         "type": "github"
       },
       "original": {
         "owner": "holochain",
-        "ref": "v0.4.0-dev.2",
+        "ref": "2b809bcf0bff3d493cd5ba230677240432fff58a",
         "repo": "kitsune2",
         "type": "github"
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.600.1-rc.0",
+  "version": "0.600.2-rc.0",
   "holochainVersion": "0.6.1-rc.0",
   "description": "CLI to run Holochain apps during development.",
   "author": "matthme",

package/src/main/index.ts

@@ -21,7 +21,7 @@ import path from 'path';
 import split from 'split';
 
 import { menu } from './menu';
-import { validateCliArgs } from './validateArgs';
+import { Transport, validateCliArgs } from './validateArgs';
 import { createHappWindow, loadHappWindow } from './windows';
 
 const rustUtils = require('@holochain/hc-spin-rust-utils');
@@ -66,7 +66,11 @@ cli
     '--signaling-url <url>',
     'Url of the signaling server to use. By default, hc spin spins up a local development signaling server for you but this argument allows you to specify a custom one.',
   )
-  .option('--open-devtools', 'Automatically open the devtools on startup.');
+  .option('--open-devtools', 'Automatically open the devtools on startup.')
+  .option(
+    '--transport <quic|webrtc>',
+    'Configure network transport. Defaults to quic, compatible with the iroh transport used in in Holochain by default. Set to `webrtc` for tx5 transport.',
+  );
 
 cli.parse();
 // console.log('Got CLI opts: ', cli.opts());
@@ -171,7 +175,7 @@ const handleSignZomeCall = async (
   return signedZomeCall;
 };
 
-async function startLocalServices(): Promise<[string, string]> {
+async function startLocalServices(transport: Transport): Promise<[string, string]> {
   const localServicesHandle = childProcess.spawn('kitsune2-bootstrap-srv');
   return new Promise((resolve) => {
     let bootStrapUrl;
@@ -183,7 +187,7 @@ async function startLocalServices(): Promise<[string, string]> {
       if (line.includes('#kitsune2_bootstrap_srv#listening#')) {
         const hostAndPort = line.split('#kitsune2_bootstrap_srv#listening#')[1].split('#')[0];
         bootStrapUrl = `http://${hostAndPort}`;
-        signalUrl = `ws://${hostAndPort}`;
+        signalUrl = transport === 'quic' ? `http://${hostAndPort}` : `ws://${hostAndPort}`;
       }
       if (line.includes('#kitsune2_bootstrap_srv#running#')) {
         bootstrapRunning = true;
@@ -209,6 +213,7 @@ async function spawnSandboxes(
   bootStrapUrl: string,
   signalUrl: string,
   appId: string,
+  transport: Transport,
   networkSeed?: string,
   targetArcFactor?: number,
 ): Promise<
@@ -239,8 +244,7 @@ async function spawnSandboxes(
   if (targetArcFactor !== undefined) {
     generateArgs.push('--target-arc-factor', targetArcFactor.toString());
   }
-  generateArgs.push('--bootstrap', bootStrapUrl, 'webrtc', signalUrl);
-  // console.log('GENERATE ARGS: ', generateArgs);
+  generateArgs.push('--bootstrap', bootStrapUrl, transport, signalUrl);
 
   let readyConductors = 0;
   const portsInfo: Record<number, PortsInfo> = {};
@@ -302,7 +306,7 @@ app.whenReady().then(async () => {
     );
   }
 
-  const [bootstrapUrl, signalingUrl] = await startLocalServices();
+  const [bootstrapUrl, signalingUrl] = await startLocalServices(CLI_OPTS.transport);
 
   const [sandboxHandle, sandboxPaths, portsInfo] = await spawnSandboxes(
     CLI_OPTS.numAgents,
@@ -310,6 +314,7 @@ app.whenReady().then(async () => {
     CLI_OPTS.bootstrapUrl ? CLI_OPTS.bootstrapUrl : bootstrapUrl,
     CLI_OPTS.singalingUrl ? CLI_OPTS.singalingUrl : signalingUrl,
     CLI_OPTS.appId,
+    CLI_OPTS.transport,
     CLI_OPTS.networkSeed,
     CLI_OPTS.targetArcFactor,
   );

package/src/main/validateArgs.ts

@@ -14,6 +14,7 @@ export type CliOpts = {
   signalingUrl?: string;
   bootstrapUrl?: string;
   openDevtools?: boolean;
+  transport?: Transport;
 };
 
 export type CliOptsValidated = {
@@ -27,8 +28,11 @@ export type CliOptsValidated = {
   bootstrapUrl: string | undefined;
   happOrWebhappPath: HappOrWebhappPath;
   openDevtools: boolean;
+  transport: Transport;
 };
 
+export type Transport = 'quic' | 'webrtc';
+
 export type HappOrWebhappPath = {
   type: 'happ' | 'webhapp';
   path: string;
@@ -104,5 +108,6 @@ export function validateCliArgs(
       ? { type: 'happ', path: happOrWebhappPath }
       : { type: 'webhapp', path: happOrWebhappPath },
     openDevtools: cliOpts.openDevtools ? true : false,
+    transport: cliOpts.transport || 'quic',
   };
 }