@dobuki/hello-worker 1.0.4 → 1.0.6

package/dist/signal-room.worker.js

@@ -27,32 +27,31 @@ self.addEventListener("message", (e) => {
             },
             onPeerJoined: (user) => {
                 // Save the ability to send to this peer
-                peerSend.set(user.userId, (type, payload) => user.receive(type, payload));
-                emit({ kind: "peer-joined", userId: user.userId });
+                peerSend.set(user.peerId, user.receive);
+                emit({ kind: "peer-joined", userId: user.userId, peerId: user.peerId });
             },
-            onPeerLeft: (userId) => {
-                peerSend.delete(userId);
-                emit({ kind: "peer-left", userId });
+            onPeerLeft: (userId, peerId) => {
+                peerSend.delete(peerId);
+                emit({ kind: "peer-left", userId, peerId });
             },
             onMessage: (type, payload, from) => {
                 // We can also learn peerSend via onMessage in case join events vary
-                peerSend.set(from.userId, (t, p) => from.receive(t, p));
-                emit({ kind: "message", type, payload, fromUserId: from.userId });
+                peerSend.set(from.peerId, from.receive);
+                emit({ kind: "message", type, payload, fromUserId: from.userId, fromPeerId: from.peerId });
             },
         });
         exitRoom = result.exitRoom;
         return;
     }
     if (msg.cmd === "send") {
-        const sendFn = peerSend.get(msg.toUserId);
+        const sendFn = peerSend.get(msg.toPeerId);
         if (sendFn)
             sendFn(msg.type, msg.payload);
         return;
     }
     if (msg.cmd === "exit") {
         exitRoom?.();
-        exitRoom = null;
-        peerSend.clear();
+        self.close();
         return;
     }
 });

