sample-xmonitor-js 1.0.0 → 1.0.2

package/lib/Monitor.d.ts

@@ -34,9 +34,9 @@ export declare class ScreenTypeError extends Error {
     readonly code: string;
     constructor(message: any, code?: any);
 }
-export type Device = 'screen' | 'camera';
+export type Device = 'screen' | 'camera' | 'mobile';
 export type Provider = 'default' | 'txrtc';
-export type DeviceProvider = 'default:screen' | 'default:camera' | 'txrtc:screen' | 'txrtc:camera';
+export type DeviceProvider = 'default:screen' | 'default:camera' | 'default:mobile' | 'txrtc:screen' | 'txrtc:camera' | 'txrtc:mobile';
 export declare class MonitorType {
     readonly provider: Provider;
     readonly device: Device;

package/lib/default/index.js

@@ -102,7 +102,7 @@ export default class DefaultMonitor extends Monitor {
         if (device === 'screen') {
             return new DefaultScreenMonitor(object, element, setup);
         }
-        else if (device === 'camera') {
+        else if (device === 'camera' || device === 'mobile') {
             return new DefaultCameraMonitor(object, element, setup);
         }
         throw new NotSupportError(`Device ${device} not support`, 'NotSupportError');

package/lib/index.d.ts

@@ -41,6 +41,6 @@ export declare function getInstance(options?: {
     monitors: Array<{
         provider: DeviceProvider;
         element: any;
-        setup?: DefaultSetup | Omit<TxrtcSetup, 'roomId' | 'userId'>;
+        setup?: DefaultSetup | TxrtcSetup;
     }>;
 }): MonitorFactory;

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;
@@ -86,7 +86,7 @@ export default class TxrtcMonitor extends Monitor {
         if (device === 'screen') {
             return new TxrtcScreenMonitor(object, element, setup);
         }
-        else if (device === 'camera') {
+        else if (device === 'camera' || device === 'mobile') {
             return new TxrtcCameraMonitor(object, element, setup);
         }
         throw new NotSupportError(`Device ${device} not support`, 'NotSupportError');
@@ -97,8 +97,8 @@ 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
             }
         });
     }
@@ -117,8 +117,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
             }
         });
     }

package/package.json

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