@midnightntwrk/wallet-sdk-node-client 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/effect/PolkadotNodeClient.js

@@ -40,7 +40,19 @@ export class PolkadotNodeClient {
             // Disconnect immediately after loading metadata to avoid keeping the WebSocket open.
             // The health-check timer (10s interval) and timeout handler (5s interval) are cleared on disconnect.
             // Metadata and type registry remain cached in memory for subsequent on-demand connections.
-            await api.disconnect();
+            //
+            // WsProvider.disconnect() is fire-and-forget: it dispatches the close frame and returns while the socket is
+            // still CLOSING. `isConnected` only flips false once #onSocketClose fires, so returning here without waiting
+            // leaves ensureConnection() reading a stale `true`, skipping the reconnect, and sending on a dying socket.
+            // Locally the close-ack lands fast enough to hide this; against a remote node it does not.
+            await new Promise((resolve) => {
+                if (!api.isConnected) {
+                    resolve();
+                    return;
+                }
+                api.once('disconnected', () => resolve());
+                void api.disconnect();
+            });
             return api;
         }), (api) => Effect.promise(() => api.disconnect())).pipe(Effect.map((api) => new PolkadotNodeClient(config, api)));
     }
@@ -49,6 +61,8 @@ export class PolkadotNodeClient {
     }
     config;
     api;
+    /** Operations currently holding the shared connection open. */
+    #activeOperations = 0;
     constructor(config, api) {
         this.config = config;
         this.api = api;
@@ -71,10 +85,30 @@ export class PolkadotNodeClient {
             until: (value) => value,
             schedule: Schedule.spaced(this.config.reconnectionDelay),
         }), Effect.timeout(this.config.reconnectionTimeout), Effect.asVoid, Effect.mapError((timeout) => new NodeClientError.ConnectionError({
-            message: 'Could not connect within specified time range (5s)',
+            message: `Could not establish a usable connection within ${Duration.format(this.config.reconnectionTimeout)}`,
             cause: timeout,
         })));
     }
+    /** Takes a hold on the shared connection for the duration of one operation. */
+    #acquire() {
+        return pipe(this.ensureConnection(), Effect.tap(() => Effect.sync(() => {
+            this.#activeOperations += 1;
+        })));
+    }
+    /**
+     * Drops one hold, disconnecting only once the last operation finishes.
+     *
+     * The api instance is shared, so an unconditional `disconnect()` in a per-operation finalizer closes the transport
+     * out from under any operation still in flight.
+     */
+    #release() {
+        return Effect.promise(async () => {
+            this.#activeOperations = Math.max(0, this.#activeOperations - 1);
+            if (this.#activeOperations === 0) {
+                await this.api.disconnect();
+            }
+        });
+    }
     sendMidnightTransaction(serializedTransaction) {
         const outputStream = Stream.async((emit) => {
             const callUnsubscribe = () => unsubscribeP.then((thunk) => thunk());
@@ -92,10 +126,10 @@ export class PolkadotNodeClient {
             });
             return Effect.promise(callUnsubscribe);
         });
-        return pipe(Stream.fromEffect(this.ensureConnection()), Stream.flatMap(() => outputStream), Stream.ensuring(Effect.promise(() => this.api.disconnect())));
+        return pipe(Stream.fromEffect(this.#acquire()), Stream.flatMap(() => outputStream), Stream.ensuring(this.#release()));
     }
     getGenesis() {
-        return pipe(this.ensureConnection(), Effect.andThen(() => Effect.promise(() => this.api.rpc.chain.getBlock(this.api.genesisHash))), 
+        return pipe(this.#acquire(), Effect.andThen(() => Effect.promise(() => this.api.rpc.chain.getBlock(this.api.genesisHash))), 
         // https://polkadot.js.org/docs/api/cookbook/blocks/#how-do-i-view-extrinsic-information
         Effect.map(({ block }) => ({
             transactions: block.extrinsics
@@ -105,7 +139,7 @@ export class PolkadotNodeClient {
         })), Effect.mapError((error) => new NodeClientError.ConnectionError({
             message: 'Failed to retrieve genesis transactions',
             cause: error,
-        })), Effect.ensuring(Effect.promise(() => this.api.disconnect())));
+        })), Effect.ensuring(this.#release()));
     }
     #handleSubmissionResult = (serializedTransaction, emit, unsubscribe) => {
         const WithBNBlockNumber = Schema.Struct({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midnightntwrk/wallet-sdk-node-client",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,8 +33,8 @@
     }
   },
   "dependencies": {
-    "@midnightntwrk/wallet-sdk-abstractions": "3.0.0-beta.0",
-    "@midnightntwrk/wallet-sdk-utilities": "1.2.0",
+    "@midnightntwrk/wallet-sdk-abstractions": "3.0.0-beta.2",
+    "@midnightntwrk/wallet-sdk-utilities": "1.2.2-beta.0",
     "@polkadot/api": "^16.5.4",
     "@polkadot/types": "^16.5.4",
     "@polkadot/util": "^14.0.1",
@@ -43,8 +43,8 @@
     "effect": "^3.19.19"
   },
   "peerDependencies": {
-    "@midnightntwrk/ledger-v9": "1.0.0-rc.3",
-    "@midnightntwrk/wallet-sdk-prover-client": "2.0.0-beta.2"
+    "@midnightntwrk/ledger-v9": "1.0.0-rc.5",
+    "@midnightntwrk/wallet-sdk-prover-client": "2.0.0-beta.4"
   },
   "peerDependenciesMeta": {
     "@midnightntwrk/ledger-v9": {
@@ -55,18 +55,18 @@
     }
   },
   "devDependencies": {
-    "@effect/cluster": "0.59.0",
-    "@effect/experimental": "0.60.0",
-    "@effect/platform": "0.96.1",
-    "@effect/platform-node": "0.107.0",
-    "@effect/rpc": "0.75.1",
-    "@effect/sql": "0.51.1",
-    "@effect/workflow": "0.18.2",
-    "@midnightntwrk/ledger-v9": "1.0.0-rc.3",
-    "@midnightntwrk/wallet-sdk-prover-client": "^2.0.0-beta.2",
+    "@effect/cluster": "0.60.2",
+    "@effect/experimental": "0.61.1",
+    "@effect/platform": "0.97.1",
+    "@effect/platform-node": "0.108.1",
+    "@effect/rpc": "0.76.2",
+    "@effect/sql": "0.52.1",
+    "@effect/workflow": "0.19.1",
+    "@midnightntwrk/ledger-v9": "1.0.0-rc.5",
+    "@midnightntwrk/wallet-sdk-prover-client": "^2.0.0-beta.4",
     "@types/tar-stream": "3.1.4",
     "tar-stream": "3.2.0",
-    "tsx": "4.22.4"
+    "tsx": "4.23.13"
   },
   "scripts": {
     "typecheck-script": "tsc -b ./tsconfig.script.json --noEmit",