@ai-matrx/meet 0.11.44 → 0.11.45

package/dist/react.cjs

@@ -358,7 +358,14 @@ function createTabClaim(platform = webTabPlatform()) {
     if (message.kind === "tab-alive?" && mine !== null && message.tabId === mine && message.from !== self) {
       platform.bus?.post({ kind: "tab-alive", tabId: mine });
     } else if (message.kind === "who-is-in?" && current !== null && mine !== null && message.from !== self && message.room === current.room && message.person === current.person) {
-      platform.bus?.post({ kind: "in-room", room: current.room, person: current.person, tabId: mine, to: message.from });
+      platform.bus?.post({
+        kind: "in-room",
+        room: current.room,
+        person: current.person,
+        tabId: mine,
+        to: message.from,
+        rule: current.rule
+      });
     }
   }) ?? (() => {
   });
@@ -388,28 +395,32 @@ function createTabClaim(platform = webTabPlatform()) {
     return candidate;
   }
   const tabId = claim();
+  async function presence(room, person) {
+    const bus = platform.bus;
+    if (bus === null) return null;
+    let seen = null;
+    const stop = bus.subscribe((message) => {
+      if (message.kind === "in-room" && message.to === self && message.room === room && message.person === person) {
+        seen = { rule: seen?.rule ?? message.rule ?? null };
+      }
+    });
+    bus.post({ kind: "who-is-in?", room, person, from: self });
+    await wait(TAB_ANSWER_MS);
+    stop();
+    return seen;
+  }
   return {
     tabId,
-    inRoom(room, person) {
-      current = { room, person };
+    inRoom(room, person, rule) {
+      current = { room, person, rule: rule ?? null };
     },
     left() {
       current = null;
     },
     async presentElsewhere(room, person) {
-      const bus = platform.bus;
-      if (bus === null) return false;
-      let seen = false;
-      const stop = bus.subscribe((message) => {
-        if (message.kind === "in-room" && message.to === self && message.room === room && message.person === person) {
-          seen = true;
-        }
-      });
-      bus.post({ kind: "who-is-in?", room, person, from: self });
-      await wait(TAB_ANSWER_MS);
-      stop();
-      return seen;
+      return await presence(room, person) !== null;
     },
+    presenceElsewhere: (room, person) => presence(room, person),
     dispose() {
       unsubscribe();
     }
@@ -587,7 +598,8 @@ function createWebResumeStorage() {
     }
   };
 }
