@uni-helper/axios-adapter 1.5.3 → 1.16.0

package/dist/index.js

@@ -1,350 +1,315 @@
-import { Axios, AxiosHeaders, AxiosError, CanceledError } from 'axios';
-import buildURL from 'axios/unsafe/helpers/buildURL';
-import speedometer from 'axios/unsafe/helpers/speedometer';
-import buildFullPath from 'axios/unsafe/core/buildFullPath';
-import settle from 'axios/unsafe/core/settle';
-
-// src/index.ts
+import { Axios, AxiosError, AxiosHeaders, CanceledError } from "axios";
+import buildFullPath from "axios/unsafe/core/buildFullPath";
+import buildURL from "axios/unsafe/helpers/buildURL";
+import speedometer from "axios/unsafe/helpers/speedometer";
+import settle from "axios/unsafe/core/settle";
+//#region src/utils.ts
 function getMethodType(config) {
-  const { method: rawMethod = "GET" } = config;
-  const method = rawMethod.toLocaleLowerCase();
-  switch (method) {
-    case "download":
-      return "download";
-    case "upload":
-      return "upload";
-    default:
-      return "request";
-  }
+	const { method: rawMethod = "GET" } = config;
+	switch (rawMethod.toLocaleLowerCase()) {
+		case "download": return "download";
+		case "upload": return "upload";
+		default: return "request";
+	}
 }
 function resolveOptions(userOptions) {
-  return {
-    ...userOptions
-  };
+	return { ...userOptions };
 }
 function resolveUniAppRequestOptions(config, _options) {
-  var _a, _b;
-  const data = config.data;
-  const responseType = config.responseType === "arraybuffer" ? "arraybuffer" : "text";
-  const dataType = responseType === "text" ? "json" : void 0;
-  const { headers, baseURL, ...requestConfig } = config;
-  const requestHeaders = AxiosHeaders.from(serializeObject(headers)).normalize(false);
-  if (config.auth) {
-    const username = config.auth.username || "";
-    const password = config.auth.password ? unescape(encodeURIComponent(config.auth.password)) : "";
-    requestHeaders.set(
-      "Authorization",
-      `Basic ${btoa(`${username}:${password}`)}`
-    );
-  }
-  const fullPath = buildFullPath(baseURL, config.url);
-  const method = (_b = (_a = config == null ? void 0 : config.method) == null ? void 0 : _a.toUpperCase()) != null ? _b : "GET";
-  const url = buildURL(fullPath, config.params, config.paramsSerializer);
-  const timeout = config.timeout || 6e4;
-  let formData = {};
-  if (data && typeof data === "string") {
-    try {
-      formData = JSON.parse(data);
-    } catch (error) {
-    }
-  }
-  const header = requestHeaders.toJSON();
-  return {
-    ...requestConfig,
-    url,
-    data,
-    header,
-    method,
-    responseType,
-    dataType,
-    timeout,
-    formData
-  };
+	const data = config.data;
+	const responseType = config.responseType === "arraybuffer" ? "arraybuffer" : "text";
+	const dataType = responseType === "text" ? "json" : void 0;
+	const { headers, baseURL, ...requestConfig } = config;
+	const requestHeaders = AxiosHeaders.from(serializeObject(headers)).normalize(false);
+	if (config.auth) {
+		const username = config.auth.username || "";
+		const password = config.auth.password ? unescape(encodeURIComponent(config.auth.password)) : "";
+		requestHeaders.set("Authorization", `Basic ${btoa(`${username}:${password}`)}`);
+	}
+	const fullPath = buildFullPath(baseURL, config.url);
+	const method = config?.method?.toUpperCase() ?? "GET";
+	const url = buildURL(fullPath, config.params, config.paramsSerializer);
+	const timeout = config.timeout || 6e4;
+	let formData = {};
+	if (data && typeof data === "string") try {
+		formData = JSON.parse(data);
+	} catch {}
+	const header = requestHeaders.toJSON();
+	return {
+		...requestConfig,
+		url,
+		data,
+		header,
+		method,
+		responseType,
+		dataType,
+		timeout,
+		formData
+	};
 }
 function progressEventReducer(listener, isDownloadStream) {
-  let bytesNotified = 0;
-  const _speedometer = speedometer(50, 250);
-  return (result) => {
-    const loaded = result.totalBytesWritten;
-    const total = result.totalBytesExpectedToWrite;
-    const progressBytes = loaded - bytesNotified;
-    const rate = _speedometer(progressBytes);
-    const inRange = loaded <= total;
-    bytesNotified = loaded;
-    const data = {
-      loaded,
-      total,
-      progress: total ? loaded / total : void 0,
-      bytes: progressBytes,
-      rate: rate || void 0,
-      estimated: rate && total && inRange ? (total - loaded) / rate : void 0,
-      event: result
-    };
-    data[isDownloadStream ? "download" : "upload"] = true;
-    listener(data);
-  };
+	let bytesNotified = 0;
+	const _speedometer = speedometer(50, 250);
+	return (result) => {
+		const loaded = result.totalBytesWritten;
+		const total = result.totalBytesExpectedToWrite;
+		const progressBytes = loaded - bytesNotified;
+		const rate = _speedometer(progressBytes);
+		const inRange = loaded <= total;
+		bytesNotified = loaded;
+		const data = {
+			loaded,
+			total,
+			progress: total ? loaded / total : void 0,
+			bytes: progressBytes,
+			rate: rate || void 0,
+			estimated: rate && total && inRange ? (total - loaded) / rate : void 0,
+			event: result
+		};
+		data[isDownloadStream ? "download" : "upload"] = true;
+		listener(data);
+	};
 }
