Merge branch 'master' into dependabot/npm_and_yarn/typescript-eslint/…

…eslint-plugin-4.18.0

README.md

@@ -157,6 +157,11 @@ venom
         '{"key":"+i/nRgWJ....","encKey":"kGdMR5t....","macKey":"+i/nRgW...."}',
       WAToken1: '"0i8...."',
       WAToken2: '"1@lPpzwC...."',
+    },
+    // BrowserInstance
+    (browser, waPage) => {
+      console.log("Browser PID:", browser.process().pid);
+      waPage.screenshot({path: 'screenshot.png'});
     }
   )
   .then((client) => {
@@ -776,7 +781,13 @@ await client.clearChatMessages('000000000000@c.us');
 await client.archiveChat(chatId, true);
 
 // Delete message (last parameter: delete only locally)
-await client.deleteMessage('000000000000@c.us', message.id.toString(), false);
+await client.deleteMessage('000000000000@c.us', ['false_000000000000@c.us_B70847EE89E22D20FB86ECA0C1B11609','false_000000000000@c.us_B70847EE89E22D20FB86ECA0C1B11777'],)
+.then((result) => {
+    console.log('Result: ', result); //return object success
+})
+.catch((erro) => {
+    console.error('Error when sending: ', erro); //return object error
+});
 
 // Mark chat as not seen (returns true if it works)
 await client.markUnseenMessage('000000000000@c.us');

examples/screenshot/.gitignore

@@ -0,0 +1,5 @@
+node_modules
+tokens
+package-lock.json
+debug.log
+*screenshot.png

examples/screenshot/README.md

@@ -0,0 +1,3 @@
+# Screenshot
+
+Get screenshot to see what happen behind the hood.

examples/screenshot/index.js

@@ -0,0 +1,25 @@
+const venom = require('../../dist');
+
+venom
+  .create(
+    'sessionName', //session
+    null, //catchQR
+    null, //statusFind
+    null, //options
+    null, //BrowserSessionToken
+    (browser, waPage) => {
+      // Show broser process ID
+      console.log('Browser PID:', browser.process().pid);
+      // Take screenshot before logged-in
+      waPage.screenshot({ path: 'before-screenshot.png' });
+    }
+  )
+  .then((client) => start(client))
+  .catch((erro) => {
+    console.log(erro);
+  });
+
+function start(client) {
+  // Taks screenshot after logged-in
+  client.waPage.screenshot({ path: 'after-screenshot.png' });
+}

examples/screenshot/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "venom-bot-functions",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "start": "node index.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "license": "ISC"
+}

src/api/layers/controls.layer.ts

@@ -55,6 +55,9 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 import { Page } from 'puppeteer';
 import { CreateConfig } from '../../config/create-config';
 import { UILayer } from './ui.layer';
+import { Scope, checkValuesSender } from '../helpers/layers-interface';
+
+let obj: Scope;
 
 export class ControlsLayer extends UILayer {
   constructor(public page: Page, session?: string, options?: CreateConfig) {
@@ -165,14 +168,43 @@ export class ControlsLayer extends UILayer {
    */
   public async deleteMessage(
     chatId: string,
-    messageId: string[] | string,
-    onlyLocal = false
-  ) {
-    return await this.page.evaluate(
-      ({ contactId, messageId, onlyLocal }) =>
-        WAPI.deleteMessages(contactId, messageId, onlyLocal),
-      { contactId: chatId, messageId, onlyLocal }
-    );
+    messageId: string[]
+  ): Promise<Object> {
+    return new Promise(async (resolve, reject) => {
+      const typeFunction = 'deleteMessage';
+      const type = 'string';
+      const check = [
+        {
+          param: 'chatId',
+          type: type,
+          value: chatId,
+          function: typeFunction,
+          isUser: true,
+        },
+        {
+          param: 'messageId',
+          type: 'object',
+          value: messageId,
+          function: typeFunction,
+          isUser: true,
+        },
+      ];
+
+      const validating = checkValuesSender(check);
+      if (typeof validating === 'object') {
+        return reject(validating);
+      }
+      const result = await this.page.evaluate(
+        ({ chatId, messageId }) => WAPI.deleteMessages(chatId, messageId),
+        { chatId, messageId }
+      );
+
+      if (result['erro'] == true) {
+        return reject(result);
+      } else {
+        return resolve(result);
+      }
+    });
   }
 
   /**

src/api/layers/sender.layer.ts

@@ -63,12 +63,7 @@ import {
   stickerSelect,
 } from '../helpers';
 import { filenameFromMimeType } from '../helpers/filename-from-mimetype';
-import {
-  Message,
-  SendFileResult,
-  SendLinkResult,
-  SendStickerResult,
-} from '../model';
+import { Message, SendFileResult, SendStickerResult } from '../model';
 import { ChatState } from '../model/enum';
 import { ListenerLayer } from './listener.layer';
 import { Scope, checkValuesSender } from '../helpers/layers-interface';

src/controllers/initializer.ts

@@ -62,6 +62,7 @@ import { getSpinnies } from '../utils/spinnies';
 import { SocketState } from '../api/model/enum';
 import { deleteFiles, checkingCloses } from '../api/helpers';
 import { tokenSession } from '../config/tokenSession.config';
+import { Browser, Page } from 'puppeteer';
 
 /**
  * A callback will be received, informing the status of the qrcode
@@ -78,6 +79,14 @@ export type CatchQR = (
  */
 export type StatusFind = (statusGet: string, session: string) => void;
 
+/**
+ * A callback will be received, informing user about browser and page instance
+ */
+export type BrowserInstance = (
+  browser: string | Browser,
+  waPage: false | Page
+) => void;
+
 export interface CreateOptions extends CreateConfig {
   /**
    * You must pass a string type parameter, this parameter will be the name of the client's session. If the parameter is not passed, the section name will be "session".
@@ -95,6 +104,10 @@ export interface CreateOptions extends CreateConfig {
    * Pass the session token information you can receive this token with the await client.getSessionTokenBrowser () function
    */
   browserSessionToken?: tokenSession;
+  /**
+   * A callback will be received, informing user about browser and page instance
+   */
+  browserInstance?: BrowserInstance;
 }
 
 /**
@@ -112,15 +125,17 @@ export async function create(
   catchQR?: CatchQR,
   statusFind?: StatusFind,
   options?: CreateConfig,
-  browserSessionToken?: tokenSession
+  browserSessionToken?: tokenSession,
+  browserInstance?: BrowserInstance
 ): Promise<Whatsapp>;
 
 export async function create(
   sessionOrOption: string | CreateOptions,
   catchQR?: CatchQR,
   statusFind?: StatusFind,
   options?: CreateConfig,
-  browserSessionToken?: tokenSession
+  browserSessionToken?: tokenSession,
+  browserInstance?: BrowserInstance
 ): Promise<Whatsapp> {
   let session = 'session';
 
@@ -135,6 +150,7 @@ export async function create(
     statusFind = sessionOrOption.statusFind || statusFind;
     browserSessionToken =
       sessionOrOption.browserSessionToken || browserSessionToken;
+    browserInstance = sessionOrOption.browserInstance || browserInstance;
     options = sessionOrOption;
   }
   let browserToken: any;