@datacamp/learn-vm-scripts 1.8.3 → 1.8.5

package/dist/index.cjs

@@ -366663,12 +366663,16 @@ var setInput = ({
 
 // src/azureLogin.ts
 var closeOnboardingPopups = async (page) => {
-  const welcomeSurveyCloseButton = 'span.fxs-welcomesurvey-close-icon[role="button"]';
-  await page.waitForSelector(welcomeSurveyCloseButton);
-  await page.click(welcomeSurveyCloseButton);
-  const popupButton = "button.fxs-teaching-bubble-close";
-  await page.waitForSelector(popupButton);
-  await page.click(popupButton);
+  try {
+    const welcomeSurveyCloseButton = 'span.fxs-welcomesurvey-close-icon[role="button"]';
+    await page.waitForSelector(welcomeSurveyCloseButton);
+    await page.click(welcomeSurveyCloseButton);
+    const popupButton = "button.fxs-teaching-bubble-close";
+    await page.waitForSelector(popupButton);
+    await page.click(popupButton);
+  } catch {
+    log("Onboarding popups not found or not clickable");
+  }
 };
 var closeSideNavigation = async (page) => {
   try {
@@ -366717,7 +366721,7 @@ async function loginToAzure({
   log("Password entered successfully");
   log("Ensuring user stays signed in ...");
   await page.waitForSelector('[type="submit"]');
-  await page.click('[type="submit"]');
+  await Promise.all([page.waitForNavigation(), page.click('[type="submit"]')]);
   if (skipOnboarding) {
     log("Skipping onboarding...");
     void closeOnboardingPopups(page).catch((error) => {
@@ -366725,7 +366729,6 @@ async function loginToAzure({
     });
   }
   if (url.includes("m365.cloud.microsoft/chat")) {
-    await page.waitForNavigation({ waitUntil: "networkidle0" });
     void closeSideNavigation(page).catch((error) => {
       console.error(
         "Error closing side navigation for Microsoft 365 copilot chat: ",
@@ -367071,9 +367074,10 @@ var handleInput = async ({ line, page }) => {
       default:
         return unreachable(input);
     }
-    log("Script ran successfully");
+    return true;
   } catch (error) {
     console.error(`Error: "${error.message}" on input ${line}`);
+    return false;
   }
 };
 var createFileIfNotExists = async (filePath) => {
@@ -367092,6 +367096,9 @@ var startInputWatcher = async ({
 }) => {
   const outputFileHandle = await fs.open(outputFilePath, "a");
   let lastInput = void 0;
+  let lastInputSucceeded = void 0;
+  let processingPromise = void 0;
+  let numberOfRuns = 0;
   await createFileIfNotExists(inputFilePath);
   let page = await setupPuppeteerPage({
     executablePath,
@@ -367105,8 +367112,9 @@ var startInputWatcher = async ({
       log("No input");
       return;
     }
-    if (lastInput != null && newInput === lastInput) {
+    if (lastInput != null && newInput === lastInput && lastInputSucceeded === true) {
       log("Input already processed");
+      log("Script ran successfully");
       await outputFileHandle.appendFile(`Done: ${newInput}`);
       return;
     }
@@ -367119,19 +367127,44 @@ var startInputWatcher = async ({
       });
     }
     log("New input, processing");
-    await handleInput({ line: newInput, page });
+    const success = await handleInput({ line: newInput, page });
+    lastInput = newInput;
+    if (success) {
+      log("Script ran successfully");
+      lastInputSucceeded = true;
+    } else {
+      log("Script ran unsuccessfully");
+      lastInputSucceeded = false;
+    }
     await outputFileHandle.appendFile(`Done: ${newInput}`);
     log("Done processing input");
-    lastInput = newInput;
   };
-  await checkInputFile();
+  const run = async () => {
+    numberOfRuns++;
+    const runId = numberOfRuns;
+    if (processingPromise != null) {
+      log(`WARNING: Parallel execution detected!`);
+      await processingPromise;
+      if (runId !== numberOfRuns) {
+        log(`WARNING: Run ${runId} was cancelled`);
+        return;
+      }
+    }
+    try {
+      processingPromise = checkInputFile();
+      await processingPromise;
+    } finally {
+      processingPromise = void 0;
+    }
+  };
+  await run();
   log("Waiting for input");
   for await (const event of fs.watch(inputFilePath)) {
     if (event.eventType !== "change") {
       continue;
     }
     log("Input file changed");
-    await checkInputFile();
+    await run();
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datacamp/learn-vm-scripts",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "repository": "git@github.com:datacamp-engineering/learn-vm-scripts.git",
   "description": "Scripts used by VMs in learn.",
   "main": "./dist/index.cjs",