Remove bareswitcher on UV (not needed due to bare-mux), add bareTransport to sw

This commit is contained in:
MotorTruck1221 2024-03-10 03:37:56 -06:00
parent c55f67ad58
commit 11dce272a4
No known key found for this signature in database
GPG key ID: 06901A625432AC21

View file

@ -1,5 +1,6 @@
importScripts("/epoxy/index.js"); importScripts("/epoxy/index.js");
importScripts("/libcurl/index.cjs"); importScripts("/libcurl/index.cjs");
importScripts("/transports/bareTransport.js");
importScripts("/uv/uv.bundle.js"); importScripts("/uv/uv.bundle.js");
importScripts("/uv/uv.config.js"); importScripts("/uv/uv.config.js");
importScripts(__uv$config.sw || "/uv/uv.sw.js"); importScripts(__uv$config.sw || "/uv/uv.sw.js");
@ -27,22 +28,6 @@ const dynPromise = new Promise(async (resolve) => {
resolve(); resolve();
}); });
const uvPromise = new Promise(async (resolve) => {
try {
const bare =
(await localforage.getItem("bare")) || location.origin + "/bare/";
const proxyUrl = (await localforage.getItem("HTTPProxy")) || "";
const [proxyIP, proxyPort] = proxyUrl.split(":");
self.__uv$config.bare = bare;
self.__uv$config.proxyPort = proxyPort;
self.__uv$config.proxyIp = proxyIP;
self.uv = new UVServiceWorker(self.__uv$config);
} catch (error) {
console.log(error);
}
resolve();
});
self.addEventListener("fetch", (event) => { self.addEventListener("fetch", (event) => {
if ( if (
event.request.url.startsWith(location.origin + self.__dynamic$config.prefix) event.request.url.startsWith(location.origin + self.__dynamic$config.prefix)
@ -63,11 +48,14 @@ self.addEventListener("fetch", (event) => {
) { ) {
event.respondWith( event.respondWith(
(async function () { (async function () {
try {
await uvPromise;
} catch (error) {}
return await self.uv.fetch(event); return await self.uv.fetch(event);
})() })()
); );
} else {
event.respondWith(
(async function () {
return await fetch(event.request);
})()
);
} }
}); });