mirror of
https://github.com/EvolutionAPI/evolution-api.git
synced 2026-03-21 20:18:40 -06:00
feat(baileys): implement caching for WhatsApp Web version fetching
- Added caching mechanism to store and retrieve the latest WhatsApp Web version - Enhanced error handling to utilize cached fallback versions when fetching fails - Updated the fetchLatestWaWebVersion function to accept a cache service as an optional parameter
This commit is contained in:
@@ -640,7 +640,7 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fetch latest WhatsApp Web version automatically
|
// Fetch latest WhatsApp Web version automatically
|
||||||
const baileysVersion = await fetchLatestWaWebVersion({});
|
const baileysVersion = await fetchLatestWaWebVersion({}, this.cache);
|
||||||
const version = baileysVersion.version;
|
const version = baileysVersion.version;
|
||||||
|
|
||||||
const log = `Baileys version: ${version.join('.')}`;
|
const log = `Baileys version: ${version.join('.')}`;
|
||||||
|
|||||||
@@ -1,9 +1,20 @@
|
|||||||
import axios, { AxiosRequestConfig } from 'axios';
|
import axios, { AxiosRequestConfig } from 'axios';
|
||||||
import { fetchLatestBaileysVersion, WAVersion } from 'baileys';
|
import { fetchLatestBaileysVersion, WAVersion } from 'baileys';
|
||||||
|
|
||||||
|
import { CacheService } from '../api/services/cache.service';
|
||||||
|
import { CacheEngine } from '../cache/cacheengine';
|
||||||
import { Baileys, configService } from '../config/env.config';
|
import { Baileys, configService } from '../config/env.config';
|
||||||
|
|
||||||
export const fetchLatestWaWebVersion = async (options: AxiosRequestConfig<{}>) => {
|
// Cache keys
|
||||||
|
const CACHE_KEY_WHATSAPP_WEB_VERSION = 'whatsapp_web_version';
|
||||||
|
const CACHE_KEY_BAILEYS_FALLBACK_VERSION = 'baileys_fallback_version';
|
||||||
|
|
||||||
|
// Cache TTL (1 hour in seconds)
|
||||||
|
const CACHE_TTL_SECONDS = 3600;
|
||||||
|
|
||||||
|
const MODULE_NAME = 'whatsapp-version';
|
||||||
|
|
||||||
|
export const fetchLatestWaWebVersion = async (options: AxiosRequestConfig<{}>, cache?: CacheService) => {
|
||||||
// Check if manual version is set via configuration
|
// Check if manual version is set via configuration
|
||||||
const baileysConfig = configService.get<Baileys>('BAILEYS');
|
const baileysConfig = configService.get<Baileys>('BAILEYS');
|
||||||
const manualVersion = baileysConfig?.VERSION;
|
const manualVersion = baileysConfig?.VERSION;
|
||||||
@@ -19,6 +30,22 @@ export const fetchLatestWaWebVersion = async (options: AxiosRequestConfig<{}>) =
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let versionCache = cache || null;
|
||||||
|
|
||||||
|
if (!versionCache) {
|
||||||
|
// Cache estático para versões do WhatsApp Web e fallback do Baileys (fallback se não for passado via parâmetro)
|
||||||
|
const cacheEngine = new CacheEngine(configService, MODULE_NAME);
|
||||||
|
const engine = cacheEngine.getEngine();
|
||||||
|
const defaultVersionCache = new CacheService(engine);
|
||||||
|
versionCache = defaultVersionCache;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check cache for WhatsApp Web version
|
||||||
|
const cachedWaVersion = await versionCache.get(CACHE_KEY_WHATSAPP_WEB_VERSION);
|
||||||
|
if (cachedWaVersion) {
|
||||||
|
return cachedWaVersion;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { data } = await axios.get('https://web.whatsapp.com/sw.js', {
|
const { data } = await axios.get('https://web.whatsapp.com/sw.js', {
|
||||||
...options,
|
...options,
|
||||||
@@ -29,26 +56,51 @@ export const fetchLatestWaWebVersion = async (options: AxiosRequestConfig<{}>) =
|
|||||||
const match = data.match(regex);
|
const match = data.match(regex);
|
||||||
|
|
||||||
if (!match?.[1]) {
|
if (!match?.[1]) {
|
||||||
return {
|
// Check cache for Baileys fallback version
|
||||||
|
const cachedFallback = await versionCache.get(CACHE_KEY_BAILEYS_FALLBACK_VERSION);
|
||||||
|
if (cachedFallback) {
|
||||||
|
return cachedFallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch and cache Baileys fallback version
|
||||||
|
const fallbackVersion = {
|
||||||
version: (await fetchLatestBaileysVersion()).version as WAVersion,
|
version: (await fetchLatestBaileysVersion()).version as WAVersion,
|
||||||
isLatest: false,
|
isLatest: false,
|
||||||
error: {
|
error: {
|
||||||
message: 'Could not find client revision in the fetched content',
|
message: 'Could not find client revision in the fetched content',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
await versionCache.set(CACHE_KEY_BAILEYS_FALLBACK_VERSION, fallbackVersion, CACHE_TTL_SECONDS);
|
||||||
|
return fallbackVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
const clientRevision = match[1];
|
const clientRevision = match[1];
|
||||||
|
|
||||||
return {
|
const result = {
|
||||||
version: [2, 3000, +clientRevision] as WAVersion,
|
version: [2, 3000, +clientRevision] as WAVersion,
|
||||||
isLatest: true,
|
isLatest: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Cache the successful result
|
||||||
|
await versionCache.set(CACHE_KEY_WHATSAPP_WEB_VERSION, result, CACHE_TTL_SECONDS);
|
||||||
|
|
||||||
|
return result;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return {
|
// Check cache for Baileys fallback version
|
||||||
|
const cachedFallback = await versionCache.get(CACHE_KEY_BAILEYS_FALLBACK_VERSION);
|
||||||
|
if (cachedFallback) {
|
||||||
|
return cachedFallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch and cache Baileys fallback version
|
||||||
|
const fallbackVersion = {
|
||||||
version: (await fetchLatestBaileysVersion()).version as WAVersion,
|
version: (await fetchLatestBaileysVersion()).version as WAVersion,
|
||||||
isLatest: false,
|
isLatest: false,
|
||||||
error,
|
error,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
await versionCache.set(CACHE_KEY_BAILEYS_FALLBACK_VERSION, fallbackVersion, CACHE_TTL_SECONDS);
|
||||||
|
return fallbackVersion;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user