@holochain/client 0.21.0-dev.1 → 0.21.0-dev.3

package/lib/api/admin/types.d.ts

@@ -976,18 +976,14 @@ export interface TransportConnectionStats {
      */
     opened_at_s: number;
     /**
-     * True if this connection has successfully upgraded to webrtc.
+     * True if this connection has successfully upgraded to a direct connection.
      */
-    is_webrtc: boolean;
+    is_direct: boolean;
 }
 /**
  * @public
  */
 export type DumpNetworkStatsResponse = ApiTransportStats;
-/**
- * @public
- */
-export type AppDumpNetworkStatsResponse = TransportStats;
 /**
  * Arguments for dumping network metrics.
  *

package/lib/api/app/types.d.ts

@@ -1,5 +1,5 @@
 import { UnsubscribeFunction } from "emittery";
-import { AgentPubKey, AppAuthenticationToken, AppInfo, CapSecret, CellId, ClonedCell, DnaHash, DnaProperties, EntryHash, FunctionName, InstalledAppId, MembraneProof, MemproofMap, NetworkSeed, Nonce256Bit, RoleName, Timestamp, Transformer, WebsocketConnectionOptions, ZomeName, PreflightRequest, SignedAction, SignedActionHashed, AppDumpNetworkStatsResponse, DumpNetworkMetricsResponse, DumpNetworkMetricsRequest } from "../../index.js";
+import { AgentPubKey, AppAuthenticationToken, AppInfo, CapSecret, CellId, ClonedCell, DnaHash, DnaProperties, EntryHash, FunctionName, InstalledAppId, MembraneProof, MemproofMap, NetworkSeed, Nonce256Bit, RoleName, Timestamp, Transformer, WebsocketConnectionOptions, ZomeName, PreflightRequest, SignedAction, SignedActionHashed, DumpNetworkMetricsResponse, DumpNetworkMetricsRequest, DumpNetworkStatsResponse } from "../../index.js";
 /**
  * @public
  */
