@outfoxx/sunday 1.1.0-beta.2 → 1.1.0-beta.21

package/build/main/util/hex.js

@@ -0,0 +1,35 @@
+"use strict";
+// Copyright 2020 Outfox, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Hex = void 0;
+var Hex;
+(function (Hex) {
+    function decode(hex) {
+        hex = hex.replace(/^0x/, '').replace(/\s/g, '');
+        const values = hex.match(/[\da-f]{2}/gi);
+        if (!values || values.length != hex.length / 2) {
+            throw Error(`Invalid hex string`);
+        }
+        return new Uint8Array(values.map((b) => parseInt(b, 16))).buffer;
+    }
+    Hex.decode = decode;
+    function encode(buffer, separator = '') {
+        return Array.from(new Uint8Array(buffer))
+            .map((value) => value.toString(16).padStart(2, '0'))
+            .join(separator);
+    }
+    Hex.encode = encode;
+})(Hex = exports.Hex || (exports.Hex = {}));
+//# sourceMappingURL=hex.js.map

package/build/main/util/hex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hex.js","sourceRoot":"","sources":["../../../src/util/hex.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,IAAiB,GAAG,CAenB;AAfD,WAAiB,GAAG;IAClB,SAAgB,MAAM,CAAC,GAAW;QAChC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9C,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACnC;QACD,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACnE,CAAC;IAPe,UAAM,SAOrB,CAAA;IAED,SAAgB,MAAM,CAAC,MAAmB,EAAE,SAAS,GAAG,EAAE;QACxD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;aACtC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aACnD,IAAI,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;IAJe,UAAM,SAIrB,CAAA;AACH,CAAC,EAfgB,GAAG,GAAH,WAAG,KAAH,WAAG,QAenB"}

package/build/main/util/rxjs.d.ts

@@ -0,0 +1,27 @@
+import { Observable } from 'rxjs';
+import { ClassType } from '../class-type';
+import { Problem } from '../problem';
+export declare function nullifyNotFound<T>(): (source: Observable<T>) => Observable<T | null>;
+export declare function nullifyResponse<T>(statuses: number[], problemTypes: ClassType<Problem>[]): (source: Observable<T>) => Observable<T | null>;
+export declare function nullifyPromiseResponse<T>(statuses: number[], problemTypes: ClassType<Problem>[]): (error: unknown) => Promise<T | null>;
+export interface AbortError extends Error {
+}
+export declare type AbortErrorCtor = new () => AbortError;
+/**
+ * An error thrown when an Observable converted to a promise is aborted with
+ * via a provided `AbortSignal`.
+ *
+ * @see {@link promiseFrom}
+ *
+ * @class AbortError
+ */
+export declare const AbortError: AbortErrorCtor;
+/**
+ * Converts an Observable to a Promise, optionally aborting the Observable via
+ * a provided `AbortSignal`.
+ *
+ * @param obs Observable to convert to a Promise
+ * @param signal Optional AbortSignal to abort the Observable
+ * @returns Promise that resolves to the first value from the Observable
+ */
+export declare function promiseFrom<T>(obs: Observable<T>, signal?: AbortSignal): Promise<T>;

package/build/main/util/rxjs.js

