sample-xmonitor-js 1.0.1 → 1.0.3

package/lib/index.d.ts

@@ -22,6 +22,11 @@ export default class MonitorFactory {
      * @param {any} setup 监视器相关的参数
      */
     init(type: MonitorType, element: HTMLDivElement, setup?: Setup): Promise<Monitor>;
+    switch(option: {
+        deviceId?: string;
+        useFrontCamera?: boolean;
+        [key: string]: any;
+    }): Promise<void>;
     /**
      * 启动所有监视器
      */
@@ -41,6 +46,16 @@ export declare function getInstance(options?: {
     monitors: Array<{
         provider: DeviceProvider;
         element: any;
-        setup?: DefaultSetup | Omit<TxrtcSetup, 'roomId' | 'userId'>;
+        setup?: DefaultSetup | TxrtcSetup;
     }>;
 }): MonitorFactory;
+export declare function switchCamera(option: {
+    deviceId?: string;
+    useFrontCamera?: boolean;
+    [key: string]: any;
+}): void;
+export declare function getSpeakerList(requestPermission?: boolean): Promise<MediaDeviceInfo[]>;
+export declare function setCurrentSpeaker(speakerId: string): Promise<void>;
+export declare function getMicrophoneList(requestPermission?: boolean): Promise<MediaDeviceInfo[]>;
+export declare function getCameraList(requestPermission?: boolean): Promise<MediaDeviceInfo[]>;
+export declare function isSupported(): Promise<any>;

package/lib/index.js

@@ -1,6 +1,7 @@
 import { MObject, MonitorEvents, MonitorType, NotSupportError } from "./Monitor";
 import DefaultMonitor from "./default";
 import TxrtcMonitor from "./txrtc";
+import TRTC from "trtc-sdk-v5";
 export default class MonitorFactory {
     constructor(pointer) {
         this.monitorMap = new Map();
@@ -47,6 +48,14 @@ export default class MonitorFactory {
         this.monitorMap.set(type.toString(), monitor);
         return monitor;
     }
+    async switch(option) {
+        for (let [, monitor] of this.monitorMap) {
+            if (monitor.type.device !== 'screen') {
+                await monitor.switch(option);
+                return;
+            }
+        }
+    }
     /**
      * 启动所有监视器
      */
@@ -113,3 +122,24 @@ export function getInstance(options) {
     }
     return factory;
 }
+export function switchCamera(option) {
+    if (!factory) {
+        throw new Error('实例尚未创建，请先执行初始化');
+    }
+    factory.switch(option);
+}
+export function getSpeakerList(requestPermission) {
+    return TRTC.getSpeakerList(requestPermission);
+}
+export function setCurrentSpeaker(speakerId) {
+    return TRTC.setCurrentSpeaker(speakerId);
+}
+export function getMicrophoneList(requestPermission) {
+    return TRTC.getMicrophoneList(requestPermission);
+}
+export function getCameraList(requestPermission) {
+    return TRTC.getCameraList(requestPermission);
+}
+export function isSupported() {
+    return TRTC.isSupported();
+}

package/lib/txrtc/index.d.ts

@@ -13,7 +13,6 @@ export default class TxrtcMonitor extends Monitor {
     protected readonly setup: TxrtcSetup;
     constructor(options: MonitorOptions);
     start(): Promise<any>;
-    initEvent(): Promise<Boolean>;
     /**
      * 发送自定义消息
      * @param message

package/lib/txrtc/index.js

@@ -12,7 +12,7 @@ export default class TxrtcMonitor extends Monitor {
         }
     }
     async start() {
-        let streamId = `${this.setup.roomId}_${this.setup.userId}_${this.type.device}`;
+        let streamId = `${this.setup.roomId}_${this.setup.userId}`;
         console.debug(`Start ${this.type.device} TxrtcMonitor with streamId ${streamId}`);
         if (this.active)
             return;
@@ -32,39 +32,33 @@ export default class TxrtcMonitor extends Monitor {
         if (this.setup.userDefineRecordId) {
             params.userDefineRecordId = this.setup.userDefineRecordId;
         }
-        await this.trtc.enterRoom(params);
-    }
-    async initEvent() {
-        return new Promise((resolve) => {
-            this.trtc.on(TRTC.EVENT.ERROR, (error) => {
-                let err = error;
-                if (this.options.type.device === 'screen') {
-                    err = new ScreenTypeError(error.message, 'ScreenTypeError');
-                }
-                this.dispatchEvent('error', null, err);
-                this.stop();
-                resolve(false);
-            }).on(TRTC.EVENT.SCREEN_SHARE_STOPPED, () => {
-                this.dispatchEvent('cancel');
-                this.stop();
-            }).on(TRTC.EVENT.TRACK, () => {
-                +this.dispatchEvent('start');
-                this.active = true;
-                this.element = this.options.element.querySelector('video');
-                resolve(true);
-            }).on(TRTC.EVENT.VIDEO_PLAY_STATE_CHANGED, ({ state }) => {
-                if (state === 'STOPPED') {
-                    this.dispatchEvent('stop');
-                }
-                else if (state === 'PLAYING') {
-                    this.dispatchEvent('playing');
-                }
-            }).on(TRTC.EVENT.CUSTOM_MESSAGE, (message) => {
-                let decoder = new TextDecoder('utf-8');
-                let payload = decoder.decode(message.data);
-                this.dispatchEvent('message', payload);
-            });
+        this.trtc.on(TRTC.EVENT.ERROR, (error) => {
+            let err = error;
+            if (this.options.type.device === 'screen') {
+                err = new ScreenTypeError(error.message, 'ScreenTypeError');
+            }
+            this.dispatchEvent('error', null, err);
+            this.stop();
+        }).on(TRTC.EVENT.SCREEN_SHARE_STOPPED, () => {
+            this.dispatchEvent('cancel');
+            this.stop();
+        }).on(TRTC.EVENT.TRACK, () => {
+            this.active = true;
+            this.dispatchEvent('start');
+        }).on(TRTC.EVENT.VIDEO_PLAY_STATE_CHANGED, ({ state }) => {
+            if (state === 'STOPPED') {
+                this.dispatchEvent('stop');
+            }
+            else if (state === 'PLAYING') {
+                this.dispatchEvent('playing');
+            }
+            this.element = this.options.element.querySelector('video');
+        }).on(TRTC.EVENT.CUSTOM_MESSAGE, (message) => {
+            let decoder = new TextDecoder('utf-8');
+            let payload = decoder.decode(message.data);
+            this.dispatchEvent('message', payload);
         });
+        await this.trtc.enterRoom(params);
     }
     /**
      * 发送自定义消息
@@ -97,15 +91,14 @@ export class TxrtcScreenMonitor extends TxrtcMonitor {
         super({
             type: new MonitorType('txrtc', 'screen'), object, element, setup: {
                 ...setup,
-                userId: object.id,
-                roomId: object.room
+                userId: setup?.userId || object.id,
+                roomId: setup?.roomId || object.room
             }
         });
     }
     async start() {
         await super.start();
         await this.trtc.startScreenShare({ publish: true, view: this.options.element });
-        await this.initEvent();
     }
     async stop() {
         await this.trtc.stopScreenShare();
@@ -117,8 +110,8 @@ export class TxrtcCameraMonitor extends TxrtcMonitor {
         super({
             type: new MonitorType('txrtc', 'camera'), element, object, setup: {
                 ...setup,
-                userId: object.id,
-                roomId: object.room
+                userId: setup?.userId || object.id,
+                roomId: setup?.roomId || object.room
             }
         });
     }
@@ -126,14 +119,13 @@ export class TxrtcCameraMonitor extends TxrtcMonitor {
         await super.start();
         await this.trtc.startLocalAudio({ publish: true });
         await this.trtc.startLocalVideo({ publish: true, view: this.options.element });
-        await this.initEvent();
     }
     /**
      * 切换摄像头
      */
     async switch(option) {
         if (option?.cameraId || option?.useFrontCamera) {
-            await this.trtc.updateLocalVideo({ option });
+            await this.trtc.updateLocalVideo({ option, publish: true, view: this.options.element });
         }
     }
     async stop() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sample-xmonitor-js",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "main": "./lib/index",
   "files": [