@novasamatech/host-substrate-chain-connection 0.6.18 → 0.7.0-1

package/dist/branchedProvider.d.ts

@@ -1,4 +1,4 @@
-import type { JsonRpcProvider } from '@polkadot-api/json-rpc-provider';
+import type { JsonRpcProvider } from 'polkadot-api';
 import type { BranchedProvider } from './types.js';
 type Params = {
     enhanceBranch?(branch: JsonRpcProvider): JsonRpcProvider;

package/dist/branchedProvider.spec.js

@@ -3,8 +3,10 @@ import { createBranchedProvider } from './branchedProvider.js';
 const createMockProvider = () => {
     const send = vi.fn();
     const disconnect = vi.fn();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let onMessage = null;
     const provider = cb => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         onMessage = cb;
         return { send, disconnect };
     };
@@ -12,6 +14,7 @@ const createMockProvider = () => {
         provider,
         send,
         disconnect,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         simulateMessage: (msg) => onMessage?.(msg),
     };
 };
@@ -21,8 +24,8 @@ describe('createBranchedProvider', () => {
         const branched = createBranchedProvider(mock.provider);
         const onMessage = vi.fn();
         branched.branch()(onMessage);
-        mock.simulateMessage('{"id":1}');
-        expect(onMessage).toHaveBeenCalledWith('{"id":1}');
+        mock.simulateMessage({ id: 1 });
+        expect(onMessage).toHaveBeenCalledWith({ id: 1 });
     });
     it('reuses connection for multiple branches', () => {
         const mock = createMockProvider();
@@ -39,9 +42,9 @@ describe('createBranchedProvider', () => {
         const cb2 = vi.fn();
         branched.branch()(cb1);
         branched.branch()(cb2);
-        mock.simulateMessage('{"id":1}');
-        expect(cb1).toHaveBeenCalledWith('{"id":1}');
-        expect(cb2).toHaveBeenCalledWith('{"id":1}');
+        mock.simulateMessage({ id: 1 });
+        expect(cb1).toHaveBeenCalledWith({ id: 1 });
+        expect(cb2).toHaveBeenCalledWith({ id: 1 });
     });
     it('disconnected branch stops receiving messages', () => {
         const mock = createMockProvider();
@@ -50,7 +53,7 @@ describe('createBranchedProvider', () => {
         const conn1 = branched.branch()(cb1);
         branched.branch()(vi.fn()); // keep connection alive
         conn1.disconnect();
-        mock.simulateMessage('{"id":1}');
+        mock.simulateMessage({ id: 1 });
         expect(cb1).not.toHaveBeenCalled();
     });
     it('disconnecting one branch does not affect others', () => {
@@ -60,8 +63,8 @@ describe('createBranchedProvider', () => {
         const cb2 = vi.fn();
         branched.branch()(cb2);
         conn1.disconnect();
-        mock.simulateMessage('{"id":1}');
-        expect(cb2).toHaveBeenCalledWith('{"id":1}');
+        mock.simulateMessage({ id: 1 });
+        expect(cb2).toHaveBeenCalledWith({ id: 1 });
         expect(mock.disconnect).not.toHaveBeenCalled();
     });
     it('disconnecting last branch tears down underlying connection', () => {
@@ -96,8 +99,9 @@ describe('createBranchedProvider', () => {
         const mock = createMockProvider();
         const branched = createBranchedProvider(mock.provider);
         const conn = branched.branch()(vi.fn());
-        conn.send('{"method":"test"}');
-        expect(mock.send).toHaveBeenCalledWith('{"method":"test"}');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        conn.send({ method: 'test' });
+        expect(mock.send).toHaveBeenCalledWith({ method: 'test' });
     });
     it('calls enhanceBranch for each new branch independently', () => {
         const mock = createMockProvider();

package/dist/connectionPool.d.ts

@@ -1,5 +1,4 @@
-import type { JsonRpcProvider } from '@polkadot-api/json-rpc-provider';
-import type { PolkadotClient } from 'polkadot-api';
+import type { JsonRpcProvider, PolkadotClient } from 'polkadot-api';
 import { createClient } from 'polkadot-api';
 import type { ChainConfig, ConnectionStatus } from './types.js';
 export type ChainConnectionConfig<C extends ChainConfig, T = PolkadotClient> = {

package/dist/connectionPool.js

@@ -104,9 +104,17 @@ export const createChainConnection = ({ resolve, clientOptions, createProvider,
             }
         },
         getProvider(chain) {
-            return getSyncProvider(async () => {
-                const { pooled, unlock } = await rawAcquire(chain);
-                return pooled.provider.branch(unlock);
+            return getSyncProvider(onResult => {
+                rawAcquire(chain)
+                    .then(({ pooled, unlock }) => {
+                    onResult((onMessage, _onHalt) => pooled.provider.branch(unlock)(onMessage));
+                })
+                    .catch(() => {
+                    onResult(null);
+                });
+                return () => {
+                    /* empty */
+                };
             });
         },
         status(genesisHash) {

package/dist/connectionPool.spec.js

@@ -7,11 +7,14 @@ const createMockClient = () => ({ destroy: vi.fn() });
 const createMockProvider = () => {
     const send = vi.fn();
     const disconnect = vi.fn();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let onMessage = null;
     const provider = cb => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         onMessage = cb;
         return { send, disconnect };
     };
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return { provider, send, disconnect, simulateMessage: (msg) => onMessage?.(msg) };
 };
 const testChain = (id) => ({ genesisHash: id });

package/dist/subscriptionReplayProvider.d.ts

@@ -1,2 +1,2 @@
-import type { JsonRpcProvider } from '@polkadot-api/json-rpc-provider';
+import type { JsonRpcProvider } from 'polkadot-api';
 export declare const withSubscriptionReplay: (provider: JsonRpcProvider, onReconnect: (callback: VoidFunction) => VoidFunction) => JsonRpcProvider;

package/dist/subscriptionReplayProvider.js

@@ -2,17 +2,22 @@ const isSubscribeMethod = (method) => method === 'chainHead_v1_follow' ||
     (method.toLowerCase().includes('subscribe') && !method.toLowerCase().includes('unsubscribe'));
 const isUnsubscribeMethod = (method) => method === 'chainHead_v1_unfollow' || method.toLowerCase().includes('unsubscribe');
 export const withSubscriptionReplay = (provider, onReconnect) => onMessage => {
-    // request id → raw JSON message (sent, awaiting server subscription ID)
+    // request id → request object (sent, awaiting server subscription ID)
     const pendingSubscriptions = new Map();
-    // server subscription ID → raw JSON message (confirmed by server)
+    // server subscription ID → request object (confirmed by server)
     const activeSubscriptions = new Map();
     const conn = provider(message => {
-        const parsed = JSON.parse(message);
-        if (parsed.id !== undefined && typeof parsed.result === 'string') {
-            const pending = pendingSubscriptions.get(parsed.id);
+        // Response with a string result means it's a subscription confirmation
+        if ('id' in message &&
+            message.id &&
+            !('method' in message) &&
+            'result' in message &&
+            typeof message.result === 'string') {
+            const id = message.id;
+            const pending = pendingSubscriptions.get(id);
             if (pending !== undefined) {
-                pendingSubscriptions.delete(parsed.id);
-                activeSubscriptions.set(parsed.result, { id: parsed.id, payload: pending });
+                pendingSubscriptions.delete(id);
+                activeSubscriptions.set(message.result, { id, payload: pending });
             }
         }
         onMessage(message);
@@ -27,7 +32,7 @@ export const withSubscriptionReplay = (provider, onReconnect) => onMessage => {
     });
     return {
         send(message) {
-            const { method, id, params } = JSON.parse(message);
+            const { method, id, params } = message;
             if (method) {
                 if (isSubscribeMethod(method)) {
                     if (id !== undefined)

package/dist/subscriptionReplayProvider.spec.js

@@ -3,8 +3,10 @@ import { withSubscriptionReplay } from './subscriptionReplayProvider.js';
 const createMockProvider = () => {
     const send = vi.fn();
     const disconnect = vi.fn();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let onMessage = null;
     const provider = cb => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         onMessage = cb;
         return { send, disconnect };
     };
@@ -12,6 +14,7 @@ const createMockProvider = () => {
         provider,
         send,
         disconnect,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         simulateMessage: (msg) => onMessage?.(msg),
     };
 };
@@ -30,27 +33,30 @@ const createReconnectControl = () => {
         unsubscribe,
     };
 };
+// Helper to create typed request objects
+const req = (id, method, params = []) => ({ jsonrpc: '2.0', id, method, params });
+const res = (id, result) => ({ jsonrpc: '2.0', id, result });
 describe('withSubscriptionReplay', () => {
     it('forwards all incoming messages to onMessage unmodified', () => {
         const mock = createMockProvider();
         const { onReconnect } = createReconnectControl();
         const onMessage = vi.fn();
         withSubscriptionReplay(mock.provider, onReconnect)(onMessage);
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"0xabc"}');
-        expect(onMessage).toHaveBeenCalledWith('{"jsonrpc":"2.0","id":1,"result":"0xabc"}');
+        mock.simulateMessage(res(1, '0xabc'));
+        expect(onMessage).toHaveBeenCalledWith(res(1, '0xabc'));
     });
     it('forwards send calls to the underlying provider', () => {
         const mock = createMockProvider();
         const { onReconnect } = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, onReconnect)(vi.fn());
-        conn.send('{"id":1,"method":"chain_getBlock","params":[]}');
-        expect(mock.send).toHaveBeenCalledWith('{"id":1,"method":"chain_getBlock","params":[]}');
+        conn.send(req(1, 'chain_getBlock'));
+        expect(mock.send).toHaveBeenCalledWith(req(1, 'chain_getBlock'));
     });
     it('does not replay non-subscription requests on reconnect', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        conn.send('{"id":1,"method":"chain_getBlock","params":[]}');
+        conn.send(req(1, 'chain_getBlock'));
         mock.send.mockClear();
         control.triggerReconnect();
         expect(mock.send).not.toHaveBeenCalled();
@@ -59,7 +65,7 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        conn.send('{"id":1,"method":"chain_subscribeNewHeads","params":[]}');
+        conn.send(req(1, 'chain_subscribeNewHeads'));
         // intentionally no simulateMessage — subscription not confirmed by server
         mock.send.mockClear();
         control.triggerReconnect();
@@ -69,9 +75,9 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        const subscribeMsg = '{"id":1,"method":"chain_subscribeNewHeads","params":[]}';
+        const subscribeMsg = req(1, 'chain_subscribeNewHeads');
         conn.send(subscribeMsg);
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"sub-id-1"}');
+        mock.simulateMessage(res(1, 'sub-id-1'));
         mock.send.mockClear();
         control.triggerReconnect();
         expect(mock.send).toHaveBeenCalledWith(subscribeMsg);
@@ -80,12 +86,12 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        const msg1 = '{"id":1,"method":"chain_subscribeNewHeads","params":[]}';
-        const msg2 = '{"id":2,"method":"state_subscribeStorage","params":[[]]}';
+        const msg1 = req(1, 'chain_subscribeNewHeads');
+        const msg2 = req(2, 'state_subscribeStorage', [[]]);
         conn.send(msg1);
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"sub-id-1"}');
+        mock.simulateMessage(res(1, 'sub-id-1'));
         conn.send(msg2);
-        mock.simulateMessage('{"jsonrpc":"2.0","id":2,"result":"sub-id-2"}');
+        mock.simulateMessage(res(2, 'sub-id-2'));
         mock.send.mockClear();
         control.triggerReconnect();
         expect(mock.send).toHaveBeenCalledTimes(2);
@@ -96,15 +102,15 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        const subscribeMsg = '{"id":1,"method":"chain_subscribeNewHeads","params":[]}';
+        const subscribeMsg = req(1, 'chain_subscribeNewHeads');
         conn.send(subscribeMsg);
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"old-sub-id"}');
+        mock.simulateMessage(res(1, 'old-sub-id'));
         // First reconnect — replays and moves to pending
         control.triggerReconnect();
         // Server assigns new subscription ID
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"new-sub-id"}');
+        mock.simulateMessage(res(1, 'new-sub-id'));
         // Unsubscribing with the old ID should have no effect (old ID is no longer tracked)
-        conn.send('{"id":2,"method":"chain_unsubscribeNewHeads","params":["old-sub-id"]}');
+        conn.send(req(2, 'chain_unsubscribeNewHeads', ['old-sub-id']));
         mock.send.mockClear();
         // Second reconnect — subscription is still active (new-sub-id was not removed)
         control.triggerReconnect();
@@ -114,9 +120,9 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        conn.send('{"id":1,"method":"chain_subscribeNewHeads","params":[]}');
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"sub-id-1"}');
-        conn.send('{"id":2,"method":"chain_unsubscribeNewHeads","params":["sub-id-1"]}');
+        conn.send(req(1, 'chain_subscribeNewHeads'));
+        mock.simulateMessage(res(1, 'sub-id-1'));
+        conn.send(req(2, 'chain_unsubscribeNewHeads', ['sub-id-1']));
         mock.send.mockClear();
         control.triggerReconnect();
         expect(mock.send).not.toHaveBeenCalled();
@@ -125,8 +131,8 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        conn.send('{"id":1,"method":"chain_subscribeNewHeads","params":[]}');
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"sub-id-1"}');
+        conn.send(req(1, 'chain_subscribeNewHeads'));
+        mock.simulateMessage(res(1, 'sub-id-1'));
         conn.disconnect();
         expect(mock.disconnect).toHaveBeenCalledTimes(1);
         expect(control.unsubscribe).toHaveBeenCalledTimes(1);
@@ -139,7 +145,7 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        conn.send('{"id":1,"method":"chainHead_v1_follow","params":[true]}');
+        conn.send(req(1, 'chainHead_v1_follow', [true]));
         // intentionally no simulateMessage — subscription not confirmed by server
         mock.send.mockClear();
         control.triggerReconnect();
@@ -149,9 +155,9 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        const followMsg = '{"id":1,"method":"chainHead_v1_follow","params":[true]}';
+        const followMsg = req(1, 'chainHead_v1_follow', [true]);
         conn.send(followMsg);
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"follow-sub-id"}');
+        mock.simulateMessage(res(1, 'follow-sub-id'));
         mock.send.mockClear();
         control.triggerReconnect();
         expect(mock.send).toHaveBeenCalledWith(followMsg);
@@ -160,9 +166,9 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        conn.send('{"id":1,"method":"chainHead_v1_follow","params":[true]}');
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"follow-sub-id"}');
-        conn.send('{"id":2,"method":"chainHead_v1_unfollow","params":["follow-sub-id"]}');
+        conn.send(req(1, 'chainHead_v1_follow', [true]));
+        mock.simulateMessage(res(1, 'follow-sub-id'));
+        conn.send(req(2, 'chainHead_v1_unfollow', ['follow-sub-id']));
         mock.send.mockClear();
         control.triggerReconnect();
         expect(mock.send).not.toHaveBeenCalled();
@@ -171,10 +177,10 @@ describe('withSubscriptionReplay', () => {
         const mock = createMockProvider();
         const control = createReconnectControl();
         const conn = withSubscriptionReplay(mock.provider, control.onReconnect)(vi.fn());
-        const followMsg = '{"id":1,"method":"chainHead_v1_follow","params":[true]}';
+        const followMsg = req(1, 'chainHead_v1_follow', [true]);
         conn.send(followMsg);
-        mock.simulateMessage('{"jsonrpc":"2.0","id":1,"result":"follow-sub-id"}');
-        conn.send('{"id":2,"method":"chainHead_v1_unfollow","params":["wrong-sub-id"]}');
+        mock.simulateMessage(res(1, 'follow-sub-id'));
+        conn.send(req(2, 'chainHead_v1_unfollow', ['wrong-sub-id']));
         mock.send.mockClear();
         control.triggerReconnect();
         expect(mock.send).toHaveBeenCalledWith(followMsg);

package/dist/types.d.ts

@@ -1,5 +1,4 @@
-import type { JsonRpcProvider } from '@polkadot-api/json-rpc-provider';
-import type { PolkadotClient } from 'polkadot-api';
+import type { JsonRpcProvider, PolkadotClient } from 'polkadot-api';
 export type ChainConfig = {
     genesisHash: string;
 };

package/dist/wsProvider.d.ts

@@ -1,4 +1,4 @@
-import type { JsonRpcProvider } from '@polkadot-api/json-rpc-provider';
+import type { JsonRpcProvider } from 'polkadot-api';
 import type { ConnectionStatus } from './types.js';
 export declare const createWsJsonRpcProvider: (options: {
     endpoints: string[];

package/dist/wsProvider.js

@@ -1,4 +1,4 @@
-import { WsEvent, getWsProvider } from '@polkadot-api/ws-provider';
+import { WsEvent, getWsProvider } from 'polkadot-api/ws';
 import { noop } from './helpers.js';
 import { withSubscriptionReplay } from './subscriptionReplayProvider.js';
 export const createWsJsonRpcProvider = (options) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novasamatech/host-substrate-chain-connection",
   "type": "module",
-  "version": "0.6.18",
+  "version": "0.7.0-1",
   "description": "Chain connection pool with ref counting and provider branching for Polkadot API",
   "license": "Apache-2.0",
   "repository": {
@@ -25,12 +25,10 @@
     "README.md"
   ],
   "dependencies": {
-    "@novasamatech/storage-adapter": "0.6.18",
-    "@polkadot-api/json-rpc-provider": "^0.0.4",
-    "@polkadot-api/json-rpc-provider-proxy": "^0.2.8",
-    "@polkadot-api/ws-provider": "^0.7.5",
+    "@novasamatech/storage-adapter": "0.7.0-1",
+    "@polkadot-api/json-rpc-provider-proxy": "^0.4.0",
     "nanoevents": "^9.1.0",
-    "polkadot-api": "^1.23.3"
+    "polkadot-api": ">=2"
   },
   "publishConfig": {
     "access": "public"