@ai-matrx/meet 0.11.31 → 0.11.33

package/dist/skins/meet.cjs

@@ -113,11 +113,17 @@ var import_react10 = require("react");
 var import_react8 = require("react");
 
 // src/core/names.ts
+var CONNECTION_SEPARATOR = "~";
+function personOf(identity) {
+  const value = String(identity ?? "").trim();
+  const cut = value.indexOf(CONNECTION_SEPARATOR);
+  return cut === -1 ? value : value.slice(0, cut);
+}
 function isGuestIdentity(identity) {
-  return String(identity).startsWith("guest:");
+  return personOf(identity).startsWith("guest:");
 }
 function isAgentIdentity(identity) {
-  return String(identity).startsWith("agent:");
+  return personOf(identity).startsWith("agent:");
 }
 var NOTE_TAKER_PRODUCT_NAME = "Matrx note-taker";
 var AGENT_PRODUCT_NAME = "Matrx agent";
@@ -167,12 +173,18 @@ var MeetError = class extends Error {
    * renders `refused:<reason>` (or `ended`) from it — never from the HTTP status.
    */
   reason;
-  constructor(code, message, remedy, cause, reason) {
+  /**
+   * A refusal that lifts by itself says when: whole seconds from the moment the server answered
+   * (a denial's cooldown, `reknock_cooldown_seconds`). Null for every refusal that does not.
+   */
+  retryAfterSeconds;
+  constructor(code, message, remedy, cause, reason, retryAfterSeconds) {
     super(message);
     this.name = "MeetError";
     this.code = code;
     this.remedy = remedy;
     this.reason = reason ?? null;
+    this.retryAfterSeconds = retryAfterSeconds ?? null;
     if (cause !== void 0) this.cause = cause;
   }
   /** True when retrying after the host re-establishes a session is the fix. */
@@ -1185,6 +1197,7 @@ function useRoom() {
     phase: snapshot?.phase ?? "resolving",
     participants: snapshot?.participants ?? [],
     failure: snapshot?.failure ?? null,
+    secondDevice: snapshot?.secondDevice ?? null,
     local,
     canShareScreen: engine?.supportsScreenShare() ?? true,
     join: (0, import_react5.useCallback)(
@@ -1277,6 +1290,7 @@ function useLobby() {
   const session = host?.meetings ?? null;
   return {
     waiting: (snapshot?.lobby ?? []).filter((entry) => entry.state === "knocking"),
+    declined: (snapshot?.lobby ?? []).filter((entry) => entry.state === "denied"),
     // No runtime means no host powers — `<LobbyPanel>` renders nothing rather
     // than an admit button that would throw.
     canAdmit: session !== null && isHost,
@@ -1298,6 +1312,37 @@ function useLobby() {
     )
   };
 }
+function useCountdown(untilMs) {
+  const [now, setNow] = (0, import_react5.useState)(() => Date.now());
+  const active = typeof untilMs === "number" && untilMs > now;
+  (0, import_react5.useEffect)(() => {
+    if (!active) return void 0;
+    setNow(Date.now());
+    const timer = setInterval(() => setNow(Date.now()), 1e3);
+    return () => clearInterval(timer);
+  }, [active, untilMs]);
+  if (typeof untilMs !== "number") return null;
+  return Math.max(0, untilMs - now);
+}
+function useKnockNotice() {
+  const lobby = useLobby();
+  const [dismissed, setDismissed] = (0, import_react5.useState)([]);
+  const keyOf = (entry) => `${entry.identity}@${entry.knockedAt}`;
+  const open = lobby.canAdmit ? lobby.waiting.filter((entry) => !dismissed.includes(keyOf(entry))) : [];
+  const knocker = open[0] ?? null;
+  return {
+    knocker,
+    others: Math.max(0, open.length - 1),
+    admit: (0, import_react5.useCallback)(async () => {
+      if (knocker === null) return;
+      setDismissed((list) => [...list, keyOf(knocker)]);
+      await lobby.admit(knocker);
+    }, [knocker, lobby.admit]),
+    dismiss: (0, import_react5.useCallback)(() => {
+      if (knocker !== null) setDismissed((list) => [...list, keyOf(knocker)]);
+    }, [knocker])
+  };
+}
 function useWaiting() {
   const host = useMeetHost();
   const snapshot = useMeetSnapshot();
@@ -3288,6 +3333,7 @@ function ControlBar({ onLeave }) {
       }
     ) }) }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(BreakoutBanner, {}),
+    panel !== "people" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(KnockNotice, { onView: () => setPanel("people") }) : null,
     controls.notice !== null && panel !== "people" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Toast, { text: controls.notice.text, failed: controls.notice.failed, onDone: controls.clearNotice }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__controls", children: [
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
@@ -3618,10 +3664,21 @@ function MediaNotices() {
   const name = (kind) => kind === "microphone" ? "Microphone" : "Camera";
   if (chips.length === 0 && region.audioOutput !== "blocked" && notice === null && offer === null) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__media-notices", children: [
-    region.audioOutput === "blocked" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__media-pill", role: "alert", "data-meet-notice": "audio-blocked", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { children: "Sound is paused in this tab" }),
-      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", className: "mx-meet__primary mx-meet__primary--small", onClick: () => void enableAudio(), children: "Enable sound" })
-    ] }) : null,
+    region.audioOutput === "blocked" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
+      import_design_system.ErrorBox,
+      {
+        as: "div",
+        className: "mx-meet__media-pill",
+        "data-meet-notice": "audio-blocked",
+        message: "Sound is paused in this tab",
+        operation: "Enable meeting sound",
+        origin: "meet/MediaNotices",
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { children: "Sound is paused in this tab" }),
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", className: "mx-meet__primary mx-meet__primary--small", onClick: () => void enableAudio(), children: "Enable sound" })
+        ]
+      }
+    ) : null,
     chips.map(({ kind, reason }) => /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__media-pill", role: "status", "data-meet-notice": deviceNoticeCode(kind, reason), children: [
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { children: deviceChipLabel(kind, reason) }),
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
@@ -4421,9 +4478,68 @@ function useMicrophoneStream(deviceId) {
   }, [deviceId]);
   return stream;
 }
