@thetypefounders/continue-with-google 1.4.3 → 1.5.2

package/.env-example

@@ -0,0 +1,3 @@
+GOOGLE_USER_EMAIL=test@thetypefounders.com
+GOOGLE_USER_PASSWORD=
+GOOGLE_USER_SECRET=

package/.github/workflows/build.yml

@@ -32,4 +32,6 @@ jobs:
         with:
           node-version: 20.x
       - run: npm install
-      - run: npm run test
+      - run: |
+          echo "${{ secrets.ENVIRONMENT }}" | base64 --decode > .env
+          npm run test

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 import { type ElementHandle, Page, WaitForSelectorOptions } from 'puppeteer';
 export interface Logger {
-    info(message: string): void;
-    warn(message: string): void;
+    info(value: any): void;
+    warn(value: any): void;
+    error(value: any): void;
 }
 export type Options = {
     challengeCount?: number;
@@ -11,4 +12,6 @@ export type Options = {
     screenshot?: string;
     waitForSelector?: WaitForSelectorOptions;
 };
+export declare class CaptchaError extends Error {
+}
 export declare function authenticate(page: Page, email: string, password: string, secret: string, selector: string, options?: Options, logger?: Logger): Promise<ElementHandle | null>;

package/dist/index.js

@@ -7,6 +7,8 @@ const DEFAULTS = {
     trialCount: 10,
     trialTimeoutSeconds: 2,
 };
+export class CaptchaError extends Error {
+}
 export async function authenticate(page, email, password, secret, selector, options = DEFAULTS, logger = console) {
     const mergedOptions = { ...DEFAULTS, ...options };
     logger.info('Waiting to enter the email...');
@@ -18,7 +20,17 @@ export async function authenticate(page, email, password, secret, selector, opti
     await page.keyboard.press('Enter');
     logger.info('Waiting to enter the password...');
     await showScreenshot(page, mergedOptions.screenshot, logger);
-    await page.waitForSelector('input[type=password]', { visible: true });
+    const captcha = await Promise.any([
+        page
+            .waitForSelector('input[type=password]', { visible: true })
+            .then(() => false),
+        page
+            .waitForSelector('input[type=text]', { visible: true })
+            .then(() => true),
+    ]);
+    if (captcha) {
+        throw new CaptchaError('failed to proceed due to CAPTCHA');
+    }
     logger.info('Entering the password...');
     await showScreenshot(page, mergedOptions.screenshot, logger);
     await page.type('input[type=password]', password);
@@ -72,8 +84,8 @@ async function takeContent(page, logger) {
     try {
         return await page.evaluate(() => document.body.innerText);
     }
-    catch (error) {
-        logger.warn(`Failed to take the content (${error}).`);
+    catch (cause) {
+        logger.error(new Error(`failed to take the content`, { cause }));
         return undefined;
     }
 }
@@ -83,8 +95,8 @@ async function takeImage(page, logger) {
         await page.addStyleTag({ content });
         return await page.screenshot({ encoding: 'base64' });
     }
-    catch (error) {
-        logger.warn(`Failed to take a screenshot (${error}).`);
+    catch (cause) {
+        logger.error(new Error(`failed to take a screenshot`, { cause }));
         return undefined;
     }
 }

package/package.json

@@ -1,31 +1,35 @@
 {
   "name": "@thetypefounders/continue-with-google",
-  "version": "1.4.3",
+  "version": "1.5.2",
   "license": "Apache-2.0",
   "author": "Ivan Ukhov <ivan.ukhov@gmail.com>",
   "description": "Two-factor authentication with Google via Puppeteer",
   "repository": {
     "type": "git",
-    "url": "https://github.com/the-type-founders/continue-with-google.git"
+    "url": "git+https://github.com/the-type-founders/continue-with-google.git"
   },
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
     "authenticator": "^1.1.5",
-    "puppeteer": "^24.9.0"
+    "puppeteer": "^24.34.0"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^5.2.2",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.0",
     "@types/authenticator": "^1.1.4",
-    "prettier": "^3.5.3",
-    "typescript": "^5.8.3"
+    "dotenv": "^17.2.3",
+    "prettier": "^3.7.4",
+    "puppeteer-extra": "^3.3.6",
+    "puppeteer-extra-plugin-stealth": "^2.11.2",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.16"
   },
   "scripts": {
     "build": "tsc",
     "check": "prettier . --check",
     "format": "prettier . --check --write",
     "prepublish": "tsc",
-    "test": "echo"
+    "test": "vitest --bail=1"
   }
 }

package/src/index.ts

@@ -4,8 +4,9 @@ import { setTimeout } from 'node:timers/promises';
 import { type ElementHandle, Page, WaitForSelectorOptions } from 'puppeteer';
 
 export interface Logger {
-  info(message: string): void;
-  warn(message: string): void;
+  info(value: any): void;
+  warn(value: any): void;
+  error(value: any): void;
 }
 
 export type Options = {
@@ -24,6 +25,8 @@ const DEFAULTS: Options = {
   trialTimeoutSeconds: 2,
 };
 
+export class CaptchaError extends Error {}
+
 export async function authenticate(
   page: Page,
   email: string,
@@ -46,7 +49,17 @@ export async function authenticate(
 
   logger.info('Waiting to enter the password...');
   await showScreenshot(page, mergedOptions.screenshot, logger);
-  await page.waitForSelector('input[type=password]', { visible: true });
+  const captcha = await Promise.any([
+    page
+      .waitForSelector('input[type=password]', { visible: true })
+      .then(() => false),
+    page
+      .waitForSelector('input[type=text]', { visible: true })
+      .then(() => true),
+  ]);
+  if (captcha) {
+    throw new CaptchaError('failed to proceed due to CAPTCHA');
+  }
 
   logger.info('Entering the password...');
   await showScreenshot(page, mergedOptions.screenshot, logger);
@@ -119,8 +132,8 @@ async function takeContent(
 ): Promise<string | undefined> {
   try {
     return await page.evaluate(() => document.body.innerText);
-  } catch (error) {
-    logger.warn(`Failed to take the content (${error}).`);
+  } catch (cause) {
+    logger.error(new Error(`failed to take the content`, { cause }));
     return undefined;
   }
 }
@@ -133,8 +146,8 @@ async function takeImage(
     const content = '* { caret-color: transparent !important; }';
     await page.addStyleTag({ content });
     return await page.screenshot({ encoding: 'base64' });
-  } catch (error) {
-    logger.warn(`Failed to take a screenshot (${error}).`);
+  } catch (cause) {
+    logger.error(new Error(`failed to take a screenshot`, { cause }));
     return undefined;
   }
 }

package/test/index.test.ts

@@ -0,0 +1,31 @@
+import 'dotenv/config';
+import assert from 'node:assert';
+import PuppeteerExtra from 'puppeteer-extra';
+import StealthPlugin from 'puppeteer-extra-plugin-stealth';
+import { test } from 'vitest';
+
+import { authenticate } from '../src/index.js';
+
+test('authenticate', { timeout: 5 * 60 * 1000 }, async () => {
+  PuppeteerExtra.use(StealthPlugin());
+  const browser = await PuppeteerExtra.launch({
+    args: ['--no-sandbox'],
+    slowMo: parseInt(process.env.PUPPETEER_SLOW_MOTION || '100'),
+  });
+  try {
+    const page = await browser.newPage();
+    await page.setViewport({ width: 1280, height: 800 });
+    await page.goto('https://mail.google.com');
+    await assert.doesNotReject(
+      authenticate(
+        page,
+        process.env.GOOGLE_USER_EMAIL!,
+        process.env.GOOGLE_USER_PASSWORD!,
+        process.env.GOOGLE_USER_SECRET!,
+        '[aria-label="Search mail"]'
+      )
+    );
+  } finally {
+    await browser.close();
+  }
+});