build(projects): update

Author: soybeanfe

package.json

@@ -33,6 +33,7 @@
     "qs": "^6.11.0",
     "simple-git-hooks": "^2.8.1",
     "tsup": "^6.5.0",
+    "tsx": "^3.12.2",
     "typescript": "^4.9.4"
   },
   "simple-git-hooks": {

pnpm-lock.yaml

@@ -16,7 +16,7 @@ class Request {
 
   requestConfig: RequiredRequestConfig;
 
-  constructor(axiosConfig: AxiosRequestConfig, requestConfig?: RequestConfig) {
+  constructor(axiosConfig?: AxiosRequestConfig, requestConfig?: RequestConfig) {
     this.axiosInstance = axios.create(axiosConfig);
     this.setInterceptor();
 
@@ -72,10 +72,8 @@ class Request {
  * 创建请求
  * @param axiosConfig axios配置
  * @param requestConfig 请求配置
- * @param isRaw 是否返回原始的axios实例, (默认返回自定义的请求实例)
  */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function createRequest(axiosConfig: AxiosRequestConfig, requestConfig?: RequestConfig, isRaw = false) {
+export function createRequest(axiosConfig?: AxiosRequestConfig, requestConfig?: RequestConfig) {
   const request = new Request(axiosConfig, requestConfig);
 
   return request.axiosInstance;

src/index.ts

@@ -1,4 +1,4 @@
-import type { AxiosRequestConfig, AxiosInstance } from 'axios';
+import type { AxiosRequestConfig, RawAxiosRequestHeaders } from 'axios';
 import { CONTENT_TYPE, type ContentTypeValue } from './constant';
 import type { RequestConfig, RequiredRequestConfig } from '../types';
 
@@ -14,9 +14,7 @@ export function createDefaultRequestConfig(requestConfig?: RequestConfig) {
       return responseData[codeKey] === BACKEND_SUCCESS_CODE;
     },
     onBackendFail: async () => {},
-    onError: async ({ error }) => {
-      window.console.log(`code: ${error.code}, msg: ${error.msg}`);
-    }
+    onError: async () => {}
   };
 
   Object.assign(configs, requestConfig);
@@ -25,7 +23,9 @@ export function createDefaultRequestConfig(requestConfig?: RequestConfig) {
 }
 
 export function getRequestHeaderContentType(config: AxiosRequestConfig) {
-  const contentType = (config?.headers?.['Content-Type'] || CONTENT_TYPE.json) as ContentTypeValue;
+  const headerContentType = (config?.headers as RawAxiosRequestHeaders)?.['Content-Type'];
+
+  const contentType = (headerContentType || CONTENT_TYPE.json) as ContentTypeValue;
 
   return contentType;
 }
@@ -38,6 +38,3 @@ export function isHttpSuccess(status: number) {
   const isSuccessCode = status >= 200 && status < 300;
   return isSuccessCode || status === 304;
 }
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function getCustomRequestInstance(instance: AxiosInstance) {}

src/shared/common.ts

@@ -9,6 +9,7 @@ import {
   BLANK_AXIOS_ERROR_CODE,
   ERROR_STATUS
 } from './constant';
+import { getNetworkIsOnline } from './network';
 import type { ErrorStatus } from './constant';
 import type { CustomError, RawError, RequestError, RequestConfig } from '../types';
 
@@ -30,7 +31,7 @@ export function handleAxiosError<T, D>(rawError: RawError<T, D>): RequestError<T
   const actions: [boolean, () => void][] = [
     [
       // 网路错误
-      !window.navigator.onLine || rawError.message === 'Network Error',
+      !getNetworkIsOnline() || rawError.message === 'Network Error',
       () => {
         updateCustomError(error, { code: NETWORK_ERROR_CODE, msg: NETWORK_ERROR_MSG });
       }
@@ -78,7 +79,7 @@ export function handleHttpError<T, D>(response: AxiosResponse<T, D>): RequestErr
     msg: DEFAULT_REQUEST_ERROR_MSG
   };
 
-  if (!window.navigator.onLine) {
+  if (!getNetworkIsOnline()) {
     // 网路错误
     updateCustomError(error, { code: NETWORK_ERROR_CODE, msg: NETWORK_ERROR_MSG });
   } else {

src/shared/error.ts

@@ -0,0 +1,11 @@
+import { networkInterfaces } from 'node:os';
+
+export function getNetworkIsOnline() {
+  const isWindow = typeof window === 'object';
+
+  const windowNetworkOnline = isWindow && window.navigator.onLine;
+
+  console.log(networkInterfaces());
+
+  return windowNetworkOnline || false;
+}

src/shared/network.ts

@@ -0,0 +1,31 @@
+import { createRequest } from '../src';
+
+const request = createRequest(
+  {},
+  {
+    codeKey: 'code',
+    dataKey: 'data',
+    msgKey: 'msg',
+    onBackendSuccess(responseData) {
+      const isObject = Object.prototype.toString.call(responseData) === '[Object object]';
+
+      /** 后端自定义的成功code */
+      const SUCCESS_CODE = '0000';
+
+      const hasCodeKey = Object.keys(responseData).includes(this.codeKey);
+
+      const isFailedByCode = responseData.code !== SUCCESS_CODE;
+
+      return !(isObject && hasCodeKey && isFailedByCode) || true;
+    }
+  }
+);
+
+async function fetchSearchBook() {
+  const data = await request('https://www.baidu.com', { responseType: 'arraybuffer' }).catch(err => {
+    console.log(err);
+  });
+  console.log('data: ', data);
+}
+
+fetchSearchBook();