@koi-design/callkit 2.3.1-beta.2 → 2.3.1

package/dist/index.d.ts

@@ -4800,8 +4800,6 @@ interface SipConfig {
     maxAttempts: number;
     delay: number;
     registererOptions: RegistererOptions;
-    enableMessageKeepalive: boolean;
-    messageKeepaliveInterval: number;
 }
 declare class Socket {
     private callKit;
@@ -4913,8 +4911,6 @@ interface IConfig {
         encryptionMethod: EncryptionMethodType;
         logGather: boolean;
         keepaliveInterval?: number;
-        enableMessageKeepalive?: boolean;
-        messageKeepaliveInterval?: number;
         /** Ping timeout reconnection max attempts */
         pingTryCount?: number;
         /** Ping timeout reconnection interval (seconds) */
@@ -5278,11 +5274,7 @@ declare class Connect {
     register(): Promise<void>;
     private reconnectTimer?;
     private reconnectAttempts;
-    private messageKeepaliveTimer?;
     private startReconnectTimer;
-    private stopMessageKeepalive;
-    private startMessageKeepalive;
-    private sendKeepaliveMessage;
     stop(): Promise<void>;
     unregister(): Promise<void>;
     call(callback: (userInfo: IConfig['userInfo']) => void): Promise<void>;

package/dist/index.global.js

@@ -3749,9 +3749,7 @@ var WebCall = (() => {
     delay: 1e3,
     registererOptions: {
       refreshFrequency: 90
-    },
-    enableMessageKeepalive: true,
-    messageKeepaliveInterval: 30
+    }
   };
 
   // core/call.ts
@@ -3895,13 +3893,13 @@ var WebCall = (() => {
   // package.json
   var package_default = {
     name: "@koi-design/callkit",
-    version: "2.3.1-beta.2",
+    version: "2.3.1",
     description: "callkit",
     author: "koi",
     license: "ISC",
     scripts: {
       build: "tsup",
-      start: "vite --host 0.0.0.0",
+      start: "pnpm build && vite --host 0.0.0.0",
       dev: "tsup --watch",
       lint: "eslint -c ../../.eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
       release: "tsup && node scripts/pkg.js"
@@ -18736,15 +18734,7 @@ ${log}` : log;
       this.callKit = callKit;
     }
     get reconnectConfig() {
-      const { userInfo } = this.callKit.config.getConfig();
-      const { enableMessageKeepalive } = userInfo;
-      const { messageKeepaliveInterval } = userInfo;
-      const defaultConfig = this.callKit.config.getReconnectConfig("sip");
-      if (enableMessageKeepalive) {
-        defaultConfig.enableMessageKeepalive = enableMessageKeepalive;
-        defaultConfig.messageKeepaliveInterval = messageKeepaliveInterval;
-      }
-      return defaultConfig;
+      return this.callKit.config.getReconnectConfig("sip");
     }
     // current call id for invite data
     currentCallId = null;
@@ -18868,7 +18858,6 @@ ${log}` : log;
         }
       }
       this.setConnectStatus(CallStatus.init);
-      this.stopMessageKeepalive();
     }
     getAduioReference() {
       const { audioRef } = this.callKit.config.getConfig();
@@ -19021,7 +19010,6 @@ ${log}` : log;
             if (!this.isInCallRefering()) {
               this.setConnectStatus(CallStatus.init);
             }
-            this.stopMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered()
@@ -19078,7 +19066,6 @@ ${log}` : log;
               }
               this.setIsReConnected(false);
             }
-            this.startMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered()
@@ -19098,7 +19085,6 @@ ${log}` : log;
             if (!this.isInCallRefering()) {
               this.setConnectStatus(CallStatus.init);
             }
-            this.stopMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered(),
@@ -19119,7 +19105,6 @@ ${log}` : log;
             if (!this.isInCallRefering()) {
               this.setConnectStatus(CallStatus.init);
             }
-            this.stopMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered(),
@@ -19166,7 +19151,7 @@ ${log}` : log;
         this.mediaStream = await navigator.mediaDevices.getUserMedia(constrains);
         return this.mediaStream;
       };
-      const { userPart, fsIp, fsPort, fsPassword, iceInfo, wsUrl } = userInfo;
+      const { userPart, fsIp, fsPort, iceInfo, wsUrl } = userInfo;
       const connectConfig = {
         uri: UserAgent.makeURI(`sip:${userPart}@${fsIp}:${fsPort}`),
         displayName: userPart,
@@ -19175,8 +19160,6 @@ ${log}` : log;
           traceSip: true
         },
         logLevel: "error",
-        authorizationUsername: userPart,
-        authorizationPassword: fsPassword,
         allowLegacyNotifications: true,
         contactName: userPart,
         contactParams: { transport: "wss" },
@@ -19432,10 +19415,7 @@ ${log}` : log;
             }
           });
           this.setupRegisterer();
-          try {
-            await this.registerer.register();
-            this.startMessageKeepalive();
-          } catch (err) {
+          await this.registerer.register().catch(async (err) => {
             this.callKit.reset();
             this.callKit.logger.error(err?.message, {
               caller: "Connect.register",
@@ -19444,10 +19424,9 @@ ${log}` : log;
                 errCode: ErrorCode.WEBRTC_REGISTER_ERROR
               }
             });