+function KnockNotice({ onView }) {
+  const { knocker, others, admit, dismiss } = useKnockNotice();
+  if (knocker === null) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__notice-bar", role: "status", "data-meet-notice": "knock-received", "data-meet-participant-name": knocker.displayName, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("span", { children: [
+      knocker.displayName,
+      " wants to join",
+      others > 0 ? ` (+${others} more)` : ""
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", className: "mx-meet__link", onClick: () => void admit().catch(() => void 0), children: "Admit" }),
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+      "button",
+      {
+        type: "button",
+        className: "mx-meet__link",
+        onClick: () => {
+          dismiss();
+          onView();
+        },
+        children: "View"
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", className: "mx-meet__toast-close", "aria-label": "Dismiss", onClick: dismiss, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(CloseIcon, { width: 14, height: 14 }) })
+  ] });
+}
 function LobbyPanel() {
   const lobby = useLobby();
-  if (!lobby.canAdmit || lobby.waiting.length === 0) return null;
+  if (!lobby.canAdmit || lobby.waiting.length === 0 && lobby.declined.length === 0) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
+    lobby.waiting.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(WaitingList, { lobby }) : null,
+    lobby.declined.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DeclinedList, { lobby }) : null
+  ] });
+}
+function DeclinedList({ lobby }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("section", { className: "mx-meet__lobby", "aria-label": "Declined requests", "data-meet-declined": "", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("header", { className: "mx-meet__lobby-head", children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("h3", { className: "mx-meet__lobby-title", children: "Declined" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("ul", { className: "mx-meet__lobby-list", children: lobby.declined.map((entry) => /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
+      "li",
+      {
+        className: "mx-meet__lobby-row",
+        "data-meet-declined-entry": "",
+        "data-meet-participant-name": entry.displayName,
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Avatar, { name: entry.displayName, url: entry.avatarUrl, size: 32 }),
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { className: "mx-meet__person-name", children: entry.displayName }),
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+            "button",
+            {
+              type: "button",
+              className: "mx-meet__link",
+              "aria-label": `Let ${entry.displayName} ask again`,
+              onClick: () => void lobby.undeny(entry),
+              children: "Let them ask again"
+            }
+          )
+        ]
+      },
+      entry.identity
+    )) })
+  ] });
+}
+function WaitingList({ lobby }) {
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("section", { className: "mx-meet__lobby", "aria-label": "Waiting room", children: [
     /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("header", { className: "mx-meet__lobby-head", children: [
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("h3", { className: "mx-meet__lobby-title", children: lobby.waiting.length === 1 ? "1 person is waiting" : `${lobby.waiting.length} people are waiting` }),
@@ -4687,6 +4803,21 @@ function PreJoinBody({
   (0, import_react10.useEffect)(() => {
     void host.devices.refresh();
   }, [host]);
+  const joinWith = (secondDevice) => {
+    setJoining(true);
+    preview.release();
+    void room.join({
+      roomName,
+      // An observer publishes nothing: no camera, no microphone (MD-16). A companion
+      // ("join here too") never opens the microphone (S7).
+      mode: observe2 ? "audio" : mode,
+      microphone: observe2 || secondDevice === "join_too" ? false : microphone,
+      ...meetingId !== void 0 ? { meetingId } : {},
+      ...slug !== void 0 ? { slug } : {},
+      ...observe2 ? { observe: true } : {},
+      ...secondDevice !== void 0 ? { secondDevice } : {}
+    }).then(() => onJoined?.()).catch(() => void 0).finally(() => setJoining(false));
+  };
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__prejoin", children: [
     /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__preview", children: [
       mode === "video" && preview.preview !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
@@ -4771,27 +4902,34 @@ function PreJoinBody({
           ),
           /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Label, { htmlFor: "mx-meet-join-mic", children: "Join with microphone" })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
-          import_design_system.Button,
-          {
-            type: "button",
-            className: "mx-meet__join",
-            disabled: joining,
-            onClick: () => {
-              setJoining(true);
-              preview.release();
-              void room.join({
-                roomName,
-                // An observer publishes nothing: no camera, no microphone (MD-16).
-                mode: observe2 ? "audio" : mode,
-                microphone: observe2 ? false : microphone,
-                ...meetingId !== void 0 ? { meetingId } : {},
-                ...slug !== void 0 ? { slug } : {},
-                ...observe2 ? { observe: true } : {}
-              }).then(() => onJoined?.()).catch(() => void 0).finally(() => setJoining(false));
-            },
-            children: joining ? "Joining\u2026" : observe2 ? "Observe" : "Join now"
-          }
+        room.secondDevice === null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Button, { type: "button", className: "mx-meet__join", disabled: joining, onClick: () => joinWith(), children: joining ? "Joining\u2026" : observe2 ? "Observe" : "Join now" }) : (
+          // S7: ALREADY IN THIS MEETING on another tab or device — the meeting's choice
+          // (Meet: Switch here / Join here too; Teams: Transfer here / Add this device).
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { className: "mx-meet__second-device", "data-meet-region": "second-device", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { className: "mx-meet__hint", children: "You're in this meeting on another device" }),
+            /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+              import_design_system.Button,
+              {
+                type: "button",
+                className: "mx-meet__join",
+                "data-meet-control": "switch-here",
+                disabled: joining,
+                onClick: () => joinWith("switch_here"),
+                children: room.secondDevice.rule === "ask_transfer_or_add" ? "Transfer here" : "Switch here"
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+              import_design_system.Button,
+              {
+                type: "button",
+                variant: "outline",
+                "data-meet-control": "join-too",
+                disabled: joining,
+                onClick: () => joinWith("join_too"),
+                children: room.secondDevice.rule === "ask_transfer_or_add" ? "Add this device" : "Join here too"
+              }
+            )
+          ] })
         )
       ] }),
       room.failure !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("p", { className: "mx-meet__error", children: [
@@ -4989,16 +5127,21 @@ var REFUSED_TITLES = {
   not_invited: "You aren't invited to this meeting",
   locked: "This meeting is locked",
   removed: "You can't rejoin this meeting",
-  lobby_rejects: "You can't ask to join this meeting",
+  lobby_rejects: "The host declined your request",
   meeting_full: "This meeting is full",
   platform_capacity: "Meetings are busy right now",
   verification_required: "Verify your account to join",
   registration_required: "Register to join this meeting"
 };
+function clockText(ms) {
+  const total = Math.ceil(ms / 1e3);
+  return `${Math.floor(total / 60)}:${String(total % 60).padStart(2, "0")}`;
+}
 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 rejoin = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
     import_design_system.Button,
     {
@@ -5041,6 +5184,33 @@ function ExitScreen({ onLeave }) {
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Button, { type: "button", variant: "outline", onClick: actions.retry, children: "Try again" }),
       home
     ] });
+    if (code === "lobby_rejects") {
+      if (retryLeft !== null && retryLeft > 0) {
+        line = `You can ask again in ${clockText(retryLeft)}`;
+        notice = "reknock-cooldown";
+        actionsNode = home;
+      } else if (retryLeft === 0) {
+        line = "You can ask to join again";
+        actionsNode = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+            import_design_system.Button,
+            {
+              type: "button",
+              disabled: busy,
+              onClick: () => {
+                setBusy(true);
+                void actions.rejoin().catch(() => void 0).finally(() => setBusy(false));
+              },
+              children: "Ask to join again"
+            }
+          ),
+          home
+        ] });
+      } else {
+        line = "Ask the host to let you in, then open the link again";
+        actionsNode = home;
+      }
+    }
   } else {
     switch (phase) {
       case "left":
@@ -5101,7 +5271,7 @@ function ExitScreen({ onLeave }) {
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Avatar, { name: host?.identity.displayName ?? "", url: host?.identity.avatarUrl ?? null, size: 72 }),
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("h1", { className: "mx-meet__prejoin-title", children: title }),
     line !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { className: "mx-meet__empty-body", children: line }) : null,
-    notice !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { role: "status", "data-meet-notice": notice, className: "mx-meet__sr-only", children: title }) : null,
+    notice !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", { role: "status", "data-meet-notice": notice, className: "mx-meet__sr-only", children: notice === "reknock-cooldown" && line !== null ? line : title }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { className: "mx-meet__waiting-actions", children: actionsNode })
   ] });
 }
