@gopowerteam/request 0.1.16 → 0.1.18

package/dist/adapters/index.d.ts

@@ -1,4 +1,4 @@
-import { c as RequestAdapter, R as RequestSetupConfig, d as RequestAdapterOptions, A as AdapterResponse } from '../request-plugin.interface-8152139f.js';
+import { c as RequestAdapter, R as RequestSetupConfig, d as RequestAdapterOptions, A as AdapterResponse } from '../request-plugin.interface-3df174bc.js';
 import { AxiosResponse, AxiosError } from 'axios';
 import 'qs';
 

package/dist/index.cjs

@@ -80,17 +80,21 @@ var _RequestService = class {
    * @param plugins
    * @param options
    */
-  execRequestPlugin(plugins = [], options) {
+  async execRequestPlugin(plugins = [], options) {
     const extraParams = {};
     const appendParams = (params) => {
       Object.assign(extraParams, params || {});
     };
-    _RequestService.config.plugins.forEach(
-      (service) => service.before && service.before(options, appendParams)
-    );
-    plugins.forEach(
-      (service) => service.before && service.before(options, appendParams)
-    );
+    for (const plugin of _RequestService.config.plugins) {
+      if (plugin.before) {
+        await plugin.before(options, appendParams);
+      }
+    }
+    for (const plugin of plugins) {
+      if (plugin.before) {
+        await plugin.before(options, appendParams);
+      }
+    }
     return extraParams;
   }
   /**
@@ -171,13 +175,14 @@ var _RequestService = class {
    * @param {RequestPlugin[]} plugins 请求插件
    * @returns
    */
-  async send(options, plugins = []) {
+  async send(options, requestPlugins = []) {
     if (!_RequestService.config) {
       throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
     }
     let hasException = false;
     const adapter = this.getRequestAdapter();
-    const extraParams = this.execRequestPlugin(plugins, options);
+    const plugins = requestPlugins.filter(Boolean);
+    const extraParams = await this.execRequestPlugin(plugins, options);
     const response = await this.startRequest(adapter, options, extraParams).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
       hasException = true;
       return adapter.transformException(exception);

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RequestSetupConfig, a as RequestSendOptions, b as RequestPlugin } from './request-plugin.interface-8152139f.js';
-export { A as AdapterResponse, e as AdapterResponseHeaders, P as PluginLifecycle, c as RequestAdapter, d as RequestAdapterOptions, f as RequestLifecycle, h as RequestMethod, i as ResponseInterceptor, g as ResponseLifecycle } from './request-plugin.interface-8152139f.js';
+import { R as RequestSetupConfig, a as RequestSendOptions, b as RequestPlugin } from './request-plugin.interface-3df174bc.js';
+export { A as AdapterResponse, e as AdapterResponseHeaders, P as PluginLifecycle, c as RequestAdapter, d as RequestAdapterOptions, f as RequestLifecycle, h as RequestMethod, i as ResponseInterceptor, g as ResponseLifecycle } from './request-plugin.interface-3df174bc.js';
 import 'qs';
 
 declare class RequestService {
@@ -49,7 +49,7 @@ declare class RequestService {
      * @param {RequestPlugin[]} plugins 请求插件
      * @returns
      */
-    send(options: RequestSendOptions, plugins?: RequestPlugin[]): Promise<any>;
+    send(options: RequestSendOptions, requestPlugins?: (RequestPlugin | undefined)[]): Promise<any>;
     /**
      * 生成请求路径
      * @param {RequestSendOptions} options 请求选项

package/dist/index.js

@@ -39,17 +39,21 @@ var _RequestService = class {
    * @param plugins
    * @param options
    */
-  execRequestPlugin(plugins = [], options) {
+  async execRequestPlugin(plugins = [], options) {
     const extraParams = {};
     const appendParams = (params) => {
       Object.assign(extraParams, params || {});
     };
-    _RequestService.config.plugins.forEach(
-      (service) => service.before && service.before(options, appendParams)
-    );
-    plugins.forEach(
-      (service) => service.before && service.before(options, appendParams)
-    );
+    for (const plugin of _RequestService.config.plugins) {
+      if (plugin.before) {
+        await plugin.before(options, appendParams);
+      }
+    }
+    for (const plugin of plugins) {
+      if (plugin.before) {
+        await plugin.before(options, appendParams);
+      }
+    }
     return extraParams;
   }
   /**
@@ -130,13 +134,14 @@ var _RequestService = class {
    * @param {RequestPlugin[]} plugins 请求插件
    * @returns
    */
-  async send(options, plugins = []) {
+  async send(options, requestPlugins = []) {
     if (!_RequestService.config) {
       throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
     }
     let hasException = false;
     const adapter = this.getRequestAdapter();
-    const extraParams = this.execRequestPlugin(plugins, options);
+    const plugins = requestPlugins.filter(Boolean);
+    const extraParams = await this.execRequestPlugin(plugins, options);
     const response = await this.startRequest(adapter, options, extraParams).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
       hasException = true;
       return adapter.transformException(exception);

package/dist/{request-plugin.interface-8152139f.d.ts → request-plugin.interface-3df174bc.d.ts}

@@ -83,7 +83,7 @@ type AdapterResponseHeaders = Record<string, string | string[] | number | boolea
  * 请求插件
  */
 interface RequestPlugin {
-    before?: (options: RequestSendOptions, appendParams: (params: Record<string, any>) => void) => void;
+    before?: (options: RequestSendOptions, appendParams: (params: Record<string, any>) => void) => void | Promise<void>;
     after?: (response: AdapterResponse, options: RequestSendOptions) => void;
     catch?: (response: AdapterResponse, options: RequestSendOptions) => void;
 }

package/package.json

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