wip

2025-12-26 07:07:45 -06:00 · 2023-07-26 10:30:26 -03:00
parent cc91f2e5db
commit e151eb85f0
55 changed files with 340 additions and 273 deletions
--- a/src/whatsapp/services/auth.service.ts
+++ b/src/whatsapp/services/auth.service.ts
@@ -1,14 +1,15 @@
-import { Auth, ConfigService, Webhook } from '../../config/env.config';
-import { InstanceDto } from '../dto/instance.dto';
-import { name as apiName } from '../../../package.json';
-import { verify, sign } from 'jsonwebtoken';
-import { Logger } from '../../config/logger.config';
-import { v4 } from 'uuid';
-import { isJWT } from 'class-validator';
-import { BadRequestException } from '../../exceptions';
 import axios from 'axios';
-import { WAMonitoringService } from './monitor.service';
+import { isJWT } from 'class-validator';
+import { sign, verify } from 'jsonwebtoken';
+import { v4 } from 'uuid';
+
+import { name as apiName } from '../../../package.json';
+import { Auth, ConfigService, Webhook } from '../../config/env.config';
+import { Logger } from '../../config/logger.config';
+import { BadRequestException } from '../../exceptions';
+import { InstanceDto } from '../dto/instance.dto';
 import { RepositoryBroker } from '../repository/repository.manager';
