Fix libcurl, fix bare clients error

Ruby-Network · Mar 14, 2024 · ef4b234 · ef4b234
1 parent 2be5a35
commit ef4b234
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/public/js/register.js b/src/public/js/register.js
@@ -4,15 +4,13 @@
         //uv SW  
         await navigator.serviceWorker.register('/js/sw/uv.js', { scope: '/js/sw/service/uv/' })
         //await navigator.serviceWorker.register('/js/sw/dynamic.js', { scope: '/js/sw/service/dynamic/' })
-        BareMux.registerRemoteListener(navigator.serviceWorker.controller);
-        setDefaultTransport();
+        //await setDefaultTransport();
     });
 function regSW() {
     'serviceWorker' in navigator && 
     navigator.serviceWorker.register('/sw.js', { scope: '/' })
     //uv SW 
     navigator.serviceWorker.register('/js/sw/uv.js', { scope: '/js/sw/service/uv/' })
     //navigator.serviceWorker.register('/js/sw/dynamic.js', { scope: '/js/sw/service/dynamic/' })
-    BareMux.registerRemoteListener(navigator.serviceWorker.controller);
     setDefaultTransport();
 }
diff --git a/src/public/js/sw/register.js b/src/public/js/sw/register.js
@@ -2,6 +2,10 @@
     window.addEventListener('load', function () {
         navigator.serviceWorker
             .register('/sw.js')
-            .then((e) => console.log('service worker registered'))
+            .then((e) => {
+                console.log('service worker registered');
+                BareMux.registerRemoteListener(navigator.serviceWorker.controller);
+                setDefaultTransport();
+            })
             .catch((e) => console.log('service worker not registered', e));
     });
diff --git a/src/public/js/tabs.js b/src/public/js/tabs.js
@@ -83,6 +83,8 @@ function tabRemoved(detail) {
     deletedTabs.push(tabId);
 }
 function handoffToTABS(url) {
+    //MAKE SURE A BARE CLIENT EXISTS
+    setTransports();
     //if there is a current iframe, delete it
     let i = chromeTabs.activeTabEl.getAttribute('data-tab-id');
     let isCurentTabHaveIframe = document.querySelector(`[data-iframe-id="${i}"]`);

diff --git a/src/public/js/transports.js b/src/public/js/transports.js
@@ -60,3 +60,4 @@ function setEpoxyTransport() {
 function setBareTransport(value) {
     BareMux.SetTransport('BareMod.BareClient', value);
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,3 +60,4 @@ function setEpoxyTransport() {
		function setBareTransport(value) {
		BareMux.SetTransport('BareMod.BareClient', value);
		}