From 4bbe92e4a1421fe392b755b023a5712dccfdbfd5 Mon Sep 17 00:00:00 2001
From: Nick Kosarev <hmbanan666@hotmail.com>
Date: Thu, 12 Dec 2024 17:35:38 +0200
Subject: [PATCH] chore: telegram id from client (#285)

---
 apps/telegram-game/src/components/Game.vue             | 4 +++-
 apps/website/server/api/websocket.ts                   | 2 +-
 packages/game/src/lib/baseGameAddon.ts                 | 6 ++----
 packages/game/src/lib/services/baseWebSocketService.ts | 9 ++++-----
 packages/game/src/lib/types.ts                         | 2 +-
 packages/types/src/lib/websocket.ts                    | 1 +
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/telegram-game/src/components/Game.vue b/apps/telegram-game/src/components/Game.vue
index fee1fdf..0b073dc 100644
--- a/apps/telegram-game/src/components/Game.vue
+++ b/apps/telegram-game/src/components/Game.vue
@@ -15,14 +15,16 @@
 </template>
 
 <script setup lang="ts">
+import { initData } from '@telegram-apps/sdk-vue'
 import { gameClient, roomConnected } from '../utils/gameClient'
 
+const data = initData.user()
 const router = useRouter()
 const canvas = ref<HTMLElement>()
 const isOpened = ref(false)
 
 onMounted(async () => {
-  await gameClient.init()
+  await gameClient.init(data?.id.toString())
   canvas.value?.appendChild(gameClient.app.canvas)
 
   return () => gameClient.destroy()
diff --git a/apps/website/server/api/websocket.ts b/apps/website/server/api/websocket.ts
index 61017c4..c2ffcc4 100644
--- a/apps/website/server/api/websocket.ts
+++ b/apps/website/server/api/websocket.ts
@@ -65,7 +65,7 @@ export default defineWebSocketHandler({
           peer.subscribe(activeRoom.id)
           void sendMessage({ type: 'CONNECTED_TO_WAGON_ROOM', data: { type: 'PLAYER', id: peer.id, objects: activeRoom.objects } }, activeRoom.token)
 
-          logger.log(`Telegram client subscribed to Wagon Room ${activeRoom.id}`, peer.id)
+          logger.log(`Telegram client ${parsed.data?.telegramId} subscribed to Wagon Room ${activeRoom.id}`, peer.id)
         }
 
         if (client === 'WAGON_CLIENT') {
diff --git a/packages/game/src/lib/baseGameAddon.ts b/packages/game/src/lib/baseGameAddon.ts
index a825e2a..4d2f7cd 100644
--- a/packages/game/src/lib/baseGameAddon.ts
+++ b/packages/game/src/lib/baseGameAddon.ts
@@ -14,7 +14,6 @@ import { Application, Container, Rectangle, TextureStyle } from 'pixi.js'
 import { BaseWagonObject } from './objects/baseWagonObject'
 import { FlagObject } from './objects/flagObject'
 import { TreeObject } from './objects/treeObject'
-import { PlayerObject } from './objects/unit/playerObject'
 import { MoveToFlagScript } from './scripts/moveToFlagScript'
 import { BaseAssetService } from './services/baseAssetService'
 import { BasePlayerService } from './services/basePlayerService'
@@ -71,7 +70,7 @@ export class BaseGameAddon extends Container implements GameAddon {
     this.serverService = new BaseServerService()
   }
 
-  async init() {
+  async init(id?: string) {
     await this.app.init({
       backgroundAlpha: 0,
       antialias: true,
@@ -95,8 +94,7 @@ export class BaseGameAddon extends Container implements GameAddon {
     this.app.stage.addChild(this)
 
     if (this.client === 'TELEGRAM_CLIENT') {
-      this.player = new PlayerObject({ id: 'svhjz9p5467wne9ybasf1bwy', addon: this, x: 200, y: this.bottomY })
-      await this.player.initChar()
+      this.player = await this.playerService.createPlayer({ id: id || createId(), x: 200 })
       this.cameraTarget = this.player
 
       this.app.stage.addEventListener('pointerdown', (e) => {
diff --git a/packages/game/src/lib/services/baseWebSocketService.ts b/packages/game/src/lib/services/baseWebSocketService.ts
index effb83a..d236418 100644
--- a/packages/game/src/lib/services/baseWebSocketService.ts
+++ b/packages/game/src/lib/services/baseWebSocketService.ts
@@ -37,6 +37,7 @@ export class BaseWebSocketService implements WebSocketService {
       data: {
         client: this.addon.client,
         id: roomId,
+        telegramId: this.addon.player?.id,
       },
     }
     this.send(connectMessage)
@@ -55,13 +56,11 @@ export class BaseWebSocketService implements WebSocketService {
         this.addon.createObject(obj.type, obj.id, obj.x, obj.zIndex)
       }
 
-      if (type === 'PLAYER') {
+      if (type === 'PLAYER' && this.addon.client === 'TELEGRAM_CLIENT' && this.addon.player) {
         const player = objects.find((obj) => obj.type === 'PLAYER' && obj.id === id)
         if (player) {
-          if (this.addon.player) {
-            this.addon.player.id = player.id
-            this.addon.player.x = player.x
-          }
+          this.addon.player.id = player.id
+          this.addon.player.x = player.x
         }
       }
     }
diff --git a/packages/game/src/lib/types.ts b/packages/game/src/lib/types.ts
index 9806f22..2bb5fc8 100644
--- a/packages/game/src/lib/types.ts
+++ b/packages/game/src/lib/types.ts
@@ -123,7 +123,7 @@ export interface WebSocketService {
 
 export interface PlayerService {
   activePlayers: GameObjectPlayer[]
-  createPlayer: (data: { id: string, x: number, character?: CharacterEditionWithCharacter }) => void
+  createPlayer: (data: { id: string, x: number, character?: CharacterEditionWithCharacter }) => Promise<GameObjectPlayer>
   removePlayer: (id: string) => void
   movePlayer: (data: { id: string, x: number }) => void
   update: () => void
diff --git a/packages/types/src/lib/websocket.ts b/packages/types/src/lib/websocket.ts
index 6187e00..04fa95f 100644
--- a/packages/types/src/lib/websocket.ts
+++ b/packages/types/src/lib/websocket.ts
@@ -33,6 +33,7 @@ export interface WebSocketConnect {
     client: 'ADDON' | 'TELEGRAM_CLIENT' | 'WAGON_CLIENT'
     id: string
     token?: string
+    telegramId?: string
   }
 }