refactor(zome-call): set default timeout to 60 sec (#185)

* refactor: set default timeout to 60 sec

* ci: cache cargo too

* docs: update changelog

* ci cache fixture 2 builds

.github/workflows/test.yml

@@ -37,21 +37,25 @@ jobs:
         env:
           cache-name: test-zome
         with:
-          path: test/e2e/fixture/zomes/foo/target
+          path: |
+            .cargo
+            test/e2e/fixture/zomes/foo/target
+            test/e2e/fixture2/coordinator2/target
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Cargo.lock') }}
 
-      - name: Install nix packages
-        run: nix develop -c $SHELL -c "echo Nix packages installed"
-
-      - name: Install JS packages
-        run: nix develop -c $SHELL -c "npm ci"
+      - name: Build Nix packages
+        run: nix develop -c $SHELL -c "echo Nix packages built"
 
       - name: Build test fixture
         run: nix develop -c $SHELL -c "./build-fixture.sh"
 
+      - name: Install JS packages
+        run: nix develop -c $SHELL -c "npm ci"
+
       - name: Run tests
         run: nix develop -c $SHELL -c "npm t"
 
       - name: Setup tmate session if a previous step failed
         if: ${{ failure() }}
         uses: mxschmitt/action-tmate@v3
+        timeout-minutes: 10

CHANGELOG.md

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 ### Changed
+- Set default timeout for API calls to 60 seconds.
 ### Fixed
 ### Removed
 

src/api/app/websocket.ts

@@ -93,11 +93,11 @@ export class AppWebsocket extends Emittery implements AppApi {
     return appWebsocket;
   }
 
-  _requester = <ReqI, ReqO, ResI, ResO>(
+  _requester<ReqI, ReqO, ResI, ResO>(
     tag: string,
     transformer?: Transformer<ReqI, ReqO, ResI, ResO>
-  ) =>
-    requesterTransformer(
+  ) {
+    return requesterTransformer(
       (req, timeout) =>
         promiseTimeout(
           this.client.request(req),
@@ -107,6 +107,7 @@ export class AppWebsocket extends Emittery implements AppApi {
       tag,
       transformer
     );
+  }
 
   /**
    * Request the app's info, including all cell infos.

src/api/common.ts

@@ -1,7 +1,7 @@
 import { RoleName } from "../types.js";
 
 const ERROR_TYPE = "error";
-export const DEFAULT_TIMEOUT = 15000;
+export const DEFAULT_TIMEOUT = 60000;
 
 /**
  * @public

test/e2e/index.ts

@@ -565,6 +565,27 @@ test("error is catchable when holochain socket is unavailable", async (t: Test)
   }
 });
 
+test(
+  "zome call timeout can be overridden",
+  withConductor(ADMIN_PORT, async (t: Test) => {
+    const { client, admin, cell_id } = await installAppAndDna(ADMIN_PORT);
+    await admin.authorizeSigningCredentials(cell_id);
+    const zomeCallPayload: CallZomeRequest = {
+      cell_id,
+      zome_name: TEST_ZOME_NAME,
+      fn_name: "foo",
+      provenance: fakeAgentPubKey(),
+      payload: null,
+    };
+    try {
+      await client.callZome(zomeCallPayload, 1);
+      t.fail();
+    } catch (error) {
+      t.pass("zome call timed out");
+    }
+  })
+);
+
 test("can inject agents", async (t: Test) => {
   const conductor1 = await launch(ADMIN_PORT);
   const conductor2 = await launch(ADMIN_PORT_1);

test/e2e/util.ts

@@ -118,7 +118,7 @@ export const installAppAndDna = async (
   await admin.enableApp({ installed_app_id });
   // destructure to get whatever open port was assigned to the interface
   const { port: appPort } = await admin.attachAppInterface({ port: 0 });
-  const client = await AppWebsocket.connect(`ws://127.0.0.1:${appPort}`, 12000);
+  const client = await AppWebsocket.connect(`ws://127.0.0.1:${appPort}`);
   return { installed_app_id, cell_id, client, admin };
 };