@jetlinks-web/core 2.2.10 → 2.2.12

package/dist/index.d.ts

@@ -0,0 +1,192 @@
+import { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import { AxiosResponseRewrite } from '@jetlinks-web/types';
+import { Observable } from 'rxjs';
+
+interface Options {
+    tokenExpiration: (err?: AxiosError<any>, response?: AxiosResponse) => void;
+    handleReconnect: () => Promise<any>;
+    filter_url?: Array<string>;
+    code?: number;
+    codeKey?: string;
+    timeout?: number;
+    handleRequest?: () => void;
+    /**
+     * 用以获取localstorage中的lang
+     */
+    langKey?: string;
+    /**
+     * response处理函数
+     * @param response AxiosResponse实例
+     */
+    handleResponse?: (response: AxiosResponse) => void;
+    /**
+     * 错误处理函数
+     * @param msg 错误消息
+     * @param status 错误code
+     * @param error 错误实例
+     */
+    handleError?: (msg: string, status: string | number, error: AxiosError<any>) => void;
+    requestOptions?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig | Record<string, any>;
+    isCreateTokenRefresh?: boolean;
+}
+interface RequestOptions {
+    url?: string;
+    method?: string;
+    params?: any;
+    data?: any;
+    [key: string]: any;
+}
+declare const abortAllRequests: () => void;
+declare const crateAxios: (options: Options) => void;
+declare const post: <T = any>(url: string, data?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+declare const get: <T = any>(url: string, params?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+declare const put: <T = any>(url: string, data?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+declare const patch: <T = any>(url: string, data?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+declare const remove: <T = any>(url: string, params?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+declare const getStream: (url: string, params?: any, ext?: any) => Promise<AxiosResponseRewrite<any>>;
+declare const postStream: (url: string, data: any, ext?: any) => Promise<AxiosResponseRewrite<any>>;
+declare const request: {
+    post: <T = any>(url: string, data?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+    get: <T = any>(url: string, params?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+    put: <T = any>(url: string, data?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+    patch: <T = any>(url: string, data?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+    remove: <T = any>(url: string, params?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
+    getStream: (url: string, params?: any, ext?: any) => Promise<AxiosResponseRewrite<any>>;
+    postStream: (url: string, data: any, ext?: any) => Promise<AxiosResponseRewrite<any>>;
+};
+declare class Request {
+    modulePath: string;
+    constructor(modulePath: string);
+    /**
+     * 分页查询
+     * @param {object} data 查询参数
+     * @param {object} options 请求配置
+     * @returns {Promise<AxiosResponse<any>>} 分页查询结果
+     */
+    page(data?: any, options?: RequestOptions): any;
+    /**
+     * 不分页查询
+     * @param {object} data 查询参数
+     * @param {object} options 请求配置
+     * @returns {Promise<AxiosResponse<any>>} 不分页查询结果
+     */
+    noPage(data?: any, options?: RequestOptions): any;
+    /**
+     * 详情查询
+     * @param {string} id 详情ID
+     * @param {object} params 查询参数
+     * @param {object} options 请求配置
+     * @returns {Promise<AxiosResponse<any>>} 详情查询结果
+     */
+    detail(id: string, params?: any, options?: RequestOptions): any;
+    /**
+     * 保存
+     * @param {object} data 保存参数
+     * @param {object} options 请求配置
+     * @returns {Promise<AxiosResponse<any>>} 保存结果
+     */
+    save(data?: any, options?: RequestOptions): any;
+    /**
+     * 更新
+     * @param {object} data 更新参数
+     * @param {object} options 请求配置
+     * @returns {Promise<AxiosResponse<any>>} 更新结果
+     */
+    update(data?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<any>>;
+    /**
+     * 删除
+     * @param {string} id 删除ID
+     * @param {object} options 请求配置
+     * @returns {Promise<AxiosResponse<any>>} 删除结果
+     */
+    delete(id: string, params?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<any>>;
+    post(...args: any[]): Promise<AxiosResponseRewrite<any>>;
+    get(...args: any[]): Promise<AxiosResponseRewrite<any>>;
+    put(...args: any[]): Promise<AxiosResponseRewrite<any>>;
+    patch(...args: any[]): Promise<AxiosResponseRewrite<any>>;
+    remove(...args: any[]): Promise<AxiosResponseRewrite<any>>;
+}
+
+declare class NdJson {
+    options: any;
+    isRead: boolean;
+    controller: any;
+    constructor();
+    create(options: any): void;
+    getUrl(url: any): any;
+    get(url: any, data?: string, extra?: {}): Observable<unknown>;
+    post(url: any, data?: BodyInit | any, extra?: {}): Observable<unknown>;
+    handleRequest(url: any): RequestInit;
+    handleResponse(response: any): any;
+    cancel(): void;
+}
+declare const ndJson: NdJson;
+
+interface WebSocketMessage {
+    type: string;
+    id?: string;
+    topic?: string;
+    parameter?: Record<string, any>;
+    requestId?: string;
+    message?: string;
+    [key: string]: any;
+}
+type WS_Options = {
+    onError?: (message: WebSocketMessage) => void;
+};
+declare class WebSocketClient {
+    private ws;
+    private subscriptions;
+    private pendingSubscriptions;
+    private heartbeatSubscription;
+    private reconnectAttempts;
+    private readonly maxReconnectAttempts;
+    private isConnected;
+    private tempQueue;
+    private url;
+    private options;
+    private wsClient;
+    constructor(options?: WS_Options);
+    setOptions(options: WS_Options): void;
+    initWebSocket(url: string): void;
+    private setupConnectionMonitor;
+    private getReconnectDelay;
+    private setupWebSocket;
+    private startHeartbeat;
+    private stopHeartbeat;
+    private handleMessage;
+    private processTempQueue;
+    private cacheSubscriptions;
+    private restoreSubscriptions;
+    private reconnect;
+    connect(): void;
+    disconnect(): void;
+    send(message: WebSocketMessage): void;
+    getWebSocket(id: string, topic: string, parameter?: Record<string, any>): Observable<WebSocketMessage>;
+}
+/**
+ * 创建单例
+ * @example
+ * wsClient.initWebSocket('ws://example.com/ws');
+ * wsClient.connect();
+ * const subscription = wsClient.getWebSocket('id1', 'topic1', { param: 'value' })
+ *   .subscribe(
+ *     message => console.log('Received:', message)
+ *   );
+ *
+ * // 清理
+ * subscription.unsubscribe();
+ *
+ */
+declare const wsClient: WebSocketClient;
+
+declare let router: any;
+declare const installRouter: (r: any) => void;
+
+declare let stores: {};
+declare const installStores: (_s?: {}) => void;
+
+declare let locales: any;
+declare const installLocales: (l: any) => void;
+
+export { NdJson, Request, WebSocketClient, abortAllRequests, crateAxios, get, getStream, installLocales, installRouter, installStores, locales, ndJson, patch, post, postStream, put, remove, request, router, stores, wsClient };

package/dist/index.mjs

@@ -0,0 +1,4 @@
+import{TOKEN_KEY as S,BASE_API as B,LOCAL_BASE_API as U}from"@jetlinks-web/constants";import{getToken as j,randomString as J}from"@jetlinks-web/utils";import G from"axios";import{isFunction as T,isObject as Y}from"lodash-es";var h,a={filter_url:[],code:200,codeKey:"status",timeout:1e3*15,handleRequest:void 0,handleResponse:void 0,handleError:void 0,langKey:"lang",requestOptions:s=>({}),tokenExpiration:()=>{},handleReconnect:()=>Promise.resolve(),isCreateTokenRefresh:!1},w=[],E=!1,be=window.__MICRO_APP_ENVIRONMENT__,b=new Map,F=s=>{let e=J(32);b.has(e)&&b.get(e)?.abort();let t=new AbortController;s.signal=t.signal,s.__requestKey=e,b.set(e,t)},V=s=>{F(s);let e=j(),t=localStorage.getItem(a.langKey),r=localStorage.getItem(U);if(t&&(s.headers[a.langKey]=t),r&&!s.baseURL){let n=s.url.startsWith("/")?s.url:`/${s.url}`;s.url=r+n}if(!e&&!a.filter_url?.some(n=>s.url?.includes(n)))return a.tokenExpiration?.(),s;if(s.headers[S]||(s.headers[S]=e),a.requestOptions&&T(a.requestOptions)){let n=a.requestOptions(s);if(n&&Y(n))for(let i in n)s[i]=n[i]}return s},z=s=>{if(a.handleResponse&&T(a.handleResponse))return a.handleResponse(s);let e=s.config?.__requestKey;if(e&&b.delete(e),s.data instanceof ArrayBuffer)return s;let t=s.data[a.codeKey||"status"];return typeof s.data=="object"&&typeof s.data.success>"u"&&(s.data.success=t===a.code),s.data},X=async s=>{let e=s.config;if(E)return new Promise((t,r)=>{w.push({resolve:t,reject:r})}).then(t=>(e.headers[S]=t,h(e))).catch(t=>Promise.reject(t));e._retry=!0,E=!0;try{if(await a.handleReconnect?.()){let r=j();return e.headers[S]=r,w.forEach(n=>n.resolve(r)),h(e)}}catch(t){throw w.forEach(r=>r.reject(t)),t}finally{w=[],E=!1}},M=async s=>{let e=s.response?.message||"Error",t=0;if(s.response){let{data:r,status:n}=s.response;switch(t=n,n){case 400:case 403:case 500:e=`${r?.message}`.substring(0,90);break;case 401:if(e=s.response.data.result?.text||"\u7528\u6237\u672A\u767B\u5F55",a.tokenExpiration?.(s),a.isCreateTokenRefresh)return X(s);break;case 404:e=s?.response?.data?.message||`${r?.error} ${r?.path}`;break;default:break}}else s.response===void 0&&(e=s.message.includes("timeout")?"\u63A5\u53E3\u54CD\u5E94\u8D85\u65F6":s.message,t="timeout");return a.handleError&&T(a.handleError)&&a.handleError(e,t,s),Promise.reject(s)},ye=()=>{b.forEach(s=>s.abort()),b.clear()},Re=s=>{s&&(a=Object.assign(a,s)),h=G.create({withCredentials:!1,timeout:a.timeout,baseURL:B}),h.interceptors.request.use(V,M),h.interceptors.response.use(z,M)},W=(s,e={},t)=>h({method:"POST",url:s,data:e,...t}),P=(s,e=void 0,t)=>h({method:"GET",url:s,params:e,...t}),N=(s,e={},t)=>h({method:"PUT",url:s,data:e,...t}),_=(s,e={},t)=>h({method:"patch",url:s,data:e,...t}),q=(s,e=void 0,t)=>h({method:"DELETE",url:s,params:e,...t}),Z=(s,e,t)=>P(s,e,{responseType:"arraybuffer",...t}),ee=(s,e,t)=>W(s,e,{responseType:"arraybuffer",...t}),x={post:W,get:P,put:N,patch:_,remove:q,getStream:Z,postStream:ee},I=class{modulePath;constructor(e){this.modulePath=e}page(e={},t={url:void 0,method:void 0}){let{url:r="/_query",method:n="post",...i}=t;return x[n](`${this.modulePath}${r}`,e,i)}noPage(e={},t={url:void 0,method:void 0}){let{url:r="/_query/no-page",method:n="post",...i}=t;return x[n](`${this.modulePath}${r}`,{paging:!1,...e},i)}detail(e,t,r={url:void 0,method:void 0}){let{url:n=`/${e}/detail`,method:i="get",...d}=r;return x[i](`${this.modulePath}${n}`,t,d)}save(e={},t={url:void 0,method:void 0}){let{url:r="/_create",method:n="post",...i}=t;return x[n](`${this.modulePath}${r}`,e,i)}update(e={},t={url:void 0,method:void 0}){let{url:r="/_update",method:n="patch",...i}=t;return _(`${this.modulePath}${r}`,e,i)}delete(e,t,r={url:void 0,method:void 0}){let{url:n=`/${e}`,method:i="post",...d}=r;return q(`${this.modulePath}${n}`,t,d)}post(...e){let[t,r,n]=e;return W(`${this.modulePath}${t}`,r,n)}get(...e){let[t,r,n]=e;return P(`${this.modulePath}${t}`,r,n)}put(...e){let[t,r,n]=e;return N(`${this.modulePath}${t}`,r,n)}patch(...e){let[t,r,n]=e;return _(`${this.modulePath}${t}`,r,n)}remove(...e){let[t,r,n]=e;return q(`${this.modulePath}${t}`,r,n)}};import{getToken as te}from"@jetlinks-web/utils";import{BASE_API as se,TOKEN_KEY as K}from"@jetlinks-web/constants";import{isFunction as L,isObject as H}from"lodash-es";import{Observable as Q}from"rxjs";var v=class{options={code:200,codeKey:"status"};isRead=!1;controller=null;constructor(){}create(e){this.options=Object.assign(this.options,e)}getUrl(e){return se+e}get(e,t="{}",r={}){let n=this.getUrl(e),i=this,d=this.controller=new AbortController;return new Q(o=>{let u;return fetch(n,{method:"GET",signal:d.signal,keepalive:!0,...r,...this.handleRequest(n)}).then(m=>{u=m.body?.getReader();let k=new TextDecoder,l="";if(!u){o.error(new Error("No readable stream available"));return}let y=()=>{if(!i.isRead){u.cancel(),o.complete();return}u.read().then(({done:g,value:A})=>{if(g){if(l.trim().length>0)try{o.next(JSON.parse(l.trim()))}catch(p){o.error(p)}o.complete();return}let C=k.decode(A,{stream:!0});l+=C;let f=l.split(`
+`);for(let p=0;p<f.length-1;++p){let R=f[p].trim();if(R.length>0)try{o.next(JSON.parse(R))}catch(O){o.error(O),u.cancel();return}}l=f[f.length-1],y()}).catch(g=>o.error(g))};i.isRead=!0,y()}).catch(m=>{o.error(m)}),()=>{i.cancel()}})}post(e,t={},r={}){let n=this.getUrl(e),i=this,d=this.controller=new AbortController;return new Q(o=>{let u;return fetch(n,{method:"POST",signal:d.signal,keepalive:!0,body:H(t)?JSON.stringify(t):t,...r,...this.handleRequest(n)}).then(async m=>{u=m.body?.getReader();let k=new TextDecoder,l="";if(!u){o.error(new Error("No readable stream available"));return}let y=()=>{if(!i.isRead){u.cancel(),o.complete();return}u.read().then(({done:g,value:A})=>{if(g){if(l.trim().length>0)try{o.next(JSON.parse(l.trim()))}catch(p){o.error(p)}o.complete();return}let C=k.decode(A,{stream:!0});l+=C;let f=l.split(`
+`);for(let p=0;p<f.length-1;++p){let R=f[p].trim();if(R.length>0)try{o.next(JSON.parse(R))}catch(O){o.error(O),u.cancel();return}}l=f[f.length-1],y()}).catch(g=>o.error(g))};i.isRead=!0,y()}).catch(m=>{o.error(m)}),()=>{i.cancel()}})}handleRequest(e){let t={headers:{"Content-Type":"application/x-ndjson"}},r=te();if(!r&&this.options.filter_url?.some(n=>n.includes(e)))return this.options.tokenExpiration?.(),t;if(t.headers[K]||(t.headers[K]=r),this.options.requestOptions&&L(this.options.requestOptions)){let n=this.options.requestOptions(t);if(n&&H(n))for(let i in n)t[i]=n[i]}return t}handleResponse(e){return this.options.handleResponse&&L(this.options.handleResponse)?this.options.handleResponse(e):e}cancel(){this.isRead&&(this.isRead=!1),this.controller.abort()}},Ce=new v;import{webSocket as ne}from"rxjs/webSocket";import{Observable as re,Subject as ie,timer as D,EMPTY as oe}from"rxjs";import{retry as ae,catchError as ce}from"rxjs/operators";import{notification as ue}from"ant-design-vue";var c=window.__MICRO_APP_ENVIRONMENT__,$=class{ws=null;subscriptions=new Map;pendingSubscriptions=new Map;heartbeatSubscription=null;reconnectAttempts=0;maxReconnectAttempts=2;isConnected=!1;tempQueue=[];url="";options={};wsClient;constructor(e){this.setOptions(e),this.setupConnectionMonitor(),c&&window.microApp.addGlobalDataListener(t=>{this.wsClient=t.wsClient})}setOptions(e){this.options=e||{}}initWebSocket(e){this.url=e}setupConnectionMonitor(){c||(window.addEventListener("online",()=>{console.log("Network is online, attempting to reconnect..."),this.reconnect()}),window.addEventListener("offline",()=>{console.log("Network is offline, caching subscriptions..."),this.cacheSubscriptions()}),window.addEventListener("beforeunload",()=>{this.disconnect()}))}getReconnectDelay(){return this.reconnectAttempts<=10?5e3:this.reconnectAttempts<=20?15e3:6e4}setupWebSocket(){if(c&&this.wsClient){this.wsClient.setupWebSocket();return}this.ws||!this.url||(this.ws=ne({url:this.url,openObserver:{next:()=>{console.log("WebSocket connected"),this.isConnected=!0,this.reconnectAttempts=0,this.startHeartbeat(),this.restoreSubscriptions(),this.processTempQueue()}},closeObserver:{next:()=>{console.log("WebSocket disconnected"),this.isConnected=!1;let e=this.getReconnectDelay();setTimeout(()=>{this.reconnectAttempts+=1,!(this.reconnectAttempts>this.maxReconnectAttempts)&&(this.cacheSubscriptions(),this.stopHeartbeat(),this.reconnect())},e)}}}),this.ws.pipe(ce(e=>(console.error("WebSocket error:",e),oe)),ae({delay:(e,t)=>{if(this.reconnectAttempts=t,t>this.maxReconnectAttempts)throw new Error("Max reconnection attempts reached");return D(this.getReconnectDelay())}})).subscribe(e=>this.handleMessage(e),e=>console.error("WebSocket error:",e)))}startHeartbeat(){if(c&&this.wsClient){this.wsClient.startHeartbeat();return}this.stopHeartbeat(),this.heartbeatSubscription=D(0,2e3).subscribe(()=>{this.send({type:"ping"})})}stopHeartbeat(){if(c&&this.wsClient){this.wsClient.stopHeartbeat();return}this.heartbeatSubscription&&(this.heartbeatSubscription.unsubscribe(),this.heartbeatSubscription=null)}handleMessage(e){if(c&&this.wsClient){this.wsClient.handleMessage(e);return}if(e.type==="pong")return;if(e.type==="error"){this.options.onError?this.options.onError(e):ue.error({key:"error",message:e.message});return}let t=this.subscriptions.get(e.requestId||"");t&&(e.type==="complete"?(t.complete(),this.subscriptions.delete(e.requestId||"")):e.type==="result"&&t.next(e))}processTempQueue(){if(c&&this.wsClient){this.wsClient.processTempQueue();return}for(;this.tempQueue.length>0;){let e=this.tempQueue.shift();e&&this.send(e)}}cacheSubscriptions(){if(c&&this.wsClient){this.wsClient.cacheSubscriptions();return}this.pendingSubscriptions=new Map(this.subscriptions),this.subscriptions.clear()}restoreSubscriptions(){if(c&&this.wsClient){this.wsClient.restoreSubscriptions();return}this.pendingSubscriptions.forEach((e,t)=>{this.subscriptions.set(t,e)}),this.pendingSubscriptions.clear()}reconnect(){if(c&&this.wsClient){this.wsClient.reconnect();return}!this.isConnected&&navigator.onLine&&(this.ws=null,this.setupWebSocket())}connect(){if(c&&this.wsClient){this.wsClient.connect();return}this.setupWebSocket()}disconnect(){if(c&&this.wsClient){this.wsClient.disconnect();return}this.ws&&(this.ws.complete(),this.ws=null),this.stopHeartbeat(),this.subscriptions.clear(),this.pendingSubscriptions.clear(),this.tempQueue=[]}send(e){if(c&&this.wsClient){this.wsClient.send(e);return}this.ws&&this.isConnected?this.ws.next(e):this.tempQueue.push(e)}getWebSocket(e,t,r={}){if(console.log("getWebSocket",this.wsClient,e),c&&this.wsClient)return this.wsClient.getWebSocket(e,t,r);let n=new ie;this.subscriptions.set(e,n);let i={id:e,topic:t,parameter:r,type:"sub"};return this.send(i),new re(d=>{let o=n.subscribe(d);return()=>{o.unsubscribe(),this.send({id:e,type:"unsub"}),this.subscriptions.delete(e)}})}},Pe=new $;var le,$e=s=>{le=s};var pe={},Ie=(s={})=>{pe=s};var he,Ne=s=>{he=s};
+export{v as NdJson,I as Request,$ as WebSocketClient,ye as abortAllRequests,Re as crateAxios,P as get,Z as getStream,Ne as installLocales,$e as installRouter,Ie as installStores,he as locales,Ce as ndJson,_ as patch,W as post,ee as postStream,N as put,q as remove,x as request,le as router,pe as stores,Pe as wsClient};

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@jetlinks-web/core",
-  "version": "2.2.10",
-  "main": "index.ts",
-  "module": "index.ts",
+  "version": "2.2.12",
+  "main": "dist/core/index.mjs",
+  "module": "dist/core/index.mjs",
+  "types": "dist/core/index.d.ts",
   "keywords": [
     "jetlinks",
     "jetlinks-web",
@@ -13,7 +14,8 @@
   ],
   "files": [
     "src",
-    "index.ts"
+    "index.ts",
+    "dist"
   ],
   "sideEffects": [
     "./src/axios.ts",
@@ -27,8 +29,8 @@
     "axios": "^1.7.4",
     "rxjs": "^7.8.1",
     "@jetlinks-web/constants": "^1.0.9",
-    "@jetlinks-web/utils": "^1.2.9",
-    "@jetlinks-web/types": "^1.0.2"
+    "@jetlinks-web/types": "^1.0.2",
+    "@jetlinks-web/utils": "^1.2.11"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/src/axios.ts

@@ -1,3 +1,4 @@
+import { message } from 'ant-design-vue';
 import { TOKEN_KEY, BASE_API, LOCAL_BASE_API } from '@jetlinks-web/constants'
 import {getToken, randomString} from '@jetlinks-web/utils'
 import axios from 'axios'
@@ -12,7 +13,7 @@ import {isFunction, isObject} from 'lodash-es'
 
 interface Options {
 
-  tokenExpiration: (err: AxiosError<any>, response: AxiosResponse) => void
+  tokenExpiration: (err?: AxiosError<any>, response?: AxiosResponse) => void
   handleReconnect: () => Promise<any>
   filter_url?: Array<string>
   code?: number
@@ -39,6 +40,19 @@ interface Options {
   isCreateTokenRefresh?: boolean
 }
 
+interface typeRequestConfig extends InternalAxiosRequestConfig {
+  __requestKey?: string
+}
+
+interface typeAxiosResponse extends AxiosResponse {
+  config: typeRequestConfig
+  message: string
+}
+
+interface typeAxiosError<T> extends AxiosError<T> {
+  response: typeAxiosResponse
+}
+
 interface RequestOptions {
   url?: string
   method?: string
@@ -69,7 +83,7 @@ let isRefreshing = false;
 const isApp = (window as any).__MICRO_APP_ENVIRONMENT__
 
 const pendingRequests = new Map<string, AbortController>();
-const requestRecords = (config: InternalAxiosRequestConfig) => {
+const requestRecords = (config: typeRequestConfig) => {
   const key = randomString(32)
 
   // 取消重复请求
@@ -83,7 +97,7 @@ const requestRecords = (config: InternalAxiosRequestConfig) => {
 
   pendingRequests.set(key, controller)
 }
-const handleRequest = (config: InternalAxiosRequestConfig) => {
+const handleRequest = (config: typeRequestConfig) => {
   requestRecords(config)
   const token = getToken();
   const lang = localStorage.getItem(_options.langKey)
@@ -121,7 +135,7 @@ const handleRequest = (config: InternalAxiosRequestConfig) => {
   return config
 }
 
-const handleResponse = (response: AxiosResponse) => {
+const handleResponse = (response: typeAxiosResponse) => {
   if (_options.handleResponse && isFunction(_options.handleResponse)) {
     return _options.handleResponse(response)
   }
@@ -176,7 +190,7 @@ const createTokenRefreshHandler = async (err) => {
     isRefreshing = false;
   }
 }
-const errorHandler = async (err: AxiosError<any>) => {
+const errorHandler = async (err: typeAxiosError<any>) => {
   let description = err.response?.message || 'Error'
   let _status: string | number = 0
   if (err.response) {

package/src/fetch.ts

@@ -99,7 +99,7 @@ export class NdJson {
     })
   }
 
-  post(url, data={}, extra = {}) {
+  post(url, data: BodyInit | any ={}, extra = {}) {
     const _url = this.getUrl(url)
     const that = this
     const controller = this.controller = new AbortController();

package/src/axios.ts~

@@ -1,419 +0,0 @@
-import { TOKEN_KEY, BASE_API } from '@jetlinks-web/constants'
-import {getToken, randomString} from '@jetlinks-web/utils'
-import axios from 'axios'
-import type {
-  AxiosInstance,
-  AxiosResponse,
-  AxiosError,
-  InternalAxiosRequestConfig,
-} from 'axios'
-import type { AxiosResponseRewrite } from '@jetlinks-web/types'
-import {isFunction, isObject} from 'lodash-es'
-
-interface Options {
-
-  tokenExpiration: (err: AxiosError<any>, response: AxiosResponse) => void
-  handleReconnect: () => Promise<any>
-  filter_url?: Array<string>
-  code?: number
-  codeKey?: string
-  timeout?: number
-  handleRequest?: () => void
-  /**
-   * 用以获取localstorage中的lang
-   */
-  langKey?: string
-  /**
-   * response处理函数
-   * @param response AxiosResponse实例
-   */
-  handleResponse?: (response: AxiosResponse) => void
-  /**
-   * 错误处理函数
-   * @param msg 错误消息
-   * @param status 错误code
-   * @param error 错误实例
-   */
-  handleError?: (msg: string, status: string | number, error: AxiosError<any>) => void
-  requestOptions?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig | Record<string, any>
-  isCreateTokenRefresh?: boolean
-}
-
-interface RequestOptions {
-  url?: string
-  method?: string
-  params?: any
-  data?: any
-  [key: string]: any
-}
-
-let instance: AxiosInstance
-let _options: Options = {
-  filter_url: [],
-  code: 200,
-  codeKey: 'status',
-  timeout: 1000 * 15,
-  handleRequest: undefined,
-  handleResponse: undefined,
-  handleError: undefined,
-  langKey: 'lang',
-  requestOptions: (config) => ({}),
-  tokenExpiration: () => {},
-  handleReconnect: () => Promise.resolve(),
-  isCreateTokenRefresh: false
-}
-
-let failedQueue = [];
-let isRefreshing = false;
-
-const isApp = (window as any).__MICRO_APP_ENVIRONMENT__
-
-const pendingRequests = new Map<string, AbortController>();
-const requestRecords = (config: InternalAxiosRequestConfig) => {
-  const key = randomString(32)
-
-  // 取消重复请求
-  if (pendingRequests.has(key)) {
-    pendingRequests.get(key)?.abort()
-  }
-
-  const controller = new AbortController()
-  config.signal = controller.signal;
-  config.__requestKey = key;
-
-  pendingRequests.set(key, controller)
-}
-const handleRequest = (config: InternalAxiosRequestConfig) => {
-  requestRecords(config)
-  const token = getToken();
-  const lang = localStorage.getItem(_options.langKey)
-  const localBaseApi = localStorage.getItem('')
-
-  if (lang) {
-    config.headers[_options.langKey] = lang
-  }
-
-  if (localBaseApi && !config.baseURL) {
-    const _url = config.url.startsWith('/') ? config.url : `/${config.url}`
-    config.url = localBaseApi + _url
-  }
-
-  // 没有token，并且该接口需要token校验
-  if (!token && !_options.filter_url?.some((url) => config.url?.includes(url))) {
-    // 跳转登录页
-    _options.tokenExpiration?.()
-    return config
-  }
-
-  if (!config.headers[TOKEN_KEY]) {
-    config.headers[TOKEN_KEY] = token
-  }
-
-  if (_options.requestOptions && isFunction(_options.requestOptions)) {
-    const extraOptions = _options.requestOptions(config)
-    if (extraOptions && isObject(extraOptions)) {
-      for (const key in extraOptions) {
-        config[key] = extraOptions[key]
-      }
-    }
-  }
-
-  return config
-}
-
-const handleResponse = (response: AxiosResponse) => {
-  if (_options.handleResponse && isFunction(_options.handleResponse)) {
-    return _options.handleResponse(response)
-  }
-
-  const __key = response.config?.__requestKey
-  if(__key){
-    pendingRequests.delete(__key)
-  }
-
-  if (response.data instanceof ArrayBuffer) {
-    return response
-  }
-
-  const status = response.data[_options.codeKey || 'status']
-
-// 增加业务接口处理成功判断方式，只需要判断返回参数包含：success为true
-  if (
-    typeof response.data === 'object' &&
-    typeof response.data.success === 'undefined'
-  ) {
-    response.data.success = status === _options.code
-  }
-
-  return response.data
-}
-
-const createTokenRefreshHandler = async (err) => {
-  const originalRequest = err.config;
-  if (isRefreshing) { // 记录之后失败的请求
-    return new Promise((resolve, reject) => {
-      failedQueue.push({ resolve, reject });
-    }).then((_token) => {
-      originalRequest.headers[TOKEN_KEY] = _token;
-      return instance(originalRequest)
-    }).catch(err => Promise.reject(err))
-  }
-  originalRequest._retry = true;
-  isRefreshing = true;
-  try {
-    const loginResult = await _options.handleReconnect?.()
-    if(loginResult){
-      const token = getToken() // 更新请求头, 修改全部的token
-      originalRequest.headers[TOKEN_KEY] = token;
-      failedQueue.forEach(a => a.resolve(token));
-      return instance(originalRequest);
-    }
-  } catch (err) {
-    failedQueue.forEach(cb => cb.reject(err));
-    throw err;
-  } finally {
-    failedQueue = [];
-    isRefreshing = false;
-  }
-}
-const errorHandler = async (err: AxiosError<any>) => {
-  let description = err.response?.message || 'Error'
-  let _status: string | number = 0
-  if (err.response) {
-    const {data, status} = err.response
-    _status = status
-    switch (status) {
-      case 400:
-      case 403:
-      case 500:
-        description = (`${data?.message}`).substring(0, 90)
-        break;
-      case 401:
-        description = err.response.data.result?.text || '用户未登录';
-        _options.tokenExpiration?.(err)
-        if(_options.isCreateTokenRefresh){
-          return createTokenRefreshHandler(err)
-        }
-        break;
-      case 404:
-        description = err?.response?.data?.message || `${data?.error} ${data?.path}`
-        break;
-      default:
-        break;
-    }
-  } else if (err.response === undefined) {
-    description = err.message.includes('timeout') ? '接口响应超时' : err.message
-    _status = 'timeout'
-  }
-
-  if (_options.handleError && isFunction(_options.handleError)) {
-    _options.handleError(description, _status, err)
-  }
-
-  return Promise.reject(err)
-}
-
-export const abortAllRequests = () => {
-  pendingRequests.forEach(controller => controller.abort())
-  pendingRequests.clear()
-}
-
-export const crateAxios = (options: Options) => {
-  if (options) {
-    _options = Object.assign(_options, options)
-  }
-
-  instance = axios.create({
-    withCredentials: false,
-    timeout: _options.timeout,
-    baseURL: BASE_API
-  })
-
-  instance.interceptors.request.use(
-    handleRequest,
-    errorHandler
-  )
-
-  instance.interceptors.response.use(
-    handleResponse,
-    errorHandler
-  )
-}
-
-export const post = <T = any>(url: string, data: any = {}, ext?: any) => {
-  return (instance<any, AxiosResponseRewrite<T>>({
-    method: 'POST',
-    url,
-    data,
-    ...ext,
-  }))
-}
-
-export const get = <T = any>(url: string, params: any = undefined, ext?: any) => {
-  return instance<any, AxiosResponseRewrite<T>>({
-    method: 'GET',
-    url,
-    params,
-    ...ext,
-  })
-}
-
-export const put = <T = any>(url: string, data: any = {}, ext?: any) => {
-  return instance<any, AxiosResponseRewrite<T>>({
-    method: 'PUT',
-    url,
-    data,
-    ...ext,
-  })
-}
-
-export const patch = <T = any>(url: string, data: any = {}, ext?: any) => {
-  return instance<any, AxiosResponseRewrite<T>>({
-    method: 'patch',
-    url,
-    data,
-    ...ext,
-  })
-}
-
-export const remove = <T = any>(url: string, params: any = undefined, ext?: any) => {
-  return instance<any, AxiosResponseRewrite<T>>({
-    method: 'DELETE',
-    url,
-    params,
-    ...ext,
-  })
-}
-
-export const getStream = (url: string, params?: any, ext?: any) => {
-  return get(url, params, { responseType: 'arraybuffer', ...ext })
-}
-
-export const postStream = (url: string, data: any, ext?: any) => {
-  return post(url, data, { responseType: 'arraybuffer', ...ext })
-}
-
-export const request = {
-  post, get, put, patch, remove, getStream, postStream
-}
-
-export class Request {
-  modulePath: string
-
-  constructor(modulePath: string) {
-    this.modulePath = modulePath
-  }
-
-  /**
-   * 分页查询
-   * @param {object} data 查询参数
-   * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 分页查询结果
-   */
-  page(data: any={}, options: RequestOptions= {
-    url: undefined,
-    method: undefined,
-  }) {
-    const { url='/_query', method = 'post', ...rest } = options
-    return request[method](`${this.modulePath}${url}`, data, rest)
-  }
-
-  /**
-   * 不分页查询
-   * @param {object} data 查询参数
-   * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 不分页查询结果
-   */
-  noPage(data: any={}, options: RequestOptions = {
-    url: undefined,
-    method: undefined,
-  }) {
-    const { url='/_query/no-page', method = 'post', ...rest } = options
-    return request[method](`${this.modulePath}${url}`, { paging: false, ...data}, rest)
-  }
-
-  /**
-   * 详情查询
-   * @param {string} id 详情ID
-   * @param {object} params 查询参数
-   * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 详情查询结果
-   */
-  detail(id: string, params?: any, options: RequestOptions= {
-    url: undefined,
-    method: undefined,
-  }) {
-    const { url=`/${id}/detail`, method = 'get', ...rest } = options
-    return request[method](`${this.modulePath}${url}`, params, rest)
-  }
-
-  /**
-   * 保存
-   * @param {object} data 保存参数
-   * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 保存结果
-   */
-  save(data: any={}, options: RequestOptions = {
-    url: undefined,
-    method: undefined,
-  }) {
-    const { url=`/_create`, method = 'post', ...rest } = options
-    return request[method](`${this.modulePath}${url}`, data, rest)
-  }
-
-  /**
-   * 更新
-   * @param {object} data 更新参数
-   * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 更新结果
-   */
-  update(data: any={}, options: RequestOptions = {
-    url: undefined,
-    method: undefined,
-  }) {
-    const { url=`/_update`, method = 'patch', ...rest } = options
-    return patch(`${this.modulePath}${url}`, data, rest)
-  }
-
-  /**
-   * 删除
-   * @param {string} id 删除ID
-   * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 删除结果
-   */
-  delete(id: string, params?: any, options: RequestOptions = {
-    url: undefined,
-    method: undefined,
-  }) {
-    const { url=`/${id}`, method = 'post', ...rest } = options
-    return remove(`${this.modulePath}${url}`, params, rest)
-  }
-
-  post(...args) {
-    const [url, data, options] = args
-    return post(`${this.modulePath}${url}`, data, options)
-  }
-
-  get(...args) {
-    const [url, params, options] = args
-    return get(`${this.modulePath}${url}`, params, options)
-  }
-
-  put(...args) {
-    const [url, data, options] = args
-    return put(`${this.modulePath}${url}`, data, options)
-  }
-
-  patch(...args) {
-    const [url, data, options] = args
-    return patch(`${this.modulePath}${url}`, data, options)
-  }
-
-  remove(...args) {
-    const [url, params, options] = args
-    return remove(`${this.modulePath}${url}`, params, options)
-  }
-}
-
-
-