Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@
"@nestjs/common": "^8.0.0",
"@nestjs/config": "^2.0.0",
"@nestjs/core": "^8.0.0",
"@nestjs/jwt": "^8.0.0",
"@nestjs/passport": "8.0.1",
"@nestjs/platform-express": "^8.0.0",
"@nestjs/platform-fastify": "^8.4.4",
"@nestjs/platform-socket.io": "^8.4.4",
"@nestjs/platform-ws": "^8.4.4",
"@nestjs/typeorm": "^8.0.3",
"@nestjs/websockets": "^8.4.4",
"cookie-parser": "^1.4.6",
"fastify-static": "^4.7.0",
"handlebars": "^4.7.7",
"hbs": "^4.2.0",
Expand Down
6 changes: 3 additions & 3 deletions src/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Controller, Get, Render, Req, Res } from '@nestjs/common';
import { Response } from 'express';
import { Controller, Get, Req} from '@nestjs/common';
import { Request } from 'express';
import { AppService } from './app.service';

@Controller()
export class AppController {
constructor(private readonly appService: AppService) {}

@Get()
getHello(): string {
getHello(): string{
return this.appService.getHello();
}
}
2 changes: 2 additions & 0 deletions src/app.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Injectable } from '@nestjs/common';


@Injectable()
export class AppService {

getHello(): string {
return 'Hello World!';
}
Expand Down
7 changes: 5 additions & 2 deletions src/events/events.gateway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ReservationService } from 'src/service/reservation/reservation.service'
import { ReviewService } from 'src/service/review/review.service';
import { EventsService } from './events.service';
import Y from 'yjs';

const WebSocket = require('ws');
const yWebsocketUtils = require('y-websocket/bin/utils');

Expand All @@ -27,6 +28,9 @@ export class EventsGateway {
afterInit(server: Server) {
server.addListener('connection', async (conn: WebSocket, req: Request) => {
try {
if(!req.url.startsWith('/socket/')) {
return
}
const { reservationId, reviewDiffId } = this.eventsService.parseUrl(req.url.split('/socket/')[1]);

const reservation = await this.reservationService.findById(reservationId);
Expand Down Expand Up @@ -83,8 +87,7 @@ export class EventsGateway {
}

//연결 되었을때
handleConnection(@ConnectedSocket() socket: WebSocket): any {
// socket.send('connected');
handleConnection(client: any, @ConnectedSocket() socket: WebSocket): any {
}
//연결 끊겼을때
handleDisconnect(@ConnectedSocket() socket: Socket): any{
Expand Down
57 changes: 31 additions & 26 deletions src/voice.gateway.ts
Original file line number Diff line number Diff line change
@@ -1,48 +1,53 @@
import { ConnectedSocket, MessageBody, OnGatewayConnection, OnGatewayDisconnect, OnGatewayInit, SubscribeMessage, WebSocketGateway, WebSocketServer } from '@nestjs/websockets';
import { Server , Socket} from 'socket.io';
const WebSocket = require('ws');

var socketsStatus= {};

@WebSocketGateway(8082, {cors: {
origin: 'http://localhost:3000'
}}) // TODO : config service for externalization config
@WebSocketGateway(3002, {cors: {
origin: '*'
},
trnasport : ['websocket'] }) // TODO : config service for externalization config
export class VoiceGateway {
@WebSocketServer() public server : Server;
wsClients: Socket[] = [];

afterInit(server: Server) {

}

@SubscribeMessage("userInformation")
userInformation(@MessageBody() data: string, @ConnectedSocket() client: Socket){
socketsStatus[client.id] = data;
console.log(data)
this.server.emit("usersUpdate", socketsStatus);
afterInit(server : Server){
server.on('connection', (socket: Socket) => {
console.log('Client connected');
});
}

@SubscribeMessage("voice")
voice(@MessageBody() data: string, @ConnectedSocket() socket: Socket){


var datanew = null;
var newData = data.split(";")
newData[0] = "data:audio/ogg;";
datanew = newData[0] + newData[1]

for (const id in socketsStatus) {

if (id != socket.id && !socketsStatus[id].mute && socketsStatus[id].online)
socket.broadcast.to(id).emit("send", datanew);
this.broadcast('send', datanew);
}
private broadcast(event, message: any) {
const sendMessage:any = {
event: event,
datas: message
}

const broadCastMessage = JSON.stringify(sendMessage);
for (let c of this.wsClients) {
c.send(broadCastMessage);
}

}
//연결 되었을때
handleConnection(@ConnectedSocket() socket: WebSocket): any {
socket.send('connected');
handleConnection(client:any): any {
this.wsClients.push(client);
console.log(this.wsClients.length);
}
//연결 끊겼을때
handleDisconnect(@ConnectedSocket() socket: Socket): any{
delete socketsStatus[socket.id];
handleDisconnect(@ConnectedSocket() socket: Socket,client:any): any{
for (let i = 0; i < this.wsClients.length; i++) {
if (this.wsClients[i] === client) {
this.wsClients.splice(i, 1);
break;
}
}
this.broadcast('disconnect',{});
}
}
Loading