@gopowerteam/request 0.1.5 → 0.1.6

package/dist/adapters/index.cjs

@@ -111,10 +111,10 @@ var _RequestService = class {
     let hasException = false;
     const adapter = this.getRequestAdapter();
     this.execRequestPlugin(plugins, options);
-    const response = await this.startRequest(adapter, options).catch((...response2) => {
+    const response = await this.startRequest(adapter, options).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
       hasException = true;
-      return response2;
-    }).then((response2) => adapter.transformResponse(response2));
+      return adapter.transformException(exception);
+    });
     if (!hasException) {
       this.execResponsePlugin("after" /* after */, plugins, options, response);
     } else {
@@ -166,6 +166,15 @@ var _AxiosAdapter = class {
       headers: response.headers
     };
   }
+  transformException(exception) {
+    var _a, _b, _c, _d;
+    return {
+      data: ((_a = exception.response) == null ? void 0 : _a.data) || {},
+      statusText: ((_b = exception.response) == null ? void 0 : _b.statusText) || "",
+      status: ((_c = exception.response) == null ? void 0 : _c.status) || 400,
+      headers: ((_d = exception.response) == null ? void 0 : _d.headers) || {}
+    };
+  }
 };
 var AxiosAdapter = _AxiosAdapter;
 __publicField(AxiosAdapter, "axiosInstance");

package/dist/adapters/index.d.ts

@@ -1,5 +1,5 @@
-import * as axios from 'axios';
-import { a as RequestAdapter, b as RequestAdapterOptions, A as AdapterResponse } from '../request-adapter.interface-f0b0f677.js';
+import { a as RequestAdapter, b as RequestAdapterOptions, A as AdapterResponse } from '../request-adapter.interface-bd32c0be.js';
+import { AxiosResponse, AxiosError } from 'axios';
 
 declare class AxiosAdapter implements RequestAdapter {
     private static axiosInstance;
@@ -12,13 +12,19 @@ declare class AxiosAdapter implements RequestAdapter {
      * @param options 请求参数
      * @returns AxiosResponse
      */
-    request({ baseURL, pathURL, headers, method, paramsQuery, paramsBody }: RequestAdapterOptions): Promise<axios.AxiosResponse<any, any>>;
+    request({ baseURL, pathURL, headers, method, paramsQuery, paramsBody }: RequestAdapterOptions): Promise<AxiosResponse<any, any>>;
     /**
      * 转换Response
      * @param response
      * @returns
      */
-    transformResponse(response: any): AdapterResponse;
+    transformResponse(response: AxiosResponse): AdapterResponse;
+    /**
+     * 转换Response
+     * @param response
+     * @returns
+     */
+    transformException(exception: AxiosError): AdapterResponse;
 }
 
 export { AxiosAdapter };

package/dist/adapters/index.js

@@ -1,7 +1,7 @@
 import {
   RequestService,
   __publicField
-} from "../chunk-QZESQRIV.js";
+} from "../chunk-BKQFIRDI.js";
 
 // src/adapters/axios.adapter.ts
 import axios from "axios";
@@ -43,6 +43,15 @@ var _AxiosAdapter = class {
       headers: response.headers
     };
   }
+  transformException(exception) {
+    var _a, _b, _c, _d;
+    return {
+      data: ((_a = exception.response) == null ? void 0 : _a.data) || {},
+      statusText: ((_b = exception.response) == null ? void 0 : _b.statusText) || "",
+      status: ((_c = exception.response) == null ? void 0 : _c.status) || 400,
+      headers: ((_d = exception.response) == null ? void 0 : _d.headers) || {}
+    };
+  }
 };
 var AxiosAdapter = _AxiosAdapter;
 __publicField(AxiosAdapter, "axiosInstance");

package/dist/{chunk-QZESQRIV.js → chunk-BKQFIRDI.js}

@@ -86,10 +86,10 @@ var _RequestService = class {
     let hasException = false;
     const adapter = this.getRequestAdapter();
     this.execRequestPlugin(plugins, options);
-    const response = await this.startRequest(adapter, options).catch((...response2) => {
+    const response = await this.startRequest(adapter, options).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
       hasException = true;
-      return response2;
-    }).then((response2) => adapter.transformResponse(response2));
+      return adapter.transformException(exception);
+    });
     if (!hasException) {
       this.execResponsePlugin("after" /* after */, plugins, options, response);
     } else {

package/dist/index.cjs

@@ -113,10 +113,10 @@ var _RequestService = class {
     let hasException = false;
     const adapter = this.getRequestAdapter();
     this.execRequestPlugin(plugins, options);
-    const response = await this.startRequest(adapter, options).catch((...response2) => {
+    const response = await this.startRequest(adapter, options).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
       hasException = true;
-      return response2;
-    }).then((response2) => adapter.transformResponse(response2));
+      return adapter.transformException(exception);
+    });
     if (!hasException) {
       this.execResponsePlugin("after" /* after */, plugins, options, response);
     } else {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RequestSendOptions, A as AdapterResponse, a as RequestAdapter } from './request-adapter.interface-f0b0f677.js';
-export { A as AdapterResponse, a as RequestAdapter, b as RequestAdapterOptions, c as RequestMethod, R as RequestSendOptions } from './request-adapter.interface-f0b0f677.js';
+import { R as RequestSendOptions, A as AdapterResponse, a as RequestAdapter } from './request-adapter.interface-bd32c0be.js';
+export { A as AdapterResponse, a as RequestAdapter, b as RequestAdapterOptions, c as RequestMethod, R as RequestSendOptions } from './request-adapter.interface-bd32c0be.js';
 import { IStringifyOptions } from 'qs';
 
 /**

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   PluginLifecycle,
   RequestService
-} from "./chunk-QZESQRIV.js";
+} from "./chunk-BKQFIRDI.js";
 
 // src/request-setup.ts
 function setup(config) {

package/dist/{request-adapter.interface-f0b0f677.d.ts → request-adapter.interface-bd32c0be.d.ts}

@@ -29,6 +29,11 @@ interface RequestAdapter {
      * @param any
      */
     transformResponse(response: any): AdapterResponse;
+    /**
+     * 转换Exception
+     * @param any
+     */
+    transformException(response: any): AdapterResponse;
 }
 interface RequestAdapterOptions {
     baseURL: string;
@@ -42,7 +47,7 @@ interface AdapterResponse {
     data: Record<string, any>;
     status: number;
     statusText: string;
-    headers: Record<string, string>;
+    headers: Record<string, string | string[] | undefined>;
 }
 
 export { AdapterResponse as A, RequestSendOptions as R, RequestAdapter as a, RequestAdapterOptions as b, RequestMethod as c };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request",
   "private": false,
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "files": [
     "dist",