Add support for regional leaderboards

index.js

@@ -14,6 +14,7 @@ import { generateDB } from './libs/database/generate.js'
 import { dbInit } from './libs/database/init.js'
 import { getStats, setStat } from './libs/serverStats.js'
 import { downloadEssentialData } from './libs/download/dowload.js'
+import { ddnssStart } from './libs/ddnss/handler.js'
 
 const start = Date.now()
 const log = initLog("[ MAIN ]")
@@ -50,3 +51,5 @@ const elapsed = Date.now() - start
 log(`Took ${elapsed/1000} seconds to start the server!`)
 
 Server.listen(process.env.PORT ?? 12345, () => log(`Server started and listening on port ${process.env.PORT}.`))
+
+//ddnssStart()

libs/database/generate.js

@@ -78,7 +78,8 @@ export function generateDB() {
         `CREATE INDEX IF NOT EXISTS "idx_rankings_rank" ON "rankings" ("rank")`,
         `CREATE INDEX IF NOT EXISTS "idx_rankings_player" ON "rankings" ("player")`,
         `CREATE INDEX IF NOT EXISTS "idx_rankings_finishes" ON "rankings" ("finishes")`,
-        `CREATE INDEX IF NOT EXISTS "idx_rankings_mapRank" ON "rankings" ("map", "rank")`
+        `CREATE INDEX IF NOT EXISTS "idx_rankings_mapRank" ON "rankings" ("map", "rank")`,
+        `CREATE INDEX IF NOT EXISTS "idx_rankings_playerServer" ON "rankings" ("player", "server")`
     ])
 
     log("Generating teamrace index...")
