@koi-design/callkit 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/index.d.ts

@@ -20,27 +20,124 @@ declare class Api {
     private post;
 }
 
-declare class Call {
+type LoggerLevel = 'info' | 'success' | 'warn' | 'error' | 'silent';
+interface Log {
+    timestamp: string;
+    level: LoggerLevel;
+    type?: 'INCALL' | 'SIP' | 'API' | 'OTHER';
+    message: string;
+    caller: string;
+    content: Record<string, any>;
+}
+type LogEntity = Omit<Log, 'timestamp' | 'level' | 'message'>;
+declare class Logger {
+    prefix: string;
+    level: LoggerLevel;
+    private pendingTrackLogs;
+    private trackLogsTimer;
     private callKit;
+    constructor(callKit: CallKit, level?: LoggerLevel);
+    private startTrackLogsTimer;
+    private flushTrackLogs;
+    destroy(): void;
+    setLevel(level: LoggerLevel): void;
+    info(msg: string, extra: LogEntity): void;
+    success(msg: string, extra: LogEntity): void;
+    warn(msg: string, extra: LogEntity): void;
+    error(msg: string | Error, extra: LogEntity): void;
+    private catchLog;
+}
+
+type SocketSendEventType = (typeof SocketSendEvent)[keyof typeof SocketSendEvent];
+interface SocketConfig {
+    enabled: boolean;
+    maxAttempts: number;
+    delay: number;
+    backoffMultiplier: number;
+    pingInterval: number;
+    pingTimeout: number;
+}
+declare class Socket {
+    private callKit;
+    private ws?;
+    private socketConfig;
+    lastPingTime: any;
+    isConnected: boolean;
+    pingTimer?: number;
+    satrtConfirm: boolean;
+    private reconnectTimer?;
+    private isReconnecting;
+    private reconnectAttempts;
+    private socketError;
     constructor(callKit: CallKit);
-    callStart(): Promise<void>;
-    /**
-     * Refer
-     * @param referTo - The referral target. If a `Session`, a REFER w/Replaces is sent.
-     * @returns
-     */
-    callRefer(referTo: string, options?: any): Promise<void>;
+    init(): void;
+    private handleDisconnect;
+    private connect;
+    private onOpen;
+    private resetReconnectState;
+    private onClose;
+    private onError;
+    private confirmAck;
+    private onMessage;
+    send(event: SocketSendEventType, message?: any): void;
+    sendMessage(event: SocketSendEventType, message?: any): Promise<void>;
+    private ping;
+    private checkPing;
     /**
-     * Hang up
-     * @param isUnprompted Whether to actively hang up
-     * @param isError Whether an error occurred
-     * @returns
+     * reset socket connection and all states
      */
-    callEnd(isUnprompted?: boolean, isError?: boolean): Promise<void>;
-    callHold(): Promise<void>;
-    callUnhold(): Promise<void>;
-    callMute(): Promise<void>;
-    callUnmute(): Promise<void>;
+    reset(): Promise<void>;
+    private attemptReconnect;
+}
+
+interface WebrtcConstranis {
+    audio: {
+        autoGainControl?: boolean;
+        noiseSuppression?: boolean;
+        echoCancellation?: boolean;
+    };
+    video: false;
+}
+interface IConfig {
+    version: string;
+    host: string;
+    log: LoggerLevel;
+    trackLogs: boolean;
+    audioRef?: HTMLAudioElement | (() => HTMLAudioElement);
+    constrains: WebrtcConstranis;
+    socket: string;
+    reconnect?: SocketConfig;
+    userInfo: {
+        wsUrl: string;
+        sessionId: string;
+        username: string;
+        password: string;
+        encryptionPassword: string;
+        sourceType: (typeof CallSourceType)[keyof typeof CallSourceType];
+        extno: string;
+        workOrderId: string;
+        userPart: string;
+        agentId: string;
+        fsUserId: string;
+        fsPassword: string;
+        fsIp: string;
+        fsPort: string;
+        iceInfo: string[];
+        iceGatheringTimeout: number;
+        encryptionMethod: EncryptionMethodType;
+    };
+}
+declare class Config {
+    callKit: CallKit;
+    constructor(callKit: CallKit);
+    config: IConfig;
+    getConfig: () => IConfig;
+    setConfig: (key: string, value: any) => Promise<void>;
+    setUserInfo: (key: string, value: any) => Promise<void>;
+    reset: () => Promise<void>;
+    validate: () => boolean;
+    isLogin: () => boolean;
+    check(): boolean;
 }
 
 declare const CallStatus: {
@@ -208,124 +305,34 @@ declare const CallSourceType: {
     workOrderId: number;
 };
 
-type LoggerLevel = 'info' | 'success' | 'warn' | 'error' | 'silent';
-interface Log {
-    timestamp: string;
-    level: LoggerLevel;
-    type?: 'INCALL' | 'SIP' | 'API' | 'OTHER';
-    message: string;
-    caller: string;
-    content: Record<string, any>;
-}
-type LogEntity = Omit<Log, 'timestamp' | 'level' | 'message'>;
-declare class Logger {
-    prefix: string;
-    level: LoggerLevel;
-    private pendingTrackLogs;
-    private trackLogsTimer;
-    private callKit;
-    constructor(callKit: CallKit, level?: LoggerLevel);
-    private startTrackLogsTimer;
-    private flushTrackLogs;
-    destroy(): void;
-    setLevel(level: LoggerLevel): void;
-    info(msg: string, extra: LogEntity): void;
-    success(msg: string, extra: LogEntity): void;
-    warn(msg: string, extra: LogEntity): void;
-    error(msg: string | Error, extra: LogEntity): void;
-    private catchLog;
-}
-
-type SocketSendEventType = (typeof SocketSendEvent)[keyof typeof SocketSendEvent];
-interface SocketConfig {
-    enabled: boolean;
-    maxAttempts: number;
-    delay: number;
-    backoffMultiplier: number;
-    pingInterval: number;
-    pingTimeout: number;
+interface CallParams {
+    agentId: string;
+    sourceType: (typeof CallSourceType)[keyof typeof CallSourceType];
+    phoneNum?: string;
+    workOrderId?: string;
+    extra?: any;
 }
-declare class Socket {
+declare class Call {
     private callKit;
-    private ws?;
-    private socketConfig;
-    lastPingTime: any;
-    isConnected: boolean;
-    pingTimer?: number;
-    satrtConfirm: boolean;
-    private reconnectTimer?;
-    private isReconnecting;
-    private reconnectAttempts;
-    private socketError;
     constructor(callKit: CallKit);
-    init(): void;
-    private handleDisconnect;
-    private connect;
-    private onOpen;
-    private resetReconnectState;
-    private onClose;
-    private onError;
-    private confirmAck;
-    private onMessage;
-    send(event: SocketSendEventType, message?: any): void;
-    sendMessage(event: SocketSendEventType, message?: any): Promise<void>;
-    private ping;
-    private checkPing;
+    callStart(params: Partial<CallParams>): Promise<void>;
     /**
-     * reset socket connection and all states
+     * Refer
+     * @param referTo - The referral target. If a `Session`, a REFER w/Replaces is sent.
+     * @returns
      */
-    reset(): Promise<void>;
-    private attemptReconnect;
-}
-
-interface WebrtcConstranis {
-    audio: {
-        autoGainControl?: boolean;
-        noiseSuppression?: boolean;
-        echoCancellation?: boolean;
-    };
-    video: false;
-}
-interface IConfig {
-    version: string;
-    host: string;
-    log: LoggerLevel;
-    trackLogs: boolean;
-    audioRef?: HTMLAudioElement | (() => HTMLAudioElement);
-    constrains: WebrtcConstranis;
-    socket: string;
-    reconnect?: SocketConfig;
-    userInfo: {
-        wsUrl: string;
-        sessionId: string;
-        username: string;
-        password: string;
-        encryptionPassword: string;
-        sourceType: (typeof CallSourceType)[keyof typeof CallSourceType];
-        extno: string;
-        workOrderId: string;
-        userPart: string;
-        agentId: string;
-        fsUserId: string;
-        fsPassword: string;
-        fsIp: string;
-        fsPort: string;
-        iceInfo: string[];
-        iceGatheringTimeout: number;
-        encryptionMethod: EncryptionMethodType;
-    };
-}
-declare class Config {
-    callKit: CallKit;
-    constructor(callKit: CallKit);
-    config: IConfig;
-    getConfig: () => IConfig;
-    setConfig: (key: string, value: any) => Promise<void>;
-    setUserInfo: (key: string, value: any) => Promise<void>;
-    reset: () => void;
-    validate: () => boolean;
-    isLogin: () => boolean;
-    check(): boolean;
+    callRefer(referTo: string, options?: any): Promise<void>;
+    /**
+     * Hang up
+     * @param isUnprompted Whether to actively hang up
+     * @param isError Whether an error occurred
+     * @returns
+     */
+    callEnd(isUnprompted?: boolean, isError?: boolean): Promise<void>;
+    callHold(): Promise<void>;
+    callUnhold(): Promise<void>;
+    callMute(): Promise<void>;
+    callUnmute(): Promise<void>;
 }
 
 type CallStatusType = (typeof CallStatus)[keyof typeof CallStatus];
@@ -368,7 +375,7 @@ declare class Connect {
      */
     private isHold;
     constructor(callKit: CallKit);
-    reset(): void;
+    reset(): Promise<void>;
     private getAduioReference;
     permission(): Promise<void>;
     /**
@@ -405,6 +412,7 @@ declare class Connect {
     clearObserveOptionsHeartbeatInterval(): void;
     heartbeatFlag: number;
     startHeartbeat(): void;
+    socketTriggerHangup(callId: string): void;
     register(): Promise<void>;
     private reconnectTimer?;
     private reconnectAttempts;
@@ -453,11 +461,6 @@ interface Listener {
     event: kitEventType;
     callback: (...args: any[]) => void;
 }
-interface CallOptions {
-    sourceType: (typeof CallSourceType)[keyof typeof CallSourceType];
-    phoneNum?: string;
-    workOrderId?: string;
-}
 declare class CallKit {
     api: Api;
     config: Config;
@@ -470,8 +473,10 @@ declare class CallKit {
     login(username: string, password: string, extra?: {
         [key: string]: any;
     }): Promise<void>;
-    logout(): Promise<void>;
-    call(extno?: string | number, options?: CallOptions): Promise<void>;
+    logout({ isReset }?: {
+        isReset?: boolean;
+    }): Promise<void>;
+    call(extno?: string | number, options?: Partial<CallParams>): Promise<void>;
     refer(uri: string, options?: any): Promise<void>;
     register(): Promise<void>;
     unregister(): Promise<void>;

package/dist/index.global.js

@@ -3640,7 +3640,7 @@ var WebCall = (() => {
     constructor(callKit) {
       this.callKit = callKit;
     }
-    async callStart() {
+    async callStart(params) {
       if (!this.callKit.config.check())
         return;
       this.callKit.logger.info("callStart", {
@@ -3659,19 +3659,15 @@ var WebCall = (() => {
         return;
       }
       this.callKit.connect.call(async (user) => {
-        let queryTrain = {};
+        const queryTrain = {
+          ...params?.extra || {},
+          agentId: user.agentId,
+          sourceType: user.sourceType
+        };
         if (user.sourceType === CallSourceType.phoneNum) {
-          queryTrain = {
-            agentId: user.agentId,
-            phoneNum: user.extno,
-            sourceType: user.sourceType
-          };
+          queryTrain.phoneNum = user.extno;
         } else if (user.sourceType === CallSourceType.workOrderId) {
-          queryTrain = {
-            agentId: user.agentId,
-            workOrderId: user.workOrderId,
-            sourceType: user.sourceType
-          };
+          queryTrain.workOrderId = user.workOrderId;
         }
         this.callKit.socket.send(SocketSendEvent.CALL, queryTrain);
       });
@@ -3819,7 +3815,7 @@ var WebCall = (() => {
         }
       });
     };
-    reset = () => {
+    reset = async () => {
       if (this.isLogin()) {
         this.config.userInfo = {
           wsUrl: "",
@@ -18402,6 +18398,21 @@ var WebCall = (() => {
     }
   };
 
+  // package/utils.ts
+  var formatGetInviteData = (inviteData) => {
+    const extendInfoStr = inviteData["x-antaios-manual-extend_info"] || inviteData["x-antaios-manual-extend-info"];
+    let extendInfoObj = null;
+    try {
+      if (extendInfoStr && typeof extendInfoStr === "string") {
+        const cleanedStr = extendInfoStr.replace(/\\/g, "");
+        extendInfoObj = JSON.parse(cleanedStr);
+        return extendInfoObj;
+      }
+    } catch (error) {
+      return {};
+    }
+  };
+
   // package/connect.ts
   var DEFAULT_RECONNECT_CONFIG = {
     maxAttempts: 3,
@@ -18484,7 +18495,7 @@ var WebCall = (() => {
         ...reconnect
       };
     }
-    reset() {
+    async reset() {
       if (this.isHolding()) {
         this.setHold(false);
       }
@@ -18500,6 +18511,7 @@ var WebCall = (() => {
       this.registerer = void 0;
       this.isOutgoing = false;
       this.isUnprompted = false;
+      this.currentCallId = void 0;
       if (this.mediaStream) {
         try {
           closeStream(this.mediaStream);
@@ -18515,7 +18527,6 @@ var WebCall = (() => {
           });
         }
       }
-      this.callKit.config.reset();
       this.setConnectStatus(CallStatus.init);
       this.clearObserveOptionsHeartbeatInterval();
     }
@@ -18601,6 +18612,18 @@ var WebCall = (() => {
         }
       }, 1e3);
     }
+    socketTriggerHangup(callId) {
+      if (!this.isCalling() || callId !== this.currentCallId)
+        return;
+      this.callKit.logger.info("socketHangup trigger hangup", {
+        caller: "Connect.socketHangup",
+        content: {
+          callId,
+          currentCallId: this.currentCallId
+        }
+      });
+      this.callKit.hangup();
+    }
     async register() {
       if (this.connectStatus !== CallStatus.init) {
         if (this.isRegistered()) {
@@ -18882,24 +18905,40 @@ var WebCall = (() => {
               alwaysAcquireMediaFirst: true
             }
           };
+          const getInviteData = () => {
+            const { request: request2 } = this.currentSession;
+            const headerNames = Object.keys(request2.headers);
+            const xHeaders = {};
+            headerNames.filter((name) => name.toLocaleLowerCase().startsWith("x-antaios")).forEach((name) => {
+              xHeaders[name.toLocaleLowerCase()] = request2.getHeader(name);
+            });
+            this.callKit.logger.info("get invite data", {
+              caller: "Connect.register.onInvite",
+              content: xHeaders
+            });
+            return xHeaders;
+          };
+          const info = getInviteData();
+          try {
+            const inviteData = formatGetInviteData(info);
+            this.currentCallId = inviteData?.callUuid;
+            this.callKit.logger.info("get invite data", {
+              caller: "Connect.register.onInvite",
+              content: {
+                inviteData,
+                currentCallId: this.currentCallId
+              }
+            });
+          } catch (error) {
+            this.callKit.logger.info(error, {
+              caller: "Connect.register.onInvite",
+              content: info
+            });
+          }
           if (this.isOutgoing) {
             this.currentSession.accept(options);
             this.callKit.trigger(KitEvent.KIT_OUTGOING_INVITE, {
-              getInviteData: () => {
-                const { request: request2 } = this.currentSession;
-                const headerNames = Object.keys(request2.headers);
-                const xHeaders = {};
-                headerNames.filter(
-                  (name) => name.toLocaleLowerCase().startsWith("x-antaios")
-                ).forEach((name) => {
-                  xHeaders[name.toLocaleLowerCase()] = request2.getHeader(name);
-                });
-                this.callKit.logger.info("get invite data", {
-                  caller: "Connect.register.onInvite",
-                  content: xHeaders
-                });
-                return xHeaders;
-              }
+              getInviteData
             });
           } else {
             const reject = () => {
@@ -18913,21 +18952,7 @@ var WebCall = (() => {
                 this.currentSession.accept(options);
               },
               reject,
-              getInviteData: () => {
-                const { request: request2 } = this.currentSession;
-                const headerNames = Object.keys(request2.headers);
-                const xHeaders = {};
-                headerNames.filter(
-                  (name) => name.toLocaleLowerCase().startsWith("x-antaios")
-                ).forEach((name) => {
-                  xHeaders[name.toLocaleLowerCase()] = request2.getHeader(name);
-                });
-                this.callKit.logger.info("get invite data", {
-                  caller: "Connect.register",
-                  content: xHeaders
-                });
-                return xHeaders;
-              }
+              getInviteData
             });
           }
         },
@@ -19568,6 +19593,9 @@ var WebCall = (() => {
           }
         });
         this.callKit.trigger(KitEvent.CALL_HANG_UP, /* @__PURE__ */ new Date());
+        if (data.data?.callUuid) {
+          this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+        }
       }
       if (data.event === SocketReceiveEvent.CUSTOMER_NO_ANSWER) {
         this.callKit.logger.info(data.msg, {
@@ -19579,6 +19607,9 @@ var WebCall = (() => {
           }
         });
         this.callKit.trigger(KitEvent.CALL_NO_ANSWER);
+        if (data.data?.callUuid) {
+          this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+        }
       }
       if (data.event === SocketReceiveEvent.CALL_CDR) {
         this.callKit.logger.info(data.msg, {
@@ -19620,6 +19651,7 @@ var WebCall = (() => {
             data: data.data
           }
         });
+        this.socketError = true;
         this.callKit.reset();
       }
       if (data.event === SocketReceiveEvent.AGENT_NO_ANSWER) {
@@ -19630,6 +19662,9 @@ var WebCall = (() => {
             event: SocketReceiveEvent.AGENT_NO_ANSWER
           }
         });
+        if (data.data?.callUuid) {
+          this.callKit.connect.socketTriggerHangup(data.data.callUuid);
+        }
       }
       this.callKit.trigger(KitEvent.SERVER_SOCKET_EVENT, data);
     }
@@ -19911,7 +19946,7 @@ var WebCall = (() => {
         });
       }
     }
-    async logout() {
+    async logout({ isReset = true } = { isReset: true }) {
       if (!this.config.check())
         return;
       const { userInfo } = this.config.getConfig();
@@ -19934,10 +19969,9 @@ var WebCall = (() => {
           });
         }
       }
-      await this.hangup();
-      this.connect.reset();
-      this.socket.reset();
-      this.config.reset();
+      if (isReset) {
+        await this.reset();
+      }
       this.trigger(KitEvent.KIT_LOGIN_CHANGE, false);
     }
     async call(extno = "", options = {
@@ -19971,7 +20005,7 @@ var WebCall = (() => {
           options
         }
       });
-      this.callCenter.callStart();
+      this.callCenter.callStart(options);
     }
     async refer(uri, options) {
       if (!this.config.check())
@@ -20088,7 +20122,15 @@ var WebCall = (() => {
           connectStatus: this.connect.connectStatus
         }
       });
-      this.connect.reset();
+      if (this.connect.isCalling()) {
+        await this.hangup();
+      }
+      await this.connect.reset();
+      if (this.config.isLogin()) {
+        await this.logout({ isReset: false });
+      }
+      await this.config.reset();
+      await this.socket.reset();
     }
     on(event, callback) {
       this.listener.push({