@ai-matrx/meet 0.11.49 → 0.11.51

package/dist/react.d.cts

@@ -341,6 +341,8 @@ interface UseCaptionsResult {
     readonly reason: string | null;
     readonly remedy: string | null;
     readonly toggle: () => void;
+    /** Try again after `unavailable`: asks for captions afresh and restarts the start ceiling. */
+    readonly retry: () => void;
 }
 declare function useCaptions(): UseCaptionsResult;
 /**

package/dist/react.d.ts

@@ -341,6 +341,8 @@ interface UseCaptionsResult {
     readonly reason: string | null;
     readonly remedy: string | null;
     readonly toggle: () => void;
+    /** Try again after `unavailable`: asks for captions afresh and restarts the start ceiling. */
+    readonly retry: () => void;
 }
 declare function useCaptions(): UseCaptionsResult;
 /**

package/dist/react.js

@@ -151,7 +151,8 @@ var DEFAULT_CONNECTION_POLICY = {
   autoRejoin: true,
   autoRejoinMaxAttempts: 5,
   reconnectGraceSeconds: 30,
-  videoAutoOffAfterPoorSeconds: 20
+  videoAutoOffAfterPoorSeconds: 20,
+  captionsStartTimeoutSeconds: 20
 };
 function clampInt(value, min, max, fallback) {
   if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
@@ -166,7 +167,8 @@ function connectionPolicyFrom(raw) {
     autoRejoin: typeof row["auto_rejoin"] === "boolean" ? row["auto_rejoin"] : d.autoRejoin,
     autoRejoinMaxAttempts: clampInt(row["auto_rejoin_max_attempts"], 0, 20, d.autoRejoinMaxAttempts),
     reconnectGraceSeconds: clampInt(row["reconnect_grace_seconds"], 0, 600, d.reconnectGraceSeconds),
-    videoAutoOffAfterPoorSeconds: clampInt(row["video_auto_off_after_poor_seconds"], 0, 600, d.videoAutoOffAfterPoorSeconds)
+    videoAutoOffAfterPoorSeconds: clampInt(row["video_auto_off_after_poor_seconds"], 0, 600, d.videoAutoOffAfterPoorSeconds),
+    captionsStartTimeoutSeconds: clampInt(row["captions_start_timeout_seconds"], 1, 600, d.captionsStartTimeoutSeconds)
   };
 }
 var LIVEKIT_BASE_DELAYS_MS = [0, 300, 1200, 2700, 4800, 7e3];
@@ -4030,6 +4032,7 @@ var EMPTY = {
   noteTakerRefusal: null,
   captionsOn: false,
   captionsRefusal: null,
+  captionsStartTimeoutSeconds: 20,
   media: IDLE_MEDIA,
   mediaRegion: IDLE_MEDIA_REGION,
   failure: null,
@@ -4451,7 +4454,10 @@ function createMeetingSession(options) {
     const meeting = store.snapshot().meeting;
     const pass = options.resolvePass?.() ?? null;
     if (meeting === null || pass === null) return;
-    if (policyReading) return policyInFlight ?? void 0;
+    if (policyReading) {
+      await (policyInFlight ?? void 0);
+      return readLivePolicy();
+    }
     policyReading = true;
     let done = () => void 0;
     policyInFlight = new Promise((resolve) => done = resolve);
@@ -4472,6 +4478,9 @@ function createMeetingSession(options) {
       if (!samePolicy(snapshot.livePolicy, next) || startedAt !== snapshot.sessionStartedAt) {
         store.patch({ livePolicy: next, sessionStartedAt: startedAt });
       }
+      if (read.consent_given === true && !store.snapshot().recordingConsentGiven) {
+        store.patch({ recordingConsentGiven: true });
+      }
     } catch {
     } finally {
       policyReading = false;
@@ -4776,6 +4785,21 @@ function createMeetingSession(options) {
     stopWaiting,
     readState: readState2,
     readLivePolicy,
+    async acknowledgeConsent() {
+      const meeting = requireMeeting("meet.consent");
+      const pass = options.resolvePass?.() ?? null;
+      const response = await options.api.request({
+        path: MEET_ROUTES.consent,
+        method: "POST",
+        requireAuth: false,
+        operation: "meet.consent",
+        body: { meeting_id: meeting.id },
+        ...pass !== null ? { headers: { [MEETING_PASS_HEADER]: pass } } : {}
+      });
+      if (!response.ok) {
+        throw new MeetError("transport", `meet.consent: the server answered ${response.status}`, "Your agreement was not saved. Try again.");
+      }
+    },
     async readExit(connection, held) {
       const meeting = store.snapshot().meeting;
       const pass = held ?? options.resolvePass?.() ?? null;
@@ -5173,7 +5197,9 @@ function createMediaSupervisor(options) {
       const deviceKind = INPUT_KIND[kind];
       const previous = inUse[deviceKind];
       const track = store.snapshot().media[kind];
-      const gone = previous !== null && !isAlias(previous) && before[deviceKind].has(previous) && !now[deviceKind].has(previous);
+      const aliasLabel = previous !== null && isAlias(previous) ? before[deviceKind].get(previous) : void 0;
+      const aliasGone = previous !== null && aliasLabel !== void 0 && aliasLabel !== "" && (!now[deviceKind].has(previous) || now[deviceKind].get(previous) !== aliasLabel);
+      const gone = aliasGone || previous !== null && !isAlias(previous) && before[deviceKind].has(previous) && !now[deviceKind].has(previous);
       if (gone) {
         const from = before[deviceKind].get(previous) ?? "";
         const remaining = [...now[deviceKind].entries()].filter(([id]) => !isAlias(id));
@@ -5198,7 +5224,7 @@ function createMediaSupervisor(options) {
               await driver.setCameraEnabled(true);
               store.setLocalTrack("camera", { enabled: true, unavailable: null });
             }
-            setRegion({ notice: { id: ++noticeId, kind, outcome: "switched", from, to: nextLabel } });
+            setRegion({ notice: { id: ++noticeId, kind, outcome: "switched", from, fromId: previous, to: nextLabel } });
           } catch (error) {
             const refused = await unavailable(error, "camera", "meet.camera(fallback)");
             store.setLocalTrack("camera", { enabled: false, unavailable: refused });
@@ -5206,8 +5232,24 @@ function createMediaSupervisor(options) {
           }
         } else {
           const active = driver.activeDevices().audioinput;
-          const to = (active !== null ? now.audioinput.get(active) : void 0) ?? now.audioinput.get("default") ?? remaining[0][1];
-          setRegion({ notice: { id: ++noticeId, kind, outcome: "switched", from, to } });
+          let to = (active !== null && !aliasGone ? now.audioinput.get(active) : void 0) ?? now.audioinput.get("default");
+          if (to === void 0 || aliasGone) {
+            const [nextId, nextLabel] = remaining[0];
+            try {
+              await driver.switchDevice("audioinput", nextId);
+              if (track.enabled || track.unavailable !== null) {
+                await driver.setMicrophoneEnabled(true);
+                store.setLocalTrack("microphone", { enabled: true, unavailable: null });
+              }
+              to = nextLabel;
+            } catch (error) {
+              const refused = await unavailable(error, "microphone", "meet.microphone(fallback)");
+              store.setLocalTrack("microphone", { enabled: false, unavailable: refused });
+              setRegion({ notice: { id: ++noticeId, kind, outcome: "lost", from, to: null } });
+              continue;
+            }
+          }
+          setRegion({ notice: { id: ++noticeId, kind, outcome: "switched", from, fromId: previous, to } });
         }
         continue;
       }
@@ -5312,6 +5354,21 @@ function createMediaSupervisor(options) {
     },
     dismissNotice() {
       setRegion({ notice: null });
+    },
+    async undoNotice() {
+      const notice = region().notice;
+      setRegion({ notice: null });
+      const driver = options.driver();
+      if (notice === null || notice.outcome !== "switched" || notice.fromId === void 0 || driver === null) return;
+      const list = await snapshotDevices();
+      if (!list[INPUT_KIND[notice.kind]].has(notice.fromId)) return;
+      try {
+        await driver.switchDevice(INPUT_KIND[notice.kind], notice.fromId);
+        readInUse();
+      } catch (error) {
+        const refused = await unavailable(error, notice.kind, "meet.undoDeviceSwitch");
+        store.setLocalTrack(notice.kind, { enabled: false, unavailable: refused });
+      }
     }
   };
   return api;
@@ -5534,11 +5591,10 @@ function moderationText(kind, payload) {
   switch (kind) {
     case "muted": {
       const source = text2(payload["source"]) ?? "microphone";
-      const who = payload["by_role"] === "host" || payload["by_role"] === "cohost" ? "the host" : by;
-      return source === "microphone" ? `You've been muted by ${who}.` : source === "camera" ? `Your camera was turned off by ${who}.` : `Your screen share was stopped by ${who}.`;
+      return source === "microphone" ? `${by} muted you.` : source === "camera" ? `${by} turned off your camera.` : `${by} stopped your screen share.`;
     }
     case "ask-unmute":
-      return `${by === "The host" ? "The host" : by} asked you to unmute.`;
+      return `${by} is asking you to unmute.`;
     case "removed":
       return `${by} removed you from this meeting.`;
     default:
@@ -5564,7 +5620,7 @@ function applyModeration(store, payload, now) {
           grants: { ...snapshot.grants, role },
           moderationNotice: {
             kind: "role",
-            text: role === "host" ? "You are now the host." : role === "cohost" ? "You're now a co-host." : role === "presenter" ? "You're now a presenter." : snapshot.grants.role === "presenter" ? "You're now a participant: you can no longer present." : "You're now a participant: you are no longer a co-host.",
+            text: role === "host" ? "You are now the host." : role === "cohost" ? "You are now a co-host." : role === "presenter" ? "You are now a presenter." : snapshot.grants.role === "presenter" ? "You are now a participant: you can no longer present." : "You are no longer a co-host.",
             at: now()
           }
         });
@@ -6066,7 +6122,14 @@ function createRoomEngine(options) {
       const latest = store.snapshot().meeting;
       if (latest === null) return;
       store.patch({ meeting: { ...latest, endedAt: verified.endedAt } });
-      store.dispatch({ type: "ended" }, { reason: "ended" });
+      const connection = current?.connectionIdentity ?? current?.identity ?? store.snapshot().localIdentity ?? null;
+      let why;
+      try {
+        why = options.readExit !== void 0 && connection !== null ? await options.readExit(connection, current?.meetingPass ?? null) : void 0;
+      } catch {
+        why = null;
+      }
+      store.dispatch({ type: "ended" }, { reason: why?.exitReason === "time_limit" ? "time_limit" : "ended" });
       await dropRoom();
       options.onLeft?.("ended");
     } catch (error) {
@@ -6394,6 +6457,7 @@ function createRoomEngine(options) {
     current = token;
     lastServerUrl = token.serverUrl;
     connectionPolicy = token.connectionPolicy ?? DEFAULT_CONNECTION_POLICY;
+    store.patch({ captionsStartTimeoutSeconds: connectionPolicy.captionsStartTimeoutSeconds });
     if (token.leavePolicy !== void 0) store.patch({ leavePolicy: token.leavePolicy });
     store.patch({ canReclaim: token.canReclaim === true });
     store.patch({
@@ -6838,6 +6902,7 @@ function createRoomEngine(options) {
     acceptDeviceOffer: () => media.acceptOffer(),
     dismissDeviceOffer: () => media.dismissOffer(),
     dismissDeviceNotice: () => media.dismissNotice(),
+    undoDeviceNotice: () => media.undoNotice(),
     pin(who) {
       store.patch({ pinned: who, layout: who === null ? "grid" : "speaker" });
     },
@@ -8840,6 +8905,22 @@ function createMeetingRecordCache(options = {}) {
   };
 }
 
+// src/core/captions-state.ts
+var CAPTIONS_TIMEOUT_REASON = "Captions are unavailable right now.";
+function resolveCaptionsState(i) {
+  if (!i.on) return { state: "off", reason: null, remedy: null };
+  if (i.takerState === "transcribing" && i.takerPresent) return { state: "live", reason: null, remedy: null };
+  if (i.takerState === "joining" && !i.timedOut) return { state: "starting", reason: null, remedy: null };
+  if (i.refusal !== null && i.refusal.reason.length > 0) {
+    return { state: "unavailable", reason: i.refusal.reason, remedy: i.refusal.remedy.length > 0 ? i.refusal.remedy : null };
+  }
+  if (i.takerState === "ended" || i.takerState === "handoff_pending") {
+    return { state: "unavailable", reason: i.takerLabel, remedy: null };
+  }
+  if (i.timedOut) return { state: "unavailable", reason: CAPTIONS_TIMEOUT_REASON, remedy: null };
+  return { state: "starting", reason: null, remedy: null };
+}
+
 // src/core/layout.ts
 var DEFAULT_PAGE_SIZE = 12;
 function orderParticipants(participants, activeSpeakers) {
@@ -8930,7 +9011,8 @@ function useRoom() {
     local,
     // An observer (role `viewer`) publishes nothing: no Share screen to press and be refused (MD-16).
     sharingAllowed: snapshot === null || canShareUnder(snapshot.livePolicy, effectiveRole(snapshot), effectiveStanding(snapshot)),
-    canShareScreen: (engine?.supportsScreenShare() ?? true) && !isObserverRole(snapshot?.grants.role ?? null) && (snapshot === null || canShareUnder(snapshot.livePolicy, effectiveRole(snapshot), effectiveStanding(snapshot))),
+    canShareScreen: (engine?.supportsScreenShare() ?? true) && !isObserverRole(snapshot?.grants.role ?? null) && // The server's word that sharing was taken away arrives before the rules refresh does: the control goes at once.
+    !(snapshot?.share.state === "ended" && snapshot.share.reason === "not_allowed") && (snapshot === null || canShareUnder(snapshot.livePolicy, effectiveRole(snapshot), effectiveStanding(snapshot))),
     otherPresenter: otherPresenterOf(snapshot),
     join: useCallback2(
       async (request) => requireEngine(engine, "join").join(request),
@@ -9327,32 +9409,37 @@ function useCaptions() {
     if (host === null || meeting === null) return;
     void host.ai.requestCaptions({ meetingId: meeting.id });
   }, [host, meeting]);
+  const [timedOut, setTimedOut] = useState3(false);
+  const timeoutSeconds = snapshot?.captionsStartTimeoutSeconds ?? 20;
+  const live = taker.state === "transcribing" && taker.present;
+  const [attempt, setAttempt] = useState3(0);
+  useEffect3(() => {
+    setTimedOut(false);
+    if (!on || live) return void 0;
+    const id = setTimeout(() => setTimedOut(true), timeoutSeconds * 1e3);
+    return () => clearTimeout(id);
+  }, [on, live, timeoutSeconds, attempt]);
   const toggle = useCallback2(() => {
     if (host === null) return;
     const next = !on;
     host.store.patch({ captionsOn: next, captionsRefusal: null });
     if (next && taker.state !== "joining" && taker.state !== "transcribing") request();
   }, [host, on, taker.state, request]);
-  let state = "off";
-  let reason = null;
-  let remedy = null;
-  if (on) {
-    if (taker.state === "transcribing" && taker.present) {
-      state = "live";
-    } else if (taker.state === "joining") {
-      state = "starting";
-    } else if (refusal2 !== null && refusal2.reason.length > 0) {
-      state = "unavailable";
-      reason = refusal2.reason;
-      remedy = refusal2.remedy.length > 0 ? refusal2.remedy : null;
-    } else if (taker.state === "ended" || taker.state === "handoff_pending") {
-      state = "unavailable";
-      reason = noteTakerLabel(taker);
-    } else {
-      state = "starting";
-    }
-  }
-  return { on, state, reason, remedy, toggle };
+  const retry = useCallback2(() => {
+    if (host === null) return;
+    host.store.patch({ captionsOn: true, captionsRefusal: null });
+    setAttempt((n) => n + 1);
+    request();
+  }, [host, request]);
+  const view = resolveCaptionsState({
+    on,
+    takerState: taker.state,
+    takerPresent: taker.present,
+    refusal: refusal2,
+    takerLabel: on ? noteTakerLabel(taker) : "",
+    timedOut
+  });
+  return { on, state: view.state, reason: view.reason, remedy: view.remedy, toggle, retry };
 }
 function useEndMeeting() {
   const host = useMeetHost();
@@ -9410,6 +9497,7 @@ function useMediaSupervisor() {
     acceptOffer: useCallback2(async () => engine?.acceptDeviceOffer(), [engine]),
     dismissOffer: useCallback2(() => engine?.dismissDeviceOffer(), [engine]),
     dismissNotice: useCallback2(() => engine?.dismissDeviceNotice(), [engine]),
+    undoNotice: useCallback2(async () => engine?.undoDeviceNotice(), [engine]),
     retry: useCallback2(
       async (kind) => kind === "microphone" ? engine?.setMicrophoneEnabled(true) : engine?.setCameraEnabled(true),
       [engine]
@@ -9879,19 +9967,19 @@ function useLivePolicy() {
   const host = useMeetHost();
   const pending = consentPending(policy, role, snapshot?.recording === "recording", snapshot?.recordingConsentGiven === true);
   const viewOnly = pending && policy.recordingConsent === "view_only_until_agree";
-  const idle = snapshot !== null && snapshot.recording !== "recording" && snapshot.recording !== "starting" && snapshot.recording !== "stopping";
-  const given = snapshot?.recordingConsentGiven === true;
   const store = host?.store ?? null;
-  useEffect3(() => {
-    if (idle && given) store?.patch({ recordingConsentGiven: false });
-  }, [idle, given, store]);
   return {
     canChat: canChat(policy, role),
     chatMode: policy.chatMode,
     micLocked: isLockedFor(policy, role, "microphone") || viewOnly,
     cameraLocked: isLockedFor(policy, role, "camera") || viewOnly,
     consent: pending ? policy.recordingConsent === "ok_or_leave" ? "ok_or_leave" : "view_only_until_agree" : null,
-    agree: () => store?.patch({ recordingConsentGiven: true }),
+    // The person's agreement is recorded by the SERVER (per run); the screen follows at once and
+    // takes it back if the server did not save it.
+    agree: () => {
+      store?.patch({ recordingConsentGiven: true });
+      void host?.meetings.acknowledgeConsent().catch(() => store?.patch({ recordingConsentGiven: false }));
+    },
     minutesLeft: left,
     timeWarning: left !== null && left <= policy.timeLimitWarningMinutes
   };
@@ -12690,7 +12778,7 @@ function SpeakingWhileMutedNudge() {
 }
 function MediaNotices() {
   const media = useLocalMedia();
-  const { region, where, enableAudio, acceptOffer, dismissOffer, dismissNotice, retry } = useMediaSupervisor();
+  const { region, where, enableAudio, acceptOffer, dismissOffer, dismissNotice, undoNotice, retry } = useMediaSupervisor();
   const [fixing, setFixing] = useState5(null);
   const chips = ["microphone", "camera"].flatMap((kind) => {
     const reason = deviceUnavailableReason(media[kind], region.permission[kind]);
@@ -12755,9 +12843,10 @@ function MediaNotices() {
       {
         className: "mx-meet__media-pill",
         role: "status",
-        ...notice.outcome === "lost" ? { "data-meet-notice": "device-lost" } : {},
+        "data-meet-notice": notice.outcome === "lost" ? "device-lost" : "device-switched",
         children: [
-          /* @__PURE__ */ jsx6("span", { children: notice.outcome === "switched" ? `${notice.from || name(notice.kind)} disconnected \xB7 now using ${notice.to || "the default"}` : `${notice.from || name(notice.kind)} disconnected` }),
+          /* @__PURE__ */ jsx6("span", { children: notice.outcome === "switched" ? `${notice.from || name(notice.kind)} disconnected \xB7 switched to ${notice.to || "the default"}` : `${notice.from || name(notice.kind)} disconnected` }),
+          notice.outcome === "switched" ? /* @__PURE__ */ jsx6("button", { type: "button", className: "mx-meet__link", onClick: () => void undoNotice(), children: "Undo" }) : null,
           /* @__PURE__ */ jsx6("button", { type: "button", className: "mx-meet__toast-close", "aria-label": "Dismiss", onClick: dismissNotice, children: /* @__PURE__ */ jsx6(CloseIcon, { width: 14, height: 14 }) })
         ]
       }
