@jpmorganchase/mosaic-from-http-request 0.1.0-beta.94 → 0.1.0-beta.96

package/dist/fromHttpRequest.d.ts

@@ -2,14 +2,31 @@ import 'event-target-polyfill';
 import 'yet-another-abortcontroller-polyfill';
 import { Observable } from 'rxjs';
 import { Request } from 'undici';
-export type ErrorResponse = {
-    error: boolean;
+/**
+ * Error raised when there an error is thrown
+ */
+export interface FromHttpRequestThrownError {
+    error: true;
+    kind: 'thrown';
+    message: string;
+}
+/**
+ * Error raised when there is a network/http error
+ */
+export interface FromHttpRequestHttpError {
+    error: true;
+    kind: 'http';
     message: string;
-};
-export declare function isErrorResponse<TData>(response: TData | ErrorResponse): response is ErrorResponse;
+    status: number;
+    statusText: string;
+    headers: Record<string, string>;
+}
+export type FromHttpRequestError = FromHttpRequestThrownError | FromHttpRequestHttpError;
+export declare function isFromHttpRequestError(response: any): response is FromHttpRequestError;
+export declare function isFromHttpRequestThrownError(response: any): response is FromHttpRequestThrownError;
 /**
  *
  * @param input The resource you would like to fetch. Can be a url or a request object.
  * @returns Observable of JSON or ErrorResponse
  */
-export declare function fromHttpRequest<TData>(input: string | Request): Observable<TData | ErrorResponse>;
+export declare function fromHttpRequest<TData>(input: string | Request): Observable<TData | FromHttpRequestError>;

package/dist/fromHttpRequest.js

@@ -1,11 +1,15 @@
 import 'event-target-polyfill';
 import 'yet-another-abortcontroller-polyfill';
-import { of } from 'rxjs';
+import { from, of } from 'rxjs';
 import { catchError, switchMap } from 'rxjs/operators';
 import contentTypeParser from 'fast-content-type-parse';
 import { fromFetch } from './fromFetch.js';
-export function isErrorResponse(response) {
-    return response.error !== undefined;
+export function isFromHttpRequestError(response) {
+    return (!!response.error && response.kind === 'http');
+}
+export function isFromHttpRequestThrownError(response) {
+    return (!!response.error &&
+        response.kind === 'thrown');
 }
 /**
  *
@@ -17,19 +21,31 @@ export function fromHttpRequest(input) {
         if (response.ok) {
             const contentTypeHeader = response.headers.get('content-type') || '';
             const contentType = contentTypeParser.safeParse(contentTypeHeader).type;
-            if (contentType.includes('json')) {
-                return response.json();
-            }
             if (contentType.includes('text')) {
-                return response.text();
+                return from(response.text());
             }
             // default to json
-            return response.json();
+            return from(response.json());
         }
-        return of({ error: true, message: `Error ${response.status}` });
-    }), catchError(err => {
-        console.error(err);
-        return of({ error: true, message: err.message });
+        const headersObj = {};
+        response.headers.forEach((value, key) => {
+            headersObj[key] = value;
+        });
+        return of({
+            error: true,
+            kind: 'http',
+            message: `A non-OK HTTP response was received from the server: ${response.status}/${response.statusText}`,
+            status: response.status,
+            statusText: response.statusText,
+            headers: headersObj
+        });
+    }), catchError(error => {
+        // Network or thrown error
+        return of({
+            error: true,
+            kind: 'thrown',
+            message: error.message
+        });
     }));
 }
 //# sourceMappingURL=fromHttpRequest.js.map

package/dist/fromHttpRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"fromHttpRequest.js","sourceRoot":"","sources":["../src/fromHttpRequest.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAC/B,OAAO,sCAAsC,CAAC;AAC9C,OAAO,EAAc,EAAE,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAI3C,MAAM,UAAU,eAAe,CAAQ,QAA+B;IACpE,OAAQ,QAA0B,CAAC,KAAK,KAAK,SAAS,CAAC;AACzD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAQ,KAAuB;IAC5D,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAC1B,SAAS,CAAC,QAAQ,CAAC,EAAE;QACnB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACrE,MAAM,WAAW,GAAG,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;YAExE,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,OAAO,QAAQ,CAAC,IAAI,EAAoB,CAAC;YAC3C,CAAC;YAED,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,OAAO,QAAQ,CAAC,IAAI,EAAoB,CAAC;YAC3C,CAAC;YACD,kBAAkB;YAClB,OAAO,QAAQ,CAAC,IAAI,EAAoB,CAAC;QAC3C,CAAC;QACD,OAAO,EAAE,CAAgB,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACjF,CAAC,CAAC,EACF,UAAU,CAAC,GAAG,CAAC,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,EAAE,CAAgB,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAiB,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"fromHttpRequest.js","sourceRoot":"","sources":["../src/fromHttpRequest.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAC/B,OAAO,sCAAsC,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAc,EAAE,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAyB3C,MAAM,UAAU,sBAAsB,CAAC,QAAa;IAClD,OAAO,CACL,CAAC,CAAE,QAAiC,CAAC,KAAK,IAAK,QAAiC,CAAC,IAAI,KAAK,MAAM,CACjG,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,QAAa;IAEb,OAAO,CACL,CAAC,CAAE,QAAuC,CAAC,KAAK;QAC/C,QAAuC,CAAC,IAAI,KAAK,QAAQ,CAC3D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC7B,KAAuB;IAEvB,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAC1B,SAAS,CAAC,QAAQ,CAAC,EAAE;QACnB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACrE,MAAM,WAAW,GAAG,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;YACxE,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAoB,CAAC,CAAC;YACjD,CAAC;YACD,kBAAkB;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAoB,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,UAAU,GAA2B,EAAE,CAAC;QAC9C,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACtC,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,CAA2B;YAClC,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,wDAAwD,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE;YACzG,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,UAAU;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,EACF,UAAU,CAAC,KAAK,CAAC,EAAE;QACjB,0BAA0B;QAC1B,OAAO,EAAE,CAA6B;YACpC,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpmorganchase/mosaic-from-http-request",
-  "version": "0.1.0-beta.94",
+  "version": "0.1.0-beta.96",
   "author": "",
   "description": "Utility package to turn HTTP fetch requests to observables.  This package can be deleted when node 18 is used.",
   "license": "Apache-2.0",
@@ -41,4 +41,4 @@
   "devDependencies": {
     "msw": "^2.0.0"
   }
-}
+}