ag-awsauth 0.0.292 → 0.0.294

package/dist/helpers/browser.d.ts

@@ -2,7 +2,9 @@ import type { Page } from 'puppeteer';
 export declare const closeBrowser: () => Promise<void>;
 export declare const launchBrowser: () => Promise<void>;
 export declare const goToPage: (url: string) => Promise<Page>;
-export declare const allowAccessIfRequested: (page: Page) => Promise<void>;
+export declare const allowAccessSelectors: string[];
+export declare const dismissAllowAccessPrompt: (page: Page, perSelectorTimeout?: number) => Promise<boolean>;
+export declare const allowAccessIfRequested: (page: Page, timeout?: number) => Promise<boolean>;
 export declare function getMFA(p: {
     verificationUriComplete: string;
     creds: {

package/dist/helpers/browser.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allowAccessIfRequested = exports.goToPage = exports.launchBrowser = exports.closeBrowser = void 0;
+exports.allowAccessIfRequested = exports.dismissAllowAccessPrompt = exports.allowAccessSelectors = exports.goToPage = exports.launchBrowser = exports.closeBrowser = void 0;
 exports.getMFA = getMFA;
 const log_1 = require("ag-common/dist/common/helpers/log");
+const sleep_1 = require("ag-common/dist/common/helpers/sleep");
 const puppeteer_1 = require("puppeteer");
 const __1 = require("..");
 const config_1 = require("../config");
@@ -83,15 +84,173 @@ const goToPage = (url) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 exports.goToPage = goToPage;
-const allowAccessIfRequested = (page) => __awaiter(void 0, void 0, void 0, function* () {
-    const allowAccess = yield page.waitForSelector('[data-testid="allow-access-button"]', { timeout: config_1.timeoutMs, visible: true });
-    if (!allowAccess) {
-        throw new Error('allow access button not found');
+exports.allowAccessSelectors = [
+    '[data-testid="allow-access-button"]',
+    '[data-analytics="allow-access-button"]',
+    'button[data-testid="allow-access-button"]',
+];
+const clickSelectorIfPresent = (page_1, selector_1, ...args_1) => __awaiter(void 0, [page_1, selector_1, ...args_1], void 0, function* (page, selector, timeout = config_1.timeoutShortMs) {
+    try {
+        const el = yield page.waitForSelector(selector, {
+            timeout,
+            visible: true,
+        });
+        if (!el) {
+            return false;
+        }
+        try {
+            yield el.click();
+        }
+        catch (_a) {
+            // Element may detach between query and click (SPA re-render).
+            // Fall back to an in-page click which re-queries the selector.
+            yield page.$eval(selector, (bn) => bn.click()).catch(() => undefined);
+        }
+        return true;
+    }
+    catch (_b) {
+        return false;
+    }
+});
+const clickAllowAccessByText = (page) => {
+    try {
+        const clicked = page.evaluate(() => {
+            const isVisible = (el) => {
+                const rect = el.getBoundingClientRect();
+                return rect.width > 0 && rect.height > 0 && getComputedStyle(el).visibility !== 'hidden';
+            };
+            // Match button, link, or ARIA-button variants: AWS renders the
+            // "Allow access" consent action differently across releases
+            // (orange button vs link), so don't assume a <button>.
+            const candidates = Array.from(document.querySelectorAll('button, a, [role="button"], input[type="submit"], input[type="button"]')).filter((el) => isVisible(el));
+            const label = (el) => {
+                var _a;
+                const inputValue = el.value;
+                // oxlint-disable-next-line typescript/no-unnecessary-condition -- value is undefined on non-inputs
+                const text = typeof inputValue === 'string' ? inputValue : ((_a = el.textContent) !== null && _a !== void 0 ? _a : '');
+                return text.trim().toLowerCase();
+            };
+            const exact = candidates.find((el) => label(el) === 'allow access');
+            const target = exact !== null && exact !== void 0 ? exact : candidates.find((el) => label(el).includes('allow access'));
+            if (target) {
+                target.click();
+                return true;
+            }
+            return false;
+        });
+        return clicked;
+    }
+    catch (_a) {
+        return Promise.resolve(false);
+    }
+};
+const dismissAllowAccessPrompt = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, perSelectorTimeout = 1000) {
+    const clicked = yield Promise.all(exports.allowAccessSelectors.map((selector) => clickSelectorIfPresent(page, selector, perSelectorTimeout)));
+    if (clicked.some(Boolean)) {
+        (0, log_1.info)('click allow-access-button');
+        return true;
+    }
+    if (yield clickAllowAccessByText(page)) {
+        (0, log_1.info)('click allow-access-button (text match "Allow access")');
+        return true;
+    }
+    return false;
+});
+exports.dismissAllowAccessPrompt = dismissAllowAccessPrompt;
+const pollDelayMs = 500;
+const sleepUntilDeadline = (deadline) => __awaiter(void 0, void 0, void 0, function* () {
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) {
+        return;
+    }
+    yield (0, sleep_1.sleep)(Math.min(pollDelayMs, remaining));
+});
+const allowAccessIfRequested = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, timeout = config_1.timeoutMs) {
+    const deadline = Date.now() + timeout;
+    // Poll so a slow-rendering consent dialog is not missed, while still
+    // returning quickly when the prompt appears (or never appears).
+    // oxlint-disable-next-line no-await-in-loop -- polling must stay sequential to match dialog timing
+    for (;;) {
+        // oxlint-disable-next-line no-await-in-loop -- each poll depends on the current page state
+        if (yield (0, exports.dismissAllowAccessPrompt)(page)) {
+            return true;
+        }
+        if (Date.now() >= deadline) {
+            return false;
+        }
+        // oxlint-disable-next-line no-await-in-loop -- delay must elapse before the next poll
+        yield sleepUntilDeadline(deadline);
     }
-    (0, log_1.info)('click allow-access-button');
-    yield allowAccess.click();
 });
 exports.allowAccessIfRequested = allowAccessIfRequested;
+const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, timeout = config_1.timeoutMs) {
+    const deadline = Date.now() + timeout;
+    let lastError;
+    // oxlint-disable-next-line no-await-in-loop -- success and consent checks are order-dependent
+    for (;;) {
+        // Success already visible?
+        try {
+            // oxlint-disable-next-line no-await-in-loop -- must check before dismissing prompts
+            const success = yield page.waitForSelector('[data-analytics-alert="success"]', { timeout: 2000 });
+            if (success) {
+                return;
+            }
+        }
+        catch (e) {
+            lastError = e;
+        }
+        // Defensively dismiss the consent prompt if it is (still) showing.
+        // This covers the "Allow <user> to access your data? / Allow access"
+        // dialog which otherwise blocks success indefinitely.
+        try {
+            // oxlint-disable-next-line no-await-in-loop -- prompt check follows the success check
+            if (yield (0, exports.dismissAllowAccessPrompt)(page)) {
+                (0, log_1.info)('dismissed allow-access prompt while waiting for success');
+                continue;
+            }
+        }
+        catch (e) {
+            (0, log_1.debug)('error dismissing allow-access prompt:', e);
+        }
+        // Also re-check the other intermediate confirmations while polling.
+        try {
+            // oxlint-disable-next-line no-await-in-loop -- confirmation check follows the success check
+            if (yield clickSelectorIfPresent(page, '[data-analytics="accept-user-code"]', 1000)) {
+                (0, log_1.info)('click accept-user-code (while waiting for success)');
+                continue;
+            }
+        }
+        catch (e) {
+            (0, log_1.debug)('error clicking accept-user-code while waiting:', e);
+        }
+        try {
+            // oxlint-disable-next-line no-await-in-loop -- auth request check follows the success check
+            if (yield clickSelectorIfPresent(page, '#cli_verification_btn', 1000)) {
+                (0, log_1.info)('clicking auth request button (while waiting for success)');
+            }
+        }
+        catch (e) {
+            (0, log_1.debug)('error clicking auth request button while waiting:', e);
+        }
+        if (Date.now() >= deadline) {
+            break;
+        }
+        // oxlint-disable-next-line no-await-in-loop -- delay must elapse before the next poll
+        yield sleepUntilDeadline(deadline);
+    }
+    // Final wait to surface a clear TimeoutError if success never arrived.
+    try {
+        yield page.waitForSelector('[data-analytics-alert="success"]', {
+            timeout: config_1.timeoutShortMs,
+        });
+    }
+    catch (_a) {
+        if (lastError instanceof Error) {
+            throw lastError;
+        }
+        throw new Error('Timed out waiting for success');
+    }
+});
 function getMFA(p) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -203,15 +362,11 @@ function getMFA(p) {
         }
         try {
             (0, log_1.info)('accept-user-code');
-            const messageDiv = yield page.waitForSelector('[data-analytics="accept-user-code"]', {
-                timeout: config_1.timeoutMs,
-            });
-            if (messageDiv) {
+            if (yield clickSelectorIfPresent(page, '[data-analytics="accept-user-code"]', config_1.timeoutMs)) {
                 (0, log_1.info)('click accept-user-code');
-                yield messageDiv.click();
             }
             else {
-                throw new Error('access prompt not found');
+                (0, log_1.debug)('accept-user-code prompt not present, continuing');
             }
         }
         catch (e) {
@@ -220,8 +375,10 @@ function getMFA(p) {
         let accessStateFound = false;
         try {
             (0, log_1.info)('allow-access-button');
-            yield (0, exports.allowAccessIfRequested)(page);
-            accessStateFound = true;
+            accessStateFound = yield (0, exports.allowAccessIfRequested)(page, config_1.timeoutMedMs);
+            if (!accessStateFound) {
+                (0, log_1.debug)('allow-access prompt not present, continuing');
+            }
         }
         catch (e) {
             (0, log_1.debug)('error clicking allow-access-button:', e);
@@ -242,9 +399,7 @@ function getMFA(p) {
         }
         //
         (0, log_1.info)('waiting for success');
-        yield page.waitForSelector('[data-analytics-alert="success"]', {
-            timeout: config_1.timeoutMs,
-        });
+        yield waitForSuccessDefensively(page, config_1.timeoutMs);
         (0, log_1.warn)('mfa success');
         const cookies = yield page.cookies();
         const ssoAuthn = (_a = cookies.find((c) => c.name === 'x-amz-sso_authn')) === null || _a === void 0 ? void 0 : _a.value;

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "ag-awsauth",
+  "version": "0.0.294",
+  "private": false,
   "description": "auth to aws sso/iamv2 easily",
-  "main": "dist/index.js",
-  "author": "andreigec@hotmail.com",
   "license": "ISC",
-  "private": false,
-  "version": "0.0.292",
-  "preferGlobal": true,
+  "author": "andreigec@hotmail.com",
   "bin": {
     "ag-awsauth": "./bin/awsauth.js"
   },
@@ -16,18 +14,21 @@
     "README.md",
     "LICENSE.md"
   ],
+  "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-sso": "3.972.0",
     "@aws-sdk/client-sso-oidc": "3.972.0",
     "@aws-sdk/client-sts": "3.972.0",
     "@aws-sdk/shared-ini-file-loader": "3.374.0",
-    "ag-common": "0.0.861",
+    "ag-common": "0.0.911",
     "cli-select": "1.1.2",
     "dotenv": "17.2.3",
     "envfile": "7.1.0",
-    "eslint-config-e7npm": "0.1.31",
+    "eslint-config-e7npm": "0.1.68",
     "ini": "5.0.0",
     "node-fetch": "3.3.2",
+    "oxfmt": "^0.65.0",
+    "oxlint": "^1.83.0",
     "puppeteer": "24.35.0",
     "readline-sync": "1.4.10",
     "typescript": "5.9.3",
@@ -43,12 +44,14 @@
   "resolutions": {
     "ws": ">=8.17.1"
   },
+  "preferGlobal": true,
   "engines": {
     "node": ">=20"
   },
   "scripts": {
-    "lint": "eslint src",
-    "format": "eslint src --fix",
+    "format": "e7-oxfmt --config .oxfmtrc.json --disable-nested-config .",
+    "lint": "e7-oxlint --config .oxlintrc.json --deny-warnings src && pnpm run typecheck",
+    "typecheck": "tsc --noEmit",
     "test": "tsc && node --test test/*.test.js",
     "start": "tsc && node bin/awsauth.js",
     "build": "tsc"