From 208b81346971b8754a85eb7ef284183ca492f318 Mon Sep 17 00:00:00 2001 From: guimroque Date: Wed, 5 Jun 2024 09:44:44 -0300 Subject: [PATCH 1/7] chore: debbug --- packages/api/src/socket/client.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/api/src/socket/client.ts b/packages/api/src/socket/client.ts index 6ac3281cf..43feeaed5 100644 --- a/packages/api/src/socket/client.ts +++ b/packages/api/src/socket/client.ts @@ -21,6 +21,8 @@ export class SocketClient { origin, }; + console.log('Conectando ao servidor Socket.IO:', auth, SOCKET_URL); + //todo: move this URL to a .env file const URL = SOCKET_URL; this.socket = io(URL, { autoConnect: true, auth }); From 171f7c842d9b50b2a9bbad902c2137e88091cbed Mon Sep 17 00:00:00 2001 From: guimroque Date: Wed, 5 Jun 2024 10:03:28 -0300 Subject: [PATCH 2/7] chore: debbug --- packages/api/src/socket/client.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/api/src/socket/client.ts b/packages/api/src/socket/client.ts index 43feeaed5..da6729668 100644 --- a/packages/api/src/socket/client.ts +++ b/packages/api/src/socket/client.ts @@ -1,7 +1,5 @@ import { io, Socket } from 'socket.io-client'; -const { SOCKET_URL } = process.env; - interface IMessage { sessionId: string; // sessionId to: string; // username -> recebe a mensagem '[UI]' por exemplo @@ -21,10 +19,11 @@ export class SocketClient { origin, }; - console.log('Conectando ao servidor Socket.IO:', auth, SOCKET_URL); - //todo: move this URL to a .env file - const URL = SOCKET_URL; + const URL = process.env.SOCKET_URL ?? 'http://localhost:3001'; + + console.log('Conectando ao servidor Socket.IO:', auth, URL); + this.socket = io(URL, { autoConnect: true, auth }); } From 1bf8709d9c6af62267bc9d455bbab0014e3c8573 Mon Sep 17 00:00:00 2001 From: guimroque Date: Wed, 5 Jun 2024 11:06:27 -0300 Subject: [PATCH 3/7] fix: debug --- packages/api/src/socket/client.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/api/src/socket/client.ts b/packages/api/src/socket/client.ts index da6729668..998a43825 100644 --- a/packages/api/src/socket/client.ts +++ b/packages/api/src/socket/client.ts @@ -22,7 +22,10 @@ export class SocketClient { //todo: move this URL to a .env file const URL = process.env.SOCKET_URL ?? 'http://localhost:3001'; - console.log('Conectando ao servidor Socket.IO:', auth, URL); + console.log('Conectando ao servidor Socket.IO:', { + auth, + URL, + }); this.socket = io(URL, { autoConnect: true, auth }); } From 97a8c8fdb02d3903bcbe43387a69d58b8511b0e2 Mon Sep 17 00:00:00 2001 From: guimroque Date: Wed, 5 Jun 2024 11:32:40 -0300 Subject: [PATCH 4/7] fix: debug --- packages/api/src/socket/client.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/api/src/socket/client.ts b/packages/api/src/socket/client.ts index 998a43825..055d916c6 100644 --- a/packages/api/src/socket/client.ts +++ b/packages/api/src/socket/client.ts @@ -19,12 +19,16 @@ export class SocketClient { origin, }; - //todo: move this URL to a .env file - const URL = process.env.SOCKET_URL ?? 'http://localhost:3001'; + const isDev = process.env.NODE_ENV === 'development'; + const URL = isDev ? process.env.SOCKET_URL : process.env.API_URL; console.log('Conectando ao servidor Socket.IO:', { auth, URL, + API_s: process.env.SOCKET_URL, + API: process.env.API_URL, + environment: process.env.NODE_ENV, + isDev, }); this.socket = io(URL, { autoConnect: true, auth }); From 81b483c36670b97eb482d87818cd6296ecadc730 Mon Sep 17 00:00:00 2001 From: guimroque Date: Wed, 5 Jun 2024 12:08:51 -0300 Subject: [PATCH 5/7] fix: remove log --- packages/api/src/socket/client.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/api/src/socket/client.ts b/packages/api/src/socket/client.ts index 055d916c6..06c4a20a2 100644 --- a/packages/api/src/socket/client.ts +++ b/packages/api/src/socket/client.ts @@ -22,15 +22,6 @@ export class SocketClient { const isDev = process.env.NODE_ENV === 'development'; const URL = isDev ? process.env.SOCKET_URL : process.env.API_URL; - console.log('Conectando ao servidor Socket.IO:', { - auth, - URL, - API_s: process.env.SOCKET_URL, - API: process.env.API_URL, - environment: process.env.NODE_ENV, - isDev, - }); - this.socket = io(URL, { autoConnect: true, auth }); } From d4612389ddfb9061f1179090255f5a69a79c28ba Mon Sep 17 00:00:00 2001 From: guimroque Date: Wed, 5 Jun 2024 14:30:23 -0300 Subject: [PATCH 6/7] chore: increase bsakosafe version --- packages/api/Makefile | 6 +++--- packages/api/package.json | 2 +- packages/socket-server/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/api/Makefile b/packages/api/Makefile index ffcd69cfd..1ab79d472 100644 --- a/packages/api/Makefile +++ b/packages/api/Makefile @@ -1,11 +1,11 @@ deploy-prod: - docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d + docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d > /dev/null 2>&1 deploy-stg: - docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d + docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d > /dev/null 2>&1 deploy-test: - docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d + docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d > /dev/null 2>&1 database-init: docker-compose -f docker/database/docker-compose.yml --env-file ${env_file} up --build -d diff --git a/packages/api/package.json b/packages/api/package.json index b12db268f..f7a8de3b3 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -21,7 +21,7 @@ "@noble/curves": "1.3.0", "@passwordless-id/webauthn": "1.4.0", "axios": "1.5.1", - "bakosafe": "0.0.57", + "bakosafe": "0.0.58", "bcrypt": "5.1.0", "body-parser": "1.20.2", "cheerio": "1.0.0-rc.12", diff --git a/packages/socket-server/Makefile b/packages/socket-server/Makefile index 75a7618b4..27b99f8f4 100644 --- a/packages/socket-server/Makefile +++ b/packages/socket-server/Makefile @@ -1,2 +1,2 @@ deploy: - docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d + docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d > /dev/null 2>&1 From 502efa60c700289c2c8466f5c86e92d2da10e729 Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 6 Jun 2024 11:03:01 -0300 Subject: [PATCH 7/7] fix: bako package version --- packages/socket-server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/socket-server/package.json b/packages/socket-server/package.json index b7ae1e064..0c0e42788 100644 --- a/packages/socket-server/package.json +++ b/packages/socket-server/package.json @@ -12,7 +12,7 @@ }, "keywords": [], "dependencies": { - "bakosafe": "0.0.57", + "bakosafe": "0.0.58", "express": "4.17.1", "express-joi-validation": "5.0.0", "fuels": "0.88.1",