Default do epoxy over libcurl

MotorTruck1221 · MotorTruck1221 · commit e3711a4fd670 · 2024-05-01T08:49:53.000-06:00
diff --git a/Makefile b/Makefile
@@ -19,5 +19,3 @@ minify-js:
 	@ls src/public/js/eruda/*.js | xargs -I {} npx terser -c -m -o {}.min.js {}
 	@rm -f src/public/js/rh/*.min.js
 	@ls src/public/js/rh/*.js | xargs -I {} npx terser -c -m -o {}.min.js {}
-	@rm -f src/public/js/sw/*.min.js
-	@ls src/public/js/sw/*.js | xargs -I {} npx terser -c -m -o {}.min.js {}
diff --git a/epoxytransport b/epoxytransport
@@ -1 +1 @@
-Subproject commit 3a8308d55bb3c4770ef6baa06d57bbd7c3f4812a
+Subproject commit d68a83866b09aa0a88069c32763cb917e7ab3f14
diff --git a/src/public/js/settings.js b/src/public/js/settings.js
@@ -292,7 +292,7 @@ function init() {
         localStorage.setItem('proxy', 'uv');
         localStorage.setItem('bare', window.location.origin + '/bare/');
         localStorage.setItem('fullScreen', 'page'); 
-        localStorage.setItem('transports', 'libcurl');
+        localStorage.setItem('transports', 'epoxy');
         localStorage.setItem('wispUrl', (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/");
         setItems();
     }
diff --git a/src/public/js/transports.js b/src/public/js/transports.js
@@ -33,7 +33,7 @@ function setTransports(transport) {
                     setBareTransport(localStorage.getItem('bare'));
                     break;
                 default:
-                    setLibcurlTransport();
+                    setEpoxyTransport();
                     break;
             }
         }
@@ -48,7 +48,7 @@ function setTransports(transport) {
                 setBareTransport(localStorage.getItem('bare'));
                 break;
             default:
-                localStorageTransport();
+                setEpoxyTransport();
                 break;
         }
 }
@@ -61,8 +61,8 @@ function setLibcurlTransport() {
 
 function setDefaultTransport() {
     if (!localStorage.getItem('transports')) {
-        localStorage.setItem('transports', 'libcurl');
-        setLibcurlTransport();
+        localStorage.setItem('transports', 'epoxy');
+        setEpoxyTransport();
     }
     else {
         setTransports();

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ function init() {`
`292`	`292`	`localStorage.setItem('proxy', 'uv');`
`293`	`293`	`localStorage.setItem('bare', window.location.origin + '/bare/');`
`294`	`294`	`localStorage.setItem('fullScreen', 'page');`
`295`		`- localStorage.setItem('transports', 'libcurl');`
	`295`	`+ localStorage.setItem('transports', 'epoxy');`
`296`	`296`	`localStorage.setItem('wispUrl', (location.protocol === "https:" ? "wss" : "ws") + "://" + location.host + "/wisp/");`
`297`	`297`	`setItems();`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ function setTransports(transport) {`
`33`	`33`	`setBareTransport(localStorage.getItem('bare'));`
`34`	`34`	`break;`
`35`	`35`	`default:`
`36`		`- setLibcurlTransport();`
	`36`	`+ setEpoxyTransport();`
`37`	`37`	`break;`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -48,7 +48,7 @@ function setTransports(transport) {`
`48`	`48`	`setBareTransport(localStorage.getItem('bare'));`
`49`	`49`	`break;`
`50`	`50`	`default:`
`51`		`- localStorageTransport();`
	`51`	`+ setEpoxyTransport();`
`52`	`52`	`break;`
`53`	`53`	`}`
`54`	`54`	`}`
`@@ -61,8 +61,8 @@ function setLibcurlTransport() {`
`61`	`61`
`62`	`62`	`function setDefaultTransport() {`
`63`	`63`	`if (!localStorage.getItem('transports')) {`
`64`		`- localStorage.setItem('transports', 'libcurl');`
`65`		`- setLibcurlTransport();`
	`64`	`+ localStorage.setItem('transports', 'epoxy');`
	`65`	`+ setEpoxyTransport();`
`66`	`66`	`}`
`67`	`67`	`else {`
`68`	`68`	`setTransports();`