fix: update transport config for holochain 0.6 kitsune2

- Switch from webrtc to quic network transport
- Use irohTransport config instead of tx5Transport
- Use http:// scheme for relay URL (iroh requires it)
- Set signal_url to local bootstrap server
- Increase dhtSync default timeout to 60s for kitsune2 gossip
- Bump version to 0.19.1

Author: zippy

docs/tryorama.conductor.md

@@ -132,7 +132,7 @@ Install an application into the conductor.
 </td></tr>
 <tr><td>
 
-[setNetworkConfig(createConductorOptions)](./tryorama.conductor.setnetworkconfig.md)
+[setNetworkConfig(createConductorOptions, signalingServerUrl)](./tryorama.conductor.setnetworkconfig.md)
 
 
 </td><td>

docs/tryorama.conductor.setnetworkconfig.md

@@ -7,7 +7,7 @@
 **Signature:**
 
 ```typescript
-setNetworkConfig(createConductorOptions: NetworkConfig): void;
+setNetworkConfig(createConductorOptions: NetworkConfig, signalingServerUrl?: URL): void;
 ```
 
 ## Parameters
@@ -41,6 +41,22 @@ createConductorOptions
 </td><td>
 
 
+</td></tr>
+<tr><td>
+
+signalingServerUrl
+
+
+</td><td>
+
+URL
+
+
+</td><td>
+
+_(Optional)_
+
+
 </td></tr>
 </tbody></table>
 **Returns:**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@holochain/tryorama",
   "description": "Toolset to manage Holochain conductors and facilitate running test scenarios",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "author": "Holochain Foundation",
   "license": "MIT",
   "keywords": [

ts/src/conductor-helpers.ts

@@ -51,7 +51,7 @@ export const runLocalServices = async () => {
           .split(BOOTSTRAP_SERVER_STARTUP_STRING)[1]
           .split("#")[0];
         const bootstrapServerUrl = new URL(`http://${listeningAddress}`);
-        const signalingServerUrl = new URL(`ws://${listeningAddress}`);
+        const signalingServerUrl = new URL(`http://${listeningAddress}`);
         logger.verbose(`bootstrap server url: ${bootstrapServerUrl}`);
         logger.verbose(`signaling server url: ${signalingServerUrl}`);
         resolve({

ts/src/conductor.ts

@@ -146,18 +146,18 @@ type NetworkAdvancedK2GossipConfigYaml = Omit<
   "targetArcFactor" | "transportTimeoutS"
 >;
 
-interface NetworkAdvancedTx5TransportConfigYaml {
-  signalAllowPlainText: boolean;
-  timeoutS: number;
+interface NetworkAdvancedIrohTransportConfigYaml {
+  relayAllowPlainText: boolean;
 }
 
 interface ConductorConfigYaml {
   network: {
     advanced: {
       k2Gossip: NetworkAdvancedK2GossipConfigYaml;
-      tx5Transport: NetworkAdvancedTx5TransportConfigYaml;
+      irohTransport: NetworkAdvancedIrohTransportConfigYaml;
     };
     target_arc_factor: number;
+    signal_url?: string;
   };
 }
 
@@ -200,7 +200,7 @@ export const createConductor = async (
     "transportTimeoutS",
     "targetArcFactor",
   ]);
-  conductor.setNetworkConfig(networkConfig);
+  conductor.setNetworkConfig(networkConfig, signalingServerUrl);
   if (options?.startup !== false) {
     await conductor.startUp();
   }
@@ -245,7 +245,7 @@ export class Conductor {
     if (options?.bootstrapServerUrl) {
       args.push("--bootstrap", options.bootstrapServerUrl.href);
     }
-    args.push("webrtc");
+    args.push("quic");
     args.push(signalingServerUrl.href);
     defaultLogger.debug("spawning hc sandbox with args:", args);
     const createConductorProcess = spawn("hc", args);
@@ -273,7 +273,7 @@ export class Conductor {
     });
   }
 
-  setNetworkConfig(createConductorOptions: NetworkConfig) {
+  setNetworkConfig(createConductorOptions: NetworkConfig, signalingServerUrl?: URL) {
     const conductorConfig = readFileSync(
       `${this.conductorDir}/${CONDUCTOR_CONFIG}`,
       "utf-8",
@@ -292,6 +292,9 @@ export class Conductor {
     }
     conductorConfigYaml.network.target_arc_factor =
       createConductorOptions.targetArcFactor ?? 1;
+    if (signalingServerUrl) {
+      conductorConfigYaml.network.signal_url = signalingServerUrl.href;
+    }
     assert("advanced" in conductorConfigYaml.network);
     conductorConfigYaml.network.advanced = {
       k2Gossip: {
@@ -301,9 +304,8 @@ export class Conductor {
         initiateJitterMs: createConductorOptions.initiateJitterMs ?? 1_000,
         roundTimeoutMs: createConductorOptions.roundTimeoutMs ?? 5_000,
       },
-      tx5Transport: {
-        signalAllowPlainText: true,
-        timeoutS: createConductorOptions.transportTimeoutS ?? 15,
+      irohTransport: {
+        relayAllowPlainText: true,
       },
     };
     const yamlDump = yaml.dump(conductorConfigYaml);

ts/src/util.ts

@@ -172,7 +172,7 @@ export const dhtSync = async (
   players: PlayerApp[],
   dnaHash: DnaHash,
   intervalMs = 500,
-  timeoutMs = 40_000,
+  timeoutMs = 60_000,
 ) =>
   retryUntilCompleteOrTimeout(
     ({ players, dnaHash }) => {
@@ -242,7 +242,7 @@ export const storageArc = async (
   dnaHash: DnaHash,
   storageArc: DhtArc,
   intervalMs = 500,
-  timeoutMs = 40_000,
+  timeoutMs = 60_000,
 ) =>
   retryUntilCompleteOrTimeout(
     ({ player, dnaHash, storageArc }) =>
@@ -331,7 +331,7 @@ export const integratedOpsCount = async (
   cellId: CellId,
   targetIntegratedOpsCount: number,
   intervalMs = 500,
-  timeoutMs = 40_000,
+  timeoutMs = 60_000,
 ) =>
   retryUntilCompleteOrTimeout(
     async ({ player, cellId, targetIntegratedOpsCount }) => {