@havue/solutions 1.1.1 → 1.1.2

package/bc-connect/__tests__/bc-connect.spec.ts

@@ -0,0 +1,73 @@
+import { describe, expect, it } from 'vitest'
+import { BroadcastChannelManager, BcConnectNodeTypeEnum } from '@havue/bc-connect'
+
+async function sleep(time) {
+  return new Promise((res) => {
+    setTimeout(res, time)
+  })
+}
+
+const DEBUG = false
+
+describe.sequential('BroadcastChannelManager', () => {
+  it('should create a new instance', () => {
+    const manager = new BroadcastChannelManager('test-channel', DEBUG)
+    expect(manager).toBeInstanceOf(BroadcastChannelManager)
+    manager.destroy()
+  })
+
+  it('should be Main', async () => {
+    const manager = new BroadcastChannelManager('test-channel', DEBUG)
+    manager.connect()
+    expect(manager.nodeType).toBeUndefined()
+    await sleep(400)
+    expect(manager.nodeType).toBe(BcConnectNodeTypeEnum.Main)
+    manager.close()
+    manager.destroy()
+  })
+
+  it('when channel closed', async () => {
+    const manager = new BroadcastChannelManager('test-channel', DEBUG)
+    manager.connect()
+    manager.close()
+    await sleep(400)
+    expect(manager.nodeType).toBeUndefined()
+    manager.destroy()
+  })
+
+  it('should handle messages', async () => {
+    const manager1 = new BroadcastChannelManager('test-channel', DEBUG)
+    // 确保第二个id生成在第一个之后
+    await sleep(10)
+    const manager2 = new BroadcastChannelManager('test-channel', DEBUG)
+    manager1.connect()
+    manager2.connect()
+    await sleep(1200)
+
+    const message1 = { type: 'test', data: 'Hello, manger2!' }
+    const message2 = { type: 'test', data: 'Hello, manger1!' }
+
+    manager1.on('test', (message) => {
+      expect(message.data).toBe(message2.data)
+    })
+    manager2.on('test', (message) => {
+      expect(message.data).toBe(message1.data)
+    })
+
+    manager1.send(message1.type, message1.data)
+    manager2.send(message2.type, message2.data)
+    expect(manager1.nodeType).toBe(BcConnectNodeTypeEnum.Main)
+    expect(manager2.nodeType).toBe(BcConnectNodeTypeEnum.Normal)
+
+    expect(manager1.friendList).toContain(manager2.id)
+    expect(manager2.friendList).toContain(manager1.id)
+
+    // wait for the message to be received
+    await sleep(1000)
+    manager1.close()
+    manager2.close()
+
+    manager1.destroy()
+    manager2.destroy()
+  })
+})

package/bc-connect/dist/bc-connect.mjs

@@ -29,7 +29,9 @@ class BroadcastChannelManager {
     /** 主节点发送心跳的interval */
     __publicField(this, "_mainNodeMsgInterval", null);
     /** 认为主节点掉线的timeout */
-    __publicField(this, "_mainNoceMsgTimeoutTimer", null);
+    __publicField(this, "_mainNodeMsgTimeoutTimer", null);
+    /** 更新友方列表的timeout */
+    __publicField(this, "_updateFriendListTimer", null);
     /** 当前实例id */
     __publicField(this, "id", Date.now() + Math.random());
     /** 记录的友方id数组 */
@@ -61,6 +63,16 @@ class BroadcastChannelManager {
   close() {
     this._debug && console.log("BC:bc close");
     this._broadcastChannel && this._broadcastChannel.close();
+    this._broadcastChannel = void 0;
+    this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer);
+    this._updateFriendListTimer = null;
+    this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval);
+    this._mainNodeMsgInterval = null;
+    this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer);
+    this._mainNodeMsgTimeoutTimer = null;
+    this._oldFrendChannelIdList = [];
+    this._friendChannelIdSet.clear();
+    this._nodeType = void 0;
   }
   /**
    * 切换节点类型
@@ -84,7 +96,8 @@ class BroadcastChannelManager {
       "Hello world"
       /* Broadcast */
     );
