Merge branch 'release/1.4.8'

* Fixed error return bug
* Fixed problem of getting message when deleting message in chatwoot
* Change in error return pattern

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 1.4.8 (2023-07-27 10:27)
+
+### Fixed
+
+* Fixed error return bug
+
+# 1.4.7 (2023-07-27 08:47)
+
+### Fixed
+
+* Fixed error return bug
+* Fixed problem of getting message when deleting message in chatwoot
+* Change in error return pattern
+
 # 1.4.6 (2023-07-26 17:54)
 
 ### Fixed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {
@@ -46,7 +46,7 @@
     "@figuro/chatwoot-sdk": "^1.1.14",
     "@hapi/boom": "^10.0.1",
     "@sentry/node": "^7.59.2",
-    "@whiskeysockets/baileys": "^6.4.0",
+    "@whiskeysockets/baileys": "github:EvolutionAPI/Baileys",
     "axios": "^1.3.5",
     "class-validator": "^0.13.2",
     "compression": "^1.7.4",

src/exceptions/401.exception.ts

@@ -5,7 +5,7 @@ export class UnauthorizedException {
     throw {
       status: HttpStatus.UNAUTHORIZED,
       error: 'Unauthorized',
-      message: objectError.length > 0 ? objectError : undefined,
+      message: objectError.length > 0 ? objectError : 'Unauthorized',
     };
   }
 }

src/main.ts

@@ -1,6 +1,5 @@
 import 'express-async-errors';
 
-// import * as Sentry from '@sentry/node';
 import compression from 'compression';
 import cors from 'cors';
 import express, { json, NextFunction, Request, Response, urlencoded } from 'express';