@@ -0,0 +1,86 @@
+"use strict";
+// Copyright 2020 Outfox, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiseFrom = exports.AbortError = exports.nullifyPromiseResponse = exports.nullifyResponse = exports.nullifyNotFound = void 0;
+const rxjs_1 = require("rxjs");
+const createErrorClass_1 = require("rxjs/internal/util/createErrorClass");
+const problem_1 = require("../problem");
+function nullifyNotFound() {
+    return nullifyResponse([404], []);
+}
+exports.nullifyNotFound = nullifyNotFound;
+function nullifyResponse(statuses, problemTypes) {
+    return function (source) {
+        return source.pipe((0, rxjs_1.catchError)((error) => {
+            const errorType = error.constructor;
+            if (error instanceof problem_1.Problem &&
+                (statuses.includes(error.status) || problemTypes.includes(errorType))) {
+                return (0, rxjs_1.from)([null]);
+            }
+            return (0, rxjs_1.throwError)(() => error);
+        }));
+    };
+}
+exports.nullifyResponse = nullifyResponse;
+function nullifyPromiseResponse(statuses, problemTypes) {
+    return function (error) {
+        const errorType = error
+            .constructor;
+        if (error instanceof problem_1.Problem &&
+            (statuses.includes(error.status) || problemTypes.includes(errorType))) {
+            return Promise.resolve(null);
+        }
+        return Promise.reject(error);
+    };
+}
+exports.nullifyPromiseResponse = nullifyPromiseResponse;
+/**
+ * An error thrown when an Observable converted to a promise is aborted with
+ * via a provided `AbortSignal`.
+ *
+ * @see {@link promiseFrom}
+ *
+ * @class AbortError
+ */
+exports.AbortError = (0, createErrorClass_1.createErrorClass)((_super) => function AbortErrorImpl() {
+    _super(this);
+    this.name = 'AbortError';
+    this.message = 'sequence was aborted';
+});
+/**
+ * Converts an Observable to a Promise, optionally aborting the Observable via
+ * a provided `AbortSignal`.
+ *
+ * @param obs Observable to convert to a Promise
+ * @param signal Optional AbortSignal to abort the Observable
+ * @returns Promise that resolves to the first value from the Observable
+ */
+function promiseFrom(obs, signal) {
+    if (!signal) {
+        return (0, rxjs_1.firstValueFrom)(obs);
+    }
+    // Reject immediately if the signal has already fired. Use `AbortError`
+    // because that's what `first` will fail with per the note below
+    if (signal.aborted) {
+        return Promise.reject(new exports.AbortError());
+    }
+    const stop = (0, rxjs_1.fromEvent)(signal, 'abort').pipe((0, rxjs_1.take)(1), (0, rxjs_1.switchMap)(() => (0, rxjs_1.throwError)(() => new exports.AbortError())));
+    // Note that `takeUntil` will cause the observable to complete when the
+    // Signal fires, but `firstValueFrom` will fail with EmptyError if there
+    // wasn't a value, which will reject out of the returned Promise.
+    return (0, rxjs_1.firstValueFrom)(obs.pipe((0, rxjs_1.takeUntil)(stop)));
+}
+exports.promiseFrom = promiseFrom;
+//# sourceMappingURL=rxjs.js.map

package/build/main/util/rxjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rxjs.js","sourceRoot":"","sources":["../../../src/util/rxjs.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,+BAUc;AACd,0EAAuE;AAEvE,wCAAqC;AAErC,SAAgB,eAAe;IAG7B,OAAO,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC;AAJD,0CAIC;AAED,SAAgB,eAAe,CAC7B,QAAkB,EAClB,YAAkC;IAElC,OAAO,UAAa,MAAqB;QACvC,OAAO,MAAM,CAAC,IAAI,CAChB,IAAA,iBAAU,EAAC,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,SAAS,GAAG,KAAK,CAAC,WAAiC,CAAC;YAC1D,IACE,KAAK,YAAY,iBAAO;gBACxB,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EACrE;gBACA,OAAO,IAAA,WAAI,EAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aACrB;YACD,OAAO,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAlBD,0CAkBC;AAED,SAAgB,sBAAsB,CACpC,QAAkB,EAClB,YAAkC;IAElC,OAAO,UAAa,KAAc;QAChC,MAAM,SAAS,GAAI,KAAiC;aACjD,WAAiC,CAAC;QACrC,IACE,KAAK,YAAY,iBAAO;YACxB,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EACrE;YACA,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAfD,wDAeC;AAOD;;;;;;;GAOG;AACU,QAAA,UAAU,GAAmB,IAAA,mCAAgB,EACxD,CAAC,MAAiC,EAAE,EAAE,CACpC,SAAS,cAAc;IACrB,MAAM,CAAC,IAAI,CAAC,CAAC;IACb,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IACzB,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC;AACxC,CAAC,CACJ,CAAC;AAEF;;;;;;;GAOG;AACH,SAAgB,WAAW,CACzB,GAAkB,EAClB,MAAoB;IAEpB,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,IAAA,qBAAc,EAAC,GAAG,CAAC,CAAC;KAC5B;IACD,uEAAuE;IACvE,gEAAgE;IAChE,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,kBAAU,EAAE,CAAC,CAAC;KACzC;IAED,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,CAC1C,IAAA,WAAI,EAAC,CAAC,CAAC,EACP,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,IAAI,kBAAU,EAAE,CAAC,CAAC,CACpD,CAAC;IAEF,uEAAuE;IACvE,wEAAwE;IACxE,iEAAiE;IACjE,OAAO,IAAA,qBAAc,EAAC,GAAG,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AAtBD,kCAsBC"}

package/build/main/util/temporal.d.ts

