@koi-design/callkit 2.2.0-beta.4 → 2.3.0-beta.10

package/dist/index.js

@@ -72,7 +72,7 @@ var Api = class {
       const res = await this.post({
         url: "/auth/agentUser/login",
         method: "post",
-        data: { ...params, browserVersion: navigator.userAgent }
+        data: params
       });
       return res;
     } finally {
@@ -535,7 +535,11 @@ var SocketReceiveEvent = {
   ERROR: "ERROR",
   SESSION_ERROR: "SESSION_ERROR",
   WAITING_QUEUE: "WAITING_QUEUE",
-  CUSTOMER_MATCH_BLACK_PHONE: "CUSTOMER_MATCH_BLACK_PHONE"
+  CUSTOMER_MATCH_BLACK_PHONE: "CUSTOMER_MATCH_BLACK_PHONE",
+  /**
+   * Agent RTP loss
+   */
+  AGENT_RTP_LOSS: "AGENT_RTP_LOSS"
 };
 var EncryptionMethod = {
   NONE: "NONE",
@@ -555,6 +559,12 @@ var CallSourceType = {
   phoneNum: 1,
   workOrderId: 2
 };
+var PhoneTypeEnum = {
+  SIP: 0,
+  TEL: 1,
+  OUT: 2,
+  SP: 5
+};
 var trackLogsDefaultConfig = {
   enabled: false,
   interval: 5e3,
@@ -718,7 +728,7 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.2.0-beta.4",
+  version: "2.3.0-beta.10",
   description: "callkit",
   author: "koi",
   license: "ISC",
@@ -795,6 +805,7 @@ var Config = class {
       password: "",
       encryptionPassword: EncryptionMethod.INTERNAL,
       sourceType: CallSourceType.phoneNum,
+      phoneType: PhoneTypeEnum.SIP,
       // Extension number
       extno: "",
       workOrderId: "",
@@ -838,6 +849,7 @@ var Config = class {
         encryptionPassword: "",
         userPart: "",
         sourceType: CallSourceType.phoneNum,
+        phoneType: PhoneTypeEnum.SIP,
         extno: "",
         workOrderId: "",
         agentId: "",
@@ -15816,8 +15828,6 @@ var Connect = class {
       });
       return;
     }
-    const { userInfo } = this.callKit.config.getConfig();
-    const { userPart, fsIp, fsPort } = userInfo;
     const { registererOptions = {} } = this.reconnectConfig;
     this.registerer = new Registerer(this.userAgent, registererOptions);
     this.registerer.stateChange.addListener((state) => {
@@ -15851,27 +15861,26 @@ var Connect = class {
           });
           this.setRegister(true);
           if (this.isReConnected) {
-            if (this.currentSession && (this.currentSession.state === SessionState2.Established || this.currentSession.state === SessionState2.Establishing) && this.isCalling()) {
-              const selfUri = `sip:manualCallAgent${userPart}@${fsIp}:${fsPort}`;
+            if (this.canReferInCallToSelf()) {
               this.callKit.logger.info(
                 "Reconnected, referring active session to self",
                 {
                   caller: "Connect.setupRegisterer.registererStateChange",
                   type: "SIP",
                   content: {
-                    selfUri,
+                    selfUri: this.getSelfReferUri(),
                     sessionState: this.currentSession.state,
                     connectStatus: this.connectStatus
                   }
                 }
               );
-              this.referInCall(selfUri).catch((err) => {
+              this.referInCallToSelf().catch((err) => {
                 this.callKit.logger.error(err, {
                   caller: "Connect.setupRegisterer.registererStateChange",
                   type: "SIP",
                   content: {
                     errCode: ErrorCode.WEBRTC_CALL_INVITE_ERROR,
-                    selfUri
+                    selfUri: this.getSelfReferUri()
                   }
                 });
               });
@@ -16700,145 +16709,58 @@ var Connect = class {
     }
     this.currentSession.refer(target, extra?.sessionReferOptions);
   }
-};
-
-// core/heartbeat-worker.ts
-var workerCode = `
-let timer = null;
-let interval = 30000;
-
-self.onmessage = function(e) {
-  const { type, interval: newInterval } = e.data;
-  
-  if (type === 'start') {
-    if (timer) {
-      clearInterval(timer);
-    }
-    interval = newInterval || interval;
-    timer = setInterval(() => {
-      self.postMessage({ type: 'tick' });
-    }, interval);
-  }
-  
-  if (type === 'stop') {
-    if (timer) {
-      clearInterval(timer);
-      timer = null;
-    }
-  }
-  
-  if (type === 'updateInterval') {
-    interval = newInterval;
-    if (timer) {
-      clearInterval(timer);
-      timer = setInterval(() => {
-        self.postMessage({ type: 'tick' });
-      }, interval);
-    }
-  }
-};
-`;
-function createHeartbeatWorker() {
-  try {
-    const blob = new Blob([workerCode], { type: "application/javascript" });
-    const workerUrl = URL.createObjectURL(blob);
-    const worker = new Worker(workerUrl);
-    URL.revokeObjectURL(workerUrl);
-    return worker;
-  } catch {
-    return null;
-  }
-}
-var HeartbeatManager = class {
-  worker = null;
-  fallbackTimer = null;
-  interval = 3e4;
-  onTick = null;
-  isRunning = false;
-  constructor() {
-    this.worker = createHeartbeatWorker();
-    if (this.worker) {
-      this.worker.onmessage = (e) => {
-        if (e.data.type === "tick" && this.onTick) {
-          this.onTick();
-        }
-      };
-    }
-  }
   /**
-   * Start the heartbeat
-   * @param interval - Interval in milliseconds
-   * @param onTick - Callback function to execute on each tick
+   * Get the SIP URI for "refer to self" (same as reconnection refer logic).
+   * Shared by referInCallToSelf and internal reconnection refer.
    */
-  start(interval, onTick) {
-    this.stop();
-    this.interval = interval;
-    this.onTick = onTick;
-    this.isRunning = true;
-    if (this.worker) {
-      this.worker.postMessage({
-        type: "start",
-        interval
-      });
-    } else {
-      this.fallbackTimer = setInterval(() => {
-        if (this.onTick) {
-          this.onTick();
-        }
-      }, interval);
-    }
+  getSelfReferUri() {
+    const { userInfo } = this.callKit.config.getConfig();
+    const { userPart, fsIp, fsPort } = userInfo;
+    return `sip:manualCallAgent${userPart}@${fsIp}:${fsPort}`;
   }
   /**
-   * Stop the heartbeat
+   * Whether we can refer the current call to self (has active session in Established/Establishing and is calling).
+   * Shared by reconnection logic and referInCallToSelf.
    */
-  stop() {
-    this.isRunning = false;
-    this.onTick = null;
-    if (this.worker) {
-      this.worker.postMessage({ type: "stop" });
-    }
-    if (this.fallbackTimer) {
-      clearInterval(this.fallbackTimer);
-      this.fallbackTimer = null;
-    }
+  canReferInCallToSelf() {
+    return !!this.currentSession && (this.currentSession.state === SessionState2.Established || this.currentSession.state === SessionState2.Establishing) && this.isCalling();
   }
   /**
-   * Update the heartbeat interval
-   * @param interval - New interval in milliseconds
+   * Refer the current call to self (e.g. Agent RTP loss recovery, post-reconnect recovery).
+   * Socket and other callers can use this without constructing referTo.
    */
-  updateInterval(interval) {
-    this.interval = interval;
-    if (!this.isRunning)
-      return;
-    if (this.worker) {
-      this.worker.postMessage({
-        type: "updateInterval",
-        interval
-      });
-    } else if (this.fallbackTimer && this.onTick) {
-      clearInterval(this.fallbackTimer);
-      this.fallbackTimer = setInterval(() => {
-        if (this.onTick) {
-          this.onTick();
+  async referInCallToSelf(callUuid, extra) {
+    if (callUuid && this.currentCallId !== callUuid) {
+      this.callKit.logger.warn(
+        "Cannot refer in call to self: callUuid mismatch",
+        {
+          caller: "Connect.referInCallToSelf",
+          type: "SIP",
+          content: {
+            currentCallId: this.currentCallId,
+            callUuid
+          }
         }
-      }, interval);
+      );
+      return;
     }
-  }
-  /**
-   * Destroy the heartbeat manager and release resources
-   */
-  destroy() {
-    this.stop();
-    if (this.worker) {
-      this.worker.terminate();
-      this.worker = null;
+    if (!this.canReferInCallToSelf()) {
+      this.callKit.logger.warn(
+        "Cannot refer in call to self: preconditions not met",
+        {
+          caller: "Connect.referInCallToSelf",
+          type: "SIP",
+          content: {
+            hasCurrentSession: !!this.currentSession,
+            sessionState: this.currentSession?.state,
+            isCalling: this.isCalling()
+          }
+        }
+      );
+      return;
     }
-  }
-  /**
-   * Check if using Web Worker
-   */
-  isUsingWorker() {
-    return this.worker !== null;
+    const selfUri = this.getSelfReferUri();
+    return this.referInCall(selfUri, extra);
   }
 };
 
@@ -16847,7 +16769,7 @@ var Socket = class {
   callKit;
   ws;
   lastPingTime = void 0;
-  heartbeatManager;
+  pingTimer;
   /**
    * @description reconnect timer
    */
@@ -16880,18 +16802,10 @@ var Socket = class {
   }
   constructor(callKit) {
     this.callKit = callKit;
-    this.heartbeatManager = new HeartbeatManager();
   }
   get reconnectConfig() {
     return this.callKit.config.getReconnectConfig("incall");
   }
-  get pingInterval() {
-    const { keepaliveInterval } = this.callKit.config.getConfig().userInfo;
-    if (Number.isInteger(keepaliveInterval) && keepaliveInterval > 0) {
-      return keepaliveInterval * 1e3;
-    }
-    return this.reconnectConfig.pingInterval;
-  }
   isConnected() {
     return this.connectAuthState.isConnected;
   }
@@ -17073,6 +16987,28 @@ var Socket = class {
       this.setConnectAuthState("startConfirm", true);
       this.cleanReconnectState();
     }
+    if (data.event === SocketReceiveEvent.AGENT_RTP_LOSS) {
+      this.callKit.logger.warn("Agent RTP loss", {
+        caller: "Socket.onMessage",
+        type: "INCALL",
+        content: {
+          data: {
+            callUuid,
+            ...content
+          },
+          event: SocketReceiveEvent.AGENT_RTP_LOSS
+        }
+      });
+      if (callUuid) {
+        this.callKit.connect.referInCallToSelf(callUuid).catch((err) => {
+          this.callKit.logger.error(err, {
+            caller: "Socket.onMessage:AGENT_RTP_LOSS",
+            type: "INCALL",
+            content: { callUuid, event: SocketReceiveEvent.AGENT_RTP_LOSS }
+          });
+        });
+      }
+    }
     if (data.event === SocketReceiveEvent.CUSTOMER_RINGING) {
       this.callKit.trigger(KitEvent.CALL_RINGING, {
         time: /* @__PURE__ */ new Date(),
@@ -17226,8 +17162,8 @@ var Socket = class {
       return;
     this.send(SocketSendEvent.PING);
     const now = Date.now();
-    const { pingTimeout } = this.reconnectConfig;
-    if (now - this.lastPingTime > this.pingInterval + pingTimeout) {
+    const { pingInterval, pingTimeout } = this.reconnectConfig;
+    if (now - this.lastPingTime > pingInterval + pingTimeout) {
       this.callKit.logger.warn("Ping timeout not connected", {
         caller: "Socket.ping",
         type: "INCALL",
@@ -17242,27 +17178,23 @@ var Socket = class {
     }
   }
   checkPing() {
-    this.heartbeatManager.start(this.pingInterval, () => {
+    if (this.pingTimer) {
+      clearInterval(this.pingTimer);
+    }
+    const { pingInterval } = this.reconnectConfig;
+    this.pingTimer = setInterval(() => {
       this.ping();
-    });
-    this.callKit.logger.info(
-      `Heartbeat started with Worker: ${this.heartbeatManager.isUsingWorker()}`,
-      {
-        caller: "Socket.checkPing",
-        type: "INCALL",
-        content: {
-          pingInterval: this.pingInterval,
-          usingWorker: this.heartbeatManager.isUsingWorker()
-        }
-      }
-    );
+    }, pingInterval);
   }
   /**
    * reset socket connection and all states
    */
   async reset(config) {
     const { force = false } = config || {};
-    this.heartbeatManager.stop();
+    if (this.pingTimer) {
+      clearInterval(this.pingTimer);
+      this.pingTimer = void 0;
+    }
     if (force) {
       this.callKit.trigger(KitEvent.INCALL_CONNECT_EVENT, {
         event: "INCALL_RESET"
@@ -17273,12 +17205,6 @@ var Socket = class {
     this.setConnectAuthState("startConfirm", false);
     this.clearWebSocket();
   }
-  /**
-   * Destroy the heartbeat manager
-   */
-  destroyHeartbeat() {
-    this.heartbeatManager.destroy();
-  }
   attemptReconnect() {
     if (this.reconnectTimer) {
       clearTimeout(this.reconnectTimer);
@@ -17404,7 +17330,6 @@ var CallKit = class {
       content: {
         username,
         password,
-        ua: navigator.userAgent,
         encryptionMethod,
         encryptionPassword
       }
@@ -17422,7 +17347,6 @@ var CallKit = class {
         password: encryptionPassword,
         timestamp: Date.now()
       });
-      console.log("user", user);
       if (user) {
         this.config.setConfig("userInfo", {
           wsUrl: `wss://${user.wsUrl}`,
@@ -17439,7 +17363,7 @@ var CallKit = class {
           iceInfo: user.iceInfo,
           iceGatheringTimeout: user.iceGatheringTimeout,
           logGather: user.logGather,
-          keepaliveInterval: user.keepaliveInterval,
+          phoneType: user.phoneType,
           // encryptionType is in extra
           ...extra
         });
@@ -17536,7 +17460,10 @@ var CallKit = class {
       caller: "CallKit.register",
       content: {}
     });
-    this.connect.register();
+    const { userInfo } = this.config.getConfig();
+    if (userInfo.phoneType === PhoneTypeEnum.SIP) {
+      this.connect.register();
+    }
   }
   async unregister() {
     if (!this.config.check())
@@ -17646,10 +17573,13 @@ var CallKit = class {
         force
       }
     });
-    if (this.connect.isCalling()) {
-      await this.hangup();
+    const { userInfo } = this.config.getConfig();
+    if (userInfo.phoneType === PhoneTypeEnum.SIP) {
+      if (this.connect.isCalling()) {
+        await this.hangup();
+      }
+      await this.connect.reset({ force });
     }
-    await this.connect.reset({ force });
     if (this.config.isLogin()) {
       await this.logout({ isReset: false });
     } else {