@pipelab/plugin-construct 1.0.0-beta.22 → 1.0.0-beta.26

package/dist/assets/listeners.ts

@@ -0,0 +1,144 @@
+import type { Page } from "playwright";
+
+export const registerInstallButtonListener = (page: Page, log: typeof console.log) => {
+  const installDialog = page.locator("#addonConfirmInstallDialog");
+  const installBtn = installDialog.locator(".okButton");
+  installBtn
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      await installBtn.click();
+      log("installBtn clicked");
+      registerInstallButtonListener(page, log);
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("installBtn.click() failed", e.message);
+    });
+};
+
+export const registerSaveLoginExpiredistener = (page: Page, log: typeof console.log) => {
+  const installDialog = page.locator("#confirmDialog");
+  const cancelBtn = installDialog.locator(".cancelConfirmButton");
+  cancelBtn
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      await cancelBtn.click();
+      log("cancelBtn clicked");
+      registerSaveLoginExpiredistener(page, log);
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("cancelBtn.click() failed", e.message);
+    });
+};
+
+export const registerWebglErrorListener = (page: Page, log: typeof console.log) => {
+  const okDialog = page.locator("#okDialog");
+  const webglErrorButton = okDialog.locator(".okButton");
+  webglErrorButton
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      const text = await okDialog.allInnerTexts();
+
+      if (text.join().toLowerCase().includes("webgl")) {
+        await webglErrorButton.click();
+        log("webglErrorButton clicked");
+        registerWebglErrorListener(page, log);
+      }
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("webglErrorButton.click() failed", e.message);
+    });
+};
+
+export const registerDeprecatedFeatures = (page: Page, log: typeof console.log) => {
+  const deprecatedFeaturesDialog = page.locator("#deprecatedFeaturesDialog");
+  const okButton = deprecatedFeaturesDialog.locator(".okButton");
+  okButton
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      await okButton.click();
+      log("okButton clicked");
+      registerDeprecatedFeatures(page, log);
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("deprecatedFeatures.okButton.click() failed", e.message);
+    });
+};
+
+export const registerWelcomeToConstructListener = (page: Page, log: typeof console.log) => {
+  const welcomeTourDialog = page.locator("#welcomeTourDialog");
+  const okButton = welcomeTourDialog.locator(".noThanksLink");
+  okButton
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      await okButton.click();
+      log("okButton clicked");
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("welcomeTour.okButton.click() failed", e.message);
+    });
+};
+
+export const registerMissingAddonErrorListener = (page: Page, log: typeof console.log) => {
+  const okDialog = page.locator("#missingAddonsDialog");
+  const webglErrorButton = okDialog.locator(".okButton");
+  webglErrorButton
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      throw new Error("Missing addon. You should bundle addons with your project");
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("missingAddon.okButton.waitFor() failed", e.message);
+    });
+};
+
+export const registerNewVersionAvailableListener = (page: Page, log: typeof console.log) => {
+  const newVersionAvailableDialog = page.locator("#confirmDialog");
+  const cancelButton = newVersionAvailableDialog.locator(".cancelConfirmButton");
+  cancelButton
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      await cancelButton.click();
+      log("cancelButton clicked");
+      registerNewVersionAvailableListener(page, log);
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("cancelButton.click() failed", e.message);
+    });
+};
+
+export const registerNotNowListener = (page: Page, log: typeof console.log) => {
+  const notNowBtn = page.getByText("Not now");
+  notNowBtn
+    .waitFor({
+      timeout: 0,
+    })
+    .then(async () => {
+      await notNowBtn.click();
+      log("notNowBtn clicked");
+    })
+    .catch(async (e) => {
+      if (e.message.includes("Target page, context or browser has been closed")) return;
+      log("notNowBtn.click() failed", e.message);
+    });
+};

package/dist/assets/script.ts

@@ -1,145 +1,15 @@
 import { Page } from "playwright";
 import { join } from "node:path";