-          }
+          });
         },
         onDisconnect: (error) => {
-          this.stopMessageKeepalive();
           if (error) {
             this.callKit.logger.warn("SIP User Agent Disconnected with error", {
               caller: "Connect.register",
@@ -19483,7 +19462,6 @@ ${log}` : log;
     }
     reconnectTimer;
     reconnectAttempts = 0;
-    messageKeepaliveTimer;
     startReconnectTimer() {
       if (this._isError || this.isReConnected)
         return;
@@ -19537,53 +19515,8 @@ ${log}` : log;
         }
       }, this.reconnectConfig.delay);
     }
-    stopMessageKeepalive() {
-      if (this.messageKeepaliveTimer) {
-        clearInterval(this.messageKeepaliveTimer);
-        this.messageKeepaliveTimer = void 0;
-      }
-    }
-    startMessageKeepalive() {
-      const { enableMessageKeepalive, messageKeepaliveInterval } = this.reconnectConfig;
-      if (!enableMessageKeepalive)
-        return;
-      this.stopMessageKeepalive();
-      this.messageKeepaliveTimer = setInterval(() => {
-        this.sendKeepaliveMessage();
-      }, messageKeepaliveInterval * 1e3);
-    }
-    async sendKeepaliveMessage() {
-      try {
-        if (!this.isRegistered() || !this.userAgent)
-          return;
-        const { userInfo } = this.callKit.config.getConfig();
-        const { userPart, fsIp, fsPort } = userInfo || {};
-        const target = UserAgent.makeURI(`sip:${userPart}@${fsIp}:${fsPort}`);
-        if (!target)
-          return;
-        const messager = new Messager(this.userAgent, target, "");
-        await messager.message();
-        this.callKit.logger.info("MESSAGE keepalive ok", {
-          caller: "Connect.sendKeepaliveMessage",
-          type: "SIP",
-          content: {}
-        });
-      } catch (err) {
-        this.callKit.logger.error(err, {
-          caller: "Connect.sendKeepaliveMessage",
-          type: "SIP",
-          content: {}
-        });
-        this.stopMessageKeepalive();
-        this.callKit.trigger(KitEvent.SIP_CONNECT_EVENT, {
-          event: "MESSAGE_KEEPALIVE_FAILED"
-        });
-        this.startReconnectTimer();
-      }
-    }
     async stop() {
       await this.userAgent.stop();
-      this.stopMessageKeepalive();
     }
     async unregister() {
       this.callKit.logger.info("connect unregister", {
@@ -19593,7 +19526,6 @@ ${log}` : log;
           isRegistered: this.isRegistered()
         }
       });
-      this.stopMessageKeepalive();
       if (!this.isRegistered() || !this.registerer) {
         this.callKit.logger.warn("No registerer to unregister.", {
           caller: "Connect.unregister",
@@ -20833,7 +20765,6 @@ self.onmessage = function(e) {
         });
         if (user) {
           this.config.setConfig("userInfo", {
-            ...user,
             wsUrl: `wss://${user.wsUrl}`,
             sessionId: user.sessionId,
             username,

package/dist/index.js

@@ -584,9 +584,7 @@ var SIP_RECONNECT_CONFIG = {
   delay: 1e3,
   registererOptions: {
     refreshFrequency: 90
-  },
-  enableMessageKeepalive: true,
-  messageKeepaliveInterval: 30
+  }
 };
 
 // core/call.ts
@@ -730,13 +728,13 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.3.1-beta.2",
+  version: "2.3.1",
   description: "callkit",
   author: "koi",
   license: "ISC",
   scripts: {
     build: "tsup",
-    start: "vite --host 0.0.0.0",
+    start: "pnpm build && vite --host 0.0.0.0",
     dev: "tsup --watch",
     lint: "eslint -c ../../.eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
     release: "tsup && node scripts/pkg.js"
@@ -15571,15 +15569,7 @@ var Connect = class {
     this.callKit = callKit;
   }
   get reconnectConfig() {
-    const { userInfo } = this.callKit.config.getConfig();
-    const { enableMessageKeepalive } = userInfo;
-    const { messageKeepaliveInterval } = userInfo;
-    const defaultConfig = this.callKit.config.getReconnectConfig("sip");
-    if (enableMessageKeepalive) {
-      defaultConfig.enableMessageKeepalive = enableMessageKeepalive;
-      defaultConfig.messageKeepaliveInterval = messageKeepaliveInterval;
-    }
-    return defaultConfig;
+    return this.callKit.config.getReconnectConfig("sip");
   }
   // current call id for invite data
   currentCallId = null;
@@ -15703,7 +15693,6 @@ var Connect = class {
       }
     }
     this.setConnectStatus(CallStatus.init);
-    this.stopMessageKeepalive();
   }
   getAduioReference() {
     const { audioRef } = this.callKit.config.getConfig();
@@ -15856,7 +15845,6 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
-          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15913,7 +15901,6 @@ var Connect = class {
             }
             this.setIsReConnected(false);
           }
-          this.startMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15933,7 +15920,6 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
-          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered(),
@@ -15954,7 +15940,6 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
-          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered(),
@@ -16001,7 +15986,7 @@ var Connect = class {
       this.mediaStream = await navigator.mediaDevices.getUserMedia(constrains);
       return this.mediaStream;
     };
-    const { userPart, fsIp, fsPort, fsPassword, iceInfo, wsUrl } = userInfo;
+    const { userPart, fsIp, fsPort, iceInfo, wsUrl } = userInfo;
     const connectConfig = {
       uri: UserAgent.makeURI(`sip:${userPart}@${fsIp}:${fsPort}`),
       displayName: userPart,
@@ -16010,8 +15995,6 @@ var Connect = class {
         traceSip: true
       },
       logLevel: "error",
-      authorizationUsername: userPart,
-      authorizationPassword: fsPassword,
       allowLegacyNotifications: true,
       contactName: userPart,
       contactParams: { transport: "wss" },
@@ -16267,10 +16250,7 @@ var Connect = class {
           }
         });
         this.setupRegisterer();
