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

package/dist/index.global.js

@@ -1736,7 +1736,7 @@ var WebCall = (() => {
   var require_follow_redirects = __commonJS({
     "../../node_modules/.pnpm/follow-redirects@1.15.9/node_modules/follow-redirects/index.js"(exports, module) {
       var url = __require("url");
-      var URL2 = url.URL;
+      var URL = url.URL;
       var http = __require("http");
       var https = __require("https");
       var Writable = __require("stream").Writable;
@@ -1752,7 +1752,7 @@ var WebCall = (() => {
       })();
       var useNativeURL = false;
       try {
-        assert(new URL2(""));
+        assert(new URL(""));
       } catch (error) {
         useNativeURL = error.code === "ERR_INVALID_URL";
       }
@@ -2132,7 +2132,7 @@ var WebCall = (() => {
       function parseUrl(input) {
         var parsed;
         if (useNativeURL) {
-          parsed = new URL2(input);
+          parsed = new URL(input);
         } else {
           parsed = validateUrl(url.parse(input));
           if (!isString(parsed.protocol)) {
@@ -2142,7 +2142,7 @@ var WebCall = (() => {
         return parsed;
       }
       function resolveUrl(relative, base) {
-        return useNativeURL ? new URL2(relative, base) : parseUrl(url.resolve(base, relative));
+        return useNativeURL ? new URL(relative, base) : parseUrl(url.resolve(base, relative));
       }
       function validateUrl(input) {
         if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
@@ -2221,7 +2221,7 @@ var WebCall = (() => {
         return typeof value === "object" && "length" in value;
       }
       function isURL(value) {
-        return URL2 && value instanceof URL2;
+        return URL && value instanceof URL;
       }
       module.exports = wrap({ http, https });
       module.exports.wrap = wrap;
@@ -3237,7 +3237,7 @@ var WebCall = (() => {
         const res = await this.post({
           url: "/auth/agentUser/login",
           method: "post",
-          data: { ...params, browserVersion: navigator.userAgent }
+          data: params
         });
         return res;
       } finally {
@@ -3700,7 +3700,11 @@ var WebCall = (() => {
     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",
@@ -3720,6 +3724,12 @@ var WebCall = (() => {
     phoneNum: 1,
     workOrderId: 2
   };
+  var PhoneTypeEnum = {
+    SIP: 0,
+    TEL: 1,
+    OUT: 2,
+    SP: 5
+  };
   var trackLogsDefaultConfig = {
     enabled: false,
     interval: 5e3,
@@ -3883,7 +3893,7 @@ var WebCall = (() => {
   // 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",
@@ -3960,6 +3970,7 @@ var WebCall = (() => {
         password: "",
         encryptionPassword: EncryptionMethod.INTERNAL,
         sourceType: CallSourceType.phoneNum,
+        phoneType: PhoneTypeEnum.SIP,
         // Extension number
         extno: "",
         workOrderId: "",
@@ -4003,6 +4014,7 @@ var WebCall = (() => {
           encryptionPassword: "",
           userPart: "",
           sourceType: CallSourceType.phoneNum,
+          phoneType: PhoneTypeEnum.SIP,
           extno: "",
           workOrderId: "",
           agentId: "",
@@ -18981,8 +18993,6 @@ ${log}` : log;
         });
         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) => {
@@ -19016,27 +19026,26 @@ ${log}` : log;
             });
             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()
                     }
                   });
                 });
@@ -19865,145 +19874,58 @@ ${log}` : log;
       }
       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);
     }
   };
 
@@ -20012,7 +19934,7 @@ self.onmessage = function(e) {
     callKit;
     ws;
     lastPingTime = void 0;
-    heartbeatManager;
+    pingTimer;
     /**
      * @description reconnect timer
      */
@@ -20045,18 +19967,10 @@ self.onmessage = function(e) {
     }
     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;
     }
@@ -20238,6 +20152,28 @@ self.onmessage = function(e) {
         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(),
@@ -20391,8 +20327,8 @@ self.onmessage = function(e) {
         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",
@@ -20407,27 +20343,23 @@ self.onmessage = function(e) {
       }
     }
     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"
@@ -20438,12 +20370,6 @@ self.onmessage = function(e) {
       this.setConnectAuthState("startConfirm", false);
       this.clearWebSocket();
     }
-    /**
-     * Destroy the heartbeat manager
-     */
-    destroyHeartbeat() {
-      this.heartbeatManager.destroy();
-    }
     attemptReconnect() {
       if (this.reconnectTimer) {
         clearTimeout(this.reconnectTimer);
@@ -20569,7 +20495,6 @@ self.onmessage = function(e) {
         content: {
           username,
           password,
-          ua: navigator.userAgent,
           encryptionMethod,
           encryptionPassword
         }
@@ -20587,7 +20512,6 @@ self.onmessage = function(e) {
           password: encryptionPassword,
           timestamp: Date.now()
         });
-        console.log("user", user);
         if (user) {
           this.config.setConfig("userInfo", {
             wsUrl: `wss://${user.wsUrl}`,
@@ -20604,7 +20528,7 @@ self.onmessage = function(e) {
             iceInfo: user.iceInfo,
             iceGatheringTimeout: user.iceGatheringTimeout,
             logGather: user.logGather,
-            keepaliveInterval: user.keepaliveInterval,
+            phoneType: user.phoneType,
             // encryptionType is in extra
             ...extra
           });
@@ -20701,7 +20625,10 @@ self.onmessage = function(e) {
         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())
@@ -20811,10 +20738,13 @@ self.onmessage = function(e) {
           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 {