fix initial sync with extension host

Author: christianalfoni

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts

@@ -55,6 +55,7 @@ export async function initializeBrowserFS({
   syncTypes = false,
   extraMounts = {},
 } = {}) {
+  let hasInitialSync = false;
   return new Promise(resolve => {
     const config = { ...BROWSER_FS_CONFIG };
     let currentSandboxFs = {};
@@ -92,6 +93,10 @@ export async function initializeBrowserFS({
           switch (evt.data.$type) {
             case 'sandbox-fs': {
               currentSandboxFs = evt.data.$data;
+              if (!hasInitialSync) {
+                hasInitialSync = true;
+                resolve();
+              }
               break;
             }
             case 'write-file': {
@@ -127,10 +132,10 @@ export async function initializeBrowserFS({
           $type: 'sync-sandbox',
           $data: {},
         });
+      } else {
+        resolve();
       }
 
-      resolve();
-
       // BrowserFS is initialized and ready-to-use!
     });
   });

packages/app/src/app/overmind/effects/vscode/sandboxFsSync/index.ts

@@ -42,26 +42,15 @@ class SandboxFsSync {
   private types: any;
   private typesInfo: Promise<any>;
   private initializingWorkers = blocker<void>();
-  private workersInitializedCount = 0;
   public initialize(options: SandboxFsSyncOptions) {
     this.options = options;
     self.addEventListener('message', evt => {
-      // We do not want to send initial sandbox until
-      // all 3 filesystems are running
-      if (this.initializingWorkers.isResolved()) {
-        if (evt.data.$type === 'sync-types') {
-          this.syncDependencyTypings();
-        }
-
-        if (evt.data.$type === 'sync-sandbox') {
-          this.syncSandbox();
-        }
-      } else if (evt.data.$type === 'sync-sandbox') {
-        this.workersInitializedCount++;
+      if (evt.data.$type === 'sync-types') {
+        this.syncDependencyTypings();
+      }
 
-        if (this.workersInitializedCount === 3) {
-          this.initializingWorkers.resolve();
-        }
+      if (evt.data.$type === 'sync-sandbox') {
+        this.syncSandbox();
       }
     });
 
@@ -185,7 +174,7 @@ class SandboxFsSync {
 
   private syncSandbox() {
     // eslint-disable-next-line
-    console.log('## SYNCING SANDBOX AND TYPINGS WITH WORKERS');
+    console.log('## SYNCING SANDBOX WITH WORKERS');
     this.send('sandbox-fs', json(this.options.getSandboxFs()));
   }
 
@@ -221,6 +210,8 @@ class SandboxFsSync {
         syncDetails.packageJsonContent,
         syncDetails.autoInstall
       );
+      // eslint-disable-next-line
+      console.log('## SYNCING TYPES WITH WORKERS');
       this.sendTypes();
     }
   }