ue-softphone-sdk 2.1.3 → 2.1.5

package/src/new-index.ts

@@ -249,7 +249,7 @@ class ueWebsocket {
 
     if (type === "message") {
       this.ws.on("call", callback);
-      // this.ws.on("commonEvent", callback);
+      this.ws.on("event", callback);
       // this.ws.on("monitor", callback);
     }
   }
@@ -427,7 +427,6 @@ export default class ueSoftphone {
                         loginInfo.data.pushServer,
                         loginInfo.data.agent
                       );
-                      debugger;
                       if (loginType === "WEBRTC") {
                         this.getWebrtcInfo(server, options);
                       }
@@ -567,11 +566,15 @@ export default class ueSoftphone {
     });
 
     this.Socketinstance.on("message", (event: any, fn: Function) => {
-      if (event.subType === "login" && event.data.eventType === "logout") {
+      if (event.subType === "KICK_OFF") {
         this.Socketinstance.disconnect();
-        if (ueSoftphone.agentInfo.loginType === "WEBRTC") {
+        try {
           WebPhoneSdk.disconnect();
-        }
+        } catch (error) {}
+        callbacks.error({
+          type: "accountError",
+          error: "您的账号在其他网页登录"
+        });
       }
       callbacks.message({
         subtype: event.subType,
@@ -2069,13 +2072,6 @@ export default class ueSoftphone {
           loginNumber = ueSoftphone.agentInfo.webrtcSipNumber;
         }
 
-        if (loginNumber === null || loginNumber === undefined) {
-          params.fail({
-            success: false,
-            message: "Please fill in the loginNumber field according to the document"
-          });
-          return;
-        }
         const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
         const query: UpdateLoginTypeParams = {
           loginType: params.loginType,
@@ -2472,394 +2468,4 @@ export default class ueSoftphone {
       }
     };
   };
-
-  // private _monitorApi = () => {
-  //   return {
-  //     // 监听
-  //     listen(params: listenParams) {
-  //       params.success =
-  //         params && typeof params.success == "function" ? params.success : ueSoftphone.noop;
-  //       params.fail = params && typeof params.fail == "function" ? params.fail : ueSoftphone.noop;
-
-  //       if (ueSoftphone.loginToken === null || ueSoftphone.loginToken === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-
-  //       if (ueSoftphone.agentInfo === null || ueSoftphone.agentInfo === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.agentNumber === null || params.agentNumber === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter agentNumber is required!"
-  //         });
-  //         return;
-  //       }
-
-  //       const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
-
-  //       ueSoftphone.request(server + "/call/sdk/v1/call/transfer/listen", {
-  //         verb: "POST",
-  //         body: params,
-  //         loginToken: ueSoftphone.loginToken,
-  //         sessionId: ueSoftphone.agentInfo._id,
-  //         accountId: ueSoftphone.agentInfo.accountId,
-  //         success: (res: any) => {
-  //           if (res.success) {
-  //             (params.success as Function)({
-  //               success: true,
-  //               message: "listen success",
-  //               data: res.data.response.data
-  //             });
-  //           } else {
-  //             (params.fail as Function)({
-  //               success: false,
-  //               message: res.message,
-  //               code: res.code
-  //             });
-  //           }
-  //         }
-  //       });
-  //     },
-  //     // 抢接
-  //     loot(params: lootParams) {
-  //       params.success =
-  //         params && typeof params.success == "function" ? params.success : ueSoftphone.noop;
-  //       params.fail = params && typeof params.fail == "function" ? params.fail : ueSoftphone.noop;
-
-  //       if (ueSoftphone.loginToken === null || ueSoftphone.loginToken === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-
-  //       if (ueSoftphone.agentInfo === null || ueSoftphone.agentInfo === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.agentNumber === null || params.agentNumber === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter agentNumber is required!"
-  //         });
-  //         return;
-  //       }
-
-  //       const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
-
-  //       ueSoftphone.request(server + "/call/sdk/v1/call/transfer/loot", {
-  //         verb: "POST",
-  //         body: params,
-  //         loginToken: ueSoftphone.loginToken,
-  //         sessionId: ueSoftphone.agentInfo._id,
-  //         accountId: ueSoftphone.agentInfo.accountId,
-  //         success: (res: any) => {
-  //           if (res.success) {
-  //             (params.success as Function)({
-  //               success: true,
-  //               message: "loot success",
-  //               data: res.data.response.data
-  //             });
-  //           } else {
-  //             (params.fail as Function)({
-  //               success: false,
-  //               message: res.message,
-  //               code: res.code
-  //             });
-  //           }
-  //         }
-  //       });
-  //     },
-  //     // 耳语
-  //     whisper(params: whisperParams) {
-  //       params.success =
-  //         params && typeof params.success == "function" ? params.success : ueSoftphone.noop;
-  //       params.fail = params && typeof params.fail == "function" ? params.fail : ueSoftphone.noop;
-
-  //       if (ueSoftphone.loginToken === null || ueSoftphone.loginToken === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-
-  //       if (ueSoftphone.agentInfo === null || ueSoftphone.agentInfo === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.agentNumber === null || params.agentNumber === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter agentNumber is required!"
-  //         });
-  //         return;
-  //       }
-
-  //       const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
-
-  //       ueSoftphone.request(server + "/call/sdk/v1/call/transfer/whisper", {
-  //         verb: "POST",
-  //         body: params,
-  //         loginToken: ueSoftphone.loginToken,
-  //         sessionId: ueSoftphone.agentInfo._id,
-  //         accountId: ueSoftphone.agentInfo.accountId,
-  //         success: (res: any) => {
-  //           if (res.success) {
-  //             (params.success as Function)({
-  //               success: true,
-  //               message: "whisper success",
-  //               data: res.data.response.data
-  //             });
-  //           } else {
-  //             (params.fail as Function)({
-  //               success: false,
-  //               message: res.message,
-  //               code: res.code
-  //             });
-  //           }
-  //         }
-  //       });
-  //     },
-  //     // 强插
-  //     breakin(params: breakinParams) {
-  //       params.success =
-  //         params && typeof params.success == "function" ? params.success : ueSoftphone.noop;
-  //       params.fail = params && typeof params.fail == "function" ? params.fail : ueSoftphone.noop;
-
-  //       if (ueSoftphone.loginToken === null || ueSoftphone.loginToken === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-
-  //       if (ueSoftphone.agentInfo === null || ueSoftphone.agentInfo === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.agentNumber === null || params.agentNumber === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter agentNumber is required!"
-  //         });
-  //         return;
-  //       }
-
-  //       const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
-
-  //       ueSoftphone.request(server + "/call/sdk/v1/call/transfer/breakin", {
-  //         verb: "POST",
-  //         body: params,
-  //         loginToken: ueSoftphone.loginToken,
-  //         sessionId: ueSoftphone.agentInfo._id,
-  //         accountId: ueSoftphone.agentInfo.accountId,
-  //         success: (res: any) => {
-  //           if (res.success) {
-  //             (params.success as Function)({
-  //               success: true,
-  //               message: "breakin success",
-  //               data: res.data.response.data
-  //             });
-  //           } else {
-  //             (params.fail as Function)({
-  //               success: false,
-  //               message: res.message,
-  //               code: res.code
-  //             });
-  //           }
-  //         }
-  //       });
-  //     },
-  //     // 强拆
-  //     forcedHangup(params: forcedHangupParams) {
-  //       params.success =
-  //         params && typeof params.success == "function" ? params.success : ueSoftphone.noop;
-  //       params.fail = params && typeof params.fail == "function" ? params.fail : ueSoftphone.noop;
-
-  //       if (ueSoftphone.loginToken === null || ueSoftphone.loginToken === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-
-  //       if (ueSoftphone.agentInfo === null || ueSoftphone.agentInfo === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.agentNumber === null || params.agentNumber === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter agentNumber is required!"
-  //         });
-  //         return;
-  //       }
-
-  //       const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
-
-  //       ueSoftphone.request(server + "/call/sdk/v1/call/transfer/hangup", {
-  //         verb: "POST",
-  //         body: params,
-  //         loginToken: ueSoftphone.loginToken,
-  //         sessionId: ueSoftphone.agentInfo._id,
-  //         accountId: ueSoftphone.agentInfo.accountId,
-  //         success: (res: any) => {
-  //           if (res.success) {
-  //             (params.success as Function)({
-  //               success: true,
-  //               message: "forcedHangup success",
-  //               data: res.data.response.data
-  //             });
-  //           } else {
-  //             (params.fail as Function)({
-  //               success: false,
-  //               message: res.message,
-  //               code: res.code
-  //             });
-  //           }
-  //         }
-  //       });
-  //     },
-  //     // 签入
-  //     signin(params: signinParams) {
-  //       params.success =
-  //         params && typeof params.success == "function" ? params.success : ueSoftphone.noop;
-  //       params.fail = params && typeof params.fail == "function" ? params.fail : ueSoftphone.noop;
-
-  //       if (ueSoftphone.loginToken === null || ueSoftphone.loginToken === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-
-  //       if (ueSoftphone.agentInfo === null || ueSoftphone.agentInfo === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.agentNumber === null || params.agentNumber === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter agentNumber is required!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.loginType === null || params.loginType === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter loginType is required!"
-  //         });
-  //         return;
-  //       }
-
-  //       const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
-
-  //       ueSoftphone.request(server + "/call/sdk/v1/call/transfer/signin", {
-  //         verb: "POST",
-  //         body: params,
-  //         loginToken: ueSoftphone.loginToken,
-  //         sessionId: ueSoftphone.agentInfo._id,
-  //         accountId: ueSoftphone.agentInfo.accountId,
-  //         success: (res: any) => {
-  //           if (res.success) {
-  //             (params.success as Function)({
-  //               success: true,
-  //               message: "signin success",
-  //               data: res.data.response.data
-  //             });
-  //           } else {
-  //             (params.fail as Function)({
-  //               success: false,
-  //               message: res.message,
-  //               code: res.code
-  //             });
-  //           }
-  //         }
-  //       });
-  //     },
-  //     // 签出
-  //     signout(params: signoutParams) {
-  //       params.success =
-  //         params && typeof params.success == "function" ? params.success : ueSoftphone.noop;
-  //       params.fail = params && typeof params.fail == "function" ? params.fail : ueSoftphone.noop;
-
-  //       if (ueSoftphone.loginToken === null || ueSoftphone.loginToken === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-
-  //       if (ueSoftphone.agentInfo === null || ueSoftphone.agentInfo === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "initialization not complete!"
-  //         });
-  //         return;
-  //       }
-  //       if (params.agentNumber === null || params.agentNumber === undefined) {
-  //         params.fail({
-  //           success: false,
-  //           message: "Parameter agentNumber is required!"
-  //         });
-  //         return;
-  //       }
-
-  //       const server = ueSoftphone.initOptions.server || ueSoftphone.callApiUrl;
-
-  //       ueSoftphone.request(server + "/call/sdk/v1/call/transfer/signout", {
-  //         verb: "POST",
-  //         body: params,
-  //         loginToken: ueSoftphone.loginToken,
-  //         sessionId: ueSoftphone.agentInfo._id,
-  //         accountId: ueSoftphone.agentInfo.accountId,
-  //         success: (res: any) => {
-  //           if (res.success) {
-  //             (params.success as Function)({
-  //               success: true,
-  //               message: "signout success",
-  //               data: res.data.response.data
-  //             });
-  //           } else {
-  //             (params.fail as Function)({
-  //               success: false,
-  //               message: res.message,
-  //               code: res.code
-  //             });
-  //           }
-  //         }
-  //       });
-  //     }
-  //   };
-  // };
 }

package/src/webPhoneSdk.ts

@@ -25,7 +25,6 @@ export default class WebPhoneSdk {
   public static message: ((arg0: any) => void | undefined) | undefined
 
   constructor (options: Options) {
-    console.log(options, 'options====')
     this.options = options
     WebPhoneSdk.WebrtcObj = new UEInitWebRtc(options)
     WebPhoneSdk.WebrtcObj.message = (message: any) => {

package/src/webrtc.ts

@@ -97,7 +97,7 @@ export default class UEWebrtc {
 
     const userAgentDelegate: UserAgentDelegate = {
       onInvite: (invitation: Invitation): void => {
-        console.log('userAgent invitation', invitation)
+        // console.log('userAgent invitation', invitation)
         this.Ginvitation = invitation
         // An Invitation is a Session
         const incomingSession: Session = invitation
@@ -105,7 +105,7 @@ export default class UEWebrtc {
         incomingSession.delegate = {
           // Handle incoming REFER request.
           onRefer (referral: Referral): void {
-            console.log(referral)
+            // console.log(referral)
           }
         };
         this.sendMessage('incomingcall')
@@ -159,20 +159,19 @@ export default class UEWebrtc {
         }
       },
       onConnect: () => {
-        console.log('onConnect==============')
+        // console.log('onConnect==============')
       },
       onDisconnect: () => {
-        console.log('onDISCONNECT===============')
+        // console.log('onDISCONNECT===============')
       },
       onRegisterRequest: () => {
-        console.log('onRegisterRequest===============')
+        // console.log('onRegisterRequest===============')
       },
       onRegister: () => {
-        console.log('onRegister=============')
+        // console.log('onRegister=============')
       },
       onMessage: (message: any) => {
-        console.log(message)
-        console.log('onMessage===============')
+        // console.log('onMessage===============')
       }
     }
 
@@ -181,6 +180,7 @@ export default class UEWebrtc {
       throw new Error('Failed to create URI');
     }
     const userAgentOptions: UserAgentOptions = {
+      logBuiltinEnabled: false,
       delegate: userAgentDelegate,
       displayName: 'webrtc',
       uri,
@@ -190,7 +190,7 @@ export default class UEWebrtc {
       /* ... */
     };
     this.userAgent = new UserAgent(userAgentOptions);
-    console.log(this.userAgent, 'this.userAgent=====')
+    // console.log(this.userAgent, 'this.userAgent=====')
     const registererOptions: RegistererOptions = {
       expires: 10
     }
@@ -201,26 +201,26 @@ export default class UEWebrtc {
      */
     const requestDelegate: Core.OutgoingRequestDelegate = {
       onAccept: (response: Core.IncomingResponse): void => {
-        console.log('onAccept.....', response)
+        // console.log('onAccept.....', response)
       },
       onProgress: (response: Core.IncomingResponse): void => {
-        console.log('onProgress.....', response)
+        // console.log('onProgress.....', response)
       },
       onRedirect: (response: Core.IncomingResponse): void => {
-        console.log('onRedirect.....', response)
+        // console.log('onRedirect.....', response)
       },
       onReject: (response: Core.IncomingResponse): void => {
-        console.log('onReject.....', response)
+        // console.log('onReject.....', response)
       },
       onTrying: (response: Core.IncomingResponse): void => {
-        console.log('onTrying.....', response)
+        // console.log('onTrying.....', response)
       }
     }
 
     const registererRegisterOptions: RegistererRegisterOptions = {
       requestDelegate
     }
-    console.log(registererRegisterOptions, 'registererRegisterOptions===')
+    // console.log(registererRegisterOptions, 'registererRegisterOptions===')
     this.registerHandle(registererRegisterOptions)
   }