@vivix-ai/ivi-frontend-sdk 0.3.3 → 0.3.5

package/dist/index.cjs

@@ -1117,6 +1117,7 @@ var TrtcSourceManager = class {
     this.onTrtcEvent = onTrtcEvent;
     this.aiDenoiser = aiDenoiser;
     this.sessions = /* @__PURE__ */ new Map();
+    this.sourceSessionKeys = /* @__PURE__ */ new Map();
     this.listeners = /* @__PURE__ */ new Map();
   }
   /**
@@ -1125,15 +1126,16 @@ var TrtcSourceManager = class {
    * - 清理已不在 runtime 中的会话（释放资源）
    */
   syncRuntimeSources(sources) {
-    const existingIds = new Set(sources.keys());
+    const trtcSourceIds = /* @__PURE__ */ new Set();
     sources.forEach((source, sourceId) => {
       if (!isRuntimeTrtcSource(source)) {
         return;
       }
+      trtcSourceIds.add(sourceId);
       this.upsertSource(sourceId, source.playback.trtc);
     });
-    this.sessions.forEach((_session, sourceId) => {
-      if (!existingIds.has(sourceId)) {
+    Array.from(this.sourceSessionKeys.keys()).forEach((sourceId) => {
+      if (!trtcSourceIds.has(sourceId)) {
         this.removeSource(sourceId);
       }
     });
@@ -1143,21 +1145,28 @@ var TrtcSourceManager = class {
    * 若配置发生变化，会先销毁旧会话再按新参数重建连接。
    */
   upsertSource(sourceId, trtc, aiDenoiser) {
-    const existing = this.sessions.get(sourceId);
-    if (!existing) {
-      this.log("info", `\u65B0\u5EFA\u4F1A\u8BDD source=${sourceId} room=${getTrtcString(trtc, "room_id")} user=${getTrtcString(trtc, "user_id")}`);
-      const session2 = this.createSession(sourceId, trtc, aiDenoiser);
-      this.sessions.set(sourceId, session2);
-      void this.ensureConnected(session2);
+    const existing = this.getSession(sourceId);
+    if (existing && isSameTrtcConfig(existing.trtc, trtc) && isSameAIDenoiserOptions(existing.aiDenoiser, aiDenoiser)) {
       return;
     }
-    if (isSameTrtcConfig(existing.trtc, trtc) && isSameAIDenoiserOptions(existing.aiDenoiser, aiDenoiser)) {
+    if (existing) {
+      this.log("info", `\u914D\u7F6E\u53D8\u66F4\uFF0C\u91CD\u5EFA\u4F1A\u8BDD source=${sourceId} room=${getTrtcString(trtc, "room_id")}`);
+      this.unlinkSourceFromSession(sourceId, existing);
+    }
+    const sessionKey = buildTrtcSessionKey(trtc, aiDenoiser);
+    const reusable = this.sessions.get(sessionKey);
+    if (reusable) {
+      this.log("info", `\u590D\u7528\u4F1A\u8BDD source=${sourceId} room=${getTrtcString(trtc, "room_id")} user=${getTrtcString(trtc, "user_id")}`);
+      reusable.sourceIds.add(sourceId);
+      this.sourceSessionKeys.set(sourceId, sessionKey);
+      this.emitSnapshot(sourceId, this.snapshotFromSession(reusable));
+      void this.ensureConnected(reusable);
       return;
     }
-    this.log("info", `\u914D\u7F6E\u53D8\u66F4\uFF0C\u91CD\u5EFA\u4F1A\u8BDD source=${sourceId} room=${getTrtcString(trtc, "room_id")}`);
-    void this.disposeSession(existing);
+    this.log("info", `\u65B0\u5EFA\u4F1A\u8BDD source=${sourceId} room=${getTrtcString(trtc, "room_id")} user=${getTrtcString(trtc, "user_id")}`);
     const session = this.createSession(sourceId, trtc, aiDenoiser);
-    this.sessions.set(sourceId, session);
+    this.sessions.set(session.sessionKey, session);
+    this.sourceSessionKeys.set(sourceId, session.sessionKey);
     void this.ensureConnected(session);
   }
   /**
@@ -1165,13 +1174,12 @@ var TrtcSourceManager = class {
    * 该操作通常由 source.deleted 或会话重置触发。
    */
   removeSource(sourceId) {
-    const session = this.sessions.get(sourceId);
+    const session = this.getSession(sourceId);
     if (!session) {
       return;
     }
     this.log("info", `\u79FB\u9664\u4F1A\u8BDD source=${sourceId}`);
-    this.sessions.delete(sourceId);
-    void this.disposeSession(session);
+    this.unlinkSourceFromSession(sourceId, session);
     this.emitSnapshot(sourceId, {
       status: "idle"
     });
@@ -1181,6 +1189,7 @@ var TrtcSourceManager = class {
     this.log("info", `\u91CD\u7F6E\u5168\u90E8\u4F1A\u8BDD count=${this.sessions.size}`);
     const sessions = Array.from(this.sessions.values());
     this.sessions.clear();
+    this.sourceSessionKeys.clear();
     sessions.forEach((session) => {
       void this.disposeSession(session);
     });
@@ -1203,7 +1212,7 @@ var TrtcSourceManager = class {
     };
   }
   getSnapshot(sourceId) {
-    const session = this.sessions.get(sourceId);
+    const session = this.getSession(sourceId);
     if (!session) {
       return {
         status: "idle"
@@ -1218,7 +1227,7 @@ var TrtcSourceManager = class {
    * 检查指定 source 的 TRTC 会话是否曾收到过 REMOTE_VIDEO_AVAILABLE 事件。
    */
   hasRemoteVideoAvailable(sourceId) {
-    const session = this.sessions.get(sourceId);
+    const session = this.getSession(sourceId);
     return session?.hasEverReceivedRemoteVideo ?? false;
   }
   /**
@@ -1227,7 +1236,7 @@ var TrtcSourceManager = class {
    * - 若会话被销毁或超时，返回 false。
    */
   waitForRemoteVideoAvailable(sourceId, timeoutMs = 3e4) {
-    const session = this.sessions.get(sourceId);
+    const session = this.getSession(sourceId);
     if (!session) return Promise.resolve(false);
     if (session.hasEverReceivedRemoteVideo) return Promise.resolve(true);
     return new Promise((resolve) => {
@@ -1255,11 +1264,12 @@ var TrtcSourceManager = class {
    * - 应用全局音频策略（根据所有 view 的 muted 汇总）
    */
   async attachView(sourceId, viewId, container, muted) {
-    const session = this.sessions.get(sourceId);
+    const session = this.getSession(sourceId);
     if (!session) {
       throw new Error(`TRTC source session not found: ${sourceId}`);
     }
     session.views.set(viewId, {
+      sourceId,
       container,
       muted,
       startedVideoKeys: /* @__PURE__ */ new Set(),
@@ -1274,15 +1284,18 @@ var TrtcSourceManager = class {
     await this.applyAudioPolicy(session);
   }
   detachView(sourceId, viewId) {
-    const session = this.sessions.get(sourceId);
+    const session = this.getSession(sourceId);
     if (!session) {
       return;
     }
-    session.views.delete(viewId);
+    const binding = session.views.get(viewId);
+    if (binding?.sourceId === sourceId) {
+      session.views.delete(viewId);
+    }
     void this.applyAudioPolicy(session);
   }
   updateViewMuted(sourceId, viewId, muted) {
-    const session = this.sessions.get(sourceId);
+    const session = this.getSession(sourceId);
     if (!session) {
       return;
     }
@@ -1293,9 +1306,43 @@ var TrtcSourceManager = class {
     binding.muted = muted;
     void this.applyAudioPolicy(session);
   }
+  unlinkSourceFromSession(sourceId, session) {
+    session.sourceIds.delete(sourceId);
+    this.sourceSessionKeys.delete(sourceId);
+    session.views.forEach((binding, viewId) => {
+      if (binding.sourceId === sourceId) {
+        session.views.delete(viewId);
+      }
+    });
+    if (session.sourceIds.size > 0) {
+      session.sourceId = session.sourceIds.values().next().value ?? session.sourceId;
+      void this.applyAudioPolicy(session);
+      return;
+    }
+    this.sessions.delete(session.sessionKey);
+    void this.disposeSession(session);
+  }
+  getSession(sourceId) {
+    const sessionKey = this.sourceSessionKeys.get(sourceId);
+    return sessionKey ? this.sessions.get(sessionKey) : void 0;
+  }
+  snapshotFromSession(session) {
+    return {
+      status: session.status,
+      error: session.error
+    };
+  }
+  emitSessionSnapshot(session, snapshot) {
+    session.sourceIds.forEach((sourceId) => this.emitSnapshot(sourceId, snapshot));
+  }
+  emitSessionTrtcEvent(session, type, rawType, payload) {
+    session.sourceIds.forEach((sourceId) => this.emitTrtcEvent(sourceId, type, rawType, payload));
+  }
   createSession(sourceId, trtc, aiDenoiser) {
     return {
+      sessionKey: buildTrtcSessionKey(trtc, aiDenoiser),
       sourceId,
+      sourceIds: /* @__PURE__ */ new Set([sourceId]),
       trtc,
       aiDenoiser,
       TRTC: null,
@@ -1323,7 +1370,7 @@ var TrtcSourceManager = class {
     }
     session.status = "connecting";
     session.error = void 0;
-    this.emitSnapshot(session.sourceId, {
+    this.emitSessionSnapshot(session, {
       status: session.status
     });
     session.connectPromise = (async () => {
@@ -1352,7 +1399,7 @@ var TrtcSourceManager = class {
         session.views.forEach((binding) => {
           void this.startRemoteVideoForBinding(client, event.userId, event.streamType, binding, remoteVideoKey);
         });
-        this.emitTrtcEvent(session.sourceId, "remote_video_available", TRTC.EVENT.REMOTE_VIDEO_AVAILABLE, event);
+        this.emitSessionTrtcEvent(session, "remote_video_available", TRTC.EVENT.REMOTE_VIDEO_AVAILABLE, event);
       };
       const onRemoteVideoUnavailable = (event) => {
         this.log("info", `\u8FDC\u7AEF\u89C6\u9891\u4E0D\u53EF\u7528 source=${session.sourceId} userId=${event.userId} streamType=${event.streamType}`);
@@ -1366,19 +1413,19 @@ var TrtcSourceManager = class {
           userId: event.userId,
           streamType: event.streamType
         }).catch(() => void 0);
-        this.emitTrtcEvent(session.sourceId, "remote_video_unavailable", TRTC.EVENT.REMOTE_VIDEO_UNAVAILABLE, event);
+        this.emitSessionTrtcEvent(session, "remote_video_unavailable", TRTC.EVENT.REMOTE_VIDEO_UNAVAILABLE, event);
       };
       const onRemoteAudioAvailable = (event) => {
         this.log("info", `\u8FDC\u7AEF\u97F3\u9891\u53EF\u7528 source=${session.sourceId} userId=${event.userId}`);
         session.remoteAudioUsers.add(event.userId);
         void this.applyAudioPolicy(session);
-        this.emitTrtcEvent(session.sourceId, "remote_audio_available", TRTC.EVENT.REMOTE_AUDIO_AVAILABLE, event);
+        this.emitSessionTrtcEvent(session, "remote_audio_available", TRTC.EVENT.REMOTE_AUDIO_AVAILABLE, event);
       };
       const onRemoteAudioUnavailable = (event) => {
         this.log("info", `\u8FDC\u7AEF\u97F3\u9891\u4E0D\u53EF\u7528 source=${session.sourceId} userId=${event.userId}`);
         session.remoteAudioUsers.delete(event.userId);
         void this.applyAudioPolicy(session);
-        this.emitTrtcEvent(session.sourceId, "remote_audio_unavailable", TRTC.EVENT.REMOTE_AUDIO_UNAVAILABLE, event);
+        this.emitSessionTrtcEvent(session, "remote_audio_unavailable", TRTC.EVENT.REMOTE_AUDIO_UNAVAILABLE, event);
       };
       session.onRemoteVideoAvailable = onRemoteVideoAvailable;
       session.onRemoteVideoUnavailable = onRemoteVideoUnavailable;
@@ -1404,7 +1451,7 @@ var TrtcSourceManager = class {
       session.error = void 0;
       this.log("info", `\u8FDB\u623F\u6210\u529F source=${session.sourceId} room=${roomId}`);
       await this.applyAIDenoiserPolicy(session, client, sdkAppId, userId, userSig);
-      this.emitSnapshot(session.sourceId, {
+      this.emitSessionSnapshot(session, {
         status: session.status
       });
       await this.applyAudioPolicy(session);
@@ -1412,7 +1459,7 @@ var TrtcSourceManager = class {
       session.status = "error";
       session.error = error instanceof Error ? error.message : String(error);
       this.log("error", `\u8FDE\u63A5\u5931\u8D25 source=${session.sourceId} error=${session.error}`);
-      this.emitSnapshot(session.sourceId, {
+      this.emitSessionSnapshot(session, {
         status: session.status,
         error: session.error
       });
@@ -1589,6 +1636,20 @@ function isRuntimeTrtcSource(source) {
 function isSameTrtcConfig(a, b) {
   return a.app_id === b.app_id && a.user_id === b.user_id && a.user_sig === b.user_sig && a.room_id === b.room_id;
 }
+function buildTrtcSessionKey(trtc, aiDenoiser) {
+  const denoiser = resolveAIDenoiserOptions(aiDenoiser);
+  return JSON.stringify({
+    appId: trtc.app_id,
+    roomId: trtc.room_id,
+    userId: trtc.user_id,
+    userSig: trtc.user_sig,
+    aiDenoiser: {
+      enabled: denoiser.enabled,
+      mode: denoiser.mode,
+      assetsPath: denoiser.assetsPath
+    }
+  });
+}
 function isSameAIDenoiserOptions(a, b) {
   const left = resolveAIDenoiserOptions(a);
   const right = resolveAIDenoiserOptions(b);
@@ -3767,6 +3828,19 @@ function detectMediaVolumeType(source) {
   if (!url) return null;
   return isM3u8Url(url) ? "hls" : "video";
 }
+function getSourceRenderKey(sourceId, source) {
+  const trtc = getTrtcPlayback(source.playback);
+  if (!trtc) {
+    return sourceId;
+  }
+  return [
+    "trtc",
+    trtc.app_id ?? "",
+    trtc.room_id ?? "",
+    trtc.user_id ?? "",
+    trtc.user_sig ?? ""
+  ].join(":");
+}
 function TrackSlotMediaContent(props) {
   const {
     slot,
@@ -3804,7 +3878,7 @@ function TrackSlotMediaContent(props) {
       IVITrtcPlayer,
       {
         trtc,
-        sourceId: source.source.source_id,
+        sourceId: slotSourceId,
         runtime,
         ...trtcPlayerProps,
         muted: trtcMuted,
@@ -3959,26 +4033,35 @@ function SlotVideo(props) {
 // src/react/internal/use-multi-preload-sources.ts
 function useMultiPreloadSources(sources, activeSourceId) {
   return react.useMemo(() => {
-    const entries = [];
-    for (const [id, runtimeSource] of sources) {
-      const isActive = id === activeSourceId;
-      const shouldMount = Boolean(runtimeSource.preload) || isActive;
-      if (!shouldMount) {
-        continue;
-      }
-      const ready = toReadyRuntimeSource(runtimeSource);
-      if (!ready) {
-        continue;
-      }
-      entries.push({
-        sourceId: id,
-        source: ready,
-        isActive
-      });
-    }
-    return entries;
+    return buildPreloadSourceEntries(sources, activeSourceId);
   }, [sources, activeSourceId]);
 }
+function buildPreloadSourceEntries(sources, activeSourceId) {
+  const entriesByRenderKey = /* @__PURE__ */ new Map();
+  for (const [id, runtimeSource] of sources) {
+    const isActive = id === activeSourceId;
+    const shouldMount = Boolean(runtimeSource.preload) || isActive;
+    if (!shouldMount) {
+      continue;
+    }
+    const ready = toReadyRuntimeSource(runtimeSource);
+    if (!ready) {
+      continue;
+    }
+    const renderKey = getSourceRenderKey(id, ready);
+    const entry = {
+      sourceId: id,
+      renderKey,
+      source: ready,
+      isActive
+    };
+    const previous = entriesByRenderKey.get(renderKey);
+    if (!previous || !previous.isActive && isActive) {
+      entriesByRenderKey.set(renderKey, entry);
+    }
+  }
+  return Array.from(entriesByRenderKey.values());
+}
 function IVITrackSlot(props) {
   const {
     slot,
@@ -4068,7 +4151,7 @@ function IVITrackSlot(props) {
                 }
               ) })
             },
-            entry.sourceId
+            entry.renderKey
           );
         }),
         showSubtitle && activeSource && supportsSubtitleOverlay(activeSource) && /* @__PURE__ */ jsxRuntime.jsx("div", { style: SUBTITLE_OVERLAY_STYLE, children: /* @__PURE__ */ jsxRuntime.jsx(