-    setTimeout(() => {
+    this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer);
+    this._updateFriendListTimer = setTimeout(() => {
       this._oldFrendChannelIdList = this._getNewFriendList();
       this._debug && console.log("BC:connect:updateFriendChannelIdList:", this._oldFrendChannelIdList);
       this.emit("friend list update", {
@@ -183,8 +196,8 @@ class BroadcastChannelManager {
     }
   }
   _timeoutToBeMainNode() {
-    this._mainNoceMsgTimeoutTimer && clearTimeout(this._mainNoceMsgTimeoutTimer);
-    this._mainNoceMsgTimeoutTimer = setTimeout(() => {
+    this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer);
+    this._mainNodeMsgTimeoutTimer = setTimeout(() => {
       this._req_beMainNode();
     }, MessageTimeout * 3);
   }
@@ -330,8 +343,8 @@ class BroadcastChannelManager {
     this._nodeType = void 0;
     this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval);
     this._mainNodeMsgInterval = null;
-    this._mainNoceMsgTimeoutTimer && clearInterval(this._mainNoceMsgTimeoutTimer);
-    this._mainNoceMsgTimeoutTimer = null;
+    this._mainNodeMsgTimeoutTimer && clearInterval(this._mainNodeMsgTimeoutTimer);
+    this._mainNodeMsgTimeoutTimer = null;
     this._debug && console.log("BC:destroy");
   }
 }

package/bc-connect/dist/bc-connect.umd.js

@@ -33,7 +33,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       /** 主节点发送心跳的interval */
       __publicField(this, "_mainNodeMsgInterval", null);
       /** 认为主节点掉线的timeout */
-      __publicField(this, "_mainNoceMsgTimeoutTimer", null);
+      __publicField(this, "_mainNodeMsgTimeoutTimer", null);
+      /** 更新友方列表的timeout */
+      __publicField(this, "_updateFriendListTimer", null);
       /** 当前实例id */
       __publicField(this, "id", Date.now() + Math.random());
       /** 记录的友方id数组 */
@@ -65,6 +67,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     close() {
       this._debug && console.log("BC:bc close");
       this._broadcastChannel && this._broadcastChannel.close();
+      this._broadcastChannel = void 0;
+      this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer);
+      this._updateFriendListTimer = null;
+      this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval);
+      this._mainNodeMsgInterval = null;
+      this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer);
+      this._mainNodeMsgTimeoutTimer = null;
+      this._oldFrendChannelIdList = [];
+      this._friendChannelIdSet.clear();
+      this._nodeType = void 0;
     }
     /**
      * 切换节点类型
@@ -88,7 +100,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         "Hello world"
         /* Broadcast */
       );
