yjz-web-sdk 1.0.4-beta.5 → 1.0.4-beta.6

package/lib/core/groupctrl/GroupControllerManager.d.ts

@@ -10,6 +10,16 @@ export declare class GroupControllerManager extends EventEmitter {
     private loopManager;
     constructor(interval?: number, visibility?: VisibilityManager);
     startControl(configMap: Map<string, WebRTCConfigOptions>): void;
+    switchToMain(targetRoomId: string): void;
+    /**
+     * 找到当前主控config, 设置为从控
+     */
+    clearCurrentControl(): string | undefined;
+    /**
+     * 找到目标config, 设置为主控
+     * @param roomId
+     */
+    setAsControl(roomId: string): string | undefined;
     stopControl(): void;
     private addController;
     getConfigs(): Map<string, WebRTCConfigOptions>;

package/lib/yjz-web-sdk.js

@@ -3711,8 +3711,8 @@ class WebRTCSdk extends EventEmitter {
   }
   /** 停止连接，并发送退出信令 */
   stop() {
-    this.webRTCClient.closeConnection();
     this.sendSignOut();
+    this.webRTCClient.closeConnection();
     this.removeAllListeners();
   }
   /** 开始推流：触发媒体采集与轨道添加 */
@@ -4051,6 +4051,49 @@ class GroupControllerManager extends EventEmitter {
     this.configs.forEach((cfg) => this.addController(cfg));
     this.loopManager.start();
   }
+  switchToMain(targetRoomId) {
+    const oldControlId = this.clearCurrentControl();
+    const newControlId = this.setAsControl(targetRoomId);
+    if (oldControlId === newControlId) {
+      console.log("targetRoomId当前就是主控, 不需要切换");
+      return;
+    }
+    if (oldControlId && newControlId) {
+      this.refreshController(oldControlId);
+      this.refreshController(newControlId);
+    }
+  }
+  /**
+   * 找到当前主控config, 设置为从控
+   */
+  clearCurrentControl() {
+    for (const [roomId, config] of this.configs.entries()) {
+      if (config.isControl) {
+        this.configs.set(roomId, {
+          ...config,
+          isControl: false
+        });
+        return roomId;
+      }
+    }
+    return void 0;
+  }
+  /**
+   * 找到目标config, 设置为主控
+   * @param roomId
+   */
+  setAsControl(roomId) {
+    for (const [id, config] of this.configs.entries()) {
+      if (id === roomId) {
+        this.configs.set(id, {
+          ...config,
+          isControl: true
+        });
+        return id;
+      }
+    }
+    return void 0;
+  }
   stopControl() {
     this.controllers.forEach((c) => {
       c.removeAllListeners();
@@ -4123,9 +4166,11 @@ class GroupControllerManager extends EventEmitter {
     try {
       const changes = this.visibility.getChanges();
       changes.forEach(({ viewId, nowVisible, wasVisible }) => {
+        var _a;
         const sdk = this.controllers.get(viewId);
         if (!sdk) return;
-        if (nowVisible) sdk.requestScreenshot(true);
+        const isMain = (_a = this.configs.get(viewId)) == null ? void 0 : _a.isControl;
+        if (nowVisible && !isMain) sdk.requestScreenshot(true);
         else if (wasVisible && !nowVisible) sdk.requestScreenshot(false);
       });
     } catch (err) {

package/lib/yjz-web-sdk.umd.cjs

@@ -83,7 +83,7 @@ r(this,"sendAnswer",(e=>{if(e&&e.length>0){const t={type:p.Answer,identity:p.Ide
 /** 发送 ICE 候选信息 */
 r(this,"sendICEMessage",(e=>{if(e&&e.length>0){const t={type:p.IceCandidates,identity:p.Identity,roomId:this.config.roomId,senderId:this.config.myId,targetId:this.config.targetId,ice:e};this.signalingClient.sendMessage(JSON.stringify(t))}})),this.config=new Te(e),this.signalingClient=new C(this.config),this.webRTCClient=new Le(this.config),this.signalingClient.on(m.signalMessage,(e=>this.handleSignaling(e))),this.signalingClient.on(m.webrtcError,(e=>{this.emit(m.webrtcError,e)})),this.webRTCClient.on(m.sendOffer,(e=>this.sendOffer(e))),this.webRTCClient.on(m.sendAnswer,(e=>this.sendAnswer(e))),this.webRTCClient.on(m.sendICEMessage,(e=>this.sendICEMessage(e))),this.webRTCClient.on(m.streamTrack,(e=>this.emit(m.streamTrack,e))),this.webRTCClient.on(m.iceConnectionState,(e=>this.emit(m.iceConnectionState,e))),this.webRTCClient.on(m.cloudStatusChanged,(e=>this.emit(m.cloudStatusChanged,e))),this.webRTCClient.on(m.cloudClipData,(e=>this.emit(m.cloudClipData,e))),this.webRTCClient.on(m.webrtcError,(e=>{this.emit(m.webrtcError,e)})),this.webRTCClient.on(m.statisticInfo,(e=>{this.emit(m.statisticInfo,e)}))}
 /** 开始连接 signal 服务 */startConnection(){this.signalingClient.start()}
-/** 停止连接，并发送退出信令 */stop(){this.webRTCClient.closeConnection(),this.sendSignOut(),this.removeAllListeners()}
+/** 停止连接，并发送退出信令 */stop(){this.sendSignOut(),this.webRTCClient.closeConnection(),this.removeAllListeners()}
 /** 开始推流：触发媒体采集与轨道添加 */async startPush(){}
 /** 发送信道数据 */sendChannelData(e,t){this.webRTCClient.sendChannelData(e,t)}sendControlEvent(e){const t=new Me(e,0);this.webRTCClient.sendChannelData(Ee.ActionInput,t)}sendRequestScreenshot(e){this.signalingClient.sendRequestScreenshot(e)}sendPong(){const e={type:p.Pong},t=JSON.stringify(e);this.signalingClient.sendMessage(t)}sendSignOut(){const e={type:p.SignOut,identity:p.Identity,roomId:this.config.roomId,myId:this.config.myId};this.signalingClient.sendMessage(JSON.stringify(e))}}const je={
 // 数字键
@@ -119,6 +119,13 @@ Insert:124,Delete:112,Home:122,End:123,PageUp:92,PageDown:93,ScrollLock:116,Paus
 (...e)=>t.unref(A)&&t.unref(A)(...e)),onPointerup:n[6]||(n[6]=//@ts-ignore
 (...e)=>t.unref(I)&&t.unref(I)(...e)),onPointerleave:n[7]||(n[7]=//@ts-ignore
 (...e)=>t.unref(O)&&t.unref(O)(...e)),onWheel:n[8]||(n[8]=//@ts-ignore
-(...e)=>t.unref(M)&&t.unref(M)(...e)),style:t.normalizeStyle({backgroundColor:`${t.unref(p)}`}),autoplay:"",playsinline:"",muted:"",disablePictureInPicture:!0},null,38)],36)],512))}}),[["__scopeId","data-v-50ed9974"]]);e.ActionCommandType=ke,e.ActionType=_e,e.ChannelDataType=Ee,e.ContainerDirection=De,e.EmitType=m,e.GestureData=class{constructor(e){r(this,"mode"),this.mode=e}},e.GroupControllerManager=class extends d{constructor(e=1e3,t=new Ke){super(),r(this,"configs",new Map),r(this,"controllers",new Map),r(this,"visibility"),r(this,"loopManager"),this.visibility=t,this.loopManager=new We(e,(()=>this.handleLoop()))}startControl(e){if(!e.size)throw new Error("配置为空");if(1!==Array.from(e.values()).filter((e=>e.isControl)).length)throw new Error("必须且仅有一个主控");this.configs=new Map(e),this.configs.forEach((e=>this.addController(e))),this.loopManager.start()}stopControl(){this.controllers.forEach((e=>{e.removeAllListeners(),e.stop()})),this.controllers.clear(),this.configs.clear(),this.visibility.clear(),this.loopManager.stop(),this.removeAllListeners()}addController(e){const t=new Je(e);t.on(m.streamTrack,(e=>{this.emit(m.streamTrack,e)})),t.on(m.iceConnectionState,((e,t)=>{this.emit(m.iceConnectionState,e,t)})),t.on(m.cloudStatusChanged,(e=>{this.emit(m.cloudStatusChanged,e)})),t.on(m.webrtcError,((e,t)=>{this.emit(m.webrtcError,e,t)})),t.on(m.screenshot,((e,t)=>{this.emit(m.screenshot,e,t)})),t.start(),this.controllers.set(e.roomId,t)}getConfigs(){return new Map(this.configs)}
+(...e)=>t.unref(M)&&t.unref(M)(...e)),style:t.normalizeStyle({backgroundColor:`${t.unref(p)}`}),autoplay:"",playsinline:"",muted:"",disablePictureInPicture:!0},null,38)],36)],512))}}),[["__scopeId","data-v-50ed9974"]]);e.ActionCommandType=ke,e.ActionType=_e,e.ChannelDataType=Ee,e.ContainerDirection=De,e.EmitType=m,e.GestureData=class{constructor(e){r(this,"mode"),this.mode=e}},e.GroupControllerManager=class extends d{constructor(e=1e3,t=new Ke){super(),r(this,"configs",new Map),r(this,"controllers",new Map),r(this,"visibility"),r(this,"loopManager"),this.visibility=t,this.loopManager=new We(e,(()=>this.handleLoop()))}startControl(e){if(!e.size)throw new Error("配置为空");if(1!==Array.from(e.values()).filter((e=>e.isControl)).length)throw new Error("必须且仅有一个主控");this.configs=new Map(e),this.configs.forEach((e=>this.addController(e))),this.loopManager.start()}switchToMain(e){const t=this.clearCurrentControl(),n=this.setAsControl(e);t!==n&&t&&n&&(this.refreshController(t),this.refreshController(n))}
+/**
+     * 找到当前主控config, 设置为从控
+     */clearCurrentControl(){for(const[e,t]of this.configs.entries())if(t.isControl)return this.configs.set(e,{...t,isControl:!1}),e}
+/**
+     * 找到目标config, 设置为主控
+     * @param roomId
+     */setAsControl(e){for(const[t,n]of this.configs.entries())if(t===e)return this.configs.set(t,{...n,isControl:!0}),t}stopControl(){this.controllers.forEach((e=>{e.removeAllListeners(),e.stop()})),this.controllers.clear(),this.configs.clear(),this.visibility.clear(),this.loopManager.stop(),this.removeAllListeners()}addController(e){const t=new Je(e);t.on(m.streamTrack,(e=>{this.emit(m.streamTrack,e)})),t.on(m.iceConnectionState,((e,t)=>{this.emit(m.iceConnectionState,e,t)})),t.on(m.cloudStatusChanged,(e=>{this.emit(m.cloudStatusChanged,e)})),t.on(m.webrtcError,((e,t)=>{this.emit(m.webrtcError,e,t)})),t.on(m.screenshot,((e,t)=>{this.emit(m.screenshot,e,t)})),t.start(),this.controllers.set(e.roomId,t)}getConfigs(){return new Map(this.configs)}
 // 🔥 新增：暴露拿单个 controller
-getController(e){return this.controllers.get(e)}refreshController(e){const t=this.configs.get(e);if(!t)throw new Error(`未找到配置项: ${e}`);const n=this.controllers.get(e);n&&(n.removeAllListeners(),n.stop(),this.controllers.delete(e)),this.addController(t)}updateProperty(e,t,n){const r=this.configs.get(e);if(!r)throw new Error(`未找到 ${e}`);r[t]=n}setVisibility(e,t){this.visibility.set(e,t)}setViewIds(e,t){this.visibility.setViewIds(e,t)}sendData(e,t){this.controllers.forEach((n=>n.sendData(e,t)))}sendControlEvent(e){this.controllers.forEach((t=>t.sendControlData(e)))}handleLoop(){try{this.visibility.getChanges().forEach((({viewId:e,nowVisible:t,wasVisible:n})=>{const r=this.controllers.get(e);r&&(t?r.requestScreenshot(!0):n&&!t&&r.requestScreenshot(!1))}))}catch(e){}}},e.InputData=class{constructor(e){r(this,"text"),this.text=e}},e.KeyEventData=Me,e.RemotePlayer=Ge,e.TouchData=Ie,e.WebRTCSdk=Ne,e.WheelData=Oe,e.getKeyEventData=Ue,e.transformCoordinate=Fe,e.valueToPercentage=ze,Object.defineProperty(e,Symbol.toStringTag,{value:"Module"})}));
+getController(e){return this.controllers.get(e)}refreshController(e){const t=this.configs.get(e);if(!t)throw new Error(`未找到配置项: ${e}`);const n=this.controllers.get(e);n&&(n.removeAllListeners(),n.stop(),this.controllers.delete(e)),this.addController(t)}updateProperty(e,t,n){const r=this.configs.get(e);if(!r)throw new Error(`未找到 ${e}`);r[t]=n}setVisibility(e,t){this.visibility.set(e,t)}setViewIds(e,t){this.visibility.setViewIds(e,t)}sendData(e,t){this.controllers.forEach((n=>n.sendData(e,t)))}sendControlEvent(e){this.controllers.forEach((t=>t.sendControlData(e)))}handleLoop(){try{this.visibility.getChanges().forEach((({viewId:e,nowVisible:t,wasVisible:n})=>{var r;const i=this.controllers.get(e);if(!i)return;const o=null==(r=this.configs.get(e))?void 0:r.isControl;t&&!o?i.requestScreenshot(!0):n&&!t&&i.requestScreenshot(!1)}))}catch(e){}}},e.InputData=class{constructor(e){r(this,"text"),this.text=e}},e.KeyEventData=Me,e.RemotePlayer=Ge,e.TouchData=Ie,e.WebRTCSdk=Ne,e.WheelData=Oe,e.getKeyEventData=Ue,e.transformCoordinate=Fe,e.valueToPercentage=ze,Object.defineProperty(e,Symbol.toStringTag,{value:"Module"})}));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "yjz-web-sdk",
   "private": false,
-  "version": "1.0.4-beta.5",
+  "version": "1.0.4-beta.6",
   "type": "module",
   "description": "针对于亚矩阵项目的云手机投屏和屏幕控制",
   "license": "Apache-2.0",