@@ -0,0 +1,2 @@
+export declare function secondsToNumber(seconds: number, nanos: number): number;
+export declare function encodeSeconds(seconds: number, fraction: number): unknown[];

package/build/main/util/temporal.js

@@ -0,0 +1,36 @@
+"use strict";
+// Copyright 2020 Outfox, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeSeconds = exports.secondsToNumber = void 0;
+function secondsToNumber(seconds, nanos) {
+    if (nanos == 0) {
+        return seconds;
+    }
+    const nanoStr = nanos.toString();
+    return parseFloat(`${seconds}.${'0'.repeat(9 - nanoStr.length)}${nanos}`);
+}
+exports.secondsToNumber = secondsToNumber;
+function encodeSeconds(seconds, fraction) {
+    const result = [];
+    if (seconds != 0 || fraction != 0) {
+        result.push(seconds);
+        if (fraction != 0) {
+            result.push(fraction);
+        }
+    }
+    return result;
+}
+exports.encodeSeconds = encodeSeconds;
+//# sourceMappingURL=temporal.js.map

package/build/main/util/temporal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"temporal.js","sourceRoot":"","sources":["../../../src/util/temporal.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,SAAgB,eAAe,CAAC,OAAe,EAAE,KAAa;IAC5D,IAAI,KAAK,IAAI,CAAC,EAAE;QACd,OAAO,OAAO,CAAC;KAChB;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IACjC,OAAO,UAAU,CAAC,GAAG,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;AAC5E,CAAC;AAND,0CAMC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,QAAgB;IAC7D,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,IAAI,OAAO,IAAI,CAAC,IAAI,QAAQ,IAAI,CAAC,EAAE;QACjC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,QAAQ,IAAI,CAAC,EAAE;YACjB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvB;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,sCASC"}

package/package.json

