@authme/core 2.2.0-rc.6 → 2.2.0-rc.8

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [2.2.0-rc.8](https://github.com/AuthMe01/web-client-sdk/compare/v2.2.0-rc.7...v2.2.0-rc.8) (2022-12-07)
+
+## [2.2.0-rc.7](https://github.com/AuthMe01/web-client-sdk/compare/v2.2.0-rc.6...v2.2.0-rc.7) (2022-12-07)
+
 ## [2.2.0-rc.6](https://github.com/AuthMe01/web-client-sdk/compare/v2.2.0-rc.5...v2.2.0-rc.6) (2022-12-05)
 
 ## [2.2.0-rc.5](https://github.com/AuthMe01/web-client-sdk/compare/v2.2.0-rc.4...v2.2.0-rc.5) (2022-12-03)

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@authme/core",
-  "version": "2.2.0-rc.6",
+  "version": "2.2.0-rc.8",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@authme/util": "2.2.0-rc.6",
+    "@authme/util": "2.2.0-rc.8",
     "three": "^0.136.0",
     "tslib": "^2.3.0"
   }

package/src/lib/data-access/http-client.d.ts

@@ -6,4 +6,11 @@ export interface RequestOptions {
         [param: string]: string;
     };
 }
-export declare function sendRequest(url: string, method?: string, body?: any, contentType?: string): Promise<any>;
+export declare function sendRequest<TResp = any>(url: string, method?: string, { body, contentType, expectedResponseContentTypes, accessToken, baseUrl, sdkInfo, }?: {
+    body?: unknown;
+    contentType?: string;
+    expectedResponseContentTypes?: string[];
+    accessToken?: string;
+    baseUrl?: string;
+    sdkInfo?: string;
+}): Promise<TResp>;

package/src/lib/data-access/http-client.js

@@ -4,40 +4,111 @@ exports.sendRequest = void 0;
 const tslib_1 = require("tslib");
 const util_1 = require("@authme/util");
 const model_1 = require("../model");
-function sendRequest(url, method = 'GET', body = null, contentType = 'application/json') {
+function tryLoadAndParseJsonAsync(response) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = {
-            method,
-            body,
-            headers: {
-                Authorization: util_1.Storage.getItem('token')
-                    ? 'Bearer ' + util_1.Storage.getItem('token')
-                    : '',
-                'Content-Type': contentType,
-                'sdk-info': `sdk-version: ${util_1.Storage.getItem('SDKVersion')};${(0, util_1.getUserAgent)()}`,
-            },
-        };
-        if (contentType === 'multipart/form-data') {
-            delete options.headers['Content-Type'];
-        }
-        const normalizedUrl = new URL(url, util_1.Storage.getItem('apiBaseUrl') || '');
+        try {
+            return [undefined, yield response.json()];
+        }
+        catch (error) {
+            return [error, undefined];
+        }
+    });
+}
+function tryLoadAndParseTextAsync(response) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            return [undefined, yield response.text()];
+        }
+        catch (error) {
+            return [error, undefined];
+        }
+    });
+}
+function tryLoadArrayBufferAsync(response) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            return [undefined, yield response.arrayBuffer()];
+        }
+        catch (error) {
+            return [error, undefined];
+        }
+    });
+}
+function sendRequest(url, method = 'GET', { body = undefined, contentType = 'application/json', expectedResponseContentTypes = null, 
+// 可以透過代入 null 的方式來取消預設值。
+accessToken = util_1.Storage.getItem('token'), baseUrl = util_1.Storage.getItem('apiBaseUrl'), sdkInfo = [
+    `sdk-version: ${util_1.Storage.getItem('SDKVersion')}`,
+    (0, util_1.getUserAgent)(),
+].join(';'), } = {}) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = Object.assign(Object.assign({ method }, (typeof body !== undefined ? { body: body } : {})), { headers: Object.assign(Object.assign(Object.assign({}, (accessToken
+                ? {
+                    Authorization: 'Bearer ' + accessToken,
+                }
+                : {})), (typeof body !== 'undefined' && contentType !== 'multipart/form-data'
+                ? {
+                    'Content-Type': contentType,
+                }
+                : {})), (sdkInfo ? { 'sdk-info': sdkInfo } : {})) });
         let resp;
         try {
+            const normalizedUrl = baseUrl ? new URL(url, baseUrl).toString() : url;
             resp = yield fetch(normalizedUrl.toString(), options);
         }
         catch (error) {
             throw new model_1.AuthmeError(model_1.ErrorCode.NETWORK_ERROR, error);
         }
