mirror of
https://github.com/cheveguerra/whatsapp-web.js.git
synced 2026-04-20 04:29:15 +00:00
Compare commits
1 Commits
pedroslope
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1499ea503e |
@@ -33,7 +33,7 @@
|
|||||||
"fluent-ffmpeg": "^2.1.2",
|
"fluent-ffmpeg": "^2.1.2",
|
||||||
"jsqr": "^1.3.1",
|
"jsqr": "^1.3.1",
|
||||||
"mime": "^3.0.0",
|
"mime": "^3.0.0",
|
||||||
"node-fetch": "^2.6.5",
|
"node-fetch": "^3.3.0",
|
||||||
"node-webpmux": "^3.1.0",
|
"node-webpmux": "^3.1.0",
|
||||||
"puppeteer": "^13.0.0"
|
"puppeteer": "^13.0.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ const moduleRaid = require('@pedroslopez/moduleraid/moduleraid');
|
|||||||
|
|
||||||
const Util = require('./util/Util');
|
const Util = require('./util/Util');
|
||||||
const InterfaceController = require('./util/InterfaceController');
|
const InterfaceController = require('./util/InterfaceController');
|
||||||
const { getIndexForVersion } = require('./util/VersionResolver');
|
|
||||||
const { WhatsWebURL, DefaultOptions, Events, WAState } = require('./util/Constants');
|
const { WhatsWebURL, DefaultOptions, Events, WAState } = require('./util/Constants');
|
||||||
const { ExposeStore, LoadUtils } = require('./util/Injected');
|
const { ExposeStore, LoadUtils } = require('./util/Injected');
|
||||||
const ChatFactory = require('./factories/ChatFactory');
|
const ChatFactory = require('./factories/ChatFactory');
|
||||||
@@ -109,7 +108,6 @@ class Client extends EventEmitter {
|
|||||||
this.pupPage = page;
|
this.pupPage = page;
|
||||||
|
|
||||||
await this.authStrategy.afterBrowserInitialized();
|
await this.authStrategy.afterBrowserInitialized();
|
||||||
await this.initVersionOverride();
|
|
||||||
|
|
||||||
await page.goto(WhatsWebURL, {
|
await page.goto(WhatsWebURL, {
|
||||||
waitUntil: 'load',
|
waitUntil: 'load',
|
||||||
@@ -564,22 +562,6 @@ class Client extends EventEmitter {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async initVersionOverride() {
|
|
||||||
const version = this.options.webVersion;
|
|
||||||
await this.pupPage.setRequestInterception(true);
|
|
||||||
this.pupPage.on('request', async (req) => {
|
|
||||||
if(req.url() === WhatsWebURL) {
|
|
||||||
req.respond({
|
|
||||||
status: 200,
|
|
||||||
contentType: 'text/html',
|
|
||||||
body: await getIndexForVersion(version)
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
req.continue();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Closes the client
|
* Closes the client
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ exports.DefaultOptions = {
|
|||||||
headless: true,
|
headless: true,
|
||||||
defaultViewport: null
|
defaultViewport: null
|
||||||
},
|
},
|
||||||
webVersion: '2.2244.6',
|
|
||||||
authTimeoutMs: 0,
|
authTimeoutMs: 0,
|
||||||
qrMaxRetries: 0,
|
qrMaxRetries: 0,
|
||||||
takeoverOnConflict: false,
|
takeoverOnConflict: false,
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
const fetch = require('node-fetch');
|
|
||||||
|
|
||||||
const VERSION_ARCHIVE_URL = 'https://archive.wwebjs.dev/web-index';
|
|
||||||
|
|
||||||
class VersionResolveError extends Error { }
|
|
||||||
|
|
||||||
const getIndexForVersion = async (version) => {
|
|
||||||
const cachedRes = await fetch(`${VERSION_ARCHIVE_URL}/${version}`);
|
|
||||||
if(!cachedRes.ok) throw new VersionResolveError(`Couldn't load app for version ${version} from the archive`);
|
|
||||||
return cachedRes.text();
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
VersionResolveError,
|
|
||||||
getIndexForVersion
|
|
||||||
};
|
|
||||||
@@ -18,24 +18,15 @@ const getCurrentVersion = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateInFile = (filePath, oldVersion, newVersion) => {
|
|
||||||
const originalFile = fs.readFileSync(filePath);
|
|
||||||
const newFile = originalFile.toString().replaceAll(oldVersion, newVersion);
|
|
||||||
|
|
||||||
fs.writeFileSync(filePath, newFile);
|
|
||||||
};
|
|
||||||
|
|
||||||
const updateVersion = async (oldVersion, newVersion) => {
|
const updateVersion = async (oldVersion, newVersion) => {
|
||||||
const filesToUpdate = [
|
const readmePath = '../../README.md';
|
||||||
'../../src/util/Constants.js',
|
|
||||||
'../../README.md',
|
|
||||||
];
|
|
||||||
|
|
||||||
for (const file of filesToUpdate) {
|
const readme = fs.readFileSync(readmePath);
|
||||||
updateInFile(file, oldVersion, newVersion);
|
const newReadme = readme.toString().replaceAll(oldVersion, newVersion);
|
||||||
}
|
|
||||||
|
|
||||||
|
fs.writeFileSync(readmePath, newReadme);
|
||||||
fs.writeFileSync('./.version', newVersion);
|
fs.writeFileSync('./.version', newVersion);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
(async () => {
|
(async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user