@@ -181,4 +182,5 @@ export function generateDB() {
             "colorFeetHex" varchar(8) NOT NULL
         )
     `)
+    skinDB.exec(`CREATE INDEX IF NOT EXISTS "idx_player" ON "skindata" ("player")`)
 }

libs/database/tasks.js

@@ -1,6 +1,7 @@
 import decodeMsgpack from './decodeMsgpack.js'
 import { execMany } from './helper.js'
 import { sqlite } from './init.js'
+import { mapToRegion, playerServer } from './wrapper.js'
 
 /**
  * This generates rankings for each map...
@@ -163,6 +164,7 @@ export function processAllPoints() {
         CREATE TABLE IF NOT EXISTS "points"
         (
             "type" varchar(16) NOT NULL,
+            "region" varchar(24) NOT NULL,
             "rank" INTEGER NOT NULL,
             "player" varchar(16) NOT NULL,
             "points" INTEGER NOT NULL
@@ -178,25 +180,27 @@ export function processAllPoints() {
                 .prepare(`
                     INSERT INTO "points"
                     (
-                        type, rank, player, points
+                        type, region, rank, player, points
-                    ) VALUES (?, ?, ?, ?)
+                    ) VALUES (?, ?, ?, ?, ?)
                 `)
                 .run(
                     type,
+                    mapToRegion(playerServer(entry[0])),
                     rank,
                     entry[0],
                     entry[1]
                 )
-
             ++rank
         }
+        console.log(`${type} Done...`)
     }
 
     /* Generate indexes */
     execMany([
         `CREATE INDEX IF NOT EXISTS "idx_points_type" ON "points" ("type")`,
-        `CREATE INDEX IF NOT EXISTS "Idx_points_rank" on "points" ("rank")`,
+        `CREATE INDEX IF NOT EXISTS "idx_points_rank" on "points" ("rank")`,
-        `CREATE INDEX IF NOT EXISTS "Idx_points_name" on "points" ("player")`
+        `CREATE INDEX IF NOT EXISTS "idx_points_name" on "points" ("player")`
+        `CREATE INDEX IF NOT EXISTS "idx_points_name" on "points" ("region", "type")`
     ])
 }
 

libs/database/wrapper.js

@@ -1,4 +1,4 @@
-import { sqlite } from './init.js'
+import { sqlite, skinDB } from './init.js'
 import { simpleSanitize } from './searcher.js'
 /**
  * This function checks if a player exists
@@ -222,17 +222,32 @@ export function leaderboardRace(map, start, end) {
  * (points, pointsRank, pointsTeam, pointsThisWeek, pointsThisMonth)
  * 
  * @param {string} type Which type of points to fetch
+ * @param {string} region Which region should be included (Global, Europe, Asia, SA, NA, Africa, ME, OLD, Other)
  * @param {number} start At which rank the leaderboard should begin
  * @param {number} end At which rank the leaderboard should end
 
  * @returns {array} An array containing the leaderboard
  */
-export function leaderboardPoints(type, start, end) {
+export function leaderboardPoints(type, region, start, end) {
-    const leaderboard = sqlite.prepare(`
+    let output = []
-        SELECT rank, player, points FROM points WHERE type = ? AND rank >= ? AND rank <= ? ORDER BY rank`)
+    let leaderboard
-    .all(type, start, end)
 
-    return leaderboard
+    if(region == "Global") {
+        leaderboard = sqlite.prepare(`
+            SELECT rank, region, player, points FROM points WHERE type = ? AND rank >= ? AND rank <= ? ORDER BY rank`)
+        .all(type, start, end)
+    }
+    else {
+        leaderboard = sqlite.prepare(`
+            SELECT rank, region, player, points FROM points WHERE type = ? AND region = ? ORDER BY rank ASC LIMIT ?, ${end}`)
+        .all(type, region, start - 1)
+    }
+    for (const entry of leaderboard) {
+        let flag = skinDB.prepare(`SELECT flag FROM skindata WHERE player = ?`).get(entry.player)?.flag ?? "default"
+
+        output.push({ rank: entry.rank, player: entry.player, points: entry.points, region: entry.region, flag: flag })
+    }
+    return output
 }
 
 /**
@@ -376,6 +391,80 @@ export function searchMap(query, categories, stars, sortBy, order) {
 
     return output
 }
+/*
+Europe
+/ RUS - Russia
+/ GER - Germany
+/ NLD - Netherlands 
+/ TUR - Turkey
+/ POL - Poland
+/ FRA - France
+
+Asia
+/ IND - INDIA
+/ SGP - Singapore
+/ CHN - China
+/ JAP - Japan
+/ KOR - South Korea
+
+South America
+/ COL - Columbia
+/ ARG - Argentina
+/ CHL - Chile
+/ BRA - Brazil
+
+North America
+/ CAN - Cananda
+/ USA - USA
+
+Africa
+/ ZAF - South Africa
+
+Middle east
+/ KSA/UAE/IRN
+
+Others
+/ CRI - Costa Rica
+/ AUS - Australia
+/ OLD ranks (NA/EU)
+/ UNK - Some bugged ranks
+
+*/
+export function mapToRegion(srv) {
+    if(srv == "RUS" || srv == "GER" || srv == "NLD" || srv == "TUR" || srv == "POL" || srv == "FRA")
+        return "Europe"
+
+    if(srv == "IND" || srv == "SGP" || srv == "CHN" || srv == "JAP" || srv == "KOR")
+        return "Asia"
+
+    if(srv == "COL" || srv == "ARG" || srv == "CHL" || srv == "BRA")
+        return "SA"
+    
+    if(srv == "CAN" || srv == "USA")
+        return "NA"
+
+    if(srv == "ZAF")
+        return "Africa"
+    
+    /* Middle east */
+    if(srv == "KSA" || srv == "UAE" || srv == "IRN")
+        return "ME"
+
+    if(srv == "")
+        return "OLD"
+
+    return "Other"
+}
+
+export function playerServer(player) {
+    /* This can be undefined if a player has changed their name */
+    const server = sqlite.prepare(
+        `SELECT server, COUNT(server) as a FROM rankings WHERE player = ? GROUP BY server ORDER BY a DESC`)
+    .get(player)?.server ?? ""
+
+    return server
+}
+
 
 export default {
     playerExists,
@@ -393,4 +482,7 @@ export default {
     leaderboardRace,
     leaderboardTeamrace,
     categoryExists,
+
+    mapToRegion,
+    playerServer,
 }

routes/routes.js

@@ -53,11 +53,11 @@ routes.get(
     '/leaderboards',
     (req, res) => {
         const leaderboards = {
-            points: wrapper.leaderboardPoints("points", 1, 10),
+            points: wrapper.leaderboardPoints("points", "Global", 1, 10),
-            pointsRank: wrapper.leaderboardPoints("pointsRank", 1, 10),
+            pointsRank: wrapper.leaderboardPoints("pointsRank", "Global", 1, 10),
-            pointsTeam: wrapper.leaderboardPoints("pointsTeam", 1, 10),
+            pointsTeam: wrapper.leaderboardPoints("pointsTeam", "Global", 1, 10),
-            pointsThisWeek: wrapper.leaderboardPoints("pointsThisWeek", 1, 10),
+            pointsThisWeek: wrapper.leaderboardPoints("pointsThisWeek", "Global", 1, 10),
-            pointsThisMonth: wrapper.leaderboardPoints("pointsThisMonth", 1, 10)
+            pointsThisMonth: wrapper.leaderboardPoints("pointsThisMonth", "Global", 1, 10)
         }
 
         tx(req, res)('pages/leaderboards.njk', { leaderboards }, true, { currentSection: "leaderboards" })