@ai-matrx/meet 0.11.31 → 0.11.33

package/dist/index.js

@@ -13,12 +13,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. */
@@ -698,7 +704,8 @@ function parseRoomToken(body, roomName) {
   const serverUrl = readString(payload, "server_url") ?? readString(payload, "serverUrl");
   const identity = readString(payload, "identity");
   const expiresAt = readString(payload, "expires_at") ?? readString(payload, "expiresAt");
-  if (token === null || serverUrl === null || identity === null) {
+  const secondDeviceChoice = readString(payload, "second_device_choice");
+  if (token === null && secondDeviceChoice === null || serverUrl === null || identity === null) {
     throw invalidResponse(
       "meet.token",
       "the response is missing token, server_url, or identity \u2014 joining with a partial token would fail inside LiveKit with an opaque error instead of here"
@@ -710,11 +717,15 @@ function parseRoomToken(body, roomName) {
       "the response carries no expires_at. Without it the package cannot refresh before the token dies, and a long meeting silently loses its ability to reconnect"
     );
   }
+  const personKey = readString(payload, "person_key") ?? identity;
   return {
-    token,
+    token: token ?? "",
     serverUrl,
     roomName,
-    identity,
+    identity: personKey,
+    connectionIdentity: readString(payload, "connection_identity") ?? personKey,
+    connectionKind: readString(payload, "connection_kind") === "companion" ? "companion" : "main",
+    secondDeviceChoice,
     displayName: readString(payload, "display_name") ?? readString(payload, "displayName") ?? identity,
     expiresAt,
     canPublish: readBoolean(payload, "can_publish", true),
@@ -789,7 +800,9 @@ function createTokenClient(options) {
           organization_id: input.identity.organizationId,
           display_name: input.identity.displayName,
           device_id: input.identity.deviceId,
-          guest
+          guest,
+          ...input.tabId !== void 0 ? { tab_id: input.tabId } : {},
+          ...input.secondDevice !== void 0 ? { second_device: input.secondDevice } : {}
         }
       });
     } catch (error) {
@@ -806,7 +819,8 @@ function createTokenClient(options) {
         said?.message ?? "You can't join this meeting.",
         said?.remedy ?? "Ask the person who shared the link to let you in, then open the link again.",
         void 0,
-        said?.reason ?? null
+        said?.reason ?? null,
+        said?.retryAfterSeconds ?? null
       );
     }
     if (response.status === 404) {
@@ -864,6 +878,10 @@ function createTokenClient(options) {
         if (!expired(entry)) return Promise.resolve(entry.token);
       }
       const pending = request(input, true).then((token) => {
+        if (token.secondDeviceChoice != null) {
+          cache.delete(input.roomName);
+          return token;
+        }
         cache.set(input.roomName, { token, mintedAt: now(), inFlight: null });
         remember(token);
         return token;
@@ -898,6 +916,9 @@ function placeholder(roomName) {
     serverUrl: "",
     roomName,
     identity: "",
+    connectionIdentity: "",
+    connectionKind: "main",
+    secondDeviceChoice: null,
     displayName: "",
     expiresAt: (/* @__PURE__ */ new Date(0)).toISOString(),
     canPublish: false,
@@ -922,7 +943,9 @@ async function serverSentence(response) {
     if (message === null) return null;
     const remedy = typeof source.remedy === "string" && source.remedy.trim() !== "" ? source.remedy : void 0;
     const reason = typeof source.reason === "string" && source.reason !== "" ? source.reason : null;
-    return { message, remedy, reason };
+    const retry = source.retry_after_seconds;
+    const retryAfterSeconds = typeof retry === "number" && Number.isFinite(retry) && retry > 0 ? Math.ceil(retry) : null;
+    return { message, remedy, reason, retryAfterSeconds };
   } catch {
     return null;
   }
@@ -1398,7 +1421,10 @@ var JOINABLE_FROM = /* @__PURE__ */ new Set([
   "superseded",
   "inactive",
   "denied",
-  "knock_expired"
+  "knock_expired",
+  // A refused knock whose rule lets the person ask again (a cooldown that ran out): the machine
+  // allows the press; the server's gate decides whether it knocks or is refused again.
+  "refused:lobby_rejects"
 ]);
 var NOT_ENDABLE = /* @__PURE__ */ new Set([
   "ended",
@@ -1482,6 +1508,8 @@ function nextPhase(from, event) {
       return WAITING_PHASES.has(from) ? "joining" : null;
     case "connected":
       return from === "joining" ? "in_call" : null;
+    case "second_device":
+      return from === "joining" ? "prejoin" : null;
     case "join_failed":
       return from === "joining" ? refusalPhase(event.reason) : null;
     case "exit":
@@ -1499,7 +1527,7 @@ function nextPhase(from, event) {
     case "call_outcome":
       return RINGING.has(from) ? event.outcome : null;
     case "reset":
-      return LIVE_PHASES.has(from) ? null : "resolving";
+      return LIVE_PHASES.has(from) && event.teardown !== true ? null : "resolving";
   }
 }
 function resolveExit(input) {
@@ -1805,8 +1833,8 @@ function createCallCenter(options) {
           "A late accept must not resurrect a settled call. Close the ringing UI; the caller has already moved on."
         );
       }
-      if (options.store.snapshot().phase === "ringing_in") options.store.dispatch({ type: "call_answered" });
       const settled = await repository.settleCallInvite(id, "connecting", null);
+      if (options.store.snapshot().phase === "ringing_in") options.store.dispatch({ type: "call_answered" });
       options.store.patch({ call: { invite: settled, direction: "incoming" } });
       settleLocal(settled);
       channel?.send(MEET_EVENTS.settled, settled);
@@ -3177,11 +3205,17 @@ async function loadMeetingActivities(api, meetingId, meetingPass = null) {
 }
 
 // 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";
@@ -3395,6 +3429,7 @@ var EMPTY = {
   waiting: null,
   meeting: null,
   localIdentity: null,
+  secondDevice: null,
   grants: NO_GRANTS,
   participants: [],
   activeSpeakers: [],
@@ -3645,7 +3680,8 @@ function createMeetStore(initial = {}) {
       commit({ ...state, media: { ...state.media, [kind]: next } });
     },
     reset() {
-      commit({ ...EMPTY, effects: state.effects });
+      const phase = nextPhase(state.phase, { type: "reset", teardown: true }) ?? EMPTY.phase;
+      commit({ ...EMPTY, effects: state.effects, phase, reason: reasonOf(phase), phaseNotice: null });
     }
   };
 }
@@ -4724,6 +4760,28 @@ function lobbyEntryFrom(attendee, now = Date.now()) {
     decidedBy: null
   };
 }
+function deniedEntryFrom(attendee) {
+  if (attendee.admissionState !== "denied") return null;
+  return {
+    identity: attendee.identity,
+    displayName: attendee.displayName,
+    avatarUrl: attendee.avatarUrl,
+    userId: attendee.userId,
+    state: "denied",
+    knockedAt: attendee.knockedAt ?? attendee.joinedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    knockExpiresAt: null,
+    decidedAt: null,
+    decidedBy: null
+  };
+}
+function applyDoorRow(store, attendee) {
+  const entry = lobbyEntryFrom(attendee) ?? deniedEntryFrom(attendee);
+  if (entry !== null) {
+    store.upsertLobby(entry);
+    return;
+  }
+  store.setAdmission(attendee.identity, decidedState(attendee.admissionState), null);
+}
 function decidedState(state) {
   return WAITING_ADMISSION_STATES.includes(state) ? "expired" : state;
 }
@@ -4858,6 +4916,7 @@ function createMeetingSession(options) {
       admission,
       admittersPresent: read.admitters_present ?? null,
       reknockAllowed: read.reknock_allowed ?? true,
+      reknockAt: typeof read.reknock_in_seconds === "number" && read.reknock_in_seconds > 0 ? Date.now() + read.reknock_in_seconds * 1e3 : null,
       knockExpiresAt: read.knock_expires_at ?? null,
       pollSeconds: read.poll_seconds ?? snapshot.waiting?.pollSeconds ?? 3,
       liveVersion: read.live_version ?? 0
@@ -4940,11 +4999,7 @@ function createMeetingSession(options) {
     try {
       const attendees = await repository.attendees(meeting.id);
       store.learn(attendees);
-      for (const attendee of attendees) {
-        const entry = lobbyEntryFrom(attendee);
-        if (entry !== null) store.upsertLobby(entry);
-        else store.setAdmission(attendee.identity, decidedState(attendee.admissionState), null);
-      }
+      for (const attendee of attendees) applyDoorRow(store, attendee);
     } catch {
     }
   }
@@ -5026,12 +5081,7 @@ function createMeetingSession(options) {
               if (row === null) return;
               const attendee = repository.projectAttendee(row);
               store.learn([attendee]);
-              const entry = lobbyEntryFrom(attendee);
-              if (entry !== null) {
-                store.upsertLobby(entry);
-                return;
-              }
-              store.setAdmission(attendee.identity, decidedState(attendee.admissionState), null);
+              applyDoorRow(store, attendee);
             }
           },
           {
@@ -5078,14 +5128,7 @@ function createMeetingSession(options) {
             store.setRecording(latest.state, latest.startedBy, "record", latest.id);
           }
           store.learn(attendees);
-          for (const attendee of attendees) {
-            const entry = lobbyEntryFrom(attendee);
-            if (entry !== null) {
-              store.upsertLobby(entry);
-            } else {
-              store.setAdmission(attendee.identity, decidedState(attendee.admissionState), null);
-            }
-          }
+          for (const attendee of attendees) applyDoorRow(store, attendee);
         }
       });
       meetingChannel.requestBackfill("manual");
@@ -6129,6 +6172,7 @@ function SCREEN_SHARE_BLOCKED_REMEDY_FOR(remedy) {
 }
 var PARTICIPANT_ROLE_ATTRIBUTE = "matrx.participant.role";
 var PARTICIPANT_CAN_RECORD_ATTRIBUTE = "matrx.participant.can_record";
+var CONNECTION_KIND_ATTRIBUTE = "matrx.participant.connection_kind";
 var PARTICIPANT_STANDING_ATTRIBUTE = "matrx.participant.standing";
 var KNOWN_STANDINGS = ["member", "invited", "outsider", "guest"];
 function parseStanding(value) {
@@ -6152,7 +6196,8 @@ function projectParticipant(driver, joinedAt) {
   }
   const userId = typeof metadata.user_id === "string" ? asUserId(metadata.user_id) : null;
   return {
-    identity: asParticipantIdentity(driver.identity),
+    // S7: a tile is a PERSON; LiveKit names the tab's connection (`<person>~<tab>`).
+    identity: personOf(driver.identity),
     userId,
     // 🚨 A RAW LIVEKIT IDENTITY IS NEVER A NAME (MRI-A18). Through 0.4.12 this
     // line read `driver.name.length > 0 ? driver.name : driver.identity`, and
@@ -6199,6 +6244,11 @@ function createRoomEngine(options) {
   let ghosts = /* @__PURE__ */ new Map();
   let ghostTimer = null;
   let liveRoster = [];
+  let personConnections = /* @__PURE__ */ new Map();
+  let mainConnection = /* @__PURE__ */ new Map();
+  function connectionsOf(who) {
+    return personConnections.get(personOf(who)) ?? [who];
+  }
   const departures = /* @__PURE__ */ new Map();
   function requestAsNow() {
     if (lastRequest === null) return null;
@@ -6263,7 +6313,12 @@ function createRoomEngine(options) {
   function failJoin(error, operation) {
     const normalized = normalizeMeetError(error, operation);
     store.patch({
-      failure: { message: normalized.message, remedy: normalized.remedy, reason: normalized.reason }
+      failure: {
+        message: normalized.message,
+        remedy: normalized.remedy,
+        reason: normalized.reason,
+        retryAt: normalized.retryAfterSeconds === null ? null : now() + normalized.retryAfterSeconds * 1e3
+      }
     });
     store.dispatch({ type: "join_failed", reason: normalized.reason ?? null });
     report(
@@ -6335,10 +6390,10 @@ function createRoomEngine(options) {
       if (store.snapshot().spotlight !== spotlight) store.patch({ spotlight });
     },
     activeSpeakers(identities) {
-      store.setSpeaking(identities.map(asParticipantIdentity));
+      store.setSpeaking([...new Set(identities.map((who) => personOf(who)))]);
     },
     quality(who, value) {
-      store.setQuality(asParticipantIdentity(who), value);
+      store.setQuality(personOf(who), value);
     },
     connectionState(state) {
       supervisor.driverState(state);
@@ -6358,7 +6413,7 @@ function createRoomEngine(options) {
         );
         return;
       }
-      const speakerIdentity = asParticipantIdentity(event.speakerIdentity);
+      const speakerIdentity = personOf(event.speakerIdentity);
       const speaker = snapshot.participants.find(
         (participant) => participant.identity === speakerIdentity
       );
@@ -6432,7 +6487,7 @@ function createRoomEngine(options) {
         );
         return;
       }
-      const sender = asParticipantIdentity(from ?? "");
+      const sender = personOf(from ?? "");
       switch (topic) {
         case DATA_TOPICS.hand:
           store.setHand(
@@ -6474,7 +6529,7 @@ function createRoomEngine(options) {
     }
   };
   async function resolveExitAndApply(hint) {
-    const connection = current?.identity ?? store.snapshot().localIdentity ?? null;
+    const connection = current?.connectionIdentity ?? current?.identity ?? store.snapshot().localIdentity ?? null;
     lastRequest = requestAsNow();
     await dropRoom();
     let server;
@@ -6512,14 +6567,29 @@ function createRoomEngine(options) {
   }
   async function connect(request) {
     store.patch({ failure: null, waiting: null, roomName: request.roomName, share: NO_SHARE, connection: "stable" });
+    const tabId = options.tabClaim !== void 0 ? await options.tabClaim.tabId : null;
     const token = await tokens.get({
       roomName: request.roomName,
       identity,
       ...request.meetingId !== void 0 ? { meetingId: request.meetingId } : {},
       ...request.slug !== void 0 ? { slug: request.slug } : {},
       ...request.breakoutRoomId != null ? { breakoutRoomId: request.breakoutRoomId } : {},
-      ...request.observe === true ? { observe: true } : {}
+      ...request.observe === true ? { observe: true } : {},
+      ...tabId !== null ? { tabId } : {},
+      ...request.secondDevice !== void 0 ? { secondDevice: request.secondDevice } : {}
     });
+    if (token.secondDeviceChoice != null) {
+      store.patch({ secondDevice: { rule: token.secondDeviceChoice }, localIdentity: token.identity });
+      store.dispatch({ type: "second_device" });
+      report("info", `meet: already in this meeting elsewhere \u2014 offering the choice (${token.secondDeviceChoice})`);
+      return;
+    }
+    if (store.snapshot().secondDevice !== null) store.patch({ secondDevice: null });
+    if (request.secondDevice === "switch_here" && lastRequest !== null) {
+      const { secondDevice: _answered, ...rest } = lastRequest;
+      lastRequest = rest;
+    }
+    options.tabClaim?.inRoom(String(request.roomName), String(token.identity));
     current = token;
     lastServerUrl = token.serverUrl;
     connectionPolicy = token.connectionPolicy ?? DEFAULT_CONNECTION_POLICY;
@@ -6584,7 +6654,7 @@ function createRoomEngine(options) {
     if (request.mode === "video") {
       await enableTrack(created, "camera", true);
     }
-    if (request.microphone !== false) {
+    if (request.microphone !== false && current?.connectionKind !== "companion") {
       await enableTrack(created, "microphone", true);
     }
     media.onConnected();
@@ -6606,7 +6676,8 @@ function createRoomEngine(options) {
   }
   async function publish(topic, body, to) {
     if (driver === null) return;
-    await driver.publishData(topic, JSON.stringify(body), to);
+    const addresses = to === void 0 ? void 0 : to.flatMap((who) => connectionsOf(who));
+    await driver.publishData(topic, JSON.stringify(body), addresses);
   }
   async function applyEffects(target, effects) {
     try {
@@ -6644,8 +6715,19 @@ function createRoomEngine(options) {
     liveRoster = list;
     const merged = mergeGhosts(list, ghosts, at);
     ghosts = merged.kept;
+    const people = /* @__PURE__ */ new Map();
+    const connections = /* @__PURE__ */ new Map();
+    for (const entry of merged.roster) {
+      const person = personOf(entry.identity);
+      connections.set(person, [...connections.get(person) ?? [], entry.identity]);
+      const rank = (entry.isLocal ? 8 : 0) + (entry.reconnecting === true ? 0 : 4) + (entry.attributes[CONNECTION_KIND_ATTRIBUTE] === "companion" ? 0 : 2) + (entry.cameraEnabled || entry.micEnabled ? 1 : 0);
+      const held = people.get(person);
+      if (held === void 0 || rank > held.rank) people.set(person, { entry, rank });
+    }
+    personConnections = connections;
+    mainConnection = new Map([...people].map(([person, { entry }]) => [person, entry.identity]));
     store.setParticipants(
-      merged.roster.map((entry) => {
+      [...people.values()].map(({ entry }) => {
         const projected = projectParticipant(entry, joinedAt);
         return entry.reconnecting === true ? { ...projected, reconnecting: true, quality: "lost" } : projected;
       })
@@ -6822,7 +6904,13 @@ function createRoomEngine(options) {
     },
     async setScreenShareEnabled(enabled) {
       if (driver === null) return;
-      if (enabled && driver.supportsScreenShare?.() === false) {
+      let unsupported = false;
+      try {
+        unsupported = enabled && driver.supportsScreenShare?.() === false;
+      } catch {
+        unsupported = false;
+      }
+      if (unsupported) {
         store.patch({ share: { state: "refused", reason: "unsupported", remedy: null, at: now() } });
         report("warn", "meet: this browser cannot share a screen", "Share from a desktop browser (Chrome, Edge, Firefox or Safari).");
         return;
@@ -6921,7 +7009,7 @@ function createRoomEngine(options) {
     },
     attach(who, kind, element) {
       if (driver === null) return () => void 0;
-      return driver.attach(who, kind, element);
+      return driver.attach(mainConnection.get(personOf(who)) ?? who, kind, element);
     },
     token: () => current,
     async dispose() {