@auxcode/auxta 1.3.73 → 1.3.75

package/build/macros/helpers/AuxGoogleAuth.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuxGoogleAuth = void 0;
 const config_1 = require("../../auxta/configs/config");
-const puppeteer_1 = __importDefault(require("../../puppeteer/puppeteer"));
+const puppeteer_extra_1 = __importDefault(require("../../puppeteer/puppeteer-extra"));
 const code_helper_1 = __importDefault(require("../helpers/code.helper"));
 const status_of_step_1 = __importDefault(require("../../auxta/enums/status-of.step"));
 const fs = require('fs');
@@ -61,6 +61,7 @@ const TOKEN_PATH = 'token.json';
 let TOKEN;
 let EMAIL;
 let PASSWORD;
+let count = 0;
 class AuxGoogleAuth {
     static get oAuth2Client() {
         return this._oAuth2Client;
@@ -177,41 +178,45 @@ class AuxGoogleAuth {
         return __awaiter(this, void 0, void 0, function* () {
             const email = EMAIL ? EMAIL : process.env.google_account;
             const password = PASSWORD ? PASSWORD : process.env.google_password;
+            yield puppeteer_extra_1.default.startBrowser();
+            count++;
             if (email && password) {
-                const context = yield puppeteer_1.default.defaultPage.browser().createIncognitoBrowserContext();
+                const context = yield puppeteer_extra_1.default.defaultPage.browser().createIncognitoBrowserContext();
                 const page = yield context.newPage();
                 yield page.goto(authUrl);
-                yield code_helper_1.default.waitForSelector('visible', '#identifierId', config_1.config.timeout, page);
+                yield code_helper_1.default.waitForSelector('visible', '#identifierId', config_1.config.timeout, page, count >= 2);
                 yield ((_a = (yield page.$('#identifierId'))) === null || _a === void 0 ? void 0 : _a.type(email));
                 yield (yield page.$$('button'))[3].click();
                 yield code_helper_1.default.timeout(4000);
-                yield code_helper_1.default.waitForSelector('visible', 'input[type="password"]', config_1.config.timeout, page);
+                yield code_helper_1.default.waitForSelector('visible', 'input[type="password"]', config_1.config.timeout, page, count >= 2);
                 yield ((_b = (yield page.$('input[type="password"]'))) === null || _b === void 0 ? void 0 : _b.type(password));
                 yield (yield page.$$('button'))[1].click();
                 yield code_helper_1.default.timeout(4000);
-                yield code_helper_1.default.waitForSelector('visible', '#headingText', config_1.config.timeout, page);
+                yield code_helper_1.default.waitForSelector('visible', '#headingText', config_1.config.timeout, page, count >= 2);
                 yield (yield page.$$('button'))[2].click();
                 yield code_helper_1.default.timeout(4000);
                 const checkbox = yield page.$$('input[type="checkbox"]');
                 if (checkbox.length > 0) {
-                    yield code_helper_1.default.waitForSelector('visible', 'input[type="checkbox"]', config_1.config.timeout, page);
+                    yield code_helper_1.default.waitForSelector('visible', 'input[type="checkbox"]', config_1.config.timeout, page, count >= 2);
                     yield checkbox[0].click();
                     yield (yield page.$$('button'))[2].click();
                 }
                 else {
-                    yield code_helper_1.default.waitForSelector('visible', `div[data-email="${email.toLocaleLowerCase()}"]`, config_1.config.timeout, page);
+                    yield code_helper_1.default.waitForSelector('visible', `div[data-email="${email.toLocaleLowerCase()}"]`, config_1.config.timeout, page, count >= 2);
                     yield code_helper_1.default.timeout(4000);
                     yield (yield page.$$('button'))[2].click();
                 }
                 yield code_helper_1.default.timeout(4000);
-                yield code_helper_1.default.waitForSelector('visible', 'body', config_1.config.timeout, page);
+                yield code_helper_1.default.waitForSelector('visible', 'body', config_1.config.timeout, page, count >= 2);
                 const currentUrl = page.url();
                 const code = currentUrl.substring(currentUrl.indexOf("code=") + 5, currentUrl.lastIndexOf("&"));
                 code_helper_1.default.log('Then', 'I get the code form the url', status_of_step_1.default.PASSED);
                 yield page.close();
+                yield puppeteer_extra_1.default.close();
                 return decodeURIComponent(code);
             }
             else {
+                yield puppeteer_extra_1.default.close();
                 throw new Error('The email or password for the google account are empty');
             }
         });

package/build/macros/helpers/code.helper.d.ts

@@ -15,9 +15,9 @@ export declare class FunctionHelper extends ExtendDefaultPage {
     pressEnter(page?: import("puppeteer").Page): Promise<void>;
     emulate(phone_name: string, page?: import("puppeteer").Page): Promise<void>;
     restartBrowser(): Promise<void>;
-    clickAndWaitForPageToBeCreated(selector: string, page: import("puppeteer").Page | undefined, waitForPageCreate: boolean): Promise<void>;
+    clickAndWaitForPageToBeCreated(selector: string, page: import("puppeteer").Page | undefined, newPage: boolean): Promise<void>;
     closeLastPage(page?: import("puppeteer").Page): Promise<void>;
-    microsoftLogin(button: string, email: string, password: string, page?: import("puppeteer").Page, waitForPageCreate?: boolean): Promise<void>;
+    microsoftLogin(button: string, email: string, password: string, page?: import("puppeteer").Page, newPage?: boolean): Promise<void>;
 }
 declare const _default: FunctionHelper;
 export default _default;

package/build/macros/helpers/code.helper.js

@@ -170,9 +170,9 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
             yield puppeteer_1.default.startBrowser();
         });
     }
