Merge pull request #2 from Ktilis:main

Thanks to Ktilis for this amazing PR#2!
Remapping config strings & unique links for skin files by md5

package.json

@@ -27,7 +27,8 @@
     "mysql2": "^3.5.2",
     "rcon-client": "^4.2.3",
     "rimraf": "^5.0.1",
-    "sharp": "^0.32.4"
+    "sharp": "^0.32.4",
+    "ts-md5": "^1.3.1"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",

src/config/mysql.json

@@ -1,17 +1,29 @@
 {
     "mysql": {
         "host": "localhost",
-        "port": 3310,
+        "port": 3306,
         "user":{
-            "name": "root",
-            "password": "root"
+            "name": "test",
+            "password": "test"
         },
         "database": {
-            "name": "newAuth",
-            "table": "AUTH",
-            "columns": {
-                "username": "NICKNAME",
-                "password": "HASH"
+            "name": "hc2_test",
+            "tables": {
+                "players": {
+                    "name": "AUTH",
+                    "columns": {
+                        "username": "NICKNAME",
+                        "password": "HASH"
+                    }
+                },
+                "skins": {
+                    "name": "SKINS_CACHE",
+                    "columns": {
+                        "username": "NICKNAME",
+                        "hash": "SKIN_HASH",
+                        "last_updated": "LAST_UPDATED"
+                    }
+                }
             }
         }
 

src/config/skinSystem.json

@@ -1,6 +1,6 @@
 {
     "skins":{
-        "path": "C:\\Users\\zxcvb\\Downloads\\ttemp",
+        "path": "/user/helicraft/skins",
         "nameFormat": "%s",
         "type": "png"
     }

src/database/database.config.ts

@@ -12,10 +12,22 @@ database = {
     },
     database: {
         name: mysqlConfig.mysql.database.name,
-        table: mysqlConfig.mysql.database.table,
-        columns: {
-            username: mysqlConfig.mysql.database.columns.username,
-            password: mysqlConfig.mysql.database.columns.password
+        tables: {
+            players: {
+                name: mysqlConfig.mysql.database.tables.players.name,
+                columns: {
+                    username: mysqlConfig.mysql.database.tables.players.columns.username,
+                    password: mysqlConfig.mysql.database.tables.players.columns.password
+                }
+            },
+            skins: {
+                name: mysqlConfig.mysql.database.tables.skins.name,
+                columns: {
+                    username: mysqlConfig.mysql.database.tables.skins.columns.username,
+                    hash: mysqlConfig.mysql.database.tables.skins.columns.hash,
+                    last_updated: mysqlConfig.mysql.database.tables.skins.columns.last_updated
+                }
+            }
         }
     }
 }

src/database/database.types.ts

@@ -7,10 +7,22 @@ interface dbConfig {
     },
     database: {
         name: string,
-        table: string,
-        columns: {
-            username: string,
-            password: string
+        tables: {
+            players: {
+                name: string,
+                columns: {
+                    username: string,
+                    password: string
+                }
+            },
+            skins: {
+                name: string,
+                columns: {
+                    username: string,
+                    hash: string,
+                    last_updated: string
+                }
+            }
         }
     }
 };

src/database/functions/changePassword.ts

@@ -1,11 +1,10 @@
-
 import database from '../database.config';
 import connection from './mysqlConnect';
 
 export default async (username: string, HASH: string): Promise<boolean> => {
   try {
     const result = await connection.execute(
-      `UPDATE ${database.database.table} SET ${database.database.columns.password} = ? WHERE ${database.database.columns.username} = ?`,
+      `UPDATE ${database.database.tables.players.name} SET ${database.database.tables.players.columns.password} = ? WHERE ${database.database.tables.players.columns.username} = ?`,
       [HASH, username]
     );
 

src/database/functions/checkPassword.ts

@@ -16,7 +16,7 @@ async function givePassword(username: string): Promise<string> {
     throw new Error('User not found');
   }
 
-  const passwordProperty = database.database.columns.password;
+  const passwordProperty = database.database.tables.players.columns.password;
   const HASH = user[passwordProperty];
 
   if (!HASH) {

src/database/functions/createUser.ts

@@ -1,4 +1,3 @@
-import mysql from 'mysql2';
 import database from '../database.config';
 import connection from './mysqlConnect';
 
@@ -12,7 +11,10 @@ import connection from './mysqlConnect';
 export default async function createUser(username: string, password: string): Promise<boolean> {
     try {
         const result = await connection.execute(
-            `INSERT INTO ${database.database.table} (${database.database.columns.username}, ${database.database.columns.password}) VALUES (?, ?)`,
+            `INSERT INTO ${database.database.tables.players.name} 
+            (${database.database.tables.players.columns.username}, 
+            ${database.database.tables.players.columns.password}) 
+            VALUES (?, ?)`,
             [username, password],
         );
         return true;

src/database/functions/findUser.ts

@@ -12,7 +12,7 @@ export default async function getUserByUsername(username: string): Promise<mysql
   try {
     const result = await new Promise<mysql.RowDataPacket[]>((resolve, reject) => {
       connection.execute(
-        `SELECT * FROM ${database.database.table} WHERE ${database.database.columns.username} = ?`,
+        `SELECT * FROM ${database.database.tables.players.name} WHERE ${database.database.tables.players.columns.username} = ?`,
         [username],
         (err, result: mysql.RowDataPacket[]) => {
           if (err) {

src/database/functions/skins/addNewSkin.ts

@@ -0,0 +1,26 @@
+import database from '../../database.config';
+import connection from '../mysqlConnect';
+
+/**
+ * Creates a new user in the database with the given username and hash.
+ *
+ * @param {string} username - The username of the new user.
+ * @param {string} hash - The password of the new user.
+ * @return {Promise<boolean>} A promise that resolves to true if the user was created successfully, or false otherwise.
+ */
+export default async function addNewSkin(username: string, hash: string, last_updated: string): Promise<boolean> {
+    try {
+        const result = await connection.execute(
+            `INSERT INTO ${database.database.tables.skins.name} 
+            (${database.database.tables.skins.columns.username}, 
+            ${database.database.tables.skins.columns.hash},
+            ${database.database.tables.skins.columns.last_updated}) 
+            VALUES (?, ?, ?)`,
+            [username, hash, last_updated],
+        );
+        return true;
+    } catch (error) {
+        console.error('Error creating user:', error);
+        return false;
+    }
+}

src/database/functions/skins/findUserByUsername.ts

@@ -0,0 +1,38 @@
+import mysql from 'mysql2';
+import database from '../../database.config';
+import connection from '../mysqlConnect';
+
+/**
+ * Is user exists
+ *
+ * @param {string} username - The username of the user to find.
+ * @return {Promise<mysql.RowDataPacket | null>} A promise that resolves true if the user was found, or null if not found.
+ */
+export default async function isUserExists(username: string): Promise<boolean> {
+  try {
+    const result = await new Promise<mysql.RowDataPacket[]>((resolve, reject) => {
+      connection.execute(
+        `SELECT *
+        FROM ${database.database.tables.skins.name} 
+        WHERE ${database.database.tables.skins.columns.username} = ?`,
+        [username],
+        (err, result: mysql.RowDataPacket[]) => {
+          if (err) {
+            console.log(err);
+            reject(err);
+          } else {
+            resolve(result);
+          }
+        }
+      );
+    });
+
+    if (result.length > 0) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    throw error;
+  }
+}

src/database/functions/skins/getHashByUsername.ts

@@ -0,0 +1,38 @@
+import mysql from 'mysql2';
+import database from '../../database.config';
+import connection from '../mysqlConnect';
+
+/**
+ * Returning player's skin hash
+ *
+ * @param {string} hash - The skin hash of the user to find.
+ * @return {Promise<string | null>} A promise that resolves with the hash if found, or null if not found.
+ */
+export default async function getHashByUsername(username: string): Promise<string | null> {
+  try {
+    const result = await new Promise<mysql.RowDataPacket[]>((resolve, reject) => {
+      connection.execute(
+        `SELECT ${database.database.tables.skins.columns.hash} 
+        FROM ${database.database.tables.skins.name} 
+        WHERE ${database.database.tables.skins.columns.username} = ?`,
+        [username],
+        (err, result: mysql.RowDataPacket[]) => {
+          if (err) {
+            console.log(err);
+            reject(err);
+          } else {
+            resolve(result);
+          }
+        }
+      );
+    });
+
+    if (result.length > 0) {
+      return result[0][database.database.tables.skins.columns.hash];
+    } else {
+      return null;
+    }
+  } catch (error) {
+    throw error;
+  }
+}

src/database/functions/skins/getUsernameByHash.ts

@@ -0,0 +1,38 @@
+import mysql from 'mysql2';
+import database from '../../database.config';
+import connection from '../mysqlConnect';
+
+/**
+ * Returning player's skin hash
+ *
+ * @param {string} hash - The skin hash of the user to find.
+ * @return {Promise<string | null>} A promise that resolves with the hash if found, or null if not found.
+ */
+export default async function getUserBySkinHash(hash: string): Promise<string | null> {
+  try {
+    const result = await new Promise<mysql.RowDataPacket[]>((resolve, reject) => {
+      connection.execute(
+        `SELECT ${database.database.tables.skins.columns.username} 
+        FROM ${database.database.tables.skins.name} 
+        WHERE ${database.database.tables.skins.columns.hash} = ?`,
+        [hash],
+        (err, result: mysql.RowDataPacket[]) => {
+          if (err) {
+            console.log(err);
+            reject(err);
+          } else {
+            resolve(result);
+          }
+        }
+      );
+    });
+
+    if (result.length > 0) {
+      return result[0][database.database.tables.skins.columns.username];
+    } else {
+      return null;
+    }
+  } catch (error) {
+    throw error;
+  }
+}

src/database/functions/skins/updateUserSkinHash.ts

@@ -0,0 +1,20 @@
+import database from '../../database.config';
+import connection from '../mysqlConnect';
+
+export default async function updateUserSkinHash(username: string, hash: string, last_updated: string): Promise<boolean> {
+  try {
+    const result = await connection.execute(
+      `UPDATE ${database.database.tables.skins.name} 
+      SET ${database.database.tables.skins.columns.hash} = ?, ${database.database.tables.skins.columns.last_updated} = ?
+      WHERE ${database.database.tables.skins.columns.username} = ?`,
+      [hash, last_updated, username]
+    );
+
+    console.log(`Updated row(s)`);
+
+    return true;
+  } catch (error) {
+    console.error('Error updating values:', error);
+    return false;
+  }
+};