@@ -1,19 +1,35 @@
 {
   "name": "@outfoxx/sunday",
-  "version": "1.1.0-beta.2",
+  "version": "1.1.0-beta.21",
   "description": "Sunday 🙏 The framework of REST for TypeScript/JavaScript",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "type": "module",
+  "main": "build/main/index.js",
+  "module": "build/esm/index.js",
+  "esnext": "build/esnext/index.js",
+  "types": "build/main/index.d.ts",
+  "files": [
+    "src",
+    "build",
+    "LICENSE.txt",
+    "README.md"
+  ],
   "scripts": {
-    "test": "karma start karma.conf.cjs --singleRun",
-    "test:watch": "karma start karma.conf.cjs",
-    "build": "tsc --build tsconfig.dist.json",
-    "clean": "rimraf build dist",
-    "prepublishOnly": "npm run clean && npm run lint && npm run build && npm run test",
-    "lint": "eslint -f json -o reports/lint.json src test",
+    "test:main": "karma start karma-main.config.js --singleRun",
+    "test:esm": "karma start karma-esm.config.js --singleRun",
+    "test:esnext": "karma start karma-esnext.config.js --singleRun",
+    "test:main:watch": "karma start karma-main.config.js",
+    "test:esm:watch": "karma start karma-esm.config.js",
+    "test:esnext:watch": "karma start karma-esnext.config.js",
+    "test:main:allbrowsers": "karma start karma-main.config.js --singleRun --browsers ChromeHeadless,SafariNative,Firefox",
+    "test:esm:allbrowsers": "karma start karma-esm.config.js --singleRun --browsers ChromeHeadless,SafariNative,Firefox",
+    "test:esnext:allbrowsers": "karma start karma-esnext.config.js --singleRun --browsers ChromeHeadless,SafariNative,Firefox",
+    "build": "tsc --build tsconfig-main.json tsconfig-esm.json tsconfig-esnext.json",
+    "build:watch": "tsc --build tsconfig-main.json tsconfig-esm.json tsconfig-esnext.json --watch",
+    "clean": "rimraf build docs reports",
     "pretty": "prettier src test",
-    "docs": "typedoc --excludeInternal --excludePrivate src/index.ts"
+    "lint": "eslint -f json -o reports/lint.json src test",
+    "lint:html": "eslint -f html -o reports/lint.html src test",
+    "docs": "typedoc --excludeInternal --excludePrivate src/index.ts",
+    "prepublishOnly": "npm run clean && npm run lint && npm run build"
   },
   "husky": {
     "hooks": {
@@ -25,56 +41,54 @@
       "eslint"
     ]
   },
-  "keywords": [],
+  "keywords": [
+    "HTTP",
+    "REST",
+    "fetch"
+  ],
   "author": "kdubb",
   "license": "Apache-2.0",
   "dependencies": {
     "@js-joda/core": "5.2.x",
-    "@outfoxx/cbor-redux": "0.3.x",
     "@outfoxx/jackson-js": "1.4.x",
-    "common-tags": "1.8.x",
+    "cbor-redux": "1.0.x",
     "tslib": "2.4.x",
-    "uri-template-lite": "^22.9.0"
+    "uri-template": "^2.0.0"
   },
   "peerDependencies": {
     "rxjs": "7.x"
   },
   "devDependencies": {
-    "@types/common-tags": "1.8.x",
-    "@types/jasmine": "4.0.x",
-    "@types/uri-template-lite": "19.12.x",
+    "@types/jasmine": "^4.3.1",
     "@typescript-eslint/eslint-plugin": "^5.25.0",
     "@typescript-eslint/parser": "^5.25.0",
+    "coverage-istanbul-loader": "^3.0.5",
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-prettier": "^4.0.0",
     "fetch-mock": "^9.11.0",
-    "fsevents": "^2.1.3",
-    "husky": "^4.3.0",
+    "husky": "^8.0.3",
     "install": "^0.13.0",
     "karma": "^6.3.20",
     "karma-chrome-launcher": "^3.1.1",
     "karma-cli": "^2.0.0",
-    "karma-coverage": "^2.2.0",
-    "karma-jasmine": "^5.0.1",
-    "karma-junit-reporter": "^2.0.1",
+    "karma-coverage-istanbul-reporter": "^3.0.3",
+    "karma-firefox-launcher": "^2.1.2",
+    "karma-jasmine": "^5.1.0",
+    "karma-safarinative-launcher": "^1.1.0",
     "karma-sonarqube-unit-reporter": "^0.0.23",
-    "karma-source-map-support": "^1.4.0",
     "karma-sourcemap-loader": "^0.3.8",
-    "karma-typescript": "^5.5.3",
-    "karma-typescript-es6-transform": "^5.5.3",
-    "lint-staged": "^10.4.0",
+    "karma-spec-reporter": "^0.0.36",
+    "karma-webpack": "^5.0.0",
+    "lint-staged": "^13.2.1",
     "prettier": "^2.1.2",
     "pretty-quick": "^3.0.2",
     "rimraf": "^3.0.2",
+    "ts-loader": "^9.4.2",
     "typedoc": "^0.22.18",
     "typescript": "~4.4",
-    "web-streams-polyfill": "^3.0.0"
-  },
-  "files": [
-    "dist",
-    "src",
-    "package.json"
-  ]
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
+  }
 }

package/src/fetch-event-source.ts

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { EMPTY, map, Observable, of, Subscription, switchMap, tap } from 'rxjs';
+import { EMPTY, map, Observable, of, Subscription, switchMap } from 'rxjs';
+import { fromReadableStreamLike } from 'rxjs/internal/observable/innerFrom';
 import { EventInfo, EventParser } from './event-parser';
 import { validate } from './fetch';
 import { Logger } from './logger';
 import { MediaType } from './media-type';
 import { ExtEventSource } from './request-factory';
