@ai-matrx/meet 0.11.49 → 0.11.50

package/dist/react.js

@@ -4451,7 +4451,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 +4475,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 +4782,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 +5194,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 +5221,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 +5229,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 +5351,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 +5588,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 +5617,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 +6119,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) {
@@ -6838,6 +6898,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" });
     },
@@ -9410,6 +9471,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 +9941,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 +12752,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 +12817,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 +12873,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: