Fixed Safari live view bugs

Fixed Safari live view

Author: benhatsor

live-view/live-view.js

@@ -599,7 +599,7 @@ if (isMobile) {
     // share live view link
 
     const link = createLink({
-      dir: treeLoc,
+      dir: selectedFile.dir.split(','),
       file: selectedFile,
       openLive: true
     });

utils.js

@@ -68,7 +68,7 @@ const body = document.body,
 
 
 // version
-const version = '3.0.0';
+const version = '3.0.1';
 versionEl.innerText = version;
 
 let logVersion = () => {

worker/client-channel.js

@@ -4,7 +4,7 @@
 
 
 // update worker name when updating worker
-const WORKER_NAME = 'codeit-worker-v506';
+const WORKER_NAME = 'codeit-worker-v518';
 
 
 // internal paths
@@ -24,6 +24,9 @@ const INTERNAL_PATHS = {
 }
 
 
+const isSafari = self.navigator.userAgent.toLowerCase().includes('safari');
+
+
 // key                : value
 // live view client ID: codeit client ID
 let liveViewClients = {};
@@ -196,7 +199,7 @@ function handleFetchRequest(request, event) {
                || (getPathType(request.referrer) === 'run')) { // if fetch originated in live view
 
       if (enableDevLogs) {
-        console.debug('[ServiceWorker] Intercepted live fetch', request.url, request);
+        console.debug('[ServiceWorker] Intercepted live fetch', event);
       }
 
 
@@ -206,17 +209,29 @@ function handleFetchRequest(request, event) {
 
       const liveFramePath = INTERNAL_PATHS.relLivePath;
 
+      let liveViewClientId = event.resultingClientId ?? event.targetClientId;
+      
       // if codeit client is creating a new live view
       if (url.endsWith(liveFramePath)
-          && event.resultingClientId) {
+          && liveViewClientId) {
 
         // add live view to client array
-                
-        const liveViewClientId = event.resultingClientId;
 
         parentClientId = parentClientId.slice(0, -1);
         clientId = parentClientId;
 
+        // if on safari
+        if (isSafari && event.targetClientId) {
+          
+          // add 1 to live view client id
+          let splitId = liveViewClientId.split('-');
+          
+          splitId[1] = Number(splitId[1]) + 1;
+          
+          liveViewClientId = splitId.join('-');
+          
+        }
+
         // pair live view client ID
         // with codeit client ID
         // in client array

worker/worker-channel.js

@@ -19,6 +19,8 @@ async function setupWorkerChannel() {
   await workerInstallPromise;
 
 
+  let numOfRequests = 0;
+  
   async function pingWorkerForClientId() {
 
     // get client ID from worker
@@ -30,14 +32,23 @@ async function setupWorkerChannel() {
       resp = '';
       console.log('%c[Client] Pinged ServiceWorker for installation', 'color: #80868b');
     }
-        
-    if (!resp || !resp.clientId) {
+    
+    if (numOfRequests < 500) {
 
-      return await pingWorkerForClientId();
+      if (!resp || !resp.clientId) {
+        
+        numOfRequests++;
+        return await pingWorkerForClientId();
+        
+      } else {
+        
+        return resp.clientId;
+        
+      }
 
     } else {
 
-      return resp.clientId;
+      return null;
 
     }
 
@@ -48,7 +59,7 @@ async function setupWorkerChannel() {
   workerInstallPromise = pingWorkerForClientId();
 
   workerClientId = await workerInstallPromise;
-  
+    
   workerInstallPromise = null;
 
 
@@ -58,7 +69,7 @@ async function setupWorkerChannel() {
 
   // add worker channel listener
   workerChannel.addEventListener('message', async (event) => {
-
+        
     // if message is for current client
     if (event.data.toClient === workerClientId) {