@livo-tv/sdk 1.6.1 → 1.7.0

package/dist/studio/index.d.cts

@@ -180,6 +180,7 @@ type StudioMeetingHandle = {
     stageStatus: () => StudioStageStatus;
     stageRequests: () => StudioStageRequest[];
     subscribeStage: (cb: () => void) => () => void;
+    subscribeStageGrant: (cb: (userId: string) => void) => () => void;
     canManageStage: () => boolean;
     stageEnabled: () => boolean;
     ensureStageJoined: () => Promise<void>;

package/dist/studio/index.d.ts

@@ -180,6 +180,7 @@ type StudioMeetingHandle = {
     stageStatus: () => StudioStageStatus;
     stageRequests: () => StudioStageRequest[];
     subscribeStage: (cb: () => void) => () => void;
+    subscribeStageGrant: (cb: (userId: string) => void) => () => void;
     canManageStage: () => boolean;
     stageEnabled: () => boolean;
     ensureStageJoined: () => Promise<void>;

package/dist/studio/index.js

@@ -5023,10 +5023,11 @@ function StudioRoom({
   ]);
   const verifyGrantTookEffect = useCallback(
     (userId, retried = false) => {
+      if (!userId) return;
       const id = window.setTimeout(() => {
-        const target = meeting.participants().find((row) => row.userId === userId);
-        if (!target || isOnStage(target.stageStatus)) return;
-        if (!retried && target.stageStatus === "ACCEPTED_TO_JOIN_STAGE") {
+        const target = meeting.participants().find((row) => row.userId === userId || row.id === userId);
+        if (target && isOnStage(target.stageStatus)) return;
+        if (!retried) {
           void meeting.setStageAccess(userId, true).then(() => {
             verifyGrantTookEffect(userId, true);
           }).catch(() => {
@@ -5040,6 +5041,12 @@ function StudioRoom({
     },
     [labels.stageGrantNoEffect, meeting]
   );
+  useEffect(
+    () => meeting.subscribeStageGrant((userId) => {
+      verifyGrantTookEffect(userId);
+    }),
+    [meeting, verifyGrantTookEffect]
+  );
   const onSetStage = useCallback(
     async (tile, on) => {
       const userId = tile.userId;
@@ -5364,20 +5371,13 @@ function StudioRoom({
           peopleBadge,
           labels,
           onAdmitAs: (id, as) => {
-            const guest = waitlisted.find((row) => row.id === id);
-            void Promise.resolve(meeting.admitAs(id, as)).then(() => {
-              if (as === "panelist" && guest?.userId) {
-                verifyGrantTookEffect(guest.userId);
-              }
+            void Promise.resolve(meeting.admitAs(id, as)).catch(() => {
+              toast.error(labels.stageError);
             });
           },
           onAdmitAll: (as) => {
-            const waiting = waitlisted;
-            void Promise.resolve(meeting.admitAll(as)).then(() => {
-              if (as !== "panelist") return;
-              for (const guest of waiting) {
-                if (guest.userId) verifyGrantTookEffect(guest.userId);
-              }
+            void Promise.resolve(meeting.admitAll(as)).catch(() => {
+              toast.error(labels.stageError);
             });
           },
           onDeny: (id) => {
@@ -6080,6 +6080,7 @@ function activeSpeakerFrom(payload, fallback) {
 }
 var STAGE_JOIN_RETRY_MS = 1e3;
 var STAGE_JOIN_MAX_ATTEMPTS = 3;
+var STAGE_GRANT_JOIN_MAX_FAILURES = 8;
 function isStageDisabledError(error) {
   if (!error || typeof error !== "object") return false;
   const row = error;
@@ -6152,12 +6153,15 @@ function studioMeetingFromRtk(raw) {
   const chatListeners = /* @__PURE__ */ new Set();
   const participantListeners = /* @__PURE__ */ new Set();
   const stageListeners = /* @__PURE__ */ new Set();
+  const stageGrantListeners = /* @__PURE__ */ new Set();
   const pinListeners = /* @__PURE__ */ new Set();
   const pendingPanelists = /* @__PURE__ */ new Set();
   const chatSend = /* @__PURE__ */ new Map();
   const nameOverrides = /* @__PURE__ */ new Map();
   let joinStageInFlight = null;
   let joinedStageLocally = false;
+  let stageGrantPending = false;
+  let stageGrantJoinFailures = 0;
   let lastMeetingError = null;
   const historyMessages = [];
   let speakerSinkId = null;
@@ -6256,6 +6260,21 @@ function studioMeetingFromRtk(raw) {
   function currentStageStatus() {
     return meeting.self?.stageStatus ?? meeting.stage?.status;
   }
+  function isStageAccepted() {
+    return meeting.self?.stageStatus === "ACCEPTED_TO_JOIN_STAGE" || meeting.stage?.status === "ACCEPTED_TO_JOIN_STAGE";
+  }
+  function clearStageGrantPending() {
+    stageGrantPending = false;
+    stageGrantJoinFailures = 0;
+  }
+  function notifyStageGrant(userId) {
+    if (!userId) return;
+    for (const listener of stageGrantListeners) listener(userId);
+  }
+  function markStageGranted() {
+    stageGrantPending = true;
+    void ensureStageJoined();
+  }
   function resolveConnectionState() {
     const self = meeting.self;
     const roomState = self?.roomState ?? null;
@@ -6347,22 +6366,21 @@ function studioMeetingFromRtk(raw) {
       joinStageInFlight = null;
     }
   }
-  async function autoJoinStage() {
+  async function ensureStageJoined() {
     if (currentStageStatus() === "ON_STAGE") {
-      notifyStage();
+      clearStageGrantPending();
       return;
     }
+    if (!stageGrantPending && !isStageAccepted()) return;
+    stageGrantPending = true;
+    if (stageGrantJoinFailures >= STAGE_GRANT_JOIN_MAX_FAILURES) return;
     try {
       await joinStageWithRetry();
+      if (currentStageStatus() === "ON_STAGE") {
+        clearStageGrantPending();
+      }
     } catch {
-      notifyStage();
-    }
-  }
-  async function ensureStageJoined() {
-    if (currentStageStatus() !== "ACCEPTED_TO_JOIN_STAGE") return;
-    try {
-      await joinStageWithRetry();
-    } catch {
+      stageGrantJoinFailures += 1;
       notifyStage();
     }
   }
@@ -6393,6 +6411,7 @@ function studioMeetingFromRtk(raw) {
     const grantId = takePendingGrantId(joined2);
     if (!grantId) return;
     await meeting.stage?.grantAccess?.([grantId]);
+    notifyStageGrant(joined2?.userId || grantId);
     notifyStage();
   }
   async function grantPendingIfJoined(participantId, userId) {
@@ -6401,6 +6420,7 @@ function studioMeetingFromRtk(raw) {
     if (!grantId) return;
     pendingPanelists.delete(participantId);
     await meeting.stage?.grantAccess?.([grantId]);
+    notifyStageGrant(already?.userId || grantId);
     notifyStage();
   }
   listen(meeting.self, "videoUpdate", rebindMedia);
@@ -6450,15 +6470,15 @@ function studioMeetingFromRtk(raw) {
   listen(meeting.stage, "stageAccessRequestUpdate", notifyStage);
   listen(meeting.stage, "newStageRequest", notifyStage);
   listen(meeting.stage, "stageRequestApproved", () => {
-    void autoJoinStage();
+    markStageGranted();
+  });
+  listen(meeting.stage, "acceptPresentRequests", () => {
+    markStageGranted();
   });
   listen(meeting.stage, "stageRequestRejected", notifyStage);
-  listen(meeting.stage, "stageStatusUpdate", (status) => {
-    if (status === "ACCEPTED_TO_JOIN_STAGE") {
-      void autoJoinStage();
-      return;
-    }
-    if (status === "ON_STAGE") {
+  listen(meeting.stage, "stageStatusUpdate", () => {
+    if (currentStageStatus() === "ON_STAGE") {
+      clearStageGrantPending();
       if (joinedStageLocally) {
         joinedStageLocally = false;
         notifyStage();
@@ -6469,12 +6489,17 @@ function studioMeetingFromRtk(raw) {
       });
       return;
     }
+    if (isStageAccepted()) {
+      markStageGranted();
+      return;
+    }
     notifyStage();
   });
   return {
     async join() {
       await meeting.join?.();
       await joinStageIfAllowed();
+      await ensureStageJoined();
       await applyCurrentVideoEffects();
     },
     async leave() {
@@ -6570,7 +6595,12 @@ function studioMeetingFromRtk(raw) {
         return;
       }
       if (on) await meeting.stage?.grantAccess?.([userId]);
-      else await meeting.stage?.kick?.([userId]);
+      else {
+        await meeting.stage?.kick?.([userId]);
+        if (meeting.self?.userId === userId) {
+          clearStageGrantPending();
+        }
+      }
       notifyStage();
     },
     async denyStageAccess(userId) {
@@ -6601,6 +6631,7 @@ function studioMeetingFromRtk(raw) {
     async leaveStage() {
       await meeting.stage?.leave?.();
       joinedStageLocally = false;
+      clearStageGrantPending();
       notifyStage();
     },
     stageStatus() {
@@ -6632,6 +6663,12 @@ function studioMeetingFromRtk(raw) {
         stageListeners.delete(cb);
       };
     },
+    subscribeStageGrant(cb) {
+      stageGrantListeners.add(cb);
+      return () => {
+        stageGrantListeners.delete(cb);
+      };
+    },
     canManageStage() {
       return meeting.self?.permissions?.acceptStageRequests === true;
     },