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

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

@@ -3202,6 +3202,8 @@ function adapterFactory({ window: window2 } = {}, options = {
   return adapter;
 }
 adapterFactory({ window: typeof window === "undefined" ? void 0 : window });
+let checkingTimer = null;
+let disconnectedTimer = null;
 const setRemoteDescriptionWithHandleOffer = (peerConnection, sdp2, sendAnswer, onError) => {
   Logger.info("信息日志：", "设置远程offer Description=======>");
   const description = new RTCSessionDescription({ type: "offer", sdp: sdp2 });
@@ -3255,8 +3257,45 @@ const configPeerConnection = (peerConnection, onICEMessage, onTrack, onConnectSt
       return;
     }
     Logger.debug("信息日志：", `webrtc p2p连接状态===>`, state);
-    if (state === "failed" || state === "disconnected" || state === "closed") {
-      onError == null ? void 0 : onError(createWebRtcError(FailCode.ICE_STATE, "failed"));
+    switch (state) {
+      case "new":
+      case "checking":
+        if (!checkingTimer) {
+          checkingTimer = setTimeout(() => {
+            onError == null ? void 0 : onError(createWebRtcError(
+              FailCode.ICE_STATE,
+              "TURN服务器连接超时"
+            ));
+          }, 6e3);
+        }
+        break;
+      case "connected":
+      case "completed":
+        if (checkingTimer) {
+          clearTimeout(checkingTimer);
+          checkingTimer = null;
+        }
+        if (disconnectedTimer) {
+          clearTimeout(disconnectedTimer);
+          disconnectedTimer = null;
+        }
+        break;
+      case "disconnected":
+        if (!disconnectedTimer) {
+          disconnectedTimer = setTimeout(() => {
+            onError == null ? void 0 : onError(createWebRtcError(
+              FailCode.ICE_STATE,
+              "TURN disconnected时间过长"
+            ));
+          }, 8e3);
+        }
+        break;
+      case "failed":
+        onError == null ? void 0 : onError(createWebRtcError(
+          FailCode.ICE_STATE,
+          "TURN ICE failed"
+        ));
+        break;
     }
     onConnectState == null ? void 0 : onConnectState(state);
   };
@@ -3434,7 +3473,6 @@ class ChannelData {
      * @param data 剪贴板数据，可以是字符串或其他类型
      */
   static clipboard(data) {
-    console.log(`剪贴板数据，可以是字符串或其他类型 ${data}`);
     return new ChannelData("ClipboardData", this.formatData(data), "");
   }
   /**
@@ -3917,9 +3955,11 @@ 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) {
+            await this.stopPush();
             await this.switchCamera(Number(cameraId) === 0);
           } else {
             await this.startPush(Number(cameraId) === 0);
@@ -4205,14 +4245,13 @@ class WebRTCConfig {
     this.signAgain = options.signAgain || true;
   }
 }
-const testTurnServer = (turnConfig, timeoutMs = 600) => {
+const testTurnServer = (turnConfig, timeoutMs = 1500) => {
   return new Promise((resolve) => {
     const start = performance.now();
     let resolved = false;
     const pc = new RTCPeerConnection({
       iceServers: [turnConfig],
       iceTransportPolicy: "relay"
-      // 强制走 TURN
     });
     pc.createDataChannel("test");
     pc.createOffer().then((offer) => pc.setLocalDescription(offer)).catch(() => {
@@ -4231,9 +4270,11 @@ const testTurnServer = (turnConfig, timeoutMs = 600) => {
         resolve({ ...turnConfig, rtt });
       }
       if (event.candidate === null) {
-        resolved = true;
-        pc.close();
-        resolve({ ...turnConfig, rtt: Infinity });
+        if (!resolved) {
+          resolved = true;
+          pc.close();
+          resolve({ ...turnConfig, rtt: Infinity });
+        }
       }
     };
     setTimeout(() => {
@@ -4245,43 +4286,56 @@ const testTurnServer = (turnConfig, timeoutMs = 600) => {
     }, timeoutMs);
   });
 };
-const testMultipleTurnServers = async (servers, timeoutMs = 600) => {
+const limitConcurrency = async (tasks, concurrency) => {
+  const results = [];
+  const executing = [];
+  for (const task of tasks) {
+    const p = task().then((r) => results.push(r));
+    executing.push(p);
+    if (executing.length >= concurrency) {
+      await Promise.race(executing);
+      for (let i = executing.length - 1; i >= 0; i--) {
+        if (executing[i].resolved) executing.splice(i, 1);
+      }
+    }
+  }
+  await Promise.all(executing);
+  return results;
+};
+const testMultipleTurnServersFast = async (servers, timeoutMs = 600, concurrency = 3) => {
   const turnServers = servers.map((url) => ({
     urls: url,
     username: "yangyj",
     credential: "hb@2025@168"
   }));
-  const testPromises = turnServers.map(
-    (cfg) => testTurnServer(cfg, timeoutMs).then((res) => res).catch((err) => {
-      Logger.warn("警告日志：", `中继计算超时=====>`, err);
-      return { ...cfg, rtt: Infinity };
-    })
-  );
-  const results = await Promise.all(testPromises);
-  Logger.debug("调试日志：", `信令计算结果======>`, results);
-  const available = results.filter((r) => r.rtt !== Infinity);
-  if (available.length === 0) {
-    throw new Error("All TURN servers are unreachable or slow (RTT = Infinity).");
-  }
-  const best = available.sort((a, b) => a.rtt - b.rtt)[0];
-  return {
-    best: best ? stripTurnAuth(best) : void 0,
-    all: results.map(stripTurnAuth)
-  };
-};
-const stripTurnAuth = (result) => {
+  let bestResult = void 0;
+  const allResults = [];
+  const tasks = turnServers.map((cfg) => async () => {
+    const res = await testTurnServer(cfg, timeoutMs);
+    allResults.push(res);
+    if (!bestResult && res.rtt !== Infinity) {
+      bestResult = res;
+    }
+    return res;
+  });
+  await limitConcurrency(tasks, concurrency);
+  Logger.debug("调试日志：", `TURN 测试结果======>`, allResults);
   return {
-    urls: result.urls,
-    rtt: result.rtt
+    best: bestResult ? stripTurnAuth(bestResult) : void 0,
+    all: allResults.map(stripTurnAuth)
   };
 };
+const stripTurnAuth = (result) => ({
+  urls: result.urls,
+  rtt: result.rtt
+});
 const areTurnListsEmpty = (options) => {
   return (!options.hostTurn || options.hostTurn.length === 0) && (!options.spareTurn || options.spareTurn.length === 0);
 };
-const selectBestTurnServer = async (turnList) => {
+const selectBestTurnServerFast = async (turnList) => {
   var _a, _b;
   try {
-    const result = await testMultipleTurnServers(turnList);
+    const result = await testMultipleTurnServersFast(turnList);
     return { url: (_a = result.best) == null ? void 0 : _a.urls, rtt: (_b = result.best) == null ? void 0 : _b.rtt };
   } catch (e) {
     return { error: e.message || "未知错误" };
@@ -4307,7 +4361,6 @@ class WebRTCSdk extends EventEmitter {
       var _a, _b, _c, _d, _e, _f, _g;
       if (!this.config) return;
       Logger.debug("调试信息:", `信令消息=========>`, message);
-      console.log(`信令消息=========>`, message);
       switch (message.type) {
         case MessageType.Peers:
           this.config.myId = message.myId;
@@ -4477,9 +4530,9 @@ class WebRTCSdk extends EventEmitter {
     const tryTurnList = async (list, isHost) => {
       if (list.length === 0) return false;
       try {
-        const result = await selectBestTurnServer(list);
+        const result = await selectBestTurnServerFast(list);
         if (result.url && typeof result.rtt === "number") {
-          if (isHost && result.rtt > 150) {
+          if (isHost && result.rtt > 250) {
             return false;
           }
           this.options.turnServerUri = result.url;
@@ -4714,6 +4767,7 @@ class WebRTCSdk extends EventEmitter {
   sendSignOut() {
     var _a, _b;
     if (!this.config) return;
+    console.log("sendSignOut===>主动断开连接");
     if (this.config.connectorType === ConnectorType.LanForwarding) {
       const message = {
         type: SendType.GroupSignOut,
@@ -5057,8 +5111,8 @@ export {
   isFunctionKey as i,
   ActionCommandEventValue as j,
   TrackEventData as k,
-  testMultipleTurnServers as l,
-  ConnectorType as m,
+  ConnectorType as l,
+  selectBestTurnServerFast as m,
   setLogLevel as s,
   transformCoordinate as t,
   valueToPercentage as v

package/lib/core/util/TurnTestUtil.d.ts

@@ -1,6 +1,6 @@
 import type { TurnSelectionResult, TurnServerConfig, TurnTestResult, TurnTestSummary } from '../data/TurnType.ts';
 import type { WebRTCConfigOptions } from '../rtc/WebRTCConfig.ts';
 export declare const testTurnServer: (turnConfig: TurnServerConfig, timeoutMs?: number) => Promise<TurnTestResult>;
-export declare const testMultipleTurnServers: (servers: string[], timeoutMs?: number) => Promise<TurnTestSummary>;
+export declare const testMultipleTurnServersFast: (servers: string[], timeoutMs?: number, concurrency?: number) => Promise<TurnTestSummary>;
 export declare const areTurnListsEmpty: (options: WebRTCConfigOptions) => boolean;
-export declare const selectBestTurnServer: (turnList: string[]) => Promise<TurnSelectionResult>;
+export declare const selectBestTurnServerFast: (turnList: string[]) => Promise<TurnSelectionResult>;

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { WebRTCSdk } from './core/WebRTCSdk';
 import { getKeyEventData } from "./core/util/KeyCodeUtil";
-import { testMultipleTurnServers } from './core/util/TurnTestUtil';
+import { selectBestTurnServerFast } from './core/util/TurnTestUtil';
 import { transformCoordinate, valueToPercentage } from "./core/util/ScreenControlUtil";
 import { ActionType, ChannelDataType, ContainerDirection, InputData, KeyEventData, TouchData, WheelData, GestureData, type ActionCommand, ActionCommandType, ActionCommandEventType, ActionCommandEventValue, TrackEventData, ClarityData } from "./core/data/WebrtcDataType";
 import { type TurnServerConfig, type TurnTestResult, type TurnTestSummary } from "./core/data/TurnType";
@@ -9,4 +9,4 @@ import { EmitType, FailCode, type CameraError, type WebRtcError } from "./core/d
 import RemotePlayer from './components/RemotePlayer/index.vue';
 import { ConnectorType } from './core/data/MessageType';
 import { GroupCtrlSocketManager } from './core/groupctrl/GroupCtrlSocketManager';
-export { WebRTCSdk, getKeyEventData, transformCoordinate, valueToPercentage, ActionType, ChannelDataType, InputData, KeyEventData, TouchData, ContainerDirection, EmitType, WheelData, GestureData, ClarityData, type ActionCommand, ActionCommandType, type WebRTCConfigOptions, ActionCommandEventType, ActionCommandEventValue, RemotePlayer, TrackEventData, type TurnServerConfig, type TurnTestResult, type TurnTestSummary, testMultipleTurnServers, type CameraError, type WebRtcError, ConnectorType, GroupCtrlSocketManager, FailCode };
+export { WebRTCSdk, getKeyEventData, transformCoordinate, valueToPercentage, ActionType, ChannelDataType, InputData, KeyEventData, TouchData, ContainerDirection, EmitType, WheelData, GestureData, ClarityData, type ActionCommand, ActionCommandType, type WebRTCConfigOptions, ActionCommandEventType, ActionCommandEventValue, RemotePlayer, TrackEventData, type TurnServerConfig, type TurnTestResult, type TurnTestSummary, type CameraError, type WebRtcError, ConnectorType, GroupCtrlSocketManager, FailCode, selectBestTurnServerFast };

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-CeBJPwr0.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-Bf1obwOj.js";
 var DocumentEvent = /* @__PURE__ */ ((DocumentEvent2) => {
   DocumentEvent2["KEY_DOWN"] = "keydown";
   DocumentEvent2["POINTER_ENTER"] = "pointerenter";

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-CeBJPwr0.js";
-import { h, j, f, d, m, c, F, G, k, l } from "./ScreenControlUtil-CeBJPwr0.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-Bf1obwOj.js";
+import { h, j, f, d, l, c, F, G, k, m } from "./ScreenControlUtil-Bf1obwOj.js";
 import { computed, onMounted, onUnmounted, ref, onBeforeUnmount, defineComponent, toRefs, createElementBlock, openBlock, createElementVNode, normalizeStyle, unref, createCommentVNode, normalizeClass } from "vue";
 function useCursorStyle(cursorType) {
   return computed(() => {
@@ -701,7 +701,7 @@ export {
   ActionType,
   ChannelDataType,
   d as ClarityData,
-  m as ConnectorType,
+  l as ConnectorType,
   c as ContainerDirection,
   EmitType,
   F as FailCode,
@@ -715,7 +715,7 @@ export {
   WebRTCSdk,
   WheelData,
   getKeyEventData,
-  l as testMultipleTurnServers,
+  m as selectBestTurnServerFast,
   transformCoordinate,
   valueToPercentage
 };

package/package.json

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