@empiricalrun/playwright-utils 0.40.0 → 0.40.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/playwright-utils
 
+## 0.40.2
+
+### Patch Changes
+
+- d40f308: fix: auth store does not load storage state for logged in cases
+
+## 0.40.1
+
+### Patch Changes
+
+- 644366a: fix: incorrect types
+
 ## 0.40.0
 
 ### Minor Changes

package/dist/auth/index.d.ts

@@ -26,7 +26,7 @@ export declare class AuthStore<T extends WithKey<{}>> {
     static getValueFromAuthState(userContext: {
         key: string;
     }, query: QueryFilter): string | undefined;
-    private newPageWithAuthState;
+    private loadAuthStateIntoPage;
     private saveAuthState;
     static location(userContext: {
         key: string;

package/dist/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAI5D,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC,KAAK,OAAO,GAAG,SAAS,GAAG,kBAAkB,CAAC;AAE9C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,QAAQ,GAAG,cAAc,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,SAAS,CAAC,CAAC,SAAS,OAAO,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,CAAC,CAAC;IACf,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;gBACxD,EACV,IAAI,EACJ,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,OAAmB,GACpB,EAAE;QACD,IAAI,EAAE,IAAI,CAAC;QACX,WAAW,EAAE,CAAC,CAAC;QACf,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;QACpE,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB;IAQK,eAAe;IAIf,YAAY,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAqC/C,MAAM,CAAC,qBAAqB,CAC1B,WAAW,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAC5B,KAAK,EAAE,WAAW,GACjB,MAAM,GAAG,SAAS;YAyBP,oBAAoB;YAsBpB,aAAa;IA6B3B,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;WAIxC,eAAe,CAC1B,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC;CAoB5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAI5D,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC,KAAK,OAAO,GAAG,SAAS,GAAG,kBAAkB,CAAC;AAE9C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,QAAQ,GAAG,cAAc,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,SAAS,CAAC,CAAC,SAAS,OAAO,CAAC,EAAE,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,CAAC,CAAC;IACf,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;gBACxD,EACV,IAAI,EACJ,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,OAAmB,GACpB,EAAE;QACD,IAAI,EAAE,IAAI,CAAC;QACX,WAAW,EAAE,CAAC,CAAC;QACf,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;QACpE,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB;IAQK,eAAe;IAIf,YAAY,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAkC/C,MAAM,CAAC,qBAAqB,CAC1B,WAAW,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAC5B,KAAK,EAAE,WAAW,GACjB,MAAM,GAAG,SAAS;YAyBP,qBAAqB;YAqCrB,aAAa;IA6B3B,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;WAIxC,eAAe,CAC1B,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC;CAoB5B"}

package/dist/auth/index.js

@@ -30,22 +30,18 @@ class AuthStore {
             shouldDoLogin = true;
         }
         else {
-            const page = await this.newPageWithAuthState(this.page, storagePath);
+            // Load cached auth state into this.page's context so the check
+            // and any subsequent caller code all operate on the same page.
+            await this.loadAuthStateIntoPage(this.page, storagePath);
             try {
-                const methodResult = await this.checkLoggedInFunc(page, this.userContext);
+                const methodResult = await this.checkLoggedInFunc(this.page, this.userContext);
                 if (methodResult) {
-                    // Continue rest of the test flow with the existing page
-                    // where we have loaded the auth state
-                    loggedInPage = page;
-                }
-                else {
-                    await page.close();
+                    loggedInPage = this.page;
                 }
                 shouldDoLogin = !methodResult;
             }
             catch {
                 shouldDoLogin = true;
-                await page.close();
             }
         }
         if (shouldDoLogin) {
@@ -78,24 +74,39 @@ class AuthStore {
             }
         }
     }
-    async newPageWithAuthState(page, storagePath) {
+    async loadAuthStateIntoPage(page, storagePath) {
         if (this.appType === "web-app") {
-            // Load state from the file in a new context
-            // We create a new context because of Playwright APIs
-            const browser = page.context().browser();
-            const newContext = await browser.newContext({
-                storageState: storagePath,
-            });
-            return await newContext.newPage();
+            const authState = JSON.parse(fs_1.default.readFileSync(storagePath, "utf-8"));
+            if (authState.cookies?.length) {
+                await page.context().addCookies(authState.cookies);
+            }
+            if (authState.origins?.length) {
+                // Use a temporary page to set localStorage without navigating
+                // the caller's page away from its current URL
+                const tmp = await page.context().newPage();
+                try {
+                    for (const origin of authState.origins) {
+                        if (!origin.localStorage?.length)
+                            continue;
+                        await tmp.goto(origin.origin, {
+                            waitUntil: "domcontentloaded",
+                        });
+                        await tmp.evaluate((items) => {
+                            localStorage.clear();
+                            for (const item of items) {
+                                localStorage.setItem(item.name, item.value);
+                            }
+                        }, origin.localStorage);
+                    }
+                }
+                finally {
+                    await tmp.close();
+                }
+            }
         }
         else if (this.appType === "chrome-extension") {
-            // Load state from chrome.storage.local into the
-            // existing browser context
-            const context = page.context();
-            await AuthStore.loadStateForCrx(context, this.userContext);
-            return await context.newPage();
+            await AuthStore.loadStateForCrx(page.context(), this.userContext);
         }
-        throw new Error(`unable to load auth state for app type: ${this.appType}`);
     }
     async saveAuthState(storagePath) {
         if (this.appType === "web-app") {

package/dist/captcha/index.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.solveRecaptcha = solveRecaptcha;
 const dashboard_client_1 = require("@empiricalrun/dashboard-client");
 const puppeteer_extra_plugin_recaptcha_1 = __importDefault(require("puppeteer-extra-plugin-recaptcha"));
-const POLLING_INTERVAL = 5000;
-const MAX_POLLING_TIME = 180_000;
+const POLLING_INTERVAL = 10_000;
+const MAX_POLLING_TIME = 300_000;
 function buildTask(captcha) {
     const taskType = captcha._vendor === "hcaptcha"
         ? "HCaptchaTaskProxyless"
@@ -65,7 +65,7 @@ async function solveSingleViaProxy(apiClient, captcha) {
                 body: { endpoint: "/getTaskResult", body: { taskId } },
             });
             assertNoError(result);
-            if (result.status === 1 && result.solution) {
+            if (result.status === "ready" && result.solution) {
                 const token = result.solution.gRecaptchaResponse || result.solution.token;
                 if (token) {
                     solution.text = token;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.40.0",
+  "version": "0.40.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"