Skip to content

Commit

Permalink
Merge pull request #2666 from 9cb14c1ec0/eval_wapi
Browse files Browse the repository at this point in the history
Use evaluate instead of injecting script tags
  • Loading branch information
orkestral committed Mar 29, 2024
2 parents 936215b + a11b344 commit 395b192
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions src/api/whatsapp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useragentOverride } from '../config/WAuserAgente';
import { CreateConfig } from '../config/create-config';
import axios from 'axios';
import * as path from 'path';
import fs from 'fs/promises';

export class Whatsapp extends ControlsLayer {
constructor(
Expand All @@ -15,9 +16,9 @@ export class Whatsapp extends ControlsLayer {
options?: CreateConfig
) {
super(browser, page, session, options);
this.initService();
this.initService().finally();
this.page.on('load', async () => {
this.initialize();
await this.initialize();
await page
.waitForSelector('#app .two', { visible: true })
.catch(() => {});
Expand All @@ -37,20 +38,22 @@ export class Whatsapp extends ControlsLayer {
.waitForFunction('webpackChunkwhatsapp_web_client.length')
.catch();
}
await this.page
.addScriptTag({
path: require.resolve(path.join(__dirname, '../lib/wapi/', 'wapi.js'))
})
.catch();

await this.page
.addScriptTag({
path: require.resolve(
path.join(__dirname, '../lib/middleware', 'middleware.js')
)
})
.catch();
this.initialize();

let js = await fs.readFile(
require.resolve(path.join(__dirname, '../lib/wapi/', 'wapi.js')),
'utf-8'
);
await this.page.evaluate(js);

let middleware_script = await fs.readFile(
require.resolve(
path.join(__dirname, '../lib/middleware', 'middleware.js')
),
'utf-8'
);
await this.page.evaluate(middleware_script);

await this.initialize();
} catch {}
}

Expand Down

0 comments on commit 395b192

Please sign in to comment.