@gopowerteam/request 0.1.20 → 0.2.0

package/dist/index.mjs

@@ -0,0 +1,244 @@
+//#region src/interfaces/request-generate.interface.ts
+let RequestGenerateType = /* @__PURE__ */ function(RequestGenerateType) {
+	RequestGenerateType["Request"] = "TO_REQUEST";
+	RequestGenerateType["URL"] = "TO_URL";
+	return RequestGenerateType;
+}({});
+
+//#endregion
+//#region src/interfaces/request-plugin.interface.ts
+let PluginLifecycle = /* @__PURE__ */ function(PluginLifecycle) {
+	PluginLifecycle["before"] = "before";
+	PluginLifecycle["after"] = "after";
+	PluginLifecycle["catch"] = "catch";
+	return PluginLifecycle;
+}({});
+
+//#endregion
+//#region src/interfaces/request-send.interface.ts
+/**
+* 请求方法类型
+*/
+let RequestMethod = /* @__PURE__ */ function(RequestMethod) {
+	RequestMethod["Get"] = "GET";
+	RequestMethod["Post"] = "POST";
+	RequestMethod["Put"] = "PUT";
+	RequestMethod["Delete"] = "DELETE";
+	RequestMethod["Options"] = "OPTIONS";
+	RequestMethod["Head"] = "HEAD";
+	RequestMethod["Patch"] = "PATCH";
+	return RequestMethod;
+}({});
+
+//#endregion
+//#region src/utils/query-string.ts
+/**
+* 编码字符串
+*/
+function encodeValue(value, encode) {
+	if (!encode) return value;
+	return encodeURIComponent(value);
+}
+/**
+* 处理嵌套对象的键名
+*/
+function getKeyWithDot(key, childKey, allowDots) {
+	return allowDots ? `${key}.${childKey}` : `${key}[${childKey}]`;
+}
+/**
+* 递归处理对象值
+*/
+function processValue(value, options, parentKey = "") {
+	const result = [];
+	if (value === null || value === void 0) {
+		if (!options.skipNulls) result.push(`${parentKey}=`);
+		return result;
+	}
+	if (Array.isArray(value)) if (options.arrayFormat === "comma") {
+		const filteredValues = value.filter((item) => item !== null && item !== void 0);
+		if (filteredValues.length > 0) {
+			const encodedValue = encodeValue(filteredValues.map((item) => typeof item === "object" ? JSON.stringify(item) : item.toString()).join(","), options.encode !== false);
+			result.push(`${parentKey}=${encodedValue}`);
+		}
+	} else value.forEach((item, index) => {
+		let itemKey;
+		const shouldEncode = options.encode !== false;
+		if (options.arrayFormat === "indices") itemKey = parentKey ? `${parentKey}[${index}]` : `[${index}]`;
+		else if (options.arrayFormat === "brackets") itemKey = parentKey ? `${parentKey}[]` : "[]";
+		else itemKey = parentKey;
+		if (typeof item === "object" && item !== null) result.push(...processValue(item, options, itemKey));
+		else {
+			const encodedValue = encodeValue(item.toString(), shouldEncode);
+			result.push(`${itemKey}=${encodedValue}`);
+		}
+	});
+	else if (typeof value === "object") Object.keys(value).forEach((childKey) => {
+		const fullKey = parentKey ? getKeyWithDot(parentKey, childKey, options.allowDots || false) : childKey;
+		result.push(...processValue(value[childKey], options, fullKey));
+	});
+	else {
+		const shouldEncode = options.encode !== false;
+		const encodedValue = encodeValue(value.toString(), shouldEncode);
+		const encodedKey = options.encodeValuesOnly ? parentKey : encodeValue(parentKey, shouldEncode);
+		result.push(`${encodedKey}=${encodedValue}`);
+	}
+	return result;
+}
+/**
+* 将对象序列化为查询字符串
+*/
+function stringify(obj, options = {}) {
+	const { arrayFormat = "indices", skipNulls = true, allowDots = true, encodeValuesOnly = false, encode = true, addQueryPrefix = false } = options;
+	if (!obj || typeof obj !== "object") return options.addQueryPrefix ? "?" : "";
+	const parts = [];
+	Object.keys(obj).forEach((key) => {
+		const value = obj[key];
+		const processedValues = processValue(value, {
+			arrayFormat,
+			skipNulls,
+			allowDots,
+			encodeValuesOnly,
+			encode,
+			addQueryPrefix
+		}, key);
+		parts.push(...processedValues);
+	});
+	const queryString = parts.join("&");
+	return addQueryPrefix ? queryString ? `?${queryString}` : "?" : queryString;
+}
+
+//#endregion
+//#region src/request-service.ts
+var RequestService = class RequestService {
+	static config;
+	static instance;
+	/**
+	* 获取服务请求单例
+	*/
+	static getInstance() {
+		if (this.instance) return this.instance;
+		return new RequestService();
+	}
+	/**
+	* 获取RequestAdatper
+	* @returns RequestAdapter
+	*/
+	getRequestAdapter() {
+		if (!RequestService.config.adapter) throw new Error("请检查是否配置请求Adatper");
+		return RequestService.config.adapter;
+	}
+	/**
+	* 执行前置插件逻辑
+	* @param plugins
+	* @param options
+	*/
+	async execRequestPlugin(plugins = [], options) {
+		const extraParams = {};
+		const appendParams = (params) => {
+			Object.assign(extraParams, params || {});
+		};
+		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;
+	}
+	/**
+	* 执行前置插件逻辑
+	*/
+	execResponsePlugin(leftcycle, plugins = [], options, response) {
+		plugins.forEach((plugin) => {
+			const leftcycleFn = plugin[leftcycle];
+			if (leftcycleFn) leftcycleFn.bind(plugin)(response, options);
+		});
+		RequestService.config.plugins.forEach((plugin) => {
+			const leftcycleFn = plugin[leftcycle];
+			if (leftcycleFn) leftcycleFn.bind(plugin)(response, options);
+		});
+	}
+	/**
+	* 转换请求路径
+	*/
+	parseRequestPath(path, paramsPath, service) {
+		if (service) path = `/${service}/${path}`.replace(/\/{2,3}/g, "/");
+		if (paramsPath) return Object.entries(paramsPath).reduce((r, [key, value]) => r.replace(`{${key}}`, value.toString()), path);
+		else return path;
+	}
+	/**
+	* 开始请求
+	* @param adapter
+	* @param options
+	* @returns  Promise
+	*/
+	startRequest(adapter, options, extraParams) {
+		return adapter.request({
+			baseURL: RequestService.config.gateway,
+			pathURL: this.parseRequestPath(options.path, options.paramsPath, options.service),
+			method: options.method,
+			headers: options.headers || {},
+			paramsQuery: options.paramsQuery,
+			paramsBody: options.paramsBody,
+			extraParams
+		});
+	}
+	/**
+	* 执行拦截器
+	* @param response 请求响应对象
+	* @returns Promise
+	*/
+	execInterceptors(response, hasException = false) {
+		const interceptors = RequestService.config?.interceptors;
+		if (!interceptors?.status || !interceptors?.error || !interceptors?.success || !interceptors?.exception) throw new Error("请检查拦截器配置");
+		const status = interceptors.status.exec(response) && !hasException;
+		if (hasException) interceptors.exception.exec(response);
+		if (status) return Promise.resolve(interceptors.success.exec(response));
+		else return Promise.reject(interceptors.error.exec(response));
+	}
+	/**
+	* 发送请求
+	* @param {RequestSendOptions} options 请求选项
+	* @param {RequestPlugin[]} requestPlugins 请求插件
+	* @returns Promise
+	*/
+	async send(options, requestPlugins = []) {
+		if (!RequestService.config) throw new Error("请检查请求配置是否完成");
+		let hasException = false;
+		const adapter = this.getRequestAdapter();
+		const plugins = requestPlugins.filter(Boolean);
+		const extraParams = await this.execRequestPlugin(plugins, options);
+		const response = await this.startRequest(adapter, options, extraParams).then((response) => adapter.transformResponse(response)).catch((exception) => {
+			hasException = true;
+			return adapter.transformException(exception);
+		});
+		if (!hasException) this.execResponsePlugin(PluginLifecycle.after, plugins, options, response);
+		else this.execResponsePlugin(PluginLifecycle.catch, plugins, options, response);
+		return this.execInterceptors(response, hasException);
+	}
+	/**
+	* 生成请求路径
+	* @param {RequestSendOptions} options 请求选项
+	* @param {RequestPlugin[]} plugins 请求插件
+	* @returns string
+	*/
+	toURL(options, plugins = []) {
+		if (!RequestService.config) throw new Error("请检查请求配置是否完成");
+		if (plugins && plugins.length) this.execRequestPlugin(plugins.filter(Boolean), options);
+		return `${RequestService.config.gateway}${this.parseRequestPath(options.path, options.paramsPath, options.service)}${stringify(options.paramsQuery || {}, {
+			arrayFormat: "repeat",
+			skipNulls: true,
+			allowDots: true,
+			encodeValuesOnly: true,
+			encode: true,
+			addQueryPrefix: true,
+			...RequestService.config.qs || {}
+		})}`;
+	}
+};
+
+//#endregion
+//#region src/request-setup.ts
+function setup(config) {
+	RequestService.config = config;
+	RequestService.config?.adapter?.injectConfig?.(config);
+}
+
+//#endregion
+export { PluginLifecycle, RequestGenerateType, RequestMethod, RequestService, setup };

