Merge branch 'code-chat-br:main' into main

tarunkumarf22labs · web-flow · commit 001094af026b · 2023-10-25T18:07:11.000+05:30
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-api",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {
@@ -45,7 +45,7 @@
     "@hapi/boom": "^10.0.1",
     "@whiskeysockets/baileys": "^6.4.0",
     "axios": "^1.3.5",
-    "class-validator": "^0.13.2",
+    "class-validator": "^0.14.0",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
@@ -55,17 +55,17 @@
     "express-async-errors": "^3.1.1",
     "express-session": "^1.17.3",
     "hbs": "^4.2.0",
-    "jimp": "^0.16.13",
+    "jimp": "^0.22.10",
     "join": "^3.0.0",
     "js-yaml": "^4.1.0",
     "jsonschema": "^1.4.1",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.2",
     "mime-types": "^2.1.35",
-    "mongoose": "^6.10.5",
+    "mongoose": "^7.6.2",
     "multer": "^1.4.5-lts.1",
     "node-cache": "^5.1.2",
     "node-mime-types": "^1.1.0",
-    "pino": "^8.11.0",
+    "pino": "^8.16.0",
     "qrcode": "^1.5.1",
     "qrcode-terminal": "^0.12.0",
     "redis": "^4.6.5",
@@ -76,26 +76,26 @@
   "devDependencies": {
     "@types/compression": "^1.7.2",
     "@types/cors": "^2.8.13",
-    "@types/express": "^4.17.17",
+    "@types/express": "^4.17.19",
     "@types/express-session": "^1.17.7",
-    "@types/js-yaml": "^4.0.5",
-    "@types/jsonwebtoken": "^8.5.9",
+    "@types/js-yaml": "^4.0.7",
+    "@types/jsonwebtoken": "^9.0.3",
     "@types/mime-types": "^2.1.2",
     "@types/multer": "^1.4.7",
-    "@types/node": "^18.15.11",
+    "@types/node": "^20.8.6",
     "@types/qrcode": "^1.5.0",
     "@types/qrcode-terminal": "^0.12.0",
     "@types/swagger-ui-express": "^4.1.3",
-    "@types/uuid": "^8.3.4",
+    "@types/uuid": "^9.0.5",
     "@types/yamljs": "^0.2.31",
-    "@typescript-eslint/eslint-plugin": "^5.57.1",
-    "@typescript-eslint/parser": "^5.57.1",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
     "copy-webpack-plugin": "^11.0.0",
-    "eslint": "^8.38.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.8.7",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "prettier": "^3.0.3",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.2.2"
   }
 }
diff --git a/src/db/db.connect.ts b/src/db/db.connect.ts
@@ -46,7 +46,7 @@ export const dbserver = (() => {
     });
     logger.info('ON - dbName: ' + dbs['$dbName']);
     process.on('beforeExit', () => {
-      dbserver.destroy(true, (error) => logger.error(error));
+      dbserver.destroy(true);
     });
 
     return dbs;
diff --git a/src/docs/swagger.yaml b/src/docs/swagger.yaml
@@ -193,6 +193,33 @@ paths:
                   base64:
                     type: string
                     description: The QR Code as a string.
+  /instance/reload/{instanceName}:
+    get:
+      tags:
+        - Instance Controller
+      summary: Instance Reload
+      parameters:
+        - name: instanceName
+          in: path
+          required: true
+          schema:
+            type: string
+          description: Reload to your instance.
+          example: 'codechat'
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  instance:
+                    type: string
+                  state:
+                    type: string
+                  statusReason:
+                    type: string
   /instance/connectionState/{instanceName}:
     get:
       tags:
