ag-awsauth 0.0.276 → 0.0.278

package/dist/config.d.ts

@@ -11,3 +11,4 @@ export declare const setConfig: () => void;
 export declare const runConfig: () => void;
 export declare const timeoutMs = 30000;
 export declare const timeoutShortMs = 3000;
+export declare const timeoutMedMs = 6000;

package/dist/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeoutShortMs = exports.timeoutMs = exports.runConfig = exports.setConfig = exports.validateConfig = exports.targetRegion = exports.ssoStartUrl = exports.identityCenterRegion = exports.setBasePath = exports.basePath = exports.nativeStsDurationSeconds = exports.stsDurationSeconds = exports.logPath = void 0;
+exports.timeoutMedMs = exports.timeoutShortMs = exports.timeoutMs = exports.runConfig = exports.setConfig = exports.validateConfig = exports.targetRegion = exports.ssoStartUrl = exports.identityCenterRegion = exports.setBasePath = exports.basePath = exports.nativeStsDurationSeconds = exports.stsDurationSeconds = exports.logPath = void 0;
 const envfile_1 = require("envfile");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -48,9 +48,9 @@ const runConfig = () => {
         c.identityCenterRegion = ' //eg us-east-1';
     }
     fs_1.default.writeFileSync(pn, (0, envfile_1.stringify)(c));
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
     require('child_process').exec(`start "" "${pn}"`);
 };
 exports.runConfig = runConfig;
 exports.timeoutMs = 30000;
 exports.timeoutShortMs = 3000;
+exports.timeoutMedMs = 6000;

package/dist/helpers/browser.d.ts

@@ -1,6 +1,7 @@
+import type { Page } from 'puppeteer';
 export declare const closeBrowser: () => Promise<void>;
 export declare const launchBrowser: () => Promise<void>;
