@koi-design/callkit 2.3.0-beta.11 → 2.3.0-beta.12

package/dist/index.d.ts

@@ -4805,7 +4805,7 @@ declare class Socket {
     private callKit;
     private ws?;
     lastPingTime: any;
-    private heartbeatManager;
+    pingTimer?: ReturnType<typeof setInterval>;
     /**
      * @description reconnect timer
      */
@@ -4829,7 +4829,6 @@ declare class Socket {
     get isError(): boolean;
     constructor(callKit: CallKit);
     get reconnectConfig(): IncallConfig;
-    get pingInterval(): number;
     isConnected(): boolean;
     init(): void;
     private setConnectAuthState;
@@ -4852,10 +4851,6 @@ declare class Socket {
     reset(config?: {
         force?: boolean;
     }): Promise<void>;
-    /**
-     * Destroy the heartbeat manager
-     */
-    destroyHeartbeat(): void;
     private attemptReconnect;
 }
 
@@ -4900,7 +4895,6 @@ interface IConfig {
         iceGatheringTimeout: number;
         encryptionMethod: EncryptionMethodType;
         logGather: boolean;
-        keepaliveInterval?: number;
     };
 }
 declare class Config {

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 {
@@ -3893,7 +3893,7 @@ var WebCall = (() => {
   // package.json
   var package_default = {
     name: "@koi-design/callkit",
-    version: "2.3.0-beta.11",
+    version: "2.3.0-beta.12",
     description: "callkit",
     author: "koi",
     license: "ISC",
@@ -19929,152 +19929,12 @@ ${log}` : log;
     }
   };
 
-  // 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
-     */
-    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);
-      }
-    }
-    /**
-     * Stop the heartbeat
-     */
-    stop() {
-      this.isRunning = false;
-      this.onTick = null;
-      if (this.worker) {
-        this.worker.postMessage({ type: "stop" });
-      }
-      if (this.fallbackTimer) {
-        clearInterval(this.fallbackTimer);
-        this.fallbackTimer = null;
-      }
-    }
-    /**
-     * Update the heartbeat interval
-     * @param interval - New interval in milliseconds
-     */
-    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();
-          }
-        }, interval);
-      }
-    }
-    /**
-     * Destroy the heartbeat manager and release resources
-     */
-    destroy() {
-      this.stop();
-      if (this.worker) {
-        this.worker.terminate();
-        this.worker = null;
-      }
-    }
-    /**
-     * Check if using Web Worker
-     */
-    isUsingWorker() {
-      return this.worker !== null;
-    }
-  };
-
   // core/socket.ts
   var Socket = class {
     callKit;
     ws;
     lastPingTime = void 0;
-    heartbeatManager;
+    pingTimer;
     /**
      * @description reconnect timer
      */
@@ -20107,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;
     }
@@ -20475,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",
@@ -20491,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"
@@ -20522,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);
@@ -20653,7 +20495,6 @@ self.onmessage = function(e) {
         content: {
           username,
           password,
-          ua: navigator.userAgent,
           encryptionMethod,
           encryptionPassword
         }
@@ -20687,7 +20528,6 @@ self.onmessage = function(e) {
             iceInfo: user.iceInfo,
             iceGatheringTimeout: user.iceGatheringTimeout,
             logGather: user.logGather,
-            keepaliveInterval: user.keepaliveInterval,
             phoneType: user.phoneType,
             // encryptionType is in extra
             ...extra