NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-16 04:02:54 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed redis cache from is on whatsapp

Browse Source
This commit is contained in:
Judson Cairo 2024-08-28 17:29:01 -03:00
parent 49806cf47e
commit 41342f39de
3 changed files with 9 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.example
View File

@ -180,9 +180,6 @@ CACHE_REDIS_PREFIX_KEY=evolution
CACHE_REDIS_SAVE_INSTANCES=false CACHE_REDIS_SAVE_INSTANCES=false
# Local Cache enabled # Local Cache enabled
CACHE_LOCAL_ENABLED=false CACHE_LOCAL_ENABLED=false
# Local Cache enabled
CACHE_REDIS_SAVE_IS_ON_WHATSAPP=false
CACHE_REDIS_SAVE_IS_ON_WHATSAPP_DAYS=7
# Amazon S3 - Environment variables # Amazon S3 - Environment variables
S3_ENABLED=false S3_ENABLED=false

5
src/config/env.config.ts
View File

@ -169,8 +169,6 @@ export type CacheConfRedis = {
PREFIX_KEY: string; PREFIX_KEY: string;
TTL: number; TTL: number;
SAVE_INSTANCES: boolean; SAVE_INSTANCES: boolean;
SAVE_IS_ON_WHATSAPP: boolean;
SAVE_IS_ON_WHATSAPP_TTL: number;
}; };
export type CacheConfLocal = { export type CacheConfLocal = {
ENABLED: boolean; ENABLED: boolean;
@ -457,9 +455,6 @@ export class ConfigService {
PREFIX_KEY: process.env?.CACHE_REDIS_PREFIX_KEY || 'evolution-cache', PREFIX_KEY: process.env?.CACHE_REDIS_PREFIX_KEY || 'evolution-cache',
TTL: Number.parseInt(process.env?.CACHE_REDIS_TTL) || 604800, TTL: Number.parseInt(process.env?.CACHE_REDIS_TTL) || 604800,
SAVE_INSTANCES: process.env?.CACHE_REDIS_SAVE_INSTANCES === 'true', SAVE_INSTANCES: process.env?.CACHE_REDIS_SAVE_INSTANCES === 'true',
SAVE_IS_ON_WHATSAPP: process.env?.CACHE_REDIS_SAVE_IS_ON_WHATSAPP === 'true',
SAVE_IS_ON_WHATSAPP_TTL:
(Number.parseInt(process.env?.CACHE_REDIS_SAVE_IS_ON_WHATSAPP_TTL) || 7) * 24 * 60 * 60,
}, },
LOCAL: { LOCAL: {
ENABLED: process.env?.CACHE_LOCAL_ENABLED === 'true', ENABLED: process.env?.CACHE_LOCAL_ENABLED === 'true',

71
src/utils/onWhatsappCache.ts
View File

@ -1,5 +1,5 @@
import { cache, prismaRepository } from '@api/server.module'; import { prismaRepository } from '@api/server.module';
import { CacheConf, configService, Database } from '@config/env.config'; import { configService, Database } from '@config/env.config';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
function getAvailableNumbers(remoteJid: string) { function getAvailableNumbers(remoteJid: string) {
@ -54,23 +54,6 @@ interface ISaveOnWhatsappCacheParams {
remoteJid: string; remoteJid: string;
} }
export async function saveOnWhatsappCache(data: ISaveOnWhatsappCacheParams[]) { export async function saveOnWhatsappCache(data: ISaveOnWhatsappCacheParams[]) {
const cacheConfig = configService.get<CacheConf>('CACHE');
if (cacheConfig.REDIS.ENABLED && cacheConfig.REDIS.SAVE_IS_ON_WHATSAPP) {
await Promise.all(
data.map(async (item) => {
const remoteJid = item.remoteJid.startsWith('+') ? item.remoteJid.slice(1) : item.remoteJid;
const numbersAvailable = getAvailableNumbers(remoteJid);
await cache.set(
`isOnWhatsapp:${remoteJid}`,
JSON.stringify({ jidOptions: numbersAvailable }),
cacheConfig.REDIS.SAVE_IS_ON_WHATSAPP_TTL,
);
}),
);
}
if (configService.get<Database>('DATABASE').SAVE_DATA.IS_ON_WHATSAPP) { if (configService.get<Database>('DATABASE').SAVE_DATA.IS_ON_WHATSAPP) {
const upsertsQuery = data.map((item) => { const upsertsQuery = data.map((item) => {
const remoteJid = item.remoteJid.startsWith('+') ? item.remoteJid.slice(1) : item.remoteJid; const remoteJid = item.remoteJid.startsWith('+') ? item.remoteJid.slice(1) : item.remoteJid;
@ -88,48 +71,14 @@ export async function saveOnWhatsappCache(data: ISaveOnWhatsappCacheParams[]) {
} }
export async function getOnWhatsappCache(remoteJids: string[]) { export async function getOnWhatsappCache(remoteJids: string[]) {
const cacheConfig = configService.get<CacheConf>('CACHE'); let results: {
const results: {
remoteJid: string; remoteJid: string;
number: string; number: string;
jidOptions: string[]; jidOptions: string[];
}[] = []; }[] = [];
if (cacheConfig.REDIS.ENABLED && cacheConfig.REDIS.SAVE_IS_ON_WHATSAPP) {
const data = await Promise.all(
remoteJids.map(async (remoteJid) => {
const remoteJidWithoutPlus = remoteJid.startsWith('+') ? remoteJid.slice(1) : remoteJid;
const cacheData = await cache.get(`isOnWhatsapp:${remoteJidWithoutPlus}`);
if (cacheData) {
return {
remoteJid: remoteJidWithoutPlus,
number: remoteJidWithoutPlus.split('@')[0],
jidOptions: JSON.parse(cacheData)?.jidOptions,
};
}
return null;
}),
);
data.forEach((item) => {
if (item) {
results.push({
remoteJid: item.remoteJid,
number: item.number,
jidOptions: item.jidOptions,
});
}
});
}
if (configService.get<Database>('DATABASE').SAVE_DATA.IS_ON_WHATSAPP) { if (configService.get<Database>('DATABASE').SAVE_DATA.IS_ON_WHATSAPP) {
const remoteJidsWithoutPlus = remoteJids const remoteJidsWithoutPlus = remoteJids.map((remoteJid) => getAvailableNumbers(remoteJid)).flat();
.filter((remoteJid) => !results.some((result) => result.remoteJid === remoteJid))
.map((remoteJid) => getAvailableNumbers(remoteJid))
.flat();
const onWhatsappCache = await prismaRepository.isOnWhatsapp.findMany({ const onWhatsappCache = await prismaRepository.isOnWhatsapp.findMany({
where: { where: {
@ -140,13 +89,11 @@ export async function getOnWhatsappCache(remoteJids: string[]) {
}, },
}); });
onWhatsappCache.forEach((item) => results = onWhatsappCache.map((item) => ({
results.push({ remoteJid: item.remoteJid,
remoteJid: item.remoteJid, number: item.remoteJid.split('@')[0],
number: item.remoteJid.split('@')[0], jidOptions: item.jidOptions.split(','),
jidOptions: item.jidOptions.split(','), }));
}),
);
} }
return results; return results;