package/dist/signal-room.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"signal-room.worker.js","sourceRoot":"","sources":["../src/browser/signal-room.worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"signal-room.worker.js","sourceRoot":"","sources":["../src/browser/signal-room.worker.ts"],"names":[],"mappings":"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"}

package/dist/webrtc-peer-collector.d.ts

@@ -0,0 +1,34 @@
+import { EnterRoom } from "./signal-room";
+export type SigType = "offer" | "answer" | "ice";
+export type SigPayload = RTCSessionDescriptionInit | RTCIceCandidateInit;
+export declare function collectPeerConnections({ userId, receivePeerConnection, leaveUserWithoutPeer, rtcConfig, enterRoomFunction: enterRoom, logLine, onLeaveUser, workerUrl, }: {
+    userId: string;
+    rtcConfig?: RTCConfiguration;
+    enterRoomFunction?: EnterRoom<SigType, SigPayload>;
+    onLeaveUser?: (userId: string) => void;
+    logLine?: (direction: string, obj?: any) => void;
+    workerUrl?: URL;
+    leaveUserWithoutPeer?: boolean;
+    receivePeerConnection(connection: {
+        pc: RTCPeerConnection;
+        userId: string;
+        initiator: boolean;
+    }): void;
+}): {
+    enterRoom: ({ room, host }: {
+        room: string;
+        host: string;
+    }) => void;
+    exitRoom: ({ room, host }: {
+        room: string;
+        host: string;
+    }) => void;
+    leaveUser: (userId: string) => void;
+    getUsers(): string[];
+    getRooms(): {
+        room: string;
+        host: string;
+        exitRoom: () => void;
+    }[];
+};
+//# sourceMappingURL=webrtc-peer-collector.d.ts.map

package/dist/webrtc-peer-collector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webrtc-peer-collector.d.ts","sourceRoot":"","sources":["../src/browser/webrtc-peer-collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,eAAe,CAAC;AAErD,MAAM,MAAM,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;AACjD,MAAM,MAAM,UAAU,GAAG,yBAAyB,GAAG,mBAAmB,CAAC;AAgBzE,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,qBAAqB,EACrB,oBAA4B,EAC5B,SAAsE,EACtE,iBAAiB,EAAE,SAA8B,EACjD,OAAuB,EACvB,WAAW,EACX,SAAS,GACV,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,iBAAiB,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACjD,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qBAAqB,CAAC,UAAU,EAAE;QAAE,EAAE,EAAE,iBAAiB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CACxG;gCAoEgC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;+BAThC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;wBA1BlC,MAAM;;;cAwBY,MAAM;cAAQ,MAAM;kBAAY,MAAM,IAAI;;EAwGxF"}

package/dist/webrtc-peer-collector.js

@@ -0,0 +1,154 @@
+import { enterRoom } from "./signal-room";
+const DEFAULT_ENTER_ROOM = enterRoom;
+export function collectPeerConnections({ userId, receivePeerConnection, leaveUserWithoutPeer = false, rtcConfig = { iceServers: [{ urls: "stun:stun.l.google.com:19302" }] }, enterRoomFunction: enterRoom = DEFAULT_ENTER_ROOM, logLine = console.debug, onLeaveUser, workerUrl, }) {
+    const users = new Map();
+    function getPeer(peer) {
+        let state = users.get(peer.userId);
+        if (!state) {
+            const newState = {
+                userId: peer.userId,
+                pc: new RTCPeerConnection(rtcConfig),
+                pendingRemoteIce: [],
+                peers: new Set([peer]),
+            };
+            users.set(peer.userId, newState);
+            // Send local ICE candidates to this peer
+            newState.pc.onicecandidate = (ev) => {
+                if (!ev.candidate)
+                    return;
+                for (let user of newState.peers) {
+                    const success = user.receive("ice", ev.candidate.toJSON());
+                    if (success)
+                        break;
+                }
+            };
+            newState.pc.onconnectionstatechange = () => {
+                logLine("💬", { event: "pc-state", userId: newState.userId, state: newState.pc.connectionState });
+            };
+            state = newState;
+        }
+        else {
+            state.peers.add(peer);
+        }
+        users.set(state.userId, state);
+        return state;
+    }
+    function leaveUser(userId) {
+        onLeaveUser?.(userId);
+        const p = users.get(userId);
+        if (!p)
+            return;
+        try {
+            p.pc.close();
+        }
+        catch { }
+        users.delete(userId);
+        logLine("👤 USER LEFT", userId);
+    }
+    async function flushRemoteIce(state) {
+        if (!state.pc.remoteDescription)
+            return;
+        const queued = state.pendingRemoteIce;
+        state.pendingRemoteIce = [];
+        for (const ice of queued) {
+            try {
+                await state.pc.addIceCandidate(ice);
+            }
+            catch (e) {
+                logLine("⚠️ ERROR", { error: "add-ice-failed", userId: state.userId, detail: String(e) });
+            }
+        }
+    }
+    const roomsEntered = new Map();
+    function exit({ room, host }) {
+        const key = `${host}/room/${room}`;
+        const session = roomsEntered.get(key);
+        if (session) {
+            session.exitRoom();
+            roomsEntered.delete(key);
+        }
+    }
+    function enter({ room, host }) {
+        const { exitRoom } = enterRoom({
+            userId,
+            room,
+            host,
+            logLine,
+            workerUrl,
+            // Existing peers initiate to the newcomer (Option 1)
+            async onPeerJoined(user) {
+                const state = getPeer(user);
+                const pc = state.pc;
+                // Offer flow: createOffer -> setLocalDescription -> send localDescription
+                const offer = await pc.createOffer();
+                await pc.setLocalDescription(offer);
+                user.receive("offer", pc.localDescription?.toJSON());
+            },
+            onPeerLeft(userId, peerId) {
+                const state = users.get(userId);
+                if (!state)
+                    return;
+                for (const user of state.peers) {
+                    if (user.peerId === peerId) {
+                        state.peers.delete(user);
+                        break;
+                    }
+                }
+                if (state.peers.size === 0 && leaveUserWithoutPeer) {
+                    leaveUser(userId);
+                }
+            },
+            async onMessage(type, payload, from) {
+                const state = getPeer(from);
+                const pc = state.pc;
+                if (type === "offer") {
+                    // Responder: set remote offer
+                    await pc.setRemoteDescription(payload);
+                    // Create and send answer
+                    const answer = await pc.createAnswer();
+                    await pc.setLocalDescription(answer);
+                    from.receive("answer", pc.localDescription?.toJSON());
+                    // Now safe to apply any queued ICE from this peer
+                    await flushRemoteIce(state);
+                    receivePeerConnection({ pc, userId: from.userId, initiator: false });
+                    return;
+                }
+                if (type === "answer") {
+                    // Initiator: set remote answer
+                    await pc.setRemoteDescription(payload);
+                    await flushRemoteIce(state);
+                    receivePeerConnection({ pc, userId: from.userId, initiator: true });
+                    return;
+                }
+                if (type === "ice") {
+                    const ice = payload;
+                    // If we don't have remoteDescription yet, queue it
+                    if (!pc.remoteDescription) {
+                        state.pendingRemoteIce.push(ice);
+                        return;
+                    }
+                    try {
+                        await pc.addIceCandidate(ice);
+                    }
+                    catch (e) {
+                        logLine("⚠️ ERROR", { error: "add-ice-failed", userId: state.userId, detail: String(e) });
+                    }
+                    return;
+                }
+            },
+        });
+        roomsEntered.set(`${host}/room/${room}`, { exitRoom, room, host });
+    }
+    return {
+        enterRoom: enter,
+        exitRoom: exit,
+        leaveUser,
+        getUsers() {
+            return Array.from(users.keys());
+        },
+        getRooms() {
+            return Array.from(roomsEntered.values());
+        },
+    };
+}
+//# sourceMappingURL=webrtc-peer-collector.js.map

package/dist/webrtc-peer-collector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webrtc-peer-collector.js","sourceRoot":"","sources":["../src/browser/webrtc-peer-collector.ts"],"names":[],"mappings":"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"}

package/dist/webrtc-room.d.ts

@@ -1,24 +1,52 @@
 import { EnterRoom } from "./signal-room";
 type SigType = "offer" | "answer" | "ice";
 type SigPayload = RTCSessionDescriptionInit | RTCIceCandidateInit;
-export declare function joinWebRTCRoom({ onMessage, logLine, enterRoom, workerUrl, }: {
+export declare function collectPeerConnections({ userId, receivePeerConnection, leaveUserWithoutPeer, rtcConfig, enterRoomFunction: enterRoom, logLine, onLeaveUser, workerUrl, }: {
+    userId: string;
+    rtcConfig?: RTCConfiguration;
+    enterRoomFunction?: EnterRoom<SigType, SigPayload>;
+    onLeaveUser?: (userId: string) => void;
+    logLine?: (direction: string, obj?: any) => void;
+    workerUrl?: URL;
+    leaveUserWithoutPeer?: boolean;
+    receivePeerConnection(connection: {
+        pc: RTCPeerConnection;
+        userId: string;
+        initiator: boolean;
+    }): void;
+}): {
+    enterRoom: ({ room, host }: {
+        room: string;
+        host: string;
+    }) => void;
+    exitRoom: ({ room, host }: {
+        room: string;
+        host: string;
+    }) => void;
+    leaveUser: (userId: string) => void;
+    getUsers(): string[];
+};
+export declare function joinWebRTCRoom({ uid, onMessage, logLine, enterRoomFunction, autoLeaveUsers, workerUrl, }: {
+    uid?: string;
     onMessage?: (data: any, from: string) => void;
     logLine?: (direction: string, obj?: any) => void;
-    enterRoom?: EnterRoom<SigType, SigPayload>;
+    enterRoomFunction?: EnterRoom<SigType, SigPayload>;
+    autoLeaveUsers?: boolean;
     workerUrl?: URL;
 }): {
-    userId: `${string}-${string}-${string}-${string}-${string}`;
-    sendToUser: (userId: string, data: string) => void;
-    sendToAll: (data: string) => void;
-    end: () => void;
-    enter: ({ room, host }: {
+    userId: string;
+    send: (data: any, userId?: string) => void;
+    enterRoom: ({ room, host }: {
         room: string;
         host: string;
     }) => void;
-    exit: ({ room, host }: {
+    exitRoom: ({ room, host }: {
         room: string;
         host: string;
     }) => void;
+    leaveUser: (userId: string) => void;
+    getUsers: () => string[];
+    end(): void;
 };
 export {};
 //# sourceMappingURL=webrtc-room.d.ts.map

package/dist/webrtc-room.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webrtc-room.d.ts","sourceRoot":"","sources":["../src/browser/webrtc-room.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoB,MAAM,eAAe,CAAC;AAE5D,KAAK,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;AAC1C,KAAK,UAAU,GAAG,yBAAyB,GAAG,mBAAmB,CAAC;AAiBlE,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,OAAuB,EACvB,SAA8B,EAC9B,SAAS,GACV,EAAE;IACD,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACjD,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;;yBAsL6B,MAAM,QAAQ,MAAM;sBAMvB,MAAM;;4BAxGA;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;2BAyFhC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;EAuC9D"}
+{"version":3,"file":"webrtc-room.d.ts","sourceRoot":"","sources":["../src/browser/webrtc-room.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,eAAe,CAAC;AAErD,KAAK,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;AAC1C,KAAK,UAAU,GAAG,yBAAyB,GAAG,mBAAmB,CAAC;AAgBlE,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,qBAAqB,EACrB,oBAA4B,EAC5B,SAAsE,EACtE,iBAAiB,EAAE,SAA8B,EACjD,OAAuB,EACvB,WAAW,EACX,SAAS,GACV,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,iBAAiB,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACjD,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qBAAqB,CAAC,UAAU,EAAE;QAAE,EAAE,EAAE,iBAAiB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CACxG;gCAoEgC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;+BAThC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;wBA1BlC,MAAM;;EAsHlC;AAGD,wBAAgB,cAAc,CAAC,EAC7B,GAAG,EACH,SAAS,EACT,OAAuB,EACvB,iBAAsC,EACtC,cAAsB,EACtB,SAAS,GACV,EAAE;IACD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACjD,iBAAiB,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;;iBA+CqB,GAAG,WAAW,MAAM;gCAnJT;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;+BAThC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE;wBA1BlC,MAAM;;;EA2MlC"}

package/dist/webrtc-room.js

@@ -1,91 +1,73 @@
 import { enterRoom } from "./signal-room";
 const DEFAULT_ENTER_ROOM = enterRoom;
-export function joinWebRTCRoom({ onMessage, logLine = console.debug, enterRoom = DEFAULT_ENTER_ROOM, workerUrl, }) {
-    const userId = crypto.randomUUID();
-    const rtcConfig = {
-        iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
-    };
-    const peers = new Map();
-    function wireDataChannel(state) {
-        const dc = state.dataChannel;
-        if (!dc)
-            return;
-        dc.onopen = () => logLine("💬", { event: "dc-open", userId: state.userId });
-        dc.onmessage = (e) => {
-            onMessage?.(e.data, state.userId);
-            logLine("💬", { event: "dc-message", userId: state.userId, data: e.data });
-        };
-        dc.onclose = () => logLine("💬", { event: "dc-close", userId: state.userId });
-        dc.onerror = () => logLine("⚠️ ERROR", { error: "dc-error", userId: state.userId });
-    }
-    async function flushRemoteIce(state) {
-        if (!state.pc.remoteDescription)
-            return;
-        const queued = state.pendingRemoteIce;
-        state.pendingRemoteIce = [];
-        for (const ice of queued) {
-            try {
-                await state.pc.addIceCandidate(ice);
-            }
-            catch (e) {
-                logLine("⚠️ ERROR", { error: "add-ice-failed", userId: state.userId, detail: String(e) });
-            }
-        }
-    }
-    function getPeer(user) {
-        let state = peers.get(user.userId);
+export function collectPeerConnections({ userId, receivePeerConnection, leaveUserWithoutPeer = false, rtcConfig = { iceServers: [{ urls: "stun:stun.l.google.com:19302" }] }, enterRoomFunction: enterRoom = DEFAULT_ENTER_ROOM, logLine = console.debug, onLeaveUser, workerUrl, }) {
+    const users = new Map();
+    function getPeer(peer) {
+        let state = users.get(peer.userId);
         if (!state) {
             const newState = {
-                userId: user.userId,
+                userId: peer.userId,
                 pc: new RTCPeerConnection(rtcConfig),
                 pendingRemoteIce: [],
-                users: new Set([user]),
-                dataChannel: null,
+                peers: new Set([peer]),
             };
-            peers.set(user.userId, newState);
+            users.set(peer.userId, newState);
             // Send local ICE candidates to this peer
             newState.pc.onicecandidate = (ev) => {
                 if (!ev.candidate)
                     return;
-                for (let user of newState.users) {
+                for (let user of newState.peers) {
                     const success = user.receive("ice", ev.candidate.toJSON());
                     if (success)
                         break;
-                    newState.users.delete(user);
                 }
             };
-            // Responder receives DataChannel here
-            newState.pc.ondatachannel = (ev) => {
-                newState.dataChannel = ev.channel;
-                wireDataChannel(newState);
-            };
             newState.pc.onconnectionstatechange = () => {
                 logLine("💬", { event: "pc-state", userId: newState.userId, state: newState.pc.connectionState });
             };
             state = newState;
         }
         else {
-            state.users.add(user);
+            state.peers.add(peer);
         }
-        peers.set(state.userId, state);
+        users.set(state.userId, state);
         return state;
     }
     function leaveUser(userId) {
-        const p = peers.get(userId);
+        onLeaveUser?.(userId);
+        const p = users.get(userId);
         if (!p)
             return;
-        try {
-            p.dataChannel?.close();
-        }
-        catch { }
         try {
             p.pc.close();
         }
         catch { }
-        peers.delete(userId);
+        users.delete(userId);
         logLine("👤 USER LEFT", userId);
     }
+    async function flushRemoteIce(state) {
+        if (!state.pc.remoteDescription)
+            return;
+        const queued = state.pendingRemoteIce;
+        state.pendingRemoteIce = [];
+        for (const ice of queued) {
+            try {
+                await state.pc.addIceCandidate(ice);
+            }
+            catch (e) {
+                logLine("⚠️ ERROR", { error: "add-ice-failed", userId: state.userId, detail: String(e) });
+            }
+        }
+    }
     const roomsEntered = new Map();
+    function exit({ room, host }) {
+        const key = `${host}/room/${room}`;
+        const session = roomsEntered.get(key);
+        if (session) {
+            session.exitRoom();
+            roomsEntered.delete(key);
+        }
+    }
     function enter({ room, host }) {
         const { exitRoom } = enterRoom({
             userId,
@@ -94,42 +76,29 @@ export function joinWebRTCRoom({ onMessage, logLine = console.debug, enterRoom =
             logLine,
             workerUrl,
             // Existing peers initiate to the newcomer (Option 1)
-            onPeerJoined: async (user) => {
+            async onPeerJoined(user) {
                 const state = getPeer(user);
                 const pc = state.pc;
-                // Initiator creates the DataChannel
-                if (!state.dataChannel) {
-                    state.dataChannel = pc.createDataChannel("data");
-                    wireDataChannel(state);
-                }
                 // Offer flow: createOffer -> setLocalDescription -> send localDescription
                 const offer = await pc.createOffer();
                 await pc.setLocalDescription(offer);
-                user.receive("offer", pc.localDescription);
+                user.receive("offer", pc.localDescription?.toJSON());
             },
-            onPeerLeft: (userId) => {
-                const state = peers.get(userId);
+            onPeerLeft(userId, peerId) {
+                const state = users.get(userId);
                 if (!state)
                     return;
-                for (const user of state.users) {
-                    if (user.userId === userId) {
-                        state.users.delete(user);
+                for (const user of state.peers) {
+                    if (user.peerId === peerId) {
+                        state.peers.delete(user);
                         break;
                     }
                 }
-                if (state.users.size === 0) {
-                    try {
-                        state.dataChannel?.close();
-                    }
-                    catch { }
-                    try {
-                        state.pc.close();
-                    }
-                    catch { }
+                if (state.peers.size === 0 && leaveUserWithoutPeer) {
                     leaveUser(userId);
                 }
             },
-            onMessage: async (type, payload, from) => {
+            async onMessage(type, payload, from) {
                 const state = getPeer(from);
                 const pc = state.pc;
                 if (type === "offer") {
@@ -138,15 +107,17 @@ export function joinWebRTCRoom({ onMessage, logLine = console.debug, enterRoom =
                     // Create and send answer
                     const answer = await pc.createAnswer();
                     await pc.setLocalDescription(answer);
-                    from.receive("answer", pc.localDescription);
+                    from.receive("answer", pc.localDescription?.toJSON());
                     // Now safe to apply any queued ICE from this peer
                     await flushRemoteIce(state);
+                    receivePeerConnection({ pc, userId: from.userId, initiator: false });
                     return;
                 }
                 if (type === "answer") {
                     // Initiator: set remote answer
                     await pc.setRemoteDescription(payload);
                     await flushRemoteIce(state);
+                    receivePeerConnection({ pc, userId: from.userId, initiator: true });
                     return;
                 }
                 if (type === "ice") {
@@ -166,50 +137,80 @@ export function joinWebRTCRoom({ onMessage, logLine = console.debug, enterRoom =
                 }
             },
         });
-        roomsEntered.set(`${host}/room/${room}`, { exitRoom, host, room });
-    }
-    function exit({ room, host }) {
-        const key = `${host}/room/${room}`;
-        const session = roomsEntered.get(key);
-        if (session) {
-            session.exitRoom();
-            roomsEntered.delete(key);
-        }
+        roomsEntered.set(`${host}/room/${room}`, { exitRoom });
     }
-    const sendToUser = (userId, data) => {
-        const p = peers.get(userId);
-        if (!p)
-            return;
-        if (p.dataChannel?.readyState === "open")
-            p.dataChannel.send(data);
+    return { enterRoom: enter, exitRoom: exit, leaveUser, getUsers() { return Array.from(users.keys()); } };
+}
+export function joinWebRTCRoom({ uid, onMessage, logLine = console.debug, enterRoomFunction = DEFAULT_ENTER_ROOM, autoLeaveUsers = false, workerUrl, }) {
+    const userId = uid ?? `user-${crypto.randomUUID()}`;
+    const rtcConfig = {
+        iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
     };
-    function sendToAll(data) {
-        for (const p of peers.values()) {
-            if (p.dataChannel?.readyState === "open")
-                p.dataChannel.send(data);
-        }
+    function wireDataChannel(userId, dc) {
+        dc.onopen = () => logLine("💬", { event: "dc-open", userId });
+        dc.onmessage = ({ data }) => {
+            onMessage?.(data, userId);
+            logLine("💬", { event: "dc-message", userId, data: data });
+        };
+        dc.onclose = () => logLine("💬", { event: "dc-close", userId });
+        dc.onerror = () => logLine("⚠️ ERROR", { error: "dc-error", userId });
+    }
+    const dataChannels = new Map();
+    const { enterRoom, exitRoom, leaveUser, getUsers } = collectPeerConnections({
+        userId,
+        rtcConfig,
+        enterRoomFunction,
+        logLine,
+        workerUrl,
+        leaveUserWithoutPeer: autoLeaveUsers,
+        onLeaveUser: (userId) => {
+            const dc = dataChannels.get(userId);
+            try {
+                dc?.close();
+            }
+            catch { }
+            dataChannels.delete(userId);
+        },
+        receivePeerConnection({ pc, userId, initiator }) {
+            if (initiator) {
+                const dc = pc.createDataChannel("data");
+                wireDataChannel(userId, dc);
+                dataChannels.set(userId, dc);
+            }
+            else {
+                pc.ondatachannel = (ev) => {
+                    const dc = ev.channel;
+                    wireDataChannel(userId, dc);
+                    dataChannels.set(userId, dc);
+                };
+            }
+            logLine("💬", { event: "pc-ready", userId, initiator });
+        },
+    });
+    function send(data, userId) {
+        dataChannels.forEach((dataChannel, pUserId) => {
+            if (userId && pUserId !== userId)
+                return;
+            if (dataChannel.readyState === "open")
+                dataChannel.send(data);
+        });
     }
     return {
         userId,
-        sendToUser,
-        sendToAll,
-        end: () => {
-            roomsEntered.values().forEach(({ exitRoom }) => exitRoom());
-            roomsEntered.clear();
-            for (const p of peers.values()) {
+        send,
+        enterRoom,
+        exitRoom,
+        leaveUser,
+        getUsers,
+        end() {
+            dataChannels.forEach((dataChannel) => {
                 try {
-                    p.dataChannel?.close();
+                    dataChannel.close();
                 }
                 catch { }
-                try {
-                    p.pc.close();
-                }
-                catch { }
-            }
-            peers.clear();
+            });
+            dataChannels.clear();
         },
-        enter,
-        exit,
     };
 }
 //# sourceMappingURL=webrtc-room.js.map