-import { unknownSet } from './util/any';
-import { fromStream } from './util/stream-rxjs';
+import { unknownGet, unknownSet } from './util/any';
 
 export interface FetchEventSource {
   addEventListener<K extends keyof EventSourceEventMap>(
@@ -73,7 +73,6 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
   private eventTimeoutCheckHandle?: number;
   private lastEventReceivedTime = 0;
   private eventParser = new EventParser();
-  private readonly externalAbortController?: AbortController;
 
   constructor(
     url: string,
@@ -81,7 +80,6 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
       adapter?: (url: string, requestInit: RequestInit) => Observable<Request>;
       eventTimeout?: number;
       logger?: Logger;
-      abortController?: AbortController;
     },
   ) {
     super();
@@ -93,7 +91,6 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
       eventSourceInit?.eventTimeout ??
       FetchEventSource.EVENT_TIMEOUT_DEFAULT * 1000;
     this.logger = eventSourceInit?.logger;
-    this.externalAbortController = eventSourceInit?.abortController;
   }
 
   //
@@ -102,7 +99,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
 
   connect(): void {
     if (this.readyState === this.CONNECTING || this.readyState === this.OPEN) {
-      // this.logger?.debug?.('skipping connect', { state: this.readyState });
+      this.logger?.trace?.('skipping connect', { state: this.readyState });
       return;
     }
 
@@ -121,44 +118,68 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
       headers.append(FetchEventSource.LAST_EVENT_ID_HEADER, this.lastEventId);
     }
 
-    const abortController =
-      this.externalAbortController ?? new AbortController();
+    this.connectionSubscription?.unsubscribe();
+    this.connectionSubscription = new Subscription();
+
+    // Abort when connection is unsubscribed
+    const unsubscribeAbortController = new AbortController();
+    this.connectionSubscription.add(() => unsubscribeAbortController.abort());
+
+    // Purely for testing purposes, allow an external signal to abort the fetch
+    const externalSignal = unknownGet(this, 'signal');
+    if (externalSignal instanceof AbortSignal) {
+      const externalSignalLink = () => unsubscribeAbortController.abort();
+
+      externalSignal.addEventListener('abort', externalSignalLink);
+      this.connectionSubscription.add(() =>
+        externalSignal?.removeEventListener('abort', externalSignalLink),
+      );
+    }
 
     const requestInit: RequestInit = {
       headers,
       cache: 'no-store',
       redirect: 'follow',
-      signal: abortController.signal,
     };
 
     this.connectionAttemptTime = Date.now();
 
-    this.connectionSubscription = this.adapter(this.url, requestInit)
-      .pipe(
-        switchMap((request) => fetch(request)),
-        switchMap((response) => validate(response, true)),
-        tap((response) => this.receivedHeaders(response)),
-        switchMap((response) => {
-          const body = response.body;
-          if (!body) {
-            return EMPTY;
-          }
-
-          return fromStream(body);
+    this.connectionSubscription.add(
+      this.adapter(this.url, requestInit)
+        .pipe(
+          switchMap(async (request) => {
+            // Fetch explicitly using the unsubscribe
+            // abort controller signal
+            const response = await fetch(request, {
+              signal: unsubscribeAbortController.signal,
+            });
+
+            const validatedResponse = await validate(response, true);
+
+            this.receivedHeaders(validatedResponse);
+
+            return validatedResponse;
+          }),
+          switchMap((response) => {
+            // If response has no body, return empty to complete immediately
+            const body = response.body;
+            if (!body) {
+              return EMPTY;
+            }
+
+            return fromReadableStreamLike(body);
+          }),
+          map((value) => this.receivedData(value)),
+        )
+        .subscribe({
+          error: (error: unknown) => {
+            this.receivedError(error);
+          },
+          complete: () => {
+            this.receivedComplete();
+          },
         }),
-        map((value) => this.receivedData(value)),
-      )
-      .subscribe({
-        error: (error: unknown) => {
-          this.receivedError(error);
-        },
-        complete: () => {
-          this.receivedComplete();
-        },
-      });
-    this.connectionSubscription.add(() => {
-      abortController.abort();
-    });
+    );
   }
 
   //
@@ -166,6 +187,10 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
   //
 
   close(): void {
+    if (this.readyState === this.CLOSED) {
+      return;
+    }
+
     this.logger?.debug?.('close requested');
 
     this.readyState = this.CLOSED;
@@ -195,7 +220,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
 
     this.lastEventReceivedTime = lastEventReceivedTime;
 
-    // this.logger?.debug?.('starting event timeout checks');
+    this.logger?.trace?.('starting event timeout checks');
 
     this.eventTimeoutCheckHandle = window.setInterval(
       () => this.checkEventTimeout(),
@@ -204,11 +229,12 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
   }
 
   private stopEventTimeoutCheck() {
-    // this.logger?.debug?.('stopping event timeout checks');
-
     if (this.eventTimeoutCheckHandle) {
+      this.logger?.trace?.('stopping event timeout checks');
+
       clearInterval(this.eventTimeoutCheckHandle);
     }
+
     this.eventTimeoutCheckHandle = undefined;
   }
 
@@ -218,7 +244,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
       return;
     }
 
-    // this.logger?.debug?.('checking event timeout');
+    this.logger?.trace?.('checking event timeout');
 
     // Check elapsed time since last received event
     const elapsed = Date.now() - this.lastEventReceivedTime;
@@ -238,7 +264,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
 
   private receivedHeaders(response: Response) {
     if (this.readyState !== this.CONNECTING) {
-      this.logger?.error?.('Invalid readyState for receiveHaders', {
+      this.logger?.error?.('invalid readyState for receivedHeaders', {
         readyState: this.readyState,
       });
 
@@ -265,7 +291,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
 
   private receivedData(buffer: ArrayBuffer) {
     if (this.readyState !== this.OPEN) {
-      this.logger?.error?.('Invalid readyState for receiveData', {
+      this.logger?.error?.('invalid readyState for receiveData', {
         readyState: this.readyState,
       });
 
@@ -275,7 +301,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
       return;
     }
 
-    this.logger?.debug?.('received data', { length: validate.length });
+    this.logger?.debug?.('received data', { length: buffer.byteLength });
 
     this.eventParser.process(buffer, this.dispatchParsedEvent);
   }

package/src/fetch-request-factory.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { defer, map, Observable, of, switchMap } from 'rxjs';
+import { fromFetch } from 'rxjs/internal/observable/dom/fetch';
 import { AnyType } from './any-type';
 import { ConstructableClassType } from './class-type';
 import { validate } from './fetch';
@@ -145,10 +146,12 @@ export class FetchRequestFactory implements RequestFactory {
         method: requestSpec.method,
       });
 
-      const request = new Request(url.toString(), init);
-
-      return this.adapter?.(request) ?? of(request);
-    });
+      return of(new Request(url.toString(), init));
+    }).pipe(
+      switchMap(
+        async (request) => this.adapter?.adapt(this, request) ?? request,
+      ),
+    );
   }
 
   response(
@@ -158,7 +161,7 @@ export class FetchRequestFactory implements RequestFactory {
     const request$ =
       request instanceof Request ? of(request) : this.request(request);
     return request$.pipe(
-      switchMap((req) => fetch(req)),
+      switchMap((req) => fromFetch(req)),
       switchMap((response) =>
         validate(response, dataExpected ?? false, this.problemTypes),
       ),

package/src/index.ts

@@ -35,6 +35,7 @@ export * from './sunday-error';
 export * from './problem';
 export * from './date-time-types';
 export * from './result-response';
+export * from './request-adapters';
 
 export * from './util/base64';
 export * from './util/hex';

package/src/media-type-codecs/cbor-decoder.ts

@@ -28,7 +28,7 @@ import {
   ZoneId,
   ZoneOffset,
 } from '@js-joda/core';
-import { CBOR } from '@outfoxx/cbor-redux';
+import { CBOR, TaggedValue } from 'cbor-redux';
 import { JsonParser } from '@outfoxx/jackson-js';
 import { CustomMapper, Deserializer } from '@outfoxx/jackson-js/dist/@types';
 import { AnyType } from '../any-type';
@@ -96,14 +96,23 @@ export class CBORDecoder implements MediaTypeDecoder {
   }
 
   decodeData<T>(buffer: ArrayBuffer, type: AnyType): T {
-    return this.parser.transform(CBOR.decode(buffer, this.untag), {
-      deserializers: this.customDeserializers,
-      mainCreator: () => type,
-    });
+    return this.parser.transform(
+      CBOR.decode(buffer, this.untag, { mode: 'loose' }),
+      {
+        deserializers: this.customDeserializers,
+        mainCreator: () => type,
+      },
+    );
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private untag = (value: any, tag: number) => {
+  private untag = (key: unknown, value: unknown) => {
+    if (!(value instanceof TaggedValue)) {
+      return value;
+    }
+
+    const tag = value.tag;
+    value = value.value;
+
     switch (tag) {
       case isoDateTimeTag:
         if (typeof value !== 'string') {
@@ -203,7 +212,7 @@ export class CBORDecoder implements MediaTypeDecoder {
         );
         return ZonedDateTime.ofInstant(instant, ZoneId.UTC);
       } else {
-        console.error('Unsupported date decoding format');
+        throw Error('Unsupported date decoding format');
       }
     }
     if (typeof value === 'string') {
@@ -252,7 +261,7 @@ export class CBORDecoder implements MediaTypeDecoder {
         );
         return OffsetDateTime.ofInstant(instant, ZoneId.UTC);
       } else {
-        console.error('Unsupported date decoding format');
+        throw new Error('Unsupported date decoding format');
       }
     }
     if (typeof value === 'string') {
@@ -465,7 +474,7 @@ export class CBORDecoder implements MediaTypeDecoder {
       ) {
         return new Date(value * 1000);
       } else {
-        console.error('Unsupported date decoding format');
+        throw new Error('Unsupported date decoding format');
       }
     }
     if (typeof value === 'string') {