From 28d0b1437d2ac9fd4838c7e1cba29941091cac23 Mon Sep 17 00:00:00 2001
From: legop3 <minecratfd8@gmail.com>
Date: Thu, 8 Oct 2026 13:21:23 -0400
Subject: [PATCH] guh stupid

---
 webui/src/lib/vendor/mediamtxPublisher.js | 476 ++++++++++++++++++++++
 webui/src/mic/MicApp.jsx                  |  63 ++-
 2 files changed, 500 insertions(+), 39 deletions(-)
 create mode 100644 webui/src/lib/vendor/mediamtxPublisher.js

diff --git a/webui/src/lib/vendor/mediamtxPublisher.js b/webui/src/lib/vendor/mediamtxPublisher.js
new file mode 100644
index 00000000..e3876162
--- /dev/null
+++ b/webui/src/lib/vendor/mediamtxPublisher.js
@@ -0,0 +1,476 @@
+// MediaMTX v1.15.3 publisher client, matching the Dockerfile default.
+// Source: https://raw.githubusercontent.com/bluenviron/mediamtx/v1.15.3/internal/servers/webrtc/publisher.js
+// Only modification: export the class as an ES module for Vite.
+/*
+MIT License
+
+Copyright (c) 2019 aler9
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+'use strict';
+
+/**
+ * @callback OnError
+ * @param {string} err - error.
+ */
+
+/**
+ * @callback OnConnected
+ */
+
+/**
+ * @typedef Conf
+ * @type {object}
+ * @property {string} url - absolute URL of the WHIP endpoint.
+ * @property {string} user - username.
+ * @property {string} pass - password.
+ * @property {string} token - token.
+ * @property {MediaStream} stream - stream that contains outgoing tracks.
+ * @property {string} videoCodec - outgoing video codec.
+ * @property {number} videoBitrate - outgoing video bitrate.
+ * @property {string} audioCodec - outgoing audio bitrate.
+ * @property {number} audioBitrate - outgoing audio bitrate.
+ * @property {boolean} audioVoice - whether audio is voice.
+ * @property {OnError} onError - called when there's an error.
+ * @property {OnConnected} onConnected - called when connected.
+ */
+
+/** WebRTC/WHIP publisher. */
+class MediaMTXWebRTCPublisher {
+  /**
+   * Create a MediaMTXWebRTCPublisher.
+   * @param {Conf} conf - configuration.
+   */
+  constructor(conf) {
+    this.retryPause = 2000;
+    this.conf = conf;
+    this.state = 'running';
+    this.restartTimeout = null;
+    this.pc = null;
+    this.offerData = null;
+    this.sessionUrl = null;
+    this.queuedCandidates = [];
+    this.#start();
+  }
+
+  /**
+   * Close the publisher and all its resources.
+   */
+  close = () => {
+    this.state = 'closed';
+
+    if (this.pc !== null) {
+      this.pc.close();
+    }
+
+    if (this.restartTimeout !== null) {
+      clearTimeout(this.restartTimeout);
+    }
+  };
+
+  static #unquoteCredential(v) {
+    return JSON.parse(`"${v}"`);
+  }
+
+  static #linkToIceServers(links) {
+    return (links !== null) ? links.split(', ').map((link) => {
+      const m = link.match(/^<(.+?)>; rel="ice-server"(; username="(.*?)"; credential="(.*?)"; credential-type="password")?/i);
+      const ret = {
+        urls: [m[1]],
+      };
+
+      if (m[3] !== undefined) {
+        ret.username = this.#unquoteCredential(m[3]);
+        ret.credential = this.#unquoteCredential(m[4]);
+        ret.credentialType = 'password';
+      }
+
+      return ret;
+    }) : [];
+  }
+
+  static #parseOffer(offer) {
+    const ret = {
+      iceUfrag: '',
+      icePwd: '',
+      medias: [],
+    };
+
+    for (const line of offer.split('\r\n')) {
+      if (line.startsWith('m=')) {
+        ret.medias.push(line.slice('m='.length));
+      } else if (ret.iceUfrag === '' && line.startsWith('a=ice-ufrag:')) {
+        ret.iceUfrag = line.slice('a=ice-ufrag:'.length);
+      } else if (ret.icePwd === '' && line.startsWith('a=ice-pwd:')) {
+        ret.icePwd = line.slice('a=ice-pwd:'.length);
+      }
+    }
+
+    return ret;
+  }
+
+  static #generateSdpFragment(od, candidates) {
+    const candidatesByMedia = {};
+    for (const candidate of candidates) {
+      const mid = candidate.sdpMLineIndex;
+      if (candidatesByMedia[mid] === undefined) {
+        candidatesByMedia[mid] = [];
+      }
+      candidatesByMedia[mid].push(candidate);
+    }
+
+    let frag = 'a=ice-ufrag:' + od.iceUfrag + '\r\n'
+      + 'a=ice-pwd:' + od.icePwd + '\r\n';
+
+    let mid = 0;
+
+    for (const media of od.medias) {
+      if (candidatesByMedia[mid] !== undefined) {
+        frag += 'm=' + media + '\r\n'
+          + 'a=mid:' + mid + '\r\n';
+
+        for (const candidate of candidatesByMedia[mid]) {
+          frag += 'a=' + candidate.candidate + '\r\n';
+        }
+      }
+      mid++;
+    }
+
+    return frag;
+  }
+
+  static #setCodec(section, codec) {
+    const lines = section.split('\r\n');
+    const lines2 = [];
+    const payloadFormats = [];
+
+    for (const line of lines) {
+      if (!line.startsWith('a=rtpmap:')) {
+        lines2.push(line);
+      } else {
+        if (line.toLowerCase().includes(codec)) {
+          payloadFormats.push(line.slice('a=rtpmap:'.length).split(' ')[0]);
+          lines2.push(line);
+        }
+      }
+    }
+
+    const lines3 = [];
+    let firstLine = true;
+
+    for (const line of lines2) {
+      if (firstLine) {
+        firstLine = false;
+        lines3.push(line.split(' ').slice(0, 3).concat(payloadFormats).join(' '));
+      } else if (line.startsWith('a=fmtp:')) {
+        if (payloadFormats.includes(line.slice('a=fmtp:'.length).split(' ')[0])) {
+          lines3.push(line);
+        }
+      } else if (line.startsWith('a=rtcp-fb:')) {
+        if (payloadFormats.includes(line.slice('a=rtcp-fb:'.length).split(' ')[0])) {
+          lines3.push(line);
+        }
+      } else {
+        lines3.push(line);
+      }
+    }
+
+    return lines3.join('\r\n');
+  }
+
+  static #setVideoBitrate(section, bitrate) {
+    let lines = section.split('\r\n');
+
+    for (let i = 0; i < lines.length; i++) {
+      if (lines[i].startsWith('c=')) {
+        lines = [...lines.slice(0, i+1), 'b=TIAS:' + (parseInt(bitrate) * 1024).toString(), ...lines.slice(i+1)];
+        break
+      }
+    }
+
+    return lines.join('\r\n');
+  }
+
+  static #setAudioBitrate(section, bitrate, voice) {
+    let opusPayloadFormat = '';
+    let lines = section.split('\r\n');
+
+    for (let i = 0; i < lines.length; i++) {
+      if (lines[i].startsWith('a=rtpmap:') && lines[i].toLowerCase().includes('opus/')) {
+        opusPayloadFormat = lines[i].slice('a=rtpmap:'.length).split(' ')[0];
+        break;
+      }
+    }
+
+    if (opusPayloadFormat === '') {
+      return section;
+    }
+
+    for (let i = 0; i < lines.length; i++) {
+      if (lines[i].startsWith('a=fmtp:' + opusPayloadFormat + ' ')) {
+        if (voice) {
+          lines[i] = 'a=fmtp:' + opusPayloadFormat + ' minptime=10;useinbandfec=1;maxaveragebitrate='
+            + (parseInt(bitrate) * 1024).toString();
+        } else {
+          lines[i] = 'a=fmtp:' + opusPayloadFormat + ' maxplaybackrate=48000;stereo=1;sprop-stereo=1;maxaveragebitrate='
+            + (parseInt(bitrate) * 1024).toString();
+        }
+      }
+    }
+
+    return lines.join('\r\n');
+  }
+
+  static #editOffer(sdp, videoCodec, audioCodec, audioBitrate, audioVoice) {
+    const sections = sdp.split('m=');
+
+    for (let i = 0; i < sections.length; i++) {
+      if (sections[i].startsWith('video')) {
+        sections[i] = this.#setCodec(sections[i], videoCodec);
+      } else if (sections[i].startsWith('audio')) {
+        sections[i] = this.#setAudioBitrate(this.#setCodec(sections[i], audioCodec), audioBitrate, audioVoice);
+      }
+    }
+
+    return sections.join('m=');
+  }
+
+  static #editAnswer(sdp, videoBitrate) {
+    const sections = sdp.split('m=');
+
+    for (let i = 0; i < sections.length; i++) {
+      if (sections[i].startsWith('video')) {
+        sections[i] = this.#setVideoBitrate(sections[i], videoBitrate);
+      }
+    }
+
+    return sections.join('m=');
+  }
+
+  #start() {
+    this.#requestICEServers()
+      .then((iceServers) => this.#setupPeerConnection(iceServers))
+      .then((offer) => this.#sendOffer(offer))
+      .then((answer) => this.#setAnswer(answer))
+      .catch((err) => {
+        this.#handleError(err.toString());
+      });
+  }
+
+  #handleError(err) {
+    if (this.state === 'running') {
+      if (this.pc !== null) {
+        this.pc.close();
+        this.pc = null;
+      }
+
+      this.offerData = null;
+
+      if (this.sessionUrl !== null) {
+        fetch(this.sessionUrl, {
+          method: 'DELETE',
+        });
+        this.sessionUrl = null;
+      }
+
+      this.queuedCandidates = [];
+      this.state = 'restarting';
+
+      this.restartTimeout = window.setTimeout(() => {
+        this.restartTimeout = null;
+        this.state = 'running';
+        this.#start();
+      }, this.retryPause);
+
+      if (this.conf.onError !== undefined) {
+        this.conf.onError(`${err}, retrying in some seconds`);
+      }
+    }
+  }
+
+  #authHeader() {
+    if (this.conf.user !== undefined && this.conf.user !== '') {
+      const credentials = btoa(`${this.conf.user}:${this.conf.pass}`);
+      return {'Authorization': `Basic ${credentials}`};
+    }
+    if (this.conf.token !== undefined && this.conf.token !== '') {
+      return {'Authorization': `Bearer ${this.conf.token}`};
+    }
+    return {};
+  }
+
+  #requestICEServers() {
+    return fetch(this.conf.url, {
+      method: 'OPTIONS',
+      headers: {
+        ...this.#authHeader(),
+      },
+    })
+      .then((res) => MediaMTXWebRTCPublisher.#linkToIceServers(res.headers.get('Link')));
+  }
+
+  #setupPeerConnection(iceServers) {
+    if (this.state !== 'running') {
+      throw new Error('closed');
+    }
+
+    this.pc = new RTCPeerConnection({
+      iceServers,
+      // https://webrtc.org/getting-started/unified-plan-transition-guide
+      sdpSemantics: 'unified-plan',
+    });
+
+    this.pc.onicecandidate = (evt) => this.#onLocalCandidate(evt);
+    this.pc.onconnectionstatechange = () => this.#onConnectionState();
+
+    this.conf.stream.getTracks().forEach((track) => {
+      this.pc.addTrack(track, this.conf.stream);
+    });
+
+    return this.pc.createOffer()
+      .then((offer) => {
+        this.offerData = MediaMTXWebRTCPublisher.#parseOffer(offer.sdp);
+
+        return this.pc.setLocalDescription(offer)
+          .then(() => offer.sdp);
+      });
+  }
+
+  #sendOffer(offer) {
+    if (this.state !== 'running') {
+      throw new Error('closed');
+    }
+
+    offer = MediaMTXWebRTCPublisher.#editOffer(
+      offer,
+      this.conf.videoCodec,
+      this.conf.audioCodec,
+      this.conf.audioBitrate,
+      this.conf.audioVoice);
+
+    return fetch(this.conf.url, {
+      method: 'POST',
+      headers: {
+        ...this.#authHeader(),
+        'Content-Type': 'application/sdp',
+      },
+      body: offer,
+    })
+      .then((res) => {
+        switch (res.status) {
+          case 201:
+            break;
+          case 400:
+            return res.json().then((e) => { throw new Error(e.error); });
+          default:
+            throw new Error(`bad status code ${res.status}`);
+        }
+
+        this.sessionUrl = new URL(res.headers.get('location'), this.conf.url).toString();
+
+        return res.text();
+      });
+  }
+
+  #setAnswer(answer) {
+    if (this.state !== 'running') {
+      throw new Error('closed');
+    }
+
+    answer = MediaMTXWebRTCPublisher.#editAnswer(answer, this.conf.videoBitrate);
+
+    return this.pc.setRemoteDescription(new RTCSessionDescription({
+      type: 'answer',
+      sdp: answer,
+    }))
+      .then(() => {
+        if (this.state !== 'running') {
+          return;
+        }
+
+        if (this.queuedCandidates.length !== 0) {
+          this.#sendLocalCandidates(this.queuedCandidates);
+          this.queuedCandidates = [];
+        }
+      });
+  }
+
+  #onLocalCandidate(evt) {
+    if (this.state !== 'running') {
+      return;
+    }
+
+    if (evt.candidate !== null) {
+      if (this.sessionUrl === null) {
+        this.queuedCandidates.push(evt.candidate);
+      } else {
+        this.#sendLocalCandidates([evt.candidate]);
+      }
+    }
+  }
+
+  #sendLocalCandidates(candidates) {
+    fetch(this.sessionUrl, {
+      method: 'PATCH',
+      headers: {
+        'Content-Type': 'application/trickle-ice-sdpfrag',
+        'If-Match': '*',
+      },
+      body: MediaMTXWebRTCPublisher.#generateSdpFragment(this.offerData, candidates),
+    })
+      .then((res) => {
+        switch (res.status) {
+          case 204:
+            break;
+          case 404:
+            throw new Error('stream not found');
+          default:
+            throw new Error(`bad status code ${res.status}`);
+        }
+      })
+      .catch((err) => {
+        this.#handleError(err.toString());
+      });
+  }
+
+  #onConnectionState() {
+    if (this.state !== 'running') {
+      return;
+    }
+
+    // "closed" can arrive before "failed" and without
+    // the close() method being called at all.
+    // It happens when the other peer sends a termination
+    // message like a DTLS CloseNotify.
+    if (this.pc.connectionState === 'failed'
+      || this.pc.connectionState === 'closed'
+    ) {
+      this.#handleError('peer connection closed');
+    } else if (this.pc.connectionState === 'connected') {
+      if (this.conf.onConnected !== undefined) {
+        this.conf.onConnected();
+      }
+    }
+  }
+
+}
+
+export default MediaMTXWebRTCPublisher;
diff --git a/webui/src/mic/MicApp.jsx b/webui/src/mic/MicApp.jsx
index a83591ad..d9debbee 100644
--- a/webui/src/mic/MicApp.jsx
+++ b/webui/src/mic/MicApp.jsx
@@ -3,9 +3,9 @@ import { useSocket } from '../context/SocketContext.jsx';
 import { useSessionSelector } from '../context/SessionContext.jsx';
 import useUserIdentitySync from '../hooks/useUserIdentitySync.js';
 import { RESTART_DELAY_MS } from '../lib/whepPlayback.js';
