@koi-design/callkit 1.0.22 → 1.0.23

package/dist/index.d.ts

@@ -35,20 +35,6 @@ declare class Call {
     callUnhold(): Promise<void>;
 }
 
-type LoggerLevel = 'debug' | 'log' | 'warn' | 'error' | 'silent';
-declare class Logger {
-    prefix: string;
-    level: LoggerLevel;
-    private callKit;
-    constructor(callKit: CallKit, level?: LoggerLevel);
-    setLevel(level: LoggerLevel): void;
-    debug(msg: any, extra?: Object): void;
-    log(msg: any, extra?: Object): void;
-    warn(msg: any, extra?: Object): void;
-    error(msg: any, extra?: any): void;
-    output(color: string): (msg: any, extra?: Object) => void;
-}
-
 declare const CallStatus: {
     /**
      * Initial state/Hang up
@@ -182,7 +168,26 @@ declare const SocketSendEvent: {
      * End
      */
     END: string;
-};
+};
+declare const EncryptionMethod: {
+    NONE: string;
+    INTERNAL: string;
+};
+type EncryptionMethodType = (typeof EncryptionMethod)[keyof typeof EncryptionMethod];
+
+type LoggerLevel = 'debug' | 'log' | 'warn' | 'error' | 'silent';
+declare class Logger {
+    prefix: string;
+    level: LoggerLevel;
+    private callKit;
+    constructor(callKit: CallKit, level?: LoggerLevel);
+    setLevel(level: LoggerLevel): void;
+    debug(msg: any, extra?: Object): void;
+    log(msg: any, extra?: Object): void;
+    warn(msg: any, extra?: Object): void;
+    error(msg: any, extra?: any): void;
+    output(color: string): (msg: any, extra?: Object) => void;
+}
 
 type SocketSendEventType = (typeof SocketSendEvent)[keyof typeof SocketSendEvent];
 interface SocketConfig {
@@ -249,6 +254,7 @@ interface IConfig {
         sessionId: string;
         username: string;
         password: string;
+        encryptionPassword: string;
         extno: string;
         userPart: string;
         agentId: string;
@@ -258,6 +264,7 @@ interface IConfig {
         fsPort: string;
         iceInfo: string[];
         iceGatheringTimeout: number;
+        encryptionMethod: EncryptionMethodType;
     };
     isAutoUpdateUserStatus: boolean;
 }
@@ -415,7 +422,9 @@ declare class CallKit {
     user: User;
     listener: Listener[];
     constructor(options: ConfigEntity);
-    login(username: string, password: string, extra?: object): Promise<void>;
+    login(username: string, password: string, extra?: {
+        [key: string]: any;
+    }): Promise<void>;
     logout(): Promise<void>;
     call(extno?: string | number): Promise<void>;
     register(): Promise<void>;

package/dist/index.global.js

@@ -3547,6 +3547,10 @@ var WebCall = (() => {
      */
     ERROR: "ERROR"
   };
+  var EncryptionMethod = {
+    NONE: "NONE",
+    INTERNAL: "INTERNAL"
+  };
   var constrainsDefault = {
     audio: {
       autoGainControl: true,
@@ -3638,6 +3642,7 @@ var WebCall = (() => {
         username: "",
         // Password
         password: "",
+        encryptionPassword: EncryptionMethod.INTERNAL,
         // Extension number
         extno: "",
         userPart: "",
@@ -3647,7 +3652,8 @@ var WebCall = (() => {
         fsIp: "",
         fsPort: "",
         iceInfo: [],
-        iceGatheringTimeout: 0
+        iceGatheringTimeout: 0,
+        encryptionMethod: EncryptionMethod.INTERNAL
       },
       // EXECUTE setUserStatus
       isAutoUpdateUserStatus: true
@@ -3667,6 +3673,7 @@ var WebCall = (() => {
           sessionId: "",
           username: "",
           password: "",
+          encryptionPassword: "",
           userPart: "",
           extno: "",
           agentId: "",
@@ -3675,7 +3682,8 @@ var WebCall = (() => {
           fsIp: "",
           fsPort: "",
           iceInfo: [],
-          iceGatheringTimeout: this.config.userInfo.iceGatheringTimeout
+          iceGatheringTimeout: this.config.userInfo.iceGatheringTimeout,
+          encryptionMethod: EncryptionMethod.INTERNAL
         };
         this.callKit.trigger(KitEvent.KIT_LOGIN_CHANGE, false);
       }
@@ -19040,18 +19048,35 @@ var WebCall = (() => {
       this.socket = new Socket(this);
       this.user = new User(this);
     }
-    async login(username, password, extra = {}) {
+    async login(username, password, extra = {
+      encryptionMethod: EncryptionMethod.INTERNAL
+    }) {
       if (this.config.isLogin()) {
         this.logger.warn("already login");
         return;
       }
+      let encryptionPassword = "";
+      const { encryptionMethod = EncryptionMethod.INTERNAL } = extra;
+      switch (encryptionMethod) {
+        case EncryptionMethod.NONE:
+          encryptionPassword = password;
+          break;
+        case EncryptionMethod.INTERNAL:
+          encryptionPassword = (0, import_blueimp_md5.default)(username + (0, import_blueimp_md5.default)(password));
+          break;
+        default:
+          encryptionPassword = (0, import_blueimp_md5.default)(username + (0, import_blueimp_md5.default)(password));
+          break;
+      }
       this.logger.debug("login info:", {
         username,
-        password
+        password,
+        encryptionMethod,
+        encryptionPassword
       });
       const user = await this.api.login({
         userName: username,
-        password: (0, import_blueimp_md5.default)(username + (0, import_blueimp_md5.default)(password))
+        password: encryptionPassword
       }).catch((err) => {
         this.logger.error(err, { errCode: ErrorCode.API_USER_LOGIN_ERROR });
       });
@@ -19060,7 +19085,8 @@ var WebCall = (() => {
           wsUrl: `wss://${user.wsUrl}`,
           sessionId: user.sessionId,
           username,
-          password,
+          password: encryptionPassword,
+          encryptionPassword,
           agentId: user.agentId,
           fsUserId: user.fsUserId,
           userPart: user.userPart,
@@ -19069,6 +19095,7 @@ var WebCall = (() => {
           fsPort: user.fsPort,
           iceInfo: user.iceInfo,
           iceGatheringTimeout: user.iceGatheringTimeout,
+          // encryptionType is in extra
           ...extra
         });
         this.socket.init();