Items and inventory

Account/accountSocket.ts

@@ -1,36 +1,39 @@
 import { game } from "../game";
-import { publicUserData, userData } from "./userData";
+import { userData } from "../Classes/userData";
 import { users } from "./users";
 
 export function registerAccountCallbacks(socket){
     function emitLogin(result : userData, registered:boolean = false){
-        socket.emit("account/login", JSON.stringify(new publicUserData(result, socket.id)));
         if(result != null){
-            socket.userId = result.Id;
+            socket.emit("account/login", JSON.stringify(userData.makeSafe(result, socket.id)));
+            socket.user = result
             if(registered){
-                console.log(`User ${(result as userData).Login} registerd and logged in`);
+                console.log(`User ${(result as userData).login} registerd and logged in`);
             }
             else{
-                console.log(`User ${(result as userData).Login} logged in`);
+                console.log(`User ${(result as userData).login} logged in`);
             }
         }
         else{
+            socket.emit("account/login", "");
             console.log("Login Failed");
         }
     }
     
     socket.on('account/register', (data) => {
         let buff = Buffer.from(data, 'base64');
-        let json = JSON.parse(buff.toString('utf-8'));
-        let result = users.createUser(json.Login, json.Password);
+        let json : userData = JSON.parse(buff.toString('utf-8'));
+        if (!json.login || !json.password) return
+        let result = users.createUser(json.login, json.password);
 
         emitLogin(result, true);
     });
 
     socket.on('account/login', (data) => {
         let buff = Buffer.from(data, 'base64');
-        let json = JSON.parse(buff.toString('utf-8'));
-        let result = users.readUser(json.Login, json.Password);
+        let json : userData = JSON.parse(buff.toString('utf-8'));
+        if (!json.login || !json.password) return
+        let result = users.readUser(json.login, json.password);
 
         emitLogin(result);
     });

Account/userData.ts

@@ -1,28 +0,0 @@
-export class userData{
-    Id: number;
-    Checksum: number;
-    Login: string;
-    Password: string;
-    Characters: number[] = [];
-
-    constructor(id:number, login:string, password:string){
-        this.Id = id;
-        this.Login = login;
-        this.Password = password;
-    }
-}
-
-export class publicUserData{
-    Id: number;
-    Login: string;
-    SocketId: string;
-
-    constructor(user:userData, socket: string){
-        if(user == null){
-            return null;
-        }
-        this.Id = user.Id;
-        this.Login = user.Login;
-        this.SocketId = socket;
-    }
-}

Account/users.ts

@@ -1,10 +1,10 @@
 import { game } from "../game";
-import { userData } from "./userData";
+import { userData } from "../Classes/userData";
 const fs = require('fs');
 
 export class users{
     static createUser(login, password){
-        if(game.accountsDB.filter(u=>u.Login == login)[0] != undefined){
+        if (game.accountsDB.find(u=>u.login == login) != null){
             console.log(`User ${login} alread exists`);
             return null;
         }
@@ -15,43 +15,51 @@ export class users{
     }
     
     static readUser(login, password){
-        let user = game.accountsDB.filter(u=>u.Login == login && u.Password == password)[0];
-        if(user != undefined){
+        let user = game.accountsDB.find(u=>u.login == login && u.password == password)
+        if(user != null){
             return user;
         }
         return null;
     }
 
     static readUserID(id : number){
-        let user = game.accountsDB.filter(u=>u.Id == id)[0];
+        let user = game.accountsDB.filter(u=>u.id == id)[0];
         return user;
     }
 
     static updateUser(userNew : userData){
-        let user = this.readUserID(userNew.Id);
+        let user = this.readUserID(userNew.id);
         let sum = Math.floor(Math.random() * 99999);
-        while(sum == userNew.Checksum){
+        while(sum == userNew.checksum){
             sum = Math.floor(Math.random() * 99999);
         }
-        userNew.Checksum = sum;
+        userNew.checksum = sum;
         game.accountsDB[game.accountsDB.indexOf(user)] = userNew;
     }
 
     static saveUsers(){
         game.accountsDB.forEach(user => {
             let data = JSON.stringify(user, null, 2);
-            fs.writeFileSync(`Database/Users/${user.Id}_${user.Login}.json`, data);
+            fs.writeFileSync(`Database/Users/${user.id}_${user.login}.json`, data);
         });
     }
     
     static loadUsers(){
+        let maxItemId = 0;
         fs.readdir(`Database/Users/`, (err, files) => {
             files.forEach(file => {
                 fs.readFile(`Database/Users/${file}`, (err, data) => {
                     if (err) throw err;
                     let user = JSON.parse(data);
                     game.accountsDB.push(user);
-                    console.log(`Loaded ${user.Login}`);
+                    if(user.playerData != null){
+                        user.playerData.inventory.items.forEach(i=>{
+                            if(i.id > maxItemId){
+                                game.itemCount = maxItemId = i.id
+                            }
+                        })
+                    }
+                    console.log(`Loaded ${user.login}`);
                 });
             });
         });