-import { waitForIceGatheringComplete } from '../components/vip/VipAudioUploadCard/whipTransport.js';
 import { ControlSystemProvider, KeyboardInputManager, GamepadInputManager, useControlSelector } from '../controls/index.js';
 import ControlHint from '../components/ControlHint/index.jsx';
+import MediaMTXWebRTCPublisher from '../lib/vendor/mediamtxPublisher.js';
 
 export default function MicApp() {
   return (
@@ -70,14 +70,12 @@ function MicPage() {
       const current = attempt;
       attempt = null;
       if (!current) return;
-      clearTimeout(current.timer);
-      current.abort.abort();
-      if (current.peer) {
-        current.peer.onconnectionstatechange = null;
-        current.peer.close();
-      }
-      if (current.resource) fetch(current.resource, { method: 'DELETE', headers: current.headers, keepalive: true }).catch(() => {});
+      const publisher = current.publisher;
+      publisher?.close();
+      // Upstream close stops the peer and retry timer but leaves HTTP session cleanup to us.
+      if (publisher?.sessionUrl) fetch(publisher.sessionUrl, { method: 'DELETE', keepalive: true }).catch(() => {});
     }
+
     function retry(current, message) {
       if (!isCurrent(current)) return;
       closeAttempt();
@@ -90,7 +88,7 @@ function MicPage() {
       // Invalidate the previous attempt before closing it. Late async results
       // and peer events must never change the new attempt's state or timers.
       closeAttempt();
-      const current = { abort: new AbortController() };
+      const current = {};
       attempt = current;
       setStatus('Starting microphone…');
       try {
@@ -109,36 +107,23 @@ function MicPage() {
         }
         const source = await ack('roomAudio:start');
         if (!isCurrent(current)) return;
-        current.headers = { Authorization: `Basic ${btoa(`${source.token}:${source.token}`)}` };
-        const pc = new RTCPeerConnection({ iceServers: [{ urls: 'stun:stun.l.google.com:19302' }] });
-        current.peer = pc;
-        media.getAudioTracks().forEach((track) => pc.addTrack(track, media));
-        pc.onconnectionstatechange = () => {
-          if (!isCurrent(current)) return;
-          if (pc.connectionState === 'connected') {
-            clearTimeout(current.timer);
-            setStatus('Microphone live');
-          }
-          if (['failed', 'disconnected', 'closed'].includes(pc.connectionState)) retry(current, 'Connection lost. Retrying…');
-        };
-        await pc.setLocalDescription(await pc.createOffer());
-        if (!isCurrent(current)) return;
-        await waitForIceGatheringComplete(pc);
-        if (!isCurrent(current)) return;
-        const response = await fetch(source.url, { method: 'POST', headers: { ...current.headers, 'Content-Type': 'application/sdp' }, body: pc.localDescription.sdp, signal: AbortSignal.any([current.abort.signal, AbortSignal.timeout(10000)]) });
-        if (!response.ok) throw new Error(`Microphone connection failed (${response.status})`);
-        const location = response.headers.get('Location');
-        current.resource = location ? new URL(location, new URL(source.url, window.location.href)).href : null;
-        if (!isCurrent(current)) {
-          if (current.resource) fetch(current.resource, { method: 'DELETE', headers: current.headers, keepalive: true }).catch(() => {});
-          return;
-        }
-        const sdp = await response.text();
-        if (!isCurrent(current)) return;
-        await pc.setRemoteDescription({ type: 'answer', sdp });
-        if (!isCurrent(current)) return;
-        // A negotiation can hang without reaching a terminal peer state.
-        if (pc.connectionState !== 'connected') current.timer = setTimeout(() => retry(current, 'Connection timed out. Retrying…'), 10000);
+        setStatus('Connecting audio…');
+        current.publisher = new MediaMTXWebRTCPublisher({
+          url: new URL(source.url, window.location.href).href,
+          user: source.token,
+          pass: source.token,
+          stream: media,
+          audioCodec: 'opus',
+          audioBitrate: 64,
+          audioVoice: true,
+          onConnected: () => {
+            if (isCurrent(current)) setStatus('Microphone live');
+          },
+          // The publisher owns transport retries; restarting it here would create competing loops.
+          onError: (message) => {
+            if (isCurrent(current)) setStatus(message);
+          },
+        });
       } catch (error) { retry(current, `${error.message}. Retrying…`); }
     }
     start();