-
-const registerInstallButtonListener = (page: Page, log: typeof console.log) => {
-  // as soon as it appear, without blocking flow
-  // accept installing plugins
-  const installDialog = page.locator("#addonConfirmInstallDialog");
-  const installBtn = installDialog.locator(".okButton");
-  installBtn
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      await installBtn.click();
-      log("installBtn clicked");
-      registerInstallButtonListener(page, log);
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("installBtn.click() failed", e.message);
-    });
-};
-
-const registerSaveLoginExpiredistener = (page: Page, log: typeof console.log) => {
-  // as soon as it appear, without blocking flow
-  // accept installing plugins
-  const installDialog = page.locator("#confirmDialog");
-  const cancelBtn = installDialog.locator(".cancelConfirmButton");
-  cancelBtn
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      await cancelBtn.click();
-      log("cancelBtn clicked");
-      registerSaveLoginExpiredistener(page, log);
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("cancelBtn.click() failed", e.message);
-    });
-};
-
-const registerWebglErrorListener = (page: Page, log: typeof console.log) => {
-  // as soon as it appear, without blocking flow
-  // ignore webgl error
-  const okDialog = page.locator("#okDialog");
-  const webglErrorButton = okDialog.locator(".okButton");
-  webglErrorButton
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      const text = await okDialog.allInnerTexts();
-
-      if (text.join().toLowerCase().includes("webgl")) {
-        await webglErrorButton.click();
-        log("webglErrorButton clicked");
-        registerWebglErrorListener(page, log);
-      }
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("webglErrorButton.click() failed", e.message);
-    });
-};
-const registerDeprecatedFeatures = (page: Page, log: typeof console.log) => {
-  // as soon as it appear, without blocking flow
-  // ignore deprecated feature
-  const deprecatedFeaturesDialog = page.locator("#deprecatedFeaturesDialog");
-  const okButton = deprecatedFeaturesDialog.locator(".okButton");
-  okButton
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      await okButton.click();
-      log("okButton clicked");
-      registerDeprecatedFeatures(page, log);
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("deprecatedFeatures.okButton.click() failed", e.message);
-    });
-};
-const registerWelcomeToConstructListener = (page: Page, log: typeof console.log) => {
-  // as soon as it appear, without blocking flow
-  // ignore deprecated feature
-  const welcomeTourDialog = page.locator("#welcomeTourDialog");
-  const okButton = welcomeTourDialog.locator(".noThanksLink");
-  okButton
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      await okButton.click();
-      log("okButton clicked");
-      // registerWelcomeToConstructListener(page, log); // usually only once
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("welcomeTour.okButton.click() failed", e.message);
-    });
-};
-
-const registerMissingAddonErrorListener = (page: Page, log: typeof console.log) => {
-  // as soon as it appear, without blocking flow
-  // ignore missing addon and throw
-  const okDialog = page.locator("#missingAddonsDialog");
-  const webglErrorButton = okDialog.locator(".okButton");
-  webglErrorButton
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      throw new Error("Missing addon. You should bundle addons with your project");
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("missingAddon.okButton.waitFor() failed", e.message);
-    });
-};
-
-const registerNewVersionAvailableListener = (page: Page, log: typeof console.log) => {
-  // as soon as it appear, without blocking flow
-  // ignore new version available and throw
-  const newVersionAvailableDialog = page.locator("#confirmDialog");
-  const cancelButton = newVersionAvailableDialog.locator(".cancelConfirmButton");
-  cancelButton
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      await cancelButton.click();
-      log("cancelButton clicked");
-      registerNewVersionAvailableListener(page, log);
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("cancelButton.click() failed", e.message);
-    });
-};
+import {
+  registerInstallButtonListener,
+  registerSaveLoginExpiredistener,
+  registerWebglErrorListener,
+  registerDeprecatedFeatures,
+  registerWelcomeToConstructListener,
+  registerMissingAddonErrorListener,
+  registerNewVersionAvailableListener,
+  registerNotNowListener,
+} from "./listeners.js";
 
 export const script = async (
   page: Page,
@@ -150,64 +20,71 @@ export const script = async (
   version: string | undefined,
   downloadDir: string,
 ) => {
+  if (username && password) {
+    log("Directly authenticating via Construct 3 account API...");
+    const formData = new FormData();
+    formData.append("username", username);
+    formData.append("password", password);
+    formData.append("productType", "games");
+
+    const res = await fetch("https://account.construct.net/login.json", {
+      method: "POST",
+      body: formData,
+    });
+    const json = (await res.json()) as any;
+    if (json.request.status !== "ok") {
+      throw new Error(json.request.errorMessage || "Invalid credentials");
+    }
+
+    const { userID, token } = json.response;
+    log("API login successful, injecting credentials into browser context...");
+
+    // Navigate to account.construct.net to set the origin context for IndexedDB
+    await page.goto("https://account.construct.net/");
+
+    // Inject token into IndexedDB
+    await page.evaluate(
+      async ({ userID, token }) => {
+        return new Promise<void>((resolve, reject) => {
+          const request = indexedDB.open("localforage", 1);
+          request.onerror = () => reject(new Error("Failed to open DB"));
+          request.onsuccess = (e: any) => {
+            const db = e.target.result;
+            try {
+              const transaction = db.transaction(["keyvaluepairs"], "readwrite");
+              const store = transaction.objectStore("keyvaluepairs");
+              const putRequest = store.put({ userID, token }, "login-data");
+              putRequest.onsuccess = () => resolve();
+              putRequest.onerror = () => reject(new Error("Failed to put item"));
+            } catch (err) {
+              reject(err);
+            }
+          };
+          request.onupgradeneeded = (e: any) => {
+            const db = e.target.result;
+            db.createObjectStore("keyvaluepairs");
+          };
+        });
+      },
+      { userID, token },
+    );
+    log("Credentials injected successfully.");
+  }
+
   let url = "https://editor.construct.net/";
   if (version) {
     url += version;
   }
   log("Navigating to URL", url);
-  // const serviceWorkerPromise = page.waitForEvent("serviceworker");
   await page.goto(url);
   log("after navigating");
 
-  // const serviceworker = await serviceWorkerPromise;
   registerWelcomeToConstructListener(page, log);
   registerNewVersionAvailableListener(page, log);
-
-  // as soon as it appear, without blocking flow
-  // ignore asking for update
-  const notNowBtn = page.getByText("Not now");
-  notNowBtn
-    .waitFor({
-      timeout: 0,
-    })
-    .then(async () => {
-      return notNowBtn.click();
-    })
-    .then(() => {
-      log("notNowBtn clicked");
-    })
-    .catch(async (e) => {
-      if (e.message.includes("Target page, context or browser has been closed")) return;
-      log("notNowBtn.click() failed", e.message);
-    });
+  registerNotNowListener(page, log);
 
   log("after event");
 
-  await page.waitForTimeout(2000);
-  log("after wait");
-
-  if (username && password) {
-    log("Authenticating");
-    await page.getByTitle("User account").locator("ui-icon").click();
-    await page.getByRole("menuitem", { name: "Log in" }).locator("span").click();
-    await page.frameLocator("#loginDialog iframe").getByLabel("Username").fill(username);
-    await page.frameLocator("#loginDialog iframe").getByLabel("Password").fill(password);
-
-    const tokenPromise = page.waitForResponse(/https:\/\/account.*\.construct\.net\/login.json/i);
-
-    await page.frameLocator("#loginDialog iframe").getByRole("button", { name: "Log in" }).click();
-
-    const response = await tokenPromise;
-    const jsonResponse = await response.json();
-
-    if (jsonResponse.request.status === "error") {
-      await page.close();
-
-      throw new Error("Invalid credentials");
-    }
-    log("Authenticated");
-  }
-
   await page.waitForTimeout(2000);
 
   const [fileChooser] = await Promise.all([
@@ -235,10 +112,15 @@ export const script = async (
   log("Got loading progress dialog");
 
   const progressInterval = setInterval(async () => {
-    const text = await progessBar.getAttribute("value");
-    const textAsNumber = parseFloat(text);
-    const finalText = Number.isNaN(textAsNumber) ? 0 : textAsNumber;
-    log("progress", `${finalText * 100}%`);
+    try {
+      const text = await progessBar.getAttribute("value", { timeout: 100 });
+      if (text === null) return;
+      const textAsNumber = parseFloat(text);
+      const finalText = Number.isNaN(textAsNumber) ? 0 : textAsNumber;
+      log("progress", `${finalText * 100}%`);
+    } catch {
+      clearInterval(progressInterval);
+    }
   }, 500);
 
   registerInstallButtonListener(page, log);
@@ -253,7 +135,7 @@ export const script = async (
     timeout: 0,
   });
   log("Got progress dialog to disapear");
-  clearTimeout(progressInterval);
+  clearInterval(progressInterval);
 
   await page.getByRole("button", { name: "Menu" }).click();
   await page.getByRole("menuitem", { name: "Project" }).click();