Merge pull request #122 from holochain/fix/do-not-stop-conductor-star…

…t-on-error

Fix/do not stop conductor start on error

CHANGELOG.md

@@ -11,6 +11,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [0.5.4]
 
+### Changed
+- Fix error handling during conductor startup (only log error instead of crashing) [issue \#119](https://github.com/holochain/tryorama/issues/119)
+- Update Holochain client (ESM only)
+
+## [0.5.4]
+
 ### Added
 - Export function to add all agents to all conductors.
 

docs/tryorama.getzomecaller.md

@@ -9,5 +9,5 @@ Get a shorthand function to call a Cell's Zome.
 <b>Signature:</b>
 
 ```typescript
-getZomeCaller: (cell: CallableCell, zomeName: string) => <T>(fnName: string, payload: unknown) => Promise<T>
+getZomeCaller: (cell: CallableCell, zomeName: string) => <T>(fnName: string, payload?: unknown) => Promise<T>
 ```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@holochain/tryorama",
   "description": "Toolset to manage Holochain conductors and facilitate running test scenarios",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "author": "Holochain Foundation",
   "keywords": [
     "holochain",
@@ -45,7 +45,7 @@
     "test:trycp:scenario": "node --loader ts-node/esm ts/test/trycp/scenario.ts"
   },
   "dependencies": {
-    "@holochain/client": "^0.3.2",
+    "@holochain/client": "^0.4.1",
     "get-port": "^6.1.2",
     "lodash": "^4.17.21",
     "uuid": "^8.3.2",

ts/src/common.ts

@@ -105,7 +105,7 @@ const getCallableCell = (
  */
 export const getZomeCaller =
   (cell: CallableCell, zomeName: string) =>
-  <T>(fnName: string, payload: unknown): Promise<T> =>
+  <T>(fnName: string, payload?: unknown): Promise<T> =>
     cell.callZome<T>({
       zome_name: zomeName,
       fn_name: fnName,

ts/src/local/conductor.ts

@@ -1,8 +1,3 @@
-import assert from "node:assert";
-import pick from "lodash/pick.js";
-import getPort, { portNumbers } from "get-port";
-import { ChildProcessWithoutNullStreams, spawn } from "node:child_process";
-import { v4 as uuidv4 } from "uuid";
 import {
   AdminWebsocket,
   AppBundleSource,
@@ -13,11 +8,16 @@ import {
   InstallAppBundleRequest,
   InstallAppDnaPayload,
 } from "@holochain/client";
+import getPort, { portNumbers } from "get-port";
+import pick from "lodash/pick.js";
+import assert from "node:assert";
+import { ChildProcessWithoutNullStreams, spawn } from "node:child_process";
 import { URL } from "node:url";
+import { v4 as uuidv4 } from "uuid";
 
-import { makeLogger } from "../logger.js";
-import { AgentHapp, IConductor, HappBundleOptions } from "../types.js";
 import { enableAndGetAgentHapp } from "../common.js";
+import { makeLogger } from "../logger.js";
+import { AgentHapp, HappBundleOptions, IConductor } from "../types.js";
 
 const logger = makeLogger("Local Conductor");
 
@@ -247,7 +247,7 @@ export class Conductor implements IConductor {
         // the process doesn't kill the conductor
       }
     );
-    const startPromise = new Promise<void>((resolve, reject) => {
+    const startPromise = new Promise<void>((resolve) => {
       runConductorProcess.stdout.on("data", (data: Buffer) => {
         logger.debug(`starting conductor\n${data}`);
 
@@ -271,8 +271,7 @@ export class Conductor implements IConductor {
       });
 
       runConductorProcess.stderr.once("data", (data: Buffer) => {
-        logger.error(`error when starting conductor: ${data.toString()}`);
-        reject(data);
+        logger.error(`starting conductor: ${data.toString()}`);
       });
     });
     await startPromise;

ts/src/trycp/conductor/conductor.ts

@@ -13,6 +13,7 @@ import {
   DumpFullStateRequest,
   DumpStateRequest,
   EnableAppRequest,
+  FullStateDump,
   InstallAppBundleRequest,
   InstallAppDnaPayload,
   InstallAppRequest,
@@ -23,16 +24,15 @@ import {
   StartAppRequest,
   UninstallAppRequest,
 } from "@holochain/client";
-import { FullStateDump } from "@holochain/client/lib/api/state-dump";
+import getPort, { portNumbers } from "get-port";
 import assert from "node:assert";
 import fs from "node:fs";
-import getPort, { portNumbers } from "get-port";
 import { URL } from "node:url";
 import { v4 as uuidv4 } from "uuid";
-import { TryCpClient, TryCpConductorLogLevel } from "../index.js";
 import { enableAndGetAgentHapp } from "../../common.js";
 import { makeLogger } from "../../logger.js";
 import { AgentHapp, IConductor } from "../../types.js";
+import { TryCpClient, TryCpConductorLogLevel } from "../index.js";
 import {
   RequestAdminInterfaceData,
   RequestCallAppInterfaceMessage,

ts/src/trycp/types.ts

@@ -15,6 +15,7 @@ import {
   DumpStateResponse,
   EnableAppRequest,
   EnableAppResponse,
+  FullStateDump,
   HoloHash,
   InstallAppBundleRequest,
   InstallAppBundleResponse,
@@ -33,7 +34,6 @@ import {
   UninstallAppRequest,
   UninstallAppResponse,
 } from "@holochain/client";
-import { FullStateDump } from "@holochain/client/lib/api/state-dump";
 import { ConductorId } from "./conductor/index.js";
 
 /**

ts/test/local/conductor.ts

@@ -1,12 +1,13 @@
+import { HeaderHash } from "@holochain/client";
 import {
   AppSignal,
   AppSignalCb,
   DnaSource,
   EntryHash,
-} from "@holochain/client/lib.es/index.js";
+} from "@holochain/client";
 import { readFileSync } from "node:fs";
-import test from "tape-promise/tape.js";
 import { URL } from "node:url";
+import test from "tape-promise/tape.js";
 import {
   addAllAgentsToAllConductors,
   getZomeCaller,
@@ -18,7 +19,6 @@ import {
 } from "../../src/index.js";
 import { pause } from "../../src/util.js";
 import { FIXTURE_DNA_URL, FIXTURE_HAPP_URL } from "../fixture/index.js";
-import { HeaderHash } from "@holochain/client";
 
 test("Local Conductor - Spawn a conductor with QUIC network", async (t) => {
   const conductor = await createConductor({