package/dist/request-adapter.interface-Cr5s4kIp.d.cts

@@ -0,0 +1,103 @@
+import { IStringifyOptions } from "qs";
+
+//#region src/interfaces/request-send.interface.d.ts
+/**
+ * 请求方法类型
+ */
+declare enum RequestMethod {
+  Get = "GET",
+  Post = "POST",
+  Put = "PUT",
+  Delete = "DELETE",
+  Options = "OPTIONS",
+  Head = "HEAD",
+  Patch = "PATCH"
+}
+interface RequestSendOptions {
+  service?: string;
+  path: string;
+  method: RequestMethod | string;
+  headers?: Record<string, string>;
+  paramsPath?: Record<string, string | number>;
+  paramsQuery?: Record<string, any>;
+  paramsBody?: any;
+}
+//#endregion
+//#region src/interfaces/request-plugin.interface.d.ts
+/**
+ * 请求插件
+ */
+interface RequestPlugin {
+  before?: (options: RequestSendOptions, appendParams: (params: Record<string, any>) => void) => void | Promise<void>;
+  after?: (response: AdapterResponse, options: RequestSendOptions) => void;
+  catch?: (response: AdapterResponse, options: RequestSendOptions) => void;
+}
+declare enum PluginLifecycle {
+  before = "before",
+  after = "after",
+  catch = "catch"
+}
+type RequestLifecycle = PluginLifecycle.before;
+type ResponseLifecycle = PluginLifecycle.after | PluginLifecycle.catch;
+//#endregion
+//#region src/interfaces/response-interceptor.interface.d.ts
+interface ResponseInterceptor {
+  exec: (response: AdapterResponse) => any;
+}
+//#endregion
+//#region src/interfaces/request-setup.interface.d.ts
+interface RequestSetupConfig {
+  gateway: string;
+  timeout?: number;
+  qs?: IStringifyOptions;
+  adapter?: RequestAdapter;
+  interceptors: {
+    status: ResponseInterceptor;
+    success: ResponseInterceptor;
+    error: ResponseInterceptor;
+    exception: ResponseInterceptor;
+  };
+  plugins: RequestPlugin[];
+}
+//#endregion
+//#region src/interfaces/request-adapter.interface.d.ts
+interface RequestAdapter {
+  /**
+   *  注入全局配置文件
+   * @param config
+   * @returns
+   */
+  injectConfig?: (config: RequestSetupConfig) => void;
+  /**
+   * 发送请求
+   */
+  request: (options: RequestAdapterOptions) => Promise<any>;
+  /**
+   * 转换Response
+   * @param response
+   */
+  transformResponse: (response: any) => AdapterResponse;
+  /**
+   * 转换Exception
+   * @param response
+   */
+  transformException: (response: any) => AdapterResponse;
+}
+interface RequestAdapterOptions {
+  baseURL: string;
+  pathURL: string;
+  headers: Record<string, string>;
+  method: RequestMethod | string;
+  paramsQuery?: Record<string, any>;
+  paramsBody?: any;
+  extraParams?: any;
+}
+interface AdapterResponse {
+  data: Record<string, any>;
+  status: number;
+  statusText: string;
+  headers: AdapterResponseHeaders;
+}
+type AdapterResponseHeaders = Record<string, string | string[] | number | boolean | undefined>;
+//#endregion
+export { RequestSetupConfig as a, RequestLifecycle as c, RequestMethod as d, RequestSendOptions as f, RequestAdapterOptions as i, RequestPlugin as l, AdapterResponseHeaders as n, ResponseInterceptor as o, RequestAdapter as r, PluginLifecycle as s, AdapterResponse as t, ResponseLifecycle as u };