-        try {
-          await this.registerer.register();
-          this.startMessageKeepalive();
-        } catch (err) {
+        await this.registerer.register().catch(async (err) => {
           this.callKit.reset();
           this.callKit.logger.error(err?.message, {
             caller: "Connect.register",
@@ -16279,10 +16259,9 @@ var Connect = class {
               errCode: ErrorCode.WEBRTC_REGISTER_ERROR
             }
           });
-        }
+        });
       },
       onDisconnect: (error) => {
-        this.stopMessageKeepalive();
         if (error) {
           this.callKit.logger.warn("SIP User Agent Disconnected with error", {
             caller: "Connect.register",
@@ -16318,7 +16297,6 @@ var Connect = class {
   }
   reconnectTimer;
   reconnectAttempts = 0;
-  messageKeepaliveTimer;
   startReconnectTimer() {
     if (this._isError || this.isReConnected)
       return;
@@ -16372,53 +16350,8 @@ var Connect = class {
       }
     }, this.reconnectConfig.delay);
   }
-  stopMessageKeepalive() {
-    if (this.messageKeepaliveTimer) {
-      clearInterval(this.messageKeepaliveTimer);
-      this.messageKeepaliveTimer = void 0;
-    }
-  }
-  startMessageKeepalive() {
-    const { enableMessageKeepalive, messageKeepaliveInterval } = this.reconnectConfig;
-    if (!enableMessageKeepalive)
-      return;
-    this.stopMessageKeepalive();
-    this.messageKeepaliveTimer = setInterval(() => {
-      this.sendKeepaliveMessage();
-    }, messageKeepaliveInterval * 1e3);
-  }
-  async sendKeepaliveMessage() {
-    try {
-      if (!this.isRegistered() || !this.userAgent)
-        return;
-      const { userInfo } = this.callKit.config.getConfig();
-      const { userPart, fsIp, fsPort } = userInfo || {};
-      const target = UserAgent.makeURI(`sip:${userPart}@${fsIp}:${fsPort}`);
-      if (!target)
-        return;
-      const messager = new Messager(this.userAgent, target, "");
-      await messager.message();
-      this.callKit.logger.info("MESSAGE keepalive ok", {
-        caller: "Connect.sendKeepaliveMessage",
-        type: "SIP",
-        content: {}
-      });
-    } catch (err) {
-      this.callKit.logger.error(err, {
-        caller: "Connect.sendKeepaliveMessage",
-        type: "SIP",
-        content: {}
-      });
-      this.stopMessageKeepalive();
-      this.callKit.trigger(KitEvent.SIP_CONNECT_EVENT, {
-        event: "MESSAGE_KEEPALIVE_FAILED"
-      });
-      this.startReconnectTimer();
-    }
-  }
   async stop() {
     await this.userAgent.stop();
-    this.stopMessageKeepalive();
   }
   async unregister() {
     this.callKit.logger.info("connect unregister", {
@@ -16428,7 +16361,6 @@ var Connect = class {
         isRegistered: this.isRegistered()
       }
     });
-    this.stopMessageKeepalive();
     if (!this.isRegistered() || !this.registerer) {
       this.callKit.logger.warn("No registerer to unregister.", {
         caller: "Connect.unregister",
@@ -17668,7 +17600,6 @@ var CallKit = class {
       });
       if (user) {
         this.config.setConfig("userInfo", {
-          ...user,
           wsUrl: `wss://${user.wsUrl}`,
           sessionId: user.sessionId,
           username,

package/dist/index.mjs

@@ -557,9 +557,7 @@ var SIP_RECONNECT_CONFIG = {
   delay: 1e3,
   registererOptions: {
     refreshFrequency: 90
-  },
-  enableMessageKeepalive: true,
-  messageKeepaliveInterval: 30
+  }
 };
 
 // core/call.ts
@@ -703,13 +701,13 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.3.1-beta.2",
+  version: "2.3.1",
   description: "callkit",
   author: "koi",
   license: "ISC",
   scripts: {
     build: "tsup",
-    start: "vite --host 0.0.0.0",
+    start: "pnpm build && vite --host 0.0.0.0",
     dev: "tsup --watch",
     lint: "eslint -c ../../.eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
     release: "tsup && node scripts/pkg.js"
@@ -15544,15 +15542,7 @@ var Connect = class {
     this.callKit = callKit;
   }
   get reconnectConfig() {
-    const { userInfo } = this.callKit.config.getConfig();
-    const { enableMessageKeepalive } = userInfo;
-    const { messageKeepaliveInterval } = userInfo;
-    const defaultConfig = this.callKit.config.getReconnectConfig("sip");
-    if (enableMessageKeepalive) {
-      defaultConfig.enableMessageKeepalive = enableMessageKeepalive;
-      defaultConfig.messageKeepaliveInterval = messageKeepaliveInterval;
-    }
-    return defaultConfig;
+    return this.callKit.config.getReconnectConfig("sip");
   }
   // current call id for invite data
   currentCallId = null;
@@ -15676,7 +15666,6 @@ var Connect = class {
       }
     }
     this.setConnectStatus(CallStatus.init);
-    this.stopMessageKeepalive();
   }
   getAduioReference() {
     const { audioRef } = this.callKit.config.getConfig();
@@ -15829,7 +15818,6 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
-          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15886,7 +15874,6 @@ var Connect = class {
             }
             this.setIsReConnected(false);
           }
-          this.startMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15906,7 +15893,6 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
-          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered(),
@@ -15927,7 +15913,6 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
-          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered(),
@@ -15974,7 +15959,7 @@ var Connect = class {
       this.mediaStream = await navigator.mediaDevices.getUserMedia(constrains);
       return this.mediaStream;
     };
-    const { userPart, fsIp, fsPort, fsPassword, iceInfo, wsUrl } = userInfo;
+    const { userPart, fsIp, fsPort, iceInfo, wsUrl } = userInfo;
     const connectConfig = {
       uri: UserAgent.makeURI(`sip:${userPart}@${fsIp}:${fsPort}`),
       displayName: userPart,
@@ -15983,8 +15968,6 @@ var Connect = class {
         traceSip: true
       },
       logLevel: "error",
-      authorizationUsername: userPart,
-      authorizationPassword: fsPassword,
       allowLegacyNotifications: true,
       contactName: userPart,
       contactParams: { transport: "wss" },
@@ -16240,10 +16223,7 @@ var Connect = class {
           }
         });
         this.setupRegisterer();
-        try {
-          await this.registerer.register();
-          this.startMessageKeepalive();
-        } catch (err) {
+        await this.registerer.register().catch(async (err) => {
           this.callKit.reset();
           this.callKit.logger.error(err?.message, {
             caller: "Connect.register",
@@ -16252,10 +16232,9 @@ var Connect = class {
               errCode: ErrorCode.WEBRTC_REGISTER_ERROR
             }
           });
-        }
+        });
       },
       onDisconnect: (error) => {
-        this.stopMessageKeepalive();
         if (error) {
           this.callKit.logger.warn("SIP User Agent Disconnected with error", {
             caller: "Connect.register",
@@ -16291,7 +16270,6 @@ var Connect = class {
   }
   reconnectTimer;
   reconnectAttempts = 0;
-  messageKeepaliveTimer;
   startReconnectTimer() {
     if (this._isError || this.isReConnected)
       return;
@@ -16345,53 +16323,8 @@ var Connect = class {
       }
     }, this.reconnectConfig.delay);
   }
-  stopMessageKeepalive() {
-    if (this.messageKeepaliveTimer) {
-      clearInterval(this.messageKeepaliveTimer);
-      this.messageKeepaliveTimer = void 0;
-    }
-  }
-  startMessageKeepalive() {
-    const { enableMessageKeepalive, messageKeepaliveInterval } = this.reconnectConfig;
-    if (!enableMessageKeepalive)
-      return;
-    this.stopMessageKeepalive();
-    this.messageKeepaliveTimer = setInterval(() => {
-      this.sendKeepaliveMessage();
-    }, messageKeepaliveInterval * 1e3);
-  }
-  async sendKeepaliveMessage() {
-    try {
-      if (!this.isRegistered() || !this.userAgent)
-        return;
-      const { userInfo } = this.callKit.config.getConfig();
-      const { userPart, fsIp, fsPort } = userInfo || {};
-      const target = UserAgent.makeURI(`sip:${userPart}@${fsIp}:${fsPort}`);
-      if (!target)
-        return;
-      const messager = new Messager(this.userAgent, target, "");
-      await messager.message();
-      this.callKit.logger.info("MESSAGE keepalive ok", {
-        caller: "Connect.sendKeepaliveMessage",
-        type: "SIP",
-        content: {}
-      });
-    } catch (err) {
-      this.callKit.logger.error(err, {
-        caller: "Connect.sendKeepaliveMessage",
-        type: "SIP",
-        content: {}
-      });
-      this.stopMessageKeepalive();
-      this.callKit.trigger(KitEvent.SIP_CONNECT_EVENT, {
-        event: "MESSAGE_KEEPALIVE_FAILED"
-      });
-      this.startReconnectTimer();
-    }
-  }
   async stop() {
     await this.userAgent.stop();
-    this.stopMessageKeepalive();
   }
   async unregister() {
     this.callKit.logger.info("connect unregister", {
@@ -16401,7 +16334,6 @@ var Connect = class {
         isRegistered: this.isRegistered()
       }
     });
-    this.stopMessageKeepalive();
     if (!this.isRegistered() || !this.registerer) {
       this.callKit.logger.warn("No registerer to unregister.", {
         caller: "Connect.unregister",
@@ -17641,7 +17573,6 @@ var CallKit = class {
       });
       if (user) {
         this.config.setConfig("userInfo", {
-          ...user,
           wsUrl: `wss://${user.wsUrl}`,
           sessionId: user.sessionId,
           username,

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@koi-design/callkit",
-    "version": "2.3.1-beta.2",
+    "version": "2.3.1",
     "description": "callkit",
     "author": "koi",
     "license": "ISC",
     "scripts": {
         "build": "tsup",
-        "start": "vite --host 0.0.0.0",
+        "start": "pnpm build && vite --host 0.0.0.0",
         "dev": "tsup --watch",
         "lint": "eslint -c ../../.eslintrc.js --ext .jsx,.js,.tsx,.ts ./package --fix",
         "release": "tsup && node scripts/pkg.js"