@ai-matrx/meet 0.11.50 → 0.11.52

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,
@@ -5781,6 +5784,16 @@ var ALIVE_TOPIC = "mx.alive";
 function encodeBeat(beat) {
   return JSON.stringify({ q: beat.q, vp: beat.vp });
 }
+function encodeBye() {
+  return JSON.stringify({ bye: true });
+}
+function isBye(payload) {
+  try {
+    return JSON.parse(payload).bye === true;
+  } catch {
+    return false;
+  }
+}
 function decodeBeat(payload) {
   try {
     const raw = JSON.parse(payload);
@@ -6007,6 +6020,7 @@ function createRoomEngine(options) {
   const autoOff = createVideoAutoOff(() => connectionPolicy.videoAutoOffAfterPoorSeconds * 1e3, now);
   const lkQuality = /* @__PURE__ */ new Map();
   let silent = /* @__PURE__ */ new Set();
+  const saidBye = /* @__PURE__ */ new Set();
   let healthTimer = null;
   let lastBeatAt = 0;
   let wasUnstable = false;
@@ -6037,6 +6051,7 @@ function createRoomEngine(options) {
     assessor.reset();
     autoOff.reset();
     silent = /* @__PURE__ */ new Set();
+    saidBye.clear();
     lkQuality.clear();
     lastBeatAt = 0;
     wasUnstable = false;
@@ -6094,6 +6109,13 @@ function createRoomEngine(options) {
     await target?.disconnect();
   }
   async function leaveRoom() {
+    const target = driver;
+    if (target !== null && store.snapshot().phase === "in_call") {
+      await Promise.race([
+        target.publishData(ALIVE_TOPIC, encodeBye()).catch(() => void 0),
+        new Promise((resolve) => setTimeout(resolve, 300))
+      ]);
+    }
     store.dispatch({ type: "leave" });
     await dropRoom();
     options.onLeft?.(null);
@@ -6189,8 +6211,6 @@ function createRoomEngine(options) {
     },
     participantLeft(who, reason) {
       departures.set(who, reason);
-      liveness.forget(who);
-      silent.delete(who);
     },
     roomMetadata(metadata) {
       let parsed = {};
@@ -6233,8 +6253,12 @@ function createRoomEngine(options) {
       const snap = store.snapshot();
       if (snap.phase !== "in_call" || snap.connection !== "stable") return;
       startHealth();
+      const before = assessor.current();
       const quality = assessor.push(reading);
       const path = pathOf(reading);
+      if (quality !== before) {
+        report("info", `meet: this connection reads ${quality} (round trip ${reading.rttMs ?? "?"} ms, path ${path})`, "Diagnostic only.");
+      }
       patchLocalNetwork({ quality, ...path !== "unknown" ? { path } : {} });
       refreshQualities();
       const cameraOn = snap.media.camera.enabled;
@@ -6249,6 +6273,11 @@ function createRoomEngine(options) {
     connectionState(state) {
       supervisor.driverState(state);
       if (state === "connected" && store.snapshot().phase === "joining") store.dispatch({ type: "connected" });
+      if (state === "connected") {
+        startHealth();
+        lastBeatAt = 0;
+        healthTick();
+      }
     },
     transcription(event) {
       const snapshot = store.snapshot();
@@ -6340,6 +6369,10 @@ function createRoomEngine(options) {
       }
       const sender = personOf(from ?? "");
       if (from !== null) {
+        if (topic === ALIVE_TOPIC && isBye(payload)) {
+          saidBye.add(from);
+          return;
+        }
         const beat = topic === ALIVE_TOPIC ? decodeBeat(payload) : null;
         const before = liveness.reported(from);
         liveness.heard(from, beat);
@@ -6454,6 +6487,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({
@@ -6571,10 +6605,17 @@ function createRoomEngine(options) {
     const graceMs = connectionPolicy.reconnectGraceSeconds * 1e3;
     for (const [who, reason] of departures) {
       const last = previous.get(who);
-      if (last !== void 0 && !last.isLocal && !present.has(who) && graceMs > 0 && isUnannouncedDeparture(reason)) {
+      const dropped = !saidBye.has(who) && (isUnannouncedDeparture(reason) || silent.has(who));
+      report("info", `meet: ${who} left the room (${reason ?? "no reason"}${dropped ? ", held as reconnecting" : ""})`, "Diagnostic only.");
+      if (last !== void 0 && !last.isLocal && !present.has(who) && graceMs > 0 && dropped) {
         ghosts.set(who, { participant: last, until: at + graceMs });
       }
     }
+    for (const who of departures.keys()) {
+      liveness.forget(who);
+      silent.delete(who);
+      saidBye.delete(who);
+    }
     departures.clear();
     liveRoster = list;
     const localNow = list.find((p) => p.isLocal);
@@ -8901,6 +8942,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) {
@@ -8991,7 +9048,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),
@@ -9388,32 +9446,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();
@@ -13932,11 +13995,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." }) });