@jetlinks-web/core 2.2.16 → 2.2.18

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import { AxiosError, AxiosResponse, InternalAxiosRequestConfig, AxiosInstance } from 'axios';
 import { AxiosResponseRewrite } from '@jetlinks-web/types';
 import { Observable } from 'rxjs';
 
@@ -29,6 +29,17 @@ interface Options {
     requestOptions?: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig | Record<string, any>;
     isCreateTokenRefresh?: boolean;
 }
+interface PageResult<T> {
+    data: T[];
+    total: number;
+    pageIndex: number;
+    pageSize: number;
+}
+interface UpdateResult {
+    added: number;
+    total: number;
+    updated: number;
+}
 interface RequestOptions {
     url?: string;
     method?: string;
@@ -36,6 +47,8 @@ interface RequestOptions {
     data?: any;
     [key: string]: any;
 }
+
+declare let instance: AxiosInstance;
 declare const abortAllRequests: () => void;
 declare const crateAxios: (options: Options) => void;
 declare const post: <T = any>(url: string, data?: any, ext?: any) => Promise<AxiosResponseRewrite<T>>;
@@ -55,56 +68,62 @@ declare const request: {
     postStream: (url: string, data: any, ext?: any) => Promise<AxiosResponseRewrite<any>>;
 };
 declare class Request {
-    modulePath: string;
-    constructor(modulePath: string);
+    basePath: string;
+    constructor(basePath: string);
+    private requestWrapper;
     /**
      * 分页查询
      * @param {object} data 查询参数
      * @param {object} options 请求配置
-     * @returns {Promise<AxiosResponse<any>>} 分页查询结果
      */
-    page(data?: any, options?: RequestOptions): any;
+    page<T = any>(data?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<PageResult<T>>>;
     /**
      * 不分页查询
      * @param {object} data 查询参数
      * @param {object} options 请求配置
-     * @returns {Promise<AxiosResponse<any>>} 不分页查询结果
      */
-    noPage(data?: any, options?: RequestOptions): any;
+    noPage<T = any>(data?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<T[]>>;
     /**
      * 详情查询
      * @param {string} id 详情ID
      * @param {object} params 查询参数
      * @param {object} options 请求配置
-     * @returns {Promise<AxiosResponse<any>>} 详情查询结果
      */
-    detail(id: string, params?: any, options?: RequestOptions): any;
+    detail<T = any>(id: string, params?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<T>>;
     /**
      * 保存
      * @param {object} data 保存参数
      * @param {object} options 请求配置
-     * @returns {Promise<AxiosResponse<any>>} 保存结果
      */
-    save(data?: any, options?: RequestOptions): any;
+    save<T = any>(data?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<T>>;
     /**
      * 更新
      * @param {object} data 更新参数
      * @param {object} options 请求配置
-     * @returns {Promise<AxiosResponse<any>>} 更新结果
      */
-    update(data?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<any>>;
+    update<T extends UpdateResult>(data?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<T>>;
     /**
      * 删除
      * @param {string} id 删除ID
+     * @param {object} params 请求参数
      * @param {object} options 请求配置
-     * @returns {Promise<AxiosResponse<any>>} 删除结果
+     * @example ${basePath}/${id}
+     */
+    delete<T = any>(id: string, params?: any, options?: RequestOptions): Promise<AxiosResponseRewrite<T>>;
+    /**
+     * 批量操作
+     * @param data
+     * @param type
+     * @param options
      */
-    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>>;
+    batch<T = any>(data?: {}, type?: string, options?: RequestOptions): Promise<AxiosResponseRewrite<T>>;
+    post<T = any>(url: string, data?: any, options?: any): Promise<AxiosResponseRewrite<T>>;
+    get<T = any>(url: string, params?: any, options?: any): Promise<AxiosResponseRewrite<T>>;
+    put<T = any>(url: string, data?: any, options?: any): Promise<AxiosResponseRewrite<T>>;
+    patch<T = any>(url: string, data?: any, options?: any): Promise<AxiosResponseRewrite<T>>;
+    remove<T = any>(url: string, params?: any, options?: any): Promise<AxiosResponseRewrite<T>>;
+    getStream(url: string, params?: any, options?: any): Promise<AxiosResponseRewrite<any>>;
+    postStream(url: string, data?: any, options?: any): Promise<AxiosResponseRewrite<any>>;
 }
 
 declare class NdJson {
@@ -189,4 +208,4 @@ 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 };
+export { NdJson, Request, WebSocketClient, abortAllRequests, crateAxios, get, getStream, installLocales, installRouter, installStores, instance, locales, ndJson, patch, post, postStream, put, remove, request, router, stores, wsClient };

package/dist/index.mjs

@@ -1,3 +1,3 @@
-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__,y=new Map,F=s=>{let e=J(32);y.has(e)&&y.get(e)?.abort();let t=new AbortController;s.signal=t.signal,s.__requestKey=e,y.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&&y.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=()=>{y.forEach(s=>s.abort()),y.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 R=()=>{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 b=f[p].trim();if(b.length>0)try{o.next(JSON.parse(b))}catch(O){o.error(O),u.cancel();return}}l=f[f.length-1],R()}).catch(g=>o.error(g))};i.isRead=!0,R()}).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 R=()=>{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 b=f[p].trim();if(b.length>0)try{o.next(JSON.parse(b.startsWith("data:")?b.slice(5):b))}catch(O){o.error(O),u.cancel();return}}l=f[f.length-1],R()}).catch(g=>o.error(g))};i.isRead=!0,R()}).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};
+import{TOKEN_KEY as S,BASE_API as U,LOCAL_BASE_API as D}from"@jetlinks-web/constants";import{getToken as P,randomString as B}from"@jetlinks-web/utils";import J from"axios";import{isFunction as A,isObject as G}from"lodash-es";var l=window.JetlinksCore?.instance||null,o={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},R=[],q=!1,me=window.__MICRO_APP_ENVIRONMENT__,g=new Map,Y=s=>{let e=s.__requestKey;g.has(e)&&g.get(e)?.abort();let t=new AbortController;s.signal=t.signal,s.__requestKey=B(32),g.set(e,t)},F=s=>{Y(s);let e=P(),t=localStorage.getItem(o.langKey),n=localStorage.getItem(D);if(t&&(s.headers[o.langKey]=t),n&&!s.baseURL){let r=s.url.startsWith("/")?s.url:`/${s.url}`;s.url=n+r}if(!e&&!o.filter_url?.some(r=>s.url?.includes(r)))return o.tokenExpiration?.(),s;if(s.headers[S]||(s.headers[S]=e),o.requestOptions&&A(o.requestOptions)){let r=o.requestOptions(s);if(r&&G(r))for(let a in r)s[a]=r[a]}return s},V=s=>{if(o.handleResponse&&A(o.handleResponse))return o.handleResponse(s);let e=s.config?.__requestKey;if(e&&g.delete(e),s.data instanceof ArrayBuffer)return s;let t=s.data[o.codeKey||"status"];return typeof s.data=="object"&&typeof s.data.success>"u"&&(s.data.success=t===o.code),s.data},z=async s=>{let e=s.config;if(q)return new Promise((t,n)=>{R.push({resolve:t,reject:n})}).then(t=>(e.headers[S]=t,l(e))).catch(t=>Promise.reject(t));e._retry=!0,q=!0;try{if(await o.handleReconnect?.()){let n=P();return e.headers[S]=n,R.forEach(r=>r.resolve(n)),l(e)}}catch(t){throw R.forEach(n=>n.reject(t)),t}finally{R=[],q=!1}},M=async s=>{let e=s.response?.message||"Error",t=0;if(s.response){let{data:n,status:r}=s.response;switch(t=r,r){case 400:case 403:case 500:e=`${n?.message}`.substring(0,90);break;case 401:if(e=s.response.data.result?.text||"\u7528\u6237\u672A\u767B\u5F55",o.tokenExpiration?.(s),o.isCreateTokenRefresh)return z(s);break;case 404:e=s?.response?.data?.message||`${n?.error} ${n?.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 o.handleError&&A(o.handleError)&&o.handleError(e,t,s),Promise.reject(s)},ge=()=>{g.forEach(s=>s.abort()),g.clear()},we=s=>{s&&(o=Object.assign(o,s)),l=J.create({withCredentials:!1,timeout:o.timeout,baseURL:U}),l.interceptors.request.use(F,M),l.interceptors.response.use(V,M)},x=(s,e={},t)=>l({method:"POST",url:s,data:e,...t}),T=(s,e=void 0,t)=>l({method:"GET",url:s,params:e,...t}),$=(s,e={},t)=>l({method:"PUT",url:s,data:e,...t}),j=(s,e={},t)=>l({method:"patch",url:s,data:e,...t}),I=(s,e=void 0,t)=>l({method:"DELETE",url:s,params:e,...t}),X=(s,e,t)=>T(s,e,{responseType:"arraybuffer",...t}),Z=(s,e,t)=>x(s,e,{responseType:"arraybuffer",...t}),ee={post:x,get:T,put:$,patch:j,remove:I,getStream:X,postStream:Z},v=class{constructor(e){this.basePath=e;this.basePath=e.startsWith("/")?e:`/${e}`}requestWrapper(e,t,n={},r={}){let{url:a=e,method:y=t,...i}=r;return ee[y](`${this.basePath}${a}`,n,i)}page(e={},t={url:void 0,method:void 0}){return this.requestWrapper("/_query","post",e,t)}noPage(e={},t={url:void 0,method:void 0}){return this.requestWrapper("/_query/no-paging","post",{paging:!1,...e},t)}detail(e,t,n={url:void 0,method:void 0}){return this.requestWrapper(`/${e}/detail`,"get",t,n)}save(e={},t={url:void 0,method:void 0}){return this.requestWrapper("","post",e,t)}update(e={},t={url:void 0,method:void 0}){return this.requestWrapper("","patch",e,t)}delete(e,t,n={url:void 0,method:void 0}){return this.requestWrapper(`/${e}`,"post",t,n)}batch(e={},t,n){let r=`/_batch${t?"/"+t:""}`;return this.requestWrapper(r,"post",e,n)}post(e,t,n){return x(`${this.basePath}${e}`,t,n)}get(e,t,n){return T(`${this.basePath}${e}`,t,n)}put(e,t,n){return $(`${this.basePath}${e}`,t,n)}patch(e,t,n){return j(`${this.basePath}${e}`,t,n)}remove(e,t,n){return I(`${this.basePath}${e}`,t,n)}getStream(e,t,n){return T(`${this.basePath}${e}`,t,{responseType:"arraybuffer",...n})}postStream(e,t,n){return x(`${this.basePath}${e}`,t,{responseType:"arraybuffer",...n})}};import{getToken as te}from"@jetlinks-web/utils";import{BASE_API as se,TOKEN_KEY as N}from"@jetlinks-web/constants";import{isFunction as K,isObject as L}from"lodash-es";import{Observable as H}from"rxjs";var _=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="{}",n={}){let r=this.getUrl(e),a=this,y=this.controller=new AbortController;return new H(i=>{let h;return fetch(r,{method:"GET",signal:y.signal,keepalive:!0,...n,...this.handleRequest(r)}).then(m=>{h=m.body?.getReader();let k=new TextDecoder,p="";if(!h){i.error(new Error("No readable stream available"));return}let w=()=>{if(!a.isRead){h.cancel(),i.complete();return}h.read().then(({done:d,value:E})=>{if(d){if(p.trim().length>0)try{i.next(JSON.parse(p.trim()))}catch(u){i.error(u)}i.complete();return}let C=k.decode(E,{stream:!0});p+=C;let f=p.split(`
+`);for(let u=0;u<f.length-1;++u){let b=f[u].trim();if(b.length>0)try{i.next(JSON.parse(b.startsWith("data:")?b.slice(5):b))}catch(O){i.error(O);return}}p=f[f.length-1],w()}).catch(d=>{d.name!=="AbortError"&&i.error(d)})};a.isRead=!0,w()}).catch(m=>{i.error(m)}),()=>{a.cancel()}})}post(e,t={},n={}){let r=this.getUrl(e),a=this,y=this.controller=new AbortController;return new H(i=>{let h;return fetch(r,{method:"POST",signal:y.signal,keepalive:!0,body:L(t)?JSON.stringify(t):t,...n,...this.handleRequest(r)}).then(async m=>{h=m.body?.getReader();let k=new TextDecoder,p="";if(!h){i.error(new Error("No readable stream available"));return}let w=()=>{if(!a.isRead){h.cancel(),i.complete();return}h.read().then(({done:d,value:E})=>{if(d){if(p.trim().length>0)try{i.next(JSON.parse(p.trim()))}catch(u){i.error(u)}i.complete();return}let C=k.decode(E,{stream:!0});p+=C;let f=p.split(`
+`);for(let u=0;u<f.length-1;++u){let b=f[u].trim();if(b.length>0)try{i.next(JSON.parse(b.startsWith("data:")?b.slice(5):b))}catch(O){i.error(O);return}}p=f[f.length-1],w()}).catch(d=>{d.name!=="AbortError"&&i.error(d)})};a.isRead=!0,w()}).catch(m=>{i.error(m)}),()=>{a.cancel()}})}handleRequest(e){let t={headers:{"Content-Type":"application/x-ndjson"}},n=te();if(!n&&this.options.filter_url?.some(r=>r.includes(e)))return this.options.tokenExpiration?.(),t;if(t.headers[N]||(t.headers[N]=n),this.options.requestOptions&&K(this.options.requestOptions)){let r=this.options.requestOptions(t);if(r&&L(r))for(let a in r)t[a]=r[a]}return t}handleResponse(e){return this.options.handleResponse&&K(this.options.handleResponse)?this.options.handleResponse(e):e}cancel(){this.isRead&&(this.isRead=!1),this.controller&&this.controller.abort()}},Ee=new _;import{webSocket as ne}from"rxjs/webSocket";import{Observable as re,Subject as ie,timer as Q,EMPTY as oe}from"rxjs";import{retry as ae,catchError as ce}from"rxjs/operators";import{notification as pe}from"ant-design-vue";var c=window.__MICRO_APP_ENVIRONMENT__,W=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 Q(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=Q(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):pe.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,n={}){if(console.log("getWebSocket",this.wsClient,e),c&&this.wsClient)return this.wsClient.getWebSocket(e,t,n);let r=new ie;this.subscriptions.set(e,r);let a={id:e,topic:t,parameter:n,type:"sub"};return this.send(a),new re(y=>{let i=r.subscribe(y);return()=>{i.unsubscribe(),this.send({id:e,type:"unsub"}),this.subscriptions.delete(e)}})}},Me=new W;var ue,Pe=s=>{ue=s};var le={},je=(s={})=>{le=s};var he,Ne=s=>{he=s};export{_ as NdJson,v as Request,W as WebSocketClient,ge as abortAllRequests,we as crateAxios,T as get,X as getStream,Ne as installLocales,Pe as installRouter,je as installStores,l as instance,he as locales,Ee as ndJson,j as patch,x as post,Z as postStream,$ as put,I as remove,ee as request,ue as router,le as stores,Me as wsClient};

package/index.ts

@@ -1,6 +1,6 @@
-export * from './src/axios'
-export * from './src/fetch'
-export * from './src/websocket'
-export * from './src/router'
-export * from './src/stores'
-export * from './src/locales'
+export * from './src/axios'
+export * from './src/fetch'
+export * from './src/websocket'
+export * from './src/router'
+export * from './src/stores'
+export * from './src/locales'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/core",
-  "version": "2.2.16",
+  "version": "2.2.18",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -29,8 +29,8 @@
     "axios": "^1.7.4",
     "rxjs": "^7.8.1",
     "@jetlinks-web/constants": "^1.0.9",
-    "@jetlinks-web/utils": "^1.2.12",
-    "@jetlinks-web/types": "^1.0.2"
+    "@jetlinks-web/types": "^1.0.2",
+    "@jetlinks-web/utils": "^1.2.12"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/src/axios.ts

@@ -3,64 +3,13 @@ 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'
+import type { Options, ExpandRequestConfig, ExpandAxiosResponse, ExpandAxiosError, RequestOptions, PageResult, UpdateResult } from './type'
 
-interface Options {
+export let instance: AxiosInstance = (window as any).JetlinksCore?.instance || null
 
-  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 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
-  params?: any
-  data?: any
-  [key: string]: any
-}
-
-let instance: AxiosInstance
 let _options: Options = {
   filter_url: [],
   code: 200,
@@ -82,8 +31,8 @@ let isRefreshing = false;
 const isApp = (window as any).__MICRO_APP_ENVIRONMENT__
 
 const pendingRequests = new Map<string, AbortController>();
-const requestRecords = (config: typeRequestConfig) => {
-  const key = randomString(32)
+const requestRecords = (config: ExpandRequestConfig) => {
+  const key = config.__requestKey
 
   // 取消重复请求
   if (pendingRequests.has(key)) {
@@ -92,11 +41,12 @@ const requestRecords = (config: typeRequestConfig) => {
 
   const controller = new AbortController()
   config.signal = controller.signal;
-  config.__requestKey = key;
+  config.__requestKey = randomString(32);
 
   pendingRequests.set(key, controller)
 }
-const handleRequest = (config: typeRequestConfig) => {
+
+const handleRequest = (config: ExpandRequestConfig) => {
   requestRecords(config)
   const token = getToken();
   const lang = localStorage.getItem(_options.langKey)
@@ -134,7 +84,7 @@ const handleRequest = (config: typeRequestConfig) => {
   return config
 }
 
-const handleResponse = (response: typeAxiosResponse) => {
+const handleResponse = (response: ExpandAxiosResponse) => {
   if (_options.handleResponse && isFunction(_options.handleResponse)) {
     return _options.handleResponse(response)
   }
@@ -189,7 +139,7 @@ const createTokenRefreshHandler = async (err) => {
     isRefreshing = false;
   }
 }
-const errorHandler = async (err: typeAxiosError<any>) => {
+const errorHandler = async (err: ExpandAxiosError<any>) => {
   let description = err.response?.message || 'Error'
   let _status: string | number = 0
   if (err.response) {
@@ -311,38 +261,43 @@ export const request = {
 }
 
 export class Request {
-  modulePath: string
 
-  constructor(modulePath: string) {
-    this.modulePath = modulePath
+  constructor(public basePath: string) {
+    this.basePath = basePath.startsWith('/') ? basePath : `/${basePath}`
+  }
+
+  private requestWrapper<T = any>(
+    defaultUrl: string,
+    defaultMethod: 'post'| 'get'| 'put'| 'patch'| 'remove'| 'getStream'| 'postStream',
+    dataOrParams: any = {},
+    options: RequestOptions = {}
+  ): Promise<AxiosResponseRewrite<T>> {
+    const { url = defaultUrl, method = defaultMethod, ...rest } = options
+    return request[method]<T>(`${this.basePath}${url}`, dataOrParams, rest)
   }
 
   /**
    * 分页查询
    * @param {object} data 查询参数
    * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 分页查询结果
    */
-  page(data: any={}, options: RequestOptions= {
+  page<T = any>(data: any={}, options: RequestOptions= {
     url: undefined,
     method: undefined,
   }) {
-    const { url='/_query', method = 'post', ...rest } = options
-    return request[method](`${this.modulePath}${url}`, data, rest)
+    return this.requestWrapper<PageResult<T>>('/_query', 'post', data, options)
   }
 
   /**
    * 不分页查询
    * @param {object} data 查询参数
    * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 不分页查询结果
    */
-  noPage(data: any={}, options: RequestOptions = {
+  noPage<T = any>(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)
+    return this.requestWrapper<T[]>('/_query/no-paging', 'post', { paging: false, ...data }, options)
   }
 
   /**
@@ -350,81 +305,89 @@ export class Request {
    * @param {string} id 详情ID
    * @param {object} params 查询参数
    * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 详情查询结果
    */
-  detail(id: string, params?: any, options: RequestOptions= {
+  detail<T = any>(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)
+    return this.requestWrapper<T>(`/${id}/detail`, 'get', params, options)
   }
 
   /**
    * 保存
    * @param {object} data 保存参数
    * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 保存结果
    */
-  save(data: any={}, options: RequestOptions = {
+  save<T = any>(data: any={}, options: RequestOptions = {
     url: undefined,
     method: undefined,
   }) {
-    const { url=`/_create`, method = 'post', ...rest } = options
-    return request[method](`${this.modulePath}${url}`, data, rest)
+    return this.requestWrapper<T>('', 'post', data, options)
   }
 
   /**
    * 更新
    * @param {object} data 更新参数
    * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 更新结果
    */
-  update(data: any={}, options: RequestOptions = {
+  update<T extends UpdateResult>(data: any={}, options: RequestOptions = {
     url: undefined,
     method: undefined,
   }) {
-    const { url=`/_update`, method = 'patch', ...rest } = options
-    return patch(`${this.modulePath}${url}`, data, rest)
+    return this.requestWrapper<T>('', 'patch', data, options)
   }
 
   /**
    * 删除
    * @param {string} id 删除ID
+   * @param {object} params 请求参数
    * @param {object} options 请求配置
-   * @returns {Promise<AxiosResponse<any>>} 删除结果
+   * @example ${basePath}/${id}
    */
-  delete(id: string, params?: any, options: RequestOptions = {
+  delete<T = any>(id: string, params?: any, options: RequestOptions = {
     url: undefined,
     method: undefined,
   }) {
-    const { url=`/${id}`, method = 'post', ...rest } = options
-    return remove(`${this.modulePath}${url}`, params, rest)
+    return this.requestWrapper<T>(`/${id}`, 'post', params, options)
+  }
+
+  /**
+   * 批量操作
+   * @param data
+   * @param type
+   * @param options
+   */
+  batch<T = any>(data = {}, type?: string, options?: RequestOptions) {
+    const url = `/_batch${type ? '/' + type : ''}`
+    return this.requestWrapper<T>(url, 'post', data, options)
+  }
+
+  post<T = any>(url: string, data?: any, options?: any) {
+    return post<T>(`${this.basePath}${url}`, data, options)
+  }
+
+  get<T = any>(url: string, params?: any, options?: any) {
+    return get<T>(`${this.basePath}${url}`, params, options)
   }
 
-  post(...args) {
-    const [url, data, options] = args
-    return post(`${this.modulePath}${url}`, data, options)
+  put<T = any>(url: string, data?: any, options?: any) {
+    return put<T>(`${this.basePath}${url}`, data, options)
   }
 
-  get(...args) {
-    const [url, params, options] = args
-    return get(`${this.modulePath}${url}`, params, options)
+  patch<T = any>(url: string, data?: any, options?: any) {
+    return patch<T>(`${this.basePath}${url}`, data, options)
   }
 
-  put(...args) {
-    const [url, data, options] = args
-    return put(`${this.modulePath}${url}`, data, options)
+  remove<T = any>(url: string, params?: any, options?: any) {
+    return remove<T>(`${this.basePath}${url}`, params, options)
   }
 
-  patch(...args) {
-    const [url, data, options] = args
-    return patch(`${this.modulePath}${url}`, data, options)
+  getStream(url: string, params?: any, options?: any) {
+    return get(`${this.basePath}${url}`, params, { responseType: 'arraybuffer', ...options })
   }
 
-  remove(...args) {
-    const [url, params, options] = args
-    return remove(`${this.modulePath}${url}`, params, options)
+  postStream(url: string, data?: any, options?: any) {
+    return post(`${this.basePath}${url}`, data, { responseType: 'arraybuffer', ...options })
   }
 }
 

package/src/fetch.ts

@@ -1,233 +1,241 @@
-import {getToken} from "@jetlinks-web/utils";
-import {BASE_API, TOKEN_KEY} from "@jetlinks-web/constants";
-import {isFunction, isObject} from "lodash-es";
-import { Observable, } from 'rxjs'
-
-export class NdJson {
-  options: any = {
-    code: 200,
-    codeKey: 'status'
-  }
-  isRead = false
-  controller = null
-  constructor() {}
-
-  create(options) {
-    this.options = Object.assign(this.options, options)
-  }
-
-  getUrl(url) {
-    return BASE_API + url
-  }
-
-  get(url, data = '{}', extra = {}) {
-    const _url = this.getUrl(url)
-    const that = this
-    const controller = this.controller = new AbortController();
-
-    return new Observable(observer => {
-      let reader
-      fetch(
-        _url,
-        {
-          method: 'GET',
-          signal: controller.signal,
-          keepalive: true,
-          ...extra,
-          ...this.handleRequest(_url)
-        }
-      ).then(resp => {
-        reader = resp.body?.getReader();
-        const decoder = new TextDecoder();
-        let data_buf = "";
-
-        if (!reader) {
-          observer.error(new Error('No readable stream available'));
-          return;
-        }
-
-        const read = () => {
-
-          if (!that.isRead) {
-            reader.cancel()
-            observer.complete();
-            return
-          }
-
-          reader.read().then(({ done, value }) => {
-            if (done) {
-              if (data_buf.trim().length > 0) {
-                try {
-                  observer.next(JSON.parse(data_buf.trim()));
-                } catch (e) {
-                  observer.error(e);
-                }
-              }
-              observer.complete();
-              return;
-            }
-
-            const data = decoder.decode(value, { stream: true });
-            data_buf += data;
-
-            let lines = data_buf.split('\n');
-            for (let i = 0; i < lines.length - 1; ++i) {
-              const line = lines[i].trim();
-              if (line.length > 0) {
-                try {
-                  observer.next(JSON.parse(line));
-                } catch (e) {
-                  observer.error(e);
-                  reader.cancel();
-                  return;
-                }
-              }
-            }
-            data_buf = lines[lines.length - 1];
-            read();
-          }).catch(err => observer.error(err));
-        };
-        that.isRead = true
-        read();
-      }).catch(e => {
-        observer.error(e)
-      })
-
-      return () => {
-        that.cancel()
-      }
-    })
-  }
-
-  post(url, data: BodyInit | any ={}, extra = {}) {
-    const _url = this.getUrl(url)
-    const that = this
-    const controller = this.controller = new AbortController();
-
-    return new Observable(observer => {
-      let reader
-      fetch(
-        _url,
-        {
-          method: 'POST',
-          signal: controller.signal,
-          keepalive: true,
-          body: isObject(data) ? JSON.stringify(data) : data,
-          ...extra,
-          ...this.handleRequest(_url)
-        }
-      ).then(async resp => {
-        reader = resp.body?.getReader();
-        const decoder = new TextDecoder();
-        let data_buf = "";
-
-        if (!reader) {
-          observer.error(new Error('No readable stream available'));
-          return;
-        }
-
-        const read = () => {
-
-          if (!that.isRead) {
-            reader.cancel()
-            observer.complete();
-            return
-          }
-
-          reader.read().then(({ done, value }) => {
-            if (done) {
-              if (data_buf.trim().length > 0) {
-                try {
-                  observer.next(JSON.parse(data_buf.trim()));
-                } catch (e) {
-                  observer.error(e);
-                }
-              }
-              observer.complete();
-              return;
-            }
-
-            const data = decoder.decode(value, { stream: true });
-            data_buf += data;
-
-            let lines = data_buf.split('\n');
-            for (let i = 0; i < lines.length - 1; ++i) {
-              const line = lines[i].trim();
-              if (line.length > 0) {
-                try {
-                  observer.next(JSON.parse(line.startsWith('data:') ? line.slice(5) : line));
-                } catch (e) {
-                  observer.error(e);
-                  reader.cancel();
-                  return;
-                }
-              }
-            }
-            data_buf = lines[lines.length - 1];
-            read();
-          }).catch(err => observer.error(err));
-        };
-        that.isRead = true
-        read();
-      }).catch(e => {
-          observer.error(e)
-      })
-
-      return () => {
-        that.cancel()
-      }
-    })
-  }
-  handleRequest(url): RequestInit {
-    const config: RequestInit = {
-      headers: {
-        'Content-Type': 'application/x-ndjson',
-      }
-    }
-
-    const token = getToken()
-
-    if (!token && this.options.filter_url?.some(_url => _url.includes(url))) {
-      this.options.tokenExpiration?.()
-      return config
-    }
-
-    if (!config.headers[TOKEN_KEY]) {
-      config.headers[TOKEN_KEY] = token
-    }
-
-    if (this.options.requestOptions && isFunction(this.options.requestOptions)) {
-      const extraOptions = this.options.requestOptions(config)
-      if (extraOptions && isObject(extraOptions)) {
-        for (const key in extraOptions) {
-          config[key] = extraOptions[key]
-        }
-      }
-    }
-
-    return config
-  }
-
-  handleResponse(response) {
-
-    if (this.options.handleResponse && isFunction(this.options.handleResponse)) {
-      return this.options.handleResponse(response)
-    }
-
-    // const status = response[this.options.codeKey || 'status']
-    // response.success = status === this.options.code
-
-    return response
-  }
-
-  cancel() {
-    if (this.isRead) {
-      this.isRead = false
-    }
-
-    this.controller.abort()
-  }
-}
-
-
-export const ndJson = new NdJson()
+import {getToken} from "@jetlinks-web/utils";
+import {BASE_API, TOKEN_KEY} from "@jetlinks-web/constants";
+import {isFunction, isObject} from "lodash-es";
+import { Observable, } from 'rxjs'
+
+export class NdJson {
+  options: any = {
+    code: 200,
+    codeKey: 'status'
+  }
+  isRead = false
+  controller = null
+  constructor() {}
+
+  create(options) {
+    this.options = Object.assign(this.options, options)
+  }
+
+  getUrl(url) {
+    return BASE_API + url
+  }
+
+  get(url, data = '{}', extra = {}) {
+    const _url = this.getUrl(url)
+    const that = this
+    const controller = this.controller = new AbortController();
+
+    return new Observable(observer => {
+      let reader
+      fetch(
+        _url,
+        {
+          method: 'GET',
+          signal: controller.signal,
+          keepalive: true,
+          ...extra,
+          ...this.handleRequest(_url)
+        }
+      ).then(resp => {
+        reader = resp.body?.getReader();
+        const decoder = new TextDecoder();
+        let data_buf = "";
+
+        if (!reader) {
+          observer.error(new Error('No readable stream available'));
+          return;
+        }
+
+        const read = () => {
+
+          if (!that.isRead) {
+            reader.cancel()
+            observer.complete();
+            return
+          }
+
+          reader.read().then(({ done, value }) => {
+            if (done) {
+              if (data_buf.trim().length > 0) {
+                try {
+                  observer.next(JSON.parse(data_buf.trim()));
+                } catch (e) {
+                  observer.error(e);
+                }
+              }
+              observer.complete();
+              return;
+            }
+
+            const data = decoder.decode(value, { stream: true });
+            data_buf += data;
+
+            let lines = data_buf.split('\n');
+            for (let i = 0; i < lines.length - 1; ++i) {
+              const line = lines[i].trim();
+              if (line.length > 0) {
+                try {
+                  observer.next(JSON.parse(line.startsWith('data:') ? line.slice(5) : line));
+                } catch (e) {
+                  observer.error(e);
+                  return;
+                }
+              }
+            }
+            data_buf = lines[lines.length - 1];
+            read();
+          }).catch(err => {
+            if (err.name !== 'AbortError') {
+              observer.error(err);
+            }
+          });
+        };
+        that.isRead = true
+        read();
+      }).catch(e => {
+        observer.error(e)
+      })
+
+      return () => {
+        that.cancel()
+      }
+    })
+  }
+
+  post(url, data: BodyInit | any ={}, extra = {}) {
+    const _url = this.getUrl(url)
+    const that = this
+    const controller = this.controller = new AbortController();
+
+    return new Observable(observer => {
+      let reader
+      fetch(
+        _url,
+        {
+          method: 'POST',
+          signal: controller.signal,
+          keepalive: true,
+          body: isObject(data) ? JSON.stringify(data) : data,
+          ...extra,
+          ...this.handleRequest(_url)
+        }
+      ).then(async resp => {
+        reader = resp.body?.getReader();
+        const decoder = new TextDecoder();
+        let data_buf = "";
+
+        if (!reader) {
+          observer.error(new Error('No readable stream available'));
+          return;
+        }
+
+        const read = () => {
+
+          if (!that.isRead) {
+            reader.cancel()
+            observer.complete();
+            return
+          }
+
+          reader.read().then(({ done, value }) => {
+            if (done) {
+              if (data_buf.trim().length > 0) {
+                try {
+                  observer.next(JSON.parse(data_buf.trim()));
+                } catch (e) {
+                  observer.error(e);
+                }
+              }
+              observer.complete();
+              return;
+            }
+
+            const data = decoder.decode(value, { stream: true });
+            data_buf += data;
+
+            let lines = data_buf.split('\n');
+            for (let i = 0; i < lines.length - 1; ++i) {
+              const line = lines[i].trim();
+              if (line.length > 0) {
+                try {
+                  observer.next(JSON.parse(line.startsWith('data:') ? line.slice(5) : line));
+                } catch (e) {
+                  observer.error(e);
+                  return;
+                }
+              }
+            }
+            data_buf = lines[lines.length - 1];
+            read();
+          }).catch(err => {
+            if (err.name !== 'AbortError') {
+              observer.error(err);
+            }
+          });
+        };
+        that.isRead = true
+        read();
+      }).catch(e => {
+          observer.error(e)
+      })
+
+      return () => {
+        that.cancel()
+      }
+    })
+  }
+  handleRequest(url): RequestInit {
+    const config: RequestInit = {
+      headers: {
+        'Content-Type': 'application/x-ndjson',
+      }
+    }
+
+    const token = getToken()
+
+    if (!token && this.options.filter_url?.some(_url => _url.includes(url))) {
+      this.options.tokenExpiration?.()
+      return config
+    }
+
+    if (!config.headers[TOKEN_KEY]) {
+      config.headers[TOKEN_KEY] = token
+    }
+
+    if (this.options.requestOptions && isFunction(this.options.requestOptions)) {
+      const extraOptions = this.options.requestOptions(config)
+      if (extraOptions && isObject(extraOptions)) {
+        for (const key in extraOptions) {
+          config[key] = extraOptions[key]
+        }
+      }
+    }
+
+    return config
+  }
+
+  handleResponse(response) {
+
+    if (this.options.handleResponse && isFunction(this.options.handleResponse)) {
+      return this.options.handleResponse(response)
+    }
+
+    // const status = response[this.options.codeKey || 'status']
+    // response.success = status === this.options.code
+
+    return response
+  }
+
+  cancel() {
+    if (this.isRead) {
+      this.isRead = false
+    }
+
+    if (this.controller) {
+      this.controller.abort()
+    }
+  }
+}
+
+
+export const ndJson = new NdJson()

package/src/locales.ts

@@ -1,7 +1,7 @@
-let locales
-
-const installLocales = (l) => {
-  locales = l
-}
-
-export { locales, installLocales }
+let locales
+
+const installLocales = (l) => {
+  locales = l
+}
+
+export { locales, installLocales }

package/src/router.ts

@@ -1,7 +1,7 @@
-let router
-
-const installRouter = (r) => {
-  router = r
-}
-
-export { router, installRouter }
+let router
+
+const installRouter = (r) => {
+  router = r
+}
+
+export { router, installRouter }

package/src/stores.ts

@@ -1,10 +1,10 @@
-let stores = {}
-
-const installStores = (_s = {}) => {
-  stores = _s
-}
-
-export {
-  stores,
-  installStores
-}
+let stores = {}
+
+const installStores = (_s = {}) => {
+  stores = _s
+}
+
+export {
+  stores,
+  installStores
+}

package/src/type.ts

@@ -0,0 +1,63 @@
+import type {AxiosError, AxiosResponse, InternalAxiosRequestConfig} from "axios";
+
+export 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
+}
+
+export interface ExpandRequestConfig extends InternalAxiosRequestConfig {
+  __requestKey?: string
+}
+
+export interface ExpandAxiosResponse extends AxiosResponse {
+  config: ExpandRequestConfig
+  message: string
+}
+
+export interface ExpandAxiosError<T> extends AxiosError<T> {
+  response: ExpandAxiosResponse
+}
+
+export interface PageResult<T> {
+  data: T[],
+  total: number
+  pageIndex: number
+  pageSize: number
+}
+
+export interface UpdateResult {
+  added: number
+  total: number
+  updated: number
+}
+
+export interface RequestOptions {
+  url?: string
+  method?: string
+  params?: any
+  data?: any
+  [key: string]: any
+}