@@ -22,27 +21,6 @@ function bootstrap() {
   const logger = new Logger('SERVER');
   const app = express();
 
-  // Sentry.init({
-  //   dsn: '',
-  //   integrations: [
-  //     // enable HTTP calls tracing
-  //     new Sentry.Integrations.Http({ tracing: true }),
-  //     // enable Express.js middleware tracing
-  //     new Sentry.Integrations.Express({ app }),
-  //     // Automatically instrument Node.js libraries and frameworks
-  //     ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
-  //   ],
-
-  //   // Set tracesSampleRate to 1.0 to capture 100%
-  //   // of transactions for performance monitoring.
-  //   // We recommend adjusting this value in production
-  //   tracesSampleRate: 1.0,
-  // });
-
-  // app.use(Sentry.Handlers.requestHandler());
-
-  // app.use(Sentry.Handlers.tracingHandler());
-
   app.use(
     cors({
       origin(requestOrigin, callback) {
@@ -67,26 +45,29 @@ function bootstrap() {
 
   app.use('/', router);
 
-  // app.use(Sentry.Handlers.errorHandler());
-
-  // app.use(function onError(err, req, res, next) {
-  //   res.statusCode = 500;
-  //   res.end(res.sentry + '\n');
-  // });
-
   app.use(
-    (err: Error, req: Request, res: Response) => {
+    (err: Error, req: Request, res: Response, next: NextFunction) => {
       if (err) {
-        return res.status(err['status'] || 500).json(err);
+        return res.status(err['status'] || 500).json({
+          status: err['status'] || 500,
+          error: err['error'] || 'Internal Server Error',
+          response: {
+            message: err['message'] || 'Internal Server Error',
+          },
+        });
       }
+
+      next();
     },
     (req: Request, res: Response, next: NextFunction) => {
       const { method, url } = req;
 
       res.status(HttpStatus.NOT_FOUND).json({
         status: HttpStatus.NOT_FOUND,
-        message: `Cannot ${method.toUpperCase()} ${url}`,
         error: 'Not Found',
+        response: {
+          message: [`Cannot ${method.toUpperCase()} ${url}`],
+        },
       });
 
       next();

src/whatsapp/abstract/abstract.router.ts

@@ -6,7 +6,7 @@ import { validate } from 'jsonschema';
 
 import { Logger } from '../../config/logger.config';
 import { BadRequestException } from '../../exceptions';
-import { GetParticipant, GroupInvite, GroupJid } from '../dto/group.dto';
+import { GetParticipant, GroupInvite } from '../dto/group.dto';
 import { InstanceDto } from '../dto/instance.dto';
 
 type DataValidate<T> = {
@@ -48,20 +48,21 @@ export abstract class RouterBroker {
     const v = schema ? validate(ref, schema) : { valid: true, errors: [] };
 
     if (!v.valid) {
-      const message: any[] = v.errors.map(({ property, stack, schema }) => {
+      const message: any[] = v.errors.map(({ stack, schema }) => {
         let message: string;
         if (schema['description']) {
           message = schema['description'];
         } else {
           message = stack.replace('instance.', '');
         }
-        return {
+        return message;
-          property: property.replace('instance.', ''),
+        // return {
-          message,
+        //   property: property.replace('instance.', ''),
-        };
+        //   message,
+        // };
       });
-      logger.error([...message]);
+      logger.error(message);
-      throw new BadRequestException(...message);
+      throw new BadRequestException(message);
     }
 
     return await execute(instance, ref);
@@ -105,7 +106,7 @@ export abstract class RouterBroker {
     const body = request.body;
 
     let groupJid = body?.groupJid;
-    
+
     if (!groupJid) {
       if (request.query?.groupJid) {
         groupJid = request.query.groupJid;
@@ -113,15 +114,15 @@ export abstract class RouterBroker {
         throw new BadRequestException('The group id needs to be informed in the query', 'ex: "groupJid=120362@g.us"');
       }
     }
-    
+
     if (!groupJid.endsWith('@g.us')) {
       groupJid = groupJid + '@g.us';
     }
-    
+
     Object.assign(body, {
-      groupJid: groupJid
+      groupJid: groupJid,
     });
-    
+
     const ref = new ClassRef();
 
     Object.assign(ref, body);

src/whatsapp/controllers/instance.controller.ts

@@ -220,8 +220,8 @@ export class InstanceController {
         },
       };
     } catch (error) {
-      console.log(error);
+      this.logger.error(error.message[0]);
-      return { error: true, message: error.toString() };
+      throw new BadRequestException(error.message[0]);
     }
   }
 
@@ -269,7 +269,7 @@ export class InstanceController {
       this.logger.verbose('logging out instance: ' + instanceName);
       this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
 
-      return { error: false, message: 'Instance restarted' };
+      return { status: 'SUCCESS', error: false, response: { message: 'Instance restarted' } };
     } catch (error) {
       this.logger.error(error);
     }
@@ -310,7 +310,7 @@ export class InstanceController {
       this.logger.verbose('close connection instance: ' + instanceName);
       this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
 
-      return { error: false, message: 'Instance logged out' };
+      return { status: 'SUCCESS', error: false, response: { message: 'Instance logged out' } };
     } catch (error) {
       throw new InternalServerErrorException(error.toString());
     }
@@ -329,13 +329,13 @@ export class InstanceController {
 
         await this.logout({ instanceName });
         delete this.waMonitor.waInstances[instanceName];
-        return { error: false, message: 'Instance deleted' };
+        return { status: 'SUCCESS', error: false, response: { message: 'Instance deleted' } };
       } else {
         this.logger.verbose('deleting instance: ' + instanceName);
 
         delete this.waMonitor.waInstances[instanceName];
         this.eventEmitter.emit('remove.instance', instanceName, 'inner');
-        return { error: false, message: 'Instance deleted' };
+        return { status: 'SUCCESS', error: false, response: { message: 'Instance deleted' } };
       }
     } catch (error) {
       throw new BadRequestException(error.toString());

src/whatsapp/controllers/settings.controller.ts

@@ -12,7 +12,6 @@ export class SettingsController {
   constructor(private readonly settingsService: SettingsService) {}
 
   public async createSettings(instance: InstanceDto, data: SettingsDto) {
-
     logger.verbose('requested createSettings from ' + instance.instanceName + ' instance');
 
     return this.settingsService.create(instance, data);

src/whatsapp/repository/repository.manager.ts

@@ -109,7 +109,6 @@ export class RepositoryBroker {
           this.logger.verbose('creating temp dir: ' + tempDir);
           fs.mkdirSync(tempDir, { recursive: true });
         }
-
       } catch (error) {
         this.logger.error(error);
       }

src/whatsapp/routers/instance.router.ts

@@ -161,7 +161,9 @@ export class InstanceRouter extends RouterBroker {
       if (db.ENABLED) {
         try {
           await dbserver.dropDatabase();
-          return res.status(HttpStatus.CREATED).json({ error: false, message: 'Database deleted' });
+          return res
+            .status(HttpStatus.CREATED)
+            .json({ status: 'SUCCESS', error: false, response: { message: 'database deleted' } });
         } catch (error) {
           return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({ error: true, message: error.message });
         }

src/whatsapp/services/chatwoot.service.ts

@@ -940,7 +940,7 @@ export class ChatwootService {
       }
 
       this.logger.verbose('check if is bot');
-      if (!body?.conversation || body.private) return { message: 'bot' };
+      if (!body?.conversation || body.private || body.event === 'message_updated') return { message: 'bot' };
 
       this.logger.verbose('check if is group');
       const chatId =