Fixed race condition with types and fs sync

Author: christianalfoni

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

@@ -1,4 +1,7 @@
-import { commonPostMessage } from '@codesandbox/common/lib/utils/global';
+import {
+  commonPostMessage,
+  getGlobal,
+} from '@codesandbox/common/lib/utils/global';
 
 import { FileSystemConfiguration } from '../../../../../../../../../standalone-packages/codesandbox-browserfs';
 import { EXTENSIONS_LOCATION } from '../../constants';
@@ -11,7 +14,7 @@ import {
 } from '../../sandboxFsSync/utils';
 import { getTypeFetcher } from './type-downloader';
 
-const global = self as any;
+const global = getGlobal();
 
 export const BROWSER_FS_CONFIG: FileSystemConfiguration = {
   fs: 'MountableFileSystem',
@@ -55,7 +58,7 @@ export async function initializeBrowserFS({
   syncTypes = false,
   extraMounts = {},
 } = {}) {
-  let hasInitialSync = false;
+  let isInitialSync = true;
   return new Promise(resolve => {
     const config = { ...BROWSER_FS_CONFIG };
     let currentSandboxFs = {};
@@ -91,10 +94,27 @@ export async function initializeBrowserFS({
       if (syncSandbox) {
         self.addEventListener('message', evt => {
           switch (evt.data.$type) {
+            case 'typings-sync': {
+              if (isInitialSync) {
+                commonPostMessage({
+                  $broadcast: true,
+                  $type: 'sync-sandbox',
+                  $data: {},
+                });
+              }
+              break;
+            }
             case 'sandbox-fs': {
               currentSandboxFs = evt.data.$data;
-              if (!hasInitialSync) {
-                hasInitialSync = true;
+              if (isInitialSync) {
+                isInitialSync = false;
+                global.BrowserFS.BFSRequire(
+                  'fs'
+                ).rename(
+                  '/sandbox/node_modules/@types',
+                  '/sandbox/node_modules/@types',
+                  () => {}
+                );
                 resolve();
               }
               break;
@@ -127,11 +147,19 @@ export async function initializeBrowserFS({
           }
         });
 
-        commonPostMessage({
-          $broadcast: true,
-          $type: 'sync-sandbox',
-          $data: {},
-        });
+        if (syncTypes) {
+          commonPostMessage({
+            $broadcast: true,
+            $type: 'sync-types',
+            $data: {},
+          });
+        } else {
+          commonPostMessage({
+            $broadcast: true,
+            $type: 'sync-sandbox',
+            $data: {},
+          });
+        }
       } else {
         resolve();
       }

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/type-downloader.ts

@@ -1,7 +1,4 @@
-import {
-  commonPostMessage,
-  getGlobal,
-} from '@codesandbox/common/lib/utils/global';
+import { getGlobal } from '@codesandbox/common/lib/utils/global';
 
 import {
   IManager,
@@ -43,11 +40,5 @@ export function getTypeFetcher() {
     }
   });
 
-  commonPostMessage({
-    $broadcast: true,
-    $type: 'sync-types',
-    $data: {},
-  });
-
   return { options };
 }

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

@@ -39,7 +39,7 @@ type SandboxFsSyncOptions = {
 
 class SandboxFsSync {
   private options: SandboxFsSyncOptions;
-  private types: any;
+  private types: any = {};
   private typesInfo: Promise<any>;
   private initializingWorkers = blocker<void>();
   public initialize(options: SandboxFsSyncOptions) {
@@ -173,8 +173,6 @@ class SandboxFsSync {
   }
 
   private syncSandbox() {
-    // eslint-disable-next-line
-    console.log('## SYNCING SANDBOX WITH WORKERS');
     this.send('sandbox-fs', json(this.options.getSandboxFs()));
   }
 
@@ -206,14 +204,20 @@ class SandboxFsSync {
     const syncDetails = await this.getDependencyTypingsSyncDetails();
 
     if (syncDetails) {
-      this.types = await this.getDependencyTypings(
-        syncDetails.packageJsonContent,
-        syncDetails.autoInstall
-      );
-      // eslint-disable-next-line
-      console.log('## SYNCING TYPES WITH WORKERS');
-      this.sendTypes();
+      try {
+        this.types = await this.getDependencyTypings(
+          syncDetails.packageJsonContent,
+          syncDetails.autoInstall
+        );
+      } catch (error) {
+        // eslint-disable-next-line
+        console.error(
+          'Unable to fetch dependency typings, please report it to us!'
+        );
+      }
     }
+
+    this.sendTypes();
   }
 
   private async getDependencyTypingsSyncDetails(): Promise<{
@@ -251,6 +255,8 @@ class SandboxFsSync {
                 );
               }
             );
+          } else {
+            resolve(null);
           }
         });
       } catch (e) {