@jetlinks-web/core 2.1.7 → 2.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/core",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "main": "index.ts",
   "module": "index.ts",
   "keywords": [
@@ -21,8 +21,8 @@
   "dependencies": {
     "axios": "^1.7.4",
     "rxjs": "^7.8.1",
-    "@jetlinks-web/types": "^1.0.2",
     "@jetlinks-web/constants": "^1.0.9",
+    "@jetlinks-web/types": "^1.0.2",
     "@jetlinks-web/utils": "^1.2.8"
   },
   "publishConfig": {

package/src/axios.ts

@@ -47,7 +47,6 @@ interface RequestOptions {
 }
 
 let instance: AxiosInstance
-
 let _options: Options = {
   filter_url: [],
   code: 200,
@@ -61,6 +60,7 @@ let _options: Options = {
   tokenExpiration: () => {},
 }
 
+const isApp = (window as any).__MICRO_APP_ENVIRONMENT__
 const controller = new AbortController();
 
 const handleRequest = (config: InternalAxiosRequestConfig) => {

package/src/websocket.ts

@@ -1,7 +1,10 @@
+import { wsClient } from '@/utils/websocket';
 import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
 import { Observable, Subject, timer, Subscription, EMPTY } from 'rxjs';
 import { retry, catchError } from 'rxjs/operators';
 import { notification } from 'ant-design-vue';
+import app from '@micro-zoe/micro-app'
+import { log } from 'console';
 
 interface WebSocketMessage {
   type: string;
@@ -14,24 +17,32 @@ interface WebSocketMessage {
 }
 
 type WS_Options = {
-    onError?: (message: WebSocketMessage) => void
+  onError?: (message: WebSocketMessage) => void
 }
 
+const isApp = (window as any).__MICRO_APP_ENVIRONMENT__
+
 export class WebSocketClient {
   private ws: WebSocketSubject<WebSocketMessage> | null = null;
   private subscriptions = new Map<string, Subject<WebSocketMessage>>();
   private pendingSubscriptions = new Map<string, Subject<WebSocketMessage>>();
   private heartbeatSubscription: Subscription | null = null;
   private reconnectAttempts = 0;
-  private readonly maxReconnectAttempts = 100;
+  private readonly maxReconnectAttempts = 2;
   private isConnected = false;
   private tempQueue: WebSocketMessage[] = []; // 缓存消息队列
   private url: string = '';
   private options: WS_Options = {}
+  private wsClient: WebSocketClient | undefined
 
   constructor(options?: WS_Options) {
     this.options = options || {};
     this.setupConnectionMonitor();
+    if (isApp) {
+      (window as any).microApp.addGlobalDataListener((data) => {
+        this.wsClient = data.wsClient
+      })
+    }
   }
 
   public initWebSocket(url: string) {
@@ -39,19 +50,21 @@ export class WebSocketClient {
   }
 
   private setupConnectionMonitor() {
-    window.addEventListener('online', () => {
-      console.log('Network is online, attempting to reconnect...');
-      this.reconnect();
-    });
+    if (!isApp) {
+      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('offline', () => {
+        console.log('Network is offline, caching subscriptions...');
+        this.cacheSubscriptions();
+      });
 
-    window.addEventListener('beforeunload', () => {
-      this.disconnect();
-    });
+      window.addEventListener('beforeunload', () => {
+        this.disconnect();
+      });
+    }
   }
 
   private getReconnectDelay(): number {
@@ -64,6 +77,12 @@ export class WebSocketClient {
   }
 
   private setupWebSocket() {
+
+    if (isApp && this.wsClient) {
+      this.wsClient.setupWebSocket()
+      return
+    }
+
     if (this.ws || !this.url) {
       return;
     }
@@ -84,9 +103,17 @@ export class WebSocketClient {
         next: () => {
           console.log('WebSocket disconnected');
           this.isConnected = false;
-          this.cacheSubscriptions();
-          this.stopHeartbeat();
-          this.reconnect();
+          const time = this.getReconnectDelay()
+          setTimeout(() => {
+            this.reconnectAttempts += 1;
+            if (this.reconnectAttempts > this.maxReconnectAttempts) {
+              return
+            }
+            this.cacheSubscriptions();
+            this.stopHeartbeat();
+            this.reconnect();
+          }, time)
+
         }
       }
     });
@@ -112,6 +139,10 @@ export class WebSocketClient {
   }
 
   private startHeartbeat() {
+    if (isApp && this.wsClient) {
+      this.wsClient.startHeartbeat()
+      return
+    }
     this.stopHeartbeat();
     this.heartbeatSubscription = timer(0, 2000).subscribe(() => {
       this.send({ type: 'ping' });
@@ -119,6 +150,11 @@ export class WebSocketClient {
   }
 
   private stopHeartbeat() {
+    if (isApp && this.wsClient) {
+      this.wsClient.stopHeartbeat()
+      return
+    }
+
     if (this.heartbeatSubscription) {
       this.heartbeatSubscription.unsubscribe();
       this.heartbeatSubscription = null;
@@ -126,16 +162,22 @@ export class WebSocketClient {
   }
 
   private handleMessage(message: WebSocketMessage) {
+
+    if (isApp && this.wsClient) {
+      this.wsClient.handleMessage(message)
+      return
+    }
+
     if (message.type === 'pong') {
       return;
     }
 
     if (message.type === 'error') {
-        if (this.options.onError) {
-            this.options.onError(message)
-        } else {
-            notification.error({ key: 'error', message: message.message });
-        }
+      if (this.options.onError) {
+        this.options.onError(message)
+      } else {
+        notification.error({ key: 'error', message: message.message });
+      }
       return;
     }
 
@@ -151,6 +193,11 @@ export class WebSocketClient {
   }
 
   private processTempQueue() {
+    if (isApp && this.wsClient) {
+      this.wsClient.processTempQueue()
+      return
+    }
+
     while (this.tempQueue.length > 0) {
       const message = this.tempQueue.shift();
       if (message) {
@@ -160,11 +207,19 @@ export class WebSocketClient {
   }
 
   private cacheSubscriptions() {
+    if (isApp && this.wsClient) {
+      this.wsClient.cacheSubscriptions()
+      return
+    }
     this.pendingSubscriptions = new Map(this.subscriptions);
     this.subscriptions.clear();
   }
 
   private restoreSubscriptions() {
+    if (isApp && this.wsClient) {
+      this.wsClient.restoreSubscriptions()
+      return
+    }
     this.pendingSubscriptions.forEach((subject, id) => {
       this.subscriptions.set(id, subject);
     });
@@ -172,6 +227,10 @@ export class WebSocketClient {
   }
 
   private reconnect() {
+    if (isApp && this.wsClient) {
+      this.wsClient.reconnect()
+      return
+    }
     if (!this.isConnected && navigator.onLine) {
       this.ws = null;
       this.setupWebSocket();
@@ -179,10 +238,18 @@ export class WebSocketClient {
   }
 
   public connect() {
+    if (isApp && this.wsClient) {
+      this.wsClient.connect()
+      return
+    }
     this.setupWebSocket();
   }
 
   public disconnect() {
+    if (isApp && this.wsClient) {
+      this.wsClient.disconnect()
+      return
+    }
     if (this.ws) {
       this.ws.complete();
       this.ws = null;
@@ -194,6 +261,10 @@ export class WebSocketClient {
   }
 
   public send(message: WebSocketMessage) {
+    if (isApp && this.wsClient) {
+      this.wsClient.send(message)
+      return
+    }
     if (this.ws && this.isConnected) {
       this.ws.next(message);
     } else {
@@ -202,6 +273,15 @@ export class WebSocketClient {
   }
 
   public getWebSocket(id: string, topic: string, parameter: Record<string, any> = {}): Observable<WebSocketMessage> {
+    console.log('getWebSocket', this.wsClient, id)
+    if (isApp && this.wsClient) {
+      return this.wsClient.getWebSocket(
+        id,
+        topic,
+        parameter
+      )
+    }
+
     const subject = new Subject<WebSocketMessage>();
     this.subscriptions.set(id, subject);
 
@@ -235,9 +315,9 @@ export class WebSocketClient {
  *   .subscribe(
  *     message => console.log('Received:', message)
  *   );
- * 
+ *
  * // 清理
  * subscription.unsubscribe();
- * 
+ *
  */
 export const wsClient = new WebSocketClient();