Merge pull request #115 from premkattaWm/dev-prem/windows-directoryHash

Maintaining single unique hash directory for windows expo app

Author: suneelkumargavara

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavemaker/wm-reactnative-cli",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "description": "",
   "main": "index.js",
   "bin": {

package.json

@@ -315,14 +315,6 @@ async function setup(previewUrl, _clean, authToken) {
     taskLogger.incrementProgress(0.5);
     const projectName = await getProjectName(previewUrl);
     const projectDir = `${global.rootDir}/wm-projects/${projectName.replace(/\s+/g, '_').replace(/\(/g, '_').replace(/\)/g, '_')}`;
-    if (_clean) {
-        clean(projectDir);
-        if (isWindowsOS() && windowsPreviewDir) {
-            clean(windowsPreviewDir);
-        }
-    } else {
-        fs.mkdirpSync(getWmProjectDir(projectDir));
-    }
     if (isWindowsOS()) {
         try {
             windowsPreviewDir = await getDestPathForWindows('preview', projectDir);
@@ -331,6 +323,14 @@ async function setup(previewUrl, _clean, authToken) {
             throw e;
         }
     }
+    if (_clean) {
+        clean(projectDir);
+        if (isWindowsOS() && windowsPreviewDir) {
+            clean(windowsPreviewDir);
+        }
+    } else {
+        fs.mkdirpSync(getWmProjectDir(projectDir));
+    }
     taskLogger.incrementProgress(0.5);
     taskLogger.succeed(previewSteps[0].succeed);
     taskLogger.resetProgressBar();

src/expo-launcher.js

@@ -48,30 +48,19 @@ async function isExpoWebPreviewContainer(previewUrl) {
 }
 
 async function getDestPathForWindows(mode, projectDir = ''){
-    const MAX_DIR_HASH_TRIES = 4;
     let destHash = '';
     let destPath = '';
-    let tryCount = 0;
     let updatePath = '';
     let appendPath = '';
+
     if(mode == 'preview') {
         updatePath = `${projectDir}/target/generated-expo-app`;
     } else if (mode == 'build'){
         appendPath = '/' ;
     }
-    for (; tryCount < MAX_DIR_HASH_TRIES; tryCount++) {
-        destHash = crypto.createHash("shake256", { outputLength: 1 }).update(updatePath).update(String(Date.now())).digest("hex");
-        destPath = path.resolve(`${global.rootDir}/${mode}/` + destHash + appendPath); 
-      if (!fs.existsSync(destPath)) break;
-    }
-    if (tryCount === MAX_DIR_HASH_TRIES && fs.existsSync(destPath)) {
-        logger.error({
-            label: loggerLabel,
-            message: `Could not create a directory under ${mode} folder after ` + MAX_DIR_HASH_TRIES + ' attempts. Please try again.'
-        });
-        taskLogger.fail(`Could not create a directory under ${mode} foder. Please try again.`);
-        return;
-    }
+
+    destHash = crypto.createHash("shake256", { outputLength: 1 }).update(updatePath).digest("hex");
+    destPath = path.resolve(`${global.rootDir}/${mode}/` + destHash + appendPath); 
     return  destPath;
 }