@polkadot-api/ws-middleware 0.2.3 → 0.2.4-canary.5629cfc

package/dist/esm/legacy/utils/with-latest-from-bp.mjs

@@ -1,20 +1,25 @@
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 
 const withLatestFromBp = (latest$) => (base$) => new Observable((observer) => {
   let latest;
   let prev = [];
-  const subscription = base$.subscribe({
-    next(v) {
-      if (prev) prev.push(v);
-      else observer.next([latest, v]);
-    },
-    error(e) {
-      observer.error(e);
-    },
-    complete() {
-      observer.complete();
-    }
-  });
+  let finished = false;
+  const subscription = new Subscription();
+  subscription.add(
+    base$.subscribe({
+      next(v) {
+        if (prev) prev.push(v);
+        else observer.next([latest, v]);
+      },
+      error(e) {
+        observer.error(e);
+      },
+      complete() {
+        if (prev) finished = true;
+        else observer.complete();
+      }
+    })
+  );
   subscription.add(
     latest$.subscribe({
       next(v) {
@@ -24,6 +29,7 @@ const withLatestFromBp = (latest$) => (base$) => new Observable((observer) => {
           prev = null;
           copy.forEach((p) => observer.next([latest, p]));
         }
+        if (finished) observer.complete();
       },
       error(e) {
         observer.error(e);

package/dist/esm/legacy/utils/with-latest-from-bp.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"with-latest-from-bp.mjs","sources":["../../../../src/legacy/utils/with-latest-from-bp.ts"],"sourcesContent":["import { Observable } from \"rxjs\"\n\nexport const withLatestFromBp =\n  <T, S>(latest$: Observable<T>) =>\n  (base$: Observable<S>) =>\n    new Observable<[T, S]>((observer) => {\n      let latest: T\n      let prev: S[] | null = []\n\n      const subscription = base$.subscribe({\n        next(v) {\n          if (prev) prev.push(v)\n          else observer.next([latest, v])\n        },\n        error(e) {\n          observer.error(e)\n        },\n        complete() {\n          observer.complete()\n        },\n      })\n\n      subscription.add(\n        latest$.subscribe({\n          next(v) {\n            latest = v\n            if (prev) {\n              const copy = [...prev]\n              prev = null\n              copy.forEach((p) => observer.next([latest, p]))\n            }\n          },\n          error(e) {\n            observer.error(e)\n          },\n          complete() {\n            if (prev) observer.error(new Error(\"Empty complete\"))\n          },\n        }),\n      )\n\n      return subscription\n    })\n"],"names":[],"mappings":";;AAEO,MAAM,gBAAA,GACX,CAAO,OAAA,KACP,CAAC,UACC,IAAI,UAAA,CAAmB,CAAC,QAAA,KAAa;AACnC,EAAA,IAAI,MAAA;AACJ,EAAA,IAAI,OAAmB,EAAC;AAExB,EAAA,MAAM,YAAA,GAAe,MAAM,SAAA,CAAU;AAAA,IACnC,KAAK,CAAA,EAAG;AACN,MAAA,IAAI,IAAA,EAAM,IAAA,CAAK,IAAA,CAAK,CAAC,CAAA;AAAA,WAChB,QAAA,CAAS,IAAA,CAAK,CAAC,MAAA,EAAQ,CAAC,CAAC,CAAA;AAAA,IAChC,CAAA;AAAA,IACA,MAAM,CAAA,EAAG;AACP,MAAA,QAAA,CAAS,MAAM,CAAC,CAAA;AAAA,IAClB,CAAA;AAAA,IACA,QAAA,GAAW;AACT,MAAA,QAAA,CAAS,QAAA,EAAS;AAAA,IACpB;AAAA,GACD,CAAA;AAED,EAAA,YAAA,CAAa,GAAA;AAAA,IACX,QAAQ,SAAA,CAAU;AAAA,MAChB,KAAK,CAAA,EAAG;AACN,QAAA,MAAA,GAAS,CAAA;AACT,QAAA,IAAI,IAAA,EAAM;AACR,UAAA,MAAM,IAAA,GAAO,CAAC,GAAG,IAAI,CAAA;AACrB,UAAA,IAAA,GAAO,IAAA;AACP,UAAA,IAAA,CAAK,OAAA,CAAQ,CAAC,CAAA,KAAM,QAAA,CAAS,KAAK,CAAC,MAAA,EAAQ,CAAC,CAAC,CAAC,CAAA;AAAA,QAChD;AAAA,MACF,CAAA;AAAA,MACA,MAAM,CAAA,EAAG;AACP,QAAA,QAAA,CAAS,MAAM,CAAC,CAAA;AAAA,MAClB,CAAA;AAAA,MACA,QAAA,GAAW;AACT,QAAA,IAAI,MAAM,QAAA,CAAS,KAAA,CAAM,IAAI,KAAA,CAAM,gBAAgB,CAAC,CAAA;AAAA,MACtD;AAAA,KACD;AAAA,GACH;AAEA,EAAA,OAAO,YAAA;AACT,CAAC;;;;"}
+{"version":3,"file":"with-latest-from-bp.mjs","sources":["../../../../src/legacy/utils/with-latest-from-bp.ts"],"sourcesContent":["import { Observable, Subscription } from \"rxjs\"\n\nexport const withLatestFromBp =\n  <T, S>(latest$: Observable<T>) =>\n  (base$: Observable<S>) =>\n    new Observable<[T, S]>((observer) => {\n      let latest: T\n      let prev: S[] | null = []\n      let finished = false\n\n      const subscription = new Subscription()\n      subscription.add(\n        base$.subscribe({\n          next(v) {\n            if (prev) prev.push(v)\n            else observer.next([latest, v])\n          },\n          error(e) {\n            observer.error(e)\n          },\n          complete() {\n            if (prev) finished = true\n            else observer.complete()\n          },\n        }),\n      )\n\n      subscription.add(\n        latest$.subscribe({\n          next(v) {\n            latest = v\n            if (prev) {\n              const copy = [...prev]\n              prev = null\n              copy.forEach((p) => observer.next([latest, p]))\n            }\n            if (finished) observer.complete()\n          },\n          error(e) {\n            observer.error(e)\n          },\n          complete() {\n            if (prev) observer.error(new Error(\"Empty complete\"))\n          },\n        }),\n      )\n\n      return subscription\n    })\n"],"names":[],"mappings":";;AAEO,MAAM,gBAAA,GACX,CAAO,OAAA,KACP,CAAC,UACC,IAAI,UAAA,CAAmB,CAAC,QAAA,KAAa;AACnC,EAAA,IAAI,MAAA;AACJ,EAAA,IAAI,OAAmB,EAAC;AACxB,EAAA,IAAI,QAAA,GAAW,KAAA;AAEf,EAAA,MAAM,YAAA,GAAe,IAAI,YAAA,EAAa;AACtC,EAAA,YAAA,CAAa,GAAA;AAAA,IACX,MAAM,SAAA,CAAU;AAAA,MACd,KAAK,CAAA,EAAG;AACN,QAAA,IAAI,IAAA,EAAM,IAAA,CAAK,IAAA,CAAK,CAAC,CAAA;AAAA,aAChB,QAAA,CAAS,IAAA,CAAK,CAAC,MAAA,EAAQ,CAAC,CAAC,CAAA;AAAA,MAChC,CAAA;AAAA,MACA,MAAM,CAAA,EAAG;AACP,QAAA,QAAA,CAAS,MAAM,CAAC,CAAA;AAAA,MAClB,CAAA;AAAA,MACA,QAAA,GAAW;AACT,QAAA,IAAI,MAAM,QAAA,GAAW,IAAA;AAAA,sBACP,QAAA,EAAS;AAAA,MACzB;AAAA,KACD;AAAA,GACH;AAEA,EAAA,YAAA,CAAa,GAAA;AAAA,IACX,QAAQ,SAAA,CAAU;AAAA,MAChB,KAAK,CAAA,EAAG;AACN,QAAA,MAAA,GAAS,CAAA;AACT,QAAA,IAAI,IAAA,EAAM;AACR,UAAA,MAAM,IAAA,GAAO,CAAC,GAAG,IAAI,CAAA;AACrB,UAAA,IAAA,GAAO,IAAA;AACP,UAAA,IAAA,CAAK,OAAA,CAAQ,CAAC,CAAA,KAAM,QAAA,CAAS,KAAK,CAAC,MAAA,EAAQ,CAAC,CAAC,CAAC,CAAA;AAAA,QAChD;AACA,QAAA,IAAI,QAAA,WAAmB,QAAA,EAAS;AAAA,MAClC,CAAA;AAAA,MACA,MAAM,CAAA,EAAG;AACP,QAAA,QAAA,CAAS,MAAM,CAAC,CAAA;AAAA,MAClB,CAAA;AAAA,MACA,QAAA,GAAW;AACT,QAAA,IAAI,MAAM,QAAA,CAAS,KAAA,CAAM,IAAI,KAAA,CAAM,gBAAgB,CAAC,CAAA;AAAA,MACtD;AAAA,KACD;AAAA,GACH;AAEA,EAAA,OAAO,YAAA;AACT,CAAC;;;;"}

package/dist/esm/middleware.mjs

@@ -1,24 +1,9 @@
-import { withLegacy } from './legacy/downstream/downstream.mjs';
+import { hybridMiddleware } from './hybrid.mjs';
 import { methodsRouter } from './methods-router.mjs';
-import { modern } from './modern/modern.mjs';
-import './modern/fix-follow.mjs';
-import './modern/fix-premature-blocks.mjs';
-import './modern/fix-unordered-blocks.mjs';
-import './modern/fix-unordered-events.mjs';
-import './methods.mjs';
-import { apply } from './utils/utils.mjs';
 import { withNumericIds } from './numeric-ids.mjs';
+import { apply } from './utils/utils.mjs';
 
-const modernGroups = [
-  "chainHead",
-  "transaction",
-  "chainSpec"
-].map((name) => `${name}_v1`);
-const isModern = (methods) => modernGroups.every((group) => methods.some((m) => m.startsWith(group)));
-const middleware = apply(
-  withNumericIds,
-  methodsRouter((methods) => isModern(methods) ? modern : withLegacy)
-);
+const middleware = apply(withNumericIds, methodsRouter(hybridMiddleware));
 
 export { middleware };
 //# sourceMappingURL=middleware.mjs.map

package/dist/esm/middleware.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.mjs","sources":["../../src/middleware.ts"],"sourcesContent":["import { withLegacy } from \"./legacy\"\nimport { methodsRouter } from \"./methods-router\"\nimport { modern } from \"./modern\"\nimport { withNumericIds } from \"./numeric-ids\"\nimport { apply } from \"./utils\"\n\nconst modernGroups = [\n  \"chainHead\",\n  \"transaction\",\n  \"chainSpec\" /*, \"archive\"*/,\n].map((name) => `${name}_v1`)\nconst isModern = (methods: string[]): boolean =>\n  modernGroups.every((group) => methods.some((m) => m.startsWith(group)))\n\nexport const middleware = apply(\n  withNumericIds,\n  methodsRouter((methods) => (isModern(methods) ? modern : withLegacy)),\n)\n"],"names":[],"mappings":";;;;;;;;;;;AAMA,MAAM,YAAA,GAAe;AAAA,EACnB,WAAA;AAAA,EACA,aAAA;AAAA,EACA;AACF,CAAA,CAAE,GAAA,CAAI,CAAC,IAAA,KAAS,CAAA,EAAG,IAAI,CAAA,GAAA,CAAK,CAAA;AAC5B,MAAM,QAAA,GAAW,CAAC,OAAA,KAChB,YAAA,CAAa,MAAM,CAAC,KAAA,KAAU,OAAA,CAAQ,IAAA,CAAK,CAAC,CAAA,KAAM,CAAA,CAAE,UAAA,CAAW,KAAK,CAAC,CAAC,CAAA;AAEjE,MAAM,UAAA,GAAa,KAAA;AAAA,EACxB,cAAA;AAAA,EACA,cAAc,CAAC,OAAA,KAAa,SAAS,OAAO,CAAA,GAAI,SAAS,UAAW;AACtE;;;;"}
+{"version":3,"file":"middleware.mjs","sources":["../../src/middleware.ts"],"sourcesContent":["import { hybridMiddleware } from \"./hybrid\"\nimport { methodsRouter } from \"./methods-router\"\nimport { withNumericIds } from \"./numeric-ids\"\nimport { apply } from \"./utils\"\n\nexport const middleware = apply(withNumericIds, methodsRouter(hybridMiddleware))\n"],"names":[],"mappings":";;;;;AAKO,MAAM,UAAA,GAAa,KAAA,CAAM,cAAA,EAAgB,aAAA,CAAc,gBAAgB,CAAC;;;;"}