-var CLEARS_RESUME = (phase) => phase === "left" || phase === "removed" || phase === "superseded" || phase === "inactive" || phase === "ended" || phase === "record" || phase === "prejoin" || phase.startsWith("refused:") || phase.startsWith("waiting:");
+var CLEARS_RESUME = (phase) => phase === "left" || phase === "removed" || phase === "superseded" || phase === "inactive" || phase === "ended" || phase === "record" || phase === "prejoin" || phase === "denied" || phase === "knock_expired" || phase.startsWith("refused:");
+var WAITING_RESUMES = (phase) => phase.startsWith("waiting:");
 function autoRejoinDelayMs(attempt, random = Math.random) {
   const base = Math.min(15e3, 1e3 * 2 ** Math.max(0, attempt));
   return Math.round(base * (0.5 + random()));
@@ -719,6 +731,10 @@ function createConnectionSupervisor(options) {
         rejoinAttempts = 0;
         stopRejoin();
         saveMarker(true);
+      } else if (WAITING_RESUMES(phase)) {
+        stopRejoin();
+        driverRegion = null;
+        saveMarker(true);
       } else if (phase === "disconnected") {
         driverRegion = null;
         saveMarker(true);
@@ -1239,6 +1255,7 @@ function parseRoomToken(body, roomName) {
     connectionIdentity: readString(payload, "connection_identity") ?? personKey,
     connectionKind: readString(payload, "connection_kind") === "companion" ? "companion" : "main",
     secondDeviceChoice,
+    secondDeviceRule: readString(payload, "second_device_rule"),
     displayName: readString(payload, "display_name") ?? readString(payload, "displayName") ?? identity,
     expiresAt,
     canPublish: readBoolean(payload, "can_publish", true),
@@ -1952,6 +1969,12 @@ var JOINABLE_FROM = /* @__PURE__ */ new Set([
   // allows the press; the server's gate decides whether it knocks or is refused again.
   "refused:lobby_rejects"
 ]);
+var RETRYABLE_REFUSALS = /* @__PURE__ */ new Set([
+  "refused:locked",
+  "refused:too_early",
+  "refused:meeting_full",
+  "refused:platform_capacity"
+]);
 var NOT_ENDABLE = /* @__PURE__ */ new Set([
   "ended",
   "record",
@@ -2017,7 +2040,7 @@ function nextPhase(from, event) {
     case "link_state":
       return from === "resolving" && event.reason !== null && isJoinRefusalReason(event.reason) ? refusalPhase(event.reason) : null;
     case "join":
-      return JOINABLE_FROM.has(from) ? "joining" : null;
+      return JOINABLE_FROM.has(from) || RETRYABLE_REFUSALS.has(from) ? "joining" : null;
     case "auto_rejoin":
       return from === "disconnected" ? "joining" : null;
     case "resumed":
@@ -2859,6 +2882,10 @@ var RPCS = {
   admitAll: "meet_admit_all",
   setLock: "meet_set_lock",
   recordConsent: "meet_record_consent",
+  /** One meeting rule as the gate obeys it (the knob ladder, this meeting's rung included). */
+  meetingRule: "meet_policy",
+  /** A host sets one rule for THIS meeting (the `meet_meeting` rung); refusals come back as `{ok:false}`. */
+  setMeetingRule: "meet_policy_set",
   /*
    * ── MEET WAVE 1 — management (0.8). Every write is a SECURITY DEFINER door
    * authorized by the meeting's host or a real iam grant (editor to change,
@@ -2905,7 +2932,7 @@ var INVITEE_COLUMNS = "id,meeting_id,invitee_user_id,email,display_name,role,rsv
 var RECORDING_COLUMNS = "id,meeting_id,state,started_at,ended_at,started_by,file_id,failure_reason";
 var SEGMENT_COLUMNS = "id,meeting_id,identity,speaker,text,started_at,is_final,metadata";
 var NOTE_COLUMNS = "id,meeting_id,text,kind,assignee_user_id,created_at,metadata";
-var ATTENDEE_COLUMNS = "id,meeting_id,identity,participant_user_id,display_name,avatar_url,role,admission_state,knocked_at,knock_expires_at,is_agent,joined_at,left_at,sessions:metadata->sessions";
+var ATTENDEE_COLUMNS = "id,meeting_id,identity,participant_user_id,display_name,avatar_url,role,admission_state,knocked_at,knock_expires_at,is_agent,joined_at,left_at,sessions:metadata->sessions,knock_flag:metadata->>knock_flag";
 function projectStays(value) {
   if (!Array.isArray(value)) return [];
   const stays = [];
@@ -3305,6 +3332,8 @@ function createMeetRepository(options) {
       admissionState: states.includes(admission) ? admission : "admitted",
       knockedAt: text(row, "knocked_at"),
       knockExpiresAt: text(row, "knock_expires_at"),
+      // The list read selects `metadata->>knock_flag`; a Postgres Changes row carries `metadata`.
+      knockFlag: text(row, "knock_flag") ?? (typeof row["metadata"] === "object" && row["metadata"] !== null ? text(row["metadata"], "knock_flag") : null),
       isAgent: bool(row, "is_agent", false),
       joinedAt: text(row, "joined_at"),
       leftAt: text(row, "left_at"),
@@ -3628,6 +3657,25 @@ function createMeetRepository(options) {
       );
       return projectMeeting(row);
     },
+    async meetingRule(meetingId, key) {
+      const response = await db.rpc(RPCS.meetingRule, { p_meeting_id: meetingId, p_key: key });
+      if (response.error !== null) throw normalizeMeetError(response.error, "meet.meetingRule");
+      return response.data;
+    },
+    async setMeetingRule(meetingId, key, value) {
+      const response = await db.rpc(RPCS.setMeetingRule, { p_meeting_id: meetingId, p_key: key, p_value: value });
+      if (response.error !== null) throw normalizeMeetError(response.error, "meet.setMeetingRule");
+      const answer = response.data ?? {};
+      if (answer["ok"] !== true) {
+        throw new MeetError(
+          "forbidden",
+          typeof answer["detail"] === "string" ? answer["detail"] : "This meeting's rule was not changed.",
+          "Only the meeting's host or a co-host sets its rules; an organization can lock a rule for everyone.",
+          answer
+        );
+      }
+      return answer["effective_value"];
+    },
     async transcript(meetingId, limit = 1e3) {
       const response = await db.from(TABLES.transcripts).select(SEGMENT_COLUMNS).eq("meeting_id", meetingId).order("started_at", { ascending: true }).order("id", { ascending: true }).limit(limit);
       if (response.error !== null) throw normalizeMeetError(response.error, "meet.transcript");
@@ -4522,7 +4570,8 @@ function lobbyEntryFrom(attendee, now = Date.now()) {
     knockedAt: attendee.knockedAt ?? attendee.joinedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     knockExpiresAt: attendee.knockExpiresAt ?? null,
     decidedAt: null,
-    decidedBy: null
+    decidedBy: null,
+    flag: attendee.knockFlag ?? null
   };
 }
 function deniedEntryFrom(attendee) {
@@ -5054,6 +5103,17 @@ function createMeetingSession(options) {
     async askAgain() {
       await options.rejoin?.();
     },
+    async meetingRule(key) {
+      const meeting = requireMeeting("meet.meetingRule");
+      return repository.meetingRule(meeting.id, key);
+    },
+    async setMeetingRule(key, value) {
+      requireHostUser("meet.setMeetingRule");
+      const meeting = requireMeeting("meet.setMeetingRule");
+      const effective = await repository.setMeetingRule(meeting.id, key, value);
+      hint();
+      return effective;
+    },
     async setLock(locked) {
       const by = requireHostUser("meet.setLock");
       const meeting = requireMeeting("meet.setLock");
@@ -6319,7 +6379,7 @@ function createRoomEngine(options) {
       const { secondDevice: _answered, ...rest } = lastRequest;
       lastRequest = rest;
     }
-    options.tabClaim?.inRoom(String(request.roomName), String(token.identity));
+    options.tabClaim?.inRoom(String(request.roomName), String(token.identity), token.secondDeviceRule ?? null);
     current = token;
     lastServerUrl = token.serverUrl;
     connectionPolicy = token.connectionPolicy ?? DEFAULT_CONNECTION_POLICY;
@@ -6631,10 +6691,12 @@ function createRoomEngine(options) {
       if (claim === void 0 || userId === null) return false;
       const before = store.snapshot();
       if (before.phase !== "prejoin" || before.secondDevice !== null) return false;
-      if (!await claim.presentElsewhere(String(roomName), `user:${String(userId)}`)) return false;
+      const person = `user:${String(userId)}`;
+      const found = claim.presenceElsewhere !== void 0 ? await claim.presenceElsewhere(String(roomName), person) : await claim.presentElsewhere(String(roomName), person) ? { rule: null } : null;
+      if (found === null || found.rule === "allow_both") return false;
       const now2 = store.snapshot();
       if (now2.phase !== "prejoin" || now2.secondDevice !== null) return false;
-      store.patch({ secondDevice: { rule: "ask_switch_or_join" } });
+      store.patch({ secondDevice: { rule: found.rule ?? "ask_switch_or_join" } });
       report("info", "meet: this browser already has you in this meeting \u2014 offering the choice before Join");
       return true;
     },
@@ -10439,6 +10501,10 @@ function actionsFor(host) {
     leave: () => engine.leave(),
     backToPrejoin: () => engine.backToPrejoin(),
     retry: () => {
+      if (RETRYABLE_REFUSALS.has(store.snapshot().phase)) {
+        void engine.rejoin().catch(() => void 0);
+        return;
+      }
       store.dispatch({ type: "retry", click: true });
     },
     resolved: () => {
@@ -12158,6 +12224,7 @@ function ControlBar({ onLeave }) {
                 ]
               }
             ),
+            /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(WaitingRoomRule, {}),
             queue.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
               MenuItem,
               {
@@ -12377,6 +12444,58 @@ function MenuItem({
     }
   );
 }
+var LOBBY_BYPASS_CHOICES = [
+  { value: "everyone", label: "Everyone" },
+  { value: "org_and_invited", label: "Your organization and invited people" },
+  { value: "org", label: "Your organization" },
+  { value: "invited", label: "Invited people" },
+  { value: "host_only", label: "Only hosts" }
+];
+function WaitingRoomRule() {
+  const host = useRequiredMeetHost();
+  const [open, setOpen] = (0, import_react10.useState)(false);
+  const [value, setValue] = (0, import_react10.useState)(null);
+  const [notice, setNotice] = (0, import_react10.useState)(null);
+  (0, import_react10.useEffect)(() => {
+    let live = true;
+    void host.meetings.meetingRule("lobby_bypass").then((rule) => {
+      if (live) setValue(typeof rule === "string" ? rule : null);
+    }).catch(() => void 0);
+    return () => {
+      live = false;
+    };
+  }, [host]);
+  const current = LOBBY_BYPASS_CHOICES.find((choice) => choice.value === value)?.label ?? null;
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(MenuItem, { onSelect: () => setOpen(!open), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(LockIcon, { width: 16, height: 16 }),
+      " Who can skip the waiting room",
+      current !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { className: "mx-meet__menu-value", children: current }) : null
+    ] }),
+    open ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { role: "group", "aria-label": "Who can skip the waiting room", "data-meet-rule": "lobby_bypass", children: [
+      LOBBY_BYPASS_CHOICES.map((choice) => /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
+        "button",
+        {
+          type: "button",
+          role: "menuitemradio",
+          "aria-checked": choice.value === value,
+          className: "mx-meet__menu-item mx-meet__menu-item--sub",
+          onClick: () => {
+            setNotice(null);
+            void host.meetings.setMeetingRule("lobby_bypass", choice.value).then(() => setValue(choice.value)).catch((error) => setNotice(error instanceof Error ? error.message : String(error)));
+          },
+          children: [
+            choice.value === value ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(CheckIcon, { width: 14, height: 14 }) : null,
+            " ",
+            choice.label
+          ]
+        },
+        choice.value
+      )),
+      notice !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { className: "mx-meet__menu-note", role: "status", children: notice }) : null
+    ] }) : null
+  ] });
+}
 function Toast({ text: text3, failed, onDone }) {
   (0, import_react10.useEffect)(() => {
     const timer = setTimeout(onDone, failed ? 7e3 : 4e3);
@@ -13465,7 +13584,11 @@ function WaitingList({ lobby }) {
           /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Avatar, { name: entry.displayName, url: entry.avatarUrl, size: 32 }),
           /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("span", { className: "mx-meet__person-name", children: [
             entry.displayName,
-            entry.userId === null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { className: "mx-meet__badge", children: "Guest" }) : null
+            entry.userId === null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { className: "mx-meet__badge", children: "Guest" }) : null,
+            entry.flag === "previously_removed" ? (
+              // `mod-removed-bypass`: advice for the host, never a block — Admit stays.
+              /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { className: "mx-meet__badge mx-meet__badge--warn", "data-meet-notice": "knock-flagged", children: "Previously removed" })
+            ) : null
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ControlButton, { label: `Admit ${entry.displayName}`, onClick: () => void lobby.admit(entry), children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(CheckIcon, { width: 16, height: 16 }) }),
           /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
@@ -14090,7 +14213,20 @@ function ExitScreen({ onLeave }) {
   const { phase, reason, host, snapshot, actions, call, connection } = useMeetCore();
   const [busy, setBusy] = (0, import_react10.useState)(false);
   const failure = snapshot?.failure ?? null;
-  const retryLeft = useCountdown(phase === "refused:lobby_rejects" ? failure?.retryAt ?? null : null);
+  const retryLeft = useCountdown(
+    phase === "refused:lobby_rejects" || phase === "refused:too_early" ? failure?.retryAt ?? null : null
+  );
+  const reaskedAtZero = (0, import_react10.useRef)(false);
+  (0, import_react10.useEffect)(() => {
+    if (phase !== "refused:too_early") {
+      reaskedAtZero.current = false;
+      return;
+    }
+    if (retryLeft === 0 && !reaskedAtZero.current) {
+      reaskedAtZero.current = true;
+      actions.retry();
+    }
+  }, [phase, retryLeft, actions]);
   const rejoin = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
     import_design_system.Button,
     {
@@ -14128,11 +14264,19 @@ function ExitScreen({ onLeave }) {
   if (phase.startsWith("refused:")) {
     const code = phase.slice("refused:".length);
     title = REFUSED_TITLES[code] ?? "You can't join this meeting";
-    line = code === "too_early" || code === "registration_required" || code === "cancelled" ? failure?.remedy ?? null : null;
+    line = code === "too_early" || code === "registration_required" || code === "cancelled" || code === "wrong_account" ? failure?.remedy ?? null : null;
+    if (code === "too_early" && retryLeft !== null && retryLeft > 0) line = `Opens in ${clockText(retryLeft)}`;
     actionsNode = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Button, { type: "button", variant: "outline", onClick: actions.retry, children: "Try again" }),
       home
     ] });
+    if (code === "sign_in_required" || code === "wrong_account") {
+      const back = typeof window === "undefined" ? "/" : `${window.location.pathname}${window.location.search}`;
+      actionsNode = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Button, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("a", { href: `/login?redirectTo=${encodeURIComponent(back)}`, children: code === "sign_in_required" ? "Sign in" : "Switch account" }) }),
+        home
+      ] });
+    }
     if (code === "lobby_rejects") {
       if (retryLeft !== null && retryLeft > 0) {
         line = `You can ask again in ${clockText(retryLeft)}`;