@ceramicnetwork/common 2.0.0-alpha.3 → 2.0.0-alpha.4

package/lib/index.d.ts

@@ -8,6 +8,7 @@ export * from './utils/stream-utils.js';
 export * from './utils/test-utils.js';
 export * from './utils/accountid-utils.js';
 export * from './utils/cid-utils.js';
+export * from './utils/abort-signal-utils.js';
 export * from './logger-provider.js';
 export * from './loggers.js';
 export * from './networks.js';
@@ -17,6 +18,7 @@ export * from './unreachable-case-error.js';
 export * from './running-state-like.js';
 export * from './stream-state-subject.js';
 export * from './subscription-set.js';
+export * from './polyfill-abort-controller.js';
 import type { IPFS } from 'ipfs-core-types';
 export declare type IpfsApi = IPFS;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,uBAAuB,CAAA;AAErC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,oBAAY,OAAO,GAAG,IAAI,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,uBAAuB,CAAA;AACrC,cAAc,gCAAgC,CAAA;AAE9C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,oBAAY,OAAO,GAAG,IAAI,CAAA"}

package/lib/index.js

@@ -8,6 +8,7 @@ export * from './utils/stream-utils.js';
 export * from './utils/test-utils.js';
 export * from './utils/accountid-utils.js';
 export * from './utils/cid-utils.js';
+export * from './utils/abort-signal-utils.js';
 export * from './logger-provider.js';
 export * from './loggers.js';
 export * from './networks.js';
@@ -17,4 +18,5 @@ export * from './unreachable-case-error.js';
 export * from './running-state-like.js';
 export * from './stream-state-subject.js';
 export * from './subscription-set.js';
+export * from './polyfill-abort-controller.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,uBAAuB,CAAA;AACrC,cAAc,gCAAgC,CAAA"}

package/lib/polyfill-abort-controller.d.ts

@@ -0,0 +1,2 @@
+export declare function polyfillAbortController(): void;
+//# sourceMappingURL=polyfill-abort-controller.d.ts.map

package/lib/polyfill-abort-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"polyfill-abort-controller.d.ts","sourceRoot":"","sources":["../src/polyfill-abort-controller.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,SAQtC"}

package/lib/polyfill-abort-controller.js

@@ -0,0 +1,10 @@
+import * as polyfill from 'abort-controller';
+export function polyfillAbortController() {
+    if (!globalThis.AbortController) {
+        globalThis.AbortController = polyfill.AbortController;
+    }
+    if (!globalThis.AbortSignal) {
+        globalThis.AbortSignal = polyfill.AbortSignal;
+    }
+}
+//# sourceMappingURL=polyfill-abort-controller.js.map

package/lib/polyfill-abort-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"polyfill-abort-controller.js","sourceRoot":"","sources":["../src/polyfill-abort-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAA;AAE5C,MAAM,UAAU,uBAAuB;IACrC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE;QAC/B,UAAU,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAA;KACtD;IAED,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;QAC3B,UAAU,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAA;KAC9C;AACH,CAAC"}

package/lib/utils/abort-signal-utils.d.ts

@@ -0,0 +1,8 @@
+export declare function mergeAbortSignals(signals: AbortSignal[]): AbortSignal;
+export declare class TimedAbortSignal {
+    private readonly _subscription;
+    readonly signal: AbortSignal;
+    constructor(timeout: number);
+    clear(): void;
+}
+//# sourceMappingURL=abort-signal-utils.d.ts.map

package/lib/utils/abort-signal-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abort-signal-utils.d.ts","sourceRoot":"","sources":["../../src/utils/abort-signal-utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,WAAW,CAmBrE;AACD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAc;IAC5C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;gBAEhB,OAAO,EAAE,MAAM;IAc3B,KAAK;CAGN"}

package/lib/utils/abort-signal-utils.js

@@ -0,0 +1,37 @@
+import { timer, fromEvent, merge } from 'rxjs';
+import { first } from 'rxjs/operators';
+import { polyfillAbortController } from '../polyfill-abort-controller.js';
+polyfillAbortController();
+export function mergeAbortSignals(signals) {
+    const controller = new AbortController();
+    if (signals.length === 0) {
+        throw Error('Need abort signals to create a merged abort signal');
+    }
+    if (signals.some((signal) => signal.aborted)) {
+        controller.abort();
+        return controller.signal;
+    }
+    merge(...signals.map((signal) => fromEvent(signal, 'abort')))
+        .pipe(first())
+        .subscribe(() => {
+        controller.abort();
+    });
+    return controller.signal;
+}
+export class TimedAbortSignal {
+    constructor(timeout) {
+        const controller = new AbortController();
+        this.signal = controller.signal;
+        if (timeout <= 0) {
+            controller.abort();
+            return;
+        }
+        this._subscription = timer(timeout).subscribe(() => {
+            controller.abort();
+        });
+    }
+    clear() {
+        this._subscription?.unsubscribe();
+    }
+}
+//# sourceMappingURL=abort-signal-utils.js.map

package/lib/utils/abort-signal-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abort-signal-utils.js","sourceRoot":"","sources":["../../src/utils/abort-signal-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAgB,MAAM,MAAM,CAAA;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AAEzE,uBAAuB,EAAE,CAAA;AAEzB,MAAM,UAAU,iBAAiB,CAAC,OAAsB;IACtD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAExC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,KAAK,CAAC,oDAAoD,CAAC,CAAA;KAClE;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QAC5C,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,OAAO,UAAU,CAAC,MAAM,CAAA;KACzB;IAED,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;SAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;SACb,SAAS,CAAC,GAAG,EAAE;QACd,UAAU,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC,CAAC,CAAA;IAEJ,OAAO,UAAU,CAAC,MAAM,CAAA;AAC1B,CAAC;AACD,MAAM,OAAO,gBAAgB;IAI3B,YAAY,OAAe;QACzB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;QACxC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;QAE/B,IAAI,OAAO,IAAI,CAAC,EAAE;YAChB,UAAU,CAAC,KAAK,EAAE,CAAA;YAClB,OAAM;SACP;QAED,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;YACjD,UAAU,CAAC,KAAK,EAAE,CAAA;QACpB,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAA;IACnC,CAAC;CACF"}