+/**
+* ### 对象序列化
+* - 将一个对象序列化为一个纯净的、类似JSON的新对象。
+* - 此过程会过滤掉值为 null、undefined 或 false 的属性。
+*
+* @link https://github.com/axios/axios/blob/ef36347fb559383b04c755b07f1a8d11897fab7f/lib/core/AxiosHeaders.js#L238-L246
+* @param {Record<string, any> | null | undefined} sourceObj 要进行序列化的源对象。
+* @param {SerializeOptions} [options] 序列化选项。
+* @returns {Record<string, any>} 返回一个新的、纯净的 JavaScript 对象。
+*/
 function serializeObject(sourceObj, options) {
-  const resultObj = /* @__PURE__ */ Object.create(null);
-  if (!sourceObj)
-    return resultObj;
-  const { asStrings = false } = options || {};
-  forEach(sourceObj, (value, key) => {
-    if (value != null && value !== false) {
-      resultObj[key] = asStrings && Array.isArray(value) ? value.join(", ") : value;
-    }
-  });
-  return resultObj;
+	const resultObj = Object.create(null);
+	if (!sourceObj) return resultObj;
+	const { asStrings = false } = options || {};
+	forEach(sourceObj, (value, key) => {
+		if (value != null && value !== false) resultObj[key] = asStrings && Array.isArray(value) ? value.join(", ") : value;
+	});
+	return resultObj;
 }