package/package.json

@@ -1,47 +1,53 @@
 {
   "name": "@gopowerteam/request",
-  "private": false,
-  "version": "0.1.20",
   "type": "module",
-  "files": [
-    "dist",
-    "adapters.d.ts",
-    "README.md"
-  ],
+  "version": "0.2.0",
+  "private": false,
   "keywords": [
     "gopowerteam",
     "request"
   ],
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
     },
     "./adapters": {
-      "require": "./dist/adapters/index.cjs",
-      "import": "./dist/adapters/index.js",
-      "types": "./dist/adapters/index.d.ts"
+      "types": "./dist/adapters/index.d.mts",
+      "import": "./dist/adapters/index.mjs",
+      "require": "./dist/adapters/index.cjs"
     }
   },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
+  "files": [
+    "README.md",
+    "adapters.d.ts",
+    "dist"
+  ],
+  "dependencies": {
+    "axios": "^1.13.5",
+    "qs": "^6.15.0"
+  },
   "devDependencies": {
-    "@types/jest": "^29.4.0",
-    "@types/node": "18",
-    "@types/qs": "^6.9.7",
-    "jest": "^29.4.3",
-    "ts-jest": "^29.0.5",
-    "tsup": "^6.6.3",
-    "typescript": "^4.9.5"
+    "@types/node": "24",
+    "@types/qs": "^6.14.0",
+    "tsdown": "0.20.3",
+    "typescript": "^5.9.3",
+    "vitest": "^3.0.0"
   },
