puppeteer-pro 1.3.1 → 1.5.1

package/README.md

@@ -21,13 +21,21 @@ const PuppeteerPro = require('puppeteer-pro');
 // Enable the 'avoidDetection' plugin to prevent headless detection
 PuppeteerPro.avoidDetection();
 
+// Enable the 'solveRecaptchas' plugin to solve Google's recaptchas (remember to provide a wit.api API access token)
+const solver = PuppeteerPro.solveRecaptchas('WIT_AI_ACCESS_TOKEN');
+
 (async () => {
   const browser = await PuppeteerPro.launch();
   const page = await browser.newPage();
   
   console.log('Testing the 🐱‍👤 avoidDetection 🐱‍👤 plugin..')
   await page.goto('https://arh.antoinevastel.com/bots/areyouheadless');
-  await page.screenshot({ path: 'areyouheadless.png' });
+  await page.screenshot({ path: 'are-you-headless.png' });
+  
+  console.log('Testing the recaptcha solver..')
+  await page.goto('https://www.google.com/recaptcha/api2/demo');
+  await solver.solveRecaptcha(page);
+  await page.screenshot({ path: 'is-recaptcha-solved.png' });
 
   await browser.close();
 })();
@@ -35,7 +43,7 @@ PuppeteerPro.avoidDetection();
 
 ## Passive Improvements
 