@@ -5110,6 +5280,7 @@ function WaitingRoom({ host, onLeave }) {
   const { phaseNotice } = useMeetCore();
   const [busy, setBusy] = (0, import_react10.useState)(false);
   const admission = waiting?.admission ?? "knocking";
+  const reknockLeft = useCountdown(admission === "denied" ? waiting?.reknockAt ?? null : null);
   const run = (action) => () => {
     setBusy(true);
     void action().catch(() => void 0).finally(() => setBusy(false));
@@ -5117,6 +5288,7 @@ function WaitingRoom({ host, onLeave }) {
   const home = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Button, { type: "button", variant: "outline", onClick: () => onLeave !== void 0 ? onLeave() : window.location.assign("/"), children: "Back to home" });
   let title;
   let line = null;
+  let cooldownNotice = false;
   let actions;
   switch (admission) {
     case "waiting_host":
@@ -5125,8 +5297,12 @@ function WaitingRoom({ host, onLeave }) {
       break;
     case "denied":
       title = "The host declined your request";
+      if (reknockLeft !== null && reknockLeft > 0) {
+        line = `You can ask again in ${clockText(reknockLeft)}`;
+        cooldownNotice = true;
+      }
       actions = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
-        waiting?.reknockAllowed === true ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Button, { type: "button", disabled: busy, onClick: run(askAgain), children: "Ask to join again" }) : null,
+        waiting?.reknockAllowed === true || waiting?.reknockAt != null && reknockLeft === 0 ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_design_system.Button, { type: "button", disabled: busy, onClick: run(askAgain), children: "Ask to join again" }) : null,
         home
       ] });
       break;
@@ -5157,7 +5333,15 @@ function WaitingRoom({ host, onLeave }) {
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Avatar, { name: host.identity.displayName, url: host.identity.avatarUrl, size: 72 }),
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("h1", { className: "mx-meet__prejoin-title", children: title }),
     phaseNotice === "sent-to-waiting" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { className: "mx-meet__empty-body", role: "status", "data-meet-notice": "sent-to-waiting", children: "The host moved you back to the waiting room" }) : null,
-    line !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("p", { className: "mx-meet__empty-body", role: "status", "data-meet-notice": "host-absent", children: line }) : null,
+    line !== null ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+      "p",
+      {
+        className: "mx-meet__empty-body",
+        role: "status",
+        "data-meet-notice": cooldownNotice ? "reknock-cooldown" : "host-absent",
+        children: line
+      }
+    ) : null,
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { className: "mx-meet__waiting-actions", children: actions })
   ] });
 }