-export declare const goToPage: (url: string) => Promise<import("puppeteer").Page>;
+export declare const goToPage: (url: string) => Promise<Page>;
 export declare function getMFA(p: {
     verificationUriComplete: string;
     creds: {

package/dist/helpers/browser.js

@@ -12,12 +12,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
 const input_1 = require("./input");
 let browser;
+/**
+ * Helper to wait for network idle, ignoring timeout errors
+ */
+const waitForNetworkIdleSafe = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, options = {}) {
+    try {
+        yield page.waitForNetworkIdle(options);
+    }
+    catch (_a) {
+        // Ignore timeout errors
+    }
+});
 const closeBrowser = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (!browser) {
@@ -35,17 +45,15 @@ const launchBrowser = () => __awaiter(void 0, void 0, void 0, function* () {
     const opt = {
         defaultViewport: { height: 1000, width: 500 },
         headless: (__1.globalargs === null || __1.globalargs === void 0 ? void 0 : __1.globalargs.verbose) ? false : true,
-        ignoreHTTPSErrors: true,
         devtools: false,
+        args: [
+            '--disable-features=AudioServiceOutOfProcess',
+            '--disable-features=AudioServiceOutOfProcessKillAtHang',
+            '--disable-software-rasterizer',
+            '--disable-gpu',
+            '--disable-dev-shm-usage',
+        ],
     };
-    if (!opt.args) {
-        opt.args = [];
-    }
-    opt.args.push('--disable-features=AudioServiceOutOfProcess');
-    opt.args.push('--disable-features=AudioServiceOutOfProcessKillAtHang');
-    opt.args.push('--disable-software-rasterizer');
-    opt.args.push('--disable-gpu');
-    opt.args.push('--disable-dev-shm-usage');
     yield (0, exports.closeBrowser)();
     (0, log_1.debug)('launch browser, opt=', opt);
     browser = (yield (0, puppeteer_1.launch)(opt));
@@ -92,7 +100,7 @@ function getMFA(p) {
                 yield verif.click();
             }
         }
-        catch (e) {
+        catch (_b) {
             //
         }
         //
@@ -107,14 +115,8 @@ function getMFA(p) {
         yield page.focus('#password-input input');
         yield page.keyboard.type(p.creds.password);
         yield page.$eval('#password-submit-button button', (el) => el.click());
-        yield (0, sleep_1.sleep)(250);
-        try {
-            yield page.waitForNetworkIdle({ idleTime: 250, timeout: 3000 });
-        }
-        catch (e) {
-            //
-        }
         try {
+            yield waitForNetworkIdleSafe(page, { idleTime: 250, timeout: 3000 });
             (0, log_1.info)('wait optional alert message');
             const messageDiv = yield page.waitForSelector('.awsui-alert-message', {
                 timeout: config_1.timeoutShortMs,
@@ -133,80 +135,107 @@ function getMFA(p) {
             }
         }
         //
-        let retry = true;
-        do {
-            (0, log_1.info)('mfa block');
-            const { mfa } = (0, input_1.enterMFA)();
-            yield page.waitForSelector('.awsui-input-type-text', {
-                timeout: config_1.timeoutMs,
+        (0, log_1.info)('mfa block');
+        //enter mfa
+        const { mfa } = (0, input_1.enterMFA)();
+        yield page.waitForSelector('.awsui-input-type-text', {
+            timeout: config_1.timeoutMedMs,
+        });
+        yield page.focus('.awsui-input-type-text');
+        yield page.keyboard.type(mfa);
+        yield page.$eval('.awsui-signin-button-container button', (el) => el.click());
+        //wait up to timeoutMs until url redirects, and ends up on https://d-9067b92b3b.awsapps.com/start/#/device?user_code=.*?
+        try {
+            (0, log_1.info)('waiting for redirect to device page');
+            yield page.waitForFunction(() => {
+                const url = window.location.href;
+                return url.includes('awsapps.com/start/#/device?user_code=');
+            }, { timeout: config_1.timeoutMs });
+            (0, log_1.info)('successfully redirected to device page');
+        }
+        catch (e) {
+            (0, log_1.warn)('timeout waiting for device page redirect:', e);
+            // Continue anyway as the flow might still work
+        }
+        try {
+            yield waitForNetworkIdleSafe(page, {
+                idleTime: 250,
+                timeout: config_1.timeoutShortMs,
             });
-            yield page.focus('.awsui-input-type-text');
-            yield page.keyboard.type(mfa);
-            yield page.$eval('.awsui-signin-button-container button', (el) => el.click());
-            //
-            try {
-                yield (0, sleep_1.sleep)(250);
-                yield page.waitForNetworkIdle({ idleTime: 250 });
-                (0, log_1.info)('waiting for potential error');
-                const messageDiv = yield page.waitForSelector('.awsui-alert-message', {
-                    timeout: config_1.timeoutShortMs,
-                });
-                const value = yield page.evaluate((el) => { var _a; return (_a = el === null || el === void 0 ? void 0 : el.textContent) !== null && _a !== void 0 ? _a : ''; }, messageDiv);
-                if (value) {
-                    throw new Error(value);
-                }
-                retry = false;
+            (0, log_1.info)('try to click cookie decline');
+            const messageDiv = yield page.waitForSelector('[data-id="awsccc-cb-btn-decline"]', {
+                timeout: config_1.timeoutShortMs,
+            });
+            if (messageDiv) {
+                (0, log_1.info)('click decline');
+                yield messageDiv.click();
+            }
+        }
+        catch (e) {
+            (0, log_1.debug)('error clicking decline:', e);
+        }
+        //
+        try {
+            yield waitForNetworkIdleSafe(page, {
+                idleTime: 250,
+                timeout: config_1.timeoutShortMs,
+            });
+            (0, log_1.info)('waiting for potential error');
+            const messageDiv = yield page.waitForSelector('.awsui-alert-message', {
+                timeout: config_1.timeoutShortMs,
+            });
+            const value = yield page.evaluate((el) => { var _a; return (_a = el === null || el === void 0 ? void 0 : el.textContent) !== null && _a !== void 0 ? _a : ''; }, messageDiv);
+            if (value) {
+                throw new Error(value);
             }
-            catch (e) {
-                const em = e.toString();
-                if (!em.includes('exceeded')) {
-                    const em2 = `mfa error:` + em + ' retry';
-                    (0, log_1.error)(em2);
-                }
-                else {
-                    retry = false;
-                }
+        }
+        catch (e) {
+            (0, log_1.debug)('error waiting for potential error:', e);
+        }
+        try {
+            (0, log_1.info)('accept-user-code');
+            const messageDiv = yield page.waitForSelector('[data-analytics="accept-user-code"]', {
+                timeout: config_1.timeoutMs,
+            });
+            if (messageDiv) {
+                (0, log_1.info)('click accept-user-code');
+                yield messageDiv.click();
             }
-            try {
-                (0, log_1.info)('accept-user-code');
-                const messageDiv = yield page.waitForSelector('[data-analytics="accept-user-code"]', {
-                    timeout: config_1.timeoutShortMs,
-                });
-                if (messageDiv) {
-                    (0, log_1.info)('click access prompt');
-                    yield messageDiv.click();
-                }
-                else {
-                    throw new Error('access prompt not found');
-                }
+            else {
+                throw new Error('access prompt not found');
             }
-            catch (e) {
-                //
+        }
+        catch (e) {
+            (0, log_1.debug)('error accepting user code:', e);
+        }
+        try {
+            (0, log_1.info)('allow-access-button');
+            const messageDiv = yield page.waitForSelector('[data-testid="allow-access-button"]', {
+                timeout: config_1.timeoutMedMs,
+            });
+            if (messageDiv) {
+                (0, log_1.info)('click allow-access-button');
+                yield messageDiv.click();
             }
-            try {
-                (0, log_1.info)('allow-access-button');
-                const messageDiv = yield page.waitForSelector('[data-testid="allow-access-button"]', {
-                    timeout: config_1.timeoutShortMs,
-                });
-                if (messageDiv) {
-                    (0, log_1.info)('click access prompt');
-                    yield messageDiv.click();
-                }
-                else {
-                    throw new Error('access prompt not found');
-                }
+            else {
+                throw new Error('access prompt not found');
             }
-            catch (e) {
-                const em = e.toString();
-                if (!em.includes('exceeded')) {
-                    const em2 = `mfa error:` + em + ' retry';
-                    (0, log_1.error)(em2);
-                }
-                else {
-                    retry = false;
-                }
+        }
+        catch (e) {
+            (0, log_1.debug)('error clicking allow-access-button:', e);
+        }
+        try {
+            const verif = yield page.waitForSelector('#cli_verification_btn', {
+                timeout: config_1.timeoutShortMs,
+            });
+            if (verif) {
+                (0, log_1.info)('clicking auth request button');
+                yield verif.click();
             }
-        } while (retry);
+        }
+        catch (e) {
+            (0, log_1.debug)('error clicking auth request button:', e);
+        }
         //
         (0, log_1.info)('waiting for success');
         yield page.waitForSelector('[data-analytics-alert="success"]', {

package/dist/helpers/oidc.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestMFA = requestMFA;
+/* eslint-disable no-await-in-loop */
 const client_sso_oidc_1 = require("@aws-sdk/client-sso-oidc");
 const log_1 = require("ag-common/dist/common/helpers/log");
 const sleep_1 = require("ag-common/dist/common/helpers/sleep");

package/dist/helpers/version.js

@@ -28,7 +28,6 @@ const getVersion = () => {
     if (!fs_1.default.existsSync(pjpath)) {
         return undefined;
     }
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const p = require(pjpath);
     return p === null || p === void 0 ? void 0 : p.version;
 };

package/dist/index.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.globalargs = void 0;
 exports.main = main;
 exports.run = run;
-/* eslint-disable padding-line-between-statements */
 const log_1 = require("ag-common/dist/common/helpers/log");
 const dotenv_1 = require("dotenv");
 const fs_1 = __importDefault(require("fs"));
@@ -44,7 +43,7 @@ function main(args) {
             try {
                 fs_1.default.appendFileSync(config_1.logPath, JSON.stringify(a1, null, 2));
             }
-            catch (e) {
+            catch (_a) {
                 //
             }
         });
@@ -59,7 +58,6 @@ function main(args) {
         }
         if (args.wipe) {
             (0, log_1.info)('wiping args');
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             yield (0, awsconfig_1.updateAwsCredentials)(undefined);
             return;
         }

package/package.json

@@ -5,13 +5,11 @@
   "author": "andrei gec (andreigec@hotmail.com)",
   "license": "ISC",
   "private": false,
-  "version": "0.0.276",
+  "version": "0.0.278",
   "preferGlobal": true,
   "scripts": {
-    "format": "eslint --ext .ts,.tsx src --fix",
-    "lint:tsc": "tsc --noEmit",
-    "lint:eslint": "eslint --ext .ts,.tsx src",
-    "lint": "pnpm run /^lint:/",
+    "lint": "next lint",
+    "format": "eslint src --fix",
     "start": "tsc && node bin/awsauth.js",
     "build": "tsc"
   },
@@ -25,26 +23,26 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@aws-sdk/client-sso": "3.632.0",
-    "@aws-sdk/client-sso-oidc": "3.632.0",
-    "@aws-sdk/client-sts": "3.632.0",
-    "@aws-sdk/shared-ini-file-loader": "^3.374.0",
-    "ag-common": "0.0.719",
+    "@aws-sdk/client-sso": "3.848.0",
+    "@aws-sdk/client-sso-oidc": "3.848.0",
+    "@aws-sdk/client-sts": "3.848.0",
+    "@aws-sdk/shared-ini-file-loader": "3.374.0",
+    "ag-common": "0.0.755",
     "cli-select": "1.1.2",
-    "dotenv": "16.4.5",
+    "dotenv": "17.2.1",
     "envfile": "7.1.0",
-    "eslint-config-e7npm": "0.0.114",
-    "ini": "4.1.3",
-    "node-fetch": "2.7.0",
-    "puppeteer": "22.15.0",
+    "eslint-config-e7npm": "0.1.23",
+    "ini": "5.0.0",
+    "node-fetch": "3.3.2",
+    "puppeteer": "24.15.0",
     "readline-sync": "1.4.10",
-    "typescript": "5.5.4",
-    "yargs": "17.7.2"
+    "typescript": "5.8.3",
+    "yargs": "18.0.0"
   },
   "devDependencies": {
     "@types/ini": "4.1.1",
-    "@types/node": "20.15.0",
-    "@types/node-fetch": "2.6.11",
+    "@types/node": "24.1.0",
+    "@types/node-fetch": "2.6.12",
     "@types/readline-sync": "1.4.8",
     "@types/yargs": "17.0.33"
   },