diff --git a/index.js b/index.js index b4f529c8..c09bb12b 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,7 @@ import express from 'express'; import http from 'node:http'; import path from 'node:path'; -import { libcurlPath } from "@mercuryworkshop/libcurl-transport"; +import { epoxyPath } from "@mercuryworkshop/epoxy-transport"; import { baremuxPath } from "@mercuryworkshop/bare-mux/node"; import wisp from "wisp-server-node"; import request from '@cypress/request'; @@ -21,7 +21,7 @@ app.use( }) ); -app.use("/libcurl/", express.static(libcurlPath)); +app.use("/epoxy/", express.static(epoxyPath)); app.use("/baremux/", express.static(baremuxPath)); app.use(express.static(path.join(__dirname, 'static'))); @@ -103,5 +103,5 @@ process.on('SIGTERM', () => shutdown('SIGTERM')); process.on('SIGINT', () => shutdown('SIGINT')); server.listen({ - port: 8000, + port: 8001, }); diff --git a/package.json b/package.json index 2a56c188..bf949f1c 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "@cypress/request": "^3.0.0", "@mercuryworkshop/bare-mux": "^2.0.4", - "@mercuryworkshop/libcurl-transport": "^1.3.7", + "@mercuryworkshop/epoxy-transport": "^2.1.5", "wisp-server-node": "^1.1.3", "chalk": "^5.3.0", "express": "^4.18.2" diff --git a/static/assets/js/loader.js b/static/assets/js/loader.js index 87b595fb..146be4a2 100644 --- a/static/assets/js/loader.js +++ b/static/assets/js/loader.js @@ -137,7 +137,7 @@ function decode(url) { if (url === 'about:blank' || url === 'welcome.html') { return '' } - else if (url === 'welcome.html' || url === 'https://beta.derpman.lol/welcome.html') { + else if (url === 'welcome.html' || url === 'https://' + location.hostname + '/welcome.html') { return '' } var uvPrefix = '/service/'; diff --git a/static/assets/js/preload.js b/static/assets/js/preload.js index 88079205..4d325a46 100644 --- a/static/assets/js/preload.js +++ b/static/assets/js/preload.js @@ -8,7 +8,7 @@ window.onload = function() { if(location.protocol !== "https:" && !swAllowedHostnames.includes(location.hostname)) throw new Error("Service workers cannot be registered without https."); throw new Error("Your browser doesn't support service workers."); } - await connection.setTransport("/libcurl/index.mjs", [{ + await connection.setTransport("/epoxy/index.mjs", [{ wisp: wispUrl }]); await navigator.serviceWorker.register(stockSW); diff --git a/static/assets/js/register.js b/static/assets/js/register.js index 47a5a21b..906925c6 100644 --- a/static/assets/js/register.js +++ b/static/assets/js/register.js @@ -14,7 +14,7 @@ async function registerSW() { throw new Error("Your browser doesn't support service workers."); } - await connection.setTransport("/libcurl/index.mjs", [{ wisp: wispUrl }]); + await connection.setTransport("/epoxy/index.mjs", [{ wisp: wispUrl }]); await navigator.serviceWorker.register(stockSW); }