+/**
+* Iterate over an Array or an Object invoking a function for each item.
+*
+* If `obj` is an Array callback will be called passing
+* the value, index, and complete array for each item.
+*
+* If 'obj' is an Object callback will be called passing
+* the value, key, and complete object for each property.
+*
+* @link https://github.com/axios/axios/blob/v1.x/lib/utils.js#L240
+*
+* @param {object | Array} obj The object to iterate
+* @param {Function} fn The callback to invoke for each item
+* @param {object} [options]
+* @param {boolean} [options.allOwnKeys]
+*/
 function forEach(obj, fn, { allOwnKeys = false } = {}) {
-  if (obj === null || typeof obj === "undefined")
-    return;
-  if (typeof obj !== "object")
-    obj = [obj];
-  if (Array.isArray(obj)) {
-    for (let i = 0, l = obj.length; i < l; i++) {
-      fn(obj[i], i, obj);
-    }
-  } else {
-    const keys = allOwnKeys ? Object.getOwnPropertyNames(obj) : Object.keys(obj);
-    const len = keys.length;
-    let key;
-    for (let i = 0; i < len; i++) {
-      key = keys[i];
-      fn(obj[key], key, obj);
-    }
-  }
+	if (obj === null || typeof obj === "undefined") return;
+	if (typeof obj !== "object") obj = [obj];
+	if (Array.isArray(obj)) for (let i = 0, l = obj.length; i < l; i++) fn(obj[i], i, obj);
+	else {
+		const keys = allOwnKeys ? Object.getOwnPropertyNames(obj) : Object.keys(obj);
+		const len = keys.length;
+		let key;
+		for (let i = 0; i < len; i++) {
+			key = keys[i];
+			fn(obj[key], key, obj);
+		}
+	}
 }
+//#endregion
+//#region src/methods/onCanceled.ts
 var OnCanceled = class {
-  constructor(config) {
-    this.config = config;
-  }
-  subscribe(task, reject) {
-    if (this.config.cancelToken || this.config.signal) {
-      this.onCanceled = (cancel) => {
-        if (!task)
-          return;
-        reject(
-          !cancel || cancel.type ? new CanceledError(void 0, void 0, this.config, task) : cancel
-        );
-        task.abort();
-        task = null;
-      };
-      if (this.config.cancelToken) {
-        this.config.cancelToken.subscribe(this.onCanceled);
-      }
-      if (this.config.signal && this.config.signal.addEventListener) {
-        this.config.signal.aborted ? this.onCanceled() : this.config.signal.addEventListener("abort", this.onCanceled);
-      }
-    }
-  }
-  unsubscribe() {
-    if (this.config.cancelToken) {
-      this.config.cancelToken.unsubscribe(this.onCanceled);
-    }
-    if (this.config.signal && this.config.signal.removeEventListener)
-      this.config.signal.removeEventListener("abort", this.onCanceled);
-  }
+	config;
+	onCanceled;
+	constructor(config) {
+		this.config = config;
+	}
+	subscribe(task, reject) {
+		if (this.config.cancelToken || this.config.signal) {
+			this.onCanceled = (cancel) => {
+				if (!task) return;
+				reject(!cancel || cancel.type ? new CanceledError(void 0, void 0, this.config, task) : cancel);
+				task.abort();
+				task = null;
+			};
+			if (this.config.cancelToken) this.config.cancelToken.subscribe(this.onCanceled);
+			if (this.config.signal && this.config.signal.addEventListener) this.config.signal.aborted ? this.onCanceled() : this.config.signal.addEventListener("abort", this.onCanceled);
+		}
+	}
+	unsubscribe() {
+		if (this.config.cancelToken) this.config.cancelToken.unsubscribe(this.onCanceled);
+		if (this.config.signal && this.config.signal.removeEventListener) this.config.signal.removeEventListener("abort", this.onCanceled);
+	}
 };
