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

package/dist/index.d.ts

@@ -4800,6 +4800,8 @@ interface SipConfig {
     maxAttempts: number;
     delay: number;
     registererOptions: RegistererOptions;
+    enableMessageKeepalive: boolean;
+    messageKeepaliveInterval: number;
 }
 declare class Socket {
     private callKit;
@@ -4911,6 +4913,8 @@ interface IConfig {
         encryptionMethod: EncryptionMethodType;
         logGather: boolean;
         keepaliveInterval?: number;
+        enableMessageKeepalive?: boolean;
+        messageKeepaliveInterval?: number;
         /** Ping timeout reconnection max attempts */
         pingTryCount?: number;
         /** Ping timeout reconnection interval (seconds) */
@@ -5274,7 +5278,11 @@ 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,7 +3749,9 @@ var WebCall = (() => {
     delay: 1e3,
     registererOptions: {
       refreshFrequency: 90
-    }
+    },
+    enableMessageKeepalive: true,
+    messageKeepaliveInterval: 30
   };
 
   // core/call.ts
@@ -3893,13 +3895,13 @@ var WebCall = (() => {
   // package.json
   var package_default = {
     name: "@koi-design/callkit",
-    version: "2.3.1-beta.1",
+    version: "2.3.1-beta.2",
     description: "callkit",
     author: "koi",
     license: "ISC",
     scripts: {
       build: "tsup",
-      start: "pnpm build && vite --host 0.0.0.0",
+      start: "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"
@@ -18734,7 +18736,15 @@ ${log}` : log;
       this.callKit = callKit;
     }
     get reconnectConfig() {
-      return this.callKit.config.getReconnectConfig("sip");
+      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;
     }
     // current call id for invite data
     currentCallId = null;
@@ -18858,6 +18868,7 @@ ${log}` : log;
         }
       }
       this.setConnectStatus(CallStatus.init);
+      this.stopMessageKeepalive();
     }
     getAduioReference() {
       const { audioRef } = this.callKit.config.getConfig();
@@ -19010,6 +19021,7 @@ ${log}` : log;
             if (!this.isInCallRefering()) {
               this.setConnectStatus(CallStatus.init);
             }
+            this.stopMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered()
@@ -19066,6 +19078,7 @@ ${log}` : log;
               }
               this.setIsReConnected(false);
             }
+            this.startMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered()
@@ -19085,6 +19098,7 @@ ${log}` : log;
             if (!this.isInCallRefering()) {
               this.setConnectStatus(CallStatus.init);
             }
+            this.stopMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered(),
@@ -19105,6 +19119,7 @@ ${log}` : log;
             if (!this.isInCallRefering()) {
               this.setConnectStatus(CallStatus.init);
             }
+            this.stopMessageKeepalive();
             this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
               registererState: state,
               isRegistered: this.isRegistered(),
@@ -19160,9 +19175,9 @@ ${log}` : log;
           traceSip: true
         },
         logLevel: "error",
-        allowLegacyNotifications: true,
-        authorizationPassword: fsPassword,
         authorizationUsername: userPart,
+        authorizationPassword: fsPassword,
+        allowLegacyNotifications: true,
         contactName: userPart,
         contactParams: { transport: "wss" },
         sessionDescriptionHandlerFactory: web_exports.defaultSessionDescriptionHandlerFactory(localStreamFactory),
@@ -19417,7 +19432,10 @@ ${log}` : log;
             }
           });
           this.setupRegisterer();