-      setTimeout(() => {
+      this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer);
+      this._updateFriendListTimer = setTimeout(() => {
         this._oldFrendChannelIdList = this._getNewFriendList();
         this._debug && console.log("BC:connect:updateFriendChannelIdList:", this._oldFrendChannelIdList);
         this.emit("friend list update", {
@@ -187,8 +200,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }
     }
     _timeoutToBeMainNode() {
-      this._mainNoceMsgTimeoutTimer && clearTimeout(this._mainNoceMsgTimeoutTimer);
-      this._mainNoceMsgTimeoutTimer = setTimeout(() => {
+      this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer);
+      this._mainNodeMsgTimeoutTimer = setTimeout(() => {
         this._req_beMainNode();
       }, MessageTimeout * 3);
     }
@@ -334,8 +347,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this._nodeType = void 0;
       this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval);
       this._mainNodeMsgInterval = null;
-      this._mainNoceMsgTimeoutTimer && clearInterval(this._mainNoceMsgTimeoutTimer);
-      this._mainNoceMsgTimeoutTimer = null;
+      this._mainNodeMsgTimeoutTimer && clearInterval(this._mainNodeMsgTimeoutTimer);
+      this._mainNodeMsgTimeoutTimer = null;
       this._debug && console.log("BC:destroy");
     }
   }

package/bc-connect/dist/types/src/manager.d.ts

@@ -46,7 +46,9 @@ export declare class BroadcastChannelManager {
     /** 主节点发送心跳的interval */
     private _mainNodeMsgInterval;
     /** 认为主节点掉线的timeout */
-    private _mainNoceMsgTimeoutTimer;
+    private _mainNodeMsgTimeoutTimer;
+    /** 更新友方列表的timeout */
+    private _updateFriendListTimer;
     /** 当前实例id */
     id: number;
     /** 记录的友方id数组 */

package/bc-connect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@havue/bc-connect",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Javascript class for Broadcast channel connect",
   "keywords": [
     "havue",

package/bc-connect/src/manager.ts

@@ -54,7 +54,9 @@ export class BroadcastChannelManager {
   /** 主节点发送心跳的interval */
   private _mainNodeMsgInterval: number | null = null
   /** 认为主节点掉线的timeout */
-  private _mainNoceMsgTimeoutTimer: number | null = null
+  private _mainNodeMsgTimeoutTimer: number | null = null
+  /** 更新友方列表的timeout */
+  private _updateFriendListTimer: number | null = null
   /** 当前实例id */
   public id: number = Date.now() + Math.random()
   /** 记录的友方id数组 */
@@ -93,6 +95,16 @@ export class BroadcastChannelManager {
   public close() {
     this._debug && console.log('BC:bc close')
     this._broadcastChannel && this._broadcastChannel.close()
+    this._broadcastChannel = undefined
+    this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer)
+    this._updateFriendListTimer = null
+    this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval)
+    this._mainNodeMsgInterval = null
+    this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer)
+    this._mainNodeMsgTimeoutTimer = null
+    this._oldFrendChannelIdList = []
+    this._friendChannelIdSet.clear()
+    this._nodeType = undefined
   }
 
   /**
@@ -117,7 +129,9 @@ export class BroadcastChannelManager {
     // 广播告知己方存在
     this.send(BcConnectEventTypeEnum.Broadcast)
 
-    setTimeout(() => {
+    this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer)
+
+    this._updateFriendListTimer = setTimeout(() => {
       this._oldFrendChannelIdList = this._getNewFriendList()
       this._debug && console.log('BC:connect:updateFriendChannelIdList:', this._oldFrendChannelIdList)
       this.emit(BcConnectEventTypeEnum.Friend_List_Update, {
@@ -221,9 +235,9 @@ export class BroadcastChannelManager {
   }
 
   private _timeoutToBeMainNode() {
-    this._mainNoceMsgTimeoutTimer && clearTimeout(this._mainNoceMsgTimeoutTimer)
+    this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer)
     // 超时未收到心跳，认为主节点掉线，申请为主节点
-    this._mainNoceMsgTimeoutTimer = setTimeout(() => {
+    this._mainNodeMsgTimeoutTimer = setTimeout(() => {
       this._req_beMainNode()
     }, MessageTimeout * 3)
   }
@@ -381,8 +395,8 @@ export class BroadcastChannelManager {
 
     this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval)
     this._mainNodeMsgInterval = null
-    this._mainNoceMsgTimeoutTimer && clearInterval(this._mainNoceMsgTimeoutTimer)
-    this._mainNoceMsgTimeoutTimer = null
+    this._mainNodeMsgTimeoutTimer && clearInterval(this._mainNodeMsgTimeoutTimer)
+    this._mainNodeMsgTimeoutTimer = null
     this._debug && console.log('BC:destroy')
   }
 }

package/dist/solutions.full.js

@@ -33,7 +33,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       /** 主节点发送心跳的interval */
       __publicField(this, "_mainNodeMsgInterval", null);
       /** 认为主节点掉线的timeout */
-      __publicField(this, "_mainNoceMsgTimeoutTimer", null);
+      __publicField(this, "_mainNodeMsgTimeoutTimer", null);
+      /** 更新友方列表的timeout */
+      __publicField(this, "_updateFriendListTimer", null);
       /** 当前实例id */
       __publicField(this, "id", Date.now() + Math.random());
       /** 记录的友方id数组 */
@@ -65,6 +67,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     close() {
       this._debug && console.log("BC:bc close");
       this._broadcastChannel && this._broadcastChannel.close();
+      this._broadcastChannel = void 0;
+      this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer);
+      this._updateFriendListTimer = null;
+      this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval);
+      this._mainNodeMsgInterval = null;
+      this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer);
+      this._mainNodeMsgTimeoutTimer = null;
+      this._oldFrendChannelIdList = [];
+      this._friendChannelIdSet.clear();
+      this._nodeType = void 0;
     }
     /**
      * 切换节点类型
@@ -88,7 +100,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         "Hello world"
         /* Broadcast */
       );
-      setTimeout(() => {
+      this._updateFriendListTimer && clearTimeout(this._updateFriendListTimer);
+      this._updateFriendListTimer = setTimeout(() => {
         this._oldFrendChannelIdList = this._getNewFriendList();
         this._debug && console.log("BC:connect:updateFriendChannelIdList:", this._oldFrendChannelIdList);
         this.emit("friend list update", {
@@ -187,8 +200,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }
     }
     _timeoutToBeMainNode() {
-      this._mainNoceMsgTimeoutTimer && clearTimeout(this._mainNoceMsgTimeoutTimer);
-      this._mainNoceMsgTimeoutTimer = setTimeout(() => {
+      this._mainNodeMsgTimeoutTimer && clearTimeout(this._mainNodeMsgTimeoutTimer);
+      this._mainNodeMsgTimeoutTimer = setTimeout(() => {
         this._req_beMainNode();
       }, MessageTimeout * 3);
     }
@@ -334,8 +347,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this._nodeType = void 0;
       this._mainNodeMsgInterval && clearInterval(this._mainNodeMsgInterval);
       this._mainNodeMsgInterval = null;
-      this._mainNoceMsgTimeoutTimer && clearInterval(this._mainNoceMsgTimeoutTimer);
-      this._mainNoceMsgTimeoutTimer = null;
+      this._mainNodeMsgTimeoutTimer && clearInterval(this._mainNodeMsgTimeoutTimer);
+      this._mainNodeMsgTimeoutTimer = null;
       this._debug && console.log("BC:destroy");
     }
   }