onelobby 0.2.1 → 0.3.0

package/dist/onelobby.d.ts

@@ -5,7 +5,7 @@ import { type LobbySummary } from "./signaling.js";
 import { type LinkFactory, type SocketFactory } from "./transport.js";
 import type { VoiceCodec, FrameSource, AudioSink } from "./voice-types.js";
 export declare const LIB_NAME = "onelobby";
-export declare const LIB_VERSION = "0.2.1";
+export declare const LIB_VERSION = "0.3.0";
 /** Where `rememberSeat` keeps the resume token: the subset of the Web Storage API it uses. */
 export interface SeatStorage {
     getItem(key: string): string | null;

package/dist/onelobby.global.js

@@ -1,4 +1,4 @@
-/*! onelobby 0.2.1 | MIT license */
+/*! onelobby 0.3.0 | MIT license */
 "use strict";
 var OneLobby = (() => {
   var __defProp = Object.defineProperty;
@@ -1146,8 +1146,19 @@ var OneLobby = (() => {
     cancelPing = null;
     pingN = 0;
     closed = false;
-    onMessage = null;
+    handler = null;
+    // Messages with no waiter and no handler yet. The reply that resolves join/create can arrive in the same socket
+    // read as the host's first offer; both are dispatched before the awaiting code builds its Lobby and sets a handler.
+    backlog = [];
     onClose = null;
+    get onMessage() {
+      return this.handler;
+    }
+    /** Setting a handler first delivers, in order, what arrived while there was none. */
+    set onMessage(h) {
+      this.handler = h;
+      while (h && this.handler === h && this.backlog.length) h(this.backlog.shift());
+    }
     connect() {
       return new Promise((resolve, reject) => {
         let s;
@@ -1187,7 +1198,8 @@ var OneLobby = (() => {
             else w.resolve(m);
             return;
           }
-          this.onMessage?.(m);
+          if (this.handler) this.handler(m);
+          else if (this.backlog.length < 256) this.backlog.push(m);
         };
         s.onclose = () => {
           if (!this.lastRx) reject(new OneLobbyError("connect_failed", `cannot reach ${this.url}`));
@@ -1798,6 +1810,8 @@ var OneLobby = (() => {
     cfg;
     roster = /* @__PURE__ */ new Map();
     links = /* @__PURE__ */ new Map();
+    /** ICE from a peer that has no link yet: its candidates can overtake its offer (node-datachannel). */
+    earlyIce = /* @__PURE__ */ new Map();
     connected = /* @__PURE__ */ new Set();
     // host: peers that said hi
     hiSentTo = /* @__PURE__ */ new Set();
@@ -2393,13 +2407,25 @@ var OneLobby = (() => {
     }
     async onSignal(from, s) {
       let link = this.links.get(from);
-      if (s.sdp?.type === "offer") {
-        link = this.makeLink(from);
-      }
-      if (!link) return;
       const payload = {};
       if (s.sdp) payload.sdp = s.sdp;
       if (s.ice) payload.ice = s.ice;
+      if (s.sdp?.type === "offer") {
+        link = this.makeLink(from);
+        const early = this.earlyIce.get(from) ?? [];
+        this.earlyIce.delete(from);
+        const done = link.handleSignal(payload);
+        for (const e of early) void link.handleSignal(e);
+        await done;
+        return;
+      }
+      if (!link) {
+        if (!payload.ice || this.ended || !this.roster.has(from)) return;
+        const q = this.earlyIce.get(from) ?? [];
+        if (q.length < 64) q.push(payload);
+        this.earlyIce.set(from, q);
+        return;
+      }
       await link.handleSignal(payload);
     }
     /**
@@ -2414,6 +2440,7 @@ var OneLobby = (() => {
         return;
       }
       if (peer) this.roster.delete(peerId);
+      this.earlyIce.delete(peerId);
       const link = this.links.get(peerId);
       if (link && peerId !== this.hostPeerId) {
         link.onMessage = null;
@@ -2518,6 +2545,7 @@ var OneLobby = (() => {
         l.close();
       }
       this.links.clear();
+      this.earlyIce.clear();
       this.lingering.clear();
       this.signaling.onClose = null;
       this.signaling.onMessage = null;
@@ -2691,8 +2719,14 @@ registerProcessor('onelobby-capture', OneLobbyCapture);
     pc;
     channels = {};
     pendingIce = [];
+    /**
+     * Set once setRemoteDescription resolves. Not `pc.remoteDescription`: node-datachannel's polyfill returns an object
+     * there before any is set, and its addIceCandidate throws until one is.
+     */
+    haveRemote = false;
     closed = false;
     opened = 0;
+    early = [];
     extra;
     /** `rtc`: the RTCPeerConnection class to use (default the global one; in Node, node-datachannel's polyfill). */
     constructor(opts, rtc = globalThis.RTCPeerConnection) {
@@ -2718,6 +2752,14 @@ registerProcessor('onelobby-capture', OneLobbyCapture);
           else this.fail(s);
         }
       };
+    }
+    /**
+     * The offerer creates the channels just before its offer, the answerer once the remote offer is set. Creating them
+     * any earlier makes libdatachannel (node-datachannel) start an offer of its own on the answering side, which then
+     * collides with the real one (both ICE agents controlling, the link never opens).
+     */
+    openChannels() {
+      if (this.channels.reliable) return;
       for (const name of ["reliable", "fast", "voice"]) {
         const ch = this.pc.createDataChannel(name, CHANNEL_INIT[name]);
         ch.binaryType = "arraybuffer";
@@ -2725,6 +2767,7 @@ registerProcessor('onelobby-capture', OneLobbyCapture);
           if (++this.opened === 3 && !this.closed) {
             this.isOpen = true;
             this.onOpen?.();
+            for (const [n, data] of this.early.splice(0)) if (!this.closed) this.onMessage?.(n, data);
             void this.reportPath();
           }
         };
@@ -2732,6 +2775,10 @@ registerProcessor('onelobby-capture', OneLobbyCapture);
         ch.onmessage = (e) => {
           const d = e.data;
           const data = d instanceof ArrayBuffer ? new Uint8Array(d) : ArrayBuffer.isView(d) ? new Uint8Array(d.buffer, d.byteOffset, d.byteLength) : new Uint8Array(d);
+          if (!this.isOpen) {
+            if (this.early.length < 1e3) this.early.push([name, data]);
+            return;
+          }
           this.onMessage?.(name, data);
         };
         this.channels[name] = ch;
@@ -2740,6 +2787,7 @@ registerProcessor('onelobby-capture', OneLobbyCapture);
     startOffer() {
       void (async () => {
         try {
+          this.openChannels();
           const offer = await this.pc.createOffer();
           await this.pc.setLocalDescription(offer);
           this.onSignal?.({ sdp: { type: "offer", sdp: offer.sdp ?? "" } });
@@ -2752,19 +2800,21 @@ registerProcessor('onelobby-capture', OneLobbyCapture);
       try {
         if (s.sdp) {
           await this.pc.setRemoteDescription({ type: s.sdp.type, sdp: s.sdp.sdp });
+          this.haveRemote = true;
           for (const c of this.pendingIce.splice(0)) await this.pc.addIceCandidate(c);
           if (this.extra.length) {
             const mid = /^a=mid:(\S+)/m.exec(s.sdp.sdp)?.[1] ?? "0";
             for (const candidate of this.extra.splice(0)) await this.pc.addIceCandidate({ candidate, sdpMid: mid, sdpMLineIndex: 0 });
           }
           if (s.sdp.type === "offer") {
+            this.openChannels();
             const answer = await this.pc.createAnswer();
             await this.pc.setLocalDescription(answer);
             this.onSignal?.({ sdp: { type: "answer", sdp: answer.sdp ?? "" } });
           }
         }
         if (s.ice) {
-          if (this.pc.remoteDescription) await this.pc.addIceCandidate(s.ice);
+          if (this.haveRemote) await this.pc.addIceCandidate(s.ice);
           else this.pendingIce.push(s.ice);
         }
       } catch (e) {
@@ -2930,7 +2980,7 @@ registerProcessor('onelobby-capture', OneLobbyCapture);
 
   // src/onelobby.ts
   var LIB_NAME = "onelobby";
-  var LIB_VERSION = "0.2.1";
+  var LIB_VERSION = "0.3.0";
   var DEFAULT_READY_TIMEOUT_MS = 15e3;
   function hasMic() {
     return typeof navigator !== "undefined" && !!navigator.mediaDevices?.getUserMedia && typeof AudioWorkletNode !== "undefined";