Skip to content

Commit 87baec5

Browse files
Merge pull request #250 from gabrielpastori1/manager
Add Manager
2 parents 87a8e25 + b2e144f commit 87baec5

File tree

4 files changed

+22
-28
lines changed

4 files changed

+22
-28
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"cross-env": "^7.0.3",
5757
"dayjs": "^1.11.7",
5858
"eventemitter2": "^6.4.9",
59+
"evolution-manager": "latest",
5960
"exiftool-vendored": "^22.0.0",
6061
"express": "^4.18.2",
6162
"express-async-errors": "^3.1.1",

src/whatsapp/controllers/views.controller.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/whatsapp/routers/view.router.ts

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,32 @@
11
import { Router } from 'express';
2+
import fs from 'fs';
3+
import mime from 'mime-types';
24

35
import { RouterBroker } from '../abstract/abstract.router';
4-
import { viewsController } from '../whatsapp.module';
56

67
export class ViewsRouter extends RouterBroker {
78
constructor() {
89
super();
910

10-
this.router.get('/', (req, res) => {
11-
return viewsController.manager(req, res);
11+
const basePath = 'evolution-manager/dist';
12+
13+
const indexPath = require.resolve(`${basePath}/index.html`);
14+
15+
this.router.get('/*', (req, res) => {
16+
try {
17+
const pathname = req.url.split('?')[0];
18+
19+
// verify if url is a file in dist folder
20+
if (pathname === '/') throw {};
21+
const filePath = require.resolve(`${basePath}${pathname}`);
22+
23+
const contentType = mime.lookup(filePath) || 'text/plain';
24+
res.set('Content-Type', contentType);
25+
res.end(fs.readFileSync(filePath));
26+
} catch {
27+
res.set('Content-Type', 'text/html');
28+
res.send(fs.readFileSync(indexPath));
29+
}
1230
});
1331
}
1432

src/whatsapp/whatsapp.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { SendMessageController } from './controllers/sendMessage.controller';
1414
import { SettingsController } from './controllers/settings.controller';
1515
import { SqsController } from './controllers/sqs.controller';
1616
import { TypebotController } from './controllers/typebot.controller';
17-
import { ViewsController } from './controllers/views.controller';
1817
import { WebhookController } from './controllers/webhook.controller';
1918
import { WebsocketController } from './controllers/websocket.controller';
2019
import {
@@ -154,7 +153,6 @@ export const instanceController = new InstanceController(
154153
typebotService,
155154
cache,
156155
);
157-
export const viewsController = new ViewsController(waMonitor, configService);
158156
export const sendMessageController = new SendMessageController(waMonitor);
159157
export const chatController = new ChatController(waMonitor);
160158
export const groupController = new GroupController(waMonitor);

0 commit comments

Comments
 (0)