0.3.2

close #31

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-web.js",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -168,6 +168,11 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
+    "jsqr": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.2.0.tgz",
+      "integrity": "sha512-wKcQS9QC2VHGk7aphWCp1RrFyC0CM6fMgC5prZZ2KV/Lk6OKNoCod9IR6bao+yx3KPY0gZFC5dc+h+KFzCI0Wg=="
+    },
     "mime": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-web.js",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Library for interacting with the WhatsApp Web API ",
   "main": "./index.js",
   "scripts": {
@@ -25,6 +25,7 @@
   },
   "homepage": "https://github.com/pedroslopez/whatsapp-web.js#readme",
   "dependencies": {
+    "jsqr": "^1.2.0",
     "moduleraid": "git+https://github.com/pixeldesu/moduleRaid.git",
     "puppeteer": "^1.20.0"
   }

src/Client.js

@@ -3,12 +3,12 @@
 const EventEmitter = require('events');
 const puppeteer = require('puppeteer');
 const moduleRaid = require('moduleraid/moduleraid');
+const jsQR = require('jsqr');
 
 const Util = require('./util/Util');
 const { WhatsWebURL, UserAgent, DefaultOptions, Events, WAState } = require('./util/Constants');
 const { ExposeStore, LoadUtils } = require('./util/Injected');
 const ChatFactory = require('./factories/ChatFactory');
-const Chat = require('./structures/Chat');
 const Message = require('./structures/Message');
 
 /**
@@ -46,12 +46,12 @@ class Client extends EventEmitter {
 
         await page.goto(WhatsWebURL);
 
-        const KEEP_PHONE_CONNECTED_IMG_SELECTOR = '._1wSzK';
+        const KEEP_PHONE_CONNECTED_IMG_SELECTOR = '.HGVhc';
 
         if (this.options.session) {
             // Check if session restore was successfull 
             try {
-                await page.waitForSelector(KEEP_PHONE_CONNECTED_IMG_SELECTOR, { timeout: 5000 });
+                await page.waitForSelector(KEEP_PHONE_CONNECTED_IMG_SELECTOR, { timeout: 15000 });
             } catch (err) {
                 if (err.name === 'TimeoutError') {
                     this.emit(Events.AUTHENTICATION_FAILURE, 'Unable to log in. Are the session details valid?');
@@ -65,12 +65,11 @@ class Client extends EventEmitter {
 
         } else {
             // Wait for QR Code
-            const QR_CONTAINER_SELECTOR = '._2d3Jz';
-            const QR_VALUE_SELECTOR = '._1pw2F';
-
-            await page.waitForSelector(QR_CONTAINER_SELECTOR);
-
-            const qr = await page.$eval(QR_VALUE_SELECTOR, node => node.getAttribute('data-ref'));
+            const QR_CANVAS_SELECTOR = 'canvas';
+            await page.waitForSelector(QR_CANVAS_SELECTOR);
+            const qrImgData = await page.$eval(QR_CANVAS_SELECTOR, canvas => [].slice.call(canvas.getContext('2d').getImageData(0,0,264,264).data));
+            const qr = jsQR(qrImgData, 264, 264).data;
+            
             this.emit(Events.QR_RECEIVED, qr);
 
             // Wait for code scan