diff --git a/src/utils/use-multi-file-auth-state-db.ts b/src/utils/use-multi-file-auth-state-db.ts
@@ -58,7 +58,7 @@ export async function useMultiFileAuthStateDb(coll: string): Promise<AuthState>
     try {
       await client.connect();
       return await collection.replaceOne(
-        { _id: key },
+        { _id: key } as any,
         JSON.parse(JSON.stringify(data, BufferJSON.replacer)),
         { upsert: true },
       );
@@ -68,7 +68,7 @@ export async function useMultiFileAuthStateDb(coll: string): Promise<AuthState>
   const readData = async (key: string): Promise<any> => {
     try {
       await client.connect();
-      const data = await collection.findOne({ _id: key });
+      const data = await collection.findOne({ _id: key } as any);
       const creds = JSON.stringify(data);
       return JSON.parse(creds, BufferJSON.reviver);
     } catch {}
@@ -77,7 +77,7 @@ export async function useMultiFileAuthStateDb(coll: string): Promise<AuthState>
   const removeData = async (key: string) => {
     try {
       await client.connect();
-      return await collection.deleteOne({ _id: key });
+      return await collection.deleteOne({ _id: key } as any);
     } catch {}
   };
 
diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts
@@ -96,6 +96,24 @@ export class InstanceController {
     }
   }
 
+  public async reloadConnection({ instanceName }: InstanceDto) {
+    try {
+      const instance = this.waMonitor.waInstances[instanceName];
+      const state = instance?.connectionStatus?.state;
+
+      switch (state) {
+        case 'open':
+          await instance.reloadConnection();
+          await delay(2000);
+          return await this.connectionState({ instanceName });
+        default:
+          return await this.connectionState({ instanceName });
+      }
+    } catch (error) {
+      this.logger.error(error);
+    }
+  }
+
   public async connectToWhatsapp({ instanceName }: InstanceDto) {
     try {
       const instance = this.waMonitor.waInstances[instanceName];
diff --git a/src/whatsapp/models/message.model.ts b/src/whatsapp/models/message.model.ts
@@ -53,6 +53,9 @@ class Key {
 }
 
 export class MessageRaw {
+  constructor(props?: MessageRaw) {
+    Object.assign(this, props);
+  }
   _id?: string;
   key?: Key;
   pushName?: string;
diff --git a/src/whatsapp/routers/instance.router.ts b/src/whatsapp/routers/instance.router.ts
@@ -88,6 +88,16 @@ export class InstanceRouter extends RouterBroker {
 
         return res.status(HttpStatus.OK).json(response);
       })
+      .get(this.routerPath('reload'), ...guards, async (req, res) => {
+        const response = await this.dataValidate<InstanceDto>({
+          request: req,
+          schema: instanceNameSchema,
+          ClassRef: InstanceDto,
+          execute: (instance) => instanceController.reloadConnection(instance),
+        });
+
+        return res.status(HttpStatus.OK).json(response);
+      })
       .delete(this.routerPath('logout'), ...guards, async (req, res) => {
         const response = await this.dataValidate<InstanceDto>({
           request: req,
diff --git a/src/whatsapp/services/monitor.service.ts b/src/whatsapp/services/monitor.service.ts
@@ -122,7 +122,7 @@ export class WAMonitoringService {
             $or: [
               { _id: { $regex: /^app.state.*/ } },
               { _id: { $regex: /^session-.*/ } },
-            ],
+            ] as any[],
           });
         });
       } else if (this.redis.ENABLED) {
@@ -235,7 +235,7 @@ export class WAMonitoringService {
   private noConnection() {
     this.eventEmitter.on('no.connection', async (instanceName) => {
       const del = this.configService.get<DelInstance>('DEL_INSTANCE');
-      if(del) {
+      if (del) {
         try {
           this.waInstances[instanceName] = undefined;
           this.cleaningUp(instanceName);
diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
@@ -190,7 +190,7 @@ export class WAStartupService {
               '-instances',
           )
           .collection(this.instanceName);
-        const data = await collection.findOne({ _id: 'creds' });
+        const data = await collection.findOne({ _id: 'creds' } as any);
         if (data) {
           const creds = JSON.parse(JSON.stringify(data), BufferJSON.reviver);
           profileName = creds.me?.name || creds.me?.verifiedName;
@@ -444,43 +444,55 @@ export class WAStartupService {
     return await useMultiFileAuthState(join(INSTANCE_DIR, this.instance.name));
   }
 
-  public async connectToWhatsapp(): Promise<WASocket> {
-    try {
-      this.loadWebhook();
+  private async setSocket() {
+    this.endSession = false;
 
-      this.instance.authState = await this.defineAuthState();
+    this.instance.authState = await this.defineAuthState();
 
-      const { version } = await fetchLatestBaileysVersion();
-      const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
-      const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
+    const { version } = await fetchLatestBaileysVersion();
+    const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
+    const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
 
-      const socketConfig: UserFacingSocketConfig = {
-        auth: {
-          creds: this.instance.authState.state.creds,
-          keys: makeCacheableSignalKeyStore(
-            this.instance.authState.state.keys,
-            P({ level: 'error' }),
-          ),
-        },
-        logger: P({ level: 'error' }),
-        printQRInTerminal: false,
-        browser,
-        version,
-        connectTimeoutMs: 60_000,
-        qrTimeout: 40_000,
-        emitOwnEvents: false,
-        msgRetryCounterCache: this.msgRetryCounterCache,
-        getMessage: this.getMessage as any,
-        generateHighQualityLinkPreview: true,
-        syncFullHistory: true,
-        userDevicesCache: this.userDevicesCache,
-        transactionOpts: { maxCommitRetries: 3, delayBetweenTriesMs: 10 },
-      };
+    const socketConfig: UserFacingSocketConfig = {
+      auth: {
+        creds: this.instance.authState.state.creds,
+        keys: makeCacheableSignalKeyStore(
+          this.instance.authState.state.keys,
+          P({ level: 'silent' }) as any,
+        ),
+      },
+      logger: P({ level: 'silent' }) as any,
+      printQRInTerminal: false,
+      browser,
+      version,
+      connectTimeoutMs: 60_000,
+      qrTimeout: 10_000,
+      emitOwnEvents: false,
+      msgRetryCounterCache: this.msgRetryCounterCache,
+      getMessage: this.getMessage as any,
+      generateHighQualityLinkPreview: true,
+      syncFullHistory: true,
+      userDevicesCache: this.userDevicesCache,
+      transactionOpts: { maxCommitRetries: 1, delayBetweenTriesMs: 10 },
+    };
 
-      this.endSession = false;
+    return makeWASocket(socketConfig);
+  }
 
-      this.client = makeWASocket(socketConfig);
+  public async reloadConnection(): Promise<WASocket> {
+    try {
+      this.client = await this.setSocket();
+      return this.client;
+    } catch (error) {
+      this.logger.error(error);
+      throw new InternalServerErrorException(error?.toString());
+    }
+  }
 
+  public async connectToWhatsapp(): Promise<WASocket> {
+    try {
+      this.loadWebhook();
+      this.client = await this.setSocket();
       this.eventHandler();
 
       return this.client;
@@ -649,35 +661,39 @@ export class WAStartupService {
       },
       database: Database,
     ) => {
-      const received = messages[0];
-      if (
-        type !== 'notify' ||
-        !received?.message ||
-        received.message?.protocolMessage ||
-        received.message.senderKeyDistributionMessage
-      ) {
-        return;
-      }
+      for (const received of messages) {
+        if (
+          type !== 'notify' ||
+          !received?.message ||
+          received.message?.protocolMessage ||
+          received.message.senderKeyDistributionMessage
+        ) {
+          return;
+        }
 
-      this.client.sendPresenceUpdate('unavailable');
+        this.client.sendPresenceUpdate('unavailable');
 
-      if (Long.isLong(received.messageTimestamp)) {
-        received.messageTimestamp = received.messageTimestamp?.toNumber();
-      }
+        if (Long.isLong(received.messageTimestamp)) {
+          received.messageTimestamp = received.messageTimestamp?.toNumber();
+        }
 
-      const messageRaw: MessageRaw = {
-        key: received.key,
-        pushName: received.pushName,
-        message: { ...received.message },
-        messageTimestamp: received.messageTimestamp as number,
-        owner: this.instance.wuid,
-        source: getDevice(received.key.id),
-      };
+        const messageRaw = new MessageRaw({
+          key: received.key,
+          pushName: received.pushName,
+          message: { ...received.message },
+          messageTimestamp: received.messageTimestamp as number,
+          owner: this.instance.wuid,
+          source: getDevice(received.key.id),
+        });
 
-      this.logger.log(received);
+        this.logger.log(received);
 
-      await this.repository.message.insert([messageRaw], database.SAVE_DATA.NEW_MESSAGE);
-      await this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
+        await this.repository.message.insert(
+          [messageRaw],
+          database.SAVE_DATA.NEW_MESSAGE,
+        );
+        await this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
+      }
     },
 
     'messages.update': async (args: WAMessageUpdate[], database: Database) => {
@@ -1234,7 +1250,7 @@ export class WAStartupService {
         'buffer',
         {},
         {
-          logger: P({ level: 'error' }),
+          logger: P({ level: 'silent' }) as any,
           reuploadRequest: this.client.updateMediaMessage,
         },
       );
diff --git a/views/qrcode.hbs b/views/qrcode.hbs

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ class Key {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`export class MessageRaw {`
	`56`	`+ constructor(props?: MessageRaw) {`
	`57`	`+ Object.assign(this, props);`
	`58`	`+ }`
`56`	`59`	`_id?: string;`
`57`	`60`	`key?: Key;`
`58`	`61`	`pushName?: string;`