@furious.luke/argus-js 0.5.0 → 0.5.2

package/README.md

@@ -181,6 +181,7 @@ the customer server owns a live control-token notify subscription.
 | `gatewayHandshakeTimeoutMs` | `number` | Overall deadline for the initial gateway race and `accepted` → `ready` handshake. Unaccepted sockets are replaced after 3 seconds so a blackholed TCP flow cannot consume the full deadline. Defaults to 20 seconds. |
 | `peerConnectionTimeoutMs` | `number` | Deadline after the initial offer for WebRTC to reach `connected`. Defaults to 30 seconds. |
 | `signalingReconnectTimeoutMs` | `number` | How long to retry a dropped signaling socket against the selected regional gateway. Defaults to 20 seconds. |
+| `preferredVideoCodecs` | `string[]` | Preferred video codecs, most-preferred first, as RTP MIME types (e.g. `"video/VP9"`, `"video/H264"`). Each published video track offers these ahead of the rest, so the browser sends the first one the media server also accepts. Defaults to `["video/VP9"]`. Pass `[]` to leave the browser's native order untouched. Codecs the browser lacks (or `setCodecPreferences` support, e.g. older Safari) are ignored — negotiation always falls back cleanly. |
 | `callbacks` | `PublisherCallbacks` | Optional lifecycle callbacks (see below). |
 
 ### Methods & properties

package/dist/index.cjs

