make compatibile with signal changes and pubkey as optional

docs/tryorama.appoptions.md

@@ -121,7 +121,7 @@ _(Optional)_ A network seed to override the hApps' network seed.
 
 </td><td>
 
-AppSignalCb
+SignalCb
 
 
 </td><td>

docs/tryorama.appoptions.signalhandler.md

@@ -9,5 +9,5 @@ A signal handler for the conductor.
 **Signature:**
 
 ```typescript
-signalHandler?: AppSignalCb;
+signalHandler?: SignalCb;
 ```

docs/tryorama.clientsplayersoptions.md

@@ -158,7 +158,7 @@ _(Optional)_ Configuration for the conductor (optional).
 
 </td><td>
 
-AppSignalCb
+SignalCb
 
 
 </td><td>

docs/tryorama.clientsplayersoptions.signalhandler.md

@@ -9,5 +9,5 @@ A signal handler to be registered in conductors.
 **Signature:**
 
 ```typescript
-signalHandler?: AppSignalCb;
+signalHandler?: SignalCb;
 ```

docs/tryorama.getcallablecell.md

@@ -13,7 +13,7 @@ getCallableCell: (appWs: IAppWebsocket, cell: ClonedCell | ProvisionedCell) => {
     callZome: <T>(request: CellZomeCallRequest, timeout?: number) => Promise<T>;
     cell_id: import("@holochain/client").CellId;
     clone_id: string;
-    original_dna_hash: import("@spartan-hc/holo-hash").DnaHash;
+    original_dna_hash: Uint8Array;
     dna_modifiers: import("@holochain/client").DnaModifiers;
     name: string;
     enabled: boolean;
@@ -78,7 +78,7 @@ Cell to bind zome call function to.
 </tbody></table>
 **Returns:**
 
-{ callZome: &lt;T&gt;(request: [CellZomeCallRequest](./tryorama.cellzomecallrequest.md)<!-- -->, timeout?: number) =&gt; Promise&lt;T&gt;; cell\_id: import("@holochain/client").CellId; clone\_id: string; original\_dna\_hash: import("@spartan-hc/holo-hash").DnaHash; dna\_modifiers: import("@holochain/client").DnaModifiers; name: string; enabled: boolean; } \| { callZome: &lt;T&gt;(request: [CellZomeCallRequest](./tryorama.cellzomecallrequest.md)<!-- -->, timeout?: number) =&gt; Promise&lt;T&gt;; cell\_id: import("@holochain/client").CellId; dna\_modifiers: import("@holochain/client").DnaModifiers; name: string; }
+{ callZome: &lt;T&gt;(request: [CellZomeCallRequest](./tryorama.cellzomecallrequest.md)<!-- -->, timeout?: number) =&gt; Promise&lt;T&gt;; cell\_id: import("@holochain/client").CellId; clone\_id: string; original\_dna\_hash: Uint8Array; dna\_modifiers: import("@holochain/client").DnaModifiers; name: string; enabled: boolean; } \| { callZome: &lt;T&gt;(request: [CellZomeCallRequest](./tryorama.cellzomecallrequest.md)<!-- -->, timeout?: number) =&gt; Promise&lt;T&gt;; cell\_id: import("@holochain/client").CellId; dna\_modifiers: import("@holochain/client").DnaModifiers; name: string; }
 
 A callable cell.
 

docs/tryorama.trycpclient.setsignalhandler.md

@@ -7,7 +7,7 @@
 **Signature:**
 
 ```typescript
-setSignalHandler(port: number, signalHandler?: AppSignalCb): void;
+setSignalHandler(port: number, signalHandler?: SignalCb): void;
 ```
 
 ## Parameters
@@ -49,7 +49,7 @@ signalHandler
 
 </td><td>
 
-AppSignalCb
+SignalCb
 
 
 </td><td>

docs/tryorama.trycpconductor.on.md

@@ -9,7 +9,7 @@ Attach a signal handler.
 **Signature:**
 
 ```typescript
-on(port: number, signalHandler: AppSignalCb): void;
+on(port: number, signalHandler: SignalCb): void;
 ```
 
 ## Parameters
@@ -53,7 +53,7 @@ signalHandler
 
 </td><td>
 
-AppSignalCb
+SignalCb
 
 
 </td><td>

ts/src/local/conductor.ts

@@ -386,11 +386,13 @@ export class Conductor implements IConductor {
             installed_app_id,
             network_seed,
           };
-    logger.debug(
-      `installing app with id ${installed_app_id} for agent ${encodeHashToBase64(
-        agent_key
-      )}`
-    );
+          if (!!agent_key) {
+            logger.debug(
+              `installing app with id ${installed_app_id} for agent ${encodeHashToBase64(
+                agent_key
+              )}`
+            );
+          }
     return this.adminWs().installApp(installAppRequest);
   }
 

