ag-awsauth 0.0.293 → 0.0.294

package/dist/helpers/browser.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -103,9 +104,7 @@ const clickSelectorIfPresent = (page_1, selector_1, ...args_1) => __awaiter(void
         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);
+            yield page.$eval(selector, (bn) => bn.click()).catch(() => undefined);
         }
         return true;
     }
@@ -113,24 +112,23 @@ const clickSelectorIfPresent = (page_1, selector_1, ...args_1) => __awaiter(void
         return false;
     }
 });
-const clickAllowAccessByText = (page) => __awaiter(void 0, void 0, void 0, function* () {
+const clickAllowAccessByText = (page) => {
     try {
-        return yield page.evaluate(() => {
+        const clicked = page.evaluate(() => {
             const isVisible = (el) => {
                 const rect = el.getBoundingClientRect();
-                return (rect.width > 0 &&
-                    rect.height > 0 &&
-                    getComputedStyle(el).visibility !== 'hidden');
+                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, _b;
-                return ((_b = (_a = el.value) !== null && _a !== void 0 ? _a : el.textContent) !== null && _b !== void 0 ? _b : '')
-                    .trim()
-                    .toLowerCase();
+                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'));
@@ -140,17 +138,17 @@ const clickAllowAccessByText = (page) => __awaiter(void 0, void 0, void 0, funct
             }
             return false;
         });
+        return clicked;
     }
     catch (_a) {
-        return false;
+        return Promise.resolve(false);
     }
-});
+};
 const dismissAllowAccessPrompt = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, perSelectorTimeout = 1000) {
-    for (const selector of exports.allowAccessSelectors) {
-        if (yield clickSelectorIfPresent(page, selector, perSelectorTimeout)) {
-            (0, log_1.info)(`click allow-access-button (${selector})`);
-            return true;
-        }
+    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")');
@@ -159,29 +157,40 @@ const dismissAllowAccessPrompt = (page_1, ...args_1) => __awaiter(void 0, [page_
     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).
-    while (Date.now() < deadline) {
+    // 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() + 500 >= deadline) {
-            break;
+        if (Date.now() >= deadline) {
+            return false;
         }
-        yield new Promise((resolve) => setTimeout(resolve, 500));
+        // oxlint-disable-next-line no-await-in-loop -- delay must elapse before the next poll
+        yield sleepUntilDeadline(deadline);
     }
-    return false;
 });
 exports.allowAccessIfRequested = allowAccessIfRequested;
 const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, timeout = config_1.timeoutMs) {
-    var _a;
     const deadline = Date.now() + timeout;
     let lastError;
-    while (Date.now() < deadline) {
+    // 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;
@@ -194,6 +203,7 @@ const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page
         // 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;
@@ -204,6 +214,7 @@ const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page
         }
         // 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;
@@ -213,6 +224,7 @@ const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page
             (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)');
             }
@@ -220,6 +232,11 @@ const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page
         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 {
@@ -227,8 +244,11 @@ const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page
             timeout: config_1.timeoutShortMs,
         });
     }
-    catch (_b) {
-        throw ((_a = lastError) !== null && _a !== void 0 ? _a : new Error('Timed out waiting for success'));
+    catch (_a) {
+        if (lastError instanceof Error) {
+            throw lastError;
+        }
+        throw new Error('Timed out waiting for success');
     }
 });
 function getMFA(p) {

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.293",
-  "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"