@anjianshi/utils 3.0.7 → 3.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -31,12 +31,12 @@
     "redis": "^5.5.6",
     "typescript": "^5.8.3",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-prettier": "3.0.5",
+    "@anjianshi/presets-eslint-base": "6.0.0",
     "@anjianshi/presets-eslint-node": "6.0.0",
     "@anjianshi/presets-eslint-react": "6.0.0",
+    "@anjianshi/presets-eslint-typescript": "6.0.0",
     "@anjianshi/presets-typescript": "3.2.5",
-    "@anjianshi/presets-eslint-base": "6.0.0",
-    "@anjianshi/presets-eslint-typescript": "6.0.0"
+    "@anjianshi/presets-prettier": "3.0.5"
   },
   "peerDependencies": {
     "@emotion/react": "^11.14.0",

package/safe-request.d.ts

@@ -15,8 +15,10 @@ interface Options {
     data?: FormData | Record<string, any>;
     /** 超时时间，不指定或设为 0 代表不限 */
     timeout?: number;
+    /** 是否把响应内容作为二进制处理（结果是 blob） */
+    binary?: boolean;
 }
-type FormattedOptions = Required<Pick<Options, 'url' | 'method' | 'headers' | 'body' | 'timeout'>>;
+type FormattedOptions = Required<Pick<Options, 'url' | 'method' | 'headers' | 'body' | 'timeout' | 'binary'>>;
 type PredefinedOptions = Pick<Options, 'urlPrefix' | 'method' | 'headers' | 'timeout'>;
 /**
  * 建立一个请求发起器，并可预设部分选项。
@@ -37,6 +39,13 @@ export declare class SafeRequestClient {
     formatOptions(input: Options): Promise<FormattedOptions>;
     /** 请求发起前调用此方法补充 Headers 内容 */
     protected getHeaders(options: FormattedOptions, inputOptions: Options): Record<string, string> | undefined | Promise<Record<string, string> | undefined>;
+    /**
+     * 解析响应内容
+     * - 若 options.binary 为 true，返回二进制结果
+     * - 若 response Content-Type 为 'text/' 开头，返回文本结果
+     * - 若 response Content-Type 为 'application/json' 开头，返回 JSON 结构
+     * - 其他情况，尝试解析成 JSON，成功则返回 JSON 否则返回纯文本
+     */
     protected parseResponse<T>(options: FormattedOptions, response: Response): Promise<Result<T>>;
     /** 若请求未成功发起，会触发此回调来生成失败信息 */
     protected onRequestError(error: Error, url: string): import("./lang/result.js").Failed<undefined>;

package/safe-request.js

@@ -1,5 +1,5 @@
 import { sleep } from './lang/async.js';
-import { failed, handleException } from './lang/result.js';
+import { success, failed, handleException } from './lang/result.js';
 import { getLogger } from './logging/index.js';
 import { combineUrl } from './url.js';
 /**
@@ -60,7 +60,7 @@ export class SafeRequestClient {
     }
     async formatOptions(input) {
         const predefined = this.prefefinedOptions;
-        const { urlPrefix = predefined.urlPrefix ?? '', url: rawUrl, query = {}, method = predefined.method ?? 'GET', headers: rawHeaders = {}, body: rawBody = null, data, timeout = predefined.timeout ?? 0, } = input;
+        const { urlPrefix = predefined.urlPrefix ?? '', url: rawUrl, query = {}, method = predefined.method ?? 'GET', headers: rawHeaders = {}, body: rawBody = null, data, timeout = predefined.timeout ?? 0, binary = false, } = input;
         const headers = {
             ...(predefined.headers ?? {}),
             ...rawHeaders,
@@ -82,6 +82,7 @@ export class SafeRequestClient {
             headers,
             body,
             timeout,
+            binary,
         };
         Object.assign(options.headers, await this.getHeaders(options, input));
         return options;
@@ -94,19 +95,31 @@ export class SafeRequestClient {
     inputOptions) {
         return undefined;
     }
+    /**
+     * 解析响应内容
+     * - 若 options.binary 为 true，返回二进制结果
+     * - 若 response Content-Type 为 'text/' 开头，返回文本结果
+     * - 若 response Content-Type 为 'application/json' 开头，返回 JSON 结构
+     * - 其他情况，尝试解析成 JSON，成功则返回 JSON 否则返回纯文本
+     */
     async parseResponse(options, response) {
-        let result;
-        result = await handleException(response.json());
-        if (result.success)
-            return result;
+        if (options.binary) {
+            return (await handleException(response.blob()));
+        }
         const contentType = (response.headers.get('Content-Type') ?? '').toLowerCase().trim();
-        if (contentType.startsWith('text/') || contentType === '') {
-            result = (await handleException(response.text()));
-            if (result.success)
-                return result;
+        const textResult = await handleException(response.text());
+        if (contentType.startsWith('text/') || !textResult.success)
+            return textResult;
+        let jsonResult;
+        try {
+            jsonResult = success(JSON.parse(textResult.data));
+        }
+        catch (error) {
+            jsonResult = failed(error.message);
         }
-        result = (await handleException(response.blob()));
-        return result;
+        if (contentType.startsWith('application/json') || jsonResult.success)
+            return jsonResult;
+        return textResult;
     }
     /** 若请求未成功发起，会触发此回调来生成失败信息 */
     onRequestError(error, url) {