package/lib/utils/http-utils.d.ts

@@ -3,6 +3,7 @@ interface FetchOpts {
     method?: string;
     headers?: any;
     timeout?: number;
+    signal?: AbortSignal;
 }
 export declare function fetchJson(url: string, opts?: FetchOpts): Promise<any>;
 export {};

package/lib/utils/http-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-utils.d.ts","sourceRoot":"","sources":["../../src/utils/http-utils.ts"],"names":[],"mappings":"AAGA,UAAU,SAAS;IACjB,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,GAAG,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,SAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAgC/E"}
+{"version":3,"file":"http-utils.d.ts","sourceRoot":"","sources":["../../src/utils/http-utils.ts"],"names":[],"mappings":"AAIA,UAAU,SAAS;IACjB,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,GAAG,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,SAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAuB/E"}

package/lib/utils/http-utils.js

@@ -1,4 +1,5 @@
 import fetch from 'cross-fetch';
+import { mergeAbortSignals, TimedAbortSignal } from './abort-signal-utils.js';
 const DEFAULT_FETCH_TIMEOUT = 60 * 1000 * 3;
 export async function fetchJson(url, opts = {}) {
     if (opts.body) {
@@ -8,21 +9,11 @@ export async function fetchJson(url, opts = {}) {
         });
     }
     const timeoutLength = opts.timeout || DEFAULT_FETCH_TIMEOUT;
-    const controller = new AbortController();
-    const timeout = setTimeout(() => {
-        controller.abort();
-    }, timeoutLength);
-    Object.assign(opts, {
-        signal: controller.signal,
-    });
-    const res = await fetch(url, opts)
-        .catch((err) => {
-        if (err.name == 'AbortError') {
-            throw new Error(`Http request timed out after ${timeoutLength} ms`);
-        }
-        throw err;
-    })
-        .finally(() => timeout && clearTimeout(timeout));
+    const timedAbortSignal = new TimedAbortSignal(timeoutLength);
+    opts.signal = opts.signal
+        ? mergeAbortSignals([opts.signal, timedAbortSignal.signal])
+        : timedAbortSignal.signal;
+    const res = await fetch(url, opts).finally(() => timedAbortSignal.clear());
     if (!res.ok) {
         const text = await res.text();
         throw new Error(`HTTP request to '${url}' failed with status '${res.statusText}': ${text}`);

package/lib/utils/http-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-utils.js","sourceRoot":"","sources":["../../src/utils/http-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAA;AAE/B,MAAM,qBAAqB,GAAG,EAAE,GAAG,IAAI,GAAG,CAAC,CAAA;AAQ3C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAW,EAAE,OAAkB,EAAE;IAC/D,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;YAC/B,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC,CAAA;KACH;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,IAAI,qBAAqB,CAAA;IAC3D,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,UAAU,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC,EAAE,aAAa,CAAC,CAAA;IACjB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QAClB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC;SAC/B,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,IAAI,GAAG,CAAC,IAAI,IAAI,YAAY,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,aAAa,KAAK,CAAC,CAAA;SACpE;QACD,MAAM,GAAG,CAAA;IACX,CAAC,CAAC;SACD,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;IAElD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;QAC7B,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,yBAAyB,GAAG,CAAC,UAAU,MAAM,IAAI,EAAE,CAAC,CAAA;KAC5F;IAED,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;AACnB,CAAC"}
+{"version":3,"file":"http-utils.js","sourceRoot":"","sources":["../../src/utils/http-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE7E,MAAM,qBAAqB,GAAG,EAAE,GAAG,IAAI,GAAG,CAAC,CAAA;AAS3C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAW,EAAE,OAAkB,EAAE;IAC/D,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;YAC/B,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC,CAAA;KACH;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,IAAI,qBAAqB,CAAA;IAC3D,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,aAAa,CAAC,CAAA;IAE5D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM;QACvB,CAAC,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC3D,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAA;IAE3B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAA;IAE1E,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;QAC7B,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,yBAAyB,GAAG,CAAC,UAAU,MAAM,IAAI,EAAE,CAAC,CAAA;KAC5F;IAED,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;AACnB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ceramicnetwork/common",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "description": "Ceramic common types and utilities",
   "keywords": [
     "ceramic",
@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "@ceramicnetwork/streamid": "^2.0.0-alpha.3",
+    "abort-controller": "^3.0.0",
     "caip": "~1.0.0",
     "cross-fetch": "^3.1.4",
     "flat": "^5.0.2",
@@ -51,10 +52,10 @@
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/logfmt": "^1.2.2",
     "@types/node": "^17.0.5",
-    "dids": "^3.0.0-alpha.9",
+    "dids": "^3.0.0-alpha.12",
     "ipfs-core-types": "~0.9.0",
     "json-schema-to-typescript": "^10.1.5",
     "typescript-json-schema": "^0.52.0"
   },
-  "gitHead": "d4ad7b5937a90588649f92de0190fe43bbf3a7d8"
+  "gitHead": "1494fdbb2f3c289c82ff7c987173b748f2d6ff8c"
 }