-    clickAndWaitForPageToBeCreated(selector, page = puppeteer_1.default.defaultPage, waitForPageCreate) {
+    clickAndWaitForPageToBeCreated(selector, page = puppeteer_1.default.defaultPage, newPage) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (waitForPageCreate) {
+            if (newPage) {
                 const nav = new Promise(res => page.browser().on('targetcreated', res));
                 yield page.click(selector);
                 yield nav;
@@ -188,7 +188,7 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
             yield pages[pages.length - 1].close();
         });
     }
-    microsoftLogin(button, email, password, page = puppeteer_1.default.defaultPage, waitForPageCreate = true) {
+    microsoftLogin(button, email, password, page = puppeteer_1.default.defaultPage, newPage = true) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const email_input = 'input[type="email"]';
@@ -196,12 +196,16 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
             const next_button = 'input[value="Next"]';
             const sign_in_button = 'input[value="Sign in"]';
             const no_button = 'input.ext-secondary';
-            yield this.clickAndWaitForPageToBeCreated(button, page, waitForPageCreate);
+            yield this.clickAndWaitForPageToBeCreated(button, page, newPage);
             const pages = yield page.browser().pages();
             const loginPage = pages[pages.length - 1];
             yield this.extend_page_functions(loginPage);
             yield loginPage.waitForNetworkIdle();
-            yield this.waitForSelector('visible', next_button, 60000, loginPage);
+            try {
+                yield loginPage.waitForSelector(next_button, { visible: true, timeout: 60000 });
+            }
+            catch (e) { }
+            this.log('Then', `I checked for the '${next_button}' element to be visible`, AuxTA_1.StepStatus.PASSED);
             yield loginPage.type(email_input, email, { delay: 0 });
             yield loginPage.keyboard.press('Enter');
             yield loginPage.waitForNetworkIdle();
@@ -214,8 +218,16 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
             else {
                 yield page.waitForNetworkIdle();
             }
-            yield this.waitForSelector('visible', sign_in_button, 60000, loginPage);
-            yield this.waitForSelector('visible', password_input, 6000, loginPage);
+            try {
+                yield loginPage.waitForSelector(sign_in_button, { visible: true, timeout: 60000 });
+            }
+            catch (e) { }
+            this.log('Then', `I checked for the '${sign_in_button}' element to be visible`, AuxTA_1.StepStatus.PASSED);
+            try {
+                yield loginPage.waitForSelector(password_input, { visible: true, timeout: 60000 });
+            }
+            catch (e) { }
+            this.log('Then', `I checked for the '${password_input}' element to be visible`, AuxTA_1.StepStatus.PASSED);
             try {
                 (_a = (yield loginPage.$(password_input))) === null || _a === void 0 ? void 0 : _a.type(password);
                 yield this.log('Then', `I type password into the ${password_input}`, AuxTA_1.StepStatus.PASSED);
@@ -226,7 +238,11 @@ class FunctionHelper extends extend_default_page_1.ExtendDefaultPage {
             }
             yield this.timeout(3000);
             yield loginPage.keyboard.press('Enter');
-            yield this.waitForSelector('visible', no_button, 60000, loginPage);
+            try {
+                yield loginPage.waitForSelector(no_button, { visible: true, timeout: 60000 });
+            }
+            catch (e) { }
+            this.log('Then', `I checked for the '${no_button}' element to be visible`, AuxTA_1.StepStatus.PASSED);
             yield loginPage.keyboard.press('Enter');
         });
     }

package/build/puppeteer/puppeteer-extra.d.ts

@@ -0,0 +1,9 @@
+import puppeteer = require("puppeteer");
+export declare class PuppeteerExtra {
+    defaultPage: puppeteer.Page;
+    private browser;
+    startBrowser(): Promise<void>;
+    close(): Promise<void>;
+}
+declare const _default: PuppeteerExtra;
+export default _default;

