diff --git a/index.js b/index.js index 2a71b0b..a592f7e 100644 --- a/index.js +++ b/index.js @@ -180,7 +180,7 @@ server.on("upgrade", (req, socket, head) => { bare.routeUpgrade(req, socket, head); } else if (shouldRouteRh(req)) { routeRhUpgrade(req, socket, head); - } else if (req.url.endsWith("/wisp/")) { + } else if (req.url.endsWith("/")) { wisp.routeRequest(req, socket, head); } else { socket.end(); diff --git a/package-lock.json b/package-lock.json index bc8a4da..3b39c15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,10 +9,9 @@ "version": "0.0.1", "dependencies": { "@astrojs/node": "^8.2.0", - "@mercuryworkshop/bare-mux": "^1.0.4", - "@mercuryworkshop/epoxy-transport": "^1.0.2", - "@mercuryworkshop/libcurl-transport": "^1.1.0", - "@nebula-services/ultraviolet": "^1.0.1-1.patch.7", + "@mercuryworkshop/bare-mux": "^1.0.5", + "@mercuryworkshop/epoxy-transport": "^1.1.0", + "@mercuryworkshop/libcurl-transport": "^1.2.1", "@titaniumnetwork-dev/ultraviolet": "^3.0.0", "@tomphttp/bare-client": "^2.2.0-alpha", "@tomphttp/bare-server-node": "^2.0.3", @@ -927,9 +926,9 @@ "integrity": "sha512-ojkXjR3K0Zz3jnCR80tqPL+0yvbZk/lEodb6RIVjLz7W8RVA2wrw8ym/CzCpXO9SYVUIKHFUpc7jvf8UKfIM3w==" }, "node_modules/@mercuryworkshop/bare-mux": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@mercuryworkshop/bare-mux/-/bare-mux-1.0.4.tgz", - "integrity": "sha512-u9vtjc9Gp4G6UO7NYB1SphEiNIZtHuwI7/wxebbeKJ+GegmogxFodXF0ZYsQl7AY0fo3RqQs4odex9pYPHDkgQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@mercuryworkshop/bare-mux/-/bare-mux-1.0.5.tgz", + "integrity": "sha512-5czcsWISUCrN49diTuF/8WXZUCyoWHn90Ea+gLhVWKGUTyJzPAG5gTVZ77rMcQYewSuSDA1WVPaF0n79ciL5Gg==", "dependencies": { "@types/uuid": "^9.0.8", "uuid": "^9.0.1" @@ -948,16 +947,16 @@ } }, "node_modules/@mercuryworkshop/epoxy-tls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-1.2.1.tgz", - "integrity": "sha512-E8FEIPbzqyNPZTlootTCkeHONuGg8NKQjdBfp3SfkTq11j4lXEECh7v1HALpX60EY2sMl36WGth04y0oFsRhYw==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-tls/-/epoxy-tls-1.4.1.tgz", + "integrity": "sha512-g4vuP25F+RUz2l46y0WJ6mm9p7GDJEwEsgtQn5SzsXgnS1iKstE8bHAtqIfEf6njs4kRZs9Lxkj2UwHw2y+S7g==" }, "node_modules/@mercuryworkshop/epoxy-transport": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-1.0.2.tgz", - "integrity": "sha512-phd8dlaSZqOt1/suNShdBFf1dlXyYGVXYEjAX7vg0pW4cWN1kgJvpq58a/LZwNlIqb2vkFp6pXUXq7w/RW70vQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mercuryworkshop/epoxy-transport/-/epoxy-transport-1.1.0.tgz", + "integrity": "sha512-JVdKr+u53qu3GQyehZDWRfWV1UWct2fAtU2/50plFl9TLzy2rPLUHqyHTmyAuErNS6SP2uZ9BlgMz6FN4PlpVg==", "dependencies": { - "@mercuryworkshop/epoxy-tls": "^1.1.1", + "@mercuryworkshop/epoxy-tls": "^1.4.1", "esbuild-plugin-umd-wrapper": "^2.0.0", "rollup": "^4.12.0", "rollup-plugin-node-resolve": "^5.2.0", @@ -966,41 +965,18 @@ } }, "node_modules/@mercuryworkshop/libcurl-transport": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@mercuryworkshop/libcurl-transport/-/libcurl-transport-1.1.0.tgz", - "integrity": "sha512-332LEbSI19dJJa7TQ+A9ODUUFITh0t/ozD2QDG/OL7x0ESKYHkKUjoY7ZFQTdrFH7alHnjNqj0yyuKzYoWH8Mw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@mercuryworkshop/libcurl-transport/-/libcurl-transport-1.2.1.tgz", + "integrity": "sha512-HwlC36KSMoUHQmZ8y2EkF57oV6UfLrg6rUbdniMQqWw2HEDBT5Ua+gcyQybjW6pNMqvneqnOWLJFF9LwZzGHoA==", "dependencies": { "esbuild-plugin-umd-wrapper": "^2.0.0", - "libcurl.js": "^0.4.1", + "libcurl.js": "^0.5.0", "rollup": "^4.12.0", "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-typescript2": "^0.36.0", "ws": "8.16.0" } }, - "node_modules/@nebula-services/bare-client": { - "version": "1.1.2-beta.3-patch.1", - "resolved": "https://registry.npmjs.org/@nebula-services/bare-client/-/bare-client-1.1.2-beta.3-patch.1.tgz", - "integrity": "sha512-SgXCJruqgFg9ulgKd/S+6IAL3G5lP08Ey+pLLv768pwvgV5WgXdoWxytV1jJ8kd0vpQcnrq3ropTn2buT+8r5Q==" - }, - "node_modules/@nebula-services/ultraviolet": { - "version": "1.0.1-1.patch.7", - "resolved": "https://registry.npmjs.org/@nebula-services/ultraviolet/-/ultraviolet-1.0.1-1.patch.7.tgz", - "integrity": "sha512-9xe7BR1DbxtK+TeAlsllbuDE6j+eA9rMFQp4M05vkHjO5CuQYUFfC48m/y4vWhbna6Uf2xdlZLJr6gYGDJStBA==", - "dependencies": { - "@nebula-services/bare-client": "^1.1.2-beta.3-patch.1", - "crypto-js": "^4.2.0", - "css-tree": "^2.0.4", - "esbuild": "^0.19.11", - "esotope-hammerhead": "^0.6.1", - "events": "^3.3.0", - "idb": "^7.1.1", - "meriyah": "^4.3.3", - "mime-db": "^1.51.0", - "parse5": "^7.1.2", - "set-cookie-parser": "^2.4.8" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -4282,9 +4258,9 @@ } }, "node_modules/libcurl.js": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/libcurl.js/-/libcurl.js-0.4.2.tgz", - "integrity": "sha512-WuL2EgeYVuSsHFeJhpq83pOMX8+ei1E4Vpym7SKz6vPvuOEK9TBDCZRXDN/zr9o4T9UIy0FXxwpIEyHvSBNGmA==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/libcurl.js/-/libcurl.js-0.5.2.tgz", + "integrity": "sha512-kj4Em8YYzx8Xl1wtXo04sGulQTqnxFkXsmtMDPqPZ8OIZCoyzilSQKMhmF2XVnoB0g+HK68A2v32b3lMPGCtfQ==" }, "node_modules/load-yaml-file": { "version": "0.2.0", diff --git a/package.json b/package.json index 92c8f0e..11abdf1 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,9 @@ }, "dependencies": { "@astrojs/node": "^8.2.0", - "@mercuryworkshop/bare-mux": "^1.0.4", - "@mercuryworkshop/epoxy-transport": "^1.0.2", - "@mercuryworkshop/libcurl-transport": "^1.1.0", - "@nebula-services/ultraviolet": "^1.0.1-1.patch.7", + "@mercuryworkshop/bare-mux": "^1.0.5", + "@mercuryworkshop/epoxy-transport": "^1.1.0", + "@mercuryworkshop/libcurl-transport": "^1.2.1", "@titaniumnetwork-dev/ultraviolet": "^3.0.0", "@tomphttp/bare-client": "^2.2.0-alpha", "@tomphttp/bare-server-node": "^2.0.3", diff --git a/src/components/ProxyRegistrar.astro b/src/components/ProxyRegistrar.astro index de31ac5..9c3601c 100644 --- a/src/components/ProxyRegistrar.astro +++ b/src/components/ProxyRegistrar.astro @@ -4,9 +4,6 @@ //@ts-nocheck let form = document.querySelector("form"); let input = document.querySelector("input"); - window.navigator.serviceWorker.register("/sw.js", { - scope: window.__uv$config.prefix, - }); document.addEventListener("astro:after-swap", initForm); function initForm() { let formEle = document.querySelector("form"); diff --git a/src/components/TransportManager.astro b/src/components/TransportManager.astro index 49966b4..cb25894 100644 --- a/src/components/TransportManager.astro +++ b/src/components/TransportManager.astro @@ -1,7 +1,23 @@ diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro index 7de8e83..1fe7665 100644 --- a/src/pages/[lang]/index.astro +++ b/src/pages/[lang]/index.astro @@ -13,9 +13,9 @@ export function getStaticPaths() { --- - - + +