+import { WAMonitoringService } from './monitor.service';

 export type JwtPayload = {
  instanceName: string;
--- a/src/whatsapp/services/chatwoot.service.ts
+++ b/src/whatsapp/services/chatwoot.service.ts
@@ -1,18 +1,17 @@
-import { InstanceDto } from '../dto/instance.dto';
-import path from 'path';
-import { ChatwootDto } from '../dto/chatwoot.dto';
-import { WAMonitoringService } from './monitor.service';
-import { Logger } from '../../config/logger.config';
 import ChatwootClient from '@figuro/chatwoot-sdk';
-import { createReadStream, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import axios from 'axios';
 import FormData from 'form-data';
-import { SendTextDto } from '../dto/sendMessage.dto';
+import { createReadStream, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import mimeTypes from 'mime-types';
-import { SendAudioDto } from '../dto/sendMessage.dto';
-import { SendMediaDto } from '../dto/sendMessage.dto';
-import { ROOT_DIR } from '../../config/path.config';
+import path from 'path';
+
 import { ConfigService, HttpServer } from '../../config/env.config';
+import { Logger } from '../../config/logger.config';
+import { ROOT_DIR } from '../../config/path.config';
+import { ChatwootDto } from '../dto/chatwoot.dto';
+import { InstanceDto } from '../dto/instance.dto';
+import { SendAudioDto, SendMediaDto, SendTextDto } from '../dto/sendMessage.dto';
+import { WAMonitoringService } from './monitor.service';

 export class ChatwootService {
  private messageCacheFile: string;
--- a/src/whatsapp/services/monitor.service.ts
+++ b/src/whatsapp/services/monitor.service.ts
@@ -1,9 +1,10 @@
-import { opendirSync, readdirSync, rmSync } from 'fs';
-import { WAStartupService } from './whatsapp.service';
-import { INSTANCE_DIR, STORE_DIR } from '../../config/path.config';
+import { execSync } from 'child_process';
 import EventEmitter2 from 'eventemitter2';
+import { opendirSync, readdirSync, rmSync } from 'fs';
+import { Db } from 'mongodb';
+import mongoose from 'mongoose';
 import { join } from 'path';
-import { Logger } from '../../config/logger.config';
+
 import {
  Auth,
  ConfigService,
@@ -12,13 +13,11 @@ import {
  HttpServer,
  Redis,
 } from '../../config/env.config';
-import { RepositoryBroker } from '../repository/repository.manager';
-import { NotFoundException } from '../../exceptions';
-import { Db } from 'mongodb';
-import { RedisCache } from '../../db/redis.client';
-import { execSync } from 'child_process';
+import { Logger } from '../../config/logger.config';
+import { INSTANCE_DIR, STORE_DIR } from '../../config/path.config';
 import { dbserver } from '../../db/db.connect';
-import mongoose from 'mongoose';
+import { RedisCache } from '../../db/redis.client';
+import { NotFoundException } from '../../exceptions';
 import {
  AuthModel,
  ChatwootModel,
@@ -28,6 +27,8 @@ import {
  SettingsModel,
  WebhookModel,
 } from '../models';
+import { RepositoryBroker } from '../repository/repository.manager';
+import { WAStartupService } from './whatsapp.service';

 export class WAMonitoringService {
  constructor(
@@ -183,7 +184,7 @@ export class WAMonitoringService {
          });
          this.logger.verbose('instance files deleted: ' + name);
        });
-      } else if (this.redis.ENABLED) {
+        // } else if (this.redis.ENABLED) {
      } else {
        const dir = opendirSync(INSTANCE_DIR, { encoding: 'utf-8' });
        for await (const dirent of dir) {
@@ -337,7 +338,9 @@ export class WAMonitoringService {
      try {
        this.logger.verbose('instance: ' + instanceName + ' - removing from memory');
        this.waInstances[instanceName] = undefined;
-      } catch {}
+      } catch (error) {
+        this.logger.error(error);
+      }

      try {
        this.logger.verbose('request cleaning up instance: ' + instanceName);
--- a/src/whatsapp/services/settings.service.ts
+++ b/src/whatsapp/services/settings.service.ts
@@ -1,7 +1,7 @@
+import { Logger } from '../../config/logger.config';
 import { InstanceDto } from '../dto/instance.dto';
 import { SettingsDto } from '../dto/settings.dto';
 import { WAMonitoringService } from './monitor.service';
-import { Logger } from '../../config/logger.config';

 export class SettingsService {
  constructor(private readonly waMonitor: WAMonitoringService) {}
--- a/src/whatsapp/services/webhook.service.ts
+++ b/src/whatsapp/services/webhook.service.ts
@@ -1,7 +1,7 @@
+import { Logger } from '../../config/logger.config';
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { WAMonitoringService } from './monitor.service';
-import { Logger } from '../../config/logger.config';

 export class WebhookService {
  constructor(private readonly waMonitor: WAMonitoringService) {}
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -1,9 +1,10 @@
+import ffmpegPath from '@ffmpeg-installer/ffmpeg';
+import { Boom } from '@hapi/boom';
 import makeWASocket, {
  AnyMessageContent,
  BufferedEventData,
  BufferJSON,
  CacheStore,
-  makeCacheableSignalKeyStore,
  Chat,
  ConnectionState,
  Contact,
@@ -12,11 +13,13 @@ import makeWASocket, {
  downloadMediaMessage,
  fetchLatestBaileysVersion,
  generateWAMessageFromContent,
+  getAggregateVotesInPollMessage,
  getContentType,
  getDevice,
  GroupMetadata,
  isJidGroup,
  isJidUser,
+  makeCacheableSignalKeyStore,
  MessageUpsertType,
  MiscMessageGenerationOptions,
  ParticipantAction,
@@ -29,8 +32,24 @@ import makeWASocket, {
  WAMessage,
  WAMessageUpdate,
  WASocket,
-  getAggregateVotesInPollMessage,
 } from '@whiskeysockets/baileys';
+import axios from 'axios';
+import { exec, execSync } from 'child_process';
+import { arrayUnique, isBase64, isURL } from 'class-validator';
+import EventEmitter2 from 'eventemitter2';
+import fs, { existsSync, readFileSync } from 'fs';
+import Long from 'long';
+import NodeCache from 'node-cache';
+import { getMIMEType } from 'node-mime-types';
+import { release } from 'os';
+import { join } from 'path';
+import P from 'pino';
+import ProxyAgent from 'proxy-agent';
+import qrcode, { QRCodeToDataURLOptions } from 'qrcode';
+import qrcodeTerminal from 'qrcode-terminal';
+import sharp from 'sharp';
+import { v4 } from 'uuid';
+
 import {
  Auth,
  CleanStoreConf,
@@ -38,31 +57,45 @@ import {
  ConfigSessionPhone,
  Database,
  HttpServer,
+  Log,
  QrCode,
  Redis,
  Webhook,
 } from '../../config/env.config';
-import fs from 'fs';
 import { Logger } from '../../config/logger.config';
 import { INSTANCE_DIR, ROOT_DIR } from '../../config/path.config';
-import { existsSync, readFileSync } from 'fs';
-import { join } from 'path';
-import axios from 'axios';
-import { v4 } from 'uuid';
-import qrcode, { QRCodeToDataURLOptions } from 'qrcode';
-import qrcodeTerminal from 'qrcode-terminal';
-import { Events, TypeMediaMessage, wa, MessageSubtype } from '../types/wa.types';
-import { Boom } from '@hapi/boom';
-import EventEmitter2 from 'eventemitter2';
-import { release } from 'os';
-import P from 'pino';
-import { execSync, exec } from 'child_process';
-import ffmpegPath from '@ffmpeg-installer/ffmpeg';
-import { RepositoryBroker } from '../repository/repository.manager';
-import { MessageRaw, MessageUpdateRaw } from '../models/message.model';
-import { ContactRaw } from '../models/contact.model';
-import { ChatRaw } from '../models/chat.model';
-import { getMIMEType } from 'node-mime-types';
+import { dbserver } from '../../db/db.connect';
+import { RedisCache } from '../../db/redis.client';
+import {
+  BadRequestException,
+  InternalServerErrorException,
+  NotFoundException,
+} from '../../exceptions';
+import { useMultiFileAuthStateDb } from '../../utils/use-multi-file-auth-state-db';
+import { useMultiFileAuthStateRedisDb } from '../../utils/use-multi-file-auth-state-redis-db';
+import {
+  ArchiveChatDto,
+  DeleteMessage,
+  getBase64FromMediaMessageDto,
+  NumberBusiness,
+  OnWhatsAppDto,
+  PrivacySettingDto,
+  ReadMessageDto,
+  WhatsAppNumberDto,
+} from '../dto/chat.dto';
+import {
+  CreateGroupDto,
+  GetParticipant,
+  GroupDescriptionDto,
+  GroupInvite,
+  GroupJid,
+  GroupPictureDto,
+  GroupSendInvite,
+  GroupSubjectDto,
+  GroupToggleEphemeralDto,
+  GroupUpdateParticipantDto,
+  GroupUpdateSettingDto,
+} from '../dto/group.dto';
 import {
  ContactMessage,
  MediaMessage,
@@ -73,59 +106,26 @@ import {
  SendListDto,
  SendLocationDto,
  SendMediaDto,
-  SendReactionDto,
-  SendTextDto,
  SendPollDto,
-  SendStickerDto,
+  SendReactionDto,
  SendStatusDto,
+  SendStickerDto,
+  SendTextDto,
  StatusMessage,
 } from '../dto/sendMessage.dto';
-import { arrayUnique, isBase64, isURL } from 'class-validator';
-import {
-  ArchiveChatDto,
-  DeleteMessage,
-  NumberBusiness,
-  OnWhatsAppDto,
-  PrivacySettingDto,
-  ReadMessageDto,
-  WhatsAppNumberDto,
-  getBase64FromMediaMessageDto,
-} from '../dto/chat.dto';
-import { MessageQuery } from '../repository/message.repository';
-import { ContactQuery } from '../repository/contact.repository';
-import {
-  BadRequestException,
-  InternalServerErrorException,
-  NotFoundException,
-} from '../../exceptions';
-import {
-  CreateGroupDto,
-  GroupInvite,
-  GroupJid,
-  GroupPictureDto,
-  GroupUpdateParticipantDto,
-  GroupUpdateSettingDto,
-  GroupToggleEphemeralDto,
-  GroupSubjectDto,
-  GroupDescriptionDto,
-  GroupSendInvite,
-  GetParticipant,
-} from '../dto/group.dto';
-import { MessageUpQuery } from '../repository/messageUp.repository';
-import { useMultiFileAuthStateDb } from '../../utils/use-multi-file-auth-state-db';
-import Long from 'long';
-import { WebhookRaw } from '../models/webhook.model';
-import { ChatwootRaw } from '../models/chatwoot.model';
-import { dbserver } from '../../db/db.connect';
-import NodeCache from 'node-cache';
-import { useMultiFileAuthStateRedisDb } from '../../utils/use-multi-file-auth-state-redis-db';
-import sharp from 'sharp';
-import { RedisCache } from '../../db/redis.client';
-import { Log } from '../../config/env.config';
-import ProxyAgent from 'proxy-agent';
-import { ChatwootService } from './chatwoot.service';
-import { waMonitor } from '../whatsapp.module';
 import { SettingsRaw } from '../models';
+import { ChatRaw } from '../models/chat.model';
+import { ChatwootRaw } from '../models/chatwoot.model';
+import { ContactRaw } from '../models/contact.model';
+import { MessageRaw, MessageUpdateRaw } from '../models/message.model';
+import { WebhookRaw } from '../models/webhook.model';
+import { ContactQuery } from '../repository/contact.repository';
+import { MessageQuery } from '../repository/message.repository';
+import { MessageUpQuery } from '../repository/messageUp.repository';
+import { RepositoryBroker } from '../repository/repository.manager';
+import { Events, MessageSubtype, TypeMediaMessage, wa } from '../types/wa.types';
+import { waMonitor } from '../whatsapp.module';
+import { ChatwootService } from './chatwoot.service';

 export class WAStartupService {
  constructor(
@@ -395,7 +395,7 @@ export class WAStartupService {
    const webhookGlobal = this.configService.get<Webhook>('WEBHOOK');
    const webhookLocal = this.localWebhook.events;
    const serverUrl = this.configService.get<HttpServer>('SERVER').URL;
-    const we = event.replace(/[\.-]/gm, '_').toUpperCase();
+    const we = event.replace(/[.-]/gm, '_').toUpperCase();
    const transformedWe = we.replace(/_/gm, '-').toLowerCase();

    const expose =
@@ -796,7 +796,9 @@ export class WAStartupService {
              );
            }
          }
-        } catch (error) {}
+        } catch (error) {
+          this.logger.error(error);
+        }
      }, (cleanStore?.CLEANING_INTERVAL ?? 3600) * 1000);
    }
  }
@@ -1514,7 +1516,7 @@ export class WAStartupService {
      .replace(/\+/g, '')
      .replace(/\(/g, '')
      .replace(/\)/g, '')
-      .split(/\:/)[0]
+      .split(':')[0]
      .split('@')[0];

    if (number.length >= 18) {