Skip to content

Commit 32e58de

Browse files
judsonjuniorrjudsonjuniorr
committed
Path mapping & deps fix & bundler changed to tsup
1 parent feb7b79 commit 32e58de

File tree

90 files changed

+645
-667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+645
-667
lines changed

‎package.json‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
"name": "evolution-api",
33
"version": "2.0.9-rc",
44
"description": "Rest api for communication with WhatsApp",
5-
"main": "./dist/src/main.js",
5+
"main": "./dist/main.js",
6+
"type": "commonjs",
67
"scripts": {
7-
"build": "tsc",
8-
"start": "ts-node --files --transpile-only ./src/main.ts",
9-
"start:prod": "node dist/src/main",
10-
"dev:server": "clear && tsnd --files --transpile-only --respawn --ignore-watch node_modules ./src/main.ts",
11-
"test": "clear && tsnd --files --transpile-only --respawn --ignore-watch node_modules ./test/all.test.ts",
8+
"build": "tsup",
9+
"start": "tsnd -r tsconfig-paths/register --files --transpile-only ./src/main.ts",
10+
"start:prod": "node dist/main",
11+
"dev:server": "clear && tsnd -r tsconfig-paths/register --files --transpile-only --respawn --ignore-watch node_modules ./src/main.ts",
12+
"test": "clear && tsnd -r tsconfig-paths/register --files --transpile-only --respawn --ignore-watch node_modules ./test/all.test.ts",
1213
"lint": "eslint --fix --ext .ts src",
1314
"db:generate:postgres": "npx prisma generate --schema ./prisma/postgresql-schema.prisma",
1415
"db:generate:mysql": "npx prisma generate --schema ./prisma/mysql-schema.prisma",
@@ -76,11 +77,13 @@
7677
"jimp": "^0.16.13",
7778
"join": "^3.0.0",
7879
"js-yaml": "^4.1.0",
80+
"json-schema": "^0.4.0",
7981
"jsonschema": "^1.4.1",
8082
"link-preview-js": "^3.0.4",
83+
"long": "^5.2.3",
84+
"mime": "^3.0.0",
8185
"minio": "^8.0.1",
8286
"node-cache": "^5.1.2",
83-
"node-mime-types": "^1.1.0",
8487
"node-windows": "^1.0.0-beta.8",
8588
"openai": "^4.52.7",
8689
"parse-bmfont-xml": "^1.1.4",
@@ -93,6 +96,7 @@
9396
"sharp": "^0.32.2",
9497
"socket.io": "^4.7.1",
9598
"socks-proxy-agent": "^8.0.1",
99+
"tsup": "^8.2.4",
96100
"uuid": "^9.0.0",
97101
"xml2js": "^0.6.2",
98102
"yamljs": "^0.3.0"
@@ -102,7 +106,7 @@
102106
"@types/cors": "^2.8.13",
103107
"@types/express": "^4.17.17",
104108
"@types/js-yaml": "^4.0.5",
105-
"@types/mime-types": "^2.1.1",
109+
"@types/json-schema": "^7.0.15",
106110
"@types/node": "^18.15.11",
107111
"@types/node-windows": "^0.1.2",
108112
"@types/qrcode": "^1.5.0",
@@ -117,6 +121,7 @@
117121
"eslint-plugin-simple-import-sort": "^10.0.0",
118122
"prettier": "^2.8.8",
119123
"ts-node-dev": "^2.0.0",
124+
"tsconfig-paths": "^4.2.0",
120125
"typescript": "^4.9.5"
121126
}
122127
}

‎src/api/abstract/abstract.repository.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
import { ConfigService, Database } from '@config/env.config';
2+
import { ROOT_DIR } from '@config/path.config';
13
import { existsSync, mkdirSync, writeFileSync } from 'fs';
24
import { join } from 'path';
35

4-
import { ConfigService, Database } from '../../config/env.config';
5-
import { ROOT_DIR } from '../../config/path.config';
6-
76
export type IInsert = { insertCount: number };
87