-        if (resp === null || resp === void 0 ? void 0 : resp.ok) {
-            return resp.json();
+        const responseContentType = resp.headers.has('content-type')
+            ? resp.headers.get('content-type')
+            : undefined;
+        const errorMessages = [];
+        let parsedError;
+        let responseContent;
+        if (!responseContentType) {
+            [parsedError, responseContent] = [undefined, undefined];
+        }
+        else if (responseContentType.indexOf('application/json') >= 0) {
+            [parsedError, responseContent] = yield tryLoadAndParseJsonAsync(resp);
+        }
+        else if (responseContentType.indexOf('text/json') >= 0) {
+            [parsedError, responseContent] = yield tryLoadAndParseJsonAsync(resp);
+        }
+        else if (responseContentType.indexOf('text/') >= 0) {
+            [parsedError, responseContent] = yield tryLoadAndParseTextAsync(resp);
+        }
+        else if (responseContentType.indexOf('application/javascript') >= 0) {
+            [parsedError, responseContent] = yield tryLoadAndParseTextAsync(resp);
         }
         else {
+            [parsedError, responseContent] = yield tryLoadArrayBufferAsync(resp);
+        }
+        if (!resp.ok) {
+            errorMessages.push('status code not in the range 200-299');
+        }
+        if (parsedError) {
+            errorMessages.push('parsedError when load/parse response');
+        }
+        if (expectedResponseContentTypes) {
+            if (!responseContentType ||
+                expectedResponseContentTypes.every((v) => responseContentType.indexOf(v) < 0)) {
+                errorMessages.push(`responseContentType: expected value = ${responseContentType}` +
+                    `, but actual value = ${responseContentType}`);
+            }
+        }
+        if (errorMessages.length !== 0) {
             throw new model_1.AuthmeError(model_1.ErrorCode.HTTP_ERROR_RESPONSE, {
-                status: resp.status,
-                ok: resp.ok,
-                error: yield resp.json(),
+                errorMessages,
+                meta: {
+                    status: resp.status,
+                    ok: resp.ok,
+                    url,
+                    responseContentType,
+                    responseContent,
+                    parsedError,
+                },
             });
         }
+        return responseContent;
     });
 }
 exports.sendRequest = sendRequest;

package/src/lib/data-access/http-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/data-access/http-client.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AACrD,oCAAkD;AAOlD,SAAsB,WAAW,CAC/B,GAAW,EACX,MAAM,GAAG,KAAK,EACd,OAAY,IAAI,EAChB,WAAW,GAAG,kBAAkB;;QAEhC,MAAM,OAAO,GAAG;YACd,MAAM;YACN,IAAI;YACJ,OAAO,EAAE;gBACP,aAAa,EAAE,cAAO,CAAC,OAAO,CAAC,OAAO,CAAC;oBACrC,CAAC,CAAC,SAAS,GAAG,cAAO,CAAC,OAAO,CAAC,OAAO,CAAC;oBACtC,CAAC,CAAC,EAAE;gBACN,cAAc,EAAE,WAAW;gBAC3B,UAAU,EAAE,gBAAgB,cAAO,CAAC,OAAO,CACzC,YAAY,CACb,IAAI,IAAA,mBAAY,GAAE,EAAE;aACtB;SACF,CAAC;QACF,IAAI,WAAW,KAAK,qBAAqB,EAAE;YACzC,OAAQ,OAAe,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;SACjD;QACD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,cAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,IAAI,IAAI,CAAC;QACT,IAAI;YACF,IAAI,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;SACvD;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,mBAAW,CAAC,iBAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SACvD;QAED,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACpB;aAAM;YACL,MAAM,IAAI,mBAAW,CAAC,iBAAS,CAAC,mBAAmB,EAAE;gBACnD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,MAAM,IAAI,CAAC,IAAI,EAAE;aACzB,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAvCD,kCAuCC"}
+{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/data-access/http-client.ts"],"names":[],"mappings":"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"}