wait for service connection (#2186)

Author: sanderegg

tests/e2e/tutorials/tutorialBase.js

@@ -120,7 +120,7 @@ class TutorialBase {
       listThem: false
     }];
 
-    for (let i=0; i<resources.length; i++) {
+    for (let i = 0; i < resources.length; i++) {
       const resource = resources[i];
       this.__responsesQueue.addResponseListener(resource.request);
     }
@@ -133,7 +133,7 @@ class TutorialBase {
       throw (err);
     }
 
-    for (let i=0; i<resources.length; i++) {
+    for (let i = 0; i < resources.length; i++) {
       const resource = resources[i];
       try {
         const resp = await this.__responsesQueue.waitUntilResponse(resource.request);
@@ -211,17 +211,19 @@ class TutorialBase {
     while ((new Date().getTime()) - start < timeout) {
       for (let i = nodeIds.length - 1; i >= 0; i--) {
         const nodeId = nodeIds[i];
-        if (await utils.isServiceReady(this.__page, studyId, nodeId)) {
+        if (await utils.isServiceReady(this.__page, studyId, nodeId) && await utils.isServiceConnected(this.__page, studyId, nodeId)) {
           nodeIds.splice(i, 1);
         }
       }
-      await utils.sleep(5000);
+
       if (nodeIds.length === 0) {
         console.log("Services ready in", ((new Date().getTime()) - start) / 1000);
         // after the service is responsive we need to wait a bit until the iframe is rendered
         await utils.sleep(3000);
         return;
       }
+
+      await utils.sleep(2500);
     }
     const errorMsg = "Timeout reached waiting for services";
     console.log(errorMsg, ((new Date().getTime()) - start) / 1000);

tests/e2e/utils/startPuppe.js

@@ -82,6 +82,8 @@ function listenToEvents(page) {
 async function getPage(browser) {
   const page = await browser.newPage();
   page.setCacheEnabled(false);
+  // NOTE: activate to see what happens in puppeteer evaluate function
+  // page.on('console', consoleObj => console.log(consoleObj.text()));
   await page.setViewport({
     width: 1920,
     height: 1080

tests/e2e/utils/utils.js

@@ -211,6 +211,39 @@ async function isServiceReady(page, studyId, nodeId) {
   return stopListening.includes(status);
 }
 
+async function getServiceUrl(page, studyId, nodeId) {
+  const endPoint = "/projects/" + studyId + "/nodes/" + nodeId;
+  console.log("-- get service url", endPoint);
+  const resp = await makeRequest(page, endPoint);
+
+  const service_basepath = resp["service_basepath"];
+  const service_entrypoint = resp["entry_point"];
+  const service_url = service_basepath + (service_entrypoint ? ("/" + service_entrypoint) : "/");
+  console.log("Service URL:", nodeId, service_url);
+
+  return service_url;
+}
+
+async function makePingRequest(page, path) {
+  // https://github.com/Netflix/pollyjs/issues/149#issuecomment-481108446
+  await page.setBypassCSP(true);
+  return await page.evaluate(async (path) => {
+    const url = (path).replace(/\/\//g, "\/");
+    console.log("makePingRequest", url);
+    return fetch(url, { accept: '*/*', cache: 'no-cache' })
+      .then(response => { console.log("ping response status:", response.status); return response.ok; })
+      .catch(error => { console.error(error); });
+  }, path);
+}
+
+async function isServiceConnected(page, studyId, nodeId) {
+  console.log("-- Is Service Connected", nodeId);
+  const serviceUrl = await getServiceUrl(page, studyId, nodeId);
+  connected = await makePingRequest(page, serviceUrl);
+  console.log(connected, "--")
+  return connected;
+}
+
 async function isStudyDone(page, studyId) {
   const endPoint = "/projects/" + studyId + "/state";
   console.log("-- Is study done", endPoint);
@@ -360,7 +393,7 @@ async function typeInInputElement(page, inputSelector, text) {
   });
 }
 
-function isElementVisible (page, selector) {
+function isElementVisible(page, selector) {
   return page.evaluate(selector => {
     const element = document.querySelector(selector)
     return !!(element && (element.offsetWidth || element.offsetHeight || element.getClientRects().length))
@@ -386,6 +419,7 @@ module.exports = {
   dragAndDrop,
   waitForResponse,
   isServiceReady,
+  isServiceConnected,
   isStudyDone,
   isStudyUnlocked,
   waitForValidOutputFile,