package/build/puppeteer/puppeteer-extra.js

@@ -0,0 +1,63 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PuppeteerExtra = void 0;
+const AuxTA_1 = __importDefault(require("../AuxTA"));
+const config_1 = require("../auxta/configs/config");
+const puppeteer_extra = require("puppeteer-extra");
+class PuppeteerExtra {
+    startBrowser() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let args = [];
+            let env = {};
+            if (process.env.ENVIRONMENT === 'LOCAL') {
+                args.push('--start-maximized');
+            }
+            if (process.env.ENVIRONMENT != 'LOCAL') {
+                args.push(`--window-size=${config_1.config.screenWidth ? config_1.config.screenWidth : 1920},${config_1.config.screenHeight ? config_1.config.screenHeight : 1080}`);
+                args.push("--no-sandbox", "--disable-setuid-sandbox", "--disable-gpu");
+                env = {
+                    DISPLAY: ":10.0"
+                };
+            }
+            const StealthPlugin = require('puppeteer-extra-plugin-stealth');
+            puppeteer_extra.default.use(StealthPlugin());
+            this.browser = yield puppeteer_extra.default.launch({
+                slowMo: process.env.slowMo ? Number(process.env.slowMo) : 0,
+                executablePath: puppeteer_extra.default.executablePath(),
+                args,
+                env,
+                ignoreDefaultArgs: ["--enable-automation"],
+                defaultViewport: process.env.ENVIRONMENT === 'LOCAL' ? null : {
+                    width: config_1.config.screenWidth,
+                    height: config_1.config.screenHeight
+                },
+                headless: process.env.ENVIRONMENT === 'LOCAL' ? (process.env.headless === 'true' ? 'new' : false) : 'new'
+            });
+            this.defaultPage = (yield this.browser.pages())[0];
+            yield AuxTA_1.default.extend_page_functions(this.defaultPage);
+        });
+    }
+    close() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.browser) {
+                let pages = yield this.browser.pages();
+                yield Promise.all(pages.map((page) => page.close()));
+                yield this.browser.close();
+            }
+        });
+    }
+}
+exports.PuppeteerExtra = PuppeteerExtra;
+exports.default = new PuppeteerExtra();

package/build/puppeteer/puppeteer.d.ts

@@ -1,7 +1,7 @@
 import { UploadModel } from "../auxta/models/upload.model";
-import puppeteerN = require("puppeteer");
+import puppeteer = require("puppeteer");
 export declare class Puppeteer {
-    defaultPage: puppeteerN.Page;
+    defaultPage: puppeteer.Page;
     private browser;
     startBrowser(): Promise<void>;
     close(): Promise<void>;

package/build/puppeteer/puppeteer.js

@@ -21,7 +21,7 @@ const status_of_step_1 = require("../auxta/enums/status-of.step");
 const config_1 = require("../auxta/configs/config");
 const start_suite_helper_1 = require("../auxta/utilities/start-suite.helper");
 const report_service_1 = require("../auxta/services/report.service");
-const puppeteer = require("puppeteer-extra");
+const puppeteer = require("puppeteer");
 class Puppeteer {
     startBrowser() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -37,8 +37,6 @@ class Puppeteer {
                     DISPLAY: ":10.0"
                 };
             }
-            const StealthPlugin = require('puppeteer-extra-plugin-stealth');
-            puppeteer.default.use(StealthPlugin());
             this.browser = yield puppeteer.default.launch({
                 slowMo: process.env.slowMo ? Number(process.env.slowMo) : 0,
                 executablePath: puppeteer.default.executablePath(),
@@ -49,7 +47,7 @@ class Puppeteer {
                     width: config_1.config.screenWidth,
                     height: config_1.config.screenHeight
                 },
-                headless: process.env.ENVIRONMENT === 'LOCAL' ? (process.env.headless === 'true' ? 'new' : false) : 'new'
+                headless: process.env.ENVIRONMENT === 'LOCAL' ? (process.env.headless === 'true' ? true : false) : true
             });
             this.defaultPage = (yield this.browser.pages())[0];
             yield AuxTA_1.default.extend_page_functions(this.defaultPage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auxcode/auxta",
-  "version": "1.3.73",
+  "version": "1.3.75",
   "description": "",
   "main": "./build/AuxTA.js",
   "types": "./build/AuxTA.d.ts",
@@ -24,7 +24,7 @@
     "js-base64": "^3.7.5",
     "node-2fa": "^2.0.3",
     "nodemailer": "^6.9.2",
-    "puppeteer": "^21.3.6",
+    "puppeteer": "^21.5.2",
     "readline": "^1.3.0",
     "typescript": "^5.2.2",
     "puppeteer-extra": "^3.3.6",