-
-// src/methods/download.ts
-var download = (config, options) => {
-  return new Promise((resolve, reject) => {
-    const requestOptions = resolveUniAppRequestOptions(
-      config);
-    const responseConfig = config;
-    responseConfig.headers = new AxiosHeaders(requestOptions.header);
-    const onCanceled = new OnCanceled(config);
-    let task = uni.downloadFile({
-      ...requestOptions,
-      success(result) {
-        var _a;
-        if (!task)
-          return;
-        const response = {
-          config: responseConfig,
-          data: result.tempFilePath,
-          headers: {},
-          status: result.statusCode,
-          statusText: (_a = result.errMsg) != null ? _a : "OK",
-          request: task
-        };
-        settle(resolve, reject, response);
-        task = null;
-      },
-      fail(error) {
-        const { errMsg = "" } = error != null ? error : {};
-        if (errMsg) {
-          const isTimeoutError = errMsg === "downloadFile:fail timeout";
-          if (isTimeoutError)
-            reject(new AxiosError(errMsg, AxiosError.ETIMEDOUT, responseConfig, task));
-          const isNetworkError = errMsg === "downloadFile:fail";
-          if (isNetworkError) {
-            reject(
-              new AxiosError(errMsg, AxiosError.ERR_NETWORK, responseConfig, task)
-            );
-          }
-        }
-        reject(new AxiosError(error.errMsg, void 0, responseConfig, task));
-        task = null;
-      },
-      complete() {
-        onCanceled.unsubscribe();
-      }
-    });
-    if (typeof config.onDownloadProgress === "function") {
-      task.onProgressUpdate(
-        progressEventReducer(config.onDownloadProgress, true)
-      );
-    }
-    if (typeof config.onHeadersReceived === "function")
-      task.onHeadersReceived(config.onHeadersReceived);
-    onCanceled.subscribe(task, reject);
-  });
+//#endregion
+//#region src/methods/download.ts
+const download = (config, options) => {
+	return new Promise((resolve, reject) => {
+		const requestOptions = resolveUniAppRequestOptions(config, options);
+		const responseConfig = config;
+		responseConfig.headers = new AxiosHeaders(requestOptions.header);
+		const onCanceled = new OnCanceled(config);
+		let task = uni.downloadFile({
+			...requestOptions,
+			success(result) {
+				if (!task) return;
+				settle(resolve, reject, {
+					config: responseConfig,
+					data: result.tempFilePath,
+					headers: {},
+					status: result.statusCode,
+					statusText: result.errMsg ?? "OK",
+					request: task
+				});
+				task = null;
+			},
+			fail(error) {
+				const { errMsg = "" } = error ?? {};
+				if (errMsg) {
+					if (errMsg === "downloadFile:fail timeout") reject(new AxiosError(errMsg, AxiosError.ETIMEDOUT, responseConfig, task));
+					if (errMsg === "downloadFile:fail") reject(new AxiosError(errMsg, AxiosError.ERR_NETWORK, responseConfig, task));
+				}
+				reject(new AxiosError(error.errMsg, void 0, responseConfig, task));
+				task = null;
+			},
+			complete() {
+				onCanceled.unsubscribe();
+			}
+		});
+		if (typeof config.onDownloadProgress === "function") task.onProgressUpdate(progressEventReducer(config.onDownloadProgress, true));
+		if (typeof config.onHeadersReceived === "function") task.onHeadersReceived(config.onHeadersReceived);
+		onCanceled.subscribe(task, reject);
+	});
 };
-var download_default = download;
-var upload = (config, options) => {
-  return new Promise((resolve, reject) => {
-    const requestOptions = resolveUniAppRequestOptions(config);
-    const responseConfig = config;
-    responseConfig.headers = new AxiosHeaders(requestOptions.header);
-    const onCanceled = new OnCanceled(config);
-    let task = uni.uploadFile({
-      ...requestOptions,
-      success(result) {
-        var _a;
-        if (!task)
-          return;
-        const response = {
-          config: responseConfig,
-          data: result.data,
-          headers: {},
-          status: result.statusCode,
-          statusText: (_a = result.errMsg) != null ? _a : "OK",
-          request: task
-        };
-        settle(resolve, reject, response);
-        task = null;
-      },
-      fail(error) {
-        const { errMsg = "" } = error != null ? error : {};
-        if (errMsg) {
-          const isTimeoutError = errMsg === "uploadFile:fail timeout";
-          const isNetworkError = errMsg === "uploadFile:fail file error";
-          if (isTimeoutError)
-            reject(new AxiosError(errMsg, AxiosError.ETIMEDOUT, responseConfig, task));
-          if (isNetworkError) {
-            reject(
-              new AxiosError(errMsg, AxiosError.ERR_NETWORK, responseConfig, task)
-            );
-          }
-        }
-        reject(new AxiosError(error.errMsg, void 0, responseConfig, task));
-        task = null;
-      },
-      complete() {
-        onCanceled.unsubscribe();
-      }
-    });
-    if (typeof config.onHeadersReceived === "function")
-      task.onHeadersReceived(config.onHeadersReceived);
-    onCanceled.subscribe(task, reject);
-  });
+//#endregion
+//#region src/methods/request.ts
+const request = (config, options) => {
+	return new Promise((resolve, reject) => {
+		const requestOptions = resolveUniAppRequestOptions(config, options);
+		const responseConfig = config;
+		responseConfig.headers = new AxiosHeaders(requestOptions.header);
+		const onCanceled = new OnCanceled(config);
+		let task = uni.request({
+			...requestOptions,
+			success(result) {
+				if (!task) return;
+				if (Array.isArray(result.header)) {
+					const dingHeader = {};
+					result.header.forEach((h) => Object.assign(dingHeader, h));
+					result.header = dingHeader;
+				}
+				const headers = new AxiosHeaders(result.header);
+				settle(resolve, reject, {
+					config: responseConfig,
+					data: result.data,
+					headers,
+					status: result.statusCode,
+					statusText: result.errMsg ?? "OK",
+					request: task,
+					cookies: result.cookies
+				});
+				task = null;
+			},
+			fail(error) {
+				const { errMsg = "" } = error ?? {};
+				if (errMsg) {
+					const isStatusError = errMsg === "request:fail http status error";
+					const isTimeoutError = errMsg === "request:fail timeout";
+					const isNetworkError = errMsg === "request:fail";
+					if (isTimeoutError) reject(new AxiosError(errMsg, AxiosError.ETIMEDOUT, responseConfig, task));
+					if (isNetworkError) reject(new AxiosError(errMsg, AxiosError.ERR_NETWORK, responseConfig, task));
+					if (isStatusError) {
+						const response = error ?? {};
+						reject(new AxiosError(errMsg, response.statusCode, responseConfig, task, response));
+					}
+				}
+				reject(new AxiosError(error.errMsg, void 0, responseConfig, task));
+				task = null;
+			},
+			complete() {
+				onCanceled.unsubscribe();
+			}
+		});
+		if (typeof config.onHeadersReceived === "function") task.onHeadersReceived(config.onHeadersReceived);
+		onCanceled.subscribe(task, reject);
+	});
 };
-var upload_default = upload;
-var request = (config, options) => {
-  return new Promise((resolve, reject) => {
-    const requestOptions = resolveUniAppRequestOptions(config);
-    const responseConfig = config;
-    responseConfig.headers = new AxiosHeaders(requestOptions.header);
-    const onCanceled = new OnCanceled(config);
-    let task = uni.request({
-      ...requestOptions,
-      success(result) {
-        var _a;
-        if (!task)
-          return;
-        if (Array.isArray(result.header)) {
-          const dingHeader = {};
-          result.header.forEach((h) => Object.assign(dingHeader, h));
-          result.header = dingHeader;
-        }
-        const headers = new AxiosHeaders(result.header);
-        const response = {
-          config: responseConfig,
-          data: result.data,
-          headers,
-          status: result.statusCode,
-          statusText: (_a = result.errMsg) != null ? _a : "OK",
-          request: task,
-          cookies: result.cookies
-        };
-        settle(resolve, reject, response);
-        task = null;
-      },
-      fail(error) {
-        const { errMsg = "" } = error != null ? error : {};
-        if (errMsg) {
-          const isTimeoutError = errMsg === "request:fail timeout";
-          const isNetworkError = errMsg === "request:fail";
-          if (isTimeoutError)
-            reject(new AxiosError(errMsg, AxiosError.ETIMEDOUT, responseConfig, task));
-          if (isNetworkError) {
-            reject(
-              new AxiosError(errMsg, AxiosError.ERR_NETWORK, responseConfig, task)
-            );
-          }
-        }
-        reject(new AxiosError(error.errMsg, void 0, responseConfig, task));
-        task = null;
-      },
-      complete() {
-        onCanceled.unsubscribe();
-      }
-    });
-    if (typeof config.onHeadersReceived === "function")
-      task.onHeadersReceived(config.onHeadersReceived);
-    onCanceled.subscribe(task, reject);
-  });
+//#endregion
+//#region src/methods/upload.ts
+const upload = (config, options) => {
+	return new Promise((resolve, reject) => {
+		const requestOptions = resolveUniAppRequestOptions(config, options);
+		const responseConfig = config;
+		responseConfig.headers = new AxiosHeaders(requestOptions.header);
+		const onCanceled = new OnCanceled(config);
+		let task = uni.uploadFile({
+			...requestOptions,
+			success(result) {
+				if (!task) return;
+				settle(resolve, reject, {
+					config: responseConfig,
+					data: result.data,
+					headers: {},
+					status: result.statusCode,
+					statusText: result.errMsg ?? "OK",
+					request: task
+				});
+				task = null;
+			},
+			fail(error) {
+				const { errMsg = "" } = error ?? {};
+				if (errMsg) {
+					const isTimeoutError = errMsg === "uploadFile:fail timeout";
+					const isNetworkError = errMsg === "uploadFile:fail file error";
+					if (isTimeoutError) reject(new AxiosError(errMsg, AxiosError.ETIMEDOUT, responseConfig, task));
+					if (isNetworkError) reject(new AxiosError(errMsg, AxiosError.ERR_NETWORK, responseConfig, task));
+				}
+				reject(new AxiosError(error.errMsg, void 0, responseConfig, task));
+				task = null;
+			},
+			complete() {
+				onCanceled.unsubscribe();
+			}
+		});
+		if (typeof config.onHeadersReceived === "function") task.onHeadersReceived(config.onHeadersReceived);
+		onCanceled.subscribe(task, reject);
+	});
 };
-var request_default = request;
-
-// src/methods/index.ts
+//#endregion
+//#region src/methods/index.ts
 function getMethod(config) {
-  const methodType = getMethodType(config);
-  switch (methodType) {
-    case "download":
-      return download_default;
-    case "upload":
-      return upload_default;
-    default:
-      return request_default;
-  }
+	switch (getMethodType(config)) {
+		case "download": return download;
+		case "upload": return upload;
+		default: return request;
+	}
 }
-
-// src/index.ts
+//#endregion
+//#region src/index.ts
 function createUniAppAxiosAdapter(userOptions = {}) {
-  const options = resolveOptions(userOptions);
-  Axios.prototype.download = function(url, config) {
-    return this.request({
-      url,
-      method: "download",
-      ...config
-    });
-  };
-  Axios.prototype.upload = function(url, data, config) {
-    return this.request({
-      url,
-      method: "upload",
-      data,
-      ...config
-    });
-  };
-  const uniappAdapter = (config) => {
-    const method = getMethod(config);
-    return method(config, options);
-  };
-  return uniappAdapter;
+	const options = resolveOptions(userOptions);
+	Axios.prototype.download = function(url, config) {
+		return this.request({
+			url,
+			method: "download",
+			...config
+		});
+	};
+	Axios.prototype.upload = function(url, data, config) {
+		return this.request({
+			url,
+			method: "upload",
+			data,
+			...config
+		});
+	};
+	const uniappAdapter = (config) => {
+		return getMethod(config)(config, options);
+	};
+	return uniappAdapter;
 }
-
+//#endregion
 export { createUniAppAxiosAdapter };

package/dist/types-BSLo1MIA.d.cts

@@ -0,0 +1,7 @@
+//#region src/types.d.ts
+interface Options {}
+interface UserOptions extends Partial<Options> {}
+interface UnpluginOptions {}
+interface UserUnpluginOptions extends Partial<UnpluginOptions> {}
+//#endregion
+export { UserUnpluginOptions as n, UserOptions as t };