@yeepay/client-utils 3.1.1 → 4.0.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import debug from "debug";
-import { AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from "axios";
+import { AxiosError, AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from "axios";
 
 //#region src/debug.d.ts
 declare const logger: Record<string, debug.Debugger> & debug.Debugger;
@@ -13,6 +13,23 @@ declare global {
   }
 }
 //#endregion
+//#region src/is.d.ts
+declare function isTouchDevice(): boolean;
+declare const BREAKPOINTS: {
+  MOBILE_MAX: number;
+  TABLET_MIN: number;
+  TABLET_MAX: number;
+  DESKTOP_MIN: number;
+};
+declare const MEDIA_QUERIES: {
+  MOBILE: string;
+  TABLET: string;
+  DESKTOP: string;
+};
+declare function isMobile(): boolean;
+declare function isTablet(): boolean;
+declare function isDesktop(): boolean;
+//#endregion
 //#region src/request/mock.d.ts
 /**
  * A valid `picomatch` glob pattern, or array of patterns.
@@ -76,11 +93,10 @@ interface ServiceFactoryCallbacks {
   notfoundCallback?: (response: AxiosResponse<any> | any) => any;
   requestInterceptor?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig;
   responseInterceptor?: (response: AxiosResponse<any>) => AxiosResponse<any>;
+  responseInterceptorFailCallback?: (error: AxiosError) => any;
 }
-type ServiceFactoryCallbacksCompatible = [ServiceFactoryCallbacks['successCallback']?, ServiceFactoryCallbacks['failCallback']?, ServiceFactoryCallbacks['unauthorizedCallback']?, ServiceFactoryCallbacks['forbiddenCallback']?, ServiceFactoryCallbacks['notfoundCallback']?, ServiceFactoryCallbacks['requestInterceptor']?, ServiceFactoryCallbacks['responseInterceptor']?];
 declare function verifySuccessCode<T extends string | number>(code: T, customCode?: T): boolean;
 declare function serviceFactory(options: ServiceFactoryOptions, callbacks: ServiceFactoryCallbacks): AxiosInstance;
-declare function serviceFactory(options: ServiceFactoryOptions, ...callbacks: ServiceFactoryCallbacksCompatible): AxiosInstance;
 //#endregion
 //#region src/request/token.d.ts
 declare function getToken(): string | undefined;
@@ -93,4 +109,4 @@ declare function removeToken(): void;
 //#region src/utils.d.ts
 declare function getQueryObject(url?: string): Record<string, string>;
 //#endregion
-export { logger as debug, getQueryObject, getToken, removeToken, serviceFactory, setTokenFromUrl, verifySuccessCode };
+export { BREAKPOINTS, MEDIA_QUERIES, logger as debug, getQueryObject, getToken, isDesktop, isMobile, isTablet, isTouchDevice, removeToken, serviceFactory, setTokenFromUrl, verifySuccessCode };

package/dist/index.js

@@ -54,6 +54,41 @@ try {
 	console.error("Error enabling logger:", error);
 }
 
+//#endregion
+//#region src/is.ts
+function isTouchDevice() {
+	if (typeof navigator === "undefined" || typeof window === "undefined") return false;
+	if ("maxTouchPoints" in navigator) return navigator.maxTouchPoints > 0;
+	if (typeof window.matchMedia === "function") return window.matchMedia("(pointer: coarse)").matches;
+	const ua = navigator.userAgent || "";
+	return /android|iphone|ipad|ipod|windows phone|blackberry|mobile/i.test(ua);
+}
+const BREAKPOINTS = {
+	MOBILE_MAX: 767,
+	TABLET_MIN: 768,
+	TABLET_MAX: 1023,
+	DESKTOP_MIN: 1024
+};
+const MEDIA_QUERIES = {
+	MOBILE: `(max-width: ${BREAKPOINTS.MOBILE_MAX}px)`,
+	TABLET: `(min-width: ${BREAKPOINTS.TABLET_MIN}px) and (max-width: ${BREAKPOINTS.TABLET_MAX}px)`,
+	DESKTOP: `(min-width: ${BREAKPOINTS.DESKTOP_MIN}px)`
+};
+function isMobile() {
+	if (!isTouchDevice()) return false;
+	if (typeof window.matchMedia === "function") return window.matchMedia(MEDIA_QUERIES.MOBILE).matches;
+	return false;
+}
+function isTablet() {
+	if (!isTouchDevice()) return false;
+	if (typeof window.matchMedia === "function") return window.matchMedia(MEDIA_QUERIES.TABLET).matches;
+	return false;
+}
+function isDesktop() {
+	if (typeof navigator === "undefined" || typeof window === "undefined") return false;
+	return window.matchMedia(MEDIA_QUERIES.DESKTOP).matches;
+}
+
 //#endregion
 //#region src/request/mock.ts
 /**
@@ -177,26 +212,13 @@ function verifySuccessCode(code, customCode) {
 	if (customCode) return toArray(customCode).includes(code) || !code;
 	return code === 0 || code === "0" || code === "000000" || code === 200 || !code;
 }
-function compatibleCallback(compatibleCallbacks = []) {
-	if (Array.isArray(compatibleCallbacks) && compatibleCallbacks.length && typeof compatibleCallbacks[0] === "function") return {
-		successCallback: compatibleCallbacks[0] || (() => ({})),
-		failCallback: compatibleCallbacks[1] || (() => ({})),
-		unauthorizedCallback: compatibleCallbacks[2] || (() => ({})),
-		forbiddenCallback: compatibleCallbacks[3] || (() => ({})),
-		notfoundCallback: compatibleCallbacks[4] || (() => ({})),
-		requestInterceptor: compatibleCallbacks[5] || ((c) => c),
-		responseInterceptor: compatibleCallbacks[6] || ((r) => r)
-	};
-	else return compatibleCallbacks[0];
-}
 function blobToJson(blob) {
 	return new Promise((resolve, reject) => {
 		const reader = new FileReader();
 		reader.onload = (event) => {
 			try {
 				const jsonString = event.target?.result;
-				const jsonObject = JSON.parse(jsonString);
-				resolve(jsonObject);
+				resolve(JSON.parse(jsonString));
 			} catch (error) {
 				reject(error);
 			}
@@ -207,16 +229,13 @@ function blobToJson(blob) {
 		reader.readAsText(blob);
 	});
 }
-function serviceFactory(options, ...callbacks) {
+function serviceFactory(options, callbacks) {
 	const { baseUrl = "/", timeout = 12e5, headers, code, debug: debug$1, mock } = options;
-	const { successCallback = (_response) => ({}), failCallback = (_error) => ({}), unauthorizedCallback = (_response) => ({}), forbiddenCallback = (_response) => ({}), notfoundCallback = (_response) => ({}), requestInterceptor = (c) => c, responseInterceptor = (r) => r } = compatibleCallback(callbacks);
+	const { successCallback = (_response) => ({}), failCallback = (_error) => ({}), unauthorizedCallback = (_response) => ({}), forbiddenCallback = (_response) => ({}), notfoundCallback = (_response) => ({}), requestInterceptor = (c) => c, responseInterceptor = (r) => r, responseInterceptorFailCallback = (error) => Promise.reject(error) } = callbacks;
 	const service = axios.create({
 		baseURL: baseUrl,
 		timeout,
-		headers,
-		validateStatus(status) {
-			return status >= 200 && status < 300 || status === 401 || status === 403 || status === 400 || status === 500;
-		}
+		headers
 	});
 	/**
 	* request拦截器, 先入栈后执行
@@ -248,16 +267,12 @@ function serviceFactory(options, ...callbacks) {
 		}
 		return response;
 	}, async (error) => {
-		if (error.response.data instanceof Blob && error.response.headers["content-type"]?.split(";")[0]?.trim() === "application/json") error.response.data = await blobToJson(error.response.data);
+		try {
+			if (error.response.data instanceof Blob && error.response.headers["content-type"]?.split(";")[0]?.trim() === "application/json") error.response.data = await blobToJson(error.response.data);
+		} catch (error$1) {}
 		return Promise.reject(error);
 	});
 	service.interceptors.response.use((response) => {
-		if (response.status && response.status === 401) return unauthorizedCallback(response);
-		if (response.status && response.status === 403) return forbiddenCallback(response);
-		if (response.status && (response.status === 400 || response.status === 500)) {
-			failCallback(response);
-			return Promise.reject(response);
-		}
 		if (verifySuccessCode(response.data.code, code)) {
 			successCallback(response);
 			return response;
@@ -267,24 +282,21 @@ function serviceFactory(options, ...callbacks) {
 		}
 	}, (error) => {
 		if (axios.isCancel(error)) return Promise.reject(error);
-		let status = 0;
 		try {
-			status = error.response.status || error.response.data.status;
-		} catch {
-			if (error.toString().includes("Error: timeout")) return Promise.reject(error);
+			const status = error.response.status || error.response.data.status;
+			if (status === 401) unauthorizedCallback(error);
+			else if (status === 403) forbiddenCallback(error);
+			else if (status === 404) notfoundCallback(error);
+			else failCallback(error);
+		} catch (_) {
+			failCallback(error);
 		}
-		if (status) if (status === 403) forbiddenCallback(error);
-		else if (status === 404) notfoundCallback(error);
-		else failCallback(error);
-		else failCallback(error);
-		return Promise.reject(error);
-	});
-	service.interceptors.response.use(responseInterceptor, (error) => {
 		return Promise.reject(error);
 	});
+	service.interceptors.response.use(responseInterceptor, responseInterceptorFailCallback);
 	if (mock) setupMockAdapter(service, mock);
 	return service;
 }
 
 //#endregion
-export { logger as debug, getQueryObject, getToken, removeToken, serviceFactory, setTokenFromUrl, verifySuccessCode };
+export { BREAKPOINTS, MEDIA_QUERIES, logger as debug, getQueryObject, getToken, isDesktop, isMobile, isTablet, isTouchDevice, removeToken, serviceFactory, setTokenFromUrl, verifySuccessCode };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yeepay/client-utils",
   "type": "module",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "shared utilities for yeepay client packages",
   "author": "Yong Yang",
   "homepage": "http://gitlab.yeepay.com/ued/client-utils#readme",
@@ -23,7 +23,7 @@
     "@imyangyong/utils": "^0.8.0",
     "@yeepay/client-utils": "link:",
     "ansis": "^4.1.0",
-    "axios": "^1.7.0",
+    "axios": "^1.13.2",
     "axios-mock-adapter": "^2.1.0",
     "debug": "^4.4.3",
     "js-cookie": "^3.0.5",