Merge pull request #936 from steveseguin/v21-dev

V21.1 dev
This commit is contained in:
Steve Seguin 2022-02-16 03:15:19 -05:00 committed by GitHub
commit 17f7425828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 31 deletions

View File

@ -1928,7 +1928,7 @@
var session = WebRTC.Media; // session is a required global variable if configuring manually. Run before loading main.js but after webrtc.js.
session.version = "21.0";
session.version = "21.1";
session.streamID = session.generateStreamID(); // randomly generates a streamID for this session. You can set your own programmatically if needed
session.defaultPassword = "someEncryptionKey123"; // Change this password if self-deploying for added security/privacy

2
lib.js
View File

@ -10749,7 +10749,7 @@ async function createDirectorOnlyBox() {
if (session.label){
labelID.innerText = session.label;
}
pokeIframeAPI("control-box", true, UUID);
pokeIframeAPI("control-box", true, true);
}
function shiftPC(ele, shift, director=false){

15
main.js
View File

@ -146,19 +146,6 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
}
}
if (urlParams.has('pwa')){
getById("enterInvite").classList.remove("advanced");
}
if ("serviceWorker" in navigator) {
window.addEventListener("load", function() {
navigator.serviceWorker
.register("./serviceWorker.js")
.then(res => log("service worker registered"))
.catch(err => warnlog("service worker not registered"))
})
}
if (navigator.userAgent.toLowerCase().indexOf(' electron/') > -1) {
try {
getById("electronDragZone").style.cursor="grab";
@ -4142,7 +4129,7 @@ setTimeout(function(){ // lazy load
script.onload = function() {
var script = document.createElement('script');
document.head.appendChild(script);
script.src = "./thirdparty/StreamSaver.js?v=4"; // dynamically load this only if its needed. Keeps loading time down.
script.src = "./thirdparty/StreamSaver.js?v=9"; // dynamically load this only if its needed. Keeps loading time down.
};
script.src = "./thirdparty/polyfill.min.js"; // dynamically load this only if its needed. Keeps loading time down.
},0);

View File

@ -1,7 +1 @@
self.addEventListener("fetch", fetchEvent => {
fetchEvent.respondWith(
caches.match(fetchEvent.request).then(res => {
return res || fetch(fetchEvent.request)
})
)
})

View File

@ -30,7 +30,7 @@
WritableStream: global.WritableStream || ponyfill.WritableStream,
supported: true,
version: { full: '2.0.7', major: 2, minor: 0, dot: 7 },
mitm: 'https://steveseguin.github.io/StreamSaver.js/mitm.html?version=2.0.7'
mitm: './thirdparty/mitm.html'
}
/**
@ -46,12 +46,14 @@
iframe.src = src
iframe.loaded = false
iframe.name = 'iframe'
iframe.id = "mitm_iframe"
iframe.isIframe = true
iframe.postMessage = (...args) => iframe.contentWindow.postMessage(...args)
iframe.addEventListener('load', () => {
iframe.loaded = true
}, { once: true })
document.body.appendChild(iframe)
console.log(iframe);
return iframe
}

12
thirdparty/mitm.html vendored
View File

@ -14,7 +14,10 @@
when the worker then receives a stream then the worker will tell the opener
to open up a link that will start the download
-->
<html>
<body>
<script>
console.log("SERVER WORKING STARTED")
// This will prevent the sw from restarting
let keepAlive = () => {
keepAlive = () => {}
@ -81,13 +84,6 @@ function onMessage (event) {
// redirect back to the page of who initiated a http request
data.referrer = data.referrer || document.referrer || origin
// pass along version for possible backwards compatibility in sw.js
data.streamSaverVersion = new URLSearchParams(location.search).get('version')
if (data.streamSaverVersion === '1.2.0') {
console.warn('[StreamSaver] please update streamsaver')
}
/** @since v2.0.0 */
if (!data.headers) {
console.warn("[StreamSaver] pass `data.headers` that you would like to pass along to the service worker\nit should be a 2D array or a key/val object that fetch's Headers api accepts")
@ -167,3 +163,5 @@ if (navigator.serviceWorker) {
}
</script>
</body>
</html>