diff --git a/frontend/src/pages/preview/reader.js b/frontend/src/pages/preview/reader.js index d6b4348be..7164a82b4 100644 --- a/frontend/src/pages/preview/reader.js +++ b/frontend/src/pages/preview/reader.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; /** * @callback OnError @@ -29,19 +29,23 @@ /** WebRTC/WHEP reader. */ class MediaMTXWebRTCReader { + static #RETRY_PAUSE = 2000; + + #conf; + #state = "getting_codecs"; + #restartTimeout = null; + #pc = null; + #offerData = null; + #sessionUrl = null; + #queuedCandidates = []; + #nonAdvertisedCodecs; + /** * Create a MediaMTXWebRTCReader. * @param {Conf} conf - configuration. */ constructor(conf) { - this.retryPause = 2000; - this.conf = conf; - this.state = 'getting_codecs'; - this.restartTimeout = null; - this.pc = null; - this.offerData = null; - this.sessionUrl = null; - this.queuedCandidates = []; + this.#conf = conf; this.#getNonAdvertisedCodecs(); } @@ -49,68 +53,73 @@ class MediaMTXWebRTCReader { * Close the reader and all its resources. */ close() { - this.state = 'closed'; + this.#state = "closed"; - if (this.pc !== null) { - this.pc.close(); + if (this.#pc !== null) { + this.#pc.close(); } - if (this.restartTimeout !== null) { - clearTimeout(this.restartTimeout); + if (this.#restartTimeout !== null) { + clearTimeout(this.#restartTimeout); } } static #supportsNonAdvertisedCodec(codec, fmtp) { return new Promise((resolve) => { const pc = new RTCPeerConnection({ iceServers: [] }); - const mediaType = 'audio'; - let payloadType = ''; + const mediaType = "audio"; + let payloadType = ""; - pc.addTransceiver(mediaType, { direction: 'recvonly' }); + pc.addTransceiver(mediaType, { direction: "recvonly" }); pc.createOffer() .then((offer) => { if (offer.sdp === undefined) { - throw new Error('SDP not present'); + throw new Error("SDP not present"); } - if (offer.sdp.includes(` ${codec}`)) { // codec is advertised, there's no need to add it manually - throw new Error('already present'); + if (offer.sdp.includes(` ${codec}`)) { + // codec is advertised, there's no need to add it manually + throw new Error("already present"); } const sections = offer.sdp.split(`m=${mediaType}`); - const payloadTypes = sections.slice(1) - .map((s) => s.split('\r\n')[0].split(' ').slice(3)) + const payloadTypes = sections + .slice(1) + .map((s) => s.split("\r\n")[0].split(" ").slice(3)) .reduce((prev, cur) => [...prev, ...cur], []); payloadType = this.#reservePayloadType(payloadTypes); - const lines = sections[1].split('\r\n'); + const lines = sections[1].split("\r\n"); lines[0] += ` ${payloadType}`; lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} ${codec}`); if (fmtp !== undefined) { lines.splice(lines.length - 1, 0, `a=fmtp:${payloadType} ${fmtp}`); } - sections[1] = lines.join('\r\n'); + sections[1] = lines.join("\r\n"); offer.sdp = sections.join(`m=${mediaType}`); return pc.setLocalDescription(offer); }) - .then(() => ( - pc.setRemoteDescription(new RTCSessionDescription({ - type: 'answer', - sdp: 'v=0\r\n' - + 'o=- 6539324223450680508 0 IN IP4 0.0.0.0\r\n' - + 's=-\r\n' - + 't=0 0\r\n' - + 'a=fingerprint:sha-256 0D:9F:78:15:42:B5:4B:E6:E2:94:3E:5B:37:78:E1:4B:54:59:A3:36:3A:E5:05:EB:27:EE:8F:D2:2D:41:29:25\r\n' - + `m=${mediaType} 9 UDP/TLS/RTP/SAVPF ${payloadType}\r\n` - + 'c=IN IP4 0.0.0.0\r\n' - + 'a=ice-pwd:7c3bf4770007e7432ee4ea4d697db675\r\n' - + 'a=ice-ufrag:29e036dc\r\n' - + 'a=sendonly\r\n' - + 'a=rtcp-mux\r\n' - + `a=rtpmap:${payloadType} ${codec}\r\n` - + ((fmtp !== undefined) ? `a=fmtp:${payloadType} ${fmtp}\r\n` : ''), - })) - )) + .then(() => + pc.setRemoteDescription( + new RTCSessionDescription({ + type: "answer", + sdp: + "v=0\r\n" + + "o=- 6539324223450680508 0 IN IP4 0.0.0.0\r\n" + + "s=-\r\n" + + "t=0 0\r\n" + + "a=fingerprint:sha-256 0D:9F:78:15:42:B5:4B:E6:E2:94:3E:5B:37:78:E1:4B:54:59:A3:36:3A:E5:05:EB:27:EE:8F:D2:2D:41:29:25\r\n" + + `m=${mediaType} 9 UDP/TLS/RTP/SAVPF ${payloadType}\r\n` + + "c=IN IP4 0.0.0.0\r\n" + + "a=ice-pwd:7c3bf4770007e7432ee4ea4d697db675\r\n" + + "a=ice-ufrag:29e036dc\r\n" + + "a=sendonly\r\n" + + "a=rtcp-mux\r\n" + + `a=rtpmap:${payloadType} ${codec}\r\n` + + (fmtp !== undefined ? `a=fmtp:${payloadType} ${fmtp}\r\n` : ""), + }), + ), + ) .then(() => { resolve(true); }) @@ -128,36 +137,40 @@ class MediaMTXWebRTCReader { } 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 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; - }) : []; + return ret; + }) + : []; } static #parseOffer(sdp) { const ret = { - iceUfrag: '', - icePwd: '', + iceUfrag: "", + icePwd: "", medias: [], }; - for (const line of sdp.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); + for (const line of sdp.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); } } @@ -174,11 +187,11 @@ class MediaMTXWebRTCReader { return pl; } } - throw Error('unable to find a free payload type'); + throw Error("unable to find a free payload type"); } static #enableStereoPcmau(payloadTypes, section) { - const lines = section.split('\r\n'); + const lines = section.split("\r\n"); let payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; @@ -190,53 +203,101 @@ class MediaMTXWebRTCReader { lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} PCMA/8000/2`); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); - return lines.join('\r\n'); + return lines.join("\r\n"); } static #enableMultichannelOpus(payloadTypes, section) { - const lines = section.split('\r\n'); + const lines = section.split("\r\n"); let payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; - lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} multiopus/48000/3`); - lines.splice(lines.length - 1, 0, `a=fmtp:${payloadType} channel_mapping=0,2,1;num_streams=2;coupled_streams=1`); + lines.splice( + lines.length - 1, + 0, + `a=rtpmap:${payloadType} multiopus/48000/3`, + ); + lines.splice( + lines.length - 1, + 0, + `a=fmtp:${payloadType} channel_mapping=0,2,1;num_streams=2;coupled_streams=1`, + ); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; - lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} multiopus/48000/4`); - lines.splice(lines.length - 1, 0, `a=fmtp:${payloadType} channel_mapping=0,1,2,3;num_streams=2;coupled_streams=2`); + lines.splice( + lines.length - 1, + 0, + `a=rtpmap:${payloadType} multiopus/48000/4`, + ); + lines.splice( + lines.length - 1, + 0, + `a=fmtp:${payloadType} channel_mapping=0,1,2,3;num_streams=2;coupled_streams=2`, + ); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; - lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} multiopus/48000/5`); - lines.splice(lines.length - 1, 0, `a=fmtp:${payloadType} channel_mapping=0,4,1,2,3;num_streams=3;coupled_streams=2`); + lines.splice( + lines.length - 1, + 0, + `a=rtpmap:${payloadType} multiopus/48000/5`, + ); + lines.splice( + lines.length - 1, + 0, + `a=fmtp:${payloadType} channel_mapping=0,4,1,2,3;num_streams=3;coupled_streams=2`, + ); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; - lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} multiopus/48000/6`); - lines.splice(lines.length - 1, 0, `a=fmtp:${payloadType} channel_mapping=0,4,1,2,3,5;num_streams=4;coupled_streams=2`); + lines.splice( + lines.length - 1, + 0, + `a=rtpmap:${payloadType} multiopus/48000/6`, + ); + lines.splice( + lines.length - 1, + 0, + `a=fmtp:${payloadType} channel_mapping=0,4,1,2,3,5;num_streams=4;coupled_streams=2`, + ); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; - lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} multiopus/48000/7`); - lines.splice(lines.length - 1, 0, `a=fmtp:${payloadType} channel_mapping=0,4,1,2,3,5,6;num_streams=4;coupled_streams=4`); + lines.splice( + lines.length - 1, + 0, + `a=rtpmap:${payloadType} multiopus/48000/7`, + ); + lines.splice( + lines.length - 1, + 0, + `a=fmtp:${payloadType} channel_mapping=0,4,1,2,3,5,6;num_streams=4;coupled_streams=4`, + ); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; - lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} multiopus/48000/8`); - lines.splice(lines.length - 1, 0, `a=fmtp:${payloadType} channel_mapping=0,6,1,4,5,2,3,7;num_streams=5;coupled_streams=4`); + lines.splice( + lines.length - 1, + 0, + `a=rtpmap:${payloadType} multiopus/48000/8`, + ); + lines.splice( + lines.length - 1, + 0, + `a=fmtp:${payloadType} channel_mapping=0,6,1,4,5,2,3,7;num_streams=5;coupled_streams=4`, + ); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); - return lines.join('\r\n'); + return lines.join("\r\n"); } static #enableL16(payloadTypes, section) { - const lines = section.split('\r\n'); + const lines = section.split("\r\n"); let payloadType = this.#reservePayloadType(payloadTypes); lines[0] += ` ${payloadType}`; @@ -253,56 +314,60 @@ class MediaMTXWebRTCReader { lines.splice(lines.length - 1, 0, `a=rtpmap:${payloadType} L16/48000/2`); lines.splice(lines.length - 1, 0, `a=rtcp-fb:${payloadType} transport-cc`); - return lines.join('\r\n'); + return lines.join("\r\n"); } static #enableStereoOpus(section) { - let opusPayloadFormat = ''; - const lines = section.split('\r\n'); + let opusPayloadFormat = ""; + const 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]; + if ( + lines[i].startsWith("a=rtpmap:") && + lines[i].toLowerCase().includes("opus/") + ) { + opusPayloadFormat = lines[i].slice("a=rtpmap:".length).split(" ")[0]; break; } } - if (opusPayloadFormat === '') { + if (opusPayloadFormat === "") { return section; } for (let i = 0; i < lines.length; i++) { if (lines[i].startsWith(`a=fmtp:${opusPayloadFormat} `)) { - if (!lines[i].includes('stereo')) { - lines[i] += ';stereo=1'; + if (!lines[i].includes("stereo")) { + lines[i] += ";stereo=1"; } - if (!lines[i].includes('sprop-stereo')) { - lines[i] += ';sprop-stereo=1'; + if (!lines[i].includes("sprop-stereo")) { + lines[i] += ";sprop-stereo=1"; } } } - return lines.join('\r\n'); + return lines.join("\r\n"); } static #editOffer(sdp, nonAdvertisedCodecs) { - const sections = sdp.split('m='); + const sections = sdp.split("m="); - const payloadTypes = sections.slice(1) - .map((s) => s.split('\r\n')[0].split(' ').slice(3)) + const payloadTypes = sections + .slice(1) + .map((s) => s.split("\r\n")[0].split(" ").slice(3)) .reduce((prev, cur) => [...prev, ...cur], []); for (let i = 1; i < sections.length; i++) { - if (sections[i].startsWith('audio')) { + if (sections[i].startsWith("audio")) { sections[i] = this.#enableStereoOpus(sections[i]); - if (nonAdvertisedCodecs.includes('pcma/8000/2')) { + if (nonAdvertisedCodecs.includes("pcma/8000/2")) { sections[i] = this.#enableStereoPcmau(payloadTypes, sections[i]); } - if (nonAdvertisedCodecs.includes('multiopus/48000/6')) { + if (nonAdvertisedCodecs.includes("multiopus/48000/6")) { sections[i] = this.#enableMultichannelOpus(payloadTypes, sections[i]); } - if (nonAdvertisedCodecs.includes('L16/48000/2')) { + if (nonAdvertisedCodecs.includes("L16/48000/2")) { sections[i] = this.#enableL16(payloadTypes, sections[i]); } @@ -310,7 +375,7 @@ class MediaMTXWebRTCReader { } } - return sections.join('m='); + return sections.join("m="); } static #generateSdpFragment(od, candidates) { @@ -323,15 +388,13 @@ class MediaMTXWebRTCReader { candidatesByMedia[mid].push(candidate); } - let frag = `a=ice-ufrag:${od.iceUfrag}\r\n` - + `a=ice-pwd:${od.icePwd}\r\n`; + 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`; + frag += `m=${media}\r\n` + `a=mid:${mid}\r\n`; for (const candidate of candidatesByMedia[mid]) { frag += `a=${candidate.candidate}\r\n`; @@ -343,62 +406,76 @@ class MediaMTXWebRTCReader { return frag; } + /** @param {string} err */ #handleError(err) { - if (this.state === 'running') { - if (this.pc !== null) { - this.pc.close(); - this.pc = null; + if (this.#state === "running") { + if (this.#pc !== null) { + this.#pc.close(); + this.#pc = null; } - this.offerData = null; + this.#offerData = null; - if (this.sessionUrl !== null) { - fetch(this.sessionUrl, { - method: 'DELETE', + if (this.#sessionUrl !== null) { + fetch(this.#sessionUrl, { + method: "DELETE", }); - this.sessionUrl = null; + this.#sessionUrl = null; } - this.queuedCandidates = []; - this.state = 'restarting'; + this.#queuedCandidates = []; + this.#state = "restarting"; - this.restartTimeout = window.setTimeout(() => { - this.restartTimeout = null; - this.state = 'running'; - this.#start(); - }, this.retryPause); + this.#restartTimeout = window.setTimeout( + () => this.#restart(), + MediaMTXWebRTCReader.#RETRY_PAUSE, + ); - if (this.conf.onError !== undefined) { - this.conf.onError(`${err}, retrying in some seconds`); + if (this.#conf.onError !== undefined) { + this.#conf.onError(`${err}, retrying in some seconds`); } - } else if (this.state === 'getting_codecs') { - this.state = 'failed'; + } else if (this.#state === "getting_codecs") { + this.#state = "failed"; - if (this.conf.onError !== undefined) { - this.conf.onError(err); + if (this.#conf.onError !== undefined) { + this.#conf.onError(err); } } } + #restart() { + this.#restartTimeout = null; + this.#state = "running"; + this.#start(); + } + #getNonAdvertisedCodecs() { - Promise.all([ - ['pcma/8000/2'], - ['multiopus/48000/6', 'channel_mapping=0,4,1,2,3,5;num_streams=4;coupled_streams=2'], - ['L16/48000/2'], - ] - .map((c) => MediaMTXWebRTCReader.#supportsNonAdvertisedCodec(c[0], c[1]).then((r) => ((r) ? c[0] : false)))) + Promise.all( + [ + ["pcma/8000/2"], + [ + "multiopus/48000/6", + "channel_mapping=0,4,1,2,3,5;num_streams=4;coupled_streams=2", + ], + ["L16/48000/2"], + ].map((c) => + MediaMTXWebRTCReader.#supportsNonAdvertisedCodec(c[0], c[1]).then( + (r) => (r ? c[0] : false), + ), + ), + ) .then((c) => c.filter((e) => e !== false)) .then((codecs) => { - if (this.state !== 'getting_codecs') { - throw new Error('closed'); + if (this.#state !== "getting_codecs") { + throw new Error("closed"); } - this.nonAdvertisedCodecs = codecs; - this.state = 'running'; + this.#nonAdvertisedCodecs = codecs; + this.#state = "running"; this.#start(); }) .catch((err) => { - this.#handleError(err); + this.#handleError(err.toString()); }); } @@ -413,119 +490,126 @@ class MediaMTXWebRTCReader { } #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.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}`}; + 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) => MediaMTXWebRTCReader.#linkToIceServers(res.headers.get('Link'))); + return fetch(this.#conf.url, { + method: "OPTIONS", + headers: this.#authHeader(), + }).then((res) => + MediaMTXWebRTCReader.#linkToIceServers(res.headers.get("Link")), + ); } #setupPeerConnection(iceServers) { - if (this.state !== 'running') { - throw new Error('closed'); + if (this.#state !== "running") { + throw new Error("closed"); } - this.pc = new RTCPeerConnection({ + this.#pc = new RTCPeerConnection({ iceServers, // https://webrtc.org/getting-started/unified-plan-transition-guide - sdpSemantics: 'unified-plan', + sdpSemantics: "unified-plan", }); - const direction = 'recvonly'; - this.pc.addTransceiver('video', { direction }); - this.pc.addTransceiver('audio', { direction }); + const direction = "recvonly"; + this.#pc.addTransceiver("video", { direction }); + this.#pc.addTransceiver("audio", { direction }); // using data channels requires creating a data channel locally - this.pc.createDataChannel(''); + this.#pc.createDataChannel(""); - this.pc.onicecandidate = (evt) => this.#onLocalCandidate(evt); - this.pc.onconnectionstatechange = () => this.#onConnectionState(); - this.pc.ontrack = (evt) => this.#onTrack(evt); - this.pc.ondatachannel = (evt) => this.#onDataChannel(evt); + this.#pc.onicecandidate = (evt) => this.#onLocalCandidate(evt); + this.#pc.onconnectionstatechange = () => this.#onConnectionState(); + this.#pc.ontrack = (evt) => this.#onTrack(evt); + this.#pc.ondatachannel = (evt) => this.#onDataChannel(evt); - return this.pc.createOffer() - .then((offer) => { - offer.sdp = MediaMTXWebRTCReader.#editOffer(offer.sdp, this.nonAdvertisedCodecs); - this.offerData = MediaMTXWebRTCReader.#parseOffer(offer.sdp); + return this.#pc.createOffer().then((offer) => { + offer.sdp = MediaMTXWebRTCReader.#editOffer( + offer.sdp, + this.#nonAdvertisedCodecs, + ); + this.#offerData = MediaMTXWebRTCReader.#parseOffer(offer.sdp); - return this.pc.setLocalDescription(offer) - .then(() => offer.sdp); - }); + return this.#pc.setLocalDescription(offer).then(() => offer.sdp); + }); } #sendOffer(offer) { - if (this.state !== 'running') { - throw new Error('closed'); + if (this.#state !== "running") { + throw new Error("closed"); } - return fetch(this.conf.url, { - method: 'POST', + return fetch(this.#conf.url, { + method: "POST", headers: { ...this.#authHeader(), - 'Content-Type': 'application/sdp', + "Content-Type": "application/sdp", }, body: offer, - }) - .then((res) => { - switch (res.status) { - case 201: - break; - case 404: - throw new Error('stream not found'); - case 400: - return res.json().then((e) => { throw new Error(e.error); }); - default: - throw new Error(`bad status code ${res.status}`); - } + }).then((res) => { + switch (res.status) { + case 201: + break; + case 404: + throw new Error("stream not found"); + 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(); + this.#sessionUrl = new URL( + res.headers.get("location"), + this.#conf.url, + ).toString(); - return res.text(); - }); + return res.text(); + }); } #setAnswer(answer) { - if (this.state !== 'running') { - throw new Error('closed'); + if (this.#state !== "running") { + throw new Error("closed"); } - return this.pc.setRemoteDescription(new RTCSessionDescription({ - type: 'answer', - sdp: answer, - })) + return this.#pc + .setRemoteDescription( + new RTCSessionDescription({ + type: "answer", + sdp: answer, + }), + ) .then(() => { - if (this.state !== 'running') { + if (this.#state !== "running") { return; } - if (this.queuedCandidates.length !== 0) { - this.#sendLocalCandidates(this.queuedCandidates); - this.queuedCandidates = []; + if (this.#queuedCandidates.length !== 0) { + this.#sendLocalCandidates(this.#queuedCandidates); + this.#queuedCandidates = []; } }); } #onLocalCandidate(evt) { - if (this.state !== 'running') { + if (this.#state !== "running") { return; } if (evt.candidate !== null) { - if (this.sessionUrl === null) { - this.queuedCandidates.push(evt.candidate); + if (this.#sessionUrl === null) { + this.#queuedCandidates.push(evt.candidate); } else { this.#sendLocalCandidates([evt.candidate]); } @@ -533,20 +617,23 @@ class MediaMTXWebRTCReader { } #sendLocalCandidates(candidates) { - fetch(this.sessionUrl, { - method: 'PATCH', + fetch(this.#sessionUrl, { + method: "PATCH", headers: { - 'Content-Type': 'application/trickle-ice-sdpfrag', - 'If-Match': '*', + "Content-Type": "application/trickle-ice-sdpfrag", + "If-Match": "*", }, - body: MediaMTXWebRTCReader.#generateSdpFragment(this.offerData, candidates), + body: MediaMTXWebRTCReader.#generateSdpFragment( + this.#offerData, + candidates, + ), }) .then((res) => { switch (res.status) { case 204: break; case 404: - throw new Error('stream not found'); + throw new Error("stream not found"); default: throw new Error(`bad status code ${res.status}`); } @@ -557,7 +644,7 @@ class MediaMTXWebRTCReader { } #onConnectionState() { - if (this.state !== 'running') { + if (this.#state !== "running") { return; } @@ -565,22 +652,23 @@ class MediaMTXWebRTCReader { // 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' + if ( + this.#pc.connectionState === "failed" || + this.#pc.connectionState === "closed" ) { - this.#handleError('peer connection closed'); + this.#handleError("peer connection closed"); } } #onTrack(evt) { - if (this.conf.onTrack !== undefined) { - this.conf.onTrack(evt); + if (this.#conf.onTrack !== undefined) { + this.#conf.onTrack(evt); } } #onDataChannel(evt) { - if (this.conf.onDataChannel !== undefined) { - this.conf.onDataChannel(evt); + if (this.#conf.onDataChannel !== undefined) { + this.#conf.onDataChannel(evt); } } } diff --git a/os/mediamtx/justfile b/os/mediamtx/justfile index ee45e3896..ff2eb88f4 100644 --- a/os/mediamtx/justfile +++ b/os/mediamtx/justfile @@ -1,8 +1,8 @@ setup: sudo ./setup_h264_sysctl.sh - wget https://github.com/bluenviron/mediamtx/releases/download/v1.18.2/mediamtx_v1.18.2_linux_arm64.tar.gz -P /tmp - wget https://raw.githubusercontent.com/bluenviron/mediamtx/refs/tags/v1.18.2/internal/servers/webrtc/reader.js -O /opt/PlanktoScope/frontend/src/pages/preview/reader.js - cd /tmp && tar -xf /tmp/mediamtx_v1.18.2_linux_arm64.tar.gz + wget https://github.com/bluenviron/mediamtx/releases/download/v1.19.2/mediamtx_v1.19.2_linux_arm64.tar.gz -P /tmp + wget https://raw.githubusercontent.com/bluenviron/mediamtx/refs/tags/v1.19.2/internal/servers/webrtc/reader.js -O /opt/PlanktoScope/frontend/src/pages/preview/reader.js + cd /tmp && tar -xf /tmp/mediamtx_v1.19.2_linux_arm64.tar.gz -sudo systemctl stop mediamtx sudo cp /tmp/mediamtx /usr/local/bin/mediamtx sudo cp mediamtx.service /etc/systemd/system/