Merge pull request #259 from veghdev/manual_offline

Allows to run manual offline

Author: simzer

test/integration/modules/console/console.test.js

@@ -104,17 +104,9 @@ describe("new Console(logPrefix, logPath|undefined).cnsl.log()", () => {
 
   afterEach(() => {
     if (path.basename(path.dirname(logFile)) === "logPath") {
-      fs.rm(path.dirname(logFile), { force: true, recursive: true }, (err) => {
-        if (err) {
-          throw err;
-        }
-      });
+      fs.rmSync(path.dirname(logFile), { force: true, recursive: true });
     } else {
-      fs.rm(logFile, { force: true, recursive: true }, (err) => {
-        if (err) {
-          throw err;
-        }
-      });
+      fs.rmSync(logFile, { force: true, recursive: true });
     }
   });
 

test/integration/modules/integration-test/test-case/test-cases.test.js

@@ -489,9 +489,5 @@ describe("getTestCases()", () => {
 });
 
 afterAll(() => {
-  fs.rm(suites, { force: true, recursive: true }, (err) => {
-    if (err) {
-      throw err;
-    }
-  });
+  fs.rmSync(suites, { force: true, recursive: true  });
 });

test/integration/modules/manual/manual.js

@@ -48,34 +48,56 @@ class Manual {
 
   #setRouteGetLibList() {
     this.#workspaceHost.setRoute("/getLibList", (req, res) => {
-      let libList = {
-        localhost:
-          "http://127.0.0.1:" + this.#workspaceHostServerPort + "/example/lib",
-      };
-      libList["HEAD"] = VizzuUrl.getRemoteStableBucket() + "/lib";
-      this.#fetchLibList().then((vizzuList) => {
+      let localUrl = "http://127.0.0.1:" + this.#workspaceHostServerPort + "/example/lib/vizzu.js";
+      let localReady = VizzuVersion.isUrlAvailable(localUrl);
+      localReady = localReady.then((available) => {
+        let versions = {};
+        if (available) {
+          versions["localhost"] = localUrl;
+        } else {
+          console.error("failed to fetch localhost");
+        }
+        return versions;
+      });
+      let headUrl = VizzuUrl.getRemoteStableBucket() + "/lib/vizzu.js"
+      let headReady = VizzuVersion.isUrlAvailable(headUrl);
+      headReady = headReady.then((available) => {
+        let versions = {};
+        if (available) {
+          versions["HEAD"] = headUrl;
+        } else {
+          console.error("failed to fetch head");
+        }
+        return versions;
+      });
+      let shaListReady = this.#fetchLibList();
+      shaListReady = shaListReady.then((vizzuList) => {
+        let versions = {};
         vizzuList
           .slice()
           .reverse()
           .forEach((vizzu) => {
-            libList[
+            versions[
               vizzu.time.substring(0, 10) +
                 " " +
                 vizzu.time.substring(11, 16) +
                 " " +
                 vizzu.sha
             ] = VizzuUrl.getRemoteBucket() + "/" + vizzu.sha;
           });
-        VizzuVersion.getPublicBetaList().then((versions) => {
-          versions.forEach((version) => {
-            libList[version.num] = version.url;
-          });
-          VizzuVersion.getPrivateBetaList().forEach((version) => {
-            libList[version.num] = version.url;
-          });
-          res.send(libList);
+          return versions;
+      });
+      let cdnListReady = VizzuVersion.getPublicBetaList();
+      cdnListReady = cdnListReady.then((cdnList) => {
+        let versions = {};
+        cdnList.forEach((version) => {
+          versions[version.num] = version.url;
         });
+        return versions;
       });
+      Promise.all([localReady, headReady, shaListReady, cdnListReady]).then((versions) => {
+        res.send(Object.assign({}, versions[0], versions[1], versions[2], versions[3]))
+      })
     });
   }
 
@@ -90,8 +112,12 @@ class Manual {
             return resolve(vizzuList);
           })
           .catch((err) => {
-            return resolve(this.#fetchLibList());
+            console.error(err);
+            return resolve([]);
           });
+      }).catch((err) => {
+        console.error("failed to fetch sha lib list");
+        return resolve([]);
       });
     });
   }

test/integration/modules/vizzu/vizzu-url.test.js

@@ -303,15 +303,15 @@ describe("resolveVizzuUrl()", () => {
         return new Promise((resolve, reject) => {
           let local = "./test_report";
           let rmVizzuJsReady = new Promise((resolve, reject) => {
-            fs.rm(local + VizzuUrl.getVizzuJs(), { force: true }, (err) => {
+            fs.rm(local + VizzuUrl.getVizzuJs(), { force: true, recursive: true  }, (err) => {
               if (err) {
                 return reject(err);
               }
               return resolve();
             });
           });
           let rmVizzuMinJsReady = new Promise((resolve, reject) => {
-            fs.rm(local + VizzuUrl.getVizzuMinJs(), { force: true }, (err) => {
+            fs.rm(local + VizzuUrl.getVizzuMinJs(), { force: true, recursive: true  }, (err) => {
               if (err) {
                 return reject(err);
               }

test/integration/modules/vizzu/vizzu-version.js

@@ -80,7 +80,20 @@ class VizzuVersion {
           });
         })
         .catch((err) => {
-          return resolve(this.getPublicBetaList());
+          console.error("failed to fetch cdn lib list");
+          return resolve([]);
+        });
+    });
+  }
+
+  static isUrlAvailable(url) {
+    return new Promise((resolve, reject) => {
+      fetch(url, { method: 'HEAD' })
+        .then((response) => {
+          resolve(response.status === 200);
+        })
+        .catch((error) => {
+          resolve(false);
         });
     });
   }