-          await this.registerer.register().catch(async (err) => {
+          try {
+            await this.registerer.register();
+            this.startMessageKeepalive();
+          } catch (err) {
             this.callKit.reset();
             this.callKit.logger.error(err?.message, {
               caller: "Connect.register",
@@ -19426,9 +19444,10 @@ ${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",
@@ -19464,6 +19483,7 @@ ${log}` : log;
     }
     reconnectTimer;
     reconnectAttempts = 0;
+    messageKeepaliveTimer;
     startReconnectTimer() {
       if (this._isError || this.isReConnected)
         return;
@@ -19517,8 +19537,53 @@ ${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", {
@@ -19528,6 +19593,7 @@ ${log}` : log;
           isRegistered: this.isRegistered()
         }
       });
+      this.stopMessageKeepalive();
       if (!this.isRegistered() || !this.registerer) {
         this.callKit.logger.warn("No registerer to unregister.", {
           caller: "Connect.unregister",
@@ -20767,6 +20833,7 @@ self.onmessage = function(e) {
         });
         if (user) {
           this.config.setConfig("userInfo", {
+            ...user,
             wsUrl: `wss://${user.wsUrl}`,
             sessionId: user.sessionId,
             username,
@@ -21060,4 +21127,3 @@ self.onmessage = function(e) {
   };
   return __toCommonJS(core_exports);
 })();
-//# sourceMappingURL=index.global.js.map

package/dist/index.js

@@ -584,7 +584,9 @@ var SIP_RECONNECT_CONFIG = {
   delay: 1e3,
   registererOptions: {
     refreshFrequency: 90
-  }
+  },
+  enableMessageKeepalive: true,
+  messageKeepaliveInterval: 30
 };
 
 // core/call.ts
@@ -728,13 +730,13 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.3.1-beta.1",
+  version: "2.3.1-beta.2",
   description: "callkit",
   author: "koi",
   license: "ISC",
   scripts: {
     build: "tsup",
-    start: "pnpm build && vite --host 0.0.0.0",
+    start: "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"
@@ -15569,7 +15571,15 @@ var Connect = class {
     this.callKit = callKit;
   }
   get reconnectConfig() {
-    return this.callKit.config.getReconnectConfig("sip");
+    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;
   }
   // current call id for invite data
   currentCallId = null;
@@ -15693,6 +15703,7 @@ var Connect = class {
       }
     }
     this.setConnectStatus(CallStatus.init);
+    this.stopMessageKeepalive();
   }
   getAduioReference() {
     const { audioRef } = this.callKit.config.getConfig();
@@ -15845,6 +15856,7 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
+          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15901,6 +15913,7 @@ var Connect = class {
             }
             this.setIsReConnected(false);
           }
+          this.startMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15920,6 +15933,7 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
+          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered(),
@@ -15940,6 +15954,7 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
+          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered(),
@@ -15995,9 +16010,9 @@ var Connect = class {
         traceSip: true
       },
       logLevel: "error",
-      allowLegacyNotifications: true,
-      authorizationPassword: fsPassword,
       authorizationUsername: userPart,
+      authorizationPassword: fsPassword,
+      allowLegacyNotifications: true,
       contactName: userPart,
       contactParams: { transport: "wss" },
       sessionDescriptionHandlerFactory: web_exports.defaultSessionDescriptionHandlerFactory(localStreamFactory),
@@ -16252,7 +16267,10 @@ var Connect = class {
           }
         });
         this.setupRegisterer();
-        await this.registerer.register().catch(async (err) => {
+        try {
+          await this.registerer.register();
+          this.startMessageKeepalive();
+        } catch (err) {
           this.callKit.reset();
           this.callKit.logger.error(err?.message, {
             caller: "Connect.register",
@@ -16261,9 +16279,10 @@ 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",
@@ -16299,6 +16318,7 @@ var Connect = class {
   }
   reconnectTimer;
   reconnectAttempts = 0;
+  messageKeepaliveTimer;
   startReconnectTimer() {
     if (this._isError || this.isReConnected)
       return;
@@ -16352,8 +16372,53 @@ 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", {
@@ -16363,6 +16428,7 @@ var Connect = class {
         isRegistered: this.isRegistered()
       }
     });
+    this.stopMessageKeepalive();
     if (!this.isRegistered() || !this.registerer) {
       this.callKit.logger.warn("No registerer to unregister.", {
         caller: "Connect.unregister",
@@ -17602,6 +17668,7 @@ var CallKit = class {
       });
       if (user) {
         this.config.setConfig("userInfo", {
+          ...user,
           wsUrl: `wss://${user.wsUrl}`,
           sessionId: user.sessionId,
           username,
@@ -17897,4 +17964,3 @@ var CallKit = class {
 0 && (module.exports = {
   CallKit
 });
-//# sourceMappingURL=index.js.map

package/dist/index.mjs

@@ -557,7 +557,9 @@ var SIP_RECONNECT_CONFIG = {
   delay: 1e3,
   registererOptions: {
     refreshFrequency: 90
-  }
+  },
+  enableMessageKeepalive: true,
+  messageKeepaliveInterval: 30
 };
 
 // core/call.ts
@@ -701,13 +703,13 @@ var Call = class {
 // package.json
 var package_default = {
   name: "@koi-design/callkit",
-  version: "2.3.1-beta.1",
+  version: "2.3.1-beta.2",
   description: "callkit",
   author: "koi",
   license: "ISC",
   scripts: {
     build: "tsup",
-    start: "pnpm build && vite --host 0.0.0.0",
+    start: "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"
@@ -15542,7 +15544,15 @@ var Connect = class {
     this.callKit = callKit;
   }
   get reconnectConfig() {
-    return this.callKit.config.getReconnectConfig("sip");
+    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;
   }
   // current call id for invite data
   currentCallId = null;
@@ -15666,6 +15676,7 @@ var Connect = class {
       }
     }
     this.setConnectStatus(CallStatus.init);
+    this.stopMessageKeepalive();
   }
   getAduioReference() {
     const { audioRef } = this.callKit.config.getConfig();
@@ -15818,6 +15829,7 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
+          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15874,6 +15886,7 @@ var Connect = class {
             }
             this.setIsReConnected(false);
           }
+          this.startMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered()
@@ -15893,6 +15906,7 @@ 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,6 +15927,7 @@ var Connect = class {
           if (!this.isInCallRefering()) {
             this.setConnectStatus(CallStatus.init);
           }
+          this.stopMessageKeepalive();
           this.callKit.trigger(KitEvent.SIP_REGISTERER_EVENT, {
             registererState: state,
             isRegistered: this.isRegistered(),
@@ -15968,9 +15983,9 @@ var Connect = class {
         traceSip: true
       },
       logLevel: "error",
-      allowLegacyNotifications: true,
-      authorizationPassword: fsPassword,
       authorizationUsername: userPart,
+      authorizationPassword: fsPassword,
+      allowLegacyNotifications: true,
       contactName: userPart,
       contactParams: { transport: "wss" },
       sessionDescriptionHandlerFactory: web_exports.defaultSessionDescriptionHandlerFactory(localStreamFactory),
@@ -16225,7 +16240,10 @@ var Connect = class {
           }
         });
         this.setupRegisterer();
-        await this.registerer.register().catch(async (err) => {
+        try {
+          await this.registerer.register();
+          this.startMessageKeepalive();
+        } catch (err) {
           this.callKit.reset();
           this.callKit.logger.error(err?.message, {
             caller: "Connect.register",
@@ -16234,9 +16252,10 @@ 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",
@@ -16272,6 +16291,7 @@ var Connect = class {
   }
   reconnectTimer;
   reconnectAttempts = 0;
+  messageKeepaliveTimer;
   startReconnectTimer() {
     if (this._isError || this.isReConnected)
       return;
@@ -16325,8 +16345,53 @@ 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", {
@@ -16336,6 +16401,7 @@ var Connect = class {
         isRegistered: this.isRegistered()
       }
     });
+    this.stopMessageKeepalive();
     if (!this.isRegistered() || !this.registerer) {
       this.callKit.logger.warn("No registerer to unregister.", {
         caller: "Connect.unregister",
@@ -17575,6 +17641,7 @@ var CallKit = class {
       });
       if (user) {
         this.config.setConfig("userInfo", {
+          ...user,
           wsUrl: `wss://${user.wsUrl}`,
           sessionId: user.sessionId,
           username,
@@ -17869,4 +17936,3 @@ var CallKit = class {
 export {
   CallKit
 };
-//# sourceMappingURL=index.mjs.map

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@koi-design/callkit",
-    "version": "2.3.1-beta.1",
+    "version": "2.3.1-beta.2",
     "description": "callkit",
     "author": "koi",
     "license": "ISC",
     "scripts": {
         "build": "tsup",
-        "start": "pnpm build && vite --host 0.0.0.0",
+        "start": "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"