wip

src/grpc/message.ts

@@ -31,42 +31,56 @@ class MessageService {
   ): Promise<R> {
     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<GetUserRequest, GetUserResponse>(req, this.client.getUser)
+    return this.toPromise<GetUserRequest, GetUserResponse>(req, this.client.getUser.bind(this.client))
   }
 
   listChat(req: ListChatRequest) {
-    return this.toPromise<ListChatRequest, ListChatResponse>(req, this.client.listChat)
+    return this.toPromise<ListChatRequest, ListChatResponse>(req, this.client.listChat.bind(this.client))
   }
 
   createChat(req: CreateChatRequest) {
-    return this.toPromise<CreateChatRequest, CreateChatResponse>(req, this.client.createChat)
+    return this.toPromise<CreateChatRequest, CreateChatResponse>(req, this.client.createChat.bind(this.client))
   }
 
   createMessage(req: CreateMessageRequest) {
-    return this.toPromise<CreateMessageRequest, CreateMessageResponse>(req, this.client.createMessage)
+    return this.toPromise<CreateMessageRequest, CreateMessageResponse>(req, this.client.createMessage.bind(this.client))
   }
 
   listMessage(req: ListMessageRequest) {
-    return this.toPromise<ListMessageRequest, ListMessageResponse>(req, this.client.listMessage)
+    return this.toPromise<ListMessageRequest, ListMessageResponse>(req, this.client.listMessage.bind(this.client))
   }
 
   listUser(req: ListUserRequest) {
-    return this.toPromise<ListUserRequest, ListUserResponse>(req, this.client.listUser)
+    return this.toPromise<ListUserRequest, ListUserResponse>(req, this.client.listUser.bind(this.client))
   }
 
   getUserByEmail(req: GetUserByEmailRequest) {
-    return this.toPromise<GetUserByEmailRequest, GetUserResponse>(req, this.client.getUserByEmail)
+    return this.toPromise<GetUserByEmailRequest, GetUserResponse>(req, this.client.getUserByEmail.bind(this.client))
   }
 
   getVersion() {
-    return this.toPromise<Empty, GetVersionResponse>({}, this.client.getVersion)
+    console.log('get version')
+    return this.toPromise<Empty, GetVersionResponse>({}, this.client.getVersion.bind(this.client))
+  }
+
+  getVersion2(): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.client.getVersion({}, (error, data) => {
+        if (error) {
+          console.log(error)
+          reject(error?.message)
+        } else resolve(data)
+      })
+    })
   }
 }
 

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 })
 

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 })