fix: 修复puppeteer的API变动而失效的问题

axetroy · Oct 24, 2017 · 0ef0493 · 0ef0493
1 parent a701785
commit 0ef0493
Show file tree

Hide file tree

Showing 38 changed files with 303 additions and 621 deletions.
diff --git a/app/app.js b/app/app.js
@@ -1,6 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 const puppeteer = require('puppeteer');
+const pTimeout = require('p-timeout');
+const chalk = require('chalk');
 const config = require('./config');
 const util = require('./utils');
 
@@ -20,7 +22,10 @@ class App {
 
     while (files.length) {
       const file = files.shift();
-      this.provider(require(path.join(dir, file)));
+      const absFilePath = path.join(dir, file);
+      const Provider = require(absFilePath);
+      Provider.file = absFilePath;
+      this.provider(Provider);
     }
 
     return this;
@@ -29,6 +34,7 @@ class App {
     // open the browser
     this.browser = await puppeteer.launch({
       headless: config.isProduction
+      // devtools: true
     });
 
     // create a new tab
@@ -59,39 +65,20 @@ class App {
 
         await this.page.evaluate(() => {
           const title = document.title;
-          window.addEventListener('mousemove', e => {
-            document.title = `(${e.x},${e.y})${title}`;
-          });
+          window.addEventListener('mousemove', e => (document.title = `(${e.x},${e.y})${title}`));
         });
 
         await this.page.deleteCookie();
 
-        // 如果resolve超过xxx秒，则认为是超时，不会无限等待
-        await new Promise(async (resolve, reject) => {
-          let haveResponse = false;
-          entity
-            .resolve(this)
-            .then(() => {
-              if (haveResponse === false) {
-                haveResponse = true;
-                this.__timer__ && clearTimeout(this.__timer__);
-                resolve();
-              }
-            })
-            .catch(err => {
-              if (haveResponse === false) {
-                haveResponse = true;
-                this.__timer__ && clearTimeout(this.__timer__);
-                reject(err);
-              }
-            });
-          this.__timer__ = setTimeout(() => {
-            if (haveResponse === false) {
-              reject(new Error(`Resolve time out...`));
-            }
-            this.__timer__ && clearTimeout(this.__timer__);
-          }, 1000 * 60);
-        });
+        // 60s超时用于处理发送短信，不会导致无线等待的情况...
+        await pTimeout(entity.resolve(this), 1000 * 60)
+          .then(() => {
+            util.log(chalk.green('[Success]:'), entity.name);
+          })
+          .catch(err => {
+            util.log(chalk.red('[Fail]:'), entity.name);
+            if (err) console.error(err);
+          });
       } catch (err) {
         console.error(err);
       } finally {
@@ -105,24 +92,35 @@ class App {
   }
   async bootstrap() {
     const entities = this.providers
-      .map(Provider => new Provider())
+      .map(Provider => {
+        // 实例化服务提供者
+        const entity = new Provider(this);
+        const fileInfo = path.parse(Provider.file);
+        // 设置每个服务提供者的文件和名字
+        entity.name = fileInfo.name;
+        entity.file = Provider.file;
+        return entity;
+      })
       .filter(entity => entity.active === true);
 
     const aloneEntity = entities.find(entity => entity.alone);
 
+    // 如果找到设置alone属性的provider，则单独运行，方便调试
     if (aloneEntity && !this.options.isProduction) {
       this.entities = [aloneEntity];
     } else {
       this.entities = entities;
     }
 
-    if (this.options.once === true) {
+    if (this.options.once) {
+      return await this.run();
+    }
+
+    // run forever
+    while (process) {
       await this.run();
-    } else {
-      while (true) {
-        await this.run();
-        await util.sleep(1000 * 10);
-      }
+      // take a rest then let's go...
+      await util.sleep(1000 * 10);
     }
   }
 }

diff --git a/app/provider.js b/app/provider.js
@@ -1,8 +1,15 @@
 class Provider {
-  constructor(name) {
-    this.name = name;
+  constructor(ctx) {
+    // 服务者提供的名字
+    this.name = 'Provider';
+    // 执行上下文
+    this.ctx = ctx;
+    // 该provider是否激活
     this.active = true;
+    // 是否单独运行，用于调试
     this.alone = false;
+    // 服务提供者的文件绝对路径
+    this.file = __filename;
   }
   async resolve(phone) {}
 }

diff --git a/app/providers/lofter.js b/app/providers/lofter.js
@@ -10,22 +10,19 @@ module.exports = class extends Provider {
     const options = ctx.options;
     const page = ctx.page;
 
-    const [$mobile, $code, $submit] = await Promise.all([
-      page.$('#phone-num'),
-      page.$('#auth-code'),
-      page.$('#btn-auth')
-    ]);
-
-    await $mobile.click();
-    await page.type(options.phone, { delay: 300 });
+    await page.type('#phone-num', options.phone, { delay: 100 });
 
     await utils.sleep(1000);
 
-    await $code.click();
-    await page.type(options.phone, { delay: 100 });
+    await page.type('#auth-code', options.phone, { delay: 50 });
 
     await utils.sleep(1000);
 
-    await $submit.click();
+    throw new Error(`Ivano`);
+
+    await page.click('#btn-auth');
+
+    // 检验是否发送成功
+    await page.waitForSelector('#btn-auth.btn-disabled', { timeout: 1000 * 3 });
   }
 };
diff --git a/app/providers/qq.js b/app/providers/qq.js
@@ -1,4 +1,5 @@
 const Provider = require('../provider');
+const utils = require('../utils');
 
 module.exports = class extends Provider {
   constructor() {
@@ -9,21 +10,12 @@ module.exports = class extends Provider {
     const options = ctx.options;
     const page = ctx.page;
 
-    const [$nickname, $password, $phone, $send] = await Promise.all([
-      page.$('#nickname'),
-      page.$('#password'),
-      page.$('#phone'),
-      page.$('#send-sms')
-    ]);
+    await page.type('#nickname', options.username, { delay: 100 });
+    await page.type('#password', options.password, { delay: 100 });
+    await page.type('#phone', options.phone, { delay: 100 });
+    await page.click('#send-sms', { button: 'left' });
 
-    await $nickname.click({ button: 'left' });
-    await page.type(options.username, { delay: 100 });
-
-    await $password.click({ button: 'left' });
-    await page.type(options.password, { delay: 100 });
-
-    await $phone.click({ button: 'left' });
-    await page.type(options.phone, { delay: 100 });
-    await $send.click({ button: 'left' });
+    // 检验是否发送成功
+    await page.waitForSelector('.send-sms.disabled', { timeout: 1000 * 3 });
   }
 };
diff --git a/app/providers/segmentfault.js b/app/providers/segmentfault.js
@@ -1,4 +1,5 @@
 const Provider = require('../provider');
+const utils = require('../utils');
 
 module.exports = class extends Provider {
   constructor() {
@@ -10,11 +11,11 @@ module.exports = class extends Provider {
 
     const page = ctx.page;
 
-    const [$mobile, $submit] = await Promise.all([page.$('[name="phone"]'), page.$('.getCode')]);
+    await page.type('[name="phone"]', options.phone, { delay: 100 });
 
-    await $mobile.click();
-    await page.type(options.phone, { delay: 100 });
+    await page.click('.getCode');
 
-    await $submit.click();
+    // 检验是否发送成功
+    await page.waitForSelector('.getCode[disabled]', { timeout: 1000 * 3 });
   }
 };
diff --git a/app/providers/久其格格.js b/app/providers/久其格格.js
@@ -11,28 +11,17 @@ module.exports = class extends Provider {
 
     const page = ctx.page;
 
-    const $phoneRegister = await page.$('#phoneRegistTab');
+    await page.click('#phoneRegistTab');
 
-    await $phoneRegister.click();
+    await page.waitForSelector('#chkCodeSendBtn');
 
-    await utils.sleep(1000);
+    await page.type('#UserName', options.phone, { delay: 100 });
+    await page.type('#Password', options.password, { delay: 100 });
+    await page.type('#ConfirmPassword', options.password, { delay: 100 });
 
-    const [$mobile, $password, $repassword, $submit] = await Promise.all([
-      page.$('#UserName'),
-      page.$('#Password'),
-      page.$('#ConfirmPassword'),
-      page.$('#chkCodeSendBtn')
-    ]);
+    await page.click('#chkCodeSendBtn');
 
-    await $mobile.click();
-    await page.type(options.phone, { delay: 100 });
-
-    await $password.click();
-    await page.type(options.password, { delay: 100 });
-
-    await $repassword.click();
-    await page.type(options.password, { delay: 100 });
-
-    await $submit.click();
+    // 检验是否发送成功
+    await page.waitForSelector('#chkCodeSendBtn[disabled]', { timeout: 1000 * 3 });
   }
 };
diff --git a/app/providers/优视.js b/app/providers/优视.js
@@ -10,41 +10,24 @@ module.exports = class extends Provider {
     const options = ctx.options;
     const page = ctx.page;
 
-    const [
-      $mobile,
-      $password,
-      $rePassword,
-      $submit
-    ] = await Promise.all([
-      page.$('#registerName'),
-      page.$('#password'),
-      page.$('#confirmPassword'),
-      page.$('#getCodeBtn')
-    ]);
-
-    await $mobile.click();
-    await page.type(options.phone, { delay: 100 });
-
-    await $password.click();
-    await page.type(options.password, { delay: 100 });
-
-    await $rePassword.click();
-    await page.type(options.password, { delay: 100 });
+    await page.type('#registerName', options.phone, { delay: 50 });
+    await page.type('#password', options.password, { delay: 50 });
+    await page.type('#confirmPassword', options.password, { delay: 50 });
 
     // 按下鼠标，拖动滚动条
-    await page.mouse.move(515, 400);
-    await page.mouse.click(515, 400);
-    await page.mouse.down({
-      button: 'left'
-    });
-
-    await page.mouse.move(800, 400, { steps: 50 });
-
-    await page.mouse.up({ button: 'left' });
+    await page.mouse.move(515, 400, { steps: 10 });
+    await page.mouse.down();
+    await page.mouse.move(546, 410, { steps: 20 });
+    await page.mouse.move(648, 408, { steps: 30 });
+    await page.mouse.move(768, 406, { steps: 40 });
+    await page.mouse.move(800, 406, { steps: 50 });
+    await page.mouse.up();
     // 松开鼠标
 
     await utils.sleep(1000);
 
-    await $submit.click();
+    await page.click('#getCodeBtn');
+
+    await page.waitForSelector('#getCodeBtn.btn_code');
   }
 };
diff --git a/app/providers/优酷.js b/app/providers/优酷.js
@@ -10,22 +10,11 @@ module.exports = class extends Provider {
     const options = ctx.options;
     const page = ctx.page;
 
-    const [$mobile, $password, $repassword, $submit] = await Promise.all([
-      page.$('#passport'),
-      page.$('#password'),
-      page.$('#repeatPsd'),
-      page.$('#getMobileCode')
-    ]);
+    await page.type('#passport', options.phone, { delay: 30 });
+    await page.type('#password', options.password, { delay: 30 });
+    await page.type('#repeatPsd', options.password, { delay: 30 });
+    await page.click('#getMobileCode');
 
-    await $mobile.click();
-    await page.type(options.phone, { delay: 100 });
-
-    await $password.click();
-    await page.type(options.password, { delay: 100 });
-
-    await $repassword.click();
-    await page.type(options.password, { delay: 100 });
-
-    await $submit.click();
+    await page.waitForSelector('#getMobileCode[disable]');
   }
-}
+};
diff --git a/app/providers/六月游戏.js b/app/providers/六月游戏.js
@@ -1,4 +1,5 @@
 const Provider = require('../provider');
+const utils = require('../utils');
 
 module.exports = class extends Provider {
   constructor() {
@@ -7,17 +8,11 @@ module.exports = class extends Provider {
   }
   async resolve(ctx) {
     const options = ctx.options;
-
     const page = ctx.page;
 
-    const [$mobile, $submit] = await Promise.all([
-      page.$('[name="phone"]'),
-      page.$('#send_sms')
-    ]);
-
-    await $mobile.click();
-    await page.type(options.phone, { delay: 100 });
+    await page.type('[name="phone"]', options.phone, { delay: 100 });
+    await page.click('#send_sms');
 
-    await $submit.click();
+    await utils.sleep(1000 * 600);
   }
 };
diff --git a/app/providers/向日葵.js b/app/providers/向日葵.js
@@ -10,18 +10,8 @@ module.exports = class extends Provider {
     const options = ctx.options;
     const page = ctx.page;
 
-    const [$name, $mobile, $submit] = await Promise.all([
-      page.$('#mobilebox_name'),
-      page.$('#mobilebox_phone'),
-      page.$('.contact-submit')
-    ]);
-
-    await $name.click({ button: 'left' });
-    await page.type(options.name, { delay: 100 });
-
-    await $mobile.click();
-    await page.type(options.phone, { delay: 100 });
-
-    await $submit.click({ button: 'left' });
+    await page.type('#mobilebox_name', options.name, { delay: 30 });
+    await page.type('#mobilebox_phone', options.phone, { delay: 30 });
+    await page.click('.contact-submit');
   }
-}
+};