-  "dependencies": {
-    "axios": "^1.3.4",
-    "qs": "^6.11.0"
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
   },
   "scripts": {
-    "test": "jest --coverage",
-    "build": "tsup"
+    "dev": "tsdown --watch",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "build": "tsdown",
+    "lint": "eslint . --fix"
   }
 }

package/dist/adapters/index.d.ts

@@ -1,33 +0,0 @@
-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';
-
-declare class AxiosAdapter implements RequestAdapter {
-    private static axiosInstance;
-    private config;
-    injectConfig(config: RequestSetupConfig): void;
-    /**
-     * 获取Axios实例
-     */
-    private getAxiosInstance;
-    /**
-     * 发送请求
-     * @param options 请求参数
-     * @returns AxiosResponse
-     */
-    request({ baseURL, pathURL, headers, method, paramsQuery, paramsBody, extraParams }: RequestAdapterOptions): Promise<AxiosResponse<any, any>>;
-    /**
-     * 转换Response
-     * @param response
-     * @returns
-     */
-    transformResponse(response: AxiosResponse): AdapterResponse;
-    /**
-     * 转换Response
-     * @param response
-     * @returns
-     */
-    transformException(exception: AxiosError): AdapterResponse;
-}
-
-export { AxiosAdapter };

package/dist/adapters/index.js