98
export interface IRepository {

‎src/api/abstract/abstract.router.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import 'express-async-errors';
22

3+
import { GetParticipant, GroupInvite } from '@api/dto/group.dto';
4+
import { InstanceDto } from '@api/dto/instance.dto';
5+
import { Logger } from '@config/logger.config';
6+
import { BadRequestException } from '@exceptions';
37
import { Request } from 'express';
48
import { JSONSchema7 } from 'json-schema';
59
import { validate } from 'jsonschema';
610

7-
import { Logger } from '../../config/logger.config';
8-
import { BadRequestException } from '../../exceptions';
9-
import { GetParticipant, GroupInvite } from '../dto/group.dto';
10-
import { InstanceDto } from '../dto/instance.dto';
11-
1211
type DataValidate<T> = {
1312
request: Request;
1413
schema: JSONSchema7;

‎src/api/controllers/chat.controller.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { Contact, Message, MessageUpdate } from '@prisma/client';
2-
31
import {
42
ArchiveChatDto,
53
BlockUserDto,
@@ -15,10 +13,11 @@ import {
1513
SendPresenceDto,
1614
UpdateMessageDto,
1715
WhatsAppNumberDto,
18-
} from '../dto/chat.dto';
19-
import { InstanceDto } from '../dto/instance.dto';
20-
import { Query } from '../repository/repository.service';
21-
import { WAMonitoringService } from '../services/monitor.service';
16+
} from '@api/dto/chat.dto';
17+
import { InstanceDto } from '@api/dto/instance.dto';
18+
import { Query } from '@api/repository/repository.service';
19+
import { WAMonitoringService } from '@api/services/monitor.service';
20+
import { Contact, Message, MessageUpdate } from '@prisma/client';
2221

2322
export class ChatController {
2423
constructor(private readonly waMonitor: WAMonitoringService) {}

‎src/api/controllers/group.controller.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import {
1111
GroupToggleEphemeralDto,
1212
GroupUpdateParticipantDto,
1313
GroupUpdateSettingDto,
14-
} from '../dto/group.dto';
15-
import { InstanceDto } from '../dto/instance.dto';
16-
import { WAMonitoringService } from '../services/monitor.service';
14+
} from '@api/dto/group.dto';
15+
import { InstanceDto } from '@api/dto/instance.dto';
16+
import { WAMonitoringService } from '@api/services/monitor.service';
1717

1818
export class GroupController {
1919
constructor(private readonly waMonitor: WAMonitoringService) {}

‎src/api/controllers/instance.controller.ts‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1+
import { InstanceDto, SetPresenceDto } from '@api/dto/instance.dto';
2+
import { ChatwootService } from '@api/integrations/chatwoot/services/chatwoot.service';
3+
import { RabbitmqService } from '@api/integrations/rabbitmq/services/rabbitmq.service';
4+
import { SqsService } from '@api/integrations/sqs/services/sqs.service';
5+
import { WebsocketService } from '@api/integrations/websocket/services/websocket.service';
6+
import { ProviderFiles } from '@api/provider/sessions';
7+
import { PrismaRepository } from '@api/repository/repository.service';
8+
import { AuthService } from '@api/services/auth.service';
9+
import { CacheService } from '@api/services/cache.service';
10+
import { BaileysStartupService } from '@api/services/channels/whatsapp.baileys.service';
11+
import { BusinessStartupService } from '@api/services/channels/whatsapp.business.service';
12+
import { WAMonitoringService } from '@api/services/monitor.service';
13+
import { SettingsService } from '@api/services/settings.service';
14+
import { WebhookService } from '@api/services/webhook.service';
15+
import { Events, Integration, wa } from '@api/types/wa.types';
16+
import { Auth, Chatwoot, ConfigService, HttpServer, WaBusiness } from '@config/env.config';
17+
import { Logger } from '@config/logger.config';
18+
import { BadRequestException, InternalServerErrorException, UnauthorizedException } from '@exceptions';
119
import { JsonValue } from '@prisma/client/runtime/library';
220
import { delay } from 'baileys';
321
import { isArray, isURL } from 'class-validator';
422
import EventEmitter2 from 'eventemitter2';
523
import { v4 } from 'uuid';
624

7-
import { Auth, Chatwoot, ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
8-
import { Logger } from '../../config/logger.config';
9-
import { BadRequestException, InternalServerErrorException, UnauthorizedException } from '../../exceptions';
10-
import { InstanceDto, SetPresenceDto } from '../dto/instance.dto';
11-
import { ChatwootService } from '../integrations/chatwoot/services/chatwoot.service';
12-
import { RabbitmqService } from '../integrations/rabbitmq/services/rabbitmq.service';
13-
import { SqsService } from '../integrations/sqs/services/sqs.service';
14-
import { WebsocketService } from '../integrations/websocket/services/websocket.service';
15-
import { ProviderFiles } from '../provider/sessions';
16-
import { PrismaRepository } from '../repository/repository.service';
17-
import { AuthService } from '../services/auth.service';
18-
import { CacheService } from '../services/cache.service';
19-
import { BaileysStartupService } from '../services/channels/whatsapp.baileys.service';
20-
import { BusinessStartupService } from '../services/channels/whatsapp.business.service';
21-
import { WAMonitoringService } from '../services/monitor.service';
22-
import { SettingsService } from '../services/settings.service';
23-
import { WebhookService } from '../services/webhook.service';
24-
import { Events, Integration, wa } from '../types/wa.types';
2525
import { ProxyController } from './proxy.controller';
2626

2727
export class InstanceController {
@@ -44,7 +44,7 @@ export class InstanceController {
4444
private readonly providerFiles: ProviderFiles,
4545
) {}
4646

47-
private readonly logger = new Logger(InstanceController.name);
47+
private readonly logger = new Logger('InstanceController');
4848

4949
public async createInstance({
5050
instanceName,

‎src/api/controllers/label.controller.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { InstanceDto } from '../dto/instance.dto';
2-
import { HandleLabelDto } from '../dto/label.dto';
3-
import { WAMonitoringService } from '../services/monitor.service';
1+
import { InstanceDto } from '@api/dto/instance.dto';
2+
import { HandleLabelDto } from '@api/dto/label.dto';
3+
import { WAMonitoringService } from '@api/services/monitor.service';
44

55
export class LabelController {
66
constructor(private readonly waMonitor: WAMonitoringService) {}

‎src/api/controllers/proxy.controller.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1+
import { InstanceDto } from '@api/dto/instance.dto';
2+
import { ProxyDto } from '@api/dto/proxy.dto';
3+
import { WAMonitoringService } from '@api/services/monitor.service';
4+
import { ProxyService } from '@api/services/proxy.service';
5+
import { Logger } from '@config/logger.config';
6+
import { BadRequestException, NotFoundException } from '@exceptions';
7+
import { makeProxyAgent } from '@utils/makeProxyAgent';
18
import axios from 'axios';
29

3-
import { Logger } from '../../config/logger.config';
4-
import { BadRequestException, NotFoundException } from '../../exceptions';
5-
import { makeProxyAgent } from '../../utils/makeProxyAgent';
6-
import { InstanceDto } from '../dto/instance.dto';
7-
import { ProxyDto } from '../dto/proxy.dto';
8-
import { WAMonitoringService } from '../services/monitor.service';
9-
import { ProxyService } from '../services/proxy.service';
10-
1110
const logger = new Logger('ProxyController');
1211

1312
export class ProxyController {

‎src/api/controllers/sendMessage.controller.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import { isBase64, isURL } from 'class-validator';
2-
3-
import { BadRequestException } from '../../exceptions';
4-
import { InstanceDto } from '../dto/instance.dto';
1+
import { InstanceDto } from '@api/dto/instance.dto';
52
import {
63
SendAudioDto,
74
SendButtonDto,
@@ -15,8 +12,10 @@ import {
1512
SendStickerDto,
1613
SendTemplateDto,
1714
SendTextDto,
18-
} from '../dto/sendMessage.dto';
19-
import { WAMonitoringService } from '../services/monitor.service';
15+
} from '@api/dto/sendMessage.dto';
16+
import { WAMonitoringService } from '@api/services/monitor.service';
17+
import { BadRequestException } from '@exceptions';
18+
import { isBase64, isURL } from 'class-validator';
2019

2120
export class SendMessageController {
2221
constructor(private readonly waMonitor: WAMonitoringService) {}

‎src/api/controllers/settings.controller.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { InstanceDto } from '../dto/instance.dto';
2-
import { SettingsDto } from '../dto/settings.dto';
3-
import { SettingsService } from '../services/settings.service';
1+
import { InstanceDto } from '@api/dto/instance.dto';
2+
import { SettingsDto } from '@api/dto/settings.dto';
3+
import { SettingsService } from '@api/services/settings.service';
44

55
export class SettingsController {
66
constructor(private readonly settingsService: SettingsService) {}

0 commit comments

Comments
 (0)