chore: Fixed "no-var" lint

.eslintrc.js

@@ -27,7 +27,6 @@ module.exports = {
     'no-empty': ['error', { allowEmptyCatch: true }],
     'no-useless-catch': 'off',
     'no-useless-escape': 'off',
-    'no-var': 'off',
     'prefer-const': 'off',
   },
   overrides: [

src/api/helpers/decrypt.ts

@@ -93,9 +93,9 @@ export const magix = (
   mediaType: any,
   expectedSize?: number
 ) => {
-  var encodedHex = fileData.toString('hex');
-  var encodedBytes = hexToBytes(encodedHex);
-  var mediaKeyBytes: any = base64ToBytes(mediaKeyBase64);
+  const encodedHex = fileData.toString('hex');
+  const encodedBytes = hexToBytes(encodedHex);
+  const mediaKeyBytes: any = base64ToBytes(mediaKeyBase64);
   const info = `WhatsApp ${mediaTypes[mediaType.toUpperCase()]} Keys`;
   const hash: string = 'sha256';
   const salt: any = new Uint8Array(32);
@@ -105,10 +105,10 @@ export const magix = (
     info,
     hash,
   });
-  var iv = mediaKeyExpanded.slice(0, 16);
-  var cipherKey = mediaKeyExpanded.slice(16, 48);
-  var decipher = crypto.createDecipheriv('aes-256-cbc', cipherKey, iv);
-  var decoded: Buffer = decipher.update(encodedBytes);
+  const iv = mediaKeyExpanded.slice(0, 16);
+  const cipherKey = mediaKeyExpanded.slice(16, 48);
+  const decipher = crypto.createDecipheriv('aes-256-cbc', cipherKey, iv);
+  const decoded: Buffer = decipher.update(encodedBytes);
   const mediaDataBuffer = expectedSize
     ? fixPadding(decoded, expectedSize)
     : decoded;
@@ -132,17 +132,17 @@ const fixPadding = (data: Buffer, expectedSize: number) => {
 };
 
 const hexToBytes = (hexStr: any) => {
-  var intArray = [];
-  for (var i = 0; i < hexStr.length; i += 2) {
+  const intArray = [];
+  for (let i = 0; i < hexStr.length; i += 2) {
     intArray.push(parseInt(hexStr.substr(i, 2), 16));
   }
   return new Uint8Array(intArray);
 };
 
 const base64ToBytes = (base64Str: any) => {
-  var binaryStr = atob(base64Str);
-  var byteArray = new Uint8Array(binaryStr.length);
-  for (var i = 0; i < binaryStr.length; i++) {
+  const binaryStr = atob(base64Str);
+  const byteArray = new Uint8Array(binaryStr.length);
+  for (let i = 0; i < binaryStr.length; i++) {
     byteArray[i] = binaryStr.charCodeAt(i);
   }
   return byteArray;

src/api/helpers/delete-file.ts

@@ -61,7 +61,7 @@ export function deleteFiles(
   spinnies: Spinnies
 ) {
   spinnies.add(`removeFile`, { text: '....' });
-  var pathTokens: string = path.join(
+  const pathTokens: string = path.join(
     path.resolve(
       process.cwd() + mergedOptions.mkdirFolderToken,
       mergedOptions.folderNameToken

src/api/helpers/file-to-base64.ts

@@ -52,7 +52,7 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMNMNMMMNMMNNMMMMMMMMMMMM
 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNMMNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 */
-var mimeTypes = require('mime-types');
+const mimeTypes = require('mime-types');
 import * as fs from 'fs';
 
 /**

src/api/helpers/scrape-deletetoken.ts

@@ -59,8 +59,8 @@ declare global {
   }
 }
 export async function scrapeDeleteToken(page: Page): Promise<boolean> {
-  var result = await page.evaluate(() => {
-    var scrape = window.pathSession;
+  const result = await page.evaluate(() => {
+    const scrape = window.pathSession;
     if (scrape === true) {
       return true;
     } else {

src/api/helpers/scrape-desconnect.ts

@@ -59,8 +59,8 @@ declare global {
   }
 }
 export async function scrapeDesconnected(page: Page): Promise<boolean> {
-  var result = await page.evaluate(() => {
-    var scrape = window.Store.State.default.on('change:state');
+  const result = await page.evaluate(() => {
+    const scrape = window.Store.State.default.on('change:state');
     if (
       scrape.__x_stream === 'DISCONNECTED' &&
       scrape.__x_state === 'CONNECTED'

src/api/helpers/scrape-login.ts

@@ -54,12 +54,12 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 */
 import { Page } from 'puppeteer';
 export async function scrapeLogin(page: Page): Promise<boolean> {
-  var result = await page.evaluate(() => {
-    let count = document.querySelector('._9a59P');
-    var data: boolean;
+  const result = await page.evaluate(() => {
+    const count = document.querySelector('._9a59P');
+    let data: boolean;
     data = false;
     if (count != null) {
-      var text = count.textContent,
+      const text = count.textContent,
         timeNumber = text.match('Invalid');
       if (timeNumber) {
         data = true;

src/api/helpers/select-sticker.ts

@@ -104,7 +104,7 @@ interface CreateSize {
   height?: number;
 }
 export async function resizeImg(buff: Buffer, size: CreateSize) {
-  var _ins = await sharp(buff, { failOnError: false })
+  const _ins = await sharp(buff, { failOnError: false })
       .resize({ width: size.width, height: size.height })
       .toBuffer(),
     _w = sharp(_ins, { failOnError: false }).jpeg(),

src/api/layers/controls.layer.ts

@@ -131,7 +131,7 @@ export class ControlsLayer extends UILayer {
    */
   public async pinChat(chatId: string, option: boolean, nonExistent?: boolean) {
     return new Promise(async (resolve, reject) => {
-      var result = await this.page.evaluate(
+      const result = await this.page.evaluate(
         ({ chatId, option, nonExistent }) => {
           return WAPI.pinChat(chatId, option, nonExistent);
         },

src/api/layers/listener.layer.ts

@@ -92,7 +92,7 @@ export class ListenerLayer extends ProfileLayer {
     ];
 
     for (const func of functions) {
-      var has = await this.page
+      const has = await this.page
         .evaluate((func) => typeof window[func] === 'function', func)
         .catch(() => false);
 

src/api/layers/profile.layer.ts

@@ -75,7 +75,7 @@ export class ProfileLayer extends HostLayer {
    */
   public sendMute(id: string, time: number, type: string): Promise<object> {
     return new Promise(async (resolve, reject) => {
-      var result = await this.page.evaluate(
+      const result = await this.page.evaluate(
         (id, time, type) => WAPI.sendMute(id, time, type),
         id,
         time,
@@ -133,9 +133,9 @@ export class ProfileLayer extends HostLayer {
       const mimeInfo = base64MimeType(b64);
 
       if (!mimeInfo || mimeInfo.includes('image')) {
-        var _webb64_96 = await resizeImg(buff, { width: 96, height: 96 }),
+        let _webb64_96 = await resizeImg(buff, { width: 96, height: 96 }),
           _webb64_640 = await resizeImg(buff, { width: 640, height: 640 });
-        var obj = { a: _webb64_640, b: _webb64_96 };
+        let obj = { a: _webb64_640, b: _webb64_96 };
 
         return await this.page.evaluate(({ obj }) => WAPI.setProfilePic(obj), {
           obj,

src/api/layers/sender.layer.ts

@@ -89,7 +89,7 @@ export class SenderLayer extends ListenerLayer {
     title: string
   ): Promise<SendLinkResult> {
     return new Promise(async (resolve, reject) => {
-      var result = await this.page.evaluate(
+      const result = await this.page.evaluate(
         ({ chatId, url, title }) => {
           return WAPI.sendLinkPreview(chatId, url, title);
         },
@@ -110,13 +110,13 @@ export class SenderLayer extends ListenerLayer {
    */
   public async sendText(to: string, content: string): Promise<Message> {
     return new Promise(async (resolve, reject) => {
-      var messageId: string = await this.page.evaluate(
+      const messageId: string = await this.page.evaluate(
         ({ to, content }) => {
           return WAPI.sendMessage(to, content);
         },
         { to, content }
       );
-      var result = (await this.page.evaluate(
+      const result = (await this.page.evaluate(
         (messageId: any) => WAPI.getMessageById(messageId),
         messageId
       )) as Message;
@@ -135,13 +135,13 @@ export class SenderLayer extends ListenerLayer {
   ): Promise<Message> {
     return new Promise(async (resolve, reject) => {
       try {
-        var messageId = await this.page.evaluate(
+        const messageId = await this.page.evaluate(
           ({ chat, content, options }) => {
             return WAPI.sendMessageOptions(chat, content, options);
           },
           { chat, content, options }
         );
-        var result = (await this.page.evaluate(
+        const result = (await this.page.evaluate(
           (messageId: any) => WAPI.getMessageById(messageId),
           messageId
         )) as Message;
@@ -179,7 +179,7 @@ export class SenderLayer extends ListenerLayer {
       }
 
       if (!base64) {
-        var obj = {
+        const obj = {
           erro: true,
           to: to,
           text: 'No such file or directory, open "' + filePath + '"',
@@ -214,7 +214,7 @@ export class SenderLayer extends ListenerLayer {
       let mimeType = base64MimeType(base64);
 
       if (!mimeType) {
-        var obj = {
+        const obj = {
           erro: true,
           to: to,
           text: 'Invalid base64!',
@@ -223,7 +223,7 @@ export class SenderLayer extends ListenerLayer {
       }
 
       if (!mimeType.includes('image')) {
-        var obj = {
+        const obj = {
           erro: true,
           to: to,
           text: 'Not an image, allowed formats png, jpeg and webp',
@@ -233,7 +233,7 @@ export class SenderLayer extends ListenerLayer {
 
       filename = filenameFromMimeType(filename, mimeType);
 
-      var result = await this.page.evaluate(
+      const result = await this.page.evaluate(
         ({ to, base64, filename, caption }) => {
           return WAPI.sendImage(base64, to, filename, caption);
         },
@@ -288,13 +288,13 @@ export class SenderLayer extends ListenerLayer {
     quotedMsg: string
   ): Promise<Message> {
     return new Promise(async (resolve, reject) => {
-      var messageId: string = await this.page.evaluate(
+      const messageId: string = await this.page.evaluate(
         ({ to, content, quotedMsg }) => {
           return WAPI.reply(to, content, quotedMsg);
         },
         { to, content, quotedMsg }
       );
-      var result = (await this.page.evaluate(
+      const result = (await this.page.evaluate(
         (messageId: any) => WAPI.getMessageById(messageId),
         messageId
       )) as Message;
@@ -346,7 +346,7 @@ export class SenderLayer extends ListenerLayer {
       let mimeType = base64MimeType(base64);
 
       if (!mimeType) {
-        var obj = {
+        const obj = {
           erro: true,
           to: to,
           text: 'Invalid base64!',
@@ -356,8 +356,8 @@ export class SenderLayer extends ListenerLayer {
 
       filename = filenameFromMimeType(filename, mimeType);
 
-      var type = 'FileFromBase64';
-      var result = await this.page.evaluate(
+      const type = 'FileFromBase64';
+      const result = await this.page.evaluate(
         ({ to, base64, filename, caption, type }) => {
           return WAPI.sendFile(base64, to, filename, caption, type);
         },
@@ -462,7 +462,7 @@ export class SenderLayer extends ListenerLayer {
     name?: string
   ) {
     return new Promise(async (resolve, reject) => {
-      var result = await this.page.evaluate(
+      const result = await this.page.evaluate(
         ({ to, contactsId, name }) => {
           return WAPI.sendContactVcard(to, contactsId, name);
         },
@@ -483,7 +483,7 @@ export class SenderLayer extends ListenerLayer {
    */
   public async sendContactVcardList(to: string, contacts: string[]) {
     return new Promise(async (resolve, reject) => {
-      var result = await this.page.evaluate(
+      const result = await this.page.evaluate(
         ({ to, contacts }) => {
           return WAPI.sendContactVcardList(to, contacts);
         },
@@ -541,7 +541,7 @@ export class SenderLayer extends ListenerLayer {
           let _met = obj['metadata'];
 
           return new Promise(async (resolve, reject) => {
-            var result = await this.page.evaluate(
+            const result = await this.page.evaluate(
               ({ _webb64, to, _met }) => {
                 return WAPI.sendImageAsSticker(_webb64, to, _met, 'StickerGif');
               },
@@ -593,7 +593,7 @@ export class SenderLayer extends ListenerLayer {
           let _webb64 = obj['webpBase64'];
           let _met = obj['metadata'];
           return new Promise(async (resolve, reject) => {
-            var result = await this.page.evaluate(
+            const result = await this.page.evaluate(
               ({ _webb64, to, _met }) => {
                 return WAPI.sendImageAsSticker(_webb64, to, _met, 'Sticker');
               },
@@ -628,7 +628,7 @@ export class SenderLayer extends ListenerLayer {
     title: string
   ) {
     return new Promise(async (resolve, reject) => {
-      var result = await this.page.evaluate(
+      const result = await this.page.evaluate(
         ({ to, latitude, longitude, title }) => {
           return WAPI.sendLocation(to, latitude, longitude, title);
         },

src/controllers/initializer.ts

@@ -84,9 +84,7 @@ export async function create(
   options?: CreateConfig,
   browserSessionToken?: object
 ): Promise<Whatsapp> {
-  var browserToken: any,
-    Session: string,
-    Session = session;
+  let browserToken: any;
 
   const spinnies = getSpinnies({
     disableSpins: options ? options.disableSpins : false,
@@ -107,7 +105,7 @@ export async function create(
     text: 'Initializing browser...',
   });
 
-  const browser = await initBrowser(Session, mergedOptions);
+  const browser = await initBrowser(session, mergedOptions);
 
   if (browser === 'connect') {
     spinnies.fail(`browser-${session}`, {
@@ -167,7 +165,7 @@ export async function create(
     }
 
     const waPage = await initWhatsapp(
-      Session,
+      session,
       mergedOptions,
       browser,
       browserToken

src/types/WAPI.d.ts

@@ -203,5 +203,5 @@ declare global {
   interface Window {
     WAPI: WAPI;
   }
-  var WAPI: WAPI;
+  const WAPI: WAPI;
 }