-- There can be multiple request interception handlers for the same request. In such cases, the resulting response will prioritize [`respond`](https://github.com/puppeteer/puppeteer/blob/master/docs/api.md#httprequestrespondresponse), followed by [`abort`](https://github.com/puppeteer/puppeteer/blob/master/docs/api.md#httprequestaborterrorcode), followed by [`continue`](https://github.com/puppeteer/puppeteer/blob/master/docs/api.md#httprequestcontinueoverrides). For example:
+- There can be multiple request interception handlers for the same request. In such cases, the resulting response will prioritize [`respond`](https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#httprequestrespondresponse), followed by [`abort`](https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#httprequestaborterrorcode), followed by [`continue`](https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#httprequestcontinueoverrides). For example:
   - If amongst 5 handlers, respond is called 1 time, abort is called 2 times and continue is called 2 times, the result will be `respond`. This will occur after the first respond is called and not when all handlers are finished.
   - If amongst 5 handlers, abort is called 1 time and continue is called 4 times, the result will be `abort`. This will occur after all handlers are finished.
   - If amongst 5 handlers, all handlers call continue, the result will be `continue`. This will occur after all handlers are finished.
@@ -52,7 +60,7 @@ PuppeteerPro.avoidDetection();
 
 ### Block Resources
 
-- Block any [resource type](https://github.com/puppeteer/puppeteer/blob/v2.1.1/docs/api.md#requestresourcetype) from loading
+- Block any [resource type](https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#httprequestresourcetype) from loading
 - Can be used to speed up loading websites by blocking style sheets and images
 
 ### Disable Dialogs
@@ -63,3 +71,8 @@ PuppeteerPro.avoidDetection();
 
 - Save and load cookies across sessions
 - Supports multiple profiles and switching between profiles
+
+### Solve Recaptcha
+
+- Solve Google's reCAPTCHA v2
+- Requires a FREE [wit.ai](https://wit.ai/apps) access token

package/index.d.ts

@@ -40,4 +40,6 @@ import { DisableDialogsPlugin } from './plugins/disable.dialogs';
 export declare function disableDialogs(logMessages?: boolean): DisableDialogsPlugin;
 import { ManageCookiesPlugin, ManageCookiesOption } from './plugins/manage.cookies';
 export declare function manageCookies(opts: ManageCookiesOption): ManageCookiesPlugin;
+import { SolveRecaptchaPlugin } from './plugins/solve.recaptcha';
+export declare function solveRecaptchas(accessToken: string): SolveRecaptchaPlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAIvC,wBAAsB,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAc5F;AAED,yIAAyI;AACzI,wBAAsB,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,aAAa,GAAG,SAAS,CAAC,4BAA4B,GAAG,SAAS,CAAC,qBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAcrK;AAID,qBAAa,MAAM;IACjB,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,GAAG,IAAI,CAAQ;IACnD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAK;IACzB,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,CAAM;IACtC,SAAS,CAAC,oBAAoB,UAAS;IAEvC,IAAI,aAAa,YAA+B;IAChD,IAAI,SAAS,YAAsC;cAEnC,aAAa,CAAC,MAAM,EAAE,MAAM;IAItC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO;cA6BrB,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO;cACvC,OAAO;cAEP,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM;cAwExC,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI;cAEnC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,WAAW;cAOxC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,WAAW;cAE9C,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM;cAQjC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM;cAEvC,aAAa;IACvB,OAAO;cAUG,YAAY;cAEZ,UAAU;IACpB,IAAI;cAkBM,SAAS;cAET,YAAY;CAS7B;AAGD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,QAA2B;AACnE,wBAAsB,YAAY,kBAMjC;AAED,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,wBAAgB,kBAAkB,IAAI,wBAAwB,CAI7D;AAED,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,wBAAgB,cAAc,IAAI,oBAAoB,CAIrD;AAED,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC3E,wBAAgB,cAAc,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,oBAAoB,CAI7E;AAED,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,wBAAgB,cAAc,CAAC,WAAW,UAAQ,GAAG,oBAAoB,CAIxE;AAED,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpF,wBAAgB,aAAa,CAAC,IAAI,EAAE,mBAAmB,GAAG,mBAAmB,CAI5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAIvC,wBAAsB,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAc5F;AAED,yIAAyI;AACzI,wBAAsB,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,aAAa,GAAG,SAAS,CAAC,4BAA4B,GAAG,SAAS,CAAC,qBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAgBrK;AAID,qBAAa,MAAM;IACjB,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,GAAG,IAAI,CAAQ;IACnD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAK;IACzB,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,CAAM;IACtC,SAAS,CAAC,oBAAoB,UAAS;IAEvC,IAAI,aAAa,YAA+B;IAChD,IAAI,SAAS,YAAsC;cAEnC,aAAa,CAAC,MAAM,EAAE,MAAM;IAItC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO;cA6BrB,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO;cACvC,OAAO;cAEP,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM;cAwExC,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI;cAEnC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,WAAW;cAOxC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,WAAW;cAE9C,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM;cAQjC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM;cAEvC,aAAa;IACvB,OAAO;cAUG,YAAY;cAEZ,UAAU;IACpB,IAAI;cAkBM,SAAS;cAET,YAAY;CAS7B;AAGD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,QAA2B;AACnE,wBAAsB,YAAY,kBAMjC;AAED,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,wBAAgB,kBAAkB,IAAI,wBAAwB,CAI7D;AAED,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,wBAAgB,cAAc,IAAI,oBAAoB,CAIrD;AAED,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC3E,wBAAgB,cAAc,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,oBAAoB,CAI7E;AAED,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,wBAAgB,cAAc,CAAC,WAAW,UAAQ,GAAG,oBAAoB,CAIxE;AAED,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpF,wBAAgB,aAAa,CAAC,IAAI,EAAE,mBAAmB,GAAG,mBAAmB,CAI5E;AAED,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,oBAAoB,CAIzE"}

package/index.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.manageCookies = exports.disableDialogs = exports.blockResources = exports.avoidDetection = exports.anonymizeUserAgent = exports.clearPlugins = exports.addPlugin = exports.Plugin = exports.launch = exports.connect = void 0;
+exports.solveRecaptchas = exports.manageCookies = exports.disableDialogs = exports.blockResources = exports.avoidDetection = exports.anonymizeUserAgent = exports.clearPlugins = exports.addPlugin = exports.Plugin = exports.launch = exports.connect = void 0;
 const events = require("events");
 // Puppeteer Defaults
 const Puppeteer = require("puppeteer");
@@ -19,6 +19,8 @@ async function connect(options) {
 exports.connect = connect;
 /** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */
 async function launch(options) {
+    if (!options)
+        options = {};
     const browser = await Puppeteer.launch({ defaultViewport: undefined, ...options });
     for (const plugin of plugins) {
         await plugin.init(browser);
@@ -232,4 +234,11 @@ function manageCookies(opts) {
     return plugin;
 }
 exports.manageCookies = manageCookies;
+const solve_recaptcha_1 = require("./plugins/solve.recaptcha");
+function solveRecaptchas(accessToken) {
+    const plugin = new solve_recaptcha_1.SolveRecaptchaPlugin(accessToken);
+    plugins.push(plugin);
+    return plugin;
+}
+exports.solveRecaptchas = solveRecaptchas;
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import * as events from 'events';\n\n// Puppeteer Defaults\nimport * as Puppeteer from 'puppeteer';\n\nconst browserEvents = new events.EventEmitter();\n\nexport async function connect(options?: Puppeteer.ConnectOptions): Promise<Puppeteer.Browser> {\n  const browser = await Puppeteer.connect(options || {});\n\n  for (const plugin of plugins) {\n    await plugin.init(browser);\n  }\n\n  const _close = browser.close;\n  browser.close = async () => {\n    await _close.apply(browser);\n    browserEvents.emit('close');\n  };\n\n  return browser;\n}\n\n/** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */\nexport async function launch(options?: Puppeteer.LaunchOptions & Puppeteer.BrowserLaunchArgumentOptions & Puppeteer.BrowserConnectOptions): Promise<Puppeteer.Browser> {\n  const browser = await Puppeteer.launch({ defaultViewport: undefined, ...options });\n\n  for (const plugin of plugins) {\n    await plugin.init(browser);\n  }\n\n  const _close = browser.close;\n  browser.close = async () => {\n    await _close.apply(browser);\n    browserEvents.emit('close');\n  };\n\n  return browser;\n}\n\n// PuppeteerPro\nlet interceptions = 0;\nexport class Plugin {\n  protected browser: Puppeteer.Browser | null = null;\n  private initialized = false;\n  private startCounter = 0;\n  protected dependencies: Plugin[] = [];\n  protected requiresInterception = false;\n\n  get isInitialized() { return this.initialized; }\n  get isStopped() { return this.startCounter === 0; }\n\n  protected async addDependency(plugin: Plugin) {\n    this.dependencies.push(plugin);\n  }\n\n  async init(browser: Puppeteer.Browser) {\n    if (this.initialized) return;\n\n    this.browser = browser;\n\n    const offOnClose: (() => void)[] = [];\n    browserEvents.once('close', async () => {\n      offOnClose.forEach(fn => fn());\n\n      this.browser = null;\n      this.initialized = false;\n      this.startCounter = 0;\n\n      await this.onClose();\n    });\n\n    this.startCounter++;\n\n    const thisOnTargetCreated = this.onTargetCreated.bind(this);\n    browser.on('targetcreated', thisOnTargetCreated);\n    offOnClose.push(() => browser.off('targetcreated', thisOnTargetCreated));\n\n    this.initialized = true;\n\n    this.dependencies.forEach(x => x.init(browser));\n\n    return this.afterLaunch(browser);\n  }\n\n  protected async afterLaunch(_browser: Puppeteer.Browser) { }\n  protected async onClose() { }\n\n  protected async onTargetCreated(target: Puppeteer.Target) {\n    if (this.isStopped) return;\n\n    if (target.type() !== 'page') return;\n    const page = await target.page() as Puppeteer.Page;\n    if (page.isClosed()) return;\n\n    const offOnClose: (() => void)[] = [];\n    page.once('close', async () => {\n      offOnClose.forEach(fn => fn());\n    });\n\n    const requestHandlers: ((request: any) => void)[] = [];\n    page.on('request', request => {\n      const _respond = request.respond;\n      let responded = 0;\n      let respondArgs: IArguments;\n\n      const _abort = request.abort;\n      let aborted = 0;\n      let abortArgs: IArguments;\n\n      const _continue = request.continue;\n      let continued = 0;\n      let continueArgs: IArguments;\n\n      // tslint:disable-next-line: only-arrow-functions\n      const handleRequest = async function () {\n        const total = responded + aborted + continued;\n\n        if (!(request as any)._interceptionHandled) {\n          if (responded === 1) await _respond.apply(request, respondArgs);\n          else if (responded === 0 && aborted >= 1 && total === requestHandlers.length) await _abort.apply(request, abortArgs);\n          else if (continued === requestHandlers.length) await _continue.apply(request, continueArgs);\n        }\n      };\n\n      // tslint:disable-next-line: only-arrow-functions\n      request.respond = async function () { responded++; respondArgs = respondArgs || arguments; await handleRequest(); };\n      // tslint:disable-next-line: only-arrow-functions\n      request.abort = async function () { aborted++; abortArgs = abortArgs || arguments; await handleRequest(); };\n      // tslint:disable-next-line: only-arrow-functions\n      request.continue = async function () { continued++; continueArgs = continueArgs || arguments; await handleRequest(); };\n\n      requestHandlers.forEach(handler => handler(request));\n    });\n\n    const _pageOn = page.on;\n    page.on = function async(eventName, handler) {\n      if (eventName === 'request') {\n        requestHandlers.push(handler);\n\n        return page;\n      } else {\n        return _pageOn.call(page, eventName, handler);\n      }\n    };\n\n    if (this.requiresInterception) {\n      await page.setRequestInterception(true);\n\n      const thisOnRequest = this.onRequest.bind(this);\n      page.on('request', thisOnRequest);\n      offOnClose.push(() => page.off('request', thisOnRequest));\n    }\n\n    const thisOnDialog = this.onDialog.bind(this);\n    page.on('dialog', thisOnDialog);\n    offOnClose.push(() => page.off('dialog', thisOnDialog));\n\n    await this.onPageCreated(page);\n  }\n  protected async onPageCreated(_page: Puppeteer.Page) { }\n\n  protected async onRequest(request: Puppeteer.HTTPRequest) {\n    const interceptionHandled = (request as any)._interceptionHandled;\n    if (interceptionHandled) return;\n    if (this.isStopped) return request.continue();\n\n    await this.processRequest(request);\n  }\n  protected async processRequest(_request: Puppeteer.HTTPRequest) { }\n\n  protected async onDialog(dialog: Puppeteer.Dialog) {\n    const handled = (dialog as any)._handled;\n\n    if (handled) return;\n    if (this.isStopped) return;\n\n    await this.processDialog(dialog);\n  }\n  protected async processDialog(_dialog: Puppeteer.Dialog) { }\n\n  protected async beforeRestart() { }\n  async restart() {\n    await this.beforeRestart();\n\n    this.startCounter++;\n    if (this.requiresInterception) interceptions++;\n\n    this.dependencies.forEach(x => x.restart());\n\n    await this.afterRestart();\n  }\n  protected async afterRestart() { }\n\n  protected async beforeStop() { }\n  async stop() {\n    await this.beforeStop();\n\n    this.startCounter--;\n    if (this.requiresInterception) interceptions--;\n\n    if (interceptions === 0 && this.browser) {\n      const pages = await this.browser.pages();\n\n      pages.filter(x => !x.isClosed()).forEach(async (page: Puppeteer.Page) => {\n        await page.setRequestInterception(false);\n      });\n    }\n\n    this.dependencies.forEach(x => x.stop());\n\n    await this.afterStop();\n  }\n  protected async afterStop() { }\n\n  protected async getFirstPage() {\n    if (!this.browser) return null;\n\n    const pages = await this.browser.pages();\n    const openPages = pages.filter(x => !x.isClosed());\n    const activePages = pages.filter(x => x.url() !== 'about:blank');\n\n    return activePages[0] || openPages[0];\n  }\n}\n\nlet plugins: Plugin[] = [];\nexport function addPlugin(plugin: Plugin) { plugins.push(plugin); }\nexport async function clearPlugins() {\n  plugins.forEach(async plugin => {\n    await plugin.stop();\n  });\n\n  plugins = [];\n}\n\nimport { AnonymizeUserAgentPlugin } from './plugins/anonymize.user.agent/index';\nexport function anonymizeUserAgent(): AnonymizeUserAgentPlugin {\n  const plugin = new AnonymizeUserAgentPlugin();\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { AvoidDetectionPlugin } from './plugins/avoid.detection';\nexport function avoidDetection(): AvoidDetectionPlugin {\n  const plugin = new AvoidDetectionPlugin();\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { BlockResourcesPlugin, Resource } from './plugins/block.resources';\nexport function blockResources(...resources: Resource[]): BlockResourcesPlugin {\n  const plugin = new BlockResourcesPlugin(resources);\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { DisableDialogsPlugin } from './plugins/disable.dialogs';\nexport function disableDialogs(logMessages = false): DisableDialogsPlugin {\n  const plugin = new DisableDialogsPlugin(logMessages);\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { ManageCookiesPlugin, ManageCookiesOption } from './plugins/manage.cookies';\nexport function manageCookies(opts: ManageCookiesOption): ManageCookiesPlugin {\n  const plugin = new ManageCookiesPlugin(opts);\n  plugins.push(plugin);\n  return plugin;\n}"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,iCAAiC;AAEjC,qBAAqB;AACrB,uCAAuC;AAEvC,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;AAEzC,KAAK,UAAU,OAAO,CAAC,OAAkC;IAC9D,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAEvD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KAC5B;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAC7B,OAAO,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;QACzB,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAdD,0BAcC;AAED,yIAAyI;AAClI,KAAK,UAAU,MAAM,CAAC,OAA4G;IACvI,IAAI,CAAC,OAAO;QAAE,OAAO,GAAG,EAAE,CAAC;IAE3B,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAEnF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KAC5B;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAC7B,OAAO,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;QACzB,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAhBD,wBAgBC;AAED,eAAe;AACf,IAAI,aAAa,GAAG,CAAC,CAAC;AACtB,MAAa,MAAM;IAAnB;QACY,YAAO,GAA6B,IAAI,CAAC;QAC3C,gBAAW,GAAG,KAAK,CAAC;QACpB,iBAAY,GAAG,CAAC,CAAC;QACf,iBAAY,GAAa,EAAE,CAAC;QAC5B,yBAAoB,GAAG,KAAK,CAAC;IAiLzC,CAAC;IA/KC,IAAI,aAAa,KAAK,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAChD,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC;IAEzC,KAAK,CAAC,aAAa,CAAC,MAAc;QAC1C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA0B;QACnC,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAE7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,MAAM,UAAU,GAAmB,EAAE,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YACrC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAE/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;YACzB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;YAEtB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,MAAM,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;QACjD,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;QAEzE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAExB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAEhD,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,QAA2B,IAAI,CAAC;IAClD,KAAK,CAAC,OAAO,KAAK,CAAC;IAEnB,KAAK,CAAC,eAAe,CAAC,MAAwB;QACtD,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAE3B,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,MAAM;YAAE,OAAO;QACrC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAoB,CAAC;QACnD,IAAI,IAAI,CAAC,QAAQ,EAAE;YAAE,OAAO;QAE5B,MAAM,UAAU,GAAmB,EAAE,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC5B,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,GAA+B,EAAE,CAAC;QACvD,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;YAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YACjC,IAAI,SAAS,GAAG,CAAC,CAAC;YAClB,IAAI,WAAuB,CAAC;YAE5B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;YAC7B,IAAI,OAAO,GAAG,CAAC,CAAC;YAChB,IAAI,SAAqB,CAAC;YAE1B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;YACnC,IAAI,SAAS,GAAG,CAAC,CAAC;YAClB,IAAI,YAAwB,CAAC;YAE7B,iDAAiD;YACjD,MAAM,aAAa,GAAG,KAAK;gBACzB,MAAM,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;gBAE9C,IAAI,CAAE,OAAe,CAAC,oBAAoB,EAAE;oBAC1C,IAAI,SAAS,KAAK,CAAC;wBAAE,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;yBAC3D,IAAI,SAAS,KAAK,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,KAAK,eAAe,CAAC,MAAM;wBAAE,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;yBAChH,IAAI,SAAS,KAAK,eAAe,CAAC,MAAM;wBAAE,MAAM,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;iBAC7F;YACH,CAAC,CAAC;YAEF,iDAAiD;YACjD,OAAO,CAAC,OAAO,GAAG,KAAK,eAAe,SAAS,EAAE,CAAC,CAAC,WAAW,GAAG,WAAW,IAAI,SAAS,CAAC,CAAC,MAAM,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;YACpH,iDAAiD;YACjD,OAAO,CAAC,KAAK,GAAG,KAAK,eAAe,OAAO,EAAE,CAAC,CAAC,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC,CAAC,MAAM,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;YAC5G,iDAAiD;YACjD,OAAO,CAAC,QAAQ,GAAG,KAAK,eAAe,SAAS,EAAE,CAAC,CAAC,YAAY,GAAG,YAAY,IAAI,SAAS,CAAC,CAAC,MAAM,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;YAEvH,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,EAAE,GAAG,SAAS,KAAK,CAAC,SAAS,EAAE,OAAO;YACzC,IAAI,SAAS,KAAK,SAAS,EAAE;gBAC3B,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAE9B,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC;QAEF,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC7B,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAExC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;YAClC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;SAC3D;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAChC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IACS,KAAK,CAAC,aAAa,CAAC,KAAqB,IAAI,CAAC;IAE9C,KAAK,CAAC,SAAS,CAAC,OAA8B;QACtD,MAAM,mBAAmB,GAAI,OAAe,CAAC,oBAAoB,CAAC;QAClE,IAAI,mBAAmB;YAAE,OAAO;QAChC,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;QAE9C,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IACS,KAAK,CAAC,cAAc,CAAC,QAA+B,IAAI,CAAC;IAEzD,KAAK,CAAC,QAAQ,CAAC,MAAwB;QAC/C,MAAM,OAAO,GAAI,MAAc,CAAC,QAAQ,CAAC;QAEzC,IAAI,OAAO;YAAE,OAAO;QACpB,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAE3B,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IACS,KAAK,CAAC,aAAa,CAAC,OAAyB,IAAI,CAAC;IAElD,KAAK,CAAC,aAAa,KAAK,CAAC;IACnC,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3B,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,oBAAoB;YAAE,aAAa,EAAE,CAAC;QAE/C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5C,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IAC5B,CAAC;IACS,KAAK,CAAC,YAAY,KAAK,CAAC;IAExB,KAAK,CAAC,UAAU,KAAK,CAAC;IAChC,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,oBAAoB;YAAE,aAAa,EAAE,CAAC;QAE/C,IAAI,aAAa,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAEzC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAoB,EAAE,EAAE;gBACtE,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAEzC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;IACzB,CAAC;IACS,KAAK,CAAC,SAAS,KAAK,CAAC;IAErB,KAAK,CAAC,YAAY;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAE/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,aAAa,CAAC,CAAC;QAEjE,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;CACF;AAtLD,wBAsLC;AAED,IAAI,OAAO,GAAa,EAAE,CAAC;AAC3B,SAAgB,SAAS,CAAC,MAAc,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAAnE,8BAAmE;AAC5D,KAAK,UAAU,YAAY;IAChC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QAC7B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AAND,oCAMC;AAED,gEAAgF;AAChF,SAAgB,kBAAkB;IAChC,MAAM,MAAM,GAAG,IAAI,gCAAwB,EAAE,CAAC;IAC9C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC;AAJD,gDAIC;AAED,+DAAiE;AACjE,SAAgB,cAAc;IAC5B,MAAM,MAAM,GAAG,IAAI,sCAAoB,EAAE,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC;AAJD,wCAIC;AAED,+DAA2E;AAC3E,SAAgB,cAAc,CAAC,GAAG,SAAqB;IACrD,MAAM,MAAM,GAAG,IAAI,sCAAoB,CAAC,SAAS,CAAC,CAAC;IACnD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC;AAJD,wCAIC;AAED,+DAAiE;AACjE,SAAgB,cAAc,CAAC,WAAW,GAAG,KAAK;IAChD,MAAM,MAAM,GAAG,IAAI,sCAAoB,CAAC,WAAW,CAAC,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC;AAJD,wCAIC;AAED,6DAAoF;AACpF,SAAgB,aAAa,CAAC,IAAyB;IACrD,MAAM,MAAM,GAAG,IAAI,oCAAmB,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC;AAJD,sCAIC;AAED,+DAAiE;AACjE,SAAgB,eAAe,CAAC,WAAmB;IACjD,MAAM,MAAM,GAAG,IAAI,sCAAoB,CAAC,WAAW,CAAC,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC;AAJD,0CAIC","sourcesContent":["import * as events from 'events';\n\n// Puppeteer Defaults\nimport * as Puppeteer from 'puppeteer';\n\nconst browserEvents = new events.EventEmitter();\n\nexport async function connect(options?: Puppeteer.ConnectOptions): Promise<Puppeteer.Browser> {\n  const browser = await Puppeteer.connect(options || {});\n\n  for (const plugin of plugins) {\n    await plugin.init(browser);\n  }\n\n  const _close = browser.close;\n  browser.close = async () => {\n    await _close.apply(browser);\n    browserEvents.emit('close');\n  };\n\n  return browser;\n}\n\n/** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */\nexport async function launch(options?: Puppeteer.LaunchOptions & Puppeteer.BrowserLaunchArgumentOptions & Puppeteer.BrowserConnectOptions): Promise<Puppeteer.Browser> {\n  if (!options) options = {};\n\n  const browser = await Puppeteer.launch({ defaultViewport: undefined, ...options });\n\n  for (const plugin of plugins) {\n    await plugin.init(browser);\n  }\n\n  const _close = browser.close;\n  browser.close = async () => {\n    await _close.apply(browser);\n    browserEvents.emit('close');\n  };\n\n  return browser;\n}\n\n// PuppeteerPro\nlet interceptions = 0;\nexport class Plugin {\n  protected browser: Puppeteer.Browser | null = null;\n  private initialized = false;\n  private startCounter = 0;\n  protected dependencies: Plugin[] = [];\n  protected requiresInterception = false;\n\n  get isInitialized() { return this.initialized; }\n  get isStopped() { return this.startCounter === 0; }\n\n  protected async addDependency(plugin: Plugin) {\n    this.dependencies.push(plugin);\n  }\n\n  async init(browser: Puppeteer.Browser) {\n    if (this.initialized) return;\n\n    this.browser = browser;\n\n    const offOnClose: (() => void)[] = [];\n    browserEvents.once('close', async () => {\n      offOnClose.forEach(fn => fn());\n\n      this.browser = null;\n      this.initialized = false;\n      this.startCounter = 0;\n\n      await this.onClose();\n    });\n\n    this.startCounter++;\n\n    const thisOnTargetCreated = this.onTargetCreated.bind(this);\n    browser.on('targetcreated', thisOnTargetCreated);\n    offOnClose.push(() => browser.off('targetcreated', thisOnTargetCreated));\n\n    this.initialized = true;\n\n    this.dependencies.forEach(x => x.init(browser));\n\n    return this.afterLaunch(browser);\n  }\n\n  protected async afterLaunch(_browser: Puppeteer.Browser) { }\n  protected async onClose() { }\n\n  protected async onTargetCreated(target: Puppeteer.Target) {\n    if (this.isStopped) return;\n\n    if (target.type() !== 'page') return;\n    const page = await target.page() as Puppeteer.Page;\n    if (page.isClosed()) return;\n\n    const offOnClose: (() => void)[] = [];\n    page.once('close', async () => {\n      offOnClose.forEach(fn => fn());\n    });\n\n    const requestHandlers: ((request: any) => void)[] = [];\n    page.on('request', request => {\n      const _respond = request.respond;\n      let responded = 0;\n      let respondArgs: IArguments;\n\n      const _abort = request.abort;\n      let aborted = 0;\n      let abortArgs: IArguments;\n\n      const _continue = request.continue;\n      let continued = 0;\n      let continueArgs: IArguments;\n\n      // tslint:disable-next-line: only-arrow-functions\n      const handleRequest = async function () {\n        const total = responded + aborted + continued;\n\n        if (!(request as any)._interceptionHandled) {\n          if (responded === 1) await _respond.apply(request, respondArgs);\n          else if (responded === 0 && aborted >= 1 && total === requestHandlers.length) await _abort.apply(request, abortArgs);\n          else if (continued === requestHandlers.length) await _continue.apply(request, continueArgs);\n        }\n      };\n\n      // tslint:disable-next-line: only-arrow-functions\n      request.respond = async function () { responded++; respondArgs = respondArgs || arguments; await handleRequest(); };\n      // tslint:disable-next-line: only-arrow-functions\n      request.abort = async function () { aborted++; abortArgs = abortArgs || arguments; await handleRequest(); };\n      // tslint:disable-next-line: only-arrow-functions\n      request.continue = async function () { continued++; continueArgs = continueArgs || arguments; await handleRequest(); };\n\n      requestHandlers.forEach(handler => handler(request));\n    });\n\n    const _pageOn = page.on;\n    page.on = function async(eventName, handler) {\n      if (eventName === 'request') {\n        requestHandlers.push(handler);\n\n        return page;\n      } else {\n        return _pageOn.call(page, eventName, handler);\n      }\n    };\n\n    if (this.requiresInterception) {\n      await page.setRequestInterception(true);\n\n      const thisOnRequest = this.onRequest.bind(this);\n      page.on('request', thisOnRequest);\n      offOnClose.push(() => page.off('request', thisOnRequest));\n    }\n\n    const thisOnDialog = this.onDialog.bind(this);\n    page.on('dialog', thisOnDialog);\n    offOnClose.push(() => page.off('dialog', thisOnDialog));\n\n    await this.onPageCreated(page);\n  }\n  protected async onPageCreated(_page: Puppeteer.Page) { }\n\n  protected async onRequest(request: Puppeteer.HTTPRequest) {\n    const interceptionHandled = (request as any)._interceptionHandled;\n    if (interceptionHandled) return;\n    if (this.isStopped) return request.continue();\n\n    await this.processRequest(request);\n  }\n  protected async processRequest(_request: Puppeteer.HTTPRequest) { }\n\n  protected async onDialog(dialog: Puppeteer.Dialog) {\n    const handled = (dialog as any)._handled;\n\n    if (handled) return;\n    if (this.isStopped) return;\n\n    await this.processDialog(dialog);\n  }\n  protected async processDialog(_dialog: Puppeteer.Dialog) { }\n\n  protected async beforeRestart() { }\n  async restart() {\n    await this.beforeRestart();\n\n    this.startCounter++;\n    if (this.requiresInterception) interceptions++;\n\n    this.dependencies.forEach(x => x.restart());\n\n    await this.afterRestart();\n  }\n  protected async afterRestart() { }\n\n  protected async beforeStop() { }\n  async stop() {\n    await this.beforeStop();\n\n    this.startCounter--;\n    if (this.requiresInterception) interceptions--;\n\n    if (interceptions === 0 && this.browser) {\n      const pages = await this.browser.pages();\n\n      pages.filter(x => !x.isClosed()).forEach(async (page: Puppeteer.Page) => {\n        await page.setRequestInterception(false);\n      });\n    }\n\n    this.dependencies.forEach(x => x.stop());\n\n    await this.afterStop();\n  }\n  protected async afterStop() { }\n\n  protected async getFirstPage() {\n    if (!this.browser) return null;\n\n    const pages = await this.browser.pages();\n    const openPages = pages.filter(x => !x.isClosed());\n    const activePages = pages.filter(x => x.url() !== 'about:blank');\n\n    return activePages[0] || openPages[0];\n  }\n}\n\nlet plugins: Plugin[] = [];\nexport function addPlugin(plugin: Plugin) { plugins.push(plugin); }\nexport async function clearPlugins() {\n  plugins.forEach(async plugin => {\n    await plugin.stop();\n  });\n\n  plugins = [];\n}\n\nimport { AnonymizeUserAgentPlugin } from './plugins/anonymize.user.agent/index';\nexport function anonymizeUserAgent(): AnonymizeUserAgentPlugin {\n  const plugin = new AnonymizeUserAgentPlugin();\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { AvoidDetectionPlugin } from './plugins/avoid.detection';\nexport function avoidDetection(): AvoidDetectionPlugin {\n  const plugin = new AvoidDetectionPlugin();\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { BlockResourcesPlugin, Resource } from './plugins/block.resources';\nexport function blockResources(...resources: Resource[]): BlockResourcesPlugin {\n  const plugin = new BlockResourcesPlugin(resources);\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { DisableDialogsPlugin } from './plugins/disable.dialogs';\nexport function disableDialogs(logMessages = false): DisableDialogsPlugin {\n  const plugin = new DisableDialogsPlugin(logMessages);\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { ManageCookiesPlugin, ManageCookiesOption } from './plugins/manage.cookies';\nexport function manageCookies(opts: ManageCookiesOption): ManageCookiesPlugin {\n  const plugin = new ManageCookiesPlugin(opts);\n  plugins.push(plugin);\n  return plugin;\n}\n\nimport { SolveRecaptchaPlugin } from './plugins/solve.recaptcha';\nexport function solveRecaptchas(accessToken: string): SolveRecaptchaPlugin {\n  const plugin = new SolveRecaptchaPlugin(accessToken);\n  plugins.push(plugin);\n  return plugin;\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puppeteer-pro",
-  "version": "1.3.1",
+  "version": "1.5.1",
   "description": "A simple puppeteer wrapper to enable useful plugins with ease",
   "main": "index.js",
   "scripts": {
@@ -34,15 +34,22 @@
   "engines": {
     "node": ">=10.0.0"
   },
+  "dependencies": {
+    "axios": "^0.25.0",
+    "ghost-cursor": "^1.1.6",
+    "user-agents": "^1.0.906"
+  },
   "devDependencies": {
-    "@types/node": "^14.14.35",
+    "@types/node": "^17.0.10",
+    "@types/user-agents": "^1.0.2",
     "chai": "^4.3.4",
-    "copyfiles": "^2.2.0",
-    "eslint": "^7.22.0",
-    "mocha": "^8.3.2",
-    "puppeteer": "^9.0.0",
+    "copyfiles": "^2.4.1",
+    "dotenv-safe": "^8.2.0",
+    "eslint": "^8.7.0",
+    "mocha": "^9.2.0",
+    "puppeteer": "^13.1.1",
     "rimraf": "^3.0.2",
-    "tslint": "^6.1.1",
-    "typescript": "^4.0.2"
+    "tslint": "^6.1.3",
+    "typescript": "^4.5.5"
   }
 }

package/plugins/anonymize.user.agent/index.d.ts

@@ -2,6 +2,8 @@ import * as Puppeteer from 'puppeteer';
 import { Plugin } from '../../index';
 export declare class AnonymizeUserAgentPlugin extends Plugin {
     private pages;
+    private userAgent?;
+    constructor();
     protected afterLaunch(browser: Puppeteer.Browser): Promise<void>;
     protected onClose(): Promise<void>;
     protected onPageCreated(page: Puppeteer.Page): Promise<void>;

package/plugins/anonymize.user.agent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/anonymize.user.agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAUrC,qBAAa,wBAAyB,SAAQ,MAAM;IAClD,OAAO,CAAC,KAAK,CAAuB;cAEpB,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO;cAStC,OAAO;cAIP,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI;cAWlC,aAAa;cAQb,SAAS;CAO1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/anonymize.user.agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAUrC,qBAAa,wBAAyB,SAAQ,MAAM;IAClD,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,SAAS,CAAC,CAAS;;cAaX,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO;cAStC,OAAO;cAIP,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI;cASlC,aAAa;cAQb,SAAS;CAO1B"}

package/plugins/anonymize.user.agent/index.js

@@ -1,11 +1,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnonymizeUserAgentPlugin = void 0;
+const UserAgent = require("user-agents");
 const index_1 = require("../../index");
 const sleep = (time) => { return new Promise(resolve => { setTimeout(resolve, time); }); };
 class AnonymizeUserAgentPlugin extends index_1.Plugin {
     constructor() {
-        super(...arguments);
+        super();
         this.pages = [];
+        try {
+            this.userAgent = new UserAgent({ vendor: 'Google Inc.', platform: 'Win32' }).toString();
+        }
+        catch (ex) {
+            console.warn('Could not create a random user agent');
+        }
     }
     async afterLaunch(browser) {
         const _newPage = browser.newPage;
@@ -20,9 +27,7 @@ class AnonymizeUserAgentPlugin extends index_1.Plugin {
     }
     async onPageCreated(page) {
         const userAgent = await page.browser().userAgent();
-        const newUserAgent = userAgent
-            .replace('HeadlessChrome/', 'Chrome/')
-            .replace(/\(([^)]+)\)/, '(Windows NT 10.0; Win64; x64)');
+        const newUserAgent = this.userAgent || userAgent.replace('HeadlessChrome/', 'Chrome/').replace(/\(([^)]+)\)/, '(Windows NT 10.0; Win64; x64)');
         this.pages.push({ target: page, userAgent, newUserAgent });
         await page.setUserAgent(newUserAgent);
     }

package/plugins/anonymize.user.agent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/anonymize.user.agent/index.ts"],"names":[],"mappings":";;AAEA,uCAAqC;AAErC,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAQnG,MAAa,wBAAyB,SAAQ,cAAM;IAApD;;QACU,UAAK,GAAoB,EAAE,CAAC;IAyCtC,CAAC;IAvCW,KAAK,CAAC,WAAW,CAAC,OAA0B;QACpD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QACjC,OAAO,CAAC,OAAO,GAAG,KAAK,IAA6B,EAAE;YACpD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,mCAAmC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,OAAO;QACrB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,IAAoB;QAChD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,CAAC;QACnD,MAAM,YAAY,GAAG,SAAS;aAC3B,OAAO,CAAC,iBAAiB,EAAE,SAAS,CAAC;aACrC,OAAO,CAAC,aAAa,EAAE,+BAA+B,CAAC,CAAC;QAE3D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;QAE3D,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAES,KAAK,CAAC,aAAa;QAC3B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAAE,SAAS;YAErC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACnD;IACH,CAAC;IAES,KAAK,CAAC,SAAS;QACvB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAAE,SAAS;YAErC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAChD;IACH,CAAC;CACF;AA1CD,4DA0CC","sourcesContent":["import * as Puppeteer from 'puppeteer';\n\nimport { Plugin } from '../../index';\n\nconst sleep = (time: number) => { return new Promise(resolve => { setTimeout(resolve, time); }); };\n\ninterface PageUserAgent {\n  target: Puppeteer.Page;\n  userAgent: string;\n  newUserAgent: string;\n}\n\nexport class AnonymizeUserAgentPlugin extends Plugin {\n  private pages: PageUserAgent[] = [];\n\n  protected async afterLaunch(browser: Puppeteer.Browser) {\n    const _newPage = browser.newPage;\n    browser.newPage = async (): Promise<Puppeteer.Page> => {\n      const page = await _newPage.apply(browser);\n      await sleep(100); // Sleep to allow user agent to set\n      return page;\n    };\n  }\n\n  protected async onClose() {\n    this.pages = [];\n  }\n\n  protected async onPageCreated(page: Puppeteer.Page) {\n    const userAgent = await page.browser().userAgent();\n    const newUserAgent = userAgent\n      .replace('HeadlessChrome/', 'Chrome/')\n      .replace(/\\(([^)]+)\\)/, '(Windows NT 10.0; Win64; x64)');\n\n    this.pages.push({ target: page, userAgent, newUserAgent });\n\n    await page.setUserAgent(newUserAgent);\n  }\n\n  protected async beforeRestart() {\n    for (const page of this.pages) {\n      if (page.target.isClosed()) continue;\n\n      await page.target.setUserAgent(page.newUserAgent);\n    }\n  }\n\n  protected async afterStop() {\n    for (const page of this.pages) {\n      if (page.target.isClosed()) continue;\n\n      await page.target.setUserAgent(page.userAgent);\n    }\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/anonymize.user.agent/index.ts"],"names":[],"mappings":";;AACA,yCAA0C;AAE1C,uCAAqC;AAErC,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAQnG,MAAa,wBAAyB,SAAQ,cAAM;IAIlD;QACE,KAAK,EAAE,CAAC;QAJF,UAAK,GAAoB,EAAE,CAAC;QAMlC,IAAI;YACF,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;SACzF;QACD,OAAO,EAAE,EAAE;YACT,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;SACtD;IACH,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,OAA0B;QACpD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QACjC,OAAO,CAAC,OAAO,GAAG,KAAK,IAA6B,EAAE;YACpD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,mCAAmC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,OAAO;QACrB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,IAAoB;QAChD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,+BAA+B,CAAC,CAAC;QAE/I,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;QAE3D,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAES,KAAK,CAAC,aAAa;QAC3B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAAE,SAAS;YAErC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACnD;IACH,CAAC;IAES,KAAK,CAAC,SAAS;QACvB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAAE,SAAS;YAErC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAChD;IACH,CAAC;CACF;AApDD,4DAoDC","sourcesContent":["import * as Puppeteer from 'puppeteer';\nimport UserAgent = require('user-agents');\n\nimport { Plugin } from '../../index';\n\nconst sleep = (time: number) => { return new Promise(resolve => { setTimeout(resolve, time); }); };\n\ninterface PageUserAgent {\n  target: Puppeteer.Page;\n  userAgent: string;\n  newUserAgent: string;\n}\n\nexport class AnonymizeUserAgentPlugin extends Plugin {\n  private pages: PageUserAgent[] = [];\n  private userAgent?: string;\n\n  constructor() {\n    super();\n\n    try {\n      this.userAgent = new UserAgent({ vendor: 'Google Inc.', platform: 'Win32' }).toString();\n    }\n    catch (ex) {\n      console.warn('Could not create a random user agent');\n    }\n  }\n\n  protected async afterLaunch(browser: Puppeteer.Browser) {\n    const _newPage = browser.newPage;\n    browser.newPage = async (): Promise<Puppeteer.Page> => {\n      const page = await _newPage.apply(browser);\n      await sleep(100); // Sleep to allow user agent to set\n      return page;\n    };\n  }\n\n  protected async onClose() {\n    this.pages = [];\n  }\n\n  protected async onPageCreated(page: Puppeteer.Page) {\n    const userAgent = await page.browser().userAgent();\n    const newUserAgent = this.userAgent || userAgent.replace('HeadlessChrome/', 'Chrome/').replace(/\\(([^)]+)\\)/, '(Windows NT 10.0; Win64; x64)');\n\n    this.pages.push({ target: page, userAgent, newUserAgent });\n\n    await page.setUserAgent(newUserAgent);\n  }\n\n  protected async beforeRestart() {\n    for (const page of this.pages) {\n      if (page.target.isClosed()) continue;\n\n      await page.target.setUserAgent(page.newUserAgent);\n    }\n  }\n\n  protected async afterStop() {\n    for (const page of this.pages) {\n      if (page.target.isClosed()) continue;\n\n      await page.target.setUserAgent(page.userAgent);\n    }\n  }\n}\n"]}

package/plugins/avoid.detection/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/avoid.detection/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAK3E,qBAAa,oBAAqB,SAAQ,MAAM;IAC9C,YAAY,6BAAoC;cAEhC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI;CASnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/avoid.detection/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAK3E,qBAAa,oBAAqB,SAAQ,MAAM;IAC9C,YAAY,6BAAoC;cAEhC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI;CAKnD"}

package/plugins/avoid.detection/index.js

@@ -12,11 +12,8 @@ class AvoidDetectionPlugin extends index_1.Plugin {
         this.dependencies = [new index_2.AnonymizeUserAgentPlugin()];
     }
     async onPageCreated(page) {
-        if (!page._pageBindings.has('isStopped')) {
-            await page.exposeFunction('isStopped', () => this.isStopped);
-        }
         for (const injection of injections) {
-            if (!page.isClosed())
+            if (!this.isStopped && !page.isClosed())
                 await page.evaluateOnNewDocument(injection);
         }
     }

package/plugins/avoid.detection/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/avoid.detection/index.ts"],"names":[],"mappings":";;AAAA,yBAAyB;AACzB,6BAA6B;AAG7B,uCAAqC;AACrC,2DAA2E;AAE3E,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,SAAS,aAAa,CAAC,CAAC;AACjE,MAAM,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,gBAAgB,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC;AAEhH,MAAa,oBAAqB,SAAQ,cAAM;IAAhD;;QACE,iBAAY,GAAG,CAAC,IAAI,gCAAwB,EAAE,CAAC,CAAC;IAWlD,CAAC;IATW,KAAK,CAAC,aAAa,CAAC,IAAoB;QAChD,IAAI,CAAE,IAAY,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACjD,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9D;QAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAAE,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;SACnE;IACH,CAAC;CACF;AAZD,oDAYC","sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\nimport * as Puppeteer from 'puppeteer';\n\nimport { Plugin } from '../../index';\nimport { AnonymizeUserAgentPlugin } from './../anonymize.user.agent/index';\n\nconst injectionsFolder = path.resolve(`${__dirname}/injections`);\nconst injections = fs.readdirSync(injectionsFolder).map(fileName => require(`${injectionsFolder}/${fileName}`));\n\nexport class AvoidDetectionPlugin extends Plugin {\n  dependencies = [new AnonymizeUserAgentPlugin()];\n\n  protected async onPageCreated(page: Puppeteer.Page) {\n    if (!(page as any)._pageBindings.has('isStopped')) {\n      await page.exposeFunction('isStopped', () => this.isStopped);\n    }\n\n    for (const injection of injections) {\n      if (!page.isClosed()) await page.evaluateOnNewDocument(injection);\n    }\n  }\n}"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/avoid.detection/index.ts"],"names":[],"mappings":";;AAAA,yBAAyB;AACzB,6BAA6B;AAG7B,uCAAqC;AACrC,2DAA2E;AAE3E,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,SAAS,aAAa,CAAC,CAAC;AACjE,MAAM,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,gBAAgB,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC;AAEhH,MAAa,oBAAqB,SAAQ,cAAM;IAAhD;;QACE,iBAAY,GAAG,CAAC,IAAI,gCAAwB,EAAE,CAAC,CAAC;IAOlD,CAAC;IALW,KAAK,CAAC,aAAa,CAAC,IAAoB;QAChD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAAE,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;SACtF;IACH,CAAC;CACF;AARD,oDAQC","sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\nimport * as Puppeteer from 'puppeteer';\n\nimport { Plugin } from '../../index';\nimport { AnonymizeUserAgentPlugin } from './../anonymize.user.agent/index';\n\nconst injectionsFolder = path.resolve(`${__dirname}/injections`);\nconst injections = fs.readdirSync(injectionsFolder).map(fileName => require(`${injectionsFolder}/${fileName}`));\n\nexport class AvoidDetectionPlugin extends Plugin {\n  dependencies = [new AnonymizeUserAgentPlugin()];\n\n  protected async onPageCreated(page: Puppeteer.Page) {\n    for (const injection of injections) {\n      if (!this.isStopped && !page.isClosed()) await page.evaluateOnNewDocument(injection);\n    }\n  }\n}"]}

package/plugins/avoid.detection/injections/chrome.runtime.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     window.chrome = { runtime: {} };
   } catch (ex) { null; }

package/plugins/avoid.detection/injections/console.debug.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     console.debug = () => { return null; };
   } catch (ex) { null; }

package/plugins/avoid.detection/injections/hairline.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     const elementDescriptor = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'offsetHeight');
 

package/plugins/avoid.detection/injections/navigator.languages.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     Object.defineProperty(Object.getPrototypeOf(navigator), 'languages', { get: () => ['en-US', 'en'] });
   } catch (ex) { null; }

package/plugins/avoid.detection/injections/navigator.permissions.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     const _query = window.navigator.permissions.query;
     const permissionsPrototype = Object.getPrototypeOf(window.navigator.permissions);

package/plugins/avoid.detection/injections/navigator.plugins.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     const hasPlugins = navigator.plugins && navigator.plugins.length > 0;
 

package/plugins/avoid.detection/injections/navigator.webdriver.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     const navigatePrototype = Object.getPrototypeOf(navigator);
     delete navigatePrototype.webdriver;

package/plugins/avoid.detection/injections/webgl.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     const _getParameter = WebGLRenderingContext.getParameter;
     WebGLRenderingContext.prototype.getParameter = parameter => {

package/plugins/avoid.detection/injections/window.js

@@ -1,6 +1,4 @@
-module.exports = async () => {
-  if (await window.isStopped()) return;
-
+module.exports = () => {
   try {
     if (!(window.outerWidth && window.outerHeight)) {
       window.outerWidth = window.innerWidth;

package/plugins/solve.recaptcha/index.d.ts

@@ -0,0 +1,11 @@
+import * as Puppeteer from 'puppeteer';
+import { Plugin } from '../../index';
+import { AvoidDetectionPlugin } from './../avoid.detection/index';
+export declare class SolveRecaptchaPlugin extends Plugin {
+    dependencies: AvoidDetectionPlugin[];
+    witAiAccessToken?: string;
+    constructor(witAiAccessToken: string);
+    hasCaptcha(page: Puppeteer.Page): Promise<boolean>;
+    solveRecaptcha(page: Puppeteer.Page): Promise<void>;
+}
+//# sourceMappingURL=index.d.ts.map

package/plugins/solve.recaptcha/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/solve.recaptcha/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAKlE,qBAAa,oBAAqB,SAAQ,MAAM;IAC9C,YAAY,yBAAgC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC;gBAEd,gBAAgB,EAAE,MAAM;IAK9B,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI;IAI/B,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI;CAgE1C"}

package/plugins/solve.recaptcha/index.js

@@ -0,0 +1,82 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolveRecaptchaPlugin = void 0;
+const axios_1 = require("axios");
+const path = require("path");
+const ghost_cursor_1 = require("ghost-cursor");
+const index_1 = require("../../index");
+const index_2 = require("./../avoid.detection/index");
+const injection = require(path.resolve(`${__dirname}/injections`) + '/utils.js'); // tslint:disable-line: no-var-requires
+const randomBetween = (min, max) => Math.floor(Math.random() * (max - min)) + min;
+class SolveRecaptchaPlugin extends index_1.Plugin {
+    constructor(witAiAccessToken) {
+        super();
+        this.dependencies = [new index_2.AvoidDetectionPlugin()];
+        this.witAiAccessToken = witAiAccessToken;
+    }
+    async hasCaptcha(page) {
+        return page.evaluate(() => { var _a, _b; return !!((_b = (_a = document.querySelector('iframe[src*="api2/anchor"]')) === null || _a === void 0 ? void 0 : _a.contentDocument) === null || _b === void 0 ? void 0 : _b.querySelector('#recaptcha-anchor')); });
+    }
+    async solveRecaptcha(page) {
+        var _a;
+        if (this.isStopped)
+            return;
+        if (!this.witAiAccessToken)
+            return;
+        if (!(await this.hasCaptcha(page)))
+            return;
+        const cursor = (0, ghost_cursor_1.createCursor)(page);
+        async function waitForSelector(iframeUrlIncludes, selector) {
+            await page.waitForFunction((_iframeUrlIncludes, _selector) => { var _a, _b; return (_b = (_a = document.querySelector(`iframe[src*="${_iframeUrlIncludes}"]`)) === null || _a === void 0 ? void 0 : _a.contentDocument) === null || _b === void 0 ? void 0 : _b.querySelector(_selector); }, {}, iframeUrlIncludes, selector);
+        }
+        async function findAndClick(iframeUrlIncludes, selector) {
+            var _a;
+            await waitForSelector(iframeUrlIncludes, selector);
+            const element = await ((_a = page.frames().find(frame => frame.url().includes(iframeUrlIncludes))) === null || _a === void 0 ? void 0 : _a.$(selector));
+            if (!element)
+                return;
+            await sleep(randomBetween(1 * 1000, 3 * 1000));
+            await cursor.click(element);
+        }
+        let numTriesLeft = 5;
+        async function isFinished() {
+            if (--numTriesLeft === 0)
+                return true;
+            return page.evaluate(() => { var _a, _b; return !!((_b = (_a = document.querySelector('iframe[src*="api2/anchor"]')) === null || _a === void 0 ? void 0 : _a.contentDocument) === null || _b === void 0 ? void 0 : _b.querySelector('.recaptcha-checkbox-checked')); });
+        }
+        await findAndClick('api2/anchor', '#recaptcha-anchor');
+        await findAndClick('api2/bframe', '.rc-button-audio');
+        while (!(await isFinished())) {
+            await waitForSelector('api2/bframe', '.rc-audiochallenge-tdownload-link');
+            const audioUrl = await page.evaluate(async () => {
+                var _a, _b, _c;
+                return (_c = (_b = (_a = document.querySelector('iframe[src*="api2/bframe"]')) === null || _a === void 0 ? void 0 : _a.contentDocument) === null || _b === void 0 ? void 0 : _b.querySelector('.rc-audiochallenge-tdownload-link')) === null || _c === void 0 ? void 0 : _c.href;
+            });
+            if (!audioUrl)
+                return;
+            const audioArray = await page.evaluate(injection, audioUrl);
+            if (!audioArray)
+                return;
+            const audioBuffer = Buffer.from(new Int8Array(audioArray));
+            const response = await axios_1.default.post('https://api.wit.ai/speech?v=20210701', audioBuffer, {
+                headers: {
+                    'Authorization': `Bearer ${this.witAiAccessToken}`,
+                    'Content-Type': 'audio/wav'
+                }
+            });
+            if (response.data.text) {
+                const responseInput = await ((_a = page.frames().find(frame => frame.url().includes('api2/bframe'))) === null || _a === void 0 ? void 0 : _a.$('#audio-response'));
+                responseInput === null || responseInput === void 0 ? void 0 : responseInput.type(response.data.text);
+                await findAndClick('api2/bframe', '#recaptcha-verify-button');
+                await sleep(1000);
+            }
+            else {
+                await findAndClick('api2/bframe', '#recaptcha-reload-button');
+            }
+        }
+    }
+}
+exports.SolveRecaptchaPlugin = SolveRecaptchaPlugin;
+function sleep(timeout) {
+    return new Promise(resolve => setTimeout(resolve, timeout));
+}
+//# sourceMappingURL=index.js.map

package/plugins/solve.recaptcha/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/solve.recaptcha/index.ts"],"names":[],"mappings":"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","sourcesContent":["import axios from 'axios';\nimport * as path from 'path';\nimport * as Puppeteer from 'puppeteer';\nimport { createCursor } from 'ghost-cursor';\n\nimport { Plugin } from '../../index';\nimport { AvoidDetectionPlugin } from './../avoid.detection/index';\n\nconst injection = require(path.resolve(`${__dirname}/injections`) + '/utils.js');// tslint:disable-line: no-var-requires\nconst randomBetween = (min: number, max: number) => Math.floor(Math.random() * (max - min)) + min;\n\nexport class SolveRecaptchaPlugin extends Plugin {\n  dependencies = [new AvoidDetectionPlugin()];\n  witAiAccessToken?: string;\n\n  constructor(witAiAccessToken: string) {\n    super();\n    this.witAiAccessToken = witAiAccessToken;\n  }\n\n  async hasCaptcha(page: Puppeteer.Page) {\n    return page.evaluate(() => !!document.querySelector<HTMLIFrameElement>('iframe[src*=\"api2/anchor\"]')?.contentDocument?.querySelector('#recaptcha-anchor'));\n  }\n\n  async solveRecaptcha(page: Puppeteer.Page) {\n    if (this.isStopped) return;\n    if (!this.witAiAccessToken) return;\n    if (!(await this.hasCaptcha(page))) return;\n\n    const cursor = createCursor(page);\n\n    async function waitForSelector(iframeUrlIncludes: string, selector: string) {\n      await page.waitForFunction((_iframeUrlIncludes: string, _selector: string) => document.querySelector<HTMLIFrameElement>(`iframe[src*=\"${_iframeUrlIncludes}\"]`)?.contentDocument?.querySelector(_selector), {}, iframeUrlIncludes, selector);\n    }\n\n    async function findAndClick(iframeUrlIncludes: string, selector: string) {\n      await waitForSelector(iframeUrlIncludes, selector);\n\n      const element = await page.frames().find(frame => frame.url().includes(iframeUrlIncludes))?.$(selector);\n      if (!element) return;\n\n      await sleep(randomBetween(1 * 1000, 3 * 1000));\n      await cursor.click(element);\n    }\n\n    let numTriesLeft = 5;\n    async function isFinished() {\n      if (--numTriesLeft === 0) return true;\n      return page.evaluate(() => !!document.querySelector<HTMLIFrameElement>('iframe[src*=\"api2/anchor\"]')?.contentDocument?.querySelector('.recaptcha-checkbox-checked'));\n    }\n\n    await findAndClick('api2/anchor', '#recaptcha-anchor');\n    await findAndClick('api2/bframe', '.rc-button-audio');\n\n    while (!(await isFinished())) {\n      await waitForSelector('api2/bframe', '.rc-audiochallenge-tdownload-link');\n\n      const audioUrl = await page.evaluate(async () => {\n        return document.querySelector<HTMLIFrameElement>('iframe[src*=\"api2/bframe\"]')?.contentDocument?.querySelector<HTMLLinkElement>('.rc-audiochallenge-tdownload-link')?.href;\n      });\n\n      if (!audioUrl) return;\n\n      const audioArray = await page.evaluate(injection, audioUrl);\n\n      if (!audioArray) return;\n\n      const audioBuffer = Buffer.from(new Int8Array(audioArray));\n\n      const response = await axios.post<any>('https://api.wit.ai/speech?v=20210701', audioBuffer, {\n        headers: {\n          'Authorization': `Bearer ${this.witAiAccessToken}`,\n          'Content-Type': 'audio/wav'\n        }\n      });\n\n      if (response.data.text) {\n        const responseInput = await page.frames().find(frame => frame.url().includes('api2/bframe'))?.$('#audio-response');\n        responseInput?.type(response.data.text);\n\n        await findAndClick('api2/bframe', '#recaptcha-verify-button');\n\n        await sleep(1000);\n      } else {\n        await findAndClick('api2/bframe', '#recaptcha-reload-button');\n      }\n    }\n  }\n}\n\nfunction sleep(timeout: number) {\n  return new Promise(resolve => setTimeout(resolve, timeout));\n}"]}

package/plugins/solve.recaptcha/injections/utils.js

@@ -0,0 +1,145 @@
+module.exports = async (audioUrl) => {
+  // Credit to https://github.com/dessant/buster
+  const normalizeAudio = async function (buffer) {
+    const ctx = new AudioContext();
+    const audioBuffer = await ctx.decodeAudioData(buffer);
+    ctx.close();
+
+    const offlineCtx = new OfflineAudioContext(1, audioBuffer.duration * 16000, 16000);
+    const source = offlineCtx.createBufferSource();
+    source.connect(offlineCtx.destination);
+    source.buffer = audioBuffer;
+    source.start();
+
+    return offlineCtx.startRendering();
+  };
+
+  const sliceAudio = function ({ audioBuffer, start, end }) {
+    const sampleRate = audioBuffer.sampleRate;
+    const channels = audioBuffer.numberOfChannels;
+
+    const startOffset = sampleRate * start;
+    const endOffset = sampleRate * end;
+    const frameCount = endOffset - startOffset;
+
+    const ctx = new AudioContext();
+    const audioSlice = ctx.createBuffer(channels, frameCount, sampleRate);
+    ctx.close();
+
+    const tempArray = new Float32Array(frameCount);
+    for (var channel = 0; channel < channels; channel++) {
+      audioBuffer.copyFromChannel(tempArray, channel, startOffset);
+      audioSlice.copyToChannel(tempArray, channel, 0);
+    }
+
+    return audioSlice;
+  };
+
+  // Credit to https://github.com/Jam3/audiobuffer-to-wav
+  const audioBufferToWav = function (buffer, opt) {
+    opt = opt || {};
+
+    var numChannels = buffer.numberOfChannels;
+    var sampleRate = buffer.sampleRate;
+    var format = opt.float32 ? 3 : 1;
+    var bitDepth = format === 3 ? 32 : 16;
+
+    var result;
+    if (numChannels === 2) {
+      result = _.interleave(buffer.getChannelData(0), buffer.getChannelData(1));
+    } else {
+      result = buffer.getChannelData(0);
+    }
+
+    return _.encodeWAV(result, format, sampleRate, numChannels, bitDepth);
+  };
+
+  const _ = {
+    encodeWAV: (samples, format, sampleRate, numChannels, bitDepth) => {
+      var bytesPerSample = bitDepth / 8;
+      var blockAlign = numChannels * bytesPerSample;
+
+      var buffer = new ArrayBuffer(44 + samples.length * bytesPerSample);
+      var view = new DataView(buffer);
+
+      /* RIFF identifier */
+      _.writeString(view, 0, 'RIFF');
+      /* RIFF chunk length */
+      view.setUint32(4, 36 + samples.length * bytesPerSample, true);
+      /* RIFF type */
+      _.writeString(view, 8, 'WAVE');
+      /* format chunk identifier */
+      _.writeString(view, 12, 'fmt ');
+      /* format chunk length */
+      view.setUint32(16, 16, true);
+      /* sample format (raw) */
+      view.setUint16(20, format, true);
+      /* channel count */
+      view.setUint16(22, numChannels, true);
+      /* sample rate */
+      view.setUint32(24, sampleRate, true);
+      /* byte rate (sample rate * block align) */
+      view.setUint32(28, sampleRate * blockAlign, true);
+      /* block align (channel count * bytes per sample) */
+      view.setUint16(32, blockAlign, true);
+      /* bits per sample */
+      view.setUint16(34, bitDepth, true);
+      /* data chunk identifier */
+      _.writeString(view, 36, 'data');
+      /* data chunk length */
+      view.setUint32(40, samples.length * bytesPerSample, true);
+      if (format === 1) { // Raw PCM
+        _.floatTo16BitPCM(view, 44, samples);
+      } else {
+        _.writeFloat32(view, 44, samples);
+      }
+
+      return buffer;
+    },
+    interleave: (inputL, inputR) => {
+      var length = inputL.length + inputR.length;
+      var result = new Float32Array(length);
+
+      var index = 0;
+      var inputIndex = 0;
+
+      while (index < length) {
+        result[index++] = inputL[inputIndex];
+        result[index++] = inputR[inputIndex];
+        inputIndex++;
+      }
+      return result;
+    },
+    writeFloat32: (output, offset, input) => {
+      for (var i = 0; i < input.length; i++, offset += 4) {
+        output.setFloat32(offset, input[i], true);
+      }
+    },
+    floatTo16BitPCM: (output, offset, input) => {
+      for (var i = 0; i < input.length; i++, offset += 2) {
+        var s = Math.max(-1, Math.min(1, input[i]));
+        output.setInt16(offset, s < 0 ? s * 0x8000 : s * 0x7FFF, true);
+      }
+    },
+    writeString: (view, offset, string) => {
+      for (var i = 0; i < string.length; i++) {
+        view.setUint8(offset + i, string.charCodeAt(i));
+      }
+    }
+  };
+
+  const audioResponse = await fetch(audioUrl, { referrer: '' });
+  const audio = await audioResponse.arrayBuffer();
+
+  const _audioBuffer = await normalizeAudio(audio);
+
+  const audioSlice = sliceAudio({
+    audioBuffer: _audioBuffer,
+    start: 1.5,
+    end: _audioBuffer.duration - 1.5
+  });
+
+  const wav = audioBufferToWav(audioSlice);
+
+  return [...new Int8Array(wav)];
+};