@@ -180,10 +180,11 @@ var Publisher = class {
   // may later reuse any compatible inactive transceiver, not necessarily the one
   // that previously carried the same logical type.
   typeSenders = /* @__PURE__ */ new Map();
-  // intentionalTrackEnds holds physical track ids removed by publish/unpublish
-  // whose server-side `media_track_ended` has not yet arrived. Correlating by id
-  // keeps a delayed end for an old screen track from being mistaken for failure
-  // of a newly-published screen track.
+  // intentionalTrackEnds holds the browser track ids removed by publish/unpublish
+  // whose server-side `media_track_ended` has not yet arrived. Correlating by the
+  // track id (the generation identity the server echoes in track_id) keeps a
+  // delayed end for an old screen track from being mistaken for failure of a
+  // newly-published screen track.
   intentionalTrackEnds = /* @__PURE__ */ new Map();
   // negotiationChain serializes every offer/answer exchange, including recovery.
   // User operations do not resolve until their answer is applied, so no caller
@@ -369,6 +370,7 @@ var Publisher = class {
       };
       if (initialTrack) {
         const sender = initialTrack.type === "audio" ? this.addMicrophoneTrack(pc, initialTrack.track, initialTrack.stream) : pc.addTrack(initialTrack.track, initialTrack.stream);
+        if (initialTrack.type !== "audio") this.preferVideoCodecs(pc, sender);
         this.typeSenders.set(
           initialTrack.type,
           sender
@@ -1124,7 +1126,7 @@ var Publisher = class {
         sdp: local.sdp,
         sdp_type: "offer",
         negotiation_id: id,
-        tracks: change?.labels ?? this.buildTrackLabels(),
+        tracks: change?.labels?.() ?? this.buildTrackLabels(),
         speech_enabled: this.speechEnabled || this.speechPending || void 0
       });
       this.releaseLocalCandidateBatch();
@@ -1533,7 +1535,7 @@ var Publisher = class {
       this.typeSenders.set(type, addedSender);
     }
     return {
-      labels: this.labelsReplacingType(type, track),
+      labels: () => this.labelsReplacingType(type, track),
       commit: () => {
         for (const { track: oldTrack } of previous) {
           this.unwatchTrack(oldTrack);
@@ -1579,6 +1581,39 @@ var Publisher = class {
     this.microphoneTransceiver = transceiver;
     return transceiver.sender;
   }
+  /**
+   * Reorders the codecs a video sender offers so the browser prefers the
+   * configured codecs (VP9 by default). This is what actually controls the wire
+   * format: the browser is the offerer and sends its own top-of-offer codec, and
+   * the media server (Pion) answers by mirroring the offer's codec order — so the
+   * server's own registration order has no say. Floating VP9 to the front of the
+   * offer is therefore the lever. Codecs not in the preference keep their native
+   * order behind it, so anything VP9 can't satisfy still negotiates.
+   *
+   * Best-effort: browsers lacking `getCapabilities`/`setCodecPreferences` (older
+   * Safari) keep their default order, and any failure is swallowed — codec
+   * preference is an optimization, never a requirement for publishing.
+   */
+  preferVideoCodecs(pc, sender) {
+    const preferred = this.opts.preferredVideoCodecs ?? ["video/VP9"];
+    if (preferred.length === 0) return;
+    if (sender.track && sender.track.kind !== "video") return;
+    if (typeof RTCRtpSender === "undefined" || typeof RTCRtpSender.getCapabilities !== "function") return;
+    if (typeof pc.getTransceivers !== "function") return;
+    const caps = RTCRtpSender.getCapabilities("video");
+    if (!caps?.codecs) return;
+    const transceiver = pc.getTransceivers().find((t) => t.sender === sender);
+    if (!transceiver || typeof transceiver.setCodecPreferences !== "function") return;
+    const rank = (mimeType) => {
+      const idx = preferred.findIndex((p) => p.toLowerCase() === mimeType.toLowerCase());
+      return idx === -1 ? preferred.length : idx;
+    };
+    const ordered = caps.codecs.map((codec, index) => ({ codec, index })).sort((a, b) => rank(a.codec.mimeType) - rank(b.codec.mimeType) || a.index - b.index).map((entry) => entry.codec);
+    try {
+      transceiver.setCodecPreferences(ordered);
+    } catch {
+    }
+  }
   /** Registers one physical video track under its logical type and source stream. */
   registerTrack(track, stream, type) {
     this.published.set(track, type);
@@ -1597,18 +1632,34 @@ var Publisher = class {
   buildTrackLabels() {
     const labels = [];
     for (const [track, type] of this.published) {
-      labels.push({ id: track.id, type });
+      const mid = this.midForTrack(track);
+      if (mid !== null) labels.push({ mid, id: track.id, type });
     }
     return labels;
   }
   labelsReplacingType(type, replacement) {
     const labels = [];
     for (const [track, publishedType] of this.published) {
-      if (publishedType !== type) labels.push({ id: track.id, type: publishedType });
+      if (publishedType === type) continue;
+      const mid = this.midForTrack(track);
+      if (mid !== null) labels.push({ mid, id: track.id, type: publishedType });
+    }
+    if (replacement) {
+      const mid = this.midForTrack(replacement);
+      if (mid !== null) labels.push({ mid, id: replacement.id, type });
     }
-    if (replacement) labels.push({ id: replacement.id, type });
     return labels;
   }
+  /**
+   * The negotiated mid of the transceiver currently sending `track`, or null if
+   * none is found or it has not been negotiated yet. The mid is the identifier
+   * both peers agree on; it is assigned once setLocalDescription runs, which the
+   * publisher always does before sending an offer's labels.
+   */
+  midForTrack(track) {
+    const transceiver = this.pc?.getTransceivers().find((candidate) => candidate.sender.track === track);
+    return transceiver?.mid ?? null;
+  }
   async stagePublish(track, stream, type) {
     const pc = this.pc;
     if (!pc) throw new Error("publisher not started");
@@ -1636,10 +1687,11 @@ var Publisher = class {
         throw new SenderRestoreError(`inactive ${type} sender still has a track`);
       }
       addedSender = pc.addTrack(track, stream);
+      this.preferVideoCodecs(pc, addedSender);
       this.typeSenders.set(type, addedSender);
     }
     return {
-      labels: this.labelsReplacingType(type, track),
+      labels: () => this.labelsReplacingType(type, track),
       commit: () => {
         this.cancelMediaRecovery(type);
         this.recoveryState(type).required = false;
@@ -1687,7 +1739,7 @@ var Publisher = class {
     for (const { track } of previous) this.expectIntentionalTrackEnd(track.id, type);
     pc.removeTrack(typeSender);
     return {
-      labels: this.labelsReplacingType(type),
+      labels: () => this.labelsReplacingType(type),
       commit: () => {
         this.cancelMediaRecovery(type);
         this.recoveryState(type).required = false;