@@ -12810,7 +12899,7 @@ function MeetingOverlays() {
       live.minutesLeft,
       " ",
       live.minutesLeft === 1 ? "minute" : "minutes",
-      " (time limit)."
+      "."
     ] }) : null,
     notice !== null && notice.kind !== "removed" ? (
       // A host's request ("the host is asking you to unmute"), not an error:
@@ -13869,11 +13958,14 @@ function Captions({ lines = 3 }) {
   const captions = useCaptions();
   if (!captions.on) return null;
   if (captions.state === "unavailable") {
-    return /* @__PURE__ */ jsx6("div", { className: "mx-meet__captions", role: "status", "data-meet-notice": "captions-unavailable", children: /* @__PURE__ */ jsxs4("p", { className: "mx-meet__caption", children: [
-      "Captions are unavailable. ",
-      captions.reason,
-      captions.remedy !== null ? ` ${captions.remedy}` : ""
-    ] }) });
+    return /* @__PURE__ */ jsxs4("div", { className: "mx-meet__captions", role: "status", "data-meet-notice": "captions-unavailable", children: [
+      /* @__PURE__ */ jsxs4("p", { className: "mx-meet__caption", children: [
+        (captions.reason ?? "").startsWith("Captions are unavailable") ? "" : "Captions are unavailable. ",
+        captions.reason,
+        captions.remedy !== null ? ` ${captions.remedy}` : ""
+      ] }),
+      /* @__PURE__ */ jsx6("button", { type: "button", className: "mx-meet__caption-retry", onClick: captions.retry, children: "Try again" })
+    ] });
   }
   if (visible.length === 0) {
     return /* @__PURE__ */ jsx6("div", { className: "mx-meet__captions", "aria-live": "polite", "aria-label": "Live captions", "data-meet-caption": captions.state, children: /* @__PURE__ */ jsx6("p", { className: "mx-meet__caption mx-meet__caption--interim", children: captions.state === "starting" ? "Starting captions. They appear as people speak." : "Captions are on. They appear as people speak." }) });