@polkadot-api/json-rpc-provider-proxy 0.2.4 → 0.2.5

package/dist/esm/get-opaque-token.mjs

@@ -0,0 +1,5 @@
+let count = 0;
+const getOpaqueToken = () => `proxyOpaque${count++}`;
+
+export { getOpaqueToken };
+//# sourceMappingURL=get-opaque-token.mjs.map

package/dist/esm/get-opaque-token.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-opaque-token.mjs","sources":["../../src/get-opaque-token.ts"],"sourcesContent":["let count = 0\nexport const getOpaqueToken = (): string => `proxyOpaque${count++}`\n"],"names":[],"mappings":"AAAA,IAAI,KAAA,GAAQ,CAAA;AACL,MAAM,cAAA,GAAiB,MAAc,CAAA,WAAA,EAAc,KAAA,EAAO,CAAA;;;;"}

package/dist/esm/get-proxy.mjs

@@ -1,18 +1,38 @@
 import { jsonRpcMsg } from './json-rpc-message.mjs';
+import { getOpaqueToken } from './get-opaque-token.mjs';
 
-const unfollowMethods = new Set(
-  ["v1", "unstable"].map((x) => `chainHead_${x}_unfollow`)
-);
+const getInternalId = () => `___proxyInternalId__${getOpaqueToken()}`;
 const getProxy = (toConsumer) => {
   let state = {
     type: 1 /* Connecting */,
+    activeBroadcasts: /* @__PURE__ */ new Map(),
     pending: []
   };
   const onMsgFromProvider = (msg) => {
+    let isActive = true;
     if (state.type === 0 /* Connected */) {
       const parsed = JSON.parse(msg);
       if ("id" in parsed) {
-        if ("result" in parsed && state.onGoingRequests.get(parsed.id)?.type === 0 /* ChainHeadFollow */)
+        const { id } = parsed;
+        if (state.pendingBroadcasts.has(id)) {
+          const synToken = state.pendingBroadcasts.get(id);
+          const upToken = parsed.result;
+          state.pendingBroadcasts.delete(id);
+          const activeBroadcast = state.activeBroadcasts.get(synToken);
+          if (activeBroadcast)
+            state.activeBroadcasts.get(synToken).upToken = upToken;
+          else
+            state.connection.send(
+              jsonRpcMsg({
+                id: getInternalId(),
+                method: "transaction_v1_stop",
+                params: [upToken]
+              })
+            );
+          return;
+        }
+        isActive = state.onGoingRequests.has(id);
+        if ("result" in parsed && state.onGoingRequests.get(id)?.type === 0 /* ChainHeadFollow */)
           state.activeChainHeads.add(parsed.result);
         state.onGoingRequests.delete(parsed.id);
       } else if ("params" in parsed) {
@@ -21,20 +41,66 @@ const getProxy = (toConsumer) => {
           state.activeChainHeads.delete(subscription);
       }
     }
-    if (state.type !== 2 /* Done */) toConsumer(msg);
+    if (isActive && state.type !== 2 /* Done */) toConsumer(msg);
   };
   const send = (msg) => {
     if (state.type === 2 /* Done */) return;
+    const parsed = JSON.parse(msg);
+    if ("id" in parsed) {
+      const { method, id, params } = parsed;
+      const [group, , methodName] = method.split("_");
+      if (group === "transaction") {
+        if (methodName === "stop") {
+          const [synToken] = params;
+          const active = state.activeBroadcasts.get(synToken);
+          state.activeBroadcasts.delete(synToken);
+          toConsumer(
+            jsonRpcMsg({
+              id,
+              result: null
+            })
+          );
+          if (state.type === 0 /* Connected */ && active && active.upToken) {
+            state.connection.send(
+              jsonRpcMsg({
+                id,
+                method,
+                params: [active.upToken]
+              })
+            );
+          }
+          return;
+        }
+        if (methodName === "broadcast") {
+          const synToken = getOpaqueToken();
+          state.activeBroadcasts.set(synToken, {
+            tx: params[0],
+            synToken
+          });
+          if (state.type === 0 /* Connected */) {
+            state.pendingBroadcasts.set(id, synToken);
+            state.connection.send(msg);
+          }
+          toConsumer(
+            jsonRpcMsg({
+              id,
+              result: synToken
+            })
+          );
+          return;
+        }
+      }
+    }
     if (state.type === 1 /* Connecting */) {
       state.pending.push(msg);
       return;
     }
-    const parsed = JSON.parse(msg);
-    if (unfollowMethods.has(parsed.method))
+    if (parsed.method === "chainHead_v1_unfollow")
       state.activeChainHeads.delete(parsed.params[0]);
     if ("id" in parsed) {
       const { method, id } = parsed;
-      const ongoingMsg = method.startsWith("chainHead") ? method.endsWith("follow") ? {
+      const [group, , methodName] = method.split("_");
+      const ongoingMsg = group === "chainHead" ? methodName === "follow" ? {
         type: 0 /* ChainHeadFollow */,
         msg
       } : { type: 1 /* ChainHeadOperation */, id } : { type: 2 /* Other */, msg };
@@ -51,12 +117,15 @@ const getProxy = (toConsumer) => {
     },
     connect: (cb) => {
       if (state.type !== 1 /* Connecting */) throw new Error("Nonesense");
-      const { pending } = state;
+      const { pending, activeBroadcasts } = state;
       const onGoingRequests = /* @__PURE__ */ new Map();
       const activeChainHeads = /* @__PURE__ */ new Set();
       const onHalt = () => {
+        const activeBroadcasts2 = state.type !== 2 /* Done */ ? state.activeBroadcasts : /* @__PURE__ */ new Map();
+        activeBroadcasts2.forEach((x) => x.upToken = void 0);
         state = {
           type: 1 /* Connecting */,
+          activeBroadcasts: activeBroadcasts2,
           pending: []
         };
         activeChainHeads.forEach((subscription) => {
@@ -89,9 +158,24 @@ const getProxy = (toConsumer) => {
       state = {
         type: 0 /* Connected */,
         connection: cb(onMsgFromProvider, onHalt),
+        activeBroadcasts,
+        pendingBroadcasts: /* @__PURE__ */ new Map(),
         onGoingRequests,
         activeChainHeads
       };
+      activeBroadcasts.forEach((broadcast) => {
+        if (state.type === 0 /* Connected */) {
+          const id = getInternalId();
+          state.pendingBroadcasts.set(id, broadcast.synToken);
+          send(
+            jsonRpcMsg({
+              id,
+              method: "transaction_v1_broadcast",
+              params: [broadcast.tx]
+            })
+          );
+        }
+      });
       pending.forEach(send);
     }
   };

package/dist/esm/get-proxy.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"get-proxy.mjs","sources":["../../src/get-proxy.ts"],"sourcesContent":["import { JsonRpcConnection } from \"@polkadot-api/json-rpc-provider\"\nimport { ReconnectableJsonRpcConnection } from \"./internal-types\"\nimport { jsonRpcMsg } from \"./json-rpc-message\"\n\nconst enum State {\n  Connected,\n  Connecting,\n  Done,\n}\n\nconst enum OngoingMsgType {\n  ChainHeadFollow,\n  ChainHeadOperation,\n  Other,\n}\ntype OngoingMsg =\n  | {\n      type: OngoingMsgType.ChainHeadFollow\n      msg: string\n    }\n  | { type: OngoingMsgType.ChainHeadOperation; id: string }\n  | { type: OngoingMsgType.Other; msg: string }\n\nconst unfollowMethods = new Set(\n  [\"v1\", \"unstable\"].map((x) => `chainHead_${x}_unfollow`),\n)\n\nexport const getProxy: ReconnectableJsonRpcConnection = (\n  toConsumer: (msg: string) => void,\n) => {\n  let state:\n    | {\n        type: State.Connected\n        connection: JsonRpcConnection\n        onGoingRequests: Map<string, OngoingMsg>\n        activeChainHeads: Set<string>\n      }\n    | { type: State.Connecting; pending: Array<string> }\n    | { type: State.Done } = {\n    type: State.Connecting,\n    pending: [],\n  }\n\n  const onMsgFromProvider = (msg: string) => {\n    if (state.type === State.Connected) {\n      const parsed = JSON.parse(msg)\n      if (\"id\" in parsed) {\n        if (\n          \"result\" in parsed &&\n          state.onGoingRequests.get(parsed.id)?.type ===\n            OngoingMsgType.ChainHeadFollow\n        )\n          state.activeChainHeads.add(parsed.result)\n        state.onGoingRequests.delete(parsed.id)\n      } else if (\"params\" in parsed) {\n        const { subscription, result } = parsed.params\n        if (result?.event === \"stop\")\n          state.activeChainHeads.delete(subscription)\n      }\n    }\n    // If the state is \"Connecting\", then these are messages\n    // sent from the `onHalt` function. So, we mus realy them\n    if (state.type !== State.Done) toConsumer(msg)\n  }\n\n  const send = (msg: string) => {\n    if (state.type === State.Done) return\n    if (state.type === State.Connecting) {\n      state.pending.push(msg)\n      return\n    }\n    const parsed = JSON.parse(msg)\n    if (unfollowMethods.has(parsed.method))\n      state.activeChainHeads.delete(parsed.params[0])\n\n    if (\"id\" in parsed) {\n      const { method, id } = parsed as { method: string; id: string }\n      const ongoingMsg: OngoingMsg = method.startsWith(\"chainHead\")\n        ? method.endsWith(\"follow\")\n          ? {\n              type: OngoingMsgType.ChainHeadFollow,\n              msg,\n            }\n          : { type: OngoingMsgType.ChainHeadOperation, id }\n        : { type: OngoingMsgType.Other, msg }\n      state.onGoingRequests.set(id, ongoingMsg)\n    }\n\n    state.connection.send(msg)\n  }\n\n  return {\n    send,\n    disconnect: () => {\n      if (state.type === State.Done) return\n      if (state.type === State.Connected) state.connection.disconnect()\n      state = { type: State.Done }\n    },\n    connect: (cb) => {\n      if (state.type !== State.Connecting) throw new Error(\"Nonesense\")\n\n      const { pending } = state\n      const onGoingRequests = new Map<string, OngoingMsg>()\n      const activeChainHeads = new Set<string>()\n      const onHalt = () => {\n        state = {\n          type: State.Connecting,\n          pending: [],\n        }\n        activeChainHeads.forEach((subscription) => {\n          // We don't send the messages directy to the consumer\n          // b/c they could have disconnected after receiving one\n          // of these messages. The `onMsgFromProvider` fn handles that\n          onMsgFromProvider(\n            jsonRpcMsg({\n              params: {\n                subscription,\n                result: {\n                  event: \"stop\",\n                  internal: true,\n                },\n              },\n            }),\n          )\n        })\n        activeChainHeads.clear()\n        for (const x of onGoingRequests.values()) {\n          if (x.type === OngoingMsgType.ChainHeadOperation)\n            onMsgFromProvider(\n              jsonRpcMsg({\n                id: x.id,\n                error: { code: -32603, message: \"Internal error\" },\n                internal: true,\n              }),\n            )\n          else send(x.msg)\n        }\n        onGoingRequests.clear()\n      }\n      state = {\n        type: State.Connected,\n        connection: cb(onMsgFromProvider, onHalt),\n        onGoingRequests,\n        activeChainHeads,\n      }\n      pending.forEach(send)\n    },\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-proxy.mjs","sources":["../../src/get-proxy.ts"],"sourcesContent":["import { JsonRpcConnection } from \"@polkadot-api/json-rpc-provider\"\nimport { ReconnectableJsonRpcConnection } from \"./internal-types\"\nimport { jsonRpcMsg } from \"./json-rpc-message\"\nimport { getOpaqueToken } from \"./get-opaque-token\"\n\nconst enum State {\n  Connected,\n  Connecting,\n  Done,\n}\n\nconst enum OngoingMsgType {\n  ChainHeadFollow,\n  ChainHeadOperation,\n  Other,\n}\ntype OngoingMsg =\n  | {\n      type: OngoingMsgType.ChainHeadFollow\n      msg: string\n    }\n  | { type: OngoingMsgType.ChainHeadOperation; id: string }\n  | { type: OngoingMsgType.Other; msg: string }\n\nconst getInternalId = () => `___proxyInternalId__${getOpaqueToken()}`\n\nexport const getProxy: ReconnectableJsonRpcConnection = (\n  toConsumer: (msg: string) => void,\n) => {\n  let state:\n    | {\n        type: State.Connected\n        connection: JsonRpcConnection\n        activeChainHeads: Set<string>\n        activeBroadcasts: Map<\n          string,\n          { tx: string; synToken: string; upToken?: string }\n        >\n        // the key is the upstream id, the value is the synthetic token\n        pendingBroadcasts: Map<string, string>\n\n        // These are requests for which their replies should be propagated downstream\n        // Therefore, the `pendingBroadcasts` won't be included in here b/c they are synthetic\n        onGoingRequests: Map<string, OngoingMsg>\n      }\n    | {\n        type: State.Connecting\n        pending: Array<string>\n        activeBroadcasts: Map<\n          string,\n          { tx: string; synToken: string; upToken?: string }\n        >\n      }\n    | { type: State.Done } = {\n    type: State.Connecting,\n    activeBroadcasts: new Map(),\n    pending: [],\n  }\n\n  const onMsgFromProvider = (msg: string) => {\n    let isActive = true\n    if (state.type === State.Connected) {\n      const parsed = JSON.parse(msg)\n      if (\"id\" in parsed) {\n        const { id } = parsed\n        if (state.pendingBroadcasts.has(id)) {\n          const synToken = state.pendingBroadcasts.get(id)!\n          const upToken = parsed.result\n          state.pendingBroadcasts.delete(id)\n          const activeBroadcast = state.activeBroadcasts.get(synToken)\n\n          if (activeBroadcast)\n            state.activeBroadcasts.get(synToken)!.upToken = upToken\n          else\n            // The consumer stopped before we got the response\n            state.connection.send(\n              jsonRpcMsg({\n                id: getInternalId(),\n                method: \"transaction_v1_stop\",\n                params: [upToken],\n              }),\n            )\n\n          return\n        }\n\n        isActive = state.onGoingRequests.has(id)\n        if (\n          \"result\" in parsed &&\n          state.onGoingRequests.get(id)?.type === OngoingMsgType.ChainHeadFollow\n        )\n          state.activeChainHeads.add(parsed.result)\n        state.onGoingRequests.delete(parsed.id)\n      } else if (\"params\" in parsed) {\n        const { subscription, result } = parsed.params\n        if (result?.event === \"stop\")\n          state.activeChainHeads.delete(subscription)\n      }\n    }\n    // If the state is \"Connecting\", then these are messages\n    // sent from the `onHalt` function. So, we mus realy them\n    if (isActive && state.type !== State.Done) toConsumer(msg)\n  }\n\n  const send = (msg: string) => {\n    if (state.type === State.Done) return\n    const parsed = JSON.parse(msg)\n\n    // Transaction methods are purely synthetic, so they must be handled separately\n    if (\"id\" in parsed) {\n      const { method, id, params } = parsed as {\n        method: string\n        id: string\n        params: string[]\n      }\n      const [group, , methodName] = method.split(\"_\")\n\n      if (group === \"transaction\") {\n        if (methodName === \"stop\") {\n          const [synToken] = params\n          const active = state.activeBroadcasts.get(synToken)\n          state.activeBroadcasts.delete(synToken)\n          toConsumer(\n            jsonRpcMsg({\n              id,\n              result: null,\n            }),\n          )\n\n          if (state.type === State.Connected && active && active.upToken) {\n            // The response from this request will be ignored later on\n            // because it won't be among the ongoing requests. so, it won't get to downstream\n            state.connection.send(\n              jsonRpcMsg({\n                id,\n                method,\n                params: [active.upToken],\n              }),\n            )\n          }\n\n          // prevents the request from being included into the ongoingRequests\n          return\n        }\n\n        if (methodName === \"broadcast\") {\n          const synToken = getOpaqueToken()\n          state.activeBroadcasts.set(synToken, {\n            tx: params[0],\n            synToken,\n          })\n\n          if (state.type === State.Connected) {\n            state.pendingBroadcasts.set(id, synToken)\n            state.connection.send(msg)\n          }\n\n          toConsumer(\n            jsonRpcMsg({\n              id,\n              result: synToken,\n            }),\n          )\n\n          // prevents the request to be tracked with the ongoingRequests\n          return\n        }\n      }\n    }\n\n    if (state.type === State.Connecting) {\n      state.pending.push(msg)\n      return\n    }\n    if (parsed.method === \"chainHead_v1_unfollow\")\n      state.activeChainHeads.delete(parsed.params[0])\n\n    if (\"id\" in parsed) {\n      const { method, id } = parsed as { method: string; id: string }\n      const [group, , methodName] = method.split(\"_\")\n\n      const ongoingMsg: OngoingMsg =\n        group === \"chainHead\"\n          ? methodName === \"follow\"\n            ? {\n                type: OngoingMsgType.ChainHeadFollow,\n                msg,\n              }\n            : { type: OngoingMsgType.ChainHeadOperation, id }\n          : { type: OngoingMsgType.Other, msg }\n      state.onGoingRequests.set(id, ongoingMsg)\n    }\n\n    state.connection.send(msg)\n  }\n\n  return {\n    send,\n    disconnect: () => {\n      if (state.type === State.Done) return\n      if (state.type === State.Connected) state.connection.disconnect()\n      state = { type: State.Done }\n    },\n    connect: (cb) => {\n      if (state.type !== State.Connecting) throw new Error(\"Nonesense\")\n\n      const { pending, activeBroadcasts } = state\n      const onGoingRequests = new Map<string, OngoingMsg>()\n      const activeChainHeads = new Set<string>()\n      const onHalt = () => {\n        const activeBroadcasts: Map<\n          string,\n          { tx: string; synToken: string; upToken?: string }\n        > = state.type !== State.Done ? state.activeBroadcasts : new Map()\n        activeBroadcasts.forEach((x) => (x.upToken = undefined))\n        state = {\n          type: State.Connecting,\n          activeBroadcasts,\n          pending: [],\n        }\n        activeChainHeads.forEach((subscription) => {\n          // We don't send the messages directy to the consumer\n          // b/c they could have disconnected after receiving one\n          // of these messages. The `onMsgFromProvider` fn handles that\n          onMsgFromProvider(\n            jsonRpcMsg({\n              params: {\n                subscription,\n                result: {\n                  event: \"stop\",\n                  internal: true,\n                },\n              },\n            }),\n          )\n        })\n        activeChainHeads.clear()\n        for (const x of onGoingRequests.values()) {\n          if (x.type === OngoingMsgType.ChainHeadOperation)\n            onMsgFromProvider(\n              jsonRpcMsg({\n                id: x.id,\n                error: { code: -32603, message: \"Internal error\" },\n                internal: true,\n              }),\n            )\n          else send(x.msg)\n        }\n        onGoingRequests.clear()\n      }\n      state = {\n        type: State.Connected,\n        connection: cb(onMsgFromProvider, onHalt),\n        activeBroadcasts,\n        pendingBroadcasts: new Map(),\n        onGoingRequests,\n        activeChainHeads,\n      }\n      activeBroadcasts.forEach((broadcast) => {\n        if (state.type === State.Connected) {\n          const id = getInternalId()\n          state.pendingBroadcasts.set(id, broadcast.synToken)\n          send(\n            jsonRpcMsg({\n              id,\n              method: \"transaction_v1_broadcast\",\n              params: [broadcast.tx],\n            }),\n          )\n        }\n      })\n      pending.forEach(send)\n    },\n  }\n}\n"],"names":["activeBroadcasts"],"mappings":"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"}

package/dist/esm/get-sync-provider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"get-sync-provider.mjs","sources":["../../src/get-sync-provider.ts"],"sourcesContent":["import type { JsonRpcProvider } from \"@polkadot-api/json-rpc-provider\"\nimport { getProxy } from \"./get-proxy\"\nimport { AsyncJsonRpcProvider } from \"./public-types\"\nimport { ConnectableJsonRpcConnection } from \"./internal-types\"\n\nexport const getSyncProvider =\n  (input: () => Promise<AsyncJsonRpcProvider>): JsonRpcProvider =>\n  (onMessage) => {\n    let proxy: ConnectableJsonRpcConnection | null = getProxy(onMessage)\n\n    const start = () => {\n      input().then(\n        (cb) => {\n          if (!proxy) {\n            try {\n              cb(\n                () => {},\n                () => {},\n              ).disconnect()\n            } catch (_) {}\n          } else\n            proxy.connect((onMsg, onHalt) =>\n              cb(onMsg, () => {\n                onHalt()\n                start()\n              }),\n            )\n        },\n        () => {\n          proxy && setTimeout(start, 0)\n        },\n      )\n    }\n\n    start()\n    return {\n      send: (msg) => {\n        proxy?.send(msg)\n      },\n      disconnect: () => {\n        proxy?.disconnect()\n        proxy = null\n      },\n    }\n  }\n"],"names":[],"mappings":";;AAKO,MAAM,eACX,GAAA,CAAC,KACD,KAAA,CAAC,SAAc,KAAA;AACb,EAAI,IAAA,KAAA,GAA6C,SAAS,SAAS,CAAA;AAEnE,EAAA,MAAM,QAAQ,MAAM;AAClB,IAAA,KAAA,EAAQ,CAAA,IAAA;AAAA,MACN,CAAC,EAAO,KAAA;AACN,QAAA,IAAI,CAAC,KAAO,EAAA;AACV,UAAI,IAAA;AACF,YAAA,EAAA;AAAA,cACE,MAAM;AAAA,eAAC;AAAA,cACP,MAAM;AAAA;AAAC,cACP,UAAW,EAAA;AAAA,mBACN,CAAG,EAAA;AAAA;AAAC,SACf;AACE,UAAM,KAAA,CAAA,OAAA;AAAA,YAAQ,CAAC,KAAA,EAAO,MACpB,KAAA,EAAA,CAAG,OAAO,MAAM;AACd,cAAO,MAAA,EAAA;AACP,cAAM,KAAA,EAAA;AAAA,aACP;AAAA,WACH;AAAA,OACJ;AAAA,MACA,MAAM;AACJ,QAAS,KAAA,IAAA,UAAA,CAAW,OAAO,CAAC,CAAA;AAAA;AAC9B,KACF;AAAA,GACF;AAEA,EAAM,KAAA,EAAA;AACN,EAAO,OAAA;AAAA,IACL,IAAA,EAAM,CAAC,GAAQ,KAAA;AACb,MAAA,KAAA,EAAO,KAAK,GAAG,CAAA;AAAA,KACjB;AAAA,IACA,YAAY,MAAM;AAChB,MAAA,KAAA,EAAO,UAAW,EAAA;AAClB,MAAQ,KAAA,GAAA,IAAA;AAAA;AACV,GACF;AACF;;;;"}
+{"version":3,"file":"get-sync-provider.mjs","sources":["../../src/get-sync-provider.ts"],"sourcesContent":["import type { JsonRpcProvider } from \"@polkadot-api/json-rpc-provider\"\nimport { getProxy } from \"./get-proxy\"\nimport { AsyncJsonRpcProvider } from \"./public-types\"\nimport { ConnectableJsonRpcConnection } from \"./internal-types\"\n\nexport const getSyncProvider =\n  (input: () => Promise<AsyncJsonRpcProvider>): JsonRpcProvider =>\n  (onMessage) => {\n    let proxy: ConnectableJsonRpcConnection | null = getProxy(onMessage)\n\n    const start = () => {\n      input().then(\n        (cb) => {\n          if (!proxy) {\n            try {\n              cb(\n                () => {},\n                () => {},\n              ).disconnect()\n            } catch (_) {}\n          } else\n            proxy.connect((onMsg, onHalt) =>\n              cb(onMsg, () => {\n                onHalt()\n                start()\n              }),\n            )\n        },\n        () => {\n          proxy && setTimeout(start, 0)\n        },\n      )\n    }\n\n    start()\n    return {\n      send: (msg) => {\n        proxy?.send(msg)\n      },\n      disconnect: () => {\n        proxy?.disconnect()\n        proxy = null\n      },\n    }\n  }\n"],"names":[],"mappings":";;AAKO,MAAM,eAAA,GACX,CAAC,KAAA,KACD,CAAC,SAAA,KAAc;AACb,EAAA,IAAI,KAAA,GAA6C,SAAS,SAAS,CAAA;AAEnE,EAAA,MAAM,QAAQ,MAAM;AAClB,IAAA,KAAA,EAAM,CAAE,IAAA;AAAA,MACN,CAAC,EAAA,KAAO;AACN,QAAA,IAAI,CAAC,KAAA,EAAO;AACV,UAAA,IAAI;AACF,YAAA,EAAA;AAAA,cACE,MAAM;AAAA,cAAC,CAAA;AAAA,cACP,MAAM;AAAA,cAAC;AAAA,cACP,UAAA,EAAW;AAAA,UACf,SAAS,CAAA,EAAG;AAAA,UAAC;AAAA,QACf,CAAA;AACE,UAAA,KAAA,CAAM,OAAA;AAAA,YAAQ,CAAC,KAAA,EAAO,MAAA,KACpB,EAAA,CAAG,OAAO,MAAM;AACd,cAAA,MAAA,EAAO;AACP,cAAA,KAAA,EAAM;AAAA,YACR,CAAC;AAAA,WACH;AAAA,MACJ,CAAA;AAAA,MACA,MAAM;AACJ,QAAA,KAAA,IAAS,UAAA,CAAW,OAAO,CAAC,CAAA;AAAA,MAC9B;AAAA,KACF;AAAA,EACF,CAAA;AAEA,EAAA,KAAA,EAAM;AACN,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,CAAC,GAAA,KAAQ;AACb,MAAA,KAAA,EAAO,KAAK,GAAG,CAAA;AAAA,IACjB,CAAA;AAAA,IACA,YAAY,MAAM;AAChB,MAAA,KAAA,EAAO,UAAA,EAAW;AAClB,MAAA,KAAA,GAAQ,IAAA;AAAA,IACV;AAAA,GACF;AACF;;;;"}

package/dist/esm/json-rpc-message.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"json-rpc-message.mjs","sources":["../../src/json-rpc-message.ts"],"sourcesContent":["export const jsonRpcMsg = <T extends {}>(msg: T) =>\n  JSON.stringify({\n    jsonrpc: \"2.0\",\n    ...msg,\n  })\n"],"names":[],"mappings":"AAAO,MAAM,UAAa,GAAA,CAAe,GACvC,KAAA,IAAA,CAAK,SAAU,CAAA;AAAA,EACb,OAAS,EAAA,KAAA;AAAA,EACT,GAAG;AACL,CAAC;;;;"}
+{"version":3,"file":"json-rpc-message.mjs","sources":["../../src/json-rpc-message.ts"],"sourcesContent":["export const jsonRpcMsg = <T extends {}>(msg: T) =>\n  JSON.stringify({\n    jsonrpc: \"2.0\",\n    ...msg,\n  })\n"],"names":[],"mappings":"AAAO,MAAM,UAAA,GAAa,CAAe,GAAA,KACvC,IAAA,CAAK,SAAA,CAAU;AAAA,EACb,OAAA,EAAS,KAAA;AAAA,EACT,GAAG;AACL,CAAC;;;;"}

package/dist/index.d.ts

@@ -4,4 +4,5 @@ type AsyncJsonRpcProvider = (onMessage: (message: string) => void, onHalt: () =>
 
 declare const getSyncProvider: (input: () => Promise<AsyncJsonRpcProvider>) => JsonRpcProvider;
 
-export { type AsyncJsonRpcProvider, getSyncProvider };
+export { getSyncProvider };
+export type { AsyncJsonRpcProvider };

package/dist/index.js

@@ -5,19 +5,41 @@ const jsonRpcMsg = (msg) => JSON.stringify({
   ...msg
 });
 
-const unfollowMethods = new Set(
-  ["v1", "unstable"].map((x) => `chainHead_${x}_unfollow`)
-);
+let count = 0;
+const getOpaqueToken = () => `proxyOpaque${count++}`;
+
+const getInternalId = () => `___proxyInternalId__${getOpaqueToken()}`;
 const getProxy = (toConsumer) => {
   let state = {
     type: 1 /* Connecting */,
+    activeBroadcasts: /* @__PURE__ */ new Map(),
     pending: []
   };
   const onMsgFromProvider = (msg) => {
+    let isActive = true;
     if (state.type === 0 /* Connected */) {
       const parsed = JSON.parse(msg);
       if ("id" in parsed) {
-        if ("result" in parsed && state.onGoingRequests.get(parsed.id)?.type === 0 /* ChainHeadFollow */)
+        const { id } = parsed;
+        if (state.pendingBroadcasts.has(id)) {
+          const synToken = state.pendingBroadcasts.get(id);
+          const upToken = parsed.result;
+          state.pendingBroadcasts.delete(id);
+          const activeBroadcast = state.activeBroadcasts.get(synToken);
+          if (activeBroadcast)
+            state.activeBroadcasts.get(synToken).upToken = upToken;
+          else
+            state.connection.send(
+              jsonRpcMsg({
+                id: getInternalId(),
+                method: "transaction_v1_stop",
+                params: [upToken]
+              })
+            );
+          return;
+        }
+        isActive = state.onGoingRequests.has(id);
+        if ("result" in parsed && state.onGoingRequests.get(id)?.type === 0 /* ChainHeadFollow */)
           state.activeChainHeads.add(parsed.result);
         state.onGoingRequests.delete(parsed.id);
       } else if ("params" in parsed) {
@@ -26,20 +48,66 @@ const getProxy = (toConsumer) => {
           state.activeChainHeads.delete(subscription);
       }
     }
-    if (state.type !== 2 /* Done */) toConsumer(msg);
+    if (isActive && state.type !== 2 /* Done */) toConsumer(msg);
   };
   const send = (msg) => {
     if (state.type === 2 /* Done */) return;
+    const parsed = JSON.parse(msg);
+    if ("id" in parsed) {
+      const { method, id, params } = parsed;
+      const [group, , methodName] = method.split("_");
+      if (group === "transaction") {
+        if (methodName === "stop") {
+          const [synToken] = params;
+          const active = state.activeBroadcasts.get(synToken);
+          state.activeBroadcasts.delete(synToken);
+          toConsumer(
+            jsonRpcMsg({
+              id,
+              result: null
+            })
+          );
+          if (state.type === 0 /* Connected */ && active && active.upToken) {
+            state.connection.send(
+              jsonRpcMsg({
+                id,
+                method,
+                params: [active.upToken]
+              })
+            );
+          }
+          return;
+        }
+        if (methodName === "broadcast") {
+          const synToken = getOpaqueToken();
+          state.activeBroadcasts.set(synToken, {
+            tx: params[0],
+            synToken
+          });
+          if (state.type === 0 /* Connected */) {
+            state.pendingBroadcasts.set(id, synToken);
+            state.connection.send(msg);
+          }
+          toConsumer(
+            jsonRpcMsg({
+              id,
+              result: synToken
+            })
+          );
+          return;
+        }
+      }
+    }
     if (state.type === 1 /* Connecting */) {
       state.pending.push(msg);
       return;
     }
-    const parsed = JSON.parse(msg);
-    if (unfollowMethods.has(parsed.method))
+    if (parsed.method === "chainHead_v1_unfollow")
       state.activeChainHeads.delete(parsed.params[0]);
     if ("id" in parsed) {
       const { method, id } = parsed;
-      const ongoingMsg = method.startsWith("chainHead") ? method.endsWith("follow") ? {
+      const [group, , methodName] = method.split("_");
+      const ongoingMsg = group === "chainHead" ? methodName === "follow" ? {
         type: 0 /* ChainHeadFollow */,
         msg
       } : { type: 1 /* ChainHeadOperation */, id } : { type: 2 /* Other */, msg };
@@ -56,12 +124,15 @@ const getProxy = (toConsumer) => {
     },
     connect: (cb) => {
       if (state.type !== 1 /* Connecting */) throw new Error("Nonesense");
-      const { pending } = state;
+      const { pending, activeBroadcasts } = state;
       const onGoingRequests = /* @__PURE__ */ new Map();
       const activeChainHeads = /* @__PURE__ */ new Set();
       const onHalt = () => {
+        const activeBroadcasts2 = state.type !== 2 /* Done */ ? state.activeBroadcasts : /* @__PURE__ */ new Map();
+        activeBroadcasts2.forEach((x) => x.upToken = void 0);
         state = {
           type: 1 /* Connecting */,
+          activeBroadcasts: activeBroadcasts2,
           pending: []
         };
         activeChainHeads.forEach((subscription) => {
@@ -94,9 +165,24 @@ const getProxy = (toConsumer) => {
       state = {
         type: 0 /* Connected */,
         connection: cb(onMsgFromProvider, onHalt),
+        activeBroadcasts,
+        pendingBroadcasts: /* @__PURE__ */ new Map(),
         onGoingRequests,
         activeChainHeads
       };
+      activeBroadcasts.forEach((broadcast) => {
+        if (state.type === 0 /* Connected */) {
+          const id = getInternalId();
+          state.pendingBroadcasts.set(id, broadcast.synToken);
+          send(
+            jsonRpcMsg({
+              id,
+              method: "transaction_v1_broadcast",
+              params: [broadcast.tx]
+            })
+          );
+        }
+      });
       pending.forEach(send);
     }
   };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/json-rpc-message.ts","../src/get-proxy.ts","../src/get-sync-provider.ts"],"sourcesContent":["export const jsonRpcMsg = <T extends {}>(msg: T) =>\n  JSON.stringify({\n    jsonrpc: \"2.0\",\n    ...msg,\n  })\n","import { JsonRpcConnection } from \"@polkadot-api/json-rpc-provider\"\nimport { ReconnectableJsonRpcConnection } from \"./internal-types\"\nimport { jsonRpcMsg } from \"./json-rpc-message\"\n\nconst enum State {\n  Connected,\n  Connecting,\n  Done,\n}\n\nconst enum OngoingMsgType {\n  ChainHeadFollow,\n  ChainHeadOperation,\n  Other,\n}\ntype OngoingMsg =\n  | {\n      type: OngoingMsgType.ChainHeadFollow\n      msg: string\n    }\n  | { type: OngoingMsgType.ChainHeadOperation; id: string }\n  | { type: OngoingMsgType.Other; msg: string }\n\nconst unfollowMethods = new Set(\n  [\"v1\", \"unstable\"].map((x) => `chainHead_${x}_unfollow`),\n)\n\nexport const getProxy: ReconnectableJsonRpcConnection = (\n  toConsumer: (msg: string) => void,\n) => {\n  let state:\n    | {\n        type: State.Connected\n        connection: JsonRpcConnection\n        onGoingRequests: Map<string, OngoingMsg>\n        activeChainHeads: Set<string>\n      }\n    | { type: State.Connecting; pending: Array<string> }\n    | { type: State.Done } = {\n    type: State.Connecting,\n    pending: [],\n  }\n\n  const onMsgFromProvider = (msg: string) => {\n    if (state.type === State.Connected) {\n      const parsed = JSON.parse(msg)\n      if (\"id\" in parsed) {\n        if (\n          \"result\" in parsed &&\n          state.onGoingRequests.get(parsed.id)?.type ===\n            OngoingMsgType.ChainHeadFollow\n        )\n          state.activeChainHeads.add(parsed.result)\n        state.onGoingRequests.delete(parsed.id)\n      } else if (\"params\" in parsed) {\n        const { subscription, result } = parsed.params\n        if (result?.event === \"stop\")\n          state.activeChainHeads.delete(subscription)\n      }\n    }\n    // If the state is \"Connecting\", then these are messages\n    // sent from the `onHalt` function. So, we mus realy them\n    if (state.type !== State.Done) toConsumer(msg)\n  }\n\n  const send = (msg: string) => {\n    if (state.type === State.Done) return\n    if (state.type === State.Connecting) {\n      state.pending.push(msg)\n      return\n    }\n    const parsed = JSON.parse(msg)\n    if (unfollowMethods.has(parsed.method))\n      state.activeChainHeads.delete(parsed.params[0])\n\n    if (\"id\" in parsed) {\n      const { method, id } = parsed as { method: string; id: string }\n      const ongoingMsg: OngoingMsg = method.startsWith(\"chainHead\")\n        ? method.endsWith(\"follow\")\n          ? {\n              type: OngoingMsgType.ChainHeadFollow,\n              msg,\n            }\n          : { type: OngoingMsgType.ChainHeadOperation, id }\n        : { type: OngoingMsgType.Other, msg }\n      state.onGoingRequests.set(id, ongoingMsg)\n    }\n\n    state.connection.send(msg)\n  }\n\n  return {\n    send,\n    disconnect: () => {\n      if (state.type === State.Done) return\n      if (state.type === State.Connected) state.connection.disconnect()\n      state = { type: State.Done }\n    },\n    connect: (cb) => {\n      if (state.type !== State.Connecting) throw new Error(\"Nonesense\")\n\n      const { pending } = state\n      const onGoingRequests = new Map<string, OngoingMsg>()\n      const activeChainHeads = new Set<string>()\n      const onHalt = () => {\n        state = {\n          type: State.Connecting,\n          pending: [],\n        }\n        activeChainHeads.forEach((subscription) => {\n          // We don't send the messages directy to the consumer\n          // b/c they could have disconnected after receiving one\n          // of these messages. The `onMsgFromProvider` fn handles that\n          onMsgFromProvider(\n            jsonRpcMsg({\n              params: {\n                subscription,\n                result: {\n                  event: \"stop\",\n                  internal: true,\n                },\n              },\n            }),\n          )\n        })\n        activeChainHeads.clear()\n        for (const x of onGoingRequests.values()) {\n          if (x.type === OngoingMsgType.ChainHeadOperation)\n            onMsgFromProvider(\n              jsonRpcMsg({\n                id: x.id,\n                error: { code: -32603, message: \"Internal error\" },\n                internal: true,\n              }),\n            )\n          else send(x.msg)\n        }\n        onGoingRequests.clear()\n      }\n      state = {\n        type: State.Connected,\n        connection: cb(onMsgFromProvider, onHalt),\n        onGoingRequests,\n        activeChainHeads,\n      }\n      pending.forEach(send)\n    },\n  }\n}\n","import type { JsonRpcProvider } from \"@polkadot-api/json-rpc-provider\"\nimport { getProxy } from \"./get-proxy\"\nimport { AsyncJsonRpcProvider } from \"./public-types\"\nimport { ConnectableJsonRpcConnection } from \"./internal-types\"\n\nexport const getSyncProvider =\n  (input: () => Promise<AsyncJsonRpcProvider>): JsonRpcProvider =>\n  (onMessage) => {\n    let proxy: ConnectableJsonRpcConnection | null = getProxy(onMessage)\n\n    const start = () => {\n      input().then(\n        (cb) => {\n          if (!proxy) {\n            try {\n              cb(\n                () => {},\n                () => {},\n              ).disconnect()\n            } catch (_) {}\n          } else\n            proxy.connect((onMsg, onHalt) =>\n              cb(onMsg, () => {\n                onHalt()\n                start()\n              }),\n            )\n        },\n        () => {\n          proxy && setTimeout(start, 0)\n        },\n      )\n    }\n\n    start()\n    return {\n      send: (msg) => {\n        proxy?.send(msg)\n      },\n      disconnect: () => {\n        proxy?.disconnect()\n        proxy = null\n      },\n    }\n  }\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../src/json-rpc-message.ts","../src/get-opaque-token.ts","../src/get-proxy.ts","../src/get-sync-provider.ts"],"sourcesContent":["export const jsonRpcMsg = <T extends {}>(msg: T) =>\n  JSON.stringify({\n    jsonrpc: \"2.0\",\n    ...msg,\n  })\n","let count = 0\nexport const getOpaqueToken = (): string => `proxyOpaque${count++}`\n","import { JsonRpcConnection } from \"@polkadot-api/json-rpc-provider\"\nimport { ReconnectableJsonRpcConnection } from \"./internal-types\"\nimport { jsonRpcMsg } from \"./json-rpc-message\"\nimport { getOpaqueToken } from \"./get-opaque-token\"\n\nconst enum State {\n  Connected,\n  Connecting,\n  Done,\n}\n\nconst enum OngoingMsgType {\n  ChainHeadFollow,\n  ChainHeadOperation,\n  Other,\n}\ntype OngoingMsg =\n  | {\n      type: OngoingMsgType.ChainHeadFollow\n      msg: string\n    }\n  | { type: OngoingMsgType.ChainHeadOperation; id: string }\n  | { type: OngoingMsgType.Other; msg: string }\n\nconst getInternalId = () => `___proxyInternalId__${getOpaqueToken()}`\n\nexport const getProxy: ReconnectableJsonRpcConnection = (\n  toConsumer: (msg: string) => void,\n) => {\n  let state:\n    | {\n        type: State.Connected\n        connection: JsonRpcConnection\n        activeChainHeads: Set<string>\n        activeBroadcasts: Map<\n          string,\n          { tx: string; synToken: string; upToken?: string }\n        >\n        // the key is the upstream id, the value is the synthetic token\n        pendingBroadcasts: Map<string, string>\n\n        // These are requests for which their replies should be propagated downstream\n        // Therefore, the `pendingBroadcasts` won't be included in here b/c they are synthetic\n        onGoingRequests: Map<string, OngoingMsg>\n      }\n    | {\n        type: State.Connecting\n        pending: Array<string>\n        activeBroadcasts: Map<\n          string,\n          { tx: string; synToken: string; upToken?: string }\n        >\n      }\n    | { type: State.Done } = {\n    type: State.Connecting,\n    activeBroadcasts: new Map(),\n    pending: [],\n  }\n\n  const onMsgFromProvider = (msg: string) => {\n    let isActive = true\n    if (state.type === State.Connected) {\n      const parsed = JSON.parse(msg)\n      if (\"id\" in parsed) {\n        const { id } = parsed\n        if (state.pendingBroadcasts.has(id)) {\n          const synToken = state.pendingBroadcasts.get(id)!\n          const upToken = parsed.result\n          state.pendingBroadcasts.delete(id)\n          const activeBroadcast = state.activeBroadcasts.get(synToken)\n\n          if (activeBroadcast)\n            state.activeBroadcasts.get(synToken)!.upToken = upToken\n          else\n            // The consumer stopped before we got the response\n            state.connection.send(\n              jsonRpcMsg({\n                id: getInternalId(),\n                method: \"transaction_v1_stop\",\n                params: [upToken],\n              }),\n            )\n\n          return\n        }\n\n        isActive = state.onGoingRequests.has(id)\n        if (\n          \"result\" in parsed &&\n          state.onGoingRequests.get(id)?.type === OngoingMsgType.ChainHeadFollow\n        )\n          state.activeChainHeads.add(parsed.result)\n        state.onGoingRequests.delete(parsed.id)\n      } else if (\"params\" in parsed) {\n        const { subscription, result } = parsed.params\n        if (result?.event === \"stop\")\n          state.activeChainHeads.delete(subscription)\n      }\n    }\n    // If the state is \"Connecting\", then these are messages\n    // sent from the `onHalt` function. So, we mus realy them\n    if (isActive && state.type !== State.Done) toConsumer(msg)\n  }\n\n  const send = (msg: string) => {\n    if (state.type === State.Done) return\n    const parsed = JSON.parse(msg)\n\n    // Transaction methods are purely synthetic, so they must be handled separately\n    if (\"id\" in parsed) {\n      const { method, id, params } = parsed as {\n        method: string\n        id: string\n        params: string[]\n      }\n      const [group, , methodName] = method.split(\"_\")\n\n      if (group === \"transaction\") {\n        if (methodName === \"stop\") {\n          const [synToken] = params\n          const active = state.activeBroadcasts.get(synToken)\n          state.activeBroadcasts.delete(synToken)\n          toConsumer(\n            jsonRpcMsg({\n              id,\n              result: null,\n            }),\n          )\n\n          if (state.type === State.Connected && active && active.upToken) {\n            // The response from this request will be ignored later on\n            // because it won't be among the ongoing requests. so, it won't get to downstream\n            state.connection.send(\n              jsonRpcMsg({\n                id,\n                method,\n                params: [active.upToken],\n              }),\n            )\n          }\n\n          // prevents the request from being included into the ongoingRequests\n          return\n        }\n\n        if (methodName === \"broadcast\") {\n          const synToken = getOpaqueToken()\n          state.activeBroadcasts.set(synToken, {\n            tx: params[0],\n            synToken,\n          })\n\n          if (state.type === State.Connected) {\n            state.pendingBroadcasts.set(id, synToken)\n            state.connection.send(msg)\n          }\n\n          toConsumer(\n            jsonRpcMsg({\n              id,\n              result: synToken,\n            }),\n          )\n\n          // prevents the request to be tracked with the ongoingRequests\n          return\n        }\n      }\n    }\n\n    if (state.type === State.Connecting) {\n      state.pending.push(msg)\n      return\n    }\n    if (parsed.method === \"chainHead_v1_unfollow\")\n      state.activeChainHeads.delete(parsed.params[0])\n\n    if (\"id\" in parsed) {\n      const { method, id } = parsed as { method: string; id: string }\n      const [group, , methodName] = method.split(\"_\")\n\n      const ongoingMsg: OngoingMsg =\n        group === \"chainHead\"\n          ? methodName === \"follow\"\n            ? {\n                type: OngoingMsgType.ChainHeadFollow,\n                msg,\n              }\n            : { type: OngoingMsgType.ChainHeadOperation, id }\n          : { type: OngoingMsgType.Other, msg }\n      state.onGoingRequests.set(id, ongoingMsg)\n    }\n\n    state.connection.send(msg)\n  }\n\n  return {\n    send,\n    disconnect: () => {\n      if (state.type === State.Done) return\n      if (state.type === State.Connected) state.connection.disconnect()\n      state = { type: State.Done }\n    },\n    connect: (cb) => {\n      if (state.type !== State.Connecting) throw new Error(\"Nonesense\")\n\n      const { pending, activeBroadcasts } = state\n      const onGoingRequests = new Map<string, OngoingMsg>()\n      const activeChainHeads = new Set<string>()\n      const onHalt = () => {\n        const activeBroadcasts: Map<\n          string,\n          { tx: string; synToken: string; upToken?: string }\n        > = state.type !== State.Done ? state.activeBroadcasts : new Map()\n        activeBroadcasts.forEach((x) => (x.upToken = undefined))\n        state = {\n          type: State.Connecting,\n          activeBroadcasts,\n          pending: [],\n        }\n        activeChainHeads.forEach((subscription) => {\n          // We don't send the messages directy to the consumer\n          // b/c they could have disconnected after receiving one\n          // of these messages. The `onMsgFromProvider` fn handles that\n          onMsgFromProvider(\n            jsonRpcMsg({\n              params: {\n                subscription,\n                result: {\n                  event: \"stop\",\n                  internal: true,\n                },\n              },\n            }),\n          )\n        })\n        activeChainHeads.clear()\n        for (const x of onGoingRequests.values()) {\n          if (x.type === OngoingMsgType.ChainHeadOperation)\n            onMsgFromProvider(\n              jsonRpcMsg({\n                id: x.id,\n                error: { code: -32603, message: \"Internal error\" },\n                internal: true,\n              }),\n            )\n          else send(x.msg)\n        }\n        onGoingRequests.clear()\n      }\n      state = {\n        type: State.Connected,\n        connection: cb(onMsgFromProvider, onHalt),\n        activeBroadcasts,\n        pendingBroadcasts: new Map(),\n        onGoingRequests,\n        activeChainHeads,\n      }\n      activeBroadcasts.forEach((broadcast) => {\n        if (state.type === State.Connected) {\n          const id = getInternalId()\n          state.pendingBroadcasts.set(id, broadcast.synToken)\n          send(\n            jsonRpcMsg({\n              id,\n              method: \"transaction_v1_broadcast\",\n              params: [broadcast.tx],\n            }),\n          )\n        }\n      })\n      pending.forEach(send)\n    },\n  }\n}\n","import type { JsonRpcProvider } from \"@polkadot-api/json-rpc-provider\"\nimport { getProxy } from \"./get-proxy\"\nimport { AsyncJsonRpcProvider } from \"./public-types\"\nimport { ConnectableJsonRpcConnection } from \"./internal-types\"\n\nexport const getSyncProvider =\n  (input: () => Promise<AsyncJsonRpcProvider>): JsonRpcProvider =>\n  (onMessage) => {\n    let proxy: ConnectableJsonRpcConnection | null = getProxy(onMessage)\n\n    const start = () => {\n      input().then(\n        (cb) => {\n          if (!proxy) {\n            try {\n              cb(\n                () => {},\n                () => {},\n              ).disconnect()\n            } catch (_) {}\n          } else\n            proxy.connect((onMsg, onHalt) =>\n              cb(onMsg, () => {\n                onHalt()\n                start()\n              }),\n            )\n        },\n        () => {\n          proxy && setTimeout(start, 0)\n        },\n      )\n    }\n\n    start()\n    return {\n      send: (msg) => {\n        proxy?.send(msg)\n      },\n      disconnect: () => {\n        proxy?.disconnect()\n        proxy = null\n      },\n    }\n  }\n"],"names":["activeBroadcasts"],"mappings":";;AAAO,MAAM,UAAA,GAAa,CAAe,GAAA,KACvC,IAAA,CAAK,SAAA,CAAU;AAAA,EACb,OAAA,EAAS,KAAA;AAAA,EACT,GAAG;AACL,CAAC,CAAA;;ACJH,IAAI,KAAA,GAAQ,CAAA;AACL,MAAM,cAAA,GAAiB,MAAc,CAAA,WAAA,EAAc,KAAA,EAAO,CAAA,CAAA;;ACuBjE,MAAM,aAAA,GAAgB,MAAM,CAAA,oBAAA,EAAuB,cAAA,EAAgB,CAAA,CAAA;AAE5D,MAAM,QAAA,GAA2C,CACtD,UAAA,KACG;AACH,EAAA,IAAI,KAAA,GAwBuB;AAAA,IACzB,IAAA,EAAM,CAAA;AAAA,IACN,gBAAA,sBAAsB,GAAA,EAAI;AAAA,IAC1B,SAAS;AAAC,GACZ;AAEA,EAAA,MAAM,iBAAA,GAAoB,CAAC,GAAA,KAAgB;AACzC,IAAA,IAAI,QAAA,GAAW,IAAA;AACf,IAAA,IAAI,KAAA,CAAM,SAAS,CAAA,kBAAiB;AAClC,MAAA,MAAM,MAAA,GAAS,IAAA,CAAK,KAAA,CAAM,GAAG,CAAA;AAC7B,MAAA,IAAI,QAAQ,MAAA,EAAQ;AAClB,QAAA,MAAM,EAAE,IAAG,GAAI,MAAA;AACf,QAAA,IAAI,KAAA,CAAM,iBAAA,CAAkB,GAAA,CAAI,EAAE,CAAA,EAAG;AACnC,UAAA,MAAM,QAAA,GAAW,KAAA,CAAM,iBAAA,CAAkB,GAAA,CAAI,EAAE,CAAA;AAC/C,UAAA,MAAM,UAAU,MAAA,CAAO,MAAA;AACvB,UAAA,KAAA,CAAM,iBAAA,CAAkB,OAAO,EAAE,CAAA;AACjC,UAAA,MAAM,eAAA,GAAkB,KAAA,CAAM,gBAAA,CAAiB,GAAA,CAAI,QAAQ,CAAA;AAE3D,UAAA,IAAI,eAAA;AACF,YAAA,KAAA,CAAM,gBAAA,CAAiB,GAAA,CAAI,QAAQ,CAAA,CAAG,OAAA,GAAU,OAAA;AAAA;AAGhD,YAAA,KAAA,CAAM,UAAA,CAAW,IAAA;AAAA,cACf,UAAA,CAAW;AAAA,gBACT,IAAI,aAAA,EAAc;AAAA,gBAClB,MAAA,EAAQ,qBAAA;AAAA,gBACR,MAAA,EAAQ,CAAC,OAAO;AAAA,eACjB;AAAA,aACH;AAEF,UAAA;AAAA,QACF;AAEA,QAAA,QAAA,GAAW,KAAA,CAAM,eAAA,CAAgB,GAAA,CAAI,EAAE,CAAA;AACvC,QAAA,IACE,YAAY,MAAA,IACZ,KAAA,CAAM,gBAAgB,GAAA,CAAI,EAAE,GAAG,IAAA,KAAS,CAAA;AAExC,UAAA,KAAA,CAAM,gBAAA,CAAiB,GAAA,CAAI,MAAA,CAAO,MAAM,CAAA;AAC1C,QAAA,KAAA,CAAM,eAAA,CAAgB,MAAA,CAAO,MAAA,CAAO,EAAE,CAAA;AAAA,MACxC,CAAA,MAAA,IAAW,YAAY,MAAA,EAAQ;AAC7B,QAAA,MAAM,EAAE,YAAA,EAAc,MAAA,EAAO,GAAI,MAAA,CAAO,MAAA;AACxC,QAAA,IAAI,QAAQ,KAAA,KAAU,MAAA;AACpB,UAAA,KAAA,CAAM,gBAAA,CAAiB,OAAO,YAAY,CAAA;AAAA,MAC9C;AAAA,IACF;AAGA,IAAA,IAAI,QAAA,IAAY,KAAA,CAAM,IAAA,KAAS,CAAA,wBAAuB,GAAG,CAAA;AAAA,EAC3D,CAAA;AAEA,EAAA,MAAM,IAAA,GAAO,CAAC,GAAA,KAAgB;AAC5B,IAAA,IAAI,KAAA,CAAM,SAAS,CAAA,aAAY;AAC/B,IAAA,MAAM,MAAA,GAAS,IAAA,CAAK,KAAA,CAAM,GAAG,CAAA;AAG7B,IAAA,IAAI,QAAQ,MAAA,EAAQ;AAClB,MAAA,MAAM,EAAE,MAAA,EAAQ,EAAA,EAAI,MAAA,EAAO,GAAI,MAAA;AAK/B,MAAA,MAAM,CAAC,KAAA,IAAS,UAAU,CAAA,GAAI,MAAA,CAAO,MAAM,GAAG,CAAA;AAE9C,MAAA,IAAI,UAAU,aAAA,EAAe;AAC3B,QAAA,IAAI,eAAe,MAAA,EAAQ;AACzB,UAAA,MAAM,CAAC,QAAQ,CAAA,GAAI,MAAA;AACnB,UAAA,MAAM,MAAA,GAAS,KAAA,CAAM,gBAAA,CAAiB,GAAA,CAAI,QAAQ,CAAA;AAClD,UAAA,KAAA,CAAM,gBAAA,CAAiB,OAAO,QAAQ,CAAA;AACtC,UAAA,UAAA;AAAA,YACE,UAAA,CAAW;AAAA,cACT,EAAA;AAAA,cACA,MAAA,EAAQ;AAAA,aACT;AAAA,WACH;AAEA,UAAA,IAAI,KAAA,CAAM,IAAA,KAAS,CAAA,oBAAmB,MAAA,IAAU,OAAO,OAAA,EAAS;AAG9D,YAAA,KAAA,CAAM,UAAA,CAAW,IAAA;AAAA,cACf,UAAA,CAAW;AAAA,gBACT,EAAA;AAAA,gBACA,MAAA;AAAA,gBACA,MAAA,EAAQ,CAAC,MAAA,CAAO,OAAO;AAAA,eACxB;AAAA,aACH;AAAA,UACF;AAGA,UAAA;AAAA,QACF;AAEA,QAAA,IAAI,eAAe,WAAA,EAAa;AAC9B,UAAA,MAAM,WAAW,cAAA,EAAe;AAChC,UAAA,KAAA,CAAM,gBAAA,CAAiB,IAAI,QAAA,EAAU;AAAA,YACnC,EAAA,EAAI,OAAO,CAAC,CAAA;AAAA,YACZ;AAAA,WACD,CAAA;AAED,UAAA,IAAI,KAAA,CAAM,SAAS,CAAA,kBAAiB;AAClC,YAAA,KAAA,CAAM,iBAAA,CAAkB,GAAA,CAAI,EAAA,EAAI,QAAQ,CAAA;AACxC,YAAA,KAAA,CAAM,UAAA,CAAW,KAAK,GAAG,CAAA;AAAA,UAC3B;AAEA,UAAA,UAAA;AAAA,YACE,UAAA,CAAW;AAAA,cACT,EAAA;AAAA,cACA,MAAA,EAAQ;AAAA,aACT;AAAA,WACH;AAGA,UAAA;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,IAAA,IAAI,KAAA,CAAM,SAAS,CAAA,mBAAkB;AACnC,MAAA,KAAA,CAAM,OAAA,CAAQ,KAAK,GAAG,CAAA;AACtB,MAAA;AAAA,IACF;AACA,IAAA,IAAI,OAAO,MAAA,KAAW,uBAAA;AACpB,MAAA,KAAA,CAAM,gBAAA,CAAiB,MAAA,CAAO,MAAA,CAAO,MAAA,CAAO,CAAC,CAAC,CAAA;AAEhD,IAAA,IAAI,QAAQ,MAAA,EAAQ;AAClB,MAAA,MAAM,EAAE,MAAA,EAAQ,EAAA,EAAG,GAAI,MAAA;AACvB,MAAA,MAAM,CAAC,KAAA,IAAS,UAAU,CAAA,GAAI,MAAA,CAAO,MAAM,GAAG,CAAA;AAE9C,MAAA,MAAM,UAAA,GACJ,KAAA,KAAU,WAAA,GACN,UAAA,KAAe,QAAA,GACb;AAAA,QACE,IAAA,EAAM,CAAA;AAAA,QACN;AAAA,OACF,GACA,EAAE,IAAA,EAAM,CAAA,2BAAmC,IAAG,GAChD,EAAE,IAAA,EAAM,CAAA,cAAsB,GAAA,EAAI;AACxC,MAAA,KAAA,CAAM,eAAA,CAAgB,GAAA,CAAI,EAAA,EAAI,UAAU,CAAA;AAAA,IAC1C;AAEA,IAAA,KAAA,CAAM,UAAA,CAAW,KAAK,GAAG,CAAA;AAAA,EAC3B,CAAA;AAEA,EAAA,OAAO;AAAA,IACL,IAAA;AAAA,IACA,YAAY,MAAM;AAChB,MAAA,IAAI,KAAA,CAAM,SAAS,CAAA,aAAY;AAC/B,MAAA,IAAI,KAAA,CAAM,IAAA,KAAS,CAAA,kBAAiB,KAAA,CAAM,WAAW,UAAA,EAAW;AAChE,MAAA,KAAA,GAAQ,EAAE,MAAM,CAAA,aAAW;AAAA,IAC7B,CAAA;AAAA,IACA,OAAA,EAAS,CAAC,EAAA,KAAO;AACf,MAAA,IAAI,MAAM,IAAA,KAAS,CAAA,mBAAkB,MAAM,IAAI,MAAM,WAAW,CAAA;AAEhE,MAAA,MAAM,EAAE,OAAA,EAAS,gBAAA,EAAiB,GAAI,KAAA;AACtC,MAAA,MAAM,eAAA,uBAAsB,GAAA,EAAwB;AACpD,MAAA,MAAM,gBAAA,uBAAuB,GAAA,EAAY;AACzC,MAAA,MAAM,SAAS,MAAM;AACnB,QAAA,MAAMA,oBAGF,KAAA,CAAM,IAAA,KAAS,eAAa,KAAA,CAAM,gBAAA,uBAAuB,GAAA,EAAI;AACjE,QAAAA,kBAAiB,OAAA,CAAQ,CAAC,CAAA,KAAO,CAAA,CAAE,UAAU,MAAU,CAAA;AACvD,QAAA,KAAA,GAAQ;AAAA,UACN,IAAA,EAAM,CAAA;AAAA,UACN,gBAAA,EAAAA,iBAAAA;AAAA,UACA,SAAS;AAAC,SACZ;AACA,QAAA,gBAAA,CAAiB,OAAA,CAAQ,CAAC,YAAA,KAAiB;AAIzC,UAAA,iBAAA;AAAA,YACE,UAAA,CAAW;AAAA,cACT,MAAA,EAAQ;AAAA,gBACN,YAAA;AAAA,gBACA,MAAA,EAAQ;AAAA,kBACN,KAAA,EAAO,MAAA;AAAA,kBACP,QAAA,EAAU;AAAA;AACZ;AACF,aACD;AAAA,WACH;AAAA,QACF,CAAC,CAAA;AACD,QAAA,gBAAA,CAAiB,KAAA,EAAM;AACvB,QAAA,KAAA,MAAW,CAAA,IAAK,eAAA,CAAgB,MAAA,EAAO,EAAG;AACxC,UAAA,IAAI,EAAE,IAAA,KAAS,CAAA;AACb,YAAA,iBAAA;AAAA,cACE,UAAA,CAAW;AAAA,gBACT,IAAI,CAAA,CAAE,EAAA;AAAA,gBACN,KAAA,EAAO,EAAE,IAAA,EAAM,MAAA,EAAQ,SAAS,gBAAA,EAAiB;AAAA,gBACjD,QAAA,EAAU;AAAA,eACX;AAAA,aACH;AAAA,eACG,IAAA,CAAK,EAAE,GAAG,CAAA;AAAA,QACjB;AACA,QAAA,eAAA,CAAgB,KAAA,EAAM;AAAA,MACxB,CAAA;AACA,MAAA,KAAA,GAAQ;AAAA,QACN,IAAA,EAAM,CAAA;AAAA,QACN,UAAA,EAAY,EAAA,CAAG,iBAAA,EAAmB,MAAM,CAAA;AAAA,QACxC,gBAAA;AAAA,QACA,iBAAA,sBAAuB,GAAA,EAAI;AAAA,QAC3B,eAAA;AAAA,QACA;AAAA,OACF;AACA,MAAA,gBAAA,CAAiB,OAAA,CAAQ,CAAC,SAAA,KAAc;AACtC,QAAA,IAAI,KAAA,CAAM,SAAS,CAAA,kBAAiB;AAClC,UAAA,MAAM,KAAK,aAAA,EAAc;AACzB,UAAA,KAAA,CAAM,iBAAA,CAAkB,GAAA,CAAI,EAAA,EAAI,SAAA,CAAU,QAAQ,CAAA;AAClD,UAAA,IAAA;AAAA,YACE,UAAA,CAAW;AAAA,cACT,EAAA;AAAA,cACA,MAAA,EAAQ,0BAAA;AAAA,cACR,MAAA,EAAQ,CAAC,SAAA,CAAU,EAAE;AAAA,aACtB;AAAA,WACH;AAAA,QACF;AAAA,MACF,CAAC,CAAA;AACD,MAAA,OAAA,CAAQ,QAAQ,IAAI,CAAA;AAAA,IACtB;AAAA,GACF;AACF,CAAA;;AC7QO,MAAM,eAAA,GACX,CAAC,KAAA,KACD,CAAC,SAAA,KAAc;AACb,EAAA,IAAI,KAAA,GAA6C,SAAS,SAAS,CAAA;AAEnE,EAAA,MAAM,QAAQ,MAAM;AAClB,IAAA,KAAA,EAAM,CAAE,IAAA;AAAA,MACN,CAAC,EAAA,KAAO;AACN,QAAA,IAAI,CAAC,KAAA,EAAO;AACV,UAAA,IAAI;AACF,YAAA,EAAA;AAAA,cACE,MAAM;AAAA,cAAC,CAAA;AAAA,cACP,MAAM;AAAA,cAAC;AAAA,cACP,UAAA,EAAW;AAAA,UACf,SAAS,CAAA,EAAG;AAAA,UAAC;AAAA,QACf,CAAA;AACE,UAAA,KAAA,CAAM,OAAA;AAAA,YAAQ,CAAC,KAAA,EAAO,MAAA,KACpB,EAAA,CAAG,OAAO,MAAM;AACd,cAAA,MAAA,EAAO;AACP,cAAA,KAAA,EAAM;AAAA,YACR,CAAC;AAAA,WACH;AAAA,MACJ,CAAA;AAAA,MACA,MAAM;AACJ,QAAA,KAAA,IAAS,UAAA,CAAW,OAAO,CAAC,CAAA;AAAA,MAC9B;AAAA,KACF;AAAA,EACF,CAAA;AAEA,EAAA,KAAA,EAAM;AACN,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,CAAC,GAAA,KAAQ;AACb,MAAA,KAAA,EAAO,KAAK,GAAG,CAAA;AAAA,IACjB,CAAA;AAAA,IACA,YAAY,MAAM;AAChB,MAAA,KAAA,EAAO,UAAA,EAAW;AAClB,MAAA,KAAA,GAAQ,IAAA;AAAA,IACV;AAAA,GACF;AACF;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot-api/json-rpc-provider-proxy",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "author": "Josep M Sobrepere (https://github.com/josepot)",
   "repository": {
     "type": "git",