@pmate/chat-sdk 0.7.3 → 0.8.0-meeting-review.2

package/lib/runtime/call.d.ts

@@ -1,9 +1,20 @@
+export type MeetingRoom = {
+    groupId: string;
+    meetingId: string;
+    startedAt: number;
+    initiatorId: string;
+    profileIds: string[];
+};
 export type CallPhase = "idle" | "requesting" | "ringing" | "incoming" | "connecting" | "connected" | "ended";
 export type CallSnapshot = {
     phase: CallPhase;
     ready: boolean;
     watchedPeerId?: string;
     peerOnline?: boolean;
+    peerInCall?: boolean;
+    rooms?: MeetingRoom[];
+    roomsError?: string;
+    screenPending?: boolean;
     callId?: string;
     peerId?: string;
     direction?: "incoming" | "outgoing";
@@ -48,6 +59,7 @@ export declare class CallClient {
     private closed;
     private capturePending;
     private requestId?;
+    private groupIds;
     private heartbeat?;
     private timeout?;
     private reconnect?;
@@ -57,6 +69,7 @@ export declare class CallClient {
     subscribe(listener: (state: CallSnapshot) => void): () => void;
     connect(): void;
     watchPeer(peerId?: string): void;
+    watchGroups(groupIds: string[]): void;
     start(peerId: string): Promise<void>;
     accept(): Promise<void>;
     hangup(): void;

package/lib/runtime/call.js

@@ -13,6 +13,7 @@ export class CallClient {
     closed = false;
     capturePending = false;
     requestId;
+    groupIds = [];
     heartbeat;
     timeout;
     reconnect;
@@ -53,16 +54,25 @@ export class CallClient {
             clearInterval(this.heartbeat);
             const active = !["idle", "ended"].includes(this.state.phase);
             this.release();
-            this.update({ ready: false, peerOnline: undefined, phase: active ? "ended" : this.state.phase, error: event.code === 1008 ? "UNAUTHORIZED" : "DISCONNECTED" });
+            this.update({ ready: false, peerOnline: undefined, peerInCall: undefined, rooms: undefined, phase: active ? "ended" : this.state.phase, error: event.code === 1008 ? "UNAUTHORIZED" : "DISCONNECTED" });
             if (!this.closed && event.code !== 1008)
                 this.reconnect = setTimeout(() => this.connect(), 3000);
         };
     }
     watchPeer(peerId) {
-        this.update({ watchedPeerId: peerId, peerOnline: undefined });
+        this.update({ watchedPeerId: peerId, peerOnline: undefined, peerInCall: undefined });
         if (this.state.ready)
             this.send({ type: "presence.watch", peerId: peerId ?? "" });
     }
+    watchGroups(groupIds) {
+        const next = [...new Set(groupIds)].sort().slice(0, 64);
+        if (JSON.stringify(next) === JSON.stringify(this.groupIds))
+            return;
+        this.groupIds = next;
+        this.update({ rooms: this.state.rooms?.filter(room => next.includes(room.groupId)), roomsError: undefined });
+        if (this.state.ready)
+            this.send({ type: "rooms.watch", groupIds: next });
+    }
     async start(peerId) {
         if (!this.state.ready || !["idle", "ended"].includes(this.state.phase))
             return;
@@ -122,6 +132,7 @@ export class CallClient {
             return this.stopSharing();
         const gen = this.generation;
         this.capturePending = true;
+        this.update({ screenPending: true, error: undefined });
         try {
             const media = this.options.mediaDevices ?? navigator.mediaDevices;
             if (!media.getDisplayMedia)
@@ -147,13 +158,14 @@ export class CallClient {
         catch (error) {
             if (gen === this.generation) {
                 await this.stopSharing();
-                if (!(error instanceof DOMException && error.name === "NotAllowedError"))
-                    this.update({ error: "SCREEN_UNAVAILABLE" });
+                this.update({ error: error instanceof DOMException && error.name === "NotAllowedError" ? "SCREEN_NOT_ALLOWED" : "SCREEN_UNAVAILABLE" });
             }
         }
         finally {
-            if (gen === this.generation)
+            if (gen === this.generation) {
                 this.capturePending = false;
+                this.update({ screenPending: false });
+            }
         }
     }
     async stopSharing() {
@@ -208,25 +220,40 @@ export class CallClient {
             stream?.getTracks().forEach(t => { t.onended = null; t.stop(); });
         this.microphone = undefined;
         this.screen = undefined;
-        this.update({ muted: false, sharing: false, remoteSharing: false, remoteStream: undefined, localScreen: undefined });
+        this.update({ muted: false, sharing: false, remoteSharing: false, remoteStream: undefined, localScreen: undefined, screenPending: false });
     }
     async receive(message) {
         if (message.type === "ready") {
             this.update({ ready: true, error: undefined });
             if (this.state.watchedPeerId)
                 this.send({ type: "presence.watch", peerId: this.state.watchedPeerId });
+            if (this.groupIds.length)
+                this.send({ type: "rooms.watch", groupIds: this.groupIds });
             clearInterval(this.heartbeat);
             this.heartbeat = setInterval(() => this.send({ type: "ping" }), 20000);
             return;
         }
         if (message.type === "presence") {
             if (message.peerId === this.state.watchedPeerId)
-                this.update({ peerOnline: typeof message.online === "boolean" ? message.online : undefined });
+                this.update({ peerOnline: typeof message.online === "boolean" ? message.online : undefined, peerInCall: typeof message.inCall === "boolean" ? message.inCall : undefined });
+            return;
+        }
+        if (message.type === "rooms.snapshot") {
+            this.update({ rooms: message.rooms.filter((room) => this.groupIds.includes(room.groupId)), roomsError: undefined });
+            return;
+        }
+        if (message.type === "rooms.changed") {
+            if (this.groupIds.includes(message.groupId))
+                this.update({ rooms: [...(this.state.rooms ?? []).filter(room => room.groupId !== message.groupId), ...(message.room ? [message.room] : [])], roomsError: undefined });
             return;
         }
         if (message.type === "pong")
             return;
         if (message.type === "error") {
+            if (message.scope === "rooms") {
+                this.update({ rooms: undefined, roomsError: message.code });
+                return;
+            }
             if (message.requestId && message.requestId !== this.requestId)
                 return;
             if (!message.callId || message.callId === this.state.callId)
@@ -304,6 +331,13 @@ export class CallClient {
             for (const candidate of this.candidates.splice(0))
                 await pc.addIceCandidate(candidate);
             if (message.description.type === "offer") {
+                const negotiated = pc.getTransceivers().find(t => t.mid !== null && t.receiver.track.kind === "video");
+                if (negotiated) {
+                    if (this.video !== negotiated && this.video?.mid === null)
+                        this.video.stop();
+                    this.video = negotiated;
+                    negotiated.direction = "sendrecv";
+                }
                 await pc.setLocalDescription(await pc.createAnswer());
                 if (gen === this.generation)
                     this.send({ type: "sdp", callId: this.state.callId, description: pc.localDescription });

package/lib/runtime/meeting.d.ts

@@ -9,6 +9,8 @@ export type MeetingParticipant = {
 export type MeetingSnapshot = {
     phase: "idle" | "joining" | "joined" | "ended";
     groupId?: string;
+    startedAt?: number;
+    screenPending?: boolean;
     meetingId?: string;
     selfId?: string;
     participants: MeetingParticipant[];

package/lib/runtime/meeting.js

@@ -69,6 +69,7 @@ export class GroupMeetingClient {
         }
         const gen = this.generation;
         this.pendingCapture = true;
+        this.update({ screenPending: true, error: undefined });
         try {
             const stream = await (this.options.mediaDevices ?? navigator.mediaDevices).getDisplayMedia({ video: { width: { ideal: 1280, max: 1920 }, height: { ideal: 720, max: 1080 }, frameRate: { ideal: 10, max: 15 } }, audio: false });
             if (gen !== this.generation) {
@@ -88,13 +89,14 @@ export class GroupMeetingClient {
         catch (e) {
             if (gen === this.generation) {
                 await this.stopSharing();
-                if (!(e instanceof DOMException && e.name === "NotAllowedError"))
-                    this.update({ error: "SCREEN_UNAVAILABLE" });
+                this.update({ error: e instanceof DOMException && e.name === "NotAllowedError" ? "SCREEN_NOT_ALLOWED" : "SCREEN_UNAVAILABLE" });
             }
         }
         finally {
-            if (gen === this.generation)
+            if (gen === this.generation) {
                 this.pendingCapture = false;
+                this.update({ screenPending: false });
+            }
         }
     }
     async stopSharing() {
@@ -130,7 +132,7 @@ export class GroupMeetingClient {
             stream?.getTracks().forEach(t => { t.onended = null; t.stop(); });
         this.microphone = undefined;
         this.screen = undefined;
-        this.update({ participants: [], meetingId: undefined, selfId: undefined, sharingId: undefined, localScreen: undefined, muted: false });
+        this.update({ participants: [], meetingId: undefined, selfId: undefined, sharingId: undefined, localScreen: undefined, muted: false, screenPending: false, startedAt: undefined });
     }
     participant(id, patch) { this.update({ participants: this.state.participants.map(p => p.id === id ? { ...p, ...patch } : p) }); }
     link(id, gen) {
@@ -194,7 +196,7 @@ export class GroupMeetingClient {
                 return;
             clearTimeout(this.timer);
             this.iceServers = m.iceServers;
-            this.update({ phase: "joined", meetingId: m.meetingId, selfId: m.selfId });
+            this.update({ phase: "joined", meetingId: m.meetingId, selfId: m.selfId, startedAt: m.startedAt });
             return;
         }
         if (m.meetingId !== this.state.meetingId || this.state.phase !== "joined")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/chat-sdk",
-  "version": "0.7.3",
+  "version": "0.8.0-meeting-review.2",
   "description": "Cross-platform PMate chat input components, voice input primitives, and ASR helpers",
   "type": "module",
   "main": "./lib/index.js",