@ai-matrx/meet 0.11.52 → 0.11.54

package/dist/react.js

@@ -2277,6 +2277,10 @@ function personOf(identity) {
   const cut = value.indexOf(CONNECTION_SEPARATOR);
   return cut === -1 ? value : value.slice(0, cut);
 }
+function userIdOfIdentity(identity) {
+  const person = personOf(identity);
+  return person.startsWith("user:") ? person.slice("user:".length) : null;
+}
 function isGuestIdentity(identity) {
   return personOf(identity).startsWith("guest:");
 }
@@ -2517,6 +2521,7 @@ function minutesLeft(policy, startedAtMs, nowMs) {
 function mayAdmitNow(role, participants, policy) {
   if (role === "none") return false;
   if (role === "host" || role === "cohost") return true;
+  if (role === "viewer") return false;
   const hostIn = participants.some((p) => p.role === "host" || p.role === "cohost");
   return !hostIn && policy.headlessPowers === "members_admit";
 }
@@ -4329,6 +4334,17 @@ function createMeetingSession(options) {
     }
     return identity.userId;
   }
+  function requireAdmitterUser(operation) {
+    const snapshot = store.snapshot();
+    if (identity.userId === null || !mayAdmitNow(effectiveRole(snapshot), snapshot.participants, snapshot.livePolicy)) {
+      throw new MeetError(
+        "forbidden",
+        `${operation}: this participant may not let people in`,
+        "Only a host or co-host admits people, unless the meeting has no host in it and lets members admit."
+      );
+    }
+    return identity.userId;
+  }
   function requireMeeting(operation) {
     const meeting = store.snapshot().meeting;
     if (meeting === null) {
@@ -4735,7 +4751,7 @@ function createMeetingSession(options) {
       meetingChannel.requestBackfill("manual");
     },
     async admit(entry, admitted) {
-      const by = requireHostUser("meet.admit");
+      const by = requireAdmitterUser("meet.admit");
       const meeting = requireMeeting("meet.admit");
       const row = await repository.decideAdmission({
         meetingId: meeting.id,
@@ -4753,7 +4769,7 @@ function createMeetingSession(options) {
       hint();
     },
     async undeny(entry) {
-      const by = requireHostUser("meet.undeny");
+      const by = requireAdmitterUser("meet.undeny");
       const meeting = requireMeeting("meet.undeny");
       const row = await repository.decideAdmission({
         meetingId: meeting.id,
@@ -4766,7 +4782,7 @@ function createMeetingSession(options) {
       hint();
     },
     async admitAll() {
-      const by = requireHostUser("meet.admitAll");
+      const by = requireAdmitterUser("meet.admitAll");
       const meeting = requireMeeting("meet.admitAll");
       const rows = await repository.admitAll(meeting.id, by);
       for (const row of rows) {
@@ -5809,21 +5825,35 @@ function heartbeatIntervalMs(roomSize) {
 function staleAfterMs(roomSize) {
   return heartbeatIntervalMs(roomSize) * 3 + 1e3;
 }
+function firstBeatAllowanceMs(roomSize) {
+  return staleAfterMs(roomSize) * 2;
+}
 function createLivenessTracker(now) {
   const lastHeard = /* @__PURE__ */ new Map();
+  const firstSeen = /* @__PURE__ */ new Map();
   const beats = /* @__PURE__ */ new Map();
   return {
     heard(who, beat) {
       lastHeard.set(who, now());
+      firstSeen.delete(who);
       if (beat !== null) beats.set(who, beat);
     },
+    expect(who) {
+      if (!lastHeard.has(who) && !firstSeen.has(who)) firstSeen.set(who, now());
+    },
     stale(present, roomSize) {
       const limit = staleAfterMs(roomSize);
+      const firstLimit = firstBeatAllowanceMs(roomSize);
       const at = now();
       const out = /* @__PURE__ */ new Set();
       for (const who of present) {
         const heard = lastHeard.get(who);
-        if (heard !== void 0 && at - heard > limit) out.add(who);
+        if (heard !== void 0) {
+          if (at - heard > limit) out.add(who);
+          continue;
+        }
+        const seen = firstSeen.get(who);
+        if (seen !== void 0 && at - seen > firstLimit) out.add(who);
       }
       return out;
     },
@@ -5831,13 +5861,16 @@ function createLivenessTracker(now) {
     restartClock() {
       const at = now();
       for (const who of lastHeard.keys()) lastHeard.set(who, at);
+      for (const who of firstSeen.keys()) firstSeen.set(who, at);
     },
     forget(who) {
       lastHeard.delete(who);
+      firstSeen.delete(who);
       beats.delete(who);
     },
     clear() {
       lastHeard.clear();
+      firstSeen.clear();
       beats.clear();
     }
   };
@@ -6603,6 +6636,13 @@ function createRoomEngine(options) {
     const previous = new Map(liveRoster.map((p) => [p.identity, p]));
     const present = new Set(list.map((p) => p.identity));
     const graceMs = connectionPolicy.reconnectGraceSeconds * 1e3;
+    if (store.snapshot().phase === "in_call") {
+      for (const [who, last] of previous) {
+        if (last.isLocal || present.has(who) || departures.has(who)) continue;
+        departures.set(who, null);
+        report("warn", `meet: ${who} vanished from the room's roster with no departure event; held as reconnecting`, "The media layer dropped a participant silently; the tile is kept for the reconnect grace.");
+      }
+    }
     for (const [who, reason] of departures) {
       const last = previous.get(who);
       const dropped = !saidBye.has(who) && (isUnannouncedDeparture(reason) || silent.has(who));
@@ -6618,6 +6658,9 @@ function createRoomEngine(options) {
     }
     departures.clear();
     liveRoster = list;
+    for (const p of list) {
+      if (!p.isLocal && (isGuestIdentity(p.identity) || userIdOfIdentity(p.identity) !== null)) liveness.expect(p.identity);
+    }
     const localNow = list.find((p) => p.isLocal);
     if (localNow !== void 0 && !localNow.screenSharing && store.snapshot().share.state === "presenting") {
       store.patch({ share: NO_SHARE });
@@ -6638,7 +6681,7 @@ function createRoomEngine(options) {
     store.setParticipants(
       [...people.values()].map(({ entry }) => {
         const projected = projectParticipant(entry, joinedAt);
-        if (entry.reconnecting === true || !entry.isLocal && silent.has(entry.identity)) {
+        if (entry.reconnecting === true || !entry.isLocal && silent.has(entry.identity) && !saidBye.has(entry.identity)) {
           return { ...projected, reconnecting: true, quality: "lost" };
         }
         const videoPaused = entry.isLocal ? store.snapshot().localNetwork.videoPaused : liveness.reported(entry.identity)?.vp === true;