diff --git a/proxyServiceValidator.js b/proxyServiceValidator.js index ca62a615..00bf54ec 100644 --- a/proxyServiceValidator.js +++ b/proxyServiceValidator.js @@ -312,6 +312,8 @@ xx xx return uvTestPassed; }; + /* Scramjet + const testScramjet = async () => { const omniboxId = 'pr-sj', errorPrefix = 'failure', @@ -406,12 +408,14 @@ xx xx return sjTestPassed; }; + */ + // Run tests for Rammerhead, Ultraviolet and Scramjet const rammerheadPassed = await testRammerhead(); const ultravioletPassed = await testUltraviolet(); - const scramjetPassed = await testScramjet(); + //const scramjetPassed = await testScramjet(); - if (rammerheadPassed && ultravioletPassed && scramjetPassed) { + if (rammerheadPassed && ultravioletPassed) { console.log('All proxy endpoint tests passed.'); process.exitCode = 0; } else { diff --git a/views/assets/js/common-16451543478.js b/views/assets/js/common-16451543478.js index 288105cc..46a145b8 100644 --- a/views/assets/js/common-16451543478.js +++ b/views/assets/js/common-16451543478.js @@ -391,37 +391,31 @@ addEventListener('DOMContentLoaded', async () => { osu: urlHandler(location.origin + '/archive/osu'), - mcnow: urlHandler(uvUrl('https://now.gg/play/a/10010/b')), + mcnow: urlHandler(sjUrl('https://now.gg/play/a/10010/b')), - glife: urlHandler(uvUrl('https://now.gg/apps/lunime/5767/gacha-life.html')), + glife: urlHandler(sjUrl('https://now.gg/apps/lunime/5767/gacha-life.html')), - roblox: urlHandler( - uvUrl('https://now.gg/apps/roblox-corporation/5349/roblox.html') - ), + roblox: urlHandler(sjUrl('https://now.gg/apps/roblox-corporation/5349/roblox.html')), - amongus: urlHandler( - uvUrl('https://now.gg/apps/innersloth-llc/4047/among-us.html') - ), + amongus: urlHandler(sjUrl('https://now.gg/apps/innersloth-llc/4047/among-us.html')), - pubg: urlHandler( - uvUrl('https://now.gg/apps/proxima-beta/2609/pubg-mobile-resistance.html') - ), + pubg: urlHandler(sjUrl('https://now.gg/apps/proxima-beta/2609/pubg-mobile-resistance.html')), - train: urlHandler(uvUrl('https://hby.itch.io/last-train-home')), + train: urlHandler(sjUrl('https://hby.itch.io/last-train-home')), - village: urlHandler(uvUrl('https://kwoodhouse.itch.io/village-arsonist')), + village: urlHandler(sjUrl('https://kwoodhouse.itch.io/village-arsonist')), - prison: urlHandler(uvUrl('https://vimlark.itch.io/pick-up-prison')), + prison: urlHandler(sjUrl('https://vimlark.itch.io/pick-up-prison')), - rpg: urlHandler(uvUrl('https://alarts.itch.io/die-in-the-dungeon')), + rpg: urlHandler(sjUrl('https://alarts.itch.io/die-in-the-dungeon')), - speed: urlHandler(uvUrl('https://captain4lk.itch.io/what-the-road-brings')), + speed: urlHandler(sjUrl('https://captain4lk.itch.io/what-the-road-brings')), - heli: urlHandler(uvUrl('https://benjames171.itch.io/helo-storm')), + heli: urlHandler(sjUrl('https://benjames171.itch.io/helo-storm')), - youtube: urlHandler(uvUrl('https://youtube.com')), + youtube: urlHandler(sjUrl('https://youtube.com')), - discordUV: urlHandler(uvUrl('https://discord.com/app')), + discordUV: urlHandler(sjUrl('https://discord.com/app')), discordRH: urlHandler(await RammerheadEncode('https://discord.com/app')), }); diff --git a/views/assets/js/register-sw.js b/views/assets/js/register-sw.js index af39f2f3..7c3af68d 100644 --- a/views/assets/js/register-sw.js +++ b/views/assets/js/register-sw.js @@ -95,12 +95,7 @@ client: '/scram/scramjet.client.js', shared: '/scram/scramjet.shared.js', sync: '/scram/scramjet.sync.js', - }, - flags: { - serviceworkers: true, - syncxhr: true, - scramitize: true, - }, + } }); console.log('Initializing ScramjetController'); diff --git a/views/pages/nav/games5.html b/views/pages/nav/games5.html index 10911d3f..824824c5 100644 --- a/views/pages/nav/games5.html +++ b/views/pages/nav/games5.html @@ -60,6 +60,7 @@ + diff --git a/views/pages/proxnav/preset/youtube.html b/views/pages/proxnav/preset/youtube.html index a9c2cb31..ef495983 100644 --- a/views/pages/proxnav/preset/youtube.html +++ b/views/pages/proxnav/preset/youtube.html @@ -77,6 +77,7 @@ +