@@ -407,7 +407,7 @@ export interface AppClient {
     appInfo(): Promise<AppInfoResponse>;
     myPubKey: AgentPubKey;
     installedAppId: InstalledAppId;
-    dumpNetworkStats(): Promise<AppDumpNetworkStatsResponse>;
+    dumpNetworkStats(): Promise<DumpNetworkStatsResponse>;
     dumpNetworkMetrics(args: DumpNetworkMetricsRequest): Promise<DumpNetworkMetricsResponse>;
     createCloneCell(args: CreateCloneCellRequest): Promise<CreateCloneCellResponse>;
     enableCloneCell(args: EnableCloneCellRequest): Promise<EnableCloneCellResponse>;

package/lib/api/app/websocket.d.ts

@@ -1,6 +1,6 @@
 import { UnsubscribeFunction } from "emittery";
 import { AgentPubKey, InstalledAppId, RoleName } from "../../types.js";
-import { AgentInfoRequest, AgentInfoResponse, PeerMetaInfoRequest, PeerMetaInfoResponse, AppInfo, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse, AppDumpNetworkStatsResponse, MemproofMap } from "../admin/index.js";
+import { AgentInfoRequest, AgentInfoResponse, PeerMetaInfoRequest, PeerMetaInfoResponse, AppInfo, DumpNetworkMetricsRequest, DumpNetworkMetricsResponse, DumpNetworkStatsResponse, MemproofMap } from "../admin/index.js";
 import { WsClient } from "../client.js";
 import { AbandonCountersigningSessionStateRequest, AppClient, AppEvents, AppWebsocketConnectionOptions, CallZomeRequest, CallZomeRequestSigned, CreateCloneCellRequest, DisableCloneCellRequest, EnableCloneCellRequest, GetCountersigningSessionStateRequest, GetCountersigningSessionStateResponse, PublishCountersigningSessionStateRequest, RoleNameCallZomeRequest, SignalCb } from "./types.js";
 /**
@@ -67,7 +67,7 @@ export declare class AppWebsocket implements AppClient {
      *
      * @returns The conductor's {@link TransportStats}.
      */
-    dumpNetworkStats(timeout?: number): Promise<AppDumpNetworkStatsResponse>;
+    dumpNetworkStats(timeout?: number): Promise<DumpNetworkStatsResponse>;
     /**
      * Request network metrics.
      *

package/lib/api/client.d.ts

@@ -23,6 +23,7 @@ export declare class WsClient extends Emittery {
     private pendingRequests;
     private index;
     private authenticationToken;
+    private reconnectPromise;
     constructor(socket: IsoWebSocket, url?: URL, options?: WsClientOptions);
     /**
      * Instance factory for creating WsClients.
@@ -53,8 +54,21 @@ export declare class WsClient extends Emittery {
     /**
      * Send requests to the connected websocket.
      *
+     * If the underlying socket is closed when this method is called, the
+     * client transparently reconnects and re-authenticates using the cached
+     * token. Transient reconnect errors are surfaced as a `ConnectionError`
+     * and the cached token is retained, so a subsequent call can retry the
+     * reconnect.
+     *
+     * If the conductor rejects the cached token during the reconnect
+     * (signalled by an immediate close after the `authenticate` handshake),
+     * the cached token is cleared and the call rejects with an
+     * `InvalidTokenError`. The consumer must rebuild the `AppWebsocket`
+     * with a fresh token; further calls on this client will reject with
+     * `WebsocketClosedError`.
+     *
      * @param request - The request to send over the websocket.
-     * @returns
+     * @returns The decoded response payload.
      */
     request<Response>(request: unknown): Promise<Response>;
     private exchange;

package/lib/api/client.js

@@ -19,6 +19,7 @@ export class WsClient extends Emittery {
     pendingRequests;
     index;
     authenticationToken;
+    reconnectPromise;
     constructor(socket, url, options) {
         super();
         this.registerMessageListener(socket);
@@ -100,8 +101,21 @@ export class WsClient extends Emittery {
     /**
      * Send requests to the connected websocket.
      *
+     * If the underlying socket is closed when this method is called, the
+     * client transparently reconnects and re-authenticates using the cached
+     * token. Transient reconnect errors are surfaced as a `ConnectionError`
+     * and the cached token is retained, so a subsequent call can retry the
+     * reconnect.
+     *
+     * If the conductor rejects the cached token during the reconnect
+     * (signalled by an immediate close after the `authenticate` handshake),
+     * the cached token is cleared and the call rejects with an
+     * `InvalidTokenError`. The consumer must rebuild the `AppWebsocket`
+     * with a fresh token; further calls on this client will reject with
+     * `WebsocketClosedError`.
+     *
      * @param request - The request to send over the websocket.
-     * @returns
+     * @returns The decoded response payload.
      */
     async request(request) {
         return this.exchange(request, this.sendMessage.bind(this));
@@ -114,7 +128,15 @@ export class WsClient extends Emittery {
             return promise;
         }
         else if (this.url && this.authenticationToken) {
-            await this.reconnectWebsocket(this.url, this.authenticationToken);
+            // Dedupe concurrent reconnect attempts. The first caller into this
+            // branch starts a single reconnect; further callers await the same
+            // promise so we never create multiple sockets in parallel.
+            if (!this.reconnectPromise) {
+                this.reconnectPromise = this.reconnectWebsocket(this.url, this.authenticationToken).finally(() => {
+                    this.reconnectPromise = undefined;
+                });
+            }
+            await this.reconnectPromise;
             this.registerMessageListener(this.socket);
             this.registerCloseListener(this.socket);
             const promise = new Promise((resolve, reject) => sendHandler(request, resolve, reject));
@@ -204,19 +226,28 @@ export class WsClient extends Emittery {
     async reconnectWebsocket(url, token) {
         return new Promise((resolve, reject) => {
             this.socket = new IsoWebSocket(url, this.options);
+            // Track whether the "open" event has fired. The invalidTokenCloseListener
+            // must only clear the token when the connection did open and the conductor
+            // then closed it quickly.
+            let openFired = false;
             // This error event never occurs in tests. Could be removed?
             this.socket.addEventListener("error", (errorEvent) => {
-                this.authenticationToken = undefined;
                 reject(new HolochainError("ConnectionError", `could not connect to Holochain Conductor API at ${url} - ${errorEvent.message}`));
             }, { once: true });
             const invalidTokenCloseListener = (closeEvent) => {
-                this.authenticationToken = undefined;
-                reject(new HolochainError("InvalidTokenError", `could not connect to ${this.url} due to an invalid app authentication token - close code ${closeEvent.code}`));
+                if (openFired) {
+                    this.authenticationToken = undefined;
+                    reject(new HolochainError("InvalidTokenError", `could not connect to ${this.url} due to an invalid app authentication token - close code ${closeEvent.code}`));
+                }
+                else {
+                    reject(new HolochainError("ConnectionError", `could not connect to Holochain Conductor API at ${url} - close code ${closeEvent.code}`));
+                }
             };
             this.socket.addEventListener("close", invalidTokenCloseListener, {
                 once: true,
             });
             this.socket.addEventListener("open", async () => {
+                openFired = true;
                 const encodedMsg = encode({
                     type: "authenticate",
                     data: encode({ token }),

package/lib/hdk/validation-receipts.d.ts

@@ -1,4 +1,4 @@
-import { AgentPubKey, DhtOpHash, Timestamp } from "../types";
+import { AgentPubKey, DhtOpHash, Timestamp } from "../types.js";
 /**
  * @public
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/client",
-  "version": "0.21.0-dev.1",
+  "version": "0.21.0-dev.3",
   "description": "A JavaScript client for the Holochain Conductor API",
   "author": "Holochain Foundation <info@holochain.org> (https://holochain.org)",
   "license": "CAL-1.0",
@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/holochain/holochain-client-js#readme",
   "engines": {
-    "node": ">=20.0.0 || >=22.0.0 || >= 24.0.0"
+    "node": ">=20.0.0"
   },
   "main": "lib/index.js",
   "module": "lib/index.js",
@@ -33,9 +33,9 @@
   "scripts": {
     "lint": "eslint --fix --ext .ts src test eslint.config.cjs",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "test:app-agent": "RUST_LOG=error RUST_BACKTRACE=1 tsx test/e2e/app-websocket.ts",
-    "test:utils": "RUST_LOG=error RUST_BACKTRACE=1 tsx test/e2e/utils.ts",
-    "test": "RUST_LOG=error RUST_BACKTRACE=1 tsx test/index.ts",
+    "test:app-agent": "RUST_LOG=error RUST_BACKTRACE=1 vitest run app-websocket",
+    "test:utils": "RUST_LOG=error RUST_BACKTRACE=1 vitest run utils",
+    "test": "RUST_LOG=error RUST_BACKTRACE=1 vitest run",
     "build:lib": "rimraf ./lib && tsc -p tsconfig.build.json",
     "build:docs": "api-extractor run --local && api-documenter markdown -i docs/temp -o docs",
     "build": "npm run build:lib && npm run build:docs",
@@ -60,7 +60,6 @@
     "@types/js-yaml": "4.0.9",
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/lodash-es": "^4.17.12",
-    "@types/tape": "^5.8.1",
     "@types/ws": "^8.18.1",
     "@typescript-eslint/eslint-plugin": "^8.48.1",
     "@typescript-eslint/parser": "^8.48.1",
@@ -68,12 +67,13 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-tsdoc": "^0.5.0",
+    "get-port": "^7.1.0",
     "globals": "^16.5.0",
     "js-yaml": "^4.1.1",
     "prettier": "^3.7.3",
     "rimraf": "^6.1.2",
-    "tape": "^5.9.0",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   }
 }