diff --git a/package-lock.json b/package-lock.json index c919227..c4f8f2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.1", "license": "UNLICENSED", "dependencies": { + "@nestjs/axios": "^4.0.0", "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.2.3", "@nestjs/core": "^10.0.0", @@ -17,6 +18,7 @@ "@nestjs/typeorm": "^10.0.2", "@nestjs/websockets": "^10.3.10", "@socket.io/redis-adapter": "^8.3.0", + "axios": "^1.9.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "pg": "^8.12.0", @@ -1509,6 +1511,16 @@ "node": ">=8" } }, + "node_modules/@nestjs/axios": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-4.0.0.tgz", + "integrity": "sha512-1cB+Jyltu/uUPNQrpUimRHEQHrnQrpLzVj6dU3dgn6iDDDdahr10TgHFGTmw5VuJ9GzKZsCLDL78VSwJAs/9JQ==", + "peerDependencies": { + "@nestjs/common": "^10.0.0 || ^11.0.0", + "axios": "^1.3.1", + "rxjs": "^7.0.0" + } + }, "node_modules/@nestjs/cli": { "version": "10.4.2", "resolved": "https://registry.npmjs.org/@nestjs/cli/-/cli-10.4.2.tgz", @@ -2913,8 +2925,17 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz", + "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } }, "node_modules/babel-jest": { "version": "29.7.0", @@ -3614,7 +3635,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -3890,7 +3910,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -4751,6 +4770,25 @@ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", @@ -4820,7 +4858,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -7363,6 +7400,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/package.json b/package.json index 2a90422..9cb47ab 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "test:e2e": "jest --config ./test/jest-e2e.json" }, "dependencies": { + "@nestjs/axios": "^4.0.0", "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.2.3", "@nestjs/core": "^10.0.0", @@ -28,6 +29,7 @@ "@nestjs/typeorm": "^10.0.2", "@nestjs/websockets": "^10.3.10", "@socket.io/redis-adapter": "^8.3.0", + "axios": "^1.9.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "pg": "^8.12.0", diff --git a/src/socket/socket.gateway.ts b/src/socket/socket.gateway.ts index c94abfd..32ea9e4 100644 --- a/src/socket/socket.gateway.ts +++ b/src/socket/socket.gateway.ts @@ -7,7 +7,6 @@ import { import { Server, Socket } from 'socket.io'; import { SendMessageDto } from './dto/sendMessage.dto'; import { SocketService } from './socket.service'; -import { Logger } from '@nestjs/common'; @WebSocketGateway({ cors: { @@ -16,15 +15,12 @@ import { Logger } from '@nestjs/common'; path: '/notification/socket.io', }) export class SocketGateway implements OnGatewayConnection { - private readonly logger = new Logger(SocketGateway.name); - @WebSocketServer() server: Server; constructor(private socketService: SocketService) {} async handleConnection(client: Socket) { - this.logger.log(`Client connected: ${client.id}`); await this.socketService.clientConnection({ client_id: client.handshake.auth.token, socket_id: client.id, diff --git a/src/socket/socket.module.ts b/src/socket/socket.module.ts index daacc07..aec9078 100644 --- a/src/socket/socket.module.ts +++ b/src/socket/socket.module.ts @@ -3,9 +3,10 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { SocketConnection } from './socket.entity'; import { SocketGateway } from './socket.gateway'; import { SocketService } from './socket.service'; +import { HttpModule } from '@nestjs/axios'; @Module({ - imports: [TypeOrmModule.forFeature([SocketConnection])], + imports: [TypeOrmModule.forFeature([SocketConnection]), HttpModule], providers: [SocketGateway, SocketService], exports: [SocketGateway], }) diff --git a/src/socket/socket.service.ts b/src/socket/socket.service.ts index b5b6190..0518f2a 100644 --- a/src/socket/socket.service.ts +++ b/src/socket/socket.service.ts @@ -1,5 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { HttpService } from '@nestjs/axios'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { firstValueFrom } from 'rxjs'; import { Socket } from 'socket.io'; import { Repository } from 'typeorm'; import { ClientConnectionDto } from './dto/clientConnection.dto'; @@ -7,13 +9,38 @@ import { SocketConnection } from './socket.entity'; @Injectable() export class SocketService { + private readonly logger = new Logger(SocketService.name); + constructor( @InjectRepository(SocketConnection) private socketConnectionRepository: Repository, + private readonly httpService: HttpService, ) {} async clientConnection(data: ClientConnectionDto) { const client = this.socketConnectionRepository.create(data); + + const eventEndpoints = { + connected: '/api/operator/online', + disconnected: '/api/operator/offline', + }; + + const endpoint = eventEndpoints[data.event]; + + if (endpoint) { + const url = `${process.env.SERVICE_URL}${endpoint}?telephone_id=${client.client_id}`; + try { + await firstValueFrom(this.httpService.get(url)); + } catch (error) { + this.logger.error( + `❌ Failed to notify ${data.event} for client ${client.client_id}:`, + error.message || error, + ); + } + } else { + this.logger.warn(`⚠️ Unknown event type: ${data.event}`); + } + await this.socketConnectionRepository.save(client); }