diff --git a/src/grpc/message.ts b/src/grpc/message.ts index f1ea722..5610e79 100644 --- a/src/grpc/message.ts +++ b/src/grpc/message.ts @@ -31,42 +31,56 @@ class MessageService { ): Promise { return new Promise((resolve, reject) => { service(request, (error, data) => { - if (error) reject(error?.message) - else resolve(data) + if (error) { + console.log(error) + reject(error?.message) + } else resolve(data) }) }) } getUser(req: GetUserRequest) { - return this.toPromise(req, this.client.getUser) + return this.toPromise(req, this.client.getUser.bind(this.client)) } listChat(req: ListChatRequest) { - return this.toPromise(req, this.client.listChat) + return this.toPromise(req, this.client.listChat.bind(this.client)) } createChat(req: CreateChatRequest) { - return this.toPromise(req, this.client.createChat) + return this.toPromise(req, this.client.createChat.bind(this.client)) } createMessage(req: CreateMessageRequest) { - return this.toPromise(req, this.client.createMessage) + return this.toPromise(req, this.client.createMessage.bind(this.client)) } listMessage(req: ListMessageRequest) { - return this.toPromise(req, this.client.listMessage) + return this.toPromise(req, this.client.listMessage.bind(this.client)) } listUser(req: ListUserRequest) { - return this.toPromise(req, this.client.listUser) + return this.toPromise(req, this.client.listUser.bind(this.client)) } getUserByEmail(req: GetUserByEmailRequest) { - return this.toPromise(req, this.client.getUserByEmail) + return this.toPromise(req, this.client.getUserByEmail.bind(this.client)) } getVersion() { - return this.toPromise({}, this.client.getVersion) + console.log('get version') + return this.toPromise({}, this.client.getVersion.bind(this.client)) + } + + getVersion2(): Promise { + return new Promise((resolve, reject) => { + this.client.getVersion({}, (error, data) => { + if (error) { + console.log(error) + reject(error?.message) + } else resolve(data) + }) + }) } } diff --git a/src/handles.ts b/src/handles.ts index 9e94e3a..fd1b9ce 100644 --- a/src/handles.ts +++ b/src/handles.ts @@ -6,9 +6,11 @@ import { config } from './config.ts' import { messageService } from './grpc/message.ts' export const handlers = { - async getVersion() { + async getVersion(req: Request) { + console.log('test') try { const res = await messageService.getVersion() + console.log(res) return Response.json(res) } catch (error) { return Response.json({ message: 'Error' }, { status: HttpStatusCodes.BAD_REQUEST }) @@ -22,6 +24,7 @@ export const handlers = { if (!email) return Response.json({ message: 'email required' }, { status: HttpStatusCodes.BAD_REQUEST }) const userResponse = await messageService.getUserByEmail({ email: body.email }) + console.log(userResponse) const user = userResponse.data if (!user) return Response.json({ message: 'Invalid email or password' }, { status: HttpStatusCodes.NOT_FOUND }) diff --git a/src/index.ts b/src/index.ts index 31ff2d7..3bf7568 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,8 +14,8 @@ const server = Bun.serve({ const pathname = url.pathname const method = req.method - if (pathname === '/version' && method === 'GET') return handlers.getVersion() - if (pathname === '/login' && method === 'POST') return handlers.login(req) + if (pathname === '/api/version' && method === 'GET') return handlers.getVersion(req) + if (pathname === '/api/login' && method === 'POST') return handlers.login(req) if (pathname === '/ws') return upgrade(req, server) return new Response('Not found', { status: HttpStatusCodes.NOT_FOUND })