@koi-design/callkit 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/index.d.ts

@@ -80,7 +80,6 @@ declare class Socket {
     private confirmAck;
     private onMessage;
     send(event: SocketSendEventType, message?: any): void;
-    sendMessage(event: SocketSendEventType, message?: any): Promise<void>;
     private ping;
     private checkPing;
     /**
@@ -377,7 +376,6 @@ declare class Connect {
      *@description  Whether it's a re-connected
      */
     isReConnected: boolean;
-    observeOptionsHeartbeatHandler: ReturnType<typeof setTimeout> | null;
     /**
      *@description  Whether it's an outgoing call
      */
@@ -427,8 +425,9 @@ declare class Connect {
      * @returns
      */
     isInit(): boolean;
-    clearObserveOptionsHeartbeatInterval(): void;
-    heartbeatFlag: number;
+    private heartbeatInterval?;
+    private heartbeatFlag;
+    clearHeartbeat(): void;
     startHeartbeat(): void;
     socketTriggerHangup(callId: string): void;
     register(): Promise<void>;

package/dist/index.global.js

@@ -3774,6 +3774,59 @@ var WebCall = (() => {
     }
   };
 
+  // package.json
+  var package_default = {
+    name: "@koi-design/callkit",
+    version: "2.0.0-beta.18",
+    description: "callkit",
+    author: "koi",
+    license: "ISC",
+    scripts: {
+      build: "tsup",
+      start: "tsup --watch",
+      dev: "vite",
+      lint: "eslint -c .eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
+      prepare: "husky install",
+      release: "tsup && node scripts/pkg.js"
+    },
+    exports: {
+      ".": {
+        require: "./dist/index.js",
+        import: "./dist/index.mjs"
+      }
+    },
+    main: "./dist/index.js",
+    module: "./dist/index.mjs",
+    types: "./dist/index.d.ts",
+    files: [
+      "dist"
+    ],
+    dependencies: {
+      axios: "~0.26.1",
+      "blueimp-md5": "^2.12.0",
+      "eslint-plugin-jsonc": "^2.21.0",
+      "json-stringify-safe": "^5.0.1",
+      "sip.js": "^0.21.2"
+    },
+    devDependencies: {
+      "@commitlint/cli": "^9.1.2",
+      "@commitlint/config-conventional": "^9.1.2",
+      "@koi-design/eslint-config-ts": "^0.0.14",
+      "@types/blueimp-md5": "^2.18.2",
+      archiver: "^5.3.1",
+      consola: "^3.4.2",
+      eslint: "~8.29.0",
+      "eslint-config-prettier": "^10.1.5",
+      "eslint-plugin-prettier": "^5.5.0",
+      husky: "^8.0.3",
+      "lint-staged": "^10.5.4",
+      prettier: "^2.6.2",
+      tsup: "6.6.3",
+      typescript: "^4.6.3",
+      vite: "^4"
+    }
+  };
+
   // package/config.ts
   var Config = class {
     callKit;
@@ -3781,7 +3834,7 @@ var WebCall = (() => {
       this.callKit = callKit;
     }
     config = {
-      version: "1.0.27",
+      version: package_default.version,
       host: "",
       log: "info",
       trackLogs: trackLogsDefaultConfig,
@@ -18492,7 +18545,6 @@ var WebCall = (() => {
      *@description  Whether it's a re-connected
      */
     isReConnected = false;
-    observeOptionsHeartbeatHandler = null;
     // sipConnected = false;
     /**
      *@description  Whether it's an outgoing call
@@ -18565,7 +18617,7 @@ var WebCall = (() => {
         }
       }
       this.setConnectStatus(CallStatus.init);
-      this.clearObserveOptionsHeartbeatInterval();
+      this.clearHeartbeat();
     }
     getAduioReference() {
       const { audioRef } = this.callKit.config.getConfig();
@@ -18630,16 +18682,19 @@ var WebCall = (() => {
     isInit() {
       return this.connectStatus === CallStatus.init;
     }
-    clearObserveOptionsHeartbeatInterval() {
-      if (this.observeOptionsHeartbeatHandler !== null) {
-        clearInterval(this.observeOptionsHeartbeatHandler);
-        this.observeOptionsHeartbeatHandler = null;
+    heartbeatInterval;
+    heartbeatFlag = MAX_HEARTBEAT_COUNT;
+    clearHeartbeat() {
+      if (this.heartbeatInterval) {
+        clearInterval(this.heartbeatInterval);
+        this.heartbeatInterval = null;
       }
+      this.heartbeatFlag = MAX_HEARTBEAT_COUNT;
     }
-    heartbeatFlag = MAX_HEARTBEAT_COUNT;
     startHeartbeat() {
       this.heartbeatFlag = MAX_HEARTBEAT_COUNT;
-      setTimeout(() => {
+      this.clearHeartbeat();
+      this.heartbeatInterval = setInterval(() => {
         this.heartbeatFlag -= 1;
         if (this.heartbeatFlag <= 0) {
           this.heartbeatFlag = MAX_HEARTBEAT_COUNT;
@@ -18916,10 +18971,8 @@ var WebCall = (() => {
                     sessionState: state
                   }
                 });
-                if (this.hasInvite) {
-                  this.currentSession.reject();
-                  this.hasInvite = false;
-                } else if (!this.isUnprompted) {
+                this.hasInvite = false;
+                if (!this.isUnprompted) {
                   this.callKit.callCenter.callEnd();
                 }
                 this.isUnprompted = false;
@@ -18956,6 +19009,14 @@ var WebCall = (() => {
             const inviteData = formatGetInviteData(info);
             if (inviteData?.callUuid) {
               this.setCallId(inviteData.callUuid);
+            } else {
+              this.setCallId(null);
+              this.callKit.logger.error("call id is not exist", {
+                caller: "Connect.register.onInvite",
+                content: {
+                  inviteData
+                }
+              });
             }
           } catch (error) {
             this.callKit.logger.info(error, {
@@ -18971,7 +19032,9 @@ var WebCall = (() => {
           } else {
             this.hasInvite = true;
             const reject = () => {
-              this.currentSession.reject();
+              if (this.currentSession?.state !== SessionState2.Terminated && this.currentSession?.state !== SessionState2.Terminating) {
+                this.currentSession.reject();
+              }
               this.hasInvite = false;
               this.callKit.callCenter.callEnd(true, false);
             };
@@ -19054,7 +19117,7 @@ var WebCall = (() => {
     reconnectTimer;
     reconnectAttempts = 0;
     startReconnectTimer() {
-      if (this.reconnectAttempts >= this.reconnectConfig.maxAttempts) {
+      if (this.reconnectAttempts >= this.reconnectConfig.maxAttempts && this.callKit.config.isLogin()) {
         this.callKit.reset();
         this.callKit.logger.error("Reconnect failed max attempts", {
           caller: "Connect.startReconnectTimer",
@@ -19208,7 +19271,9 @@ var WebCall = (() => {
           const shouldSendBye = this.isRinging() || this.isCalling();
           if (shouldSendBye) {
             if (this.hasInvite) {
-              this.currentSession?.reject();
+              if (this.currentSession?.state !== SessionState2.Terminated && this.currentSession?.state !== SessionState2.Terminating) {
+                this.currentSession.reject();
+              }
               this.hasInvite = false;
             } else {
               await this.currentSession?.bye();
@@ -19493,11 +19558,26 @@ var WebCall = (() => {
     }
     onMessage(ev) {
       const data = JSON.parse(ev.data);
+      let content = {};
+      try {
+        if (data.data) {
+          content = JSON.parse(data.data);
+        }
+      } catch (error) {
+        this.callKit.logger.info("socket onMessage parse error", {
+          caller: "Socket.onMessage",
+          type: "INCALL",
+          content: {
+            data: data.data
+          }
+        });
+        content = data.data;
+      }
       this.callKit.logger.info("socket onMessage", {
         caller: "Socket.onMessage",
         type: "INCALL",
         content: {
-          data: data.data,
+          data: content,
           event: data.event
         }
       });
@@ -19511,7 +19591,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.START_CONFIRM
           }
         });
@@ -19522,7 +19602,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CALL_SUCCESS
           }
         });
@@ -19532,7 +19612,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             errCode: ErrorCode.SOCKET_CALL_ERROR
           }
         });
@@ -19543,7 +19623,7 @@ var WebCall = (() => {
           caller: `Socket.onMessage:${data.event}`,
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CUSTOMER_RINGING
           }
         });
@@ -19553,7 +19633,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CUSTOMER_PICK_UP
           }
         });
@@ -19564,7 +19644,7 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.AGENT_PICK_UP
           }
         });
@@ -19575,13 +19655,13 @@ var WebCall = (() => {
           caller: `Socket.onMessage:${data.event}`,
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CUSTOMER_HANG_UP
           }
         });
         this.callKit.trigger(KitEvent.CALL_HANG_UP, /* @__PURE__ */ new Date());
-        if (data.data?.callUuid) {
-          this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+        if (content?.callUuid) {
+          this.callKit.connect.socketTriggerHangup(content.callUuid);
         }
       }
       if (data.event === SocketReceiveEvent.CUSTOMER_NO_ANSWER) {
@@ -19589,13 +19669,13 @@ var WebCall = (() => {
           caller: "Socket.onMessage",
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CUSTOMER_NO_ANSWER
           }
         });
         this.callKit.trigger(KitEvent.CALL_NO_ANSWER);
-        if (data.data?.callUuid) {
-          this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+        if (content?.callUuid) {
+          this.callKit.connect.socketTriggerHangup(content.callUuid);
         }
       }
       if (data.event === SocketReceiveEvent.CALL_CDR) {
@@ -19603,18 +19683,18 @@ var WebCall = (() => {
           caller: `Socket.onMessage:${data.event}`,
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CALL_CDR
           }
         });
-        this.callKit.trigger(KitEvent.CALL_CDR, data.data);
+        this.callKit.trigger(KitEvent.CALL_CDR, content);
       }
       if (data.event === SocketReceiveEvent.STOP_CONFIRM) {
         this.callKit.logger.info(data.msg, {
           caller: `Socket.onMessage:${data.event}`,
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.STOP_CONFIRM
           }
         });
@@ -19625,7 +19705,7 @@ var WebCall = (() => {
           caller: `Socket.onMessage:${data.event}`,
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.CLOSE
           }
         });
@@ -19641,7 +19721,7 @@ var WebCall = (() => {
           type: "INCALL",
           content: {
             errCode: ErrorCode.SOKET_SERVER_ERROR,
-            data: data.data
+            data: content
           }
         });
       }
@@ -19652,7 +19732,7 @@ var WebCall = (() => {
           caller: `Socket.onMessage:${data.event}`,
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.SESSION_ERROR
           }
         });
@@ -19662,12 +19742,12 @@ var WebCall = (() => {
           caller: `Socket.onMessage:${data.event}`,
           type: "INCALL",
           content: {
-            data: data.data,
+            data: content,
             event: SocketReceiveEvent.AGENT_NO_ANSWER
           }
         });
-        if (data.data?.callUuid) {
-          this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+        if (content?.callUuid) {
+          this.callKit.connect.socketTriggerHangup(content.callUuid);
         }
       }
       this.callKit.trigger(KitEvent.SERVER_SOCKET_EVENT, data);
@@ -19687,7 +19767,7 @@ var WebCall = (() => {
         });
         return;
       }
-      const { userInfo } = this.callKit.config.getConfig();
+      const { userInfo, version } = this.callKit.config.getConfig();
       const { sessionId, extno, agentId } = userInfo;
       if (!sessionId) {
         this.callKit.logger.error("sessionId is empty", {
@@ -19702,6 +19782,7 @@ var WebCall = (() => {
       const msg = {
         event,
         sessionId,
+        version,
         ...message
       };
       if (SocketSendEvent.CALL === event) {
@@ -19730,25 +19811,6 @@ var WebCall = (() => {
           break;
       }
     }
-    async sendMessage(event, message) {
-      if (!this.isConnected) {
-        this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
-          event: "INCALL_NOT_CONNECTED"
-        });
-        this.callKit.logger.error("socket not connected", {
-          caller: "Socket.sendMessage",
-          type: "INCALL",
-          content: {
-            errCode: ErrorCode.SOCKET_CONNECT_ERROR,
-            message
-          }
-        });
-        return;
-      }
-      const { userInfo } = this.callKit.config.getConfig();
-      const { sessionId } = userInfo;
-      this.ws?.send(JSON.stringify({ event, sessionId, ...message }));
-    }
     ping() {
       if (!this.isConnected)
         return;