@@ -1,97 +0,0 @@
-import {
-  __publicField
-} from "../chunk-XXPGZHWZ.js";
-
-// src/adapters/axios.adapter.ts
-import axios from "axios";
-import * as qs from "qs";
-var _AxiosAdapter = class {
-  config;
-  injectConfig(config) {
-    this.config = config;
-  }
-  /**
-   * 获取Axios实例
-   */
-  getAxiosInstance() {
-    if (!_AxiosAdapter.axiosInstance) {
-      _AxiosAdapter.axiosInstance = axios.create({
-        timeout: this.config?.timeout,
-        headers: {
-          "Content-Type": "application/json"
-        },
-        paramsSerializer: {
-          serialize: (params) => qs.stringify(
-            params,
-            this.config?.qs || {
-              arrayFormat: "repeat",
-              skipNulls: true,
-              allowDots: true,
-              encodeValuesOnly: true,
-              encode: true,
-              sort: (a, b) => a.localeCompare(b),
-              filter: (_, value) => ["", void 0, null].some((v) => v === value) ? void 0 : value
-            }
-          )
-        }
-      });
-    }
-    return _AxiosAdapter.axiosInstance;
-  }
-  /**
-   * 发送请求
-   * @param options 请求参数
-   * @returns AxiosResponse
-   */
-  request({
-    baseURL,
-    pathURL,
-    headers,
-    method,
-    paramsQuery,
-    paramsBody,
-    extraParams = {}
-  }) {
-    const axiosInstance = this.getAxiosInstance();
-    return axiosInstance.request({
-      method,
-      baseURL,
-      headers,
-      params: paramsQuery,
-      data: paramsBody,
-      url: pathURL,
-      ...extraParams
-    });
-  }
-  /**
-   * 转换Response
-   * @param response
-   * @returns
-   */
-  transformResponse(response) {
-    return {
-      data: response.data,
-      statusText: response.statusText,
-      status: response.status,
-      headers: response.headers
-    };
-  }
-  /**
-   * 转换Response
-   * @param response
-   * @returns
-   */
-  transformException(exception) {
-    return {
-      data: exception.response?.data || {},
-      statusText: exception.response?.statusText || "",
-      status: exception.response?.status || 400,
-      headers: exception.response?.headers || {}
-    };
-  }
-};
-var AxiosAdapter = _AxiosAdapter;
-__publicField(AxiosAdapter, "axiosInstance");
-export {
-  AxiosAdapter
-};

package/dist/chunk-XXPGZHWZ.js

@@ -1,10 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-
-export {
-  __publicField
-};

package/dist/index.d.ts

@@ -1,72 +0,0 @@
-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 {
-    static config: RequestSetupConfig;
-    static instance: RequestService;
-    /**
-     * 获取服务请求单例
-     */
-    static getInstance(): RequestService;
-    /**
-     * 获取RequestAdatper
-     * @returns
-     */
-    private getRequestAdapter;
-    /**
-     * 执行前置插件逻辑
-     * @param plugins
-     * @param options
-     */
-    private execRequestPlugin;
-    /**
-     * 执行前置插件逻辑
-     * @param plugins
-     * @param options
-     */
-    private execResponsePlugin;
-    /**
-     * 转换请求路径
-     */
-    private parseRequestPath;
-    /**
-     * 开始请求
-     * @param adapter
-     * @param options
-     * @returns
-     */
-    private startRequest;
-    /**
-     * 执行拦截器
-     * @param response 请求响应对象
-     * @returns
-     */
-    private execInterceptors;
-    /**
-     * 发送请求
-     * @param {RequestSendOptions} options 请求选项
-     * @param {RequestPlugin[]} plugins 请求插件
-     * @returns
-     */
-    send(options: RequestSendOptions, requestPlugins?: (RequestPlugin | undefined)[]): Promise<any>;
-    /**
-     * 生成请求路径
-     * @param {RequestSendOptions} options 请求选项
-     * @param {RequestPlugin[]} plugins 请求插件
-     * @returns
-     */
-    toURL(options: RequestSendOptions, plugins?: (RequestPlugin | undefined)[]): string;
-}
-
-declare function setup(config: RequestSetupConfig): void;
-
-declare enum RequestGenerateType {
-    Request = "TO_REQUEST",
-    URL = "TO_URL"
-}
-interface RequestGenerateOptions {
-    type?: RequestGenerateType;
-}
-
-export { RequestGenerateOptions, RequestGenerateType, RequestPlugin, RequestSendOptions, RequestService, RequestSetupConfig, setup };