Merge pull request #99 from tiny-devs/dev

Merge with Master

Author: diguifi

Procfile

@@ -1 +1 @@
-web: deno run --allow-net=:${PORT} --cached-only --allow-read main.ts --port=${PORT}
+web: deno run --allow-net --cached-only --allow-read --allow-env main.ts --port=${PORT}

README.md

@@ -7,9 +7,9 @@ Play now (TODO: Deploy)
 Install Deno: [installation guide](https://deno.land/manual/getting_started/installation)  
 
 Run the game server (you'll need 2 terminals)  
-Server: (From the root folder)
-`deno run --allow-net=:3000 --allow-read main.ts --port=3000`
-Client: (From client's folder)
+Server: (From the root folder)  
+`deno run --allow-net=:3000 --allow-read main.ts --port=3000`  
+Client: (From client's folder)  
 `yarn install`
 `yarn start`
 

server/clientHandler.ts

@@ -6,24 +6,29 @@ import Room from './map/rooms/room.ts'
 import Map from './map/map.ts'
 import { Npc } from './entities/npc.ts'
 import { PveData } from './pve/pveData.ts'
+import ConnectionManager from "./db/main.ts"
 
 export class ClientHandler {
   public boardColumns: number = 16
   public boardRows: number = 16
   public playerNames: string[] = []
   public map: Map
   private topPlayers: {id:string,name:string,level:number}[]
+  private db: ConnectionManager
 
   constructor(serverConfigs: any) {
     this.boardRows = serverConfigs.boardRows
     this.boardColumns = serverConfigs.boardColumns
 
     this.map = new Map(this)
 
+    this.db = new ConnectionManager()
+
     this.topPlayers = []
-    this.topPlayers.push({id:'',name:'',level:0})
-    this.topPlayers.push({id:'',name:'',level:0})
-    this.topPlayers.push({id:'',name:'',level:0})
+
+     this.db.getRank().then(result => {
+      this.topPlayers = result
+    })
   }
 
   private broadcastRank(): void {
@@ -350,7 +355,9 @@ export class ClientHandler {
     players.splice(0, players.length)
     if (updated) {
       this.topPlayers.splice(3)
-      this.broadcastRank()
+      this.db.updateRank(this.topPlayers).then(() => {
+        this.broadcastRank()
+      })
     }
 
     return updated

server/db/main.ts

@@ -0,0 +1,126 @@
+import { Client } from "https://deno.land/x/mysql/mod.ts";
+
+enum LastActionEnum {
+    None,
+    GetRank,
+    UpdateRank
+}
+
+export default class ConnectionManager {
+    public client: Client
+    public isConnected: boolean = false
+    private lastAction: LastActionEnum = LastActionEnum.None
+    private currentRankData: {id:string,name:string,level:number}[] = []
+    private reconnectAttempts: number = 0
+    private hostname: string = ''
+    private username: string = ''
+    private dbname: string = ''
+    private password: string = ''
+
+    constructor() {
+        this.client = new Client()
+        this.parseConnectionString()
+        this.connect()
+    }
+
+    public async getRank(): Promise<{id:string,name:string,level:number}[]> {
+        try {
+            const players = await this.client.query(`select * from tinyrank`);
+            let result = []
+            for(const player of players) {
+                result.push({id:player.PlayerId,name:player.PlayerName,level:player.PlayerLevel})
+            }
+    
+            return result
+        } catch (e) {
+            this.client.close()
+            this.isConnected = false
+            let result = []
+            result.push({id:'',name:'',level:0})
+            result.push({id:'',name:'',level:0})
+            result.push({id:'',name:'',level:0})
+
+            console.log(`DB error:`)
+            console.log(e)
+            this.lastAction = LastActionEnum.GetRank
+            this.reconnect()
+            return result
+        }
+    }
+
+    public async updateRank(topPlayers: {id:string,name:string,level:number}[]) {
+        try {
+            this.currentRankData = topPlayers
+
+            await this.client.execute(
+                `update tinyrank set ?? = ?, ?? = ?, ?? = ? where Id = 0`,
+                ["PlayerId", topPlayers[0].id,
+                "PlayerName", topPlayers[0].name,
+                "PlayerLevel", topPlayers[0].level]);
+            await this.client.execute(
+                `update tinyrank set ?? = ?, ?? = ?, ?? = ? where Id = 1`,
+                ["PlayerId", topPlayers[1].id,
+                "PlayerName", topPlayers[1].name,
+                "PlayerLevel", topPlayers[1].level]);
+            await this.client.execute(
+                `update tinyrank set ?? = ?, ?? = ?, ?? = ? where Id = 2`,
+                ["PlayerId", topPlayers[2].id,
+                "PlayerName", topPlayers[2].name,
+                "PlayerLevel", topPlayers[2].level]);
+        } catch (e) {
+            this.client.close()
+            this.isConnected = false
+            console.log(`DB error:`)
+            console.log(e)
+            this.lastAction = LastActionEnum.UpdateRank
+            this.reconnect()
+        }
+    }
+
+    public async connect() {
+        try {
+            await this.client.connect({
+                hostname: this.hostname,
+                username: this.username,
+                db: this.dbname,
+                password: this.password,
+            });
+            this.isConnected = true
+        } catch (e) {
+            this.isConnected = false
+            console.log(e)
+        }
+    }
+
+    private parseConnectionString() {
+        const connectionString = Deno.env.get('tinyconnectionstring')
+        if (connectionString) {
+            const variables = connectionString.split(';')
+
+            this.hostname = variables[0]
+            this.username = variables[1]
+            this.dbname = variables[2]
+            this.password = variables[3]
+        } else {
+            this.isConnected = false
+            console.log(`error getting env: ${Deno.env.get('tinyconnectionstring')}`)
+        }
+    }
+
+    private async reconnect() {
+        console.log(`retrying connection: ${this.reconnectAttempts}`)
+        setTimeout(async ()=>{
+            await this.connect()
+            if (!this.isConnected) {
+                this.reconnectAttempts += 1
+                this.reconnect()
+            } else {
+                this.reconnectAttempts = 0
+                console.log('reconnected to db!')
+                if (this.lastAction == LastActionEnum.UpdateRank) {
+                    this.updateRank(this.currentRankData)
+                }
+            }
+        },5000)
+    }
+}