@koi-design/callkit 2.0.0 → 2.0.2

package/dist/index.d.ts

@@ -72,6 +72,7 @@ declare class Socket {
     constructor(callKit: CallKit);
     init(): void;
     private handleDisconnect;
+    private clearWebSocket;
     private connect;
     private onOpen;
     private resetReconnectState;

package/dist/index.global.js

@@ -3785,7 +3785,7 @@ var WebCall = (() => {
   // package.json
   var package_default = {
     name: "@koi-design/callkit",
-    version: "2.0.0",
+    version: "2.0.2",
     description: "callkit",
     author: "koi",
     license: "ISC",
@@ -3842,7 +3842,7 @@ var WebCall = (() => {
       this.callKit = callKit;
     }
     config = {
-      version: `v${package_default.version}`,
+      version: `V${package_default.version}`,
       host: "",
       log: "info",
       trackLogs: trackLogsDefaultConfig,
@@ -19066,14 +19066,11 @@ var WebCall = (() => {
             caller: "Connect.register",
             type: "SIP",
             content: {
-              version: `V${this.callKit.config.getConfig().version}`
+              version: `${this.callKit.config.getConfig().version}`
             }
           });
-          const version = `V${this.callKit.config.getConfig().version}`;
           await this.registerer.register().then(() => {
-            this.callKit.socket.send(SocketSendEvent.START, {
-              version
-            });
+            this.callKit.socket.send(SocketSendEvent.START);
           }).catch(async (err) => {
             this.callKit.reset();
             this.callKit.logger.error(err?.message, {
@@ -19490,9 +19487,33 @@ var WebCall = (() => {
         });
         return;
       }
+      if (this.isReconnecting) {
+        return;
+      }
       this.attemptReconnect();
     }
+    clearWebSocket() {
+      if (this.ws) {
+        this.ws.onopen = null;
+        this.ws.onclose = null;
+        this.ws.onerror = null;
+        this.ws.onmessage = null;
+      }
+      if (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.OPEN) {
+        this.ws.close();
+        this.callKit.logger.info("socket clear", {
+          caller: "Socket.clearWebSocket",
+          type: "INCALL",
+          content: {}
+        });
+      }
+      this.ws = void 0;
+      this.isConnected = false;
+    }
     connect(socketUrl) {
+      if (this.ws) {
+        this.clearWebSocket();
+      }
       this.ws = new WebSocket(socketUrl);
       this.ws.onopen = (ev) => this.onOpen(ev);
       this.ws.onclose = (ev) => this.onClose(ev);
@@ -19538,10 +19559,6 @@ var WebCall = (() => {
         type: "INCALL",
         content: { ev }
       });
-      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
-        event: "INCALL_CONNECT_ERROR",
-        err: ev
-      });
       if (this.socketError) {
         return;
       }
@@ -19549,6 +19566,10 @@ var WebCall = (() => {
     }
     onError(ev) {
       this.socketError = true;
+      this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
+        event: "INCALL_CONNECT_ERROR",
+        err: ev
+      });
       this.callKit.logger.error("socket onError", {
         caller: "Socket.onError",
         type: "INCALL",
@@ -19870,17 +19891,13 @@ var WebCall = (() => {
       this.lastPingTime = void 0;
       this.satrtConfirm = false;
       this.socketError = false;
-      if (this.ws && this.isConnected) {
-        this.callKit.logger.info("Closing socket connection", {
-          caller: "Socket.reset",
-          type: "INCALL",
-          content: {}
-        });
-        this.ws.close();
-        this.isConnected = false;
-      }
+      this.clearWebSocket();
     }
     attemptReconnect() {
+      if (this.reconnectTimer) {
+        clearTimeout(this.reconnectTimer);
+        this.reconnectTimer = void 0;
+      }
       if (this.reconnectAttempts >= this.socketConfig.maxAttempts) {
         this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
           event: "INCALL_RECONNECT_ERROR"