Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
1499ea503e chore(deps): bump node-fetch from 2.6.7 to 3.3.0
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.7 to 3.3.0.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.7...v3.3.0)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-26 09:28:42 +00:00
5 changed files with 8 additions and 52 deletions

View File

@@ -33,7 +33,7 @@
"fluent-ffmpeg": "^2.1.2",
"jsqr": "^1.3.1",
"mime": "^3.0.0",
"node-fetch": "^2.6.5",
"node-fetch": "^3.3.0",
"node-webpmux": "^3.1.0",
"puppeteer": "^13.0.0"
},

View File

@@ -6,7 +6,6 @@ const moduleRaid = require('@pedroslopez/moduleraid/moduleraid');
const Util = require('./util/Util');
const InterfaceController = require('./util/InterfaceController');
const { getIndexForVersion } = require('./util/VersionResolver');
const { WhatsWebURL, DefaultOptions, Events, WAState } = require('./util/Constants');
const { ExposeStore, LoadUtils } = require('./util/Injected');
const ChatFactory = require('./factories/ChatFactory');
@@ -109,7 +108,6 @@ class Client extends EventEmitter {
this.pupPage = page;
await this.authStrategy.afterBrowserInitialized();
await this.initVersionOverride();
await page.goto(WhatsWebURL, {
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
*/

View File

@@ -7,7 +7,6 @@ exports.DefaultOptions = {
headless: true,
defaultViewport: null
},
webVersion: '2.2244.6',
authTimeoutMs: 0,
qrMaxRetries: 0,
takeoverOnConflict: false,

View File

@@ -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
};

View File

@@ -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 filesToUpdate = [
'../../src/util/Constants.js',
'../../README.md',
];
const readmePath = '../../README.md';
const readme = fs.readFileSync(readmePath);
const newReadme = readme.toString().replaceAll(oldVersion, newVersion);
for (const file of filesToUpdate) {
updateInFile(file, oldVersion, newVersion);
}
fs.writeFileSync('./.version', newVersion);
fs.writeFileSync(readmePath, newReadme);
fs.writeFileSync('./.version', newVersion);
};
(async () => {