ts/src/trycp/conductor/conductor.ts

@@ -4,7 +4,7 @@ import {
   AgentPubKey,
   AppAuthenticationToken,
   AppBundleSource,
-  AppSignalCb,
+  SignalCb,
   AttachAppInterfaceRequest,
   CallZomeRequest,
   CallZomeRequestSigned,
@@ -332,7 +332,7 @@ export class TryCpConductor implements IConductor {
    * @param signalHandler - The signal handler to register.
    * @param port - The port of the app interface.
    */
-  on(port: number, signalHandler: AppSignalCb) {
+  on(port: number, signalHandler: SignalCb) {
     this.tryCpClient.setSignalHandler(port, signalHandler);
   }
 

ts/src/trycp/conductor/scenario.ts

@@ -1,4 +1,4 @@
-import { AgentPubKey, AppBundleSource, AppSignalCb } from "@holochain/client";
+import { AgentPubKey, AppBundleSource, SignalCb } from "@holochain/client";
 import { ChildProcessWithoutNullStreams } from "node:child_process";
 import { URL } from "url";
 import { v4 as uuidv4 } from "uuid";
@@ -49,7 +49,7 @@ export interface ClientsPlayersOptions {
   /**
    * A signal handler to be registered in conductors.
    */
-  signalHandler?: AppSignalCb;
+  signalHandler?: SignalCb;
 }
 
 /**

ts/src/trycp/trycp-client.ts

@@ -1,4 +1,4 @@
-import { AppSignalCb, CallZomeRequestSigned } from "@holochain/client";
+import { SignalCb, AppSignal, CallZomeRequestSigned } from "@holochain/client";
 import msgpack from "@msgpack/msgpack";
 import cloneDeep from "lodash/cloneDeep.js";
 import assert from "node:assert";
@@ -46,7 +46,7 @@ export class TryCpClient {
       responseReject: (reason: TryCpResponseErrorValue) => void;
     };
   };
-  private signalHandlers: Record<number, AppSignalCb | undefined>;
+  private signalHandlers: Record<number, SignalCb | undefined>;
 
   // can be set in local test cases
   bootstrapServerUrl: URL | undefined;
@@ -143,7 +143,7 @@ export class TryCpClient {
     return connectPromise;
   }
 
-  setSignalHandler(port: number, signalHandler?: AppSignalCb) {
+  setSignalHandler(port: number, signalHandler?: SignalCb) {
     this.signalHandlers[port] = signalHandler;
   }
 

ts/src/trycp/util.ts

@@ -23,15 +23,15 @@ export const deserializeTryCpResponse = (response: Uint8Array) => {
  * @param signal - The signal to deserialize.
  * @returns The deserialized signal.
  */
-export const deserializeTryCpSignal = <T>(signal: Uint8Array) => {
+export const deserializeTryCpSignal = (signal: Uint8Array) => {
   const deserializedSignal = msgpack.decode(signal);
   assertIsSignal(deserializedSignal);
   if (SignalType.App in deserializedSignal) {
     const {
-      [SignalType.App]: { cell_id, signal: payload, zome_name },
+      [SignalType.App]: { cell_id, payload: decodedPayload, zome_name },
     } = deserializedSignal;
-    const decodedPayload = msgpack.decode(payload) as T;
-    return { cell_id, payload: decodedPayload, zome_name };
+    let app_payload = { cell_id, payload: decodedPayload, zome_name };
+     return { App: app_payload } as Signal
   } else {
     throw new Error("Receiving system signals is not implemented yet");
   }

ts/src/types.ts

@@ -4,7 +4,7 @@ import type {
   AppAuthenticationToken,
   AppBundleSource,
   AppInfo,
-  AppSignalCb,
+  SignalCb,
   AppWebsocket,
   CallZomeRequest,
   CellId,
@@ -151,7 +151,7 @@ export interface AppOptions {
   /**
    * A signal handler for the conductor.
    */
-  signalHandler?: AppSignalCb;
+  signalHandler?: SignalCb;
 }
 
 /**

ts/test/local/conductor.ts

@@ -1,12 +1,12 @@
 import {
   ActionHash,
   AppBundleSource,
-  AppSignal,
-  AppSignalCb,
+  Signal,
+  SignalCb,
   CellProvisioningStrategy,
   CloneId,
   EntryHash,
-  Signal,
+  AppSignal,
   SignalType,
 } from "@holochain/client";
 import assert from "node:assert";
@@ -616,8 +616,8 @@ test("Local Conductor - create and read an entry, 2 conductors, 2 cells, 2 agent
 
 test("Local Conductor - Receive a signal", async (t) => {
   const { servicesProcess, signalingServerUrl } = await runLocalServices();
-  let signalHandler: AppSignalCb | undefined;
-  const signalReceived = new Promise<AppSignal>((resolve) => {
+  let signalHandler: SignalCb | undefined;
+  const signalReceived = new Promise<Signal>((resolve) => {
     signalHandler = (signal: Signal) => {
       assert(SignalType.App in signal);
       resolve(signal[SignalType.App]);

ts/test/local/scenario.ts

@@ -1,11 +1,11 @@
 import {
   ActionHash,
   AppBundleSource,
-  AppSignal,
-  AppSignalCb,
+  Signal,
+  SignalCb,
   AppWebsocket,
   EntryHash,
-  Signal,
+  AppSignal,
   SignalType,
 } from "@holochain/client";
 import assert from "node:assert/strict";
@@ -66,8 +66,8 @@ test("Local Scenario - runScenario - Catch error when calling a zome of an undef
 
 test("Local Scenario - runScenario - Catch error that occurs in a signal handler", async (t) => {
   await runScenario(async (scenario: Scenario) => {
-    let signalHandlerAlice: AppSignalCb | undefined;
-    const signalReceivedAlice = new Promise<AppSignal>((_, reject) => {
+    let signalHandlerAlice: SignalCb | undefined;
+    const signalReceivedAlice = new Promise<Signal>((_, reject) => {
       signalHandlerAlice = () => {
         reject();
       };
@@ -201,16 +201,16 @@ test("Local Scenario - Conductor maintains data after shutdown and restart", asy
 test("Local Scenario - Receive signals with 2 conductors", async (t) => {
   const scenario = new Scenario();
 
-  let signalHandlerAlice: AppSignalCb | undefined;
-  const signalReceivedAlice = new Promise<AppSignal>((resolve) => {
+  let signalHandlerAlice: SignalCb | undefined;
+  const signalReceivedAlice = new Promise<Signal>((resolve) => {
     signalHandlerAlice = (signal: Signal) => {
       assert(SignalType.App in signal);
       resolve(signal[SignalType.App]);
     };
   });
 
-  let signalHandlerBob: AppSignalCb | undefined;
-  const signalReceivedBob = new Promise<AppSignal>((resolve) => {
+  let signalHandlerBob: SignalCb | undefined;
+  const signalReceivedBob = new Promise<Signal>((resolve) => {
     signalHandlerBob = (signal: Signal) => {
       assert(SignalType.App in signal);
       resolve(signal[SignalType.App]);

ts/test/trycp/conductor.ts

@@ -1,6 +1,7 @@
 import {
   ActionHash,
   AppBundleSource,
+  Signal,
   AppSignal,
   CellProvisioningStrategy,
   CellType,
@@ -395,8 +396,8 @@ test("TryCP Conductor - receive a signal", async (t) => {
   const testSignal = { value: "signal" };
 
   let signalHandler;
-  const signalReceived = new Promise<AppSignal>((resolve) => {
-    signalHandler = (signal: AppSignal) => {
+  const signalReceived = new Promise<Signal>((resolve) => {
+    signalHandler = (signal: Signal) => {
       resolve(signal);
     };
   });

ts/test/trycp/scenario.ts

@@ -1,4 +1,4 @@
-import { AppSignal, AppSignalCb, EntryHash } from "@holochain/client";
+import { Signal, SignalCb, EntryHash } from "@holochain/client";
 import { URL } from "node:url";
 import test from "tape-promise/tape.js";
 import { runLocalServices } from "../../src/common.js";
@@ -152,14 +152,14 @@ test("TryCP Scenario - receive signals with 2 conductors", async (t) => {
   } = await runLocalServices());
   const client = await scenario.addClient(SERVER_URL);
 
-  let signalHandlerAlice: AppSignalCb | undefined;
-  const signalReceivedAlice = new Promise<AppSignal>((resolve) => {
+  let signalHandlerAlice: SignalCb | undefined;
+  const signalReceivedAlice = new Promise<Signal>((resolve) => {
     signalHandlerAlice = (signal) => {
       resolve(signal);
     };
   });
-  let signalHandlerBob: AppSignalCb | undefined;
-  const signalReceivedBob = new Promise<AppSignal>((resolve) => {
+  let signalHandlerBob: SignalCb | undefined;
+  const signalReceivedBob = new Promise<Signal>((resolve) => {
     signalHandlerBob = (signal) => {
       resolve(signal);
     };