ue-softphone-sdk 2.2.5 → 2.2.6

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "ue-softphone-sdk",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "ue-softphone-sdk",
   "main": "dist/ue-softphone-sdk.js",
+  "types": "dist/types/index.d.ts",
   "scripts": {
     "build": "rollup -c --bundleConfigAsCjs",
-    "build:js": "rollup -c new-rollup.config.mjs",
+    "build:js": "rollup -c rollup-new.config.mjs",
     "dev": "rollup -c -w --bundleConfigAsCjs"
   },
   "keywords": [],
   "author": "useasy",
   "license": "MIT",
   "dependencies": {
-    "socket.io-client": "^4.6.1",
     "js-base64": "^3.7.2",
     "js-md5": "^0.7.3",
-    "jsencrypt": "^3.2.1"
+    "jsencrypt": "^3.2.1",
+    "ue-webrtc": "^1.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.5",
@@ -23,8 +24,6 @@
     "@rollup/plugin-babel": "^6.0.3",
     "@types/node": "^20.3.3",
     "rollup": "^3.26.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.35.0",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.1.0",

package/{new-rollup.config.mjs → rollup-new.config.mjs}

@@ -6,7 +6,7 @@ import commonjs from "@rollup/plugin-commonjs";
 import nodePolyfills from "rollup-plugin-polyfill-node";
 
 export default {
-  input: "src/new-index.ts",
+  input: "src/index.ts",
   output: [
     {
       name: "ueSoftphone",

package/rollup.config.js

@@ -3,32 +3,31 @@
  * @Date: 2023-07-02 11:46:31
  * @LastEditors: cuixuecheng
  * @LastEditTime: 2023-07-02 12:24:46
- * @Description: 
+ * @Description:
  */
-import typescript from 'rollup-plugin-typescript2';
-import babel from '@rollup/plugin-babel';
-import { terser } from 'rollup-plugin-terser';
+import babel from "@rollup/plugin-babel";
+import terser from "@rollup/plugin-terser";
+import typescript from "@rollup/plugin-typescript";
 
-const extensions = ['.js', '.ts'];
+const extensions = [".js", ".ts"];
 
 export default {
-  input: 'src/index.ts',
+  input: "src/index.ts",
   output: {
-    file: 'dist/ue-softphone-sdk.js',
-    format: 'es',
-    name: 'ueSoftphone',
-    sourcemap: true
+    file: "dist/ue-softphone-sdk.js",
+    format: "es",
+    name: "ueSoftphone"
   },
   watch: {
-    include: 'src/**',
+    include: "src/**"
   },
   plugins: [
     typescript(),
     babel({
       extensions,
-      babelHelpers: 'bundled',
-      exclude: 'node_modules/**',
+      babelHelpers: "bundled",
+      exclude: "node_modules/**"
     }),
-    terser(),
-  ],
+    terser()
+  ]
 };

package/src/index.ts

@@ -10,9 +10,9 @@
 /**package.json 版本号 */
 // @ts-ignore: Unreachable code error
 // import { Parameters } from './grammar/parameters.js'
-import io from "socket.io-client";
-import WebPhoneSdk from "./webPhoneSdk";
+import io from "./lib/socket.io.esm.min.js";
 import { AUDIO_FORBIDDEN, DENIED, NOT_OPEN_AUDIO } from "./config";
+import { UeWebrtc } from "ue-webrtc";
 
 import { Base64 } from "js-base64";
 import md5 from "js-md5";
@@ -104,7 +104,7 @@ interface MuteOrUnMuteParams {
   fail?: Function;
 }
 interface TransferParams {
-  mode: String;
+  type: String;
   number: String;
   agentNumber?: String;
   success?: Function;
@@ -158,7 +158,6 @@ interface consultParams {
   fail?: Function;
 }
 interface cancleConsultParams {
-  agentNumber: String;
   success?: Function;
   fail?: Function;
 }
@@ -167,18 +166,15 @@ interface stopConsultParams {
   fail?: Function;
 }
 interface resumeConsultParams {
-  agentNumber: String;
   success?: Function;
   fail?: Function;
 }
 interface consultTransferParams {
-  agentNumber: String;
   success?: Function;
   fail?: Function;
 }
 
 interface threeWayCallParams {
-  agentNumber: String;
   success?: Function;
   fail?: Function;
 }
@@ -499,6 +495,7 @@ export default class ueSoftphone {
     callbacks.error = typeof callbacks.error == "function" ? callbacks.error : ueSoftphone.noop;
     callbacks.message =
       typeof callbacks.message == "function" ? callbacks.message : ueSoftphone.noop;
+    callbacks.event = typeof callbacks.event == "function" ? callbacks.event : ueSoftphone.noop;
     callbacks.server =
       callbacks.serve === null || callbacks.serve === undefined
         ? "ws://152.136.72.209:3201/phoneBarGateway"
@@ -511,6 +508,7 @@ export default class ueSoftphone {
     this.Socketinstance = ueSoftphone.newWebSocket(callbacks.server, callbacks.SocketOptions);
     this.Socketinstance.on("connect", () => {
       callbacks.success("connect event serve success!");
+      callbacks.suc();
       // (ueSoftphone.initOptions.success as Function)({
       //   agentNumber: ueSoftphone.agentInfo.agentNumber,
       //   agentName: ueSoftphone.agentInfo.agentName,
@@ -548,11 +546,10 @@ export default class ueSoftphone {
       if (event.subType === "KICK_OFF") {
         this.Socketinstance.disconnect();
         try {
-          WebPhoneSdk.disconnect();
+          ueSoftphone.webPhone.disconnect();
         } catch (error) {}
-        callbacks.error({
-          type: "accountError",
-          error: "您的账号在其他网页登录"
+        callbacks.event({
+          message: "坐席账户在其他地方登录"
         });
       }
     });
@@ -605,7 +602,7 @@ export default class ueSoftphone {
     loginType: string,
     options: any,
     userOptions: any,
-    success
+    suc: any
   ) => {
     if (this.attachEventCallbacks) {
       // 每次创建链接的时候，要获取最新的ws token
@@ -641,7 +638,7 @@ export default class ueSoftphone {
               transports: ["websocket"],
               timeout: 5000
             };
-            this.attachEventCallbacks.success = success;
+            this.attachEventCallbacks.suc = suc;
             ueSoftphone.createEventHandle(this.attachEventCallbacks);
           }
         },
@@ -746,15 +743,18 @@ export default class ueSoftphone {
   }
 
   // webrtc事件回调
-  private static initWebrtcEvent = (extras: any) => {
-    ueSoftphone.webPhone = new WebPhoneSdk({
+  private static initWebrtcEvent = async (extras: any) => {
+    ueSoftphone.webPhone = new UeWebrtc({
       server: extras.wssUrl,
       sip: extras.sip,
       secret: extras.password
     });
-    ueSoftphone.webPhone.message = (res: any) => {
-      console.log(res);
-    };
+
+    // Connect to server
+    await this.webPhone.connect();
+
+    // Register to receive inbound calls
+    this.webPhone.register();
   };
   // 若是webrtc的模式，会检测权限，弹窗让客户授权
   private openMediaAudio = (failMsg: string, hasAlert: boolean) => {
@@ -1118,10 +1118,10 @@ export default class ueSoftphone {
           });
           return;
         }
-        if (params.mode === null || params.mode === undefined) {
+        if (params.type === null || params.type === undefined) {
           params.fail({
             success: false,
-            message: "Parameter mode is required!"
+            message: "Parameter type is required!"
           });
           return;
         } else if (params.number === null || params.number === undefined) {
@@ -1247,13 +1247,6 @@ export default class ueSoftphone {
           });
           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;
 
@@ -1352,13 +1345,6 @@ export default class ueSoftphone {
           });
           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;
 
@@ -1408,13 +1394,6 @@ export default class ueSoftphone {
           });
           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;
 
@@ -1464,13 +1443,6 @@ export default class ueSoftphone {
           });
           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;
 
@@ -1831,7 +1803,7 @@ export default class ueSoftphone {
               if (params) {
                 ueSoftphone.Socketinstance.disconnect();
                 if (ueSoftphone.agentInfo.loginType === "WEBRTC") {
-                  WebPhoneSdk.disconnect();
+                  ueSoftphone.webPhone.disconnect();
                 }
                 (params.success as Function)({
                   success: true
@@ -2027,7 +1999,7 @@ export default class ueSoftphone {
     return {
       // 接听
       accept() {
-        WebPhoneSdk.accept();
+        ueSoftphone.webPhone.accept();
       },
       // 注册设备，链接webrtc
       connect() {
@@ -2038,16 +2010,16 @@ export default class ueSoftphone {
       // 注销设备，跟webrtc断开链接
       disconnect() {
         if (ueSoftphone.webPhone && this.isConnected()) {
-          WebPhoneSdk.disconnect();
+          ueSoftphone.webPhone.disconnect();
         }
       },
       // 检测设备是否有链接上
       isConnected() {
-        return WebPhoneSdk.isConnected();
+        return ueSoftphone.webPhone.isConnected();
       },
       // 发送DTMF 可与demo中的软电话拨号盘结合使用
       sendDTMF(tone: string) {
-        WebPhoneSdk.sendDTMF(tone);
+        ueSoftphone.webPhone.sendDTMF(tone);
       }
     };
   };
@@ -2056,6 +2028,9 @@ export default class ueSoftphone {
 class ueWebsocket {
   private ws: any;
   constructor(server: string, proto: any) {
+    delete proto.path;
+    delete proto.hostname;
+    delete proto.port;
     //@ts-ignore
     this.ws = io.connect(`wss://${server}`, proto);
   }

package/tsconfig.json

@@ -1,37 +1,21 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "outDir": "./dist/",// 打包到的目录
-    "sourceMap": false,// 是否生成sourceMap（用于浏览器调试）
+    "outDir": "./dist/", // 打包到的目录
+    "sourceMap": false, // 是否生成sourceMap（用于浏览器调试）
     "noImplicitAny": false,
     "noUnusedLocals": false,
     "noUnusedParameters": false,
-    "declaration": true,// 是否生成声明文件
-    "declarationDir": "./dist/types/",// 声明文件打包的位置
-    "declarationMap": false,// 是否生成声明文件map文件（便于调试）
+    "declaration": true, // 是否生成声明文件
+    "declarationDir": "dist/types", // 声明文件打包的位置
+    "declarationMap": false, // 是否生成声明文件map文件（便于调试）
     "moduleResolution": "node",
     "module": "esnext",
-    "target": "es5",// 转化成的目标语言
+    "target": "es5", // 转化成的目标语言
     "baseUrl": "./",
-    "types": [
-      "node"
-    ],
-    "typeRoots": [
-      "./node_modules/@types"
-    ],
-    "lib": [
-      "dom",
-      "es2015"
-    ],
-    "jsx": "react",
+    "lib": ["dom", "ES2020"],
     "allowJs": false
   },
-  "include": [
-    "src/**/*.ts",
-    "typings.d.ts",
-  ],// 要打包的文件
-  "exclude": [
-    "node_modules",
-    "*.test.ts"
-  ]
-}
+  "include": ["src/**/*.ts", "typings.d.ts"], // 要打包的文件
+  "exclude": ["node_modules", "*.test.ts"]
+}

package/dist/api/bye.d.ts

@@ -1,16 +0,0 @@
-import { IncomingByeRequest, IncomingRequestMessage, ResponseOptions } from "../core";
-/**
- * A request to end a {@link Session} (incoming BYE).
- * @public
- */
-export declare class Bye {
-    private incomingByeRequest;
-    /** @internal */
-    constructor(incomingByeRequest: IncomingByeRequest);
-    /** Incoming BYE request message. */
-    get request(): IncomingRequestMessage;
-    /** Accept the request. */
-    accept(options?: ResponseOptions): Promise<void>;
-    /** Reject the request. */
-    reject(options?: ResponseOptions): Promise<void>;
-}

package/dist/api/dtmf.d.ts

@@ -1,15 +0,0 @@
-import { IncomingInfoRequest } from "../core";
-import { Info } from "./info";
-/**
- * A DTMF signal (incoming INFO).
- * @deprecated Use `Info`.
- * @internal
- */
-export declare class DTMF extends Info {
-    private _tone;
-    private _duration;
-    /** @internal */
-    constructor(incomingInfoRequest: IncomingInfoRequest, tone: string, duration: number);
-    get tone(): string;
-    get duration(): number;
-}

package/dist/api/emitter.d.ts

@@ -1,88 +0,0 @@
-/**
- * Generic observable.
- * @public
- */
-export interface Emitter<T> {
-    /**
-     * Sets up a function that will be called whenever the target changes.
-     * @param listener - Callback function.
-     * @param options - An options object that specifies characteristics about the listener.
-     *                  If once true, indicates that the listener should be invoked at most once after being added.
-     *                  If once true, the listener would be automatically removed when invoked.
-     */
-    addListener(listener: (data: T) => void, options?: {
-        once?: boolean;
-    }): void;
-    /**
-     * Removes from the listener previously registered with addListener.
-     * @param listener - Callback function.
-     */
-    removeListener(listener: (data: T) => void): void;
-    /**
-     * Registers a listener.
-     * @param listener - Callback function.
-     * @deprecated Use addListener.
-     */
-    on(listener: (data: T) => void): void;
-    /**
-     * Unregisters a listener.
-     * @param listener - Callback function.
-     * @deprecated Use removeListener.
-     */
-    off(listener: (data: T) => void): void;
-    /**
-     * Registers a listener then unregisters the listener after one event emission.
-     * @param listener - Callback function.
-     * @deprecated Use addListener.
-     */
-    once(listener: (data: T) => void): void;
-}
-/**
- * An {@link Emitter} implementation.
- * @internal
- */
-export declare class EmitterImpl<T> implements Emitter<T> {
-    private listeners;
-    /**
-     * Sets up a function that will be called whenever the target changes.
-     * @param listener - Callback function.
-     * @param options - An options object that specifies characteristics about the listener.
-     *                  If once true, indicates that the listener should be invoked at most once after being added.
-     *                  If once true, the listener would be automatically removed when invoked.
-     */
-    addListener(listener: (data: T) => void, options?: {
-        once?: boolean;
-    }): void;
-    /**
-     * Emit change.
-     * @param data - Data to emit.
-     */
-    emit(data: T): void;
-    /**
-     * Removes all listeners previously registered with addListener.
-     */
-    removeAllListeners(): void;
-    /**
-     * Removes a listener previously registered with addListener.
-     * @param listener - Callback function.
-     */
-    removeListener(listener: (data: T) => void): void;
-    /**
-     * Registers a listener.
-     * @param listener - Callback function.
-     * @deprecated Use addListener.
-     */
-    on(listener: (data: T) => void): void;
-    /**
-     * Unregisters a listener.
-     * @param listener - Callback function.
-     * @deprecated Use removeListener.
-     */
-    off(listener: (data: T) => void): void;
-    /**
-     * Registers a listener then unregisters the listener after one event emission.
-     * @param listener - Callback function.
-     * @deprecated Use addListener.
-     */
-    once(listener: (data: T) => void): void;
-}

package/dist/api/exceptions/content-type-unsupported.d.ts

@@ -1,8 +0,0 @@
-import { Exception } from "../../core";
-/**
- * An exception indicating an unsupported content type prevented execution.
- * @public
- */
-export declare class ContentTypeUnsupportedError extends Exception {
-    constructor(message?: string);
-}

package/dist/api/exceptions/index.d.ts

@@ -1,5 +0,0 @@
-export * from "./content-type-unsupported";
-export * from "./request-pending";
-export * from "./session-description-handler";
-export * from "./session-terminated";
-export * from "./state-transition";

package/dist/api/exceptions/request-pending.d.ts

@@ -1,9 +0,0 @@
-import { Exception } from "../../core";
-/**
- * An exception indicating an outstanding prior request prevented execution.
- * @public
- */
-export declare class RequestPendingError extends Exception {
-    /** @internal */
-    constructor(message?: string);
-}

package/dist/api/exceptions/session-description-handler.d.ts

@@ -1,8 +0,0 @@
-import { Exception } from "../../core";
-/**
- * An exception indicating a session description handler error occured.
- * @public
- */
-export declare class SessionDescriptionHandlerError extends Exception {
-    constructor(message?: string);
-}

package/dist/api/exceptions/session-terminated.d.ts

@@ -1,8 +0,0 @@
-import { Exception } from "../../core";
-/**
- * An exception indicating the session terminated before the action completed.
- * @public
- */
-export declare class SessionTerminatedError extends Exception {
-    constructor();
-}

package/dist/api/exceptions/state-transition.d.ts

@@ -1,8 +0,0 @@
-import { Exception } from "../../core";
-/**
- * An exception indicating an invalid state transition error occured.
- * @public
- */
-export declare class StateTransitionError extends Exception {
-    constructor(message?: string);
-}

package/dist/api/index.d.ts

@@ -1,58 +0,0 @@
-/**
- * A simple yet powerful API which takes care of SIP signaling and WebRTC media sessions for you.
- * @packageDocumentation
- */
-export * from "./exceptions";
-export * from "./bye";
-export * from "./emitter";
-export * from "./info";
-export * from "./invitation-accept-options";
-export * from "./invitation-progress-options";
-export * from "./invitation-reject-options";
-export * from "./invitation";
-export * from "./inviter-cancel-options";
-export * from "./inviter-invite-options";
-export * from "./inviter-options";
-export * from "./inviter";
-export * from "./message";
-export * from "./messager-message-options";
-export * from "./messager-options";
-export * from "./messager";
-export * from "./notification";
-export * from "./publisher-options";
-export * from "./publisher-publish-options";
-export * from "./publisher-state";
-export * from "./publisher-unpublish-options";
-export * from "./publisher";
-export * from "./referral";
-export * from "./registerer-options";
-export * from "./registerer-register-options";
-export * from "./registerer-state";
-export * from "./registerer-unregister-options";
-export * from "./registerer";
-export * from "./session-bye-options";
-export * from "./session-delegate";
-export * from "./session-description-handler-factory";
-export * from "./session-description-handler";
-export * from "./session-info-options";
-export * from "./session-invite-options";
-export * from "./session-message-options";
-export * from "./session-options";
-export * from "./session-refer-options";
-export * from "./session-state";
-export * from "./session";
-export * from "./subscriber-options";
-export * from "./subscriber-subscribe-options";
-export * from "./subscriber";
-export * from "./subscription-delegate";
-export * from "./subscription-options";
-export * from "./subscription-state";
-export * from "./subscription-subscribe-options";
-export * from "./subscription-unsubscribe-options";
-export * from "./subscription";
-export * from "./transport";
-export * from "./transport-state";
-export * from "./user-agent-delegate";
-export * from "./user-agent-options";
-export * from "./user-agent-state";
-export * from "./user-agent";

package/dist/api/info.d.ts

@@ -1,16 +0,0 @@
-import { IncomingInfoRequest, IncomingRequestMessage, ResponseOptions } from "../core";
-/**
- * An exchange of information (incoming INFO).
- * @public
- */
-export declare class Info {
-    private incomingInfoRequest;
-    /** @internal */
-    constructor(incomingInfoRequest: IncomingInfoRequest);
-    /** Incoming MESSAGE request message. */
-    get request(): IncomingRequestMessage;
-    /** Accept the request. */
-    accept(options?: ResponseOptions): Promise<void>;
-    /** Reject the request. */
-    reject(options?: ResponseOptions): Promise<void>;
-}

package/dist/api/invitation-accept-options.d.ts

@@ -1,19 +0,0 @@
-import { SessionDescriptionHandlerModifier, SessionDescriptionHandlerOptions } from "./session-description-handler";
-/**
- * Options for {@link Invitation.accept}.
- * @public
- */
-export interface InvitationAcceptOptions {
-    /**
-     * Array of extra headers added to the response.
-     */
-    extraHeaders?: Array<string>;
-    /**
-     * Modifiers to pass to SessionDescriptionHandler during the initial INVITE transaction.
-     */
-    sessionDescriptionHandlerModifiers?: Array<SessionDescriptionHandlerModifier>;
-    /**
-     * Options to pass to SessionDescriptionHandler during the initial INVITE transaction.
-     */
-    sessionDescriptionHandlerOptions?: SessionDescriptionHandlerOptions;
-}