yjz-web-sdk 1.0.11-beta.7 → 1.0.11-beta.8

package/lib/{ScreenControlUtil-Bf1obwOj.js → ScreenControlUtil-hkrPNY6q.js}

@@ -3306,9 +3306,11 @@ const configPeerConnection = (peerConnection, onICEMessage, onTrack, onConnectSt
     onTrack == null ? void 0 : onTrack(track);
   };
 };
-const setRemoteDescriptionWithHandleAnswer = (peerConnection, sdp2, onError) => {
+const setRemoteDescriptionWithHandleAnswer = (peerConnection, sdp2, onSuccess, onError) => {
   const description = new RTCSessionDescription({ type: "answer", sdp: sdp2 });
-  peerConnection.setRemoteDescription(description).catch((err) => onError == null ? void 0 : onError(createWebRtcError(FailCode.REMOTE_DES, err)));
+  peerConnection.setRemoteDescription(description).then(() => {
+    onSuccess == null ? void 0 : onSuccess();
+  }).catch((err) => onError == null ? void 0 : onError(createWebRtcError(FailCode.REMOTE_DES, err)));
 };
 const createOffer = async (peerConnection, sendOfferMessage) => {
   try {
@@ -3587,6 +3589,8 @@ class WebRTCClient extends EventEmitter {
     __publicField(this, "rafId", 0);
     __publicField(this, "currentMedia", null);
     __publicField(this, "fileImage");
+    __publicField(this, "reConnectTimer", null);
+    __publicField(this, "canPushStream", false);
     __publicField(this, "startPushLocal", async (file) => {
       if (this.isPushingLocalStream || !file) return;
       try {
@@ -3638,7 +3642,16 @@ class WebRTCClient extends EventEmitter {
     }, (err) => this.emit(EmitType.webrtcError, err));
   }
   handleAnswer(answerSdp) {
-    setRemoteDescriptionWithHandleAnswer(this.peerConnection, answerSdp ?? "", (err) => this.emit(EmitType.webrtcError, err));
+    setRemoteDescriptionWithHandleAnswer(this.peerConnection, answerSdp ?? "", () => {
+      this.canPushStream = true;
+    }, (_err) => {
+      this.canPushStream = false;
+      this.reConnectTimer = setTimeout(async () => {
+        await createOffer(this.peerConnection, (sdp2) => {
+          this.emit(EmitType.sendOffer, sdp2);
+        });
+      }, 3e3);
+    });
   }
   handleIceCandidate(candidate) {
     addIceCandidate(this.peerConnection, candidate, (err) => this.emit(EmitType.webrtcError, err));
@@ -3724,6 +3737,10 @@ class WebRTCClient extends EventEmitter {
           (_a2 = transceiver.stop) == null ? void 0 : _a2.call(transceiver);
         });
       }
+      if (this.reConnectTimer) {
+        clearTimeout(this.reConnectTimer);
+        this.reConnectTimer = null;
+      }
       this.removeAllListeners();
       (_a = this.videoDataChannel) == null ? void 0 : _a.close();
       this.videoDataChannel = null;
@@ -3756,6 +3773,11 @@ class WebRTCClient extends EventEmitter {
       });
       this.rotatedStream = await this.getRotatedStream(this.localStream, useBackCamera);
       await this.onConnected();
+      if (!this.canPushStream) {
+        await createOffer(this.peerConnection, (sdp2) => {
+          this.emit(EmitType.sendOffer, sdp2);
+        });
+      }
     } catch (err) {
       if (err instanceof DOMException) {
         switch (err.name) {
@@ -3794,6 +3816,11 @@ class WebRTCClient extends EventEmitter {
       const rotatedStream = await this.getRotatedStream(this.localStream, useBackCamera);
       this.rotatedStream = rotatedStream;
       await this.onConnected();
+      if (!this.canPushStream) {
+        await createOffer(this.peerConnection, (sdp2) => {
+          this.emit(EmitType.sendOffer, sdp2);
+        });
+      }
     } catch (err) {
       this.isPushingStream = false;
       if (err instanceof DOMException) {
@@ -3922,9 +3949,6 @@ class WebRTCClient extends EventEmitter {
         this.emit(EmitType.iceConnectionState, state);
         if (state === "connected") {
           this.checkStats();
-          await createOffer(this.peerConnection, (sdp2) => {
-            this.emit(EmitType.sendOffer, sdp2);
-          });
         }
       }, (err) => this.emit(EmitType.webrtcError, err));
       this.configDataChannel();
@@ -3955,7 +3979,6 @@ class WebRTCClient extends EventEmitter {
     const data = JSON.parse(event.data);
     if (data.type === ChannelDataType.ActionCommandEvent) {
       const { action, value, cameraId } = JSON.parse(data.data);
-      console.error("data===>", data.data);
       if (action === "ACTION_CONTROL_VIDEO") {
         if (value === "ENABLE") {
           if (this.isPushingStream) {

package/lib/core/rtc/WebRTCClient.d.ts

@@ -26,6 +26,8 @@ export declare class WebRTCClient extends EventEmitter {
     private rafId;
     private currentMedia;
     private fileImage?;
+    private reConnectTimer;
+    private canPushStream;
     constructor(config: WebRTCConfig);
     startPush(useBackCamera?: boolean): Promise<void>;
     handleOffer(offerSdp: string): void;

package/lib/core/rtc/WebRtcNegotiate.d.ts

@@ -3,7 +3,7 @@ import { WebRTCConfig } from "./WebRTCConfig.ts";
 export declare const setRemoteDescriptionWithHandleOffer: (peerConnection: RTCPeerConnection, sdp: string, sendAnswer?: (sdp: string) => void, onError?: (err: WebRtcError) => void) => void;
 export declare const createPeerConnection: (config: WebRTCConfig) => RTCPeerConnection;
 export declare const configPeerConnection: (peerConnection: RTCPeerConnection, onICEMessage: (candidate: string) => void, onTrack?: (track: MediaStreamTrack) => void, onConnectState?: (state: RTCIceConnectionState) => void, onError?: (error: WebRtcError) => void) => void;
-export declare const setRemoteDescriptionWithHandleAnswer: (peerConnection: RTCPeerConnection, sdp: string, onError?: (error: WebRtcError) => void) => void;
+export declare const setRemoteDescriptionWithHandleAnswer: (peerConnection: RTCPeerConnection, sdp: string, onSuccess?: () => void, onError?: (error: WebRtcError) => void) => void;
 export declare const createOffer: (peerConnection: RTCPeerConnection, sendOfferMessage: (sdp: string) => void) => Promise<void>;
 export declare const setLocalDescriptionWithCreateOffer: (peerConnection: RTCPeerConnection, offer: RTCSessionDescriptionInit, sendOfferMessage: (sdp: string) => void) => Promise<void>;
 export declare const addIceCandidate: (peerConnection: RTCPeerConnection, candidate: RTCIceCandidateInit, onError?: (error: WebRtcError) => void) => void;

package/lib/uni/RemoteCanvasController.d.ts

@@ -2,9 +2,7 @@ import RemoteControllerBase from "./RemoteControllerBase";
 declare class RemoteCanvasController implements RemoteControllerBase {
     remoteElement: HTMLElement | null;
     audioElement?: HTMLAudioElement | null | undefined;
-    constructor({ remoteElement }: {
-        remoteElement: HTMLElement;
-    });
+    constructor();
     startDecode(arrayBuffer: ArrayBuffer): void;
     startPlay(track: MediaStreamTrack): void;
     stopPlay(): void;

package/lib/uni-sdk.js

@@ -10,7 +10,7 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var _screenStatus, _isComposing, _direction, _screenWidth, _screenHeight, _clarityLevel, _gestureMode;
-import { W as WheelData, t as transformCoordinate, A as ActionType, v as valueToPercentage, T as TouchData, g as getKeyEventData, I as InputData, i as isFunctionKey, E as EventEmitter, C as ChannelDataType, a as WebRTCSdk, b as EmitType, F as FailCode, c as ContainerDirection, K as KeyEventData, j as ActionCommandEventValue, h as ActionCommandEventType, d as ClarityData, G as GestureData } from "./ScreenControlUtil-Bf1obwOj.js";
+import { W as WheelData, t as transformCoordinate, A as ActionType, v as valueToPercentage, T as TouchData, g as getKeyEventData, I as InputData, i as isFunctionKey, E as EventEmitter, C as ChannelDataType, a as WebRTCSdk, b as EmitType, F as FailCode, c as ContainerDirection, K as KeyEventData, j as ActionCommandEventValue, h as ActionCommandEventType, d as ClarityData, G as GestureData } from "./ScreenControlUtil-hkrPNY6q.js";
 var DocumentEvent = /* @__PURE__ */ ((DocumentEvent2) => {
   DocumentEvent2["KEY_DOWN"] = "keydown";
   DocumentEvent2["POINTER_ENTER"] = "pointerenter";
@@ -143,7 +143,7 @@ class RemoteVideoController {
       (_a = this.loadedSuccess) == null ? void 0 : _a.call(this);
     });
     this.logger = new Logger({
-      prefix: "RemoteVideoController",
+      prefix: "RemoteController",
       enabledDebug
     });
     this.rootContainer = rootContainer;
@@ -241,17 +241,16 @@ class RemoteVideoController {
     }
   }
   destroy() {
-    this.logger.log("实例销毁");
+    this.logger.log("destroy");
     this.stopPlay();
     this.offEvent();
   }
 }
 _screenStatus = new WeakMap();
 class RemoteCanvasController {
-  constructor({ remoteElement }) {
-    __publicField(this, "remoteElement");
+  constructor() {
+    __publicField(this, "remoteElement", null);
     __publicField(this, "audioElement");
-    this.remoteElement = remoteElement;
   }
   startDecode(arrayBuffer) {
   }
@@ -746,7 +745,7 @@ const _WebRTCWrapper = class _WebRTCWrapper extends EventEmitter {
     __privateAdd(this, _clarityLevel);
     __privateAdd(this, _gestureMode);
     this.logger = new Logger({
-      prefix: "WebRTCWrapper",
+      prefix: "Wrapper",
       enabledDebug
     });
     const webRtcSDKInstance = new WebRTCSdk(connectConfig);
@@ -889,6 +888,7 @@ const _WebRTCWrapper = class _WebRTCWrapper extends EventEmitter {
   }
   destroy() {
     var _a;
+    this.logger.log("destroy");
     (_a = this.webRtcSDKInstance) == null ? void 0 : _a.stop();
     this.offEvents();
     this.webRtcSDKInstance = null;

package/lib/yjz-web-sdk.js

@@ -2,8 +2,8 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { A as ActionType, C as ChannelDataType, W as WheelData, t as transformCoordinate, v as valueToPercentage, T as TouchData, I as InputData, i as isFunctionKey, g as getKeyEventData, E as EventEmitter, a as WebRTCSdk, b as EmitType, e as enableLog, s as setLogLevel, K as KeyEventData } from "./ScreenControlUtil-Bf1obwOj.js";
-import { h, j, f, d, l, c, F, G, k, m } from "./ScreenControlUtil-Bf1obwOj.js";
+import { A as ActionType, C as ChannelDataType, W as WheelData, t as transformCoordinate, v as valueToPercentage, T as TouchData, I as InputData, i as isFunctionKey, g as getKeyEventData, E as EventEmitter, a as WebRTCSdk, b as EmitType, e as enableLog, s as setLogLevel, K as KeyEventData } from "./ScreenControlUtil-hkrPNY6q.js";
+import { h, j, f, d, l, c, F, G, k, m } from "./ScreenControlUtil-hkrPNY6q.js";
 import { computed, onMounted, onUnmounted, ref, onBeforeUnmount, defineComponent, toRefs, createElementBlock, openBlock, createElementVNode, normalizeStyle, unref, createCommentVNode, normalizeClass } from "vue";
 function useCursorStyle(cursorType) {
   return computed(() => {
@@ -296,6 +296,7 @@ function useMouseTouchControl(options) {
   const handleMouseEnter = (event) => {
     event.preventDefault();
     event.stopPropagation();
+    if (event.pointerType !== "mouse") return;
     if (event.buttons === 1 && !pointers.value.has(event.pointerId)) {
       if (remoteVideoElement.value) remoteVideoElement.value.setPointerCapture(event.pointerId);
       handlePointerEvent(event, ActionType.ACTION_DOWN, event.pointerId);
@@ -304,6 +305,7 @@ function useMouseTouchControl(options) {
   const handleMouseLeave = (event) => {
     event.preventDefault();
     event.stopPropagation();
+    if (event.pointerType !== "mouse") return;
     if (pointers.value.has(event.pointerId)) {
       handlePointerEvent(event, ActionType.ACTION_UP, event.pointerId);
       if (remoteVideoElement.value) remoteVideoElement.value.releasePointerCapture(event.pointerId);
@@ -327,6 +329,7 @@ function useMouseTouchControl(options) {
 function useKeyboardControl(imeInput, disabled, emit) {
   const isComposing = ref(false);
   const handleKeyDown = (e) => {
+    e.preventDefault();
     const data = getKeyEventData(e);
     emit("channelEvent", ChannelDataType.ActionInput, data);
   };
@@ -372,6 +375,7 @@ function useKeyboardControl(imeInput, disabled, emit) {
   function onKeyDown(event) {
     if (isComposing.value) return;
     if (isFunctionKey(event)) {
+      event.preventDefault();
       const data = getKeyEventData(event);
       if (data.keyCode === 50 && data.meta === 4096) return;
       emit("channelEvent", ChannelDataType.ActionInput, data);

package/package.json

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