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

package/lib/{ScreenControlUtil-hkrPNY6q.js → ScreenControlUtil-D4-BTCo9.js}

@@ -244,6 +244,7 @@ var FailCode = /* @__PURE__ */ ((FailCode2) => {
   FailCode2[FailCode2["KICK_OUT_ERR"] = 10016] = "KICK_OUT_ERR";
   FailCode2[FailCode2["STATE_ERR"] = 10017] = "STATE_ERR";
   FailCode2[FailCode2["OPTION_ERR"] = 10018] = "OPTION_ERR";
+  FailCode2[FailCode2["NO_OPTION_LONGTIME"] = 10019] = "NO_OPTION_LONGTIME";
   return FailCode2;
 })(FailCode || {});
 const FailInfoMap = {
@@ -318,7 +319,11 @@ const FailInfoMap = {
   [
     10018
     /* OPTION_ERR */
-  ]: { type: "option_err", description: "投屏配置异常，请检查配置" }
+  ]: { type: "option_err", description: "投屏配置异常，请检查配置" },
+  [
+    10019
+    /* NO_OPTION_LONGTIME */
+  ]: { type: "no_option_long_time", description: "云机长时间未操作，主动断开连接,点击重连恢复投屏" }
 };
 var CameraFailCode = /* @__PURE__ */ ((CameraFailCode2) => {
   CameraFailCode2[CameraFailCode2["LOCAL_STREAM_FAIL"] = 20001] = "LOCAL_STREAM_FAIL";
@@ -3563,6 +3568,7 @@ const formattedTime = (timestamp) => {
   return `${h}:${m}:${s}.${ms}`;
 };
 class WebRTCClient extends EventEmitter {
+  // 最近一次触发时间戳
   constructor(config) {
     super();
     __publicField(this, "config");
@@ -3591,6 +3597,12 @@ class WebRTCClient extends EventEmitter {
     __publicField(this, "fileImage");
     __publicField(this, "reConnectTimer", null);
     __publicField(this, "canPushStream", false);
+    __publicField(this, "idleTimer", null);
+    __publicField(this, "retryCount", 0);
+    // 当前重连里的 retry 次数
+    __publicField(this, "MAX_RETRY_PER_RECONNECT", 2);
+    // 每次重连最多 retry 2 次
+    __publicField(this, "lastIdleResetTime", 0);
     __publicField(this, "startPushLocal", async (file) => {
       if (this.isPushingLocalStream || !file) return;
       try {
@@ -3644,13 +3656,23 @@ class WebRTCClient extends EventEmitter {
   handleAnswer(answerSdp) {
     setRemoteDescriptionWithHandleAnswer(this.peerConnection, answerSdp ?? "", () => {
       this.canPushStream = true;
+      this.retryCount = 0;
     }, (_err) => {
       this.canPushStream = false;
-      this.reConnectTimer = setTimeout(async () => {
-        await createOffer(this.peerConnection, (sdp2) => {
-          this.emit(EmitType.sendOffer, sdp2);
-        });
-      }, 3e3);
+      if (this.reConnectTimer) {
+        clearTimeout(this.reConnectTimer);
+        this.reConnectTimer = null;
+      }
+      if (this.retryCount < this.MAX_RETRY_PER_RECONNECT) {
+        this.reConnectTimer = setTimeout(async () => {
+          await createOffer(this.peerConnection, (sdp2) => {
+            this.emit(EmitType.sendOffer, sdp2);
+          });
+        }, 3e3);
+        this.retryCount++;
+      } else {
+        this.retryCount = 0;
+      }
     });
   }
   handleIceCandidate(candidate) {
@@ -3699,6 +3721,7 @@ class WebRTCClient extends EventEmitter {
         const jsonString = JSON.stringify(channelData);
         const buffer = new TextEncoder().encode(jsonString).buffer;
         (_a = this.dataChannel) == null ? void 0 : _a.send(buffer);
+        this.resetIdleTimer();
         channelData = null;
       }
     } catch (err) {
@@ -3741,6 +3764,7 @@ class WebRTCClient extends EventEmitter {
         clearTimeout(this.reConnectTimer);
         this.reConnectTimer = null;
       }
+      this.clearIdleTimer();
       this.removeAllListeners();
       (_a = this.videoDataChannel) == null ? void 0 : _a.close();
       this.videoDataChannel = null;
@@ -3949,6 +3973,7 @@ class WebRTCClient extends EventEmitter {
         this.emit(EmitType.iceConnectionState, state);
         if (state === "connected") {
           this.checkStats();
+          this.resetIdleTimer();
         }
       }, (err) => this.emit(EmitType.webrtcError, err));
       this.configDataChannel();
@@ -3977,6 +4002,7 @@ class WebRTCClient extends EventEmitter {
   }
   async handleDataChannelMessage(event) {
     const data = JSON.parse(event.data);
+    this.resetIdleTimer();
     if (data.type === ChannelDataType.ActionCommandEvent) {
       const { action, value, cameraId } = JSON.parse(data.data);
       if (action === "ACTION_CONTROL_VIDEO") {
@@ -4009,6 +4035,7 @@ class WebRTCClient extends EventEmitter {
     }
   }
   checkStats() {
+    if (this.statsTimer) return;
     this.statsTimer = setInterval(() => this.processStatsOptimized(), 1e3);
   }
   async processStatsOptimized() {
@@ -4221,6 +4248,33 @@ class WebRTCClient extends EventEmitter {
       this.fileVideo.src = "";
     }
   }
+  resetIdleTimer() {
+    const now = Date.now();
+    const DEBOUNCE_MS = 2e3;
+    if (now - this.lastIdleResetTime < DEBOUNCE_MS) {
+      return;
+    }
+    this.lastIdleResetTime = now;
+    if (this.idleTimer) {
+      clearTimeout(this.idleTimer);
+    }
+    this.idleTimer = setTimeout(() => {
+      this.emit(
+        EmitType.webrtcError,
+        createWebRtcError(
+          FailCode.NO_OPTION_LONGTIME,
+          createWebRtcError(FailCode.NO_OPTION_LONGTIME, "")
+        )
+      );
+    }, this.config.operateTimeout);
+  }
+  /** 停止空闲计时器 */
+  clearIdleTimer() {
+    if (this.idleTimer) {
+      clearTimeout(this.idleTimer);
+      this.idleTimer = null;
+    }
+  }
 }
 class WebRTCConfig {
   constructor(options) {
@@ -4245,6 +4299,7 @@ class WebRTCConfig {
     __publicField(this, "turnKey");
     __publicField(this, "traceId", "");
     __publicField(this, "signAgain");
+    __publicField(this, "operateTimeout");
     this.signalServerUrl = options.signalServerUrl || "";
     this.myId = options.myId || "";
     this.roomId = options.roomId || "";
@@ -4266,6 +4321,7 @@ class WebRTCConfig {
     this.isGroup = options.isGroup;
     this.traceId = options.traceId || "";
     this.signAgain = options.signAgain || true;
+    this.operateTimeout = options.operateTimeout || 15 * 60 * 1e3;
   }
 }
 const testTurnServer = (turnConfig, timeoutMs = 1500) => {
@@ -4373,9 +4429,10 @@ class WebRTCSdk extends EventEmitter {
     __publicField(this, "options");
     __publicField(this, "isConnected", false);
     __publicField(this, "isConnecting", false);
-    // private connectCount: number = 0
-    // private MAX_COUNT: number = 1
+    __publicField(this, "connectCount", 0);
+    __publicField(this, "MAX_COUNT", 1);
     __publicField(this, "timeout", null);
+    __publicField(this, "reconnectTimer", null);
     /**
        * 处理 signal 消息，根据不同消息类型分发到 webRTCClient 或直接触发 SDK 事件
        * @param message 信令消息
@@ -4621,6 +4678,24 @@ class WebRTCSdk extends EventEmitter {
       this.isConnecting = false;
     }
   }
+  scheduleReconnect() {
+    if (this.reconnectTimer) {
+      Logger.warn("reconnect 已在调度中，跳过");
+      return;
+    }
+    this.isConnected = false;
+    const delay = 4e3 + Math.floor(Math.random() * 2e3);
+    Logger.warn(`WebRTC 将在 ${delay}ms 后重连`);
+    this.reconnectTimer = setTimeout(async () => {
+      this.reconnectTimer = null;
+      try {
+        await this.reconnect();
+      } catch (e) {
+        Logger.error("错误信息：", "scheduleReconnect 执行失败");
+        this.emit(EmitType.webrtcError, e);
+      }
+    }, delay);
+  }
   async reconnect() {
     this.resetConfig();
     try {
@@ -4649,6 +4724,7 @@ class WebRTCSdk extends EventEmitter {
       this.emit(EmitType.iceConnectionState, state);
       if (state === "connected") {
         this.isConnected = true;
+        this.clearReconnectTimer();
       }
     });
     (_f = this.webRTCClient) == null ? void 0 : _f.on(
@@ -4660,8 +4736,14 @@ class WebRTCSdk extends EventEmitter {
       (clipData) => this.emit(EmitType.cloudClipData, clipData)
     );
     (_h = this.webRTCClient) == null ? void 0 : _h.on(EmitType.webrtcError, (err) => {
-      Logger.error("错误信息：", `sdk调试错误日志======>`, err);
-      this.emit(EmitType.webrtcError, err);
+      if (err.code === FailCode.ICE_STATE && this.connectCount < this.MAX_COUNT && this.isConnected) {
+        this.connectCount++;
+        this.emit(EmitType.reconnect);
+        this.scheduleReconnect();
+      } else {
+        Logger.error("错误信息：", `sdk调试错误日志======>`, err);
+        this.emit(EmitType.webrtcError, err);
+      }
     });
     (_i = this.webRTCClient) == null ? void 0 : _i.on(EmitType.cameraError, (err) => {
       this.emit(EmitType.cameraError, err);
@@ -4790,7 +4872,7 @@ class WebRTCSdk extends EventEmitter {
   sendSignOut() {
     var _a, _b;
     if (!this.config) return;
-    console.log("sendSignOut===>主动断开连接");
+    Logger.debug("调试信息:", `sendSignOut=========>主动断开连接`);
     if (this.config.connectorType === ConnectorType.LanForwarding) {
       const message = {
         type: SendType.GroupSignOut,
@@ -4854,6 +4936,12 @@ class WebRTCSdk extends EventEmitter {
       this.emit(EmitType.webrtcError, createWebRtcError(FailCode.DATACHANNEL_ERR, err));
     }
   }
+  clearReconnectTimer() {
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+  }
 }
 const META_SHIFT_ON = 1;
 const META_ALT_ON = 2;

package/lib/core/WebRTCSdk.d.ts

@@ -12,12 +12,16 @@ export declare class WebRTCSdk extends EventEmitter {
     options: WebRTCConfigOptions;
     isConnected: boolean;
     isConnecting: boolean;
+    private connectCount;
+    private MAX_COUNT;
     private timeout;
+    private reconnectTimer;
     constructor(options: WebRTCConfigOptions);
     initConfig(): Promise<void>;
     /** 开始连接 signal 服务 */
     startConnection(): void;
     private prepareConnection;
+    private scheduleReconnect;
     reconnect(): Promise<void>;
     initConnectConfig(initConfig?: boolean): void;
     initSignalingClient(): void;
@@ -51,4 +55,5 @@ export declare class WebRTCSdk extends EventEmitter {
     sendPong(): void;
     sendSignOut(): void;
     groupSendAction(type: ChannelDataType, data: any): void;
+    private clearReconnectTimer;
 }

package/lib/core/data/WebRtcError.d.ts

@@ -16,7 +16,8 @@ export declare enum FailCode {
     AUTH_FAILED = 10015,
     KICK_OUT_ERR = 10016,
     STATE_ERR = 10017,
-    OPTION_ERR = 10018
+    OPTION_ERR = 10018,
+    NO_OPTION_LONGTIME = 10019
 }
 export declare const FailInfoMap: Record<FailCode, {
     type: string;

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

@@ -28,6 +28,10 @@ export declare class WebRTCClient extends EventEmitter {
     private fileImage?;
     private reConnectTimer;
     private canPushStream;
+    private idleTimer;
+    private retryCount;
+    private readonly MAX_RETRY_PER_RECONNECT;
+    private lastIdleResetTime;
     constructor(config: WebRTCConfig);
     startPush(useBackCamera?: boolean): Promise<void>;
     handleOffer(offerSdp: string): void;
@@ -60,4 +64,7 @@ export declare class WebRTCClient extends EventEmitter {
     getFileImage(): HTMLImageElement;
     /** 停止推流并释放资源 */
     stopLocal(): void;
+    private resetIdleTimer;
+    /** 停止空闲计时器 */
+    private clearIdleTimer;
 }

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

@@ -33,6 +33,7 @@ export interface WebRTCConfigOptions {
     cacheTimeout?: number;
     enableLogger?: boolean;
     loggerLevel?: LogLevel;
+    operateTimeout?: number;
 }
 export declare class WebRTCConfig {
     signalServerUrl: string;
@@ -56,5 +57,6 @@ export declare class WebRTCConfig {
     turnKey: Array<string>;
     traceId: string;
     signAgain: boolean;
+    operateTimeout: number;
     constructor(options: WebRTCConfigOptions);
 }

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-hkrPNY6q.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-D4-BTCo9.js";
 var DocumentEvent = /* @__PURE__ */ ((DocumentEvent2) => {
   DocumentEvent2["KEY_DOWN"] = "keydown";
   DocumentEvent2["POINTER_ENTER"] = "pointerenter";
@@ -443,6 +443,7 @@ class MouseTouchControl {
     __publicField(this, "handleMouseEnter", (event) => {
       event.preventDefault();
       event.stopPropagation();
+      if (event.pointerType !== "mouse") return;
       if (event.buttons === 1 && !this.pointers.has(event.pointerId)) {
         if (this.remoteElement) {
           this.remoteElement.setPointerCapture(event.pointerId);
@@ -453,6 +454,7 @@ class MouseTouchControl {
     __publicField(this, "handleMouseLeave", (event) => {
       event.preventDefault();
       event.stopPropagation();
+      if (event.pointerType !== "mouse") return;
       if (this.pointers.has(event.pointerId)) {
         this.handlePointerEvent(event, ActionType.ACTION_UP, event.pointerId);
         if (this.remoteElement) {
@@ -561,6 +563,7 @@ class KeyboardControl {
       (_a = this.inputMethodEditorElement) == null ? void 0 : _a.blur();
     });
     __publicField(this, "handleKeyDown", (e) => {
+      e.preventDefault();
       const data = getKeyEventData(e);
       this.inputDataUpdateCallback(data);
     });

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-hkrPNY6q.js";
-import { h, j, f, d, l, c, F, G, k, m } from "./ScreenControlUtil-hkrPNY6q.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-D4-BTCo9.js";
+import { h, j, f, d, l, c, F, G, k, m } from "./ScreenControlUtil-D4-BTCo9.js";
 import { computed, onMounted, onUnmounted, ref, onBeforeUnmount, defineComponent, toRefs, createElementBlock, openBlock, createElementVNode, normalizeStyle, unref, createCommentVNode, normalizeClass } from "vue";
 function useCursorStyle(cursorType) {
   return computed(() => {

package/package.json

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