cheveguerra/whatsapp-web.js
1
0
Fork 0
mirror of https://github.com/cheveguerra/whatsapp-web.js.git synced 2026-04-17 19:26:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: set user agent as a launch arg for usage in serviceworker (#1518)

Browse Source
This commit is contained in:
Pedro S. Lopez
2022-06-21 00:01:59 -04:00
committed by GitHub
parent 98ff761cfb
commit a0b18fb685
2 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Client.js
View File

@@ -92,7 +92,12 @@ class Client extends EventEmitter {
browser = await puppeteer.connect(puppeteerOpts);
page = await browser.newPage();
} else {
browser = await puppeteer.launch(puppeteerOpts);
const browserArgs = [...(puppeteerOpts.args || [])];
if(!browserArgs.find(arg => arg.includes('--user-agent'))) {
browserArgs.push(`--user-agent=${this.options.userAgent}`);
}
browser = await puppeteer.launch({...puppeteerOpts, args: browserArgs});
page = (await browser.pages())[0];
}

70
tests/client.js
View File

@@ -9,7 +9,7 @@ const Message = require('../src/structures/Message');
const MessageMedia = require('../src/structures/MessageMedia');
const Location = require('../src/structures/Location');
const LegacySessionAuth = require('../src/authStrategies/LegacySessionAuth');
const { MessageTypes, WAState } = require('../src/util/Constants');
const { MessageTypes, WAState, DefaultOptions } = require('../src/util/Constants');
const expect = chai.expect;
chai.use(chaiAsPromised);
@@ -18,6 +18,74 @@ const remoteId = helper.remoteId;
const isMD = helper.isMD();
describe('Client', function() {
describe('User Agent', function () {
it('should set user agent on browser', async function () {
this.timeout(25000);
const client = helper.createClient();
client.initialize();
await helper.sleep(20000);
const browserUA = await client.pupBrowser.userAgent();
expect(browserUA).to.equal(DefaultOptions.userAgent);
const pageUA = await client.pupPage.evaluate(() => window.navigator.userAgent);
expect(pageUA).to.equal(DefaultOptions.userAgent);
await client.destroy();
});
it('should set custom user agent on browser', async function () {
this.timeout(25000);
const customUA = DefaultOptions.userAgent.replace(/Chrome\/.* /, 'Chrome/99.9.9999.999 ');
const client = helper.createClient({
options: {
userAgent: customUA
}
});
client.initialize();
await helper.sleep(20000);
const browserUA = await client.pupBrowser.userAgent();
expect(browserUA).to.equal(customUA);
expect(browserUA.includes('Chrome/99.9.9999.999')).to.equal(true);
const pageUA = await client.pupPage.evaluate(() => window.navigator.userAgent);
expect(pageUA).to.equal(customUA);
await client.destroy();
});
it('should respect an existing user agent arg', async function () {
this.timeout(25000);
const customUA = DefaultOptions.userAgent.replace(/Chrome\/.* /, 'Chrome/99.9.9999.999 ');
const client = helper.createClient({
options: {
puppeteer: {
args: [`--user-agent=${customUA}`]
}
}
});
client.initialize();
await helper.sleep(20000);
const browserUA = await client.pupBrowser.userAgent();
expect(browserUA).to.equal(customUA);
expect(browserUA.includes('Chrome/99.9.9999.999')).to.equal(true);
const pageUA = await client.pupPage.evaluate(() => window.navigator.userAgent);
expect(pageUA).to.equal(DefaultOptions.userAgent);
await client.destroy();
});
});
describe('Authentication', function() {
it('should emit QR code if not authenticated', async function() {
this.timeout(25000);