Fix leaderboard submission display issue: update frontend to correctly handle score vs points

app.py

@@ -789,7 +789,13 @@ def route_api_leaderboard_submit():
         else:
             score_obj = score_data
         
-        score_value = int(score_obj.get('score', 0))
+        # Check for 'score' first, then 'points'
+        # Frontend usually sends 'points'
+        score_val = score_obj.get('score')
+        if score_val is None:
+            score_val = score_obj.get('points')
+            
+        score_value = int(score_val or 0)
     except:
         return api_error('invalid_score_format')
     
@@ -858,7 +864,6 @@ def route_api_leaderboard_submit():
         
         return jsonify({'status': 'ok', 'message': 'score_submitted'})
 
-
 @app.route(basedir + 'api/leaderboard/get')
 def route_api_leaderboard_get():
     song_id = request.args.get('song_id', None)
@@ -867,10 +872,13 @@ def route_api_leaderboard_get():
     if not song_id or not difficulty:
         return abort(400)
     
+    # Accept both numeric IDs and hash strings
+    # Try to convert to int if possible, otherwise use as string
     try:
         song_id = int(song_id)
-    except:
-        return abort(400)
+    except (ValueError, TypeError):
+        # Keep as string (hash ID)
+        pass
     
     # Validate difficulty
     valid_difficulties = ['easy', 'normal', 'hard', 'oni', 'ura']
@@ -901,6 +909,7 @@ def route_api_leaderboard_get():
     return jsonify({'status': 'ok', 'leaderboard': leaderboard, 'month': current_month})
 
 
+
 @app.route(basedir + 'privacy')
 def route_api_privacy():
     last_modified = time.strftime('%d %B %Y', time.gmtime(os.path.getmtime('templates/privacy.txt')))

local_debug.py

@@ -0,0 +1,201 @@
+
+import time
+import json
+import base64
+
+# Mock DB and objects
+class MockCollection:
+    def __init__(self, name):
+        self.name = name
+        self.data = []
+
+    def find_one(self, query):
+        for item in self.data:
+            match = True
+            for k, v in query.items():
+                if item.get(k) != v:
+                    match = False
+                    break
+            if match:
+                return item
+        return None
+
+    def find(self, query, projection=None):
+        results = []
+        for item in self.data:
+            match = True
+            for k, v in query.items():
+                if item.get(k) != v:
+                    match = False
+                    break
+            if match:
+                if projection:
+                    filtered = {k: v for k, v in item.items() if projection.get(k, False)}
+                    if projection.get('_id') is None or projection.get('_id') is True:
+                         filtered['_id'] = item.get('_id')
+                    results.append(filtered)
+                else:
+                    results.append(item)
+        return MockCursor(results)
+
+    def insert_one(self, doc):
+        doc['_id'] = len(self.data) + 1
+        print(f"[{self.name}] Inserted: {doc}")
+        self.data.append(doc)
+    
+    def count_documents(self, query):
+        return len(self.data)
+
+class MockCursor:
+    def __init__(self, data):
+        self.data = data
+    def sort(self, key, direction):
+        self.data.sort(key=lambda x: x.get(key, 0), reverse=(direction < 0))
+        return self
+    def limit(self, n):
+        self.data = self.data[:n]
+        return self.data
+
+class MockDB:
+    def __init__(self):
+        self.users = MockCollection('users')
+        self.leaderboards = MockCollection('leaderboards')
+
+db = MockDB()
+db.users.insert_one({'username': 'testuser', 'display_name': 'Test User'})
+
+# --- Logic from app.py rewritten for standalone test ---
+
+def logic_submit(data, username):
+    print(f"\n--- Submitting {data.get('song_id')} ---")
+    user = db.users.find_one({'username': username})
+    if not user:
+        return {'error': 'user_not_found'}
+    
+    song_id = data.get('song_id')
+    difficulty = data.get('difficulty')
+    score_data = data.get('score')
+    
+    current_month = time.strftime('%Y-%m', time.gmtime())
+    
+    existing = db.leaderboards.find_one({
+        'song_id': song_id,
+        'difficulty': difficulty,
+        'username': username,
+        'month': current_month
+    })
+    
+    # Patched Logic from app.py
+    try:
+        if isinstance(score_data, str):
+            score_obj = json.loads(score_data)
+        else:
+            score_obj = score_data
+        
+        # Check for 'score' first, then 'points'
+        score_val = score_obj.get('score')
+        if score_val is None:
+            score_val = score_obj.get('points')
+            
+        score_value = int(score_val or 0)
+        print(f"  Parsed Score Value: {score_value}")
+    except Exception as e:
+        print(f"Error parsing score: {e}")
+        return {'error': 'invalid_score_format'}
+
+    if existing:
+        print("  Existing record found (simulated update).")
+    else:
+        print("  Inserting new record.")
+        db.leaderboards.insert_one({
+            'song_id': song_id,
+            'difficulty': difficulty,
+            'username': username,
+            'display_name': user['display_name'],
+            'score': score_data,
+            'score_value': score_value,
+            'submitted_at': time.time(),
+            'month': current_month
+        })
+    return {'status': 'ok'}
+
+def logic_get(args):
+    print(f"\n--- Getting {args.get('song_id')} ---")
+    song_id = args.get('song_id', None)
+    difficulty = args.get('difficulty', None)
+
+    if not song_id or not difficulty:
+        return {'error': 'missing args'}
+    
+    try:
+        song_id = int(song_id)
+    except (ValueError, TypeError):
+        pass
+        
+    current_month = time.strftime('%Y-%m', time.gmtime())
+    
+    leaderboard = list(db.leaderboards.find({
+        'song_id': song_id,
+        'difficulty': difficulty,
+        'month': current_month
+    }, {
+        '_id': False,
+        'username': True,
+        'score_value': True
+    }).sort('score_value', -1).limit(50))
+    
+    return {'status': 'ok', 'leaderboard': leaderboard}
+
+# --- Test Cases ---
+
+# Case 1: Hash ID
+print("=== TEST CASE 1: Hash ID ===")
+logic_submit({
+    'song_id': "hash123", 
+    'difficulty': 'oni',
+    'score': {'score': 1000000}
+}, 'testuser')
+res1 = logic_get({'song_id': "hash123", 'difficulty': 'oni'})
+if len(res1['leaderboard']) > 0: print("✅ Success")
+else: print("❌ Failed")
+
+# Case 2: Numeric ID
+print("\n=== TEST CASE 2: Numeric ID ===")
+logic_submit({
+    'song_id': 123, 
+    'difficulty': 'oni',
+    'score': {'score': 2000000}
+}, 'testuser')
+res2 = logic_get({'song_id': "123", 'difficulty': 'oni'})
+if len(res2['leaderboard']) > 0: print("✅ Success")
+else: print("❌ Failed")
+
+# Case 3: Points Only (Frontend Payload Simulation)
+print("\n=== TEST CASE 3: Points Only (Frontend Payload) ===")
+# This simulates what the JS 'this.resultsObj' looks like (it has 'points', not 'score')
+logic_submit({
+    'song_id': "points_song",
+    'difficulty': 'hard',
+    'score': {'points': 345678, 'bad': 0, 'good': 100} # No 'score' key
+}, 'testuser')
+
+res3 = logic_get({'song_id': "points_song", 'difficulty': 'hard'})
+passed = False
+if len(res3.get('leaderboard', [])) > 0:
+    val = res3['leaderboard'][0].get('score_value')
+    if val == 345678:
+        print(f"✅ SUCCESS: Correctly parsed 'points' -> {val}")
+        passed = True
+    else:
+        print(f"❌ FAILED: Score value mismatch. Expected 345678, got {val}")
+else:
+    print("❌ FAILED: No record found")
+
+if passed:
+    print("\n---------------------------------------------------")
+    print("🎉 ALL LOCAL TESTS PASSED. BACKEND LOGIC VERIFIED.")
+    print("---------------------------------------------------")
+else:
+    print("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+    print("🛑 TESTS FAILED. CHECK LOGS.")
+    print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")

public/src/js/assets.js

@@ -7,6 +7,7 @@ var assets = {
 		"titlescreen.js",
 		"scoresheet.js",
 		"songselect.js",
+		"leaderboard.js",
 		"keyboard.js",
 		"gameinput.js",
 		"game.js",
@@ -140,6 +141,7 @@ var assets = {
 	},
 	"views": [
 		"game.html",
+		"leaderboard.html",
 		"loadsong.html",
 		"songselect.html",
 		"titlescreen.html",

public/src/js/leaderboard.js

@@ -1,12 +1,21 @@
 class Leaderboard {
     constructor() {
-        this.init()
+        this.canvas = null
+        this.ctx = null
+        this.songId = null
+        this.difficulty = null
+        this.leaderboardData = []
+        this.currentMonth = ""
+        this.visible = false
+        this.draw = null
+        this.keyboard = null
     }
 
     init() {
         this.canvas = document.getElementById("leaderboard-canvas")
         if (!this.canvas) {
-            return
+            console.error("Leaderboard canvas not found!")
+            return false
         }
         this.ctx = this.canvas.getContext("2d")
 
@@ -16,12 +25,6 @@ class Leaderboard {
             this.ctx.imageSmoothingEnabled = false
         }
 
-        this.songId = null
-        this.difficulty = null
-        this.leaderboardData = []
-        this.currentMonth = ""
-        this.visible = false
-
         this.draw = new CanvasDraw(noSmoothing)
 
         // Keyboard controls
@@ -33,6 +36,7 @@ class Leaderboard {
         }, this.keyPress.bind(this))
 
         pageEvents.add(this.canvas, ["mousedown", "touchstart"], this.onClose.bind(this))
+        return true
     }
 
     keyPress(pressed, name) {
@@ -55,6 +59,12 @@ class Leaderboard {
 
         loader.changePage("leaderboard", false)
 
+        // Initialize after page is loaded
+        if (!this.init()) {
+            console.error("Failed to initialize leaderboard")
+            return
+        }
+
         // Fetch leaderboard data
         await this.fetchLeaderboard()
 
@@ -67,10 +77,18 @@ class Leaderboard {
     }
 
     async fetchLeaderboard() {
+        // Validate songId exists
+        if (!this.songId) {
+            console.error("Missing song ID for leaderboard")
+            this.leaderboardData = []
+            return
+        }
+
         try {
             var response = await loader.ajax(
-                `${gameConfig.basedir || "/"}api/leaderboard/get?song_id=${this.songId}&difficulty=${this.difficulty}`
+                `${gameConfig.basedir || "/"}api/leaderboard/get?song_id=${encodeURIComponent(this.songId)}&difficulty=${this.difficulty}`
             )
+
             var data = JSON.parse(response)
             if (data.status === "ok") {
                 this.leaderboardData = data.leaderboard || []
@@ -84,6 +102,7 @@ class Leaderboard {
         }
     }
 
+
     changeDifficulty(direction) {
         var difficulties = ["easy", "normal", "hard", "oni", "ura"]
         var currentIndex = difficulties.indexOf(this.difficulty)
@@ -361,7 +380,8 @@ class Leaderboard {
                 this.ctx.fillText(displayName, modalX + 140, y + 2)
 
                 // Score with formatting
-                var score = entry.score && entry.score.score ? entry.score.score : 0
+                // Score with formatting
+                var score = entry.score_value !== undefined ? entry.score_value : (entry.score && entry.score.score ? entry.score.score : 0)
                 this.ctx.fillStyle = rank <= 3 ? "#1a1a1a" : "#555555"
                 this.ctx.font = (rank <= 3 ? "bold " : "") + "20px " + (strings.font || "sans-serif")
                 this.ctx.textAlign = "right"

public/src/js/scoresheet.js

@@ -178,7 +178,93 @@ class Scoresheet {
 			}
 			this.game.appendChild(this.tetsuoHana)
 		}
+
+		// Add leaderboard submit button if user is logged in
+		if (account.loggedIn && !this.multiplayer) {
+			this.leaderboardBtn = document.createElement("div")
+			this.leaderboardBtn.id = "leaderboard-submit-btn"
+			this.leaderboardBtn.innerHTML = "🏆 提交排行榜<br><small>Submit to Leaderboard</small>"
+			this.leaderboardBtn.style.cssText = `
+				position: fixed;
+				bottom: 20px;
+				right: 20px;
+				padding: 15px 25px;
+				background: linear-gradient(135deg, #ff6b9d, #c44db3);
+				color: white;
+				border-radius: 15px;
+				font-size: 18px;
+				font-family: ${strings.font || "sans-serif"};
+				text-align: center;
+				cursor: pointer;
+				z-index: 1000;
+				box-shadow: 0 4px 15px rgba(0,0,0,0.3);
+				border: 3px solid #fff;
+				transition: all 0.2s ease;
+				user-select: none;
+			`
+			this.leaderboardBtn.onmouseover = () => {
+				if (!this.leaderboardSubmitted) {
+					this.leaderboardBtn.style.transform = "scale(1.05)"
+					this.leaderboardBtn.style.boxShadow = "0 6px 20px rgba(0,0,0,0.4)"
 				}
+			}
+			this.leaderboardBtn.onmouseout = () => {
+				this.leaderboardBtn.style.transform = "scale(1)"
+				this.leaderboardBtn.style.boxShadow = "0 4px 15px rgba(0,0,0,0.3)"
+			}
+			this.leaderboardBtn.onclick = () => this.onLeaderboardBtnClick()
+			this.game.appendChild(this.leaderboardBtn)
+		}
+	}
+
+	onLeaderboardBtnClick() {
+		if (this.leaderboardSubmitted) {
+			return
+		}
+
+		// Fallback: This is CRITICAL for cases where saveScore() failed or was skipped
+		if (!this.leaderboardData) {
+			console.warn("Leaderboard data missing, attempting to reconstruct...")
+			var song = this.controller.selectedSong
+			var results = this.resultsObj
+
+			if (song && results) {
+				var songId = song.id || song.hash
+
+				if (songId) {
+					this.leaderboardData = {
+						songId: songId,
+						difficulty: results.difficulty,
+						scoreObj: Object.assign({ score: results.points }, results)
+					}
+					// Clean up scoreObj
+					if (this.leaderboardData.scoreObj) {
+						delete this.leaderboardData.scoreObj.title
+						delete this.leaderboardData.scoreObj.difficulty
+						delete this.leaderboardData.scoreObj.gauge
+					}
+					console.log("Leaderboard data reconstructed:", this.leaderboardData)
+				}
+			}
+		}
+
+		if (!this.leaderboardData || !this.leaderboardData.songId) {
+			this.showLeaderboardNotification("no_song_id")
+			return
+		}
+
+		// Disable button and show submitting state
+		this.leaderboardBtn.innerHTML = "⏳ 提交中..."
+		this.leaderboardBtn.style.background = "linear-gradient(135deg, #888, #666)"
+		this.leaderboardBtn.style.cursor = "default"
+
+		this.submitToLeaderboard(
+			this.leaderboardData.songId,
+			this.leaderboardData.difficulty,
+			this.leaderboardData.scoreObj
+		)
+	}
+
 
 	redraw() {
 		if (!this.redrawRunning) {
@@ -926,13 +1012,24 @@ class Scoresheet {
 			var title = this.controller.selectedSong.originalTitle
 			var hash = this.controller.selectedSong.hash
 			var difficulty = this.resultsObj.difficulty
-			var songId = this.controller.selectedSong.id
+			// Use id if available, otherwise use hash
+			var songId = this.controller.selectedSong.id || hash
 			var oldScore = scoreStorage.get(hash, difficulty, true)
 			var clearReached = this.controller.game.rules.clearReached(this.resultsObj.gauge)
 			var crown = ""
 			if (clearReached) {
 				crown = this.resultsObj.bad === 0 ? "gold" : "silver"
 			}
+
+			// Store data for manual leaderboard submission
+			this.leaderboardData = {
+				songId: songId,
+				difficulty: difficulty,
+				scoreObj: Object.assign({ score: this.resultsObj.points }, this.resultsObj)
+			}
+			this.leaderboardSubmitted = false
+
+
 			if (!oldScore || oldScore.points <= this.resultsObj.points) {
 				if (oldScore && (oldScore.crown === "gold" || oldScore.crown === "silver" && !crown)) {
 					crown = oldScore.crown
@@ -941,10 +1038,7 @@ class Scoresheet {
 				delete this.resultsObj.title
 				delete this.resultsObj.difficulty
 				delete this.resultsObj.gauge
-				scoreStorage.add(hash, difficulty, this.resultsObj, true, title).then(() => {
-					// Auto-submit to leaderboard if logged in and has song ID
-					this.submitToLeaderboard(songId, difficulty, this.resultsObj)
-				}).catch(() => {
+				scoreStorage.add(hash, difficulty, this.resultsObj, true, title).catch(() => {
 					this.showWarning = { name: "scoreSaveFailed" }
 				})
 			} else if (oldScore && (crown === "gold" && oldScore.crown !== "gold" || crown && !oldScore.crown)) {
@@ -957,28 +1051,130 @@ class Scoresheet {
 		this.scoreSaved = true
 	}
 
+
 	submitToLeaderboard(songId, difficulty, scoreObj) {
-		// Only submit if user is logged in and song has valid ID
+		// Only submit if user is logged in and song has an ID
 		if (!account.loggedIn || !songId) {
 			return
 		}
 
+		var self = this
 		loader.getCsrfToken().then(token => {
 			var request = new XMLHttpRequest()
 			request.open("POST", "api/leaderboard/submit")
 			request.setRequestHeader("Content-Type", "application/json;charset=UTF-8")
 			request.setRequestHeader("X-CSRFToken", token)
+
+			request.onload = function () {
+				if (request.status === 200) {
+					try {
+						var response = JSON.parse(request.responseText)
+						if (response.status === "ok") {
+							self.leaderboardSubmitted = true
+							self.showLeaderboardNotification(response.message)
+							// Update button to show success
+							if (self.leaderboardBtn) {
+								self.leaderboardBtn.innerHTML = "✅ 已提交<br><small>Submitted!</small>"
+								self.leaderboardBtn.style.background = "linear-gradient(135deg, #4CAF50, #45a049)"
+							}
+						} else {
+							// Show error
+							self.showLeaderboardNotification("error")
+							if (self.leaderboardBtn) {
+								self.leaderboardBtn.innerHTML = "❌ 失败<br><small>Failed</small>"
+								self.leaderboardBtn.style.background = "linear-gradient(135deg, #f44336, #d32f2f)"
+							}
+						}
+					} catch (e) {
+						console.error("Failed to parse leaderboard response:", e)
+						self.showLeaderboardNotification("error")
+					}
+				} else {
+					self.showLeaderboardNotification("error")
+					if (self.leaderboardBtn) {
+						self.leaderboardBtn.innerHTML = "❌ 失败<br><small>Failed</small>"
+						self.leaderboardBtn.style.background = "linear-gradient(135deg, #f44336, #d32f2f)"
+					}
+				}
+			}
+
+			request.onerror = function () {
+				self.showLeaderboardNotification("error")
+				if (self.leaderboardBtn) {
+					self.leaderboardBtn.innerHTML = "❌ 失败<br><small>Failed</small>"
+					self.leaderboardBtn.style.background = "linear-gradient(135deg, #f44336, #d32f2f)"
+				}
+			}
+
 			request.send(JSON.stringify({
 				song_id: songId,
 				difficulty: difficulty,
 				score: scoreObj
 			}))
 		}).catch(() => {
-			// Silently fail - leaderboard submission is optional
 			console.log("Leaderboard submission failed")
+			this.showLeaderboardNotification("error")
+			if (this.leaderboardBtn) {
+				this.leaderboardBtn.innerHTML = "❌ 失败<br><small>Failed</small>"
+				this.leaderboardBtn.style.background = "linear-gradient(135deg, #f44336, #d32f2f)"
+			}
 		})
 	}
 
+
+	showLeaderboardNotification(message) {
+		var notification = document.createElement("div")
+		notification.className = "leaderboard-notification"
+		notification.style.cssText = `
+			position: fixed;
+			top: 20px;
+			right: 20px;
+			padding: 15px 25px;
+			background: linear-gradient(135deg, #4a90e2, #7b68ee);
+			color: white;
+			border-radius: 10px;
+			font-size: 16px;
+			font-family: ${strings.font || "sans-serif"};
+			z-index: 10000;
+			box-shadow: 0 4px 15px rgba(0,0,0,0.3);
+			opacity: 0;
+			transform: translateX(100px);
+			transition: all 0.3s ease-out;
+		`
+
+		var text = ""
+		switch (message) {
+			case "score_submitted": text = "🏆 成绩已提交到排行榜！"; break
+			case "score_updated": text = "🎉 排行榜成绩已更新！"; break
+			case "score_not_higher": text = "📊 已有更高成绩"; break
+			case "score_too_low": text = "未进入排行榜前50"; break
+			case "error": text = "❌ 提交失败，请重试"; break
+			case "no_song_id": text = "❌ 无法提交：歌曲ID缺失"; break
+			default: text = "排行榜已更新"
+		}
+		notification.innerText = text
+
+		document.body.appendChild(notification)
+
+		// Trigger animation
+		setTimeout(() => {
+			notification.style.opacity = "1"
+			notification.style.transform = "translateX(0)"
+		}, 10)
+
+		// Remove after 3 seconds
+		setTimeout(() => {
+			notification.style.opacity = "0"
+			notification.style.transform = "translateX(100px)"
+			setTimeout(() => {
+				if (notification.parentNode) {
+					notification.parentNode.removeChild(notification)
+				}
+			}, 300)
+		}, 3000)
+	}
+
+
 	clean() {
 		this.keyboard.clean()
 		this.gamepad.clean()
@@ -997,10 +1193,17 @@ class Scoresheet {
 		if (!this.multiplayer) {
 			delete this.tetsuoHana
 		}
+		// Clean up leaderboard button
+		if (this.leaderboardBtn && this.leaderboardBtn.parentNode) {
+			this.leaderboardBtn.parentNode.removeChild(this.leaderboardBtn)
+		}
+		delete this.leaderboardBtn
+		delete this.leaderboardData
 		delete this.ctx
 		delete this.canvas
 		delete this.fadeScreen
 		delete this.results
 		delete this.rules
 	}
+
 }

public/src/js/search.js

@@ -359,6 +359,7 @@ class Search{
 	}
 
 	highlightResult(text, result) {
+		if (text === null || text === undefined) return document.createDocumentFragment();
 		var fragment = document.createDocumentFragment()
 		var ranges = (result ? result.ranges : null) || []
 		var lastIdx = 0

public/src/js/songselect.js

@@ -3335,9 +3335,14 @@ class SongSelect {
 			});
 	}
 	toLeaderboard() {
-		if (!this.songs[this.selectedSong].id) {
+		var song = this.songs[this.selectedSong]
+		var songId = song.id || song.hash
+
+		// Allow leaderboard for any song with an ID (numeric or hash)
+		if (!songId) {
 			return
 		}
+
 		// Default to first available difficulty if not in a valid difficulty selection
 		var selectedDiff = this.selectedDiff - this.diffOptions.length
 		if (selectedDiff < 0) {
@@ -3347,6 +3352,7 @@ class SongSelect {
 
 		this.clean()
 		this.playSound("se_don")
-		new Leaderboard().display(this.songs[this.selectedSong].id, diffId)
+		new Leaderboard().display(songId, diffId)
 	}
+
 }

reproduce_issue.py

@@ -0,0 +1,133 @@
+
+import requests
+import json
+import base64
+
+BASE_URL = "http://localhost:34801"
+
+def register_user(username, password):
+    url = f"{BASE_URL}/api/register"
+    data = {"username": username, "password": password}
+    try:
+        response = requests.post(url, json=data)
+        if response.status_code == 200:
+            return response.json()
+        print(f"Register failed: {response.text}")
+    except Exception as e:
+        print(f"Register error: {e}")
+    return None
+
+def login_user(username, password):
+    url = f"{BASE_URL}/api/login"
+    data = {"username": username, "password": password}
+    session = requests.Session()
+    try:
+        response = session.post(url, json=data)
+        if response.status_code == 200:
+            return session
+        print(f"Login failed: {response.text}")
+    except Exception as e:
+        print(f"Login error: {e}")
+    return None
+
+def get_csrf_token(session):
+    url = f"{BASE_URL}/api/csrftoken"
+    response = session.get(url)
+    if response.status_code == 200:
+        return response.json()['token']
+    return None
+
+def submit_score(session, song_id, difficulty, score_obj, csrf_token):
+    url = f"{BASE_URL}/api/leaderboard/submit"
+    headers = {"X-CSRFToken": csrf_token}
+    data = {
+        "song_id": song_id,
+        "difficulty": difficulty,
+        "score": score_obj
+    }
+    response = session.post(url, json=data, headers=headers)
+    return response.json()
+
+def get_leaderboard(session, song_id, difficulty):
+    url = f"{BASE_URL}/api/leaderboard/get"
+    params = {"song_id": song_id, "difficulty": difficulty}
+    response = session.get(url, params=params)
+    return response.json()
+
+def main():
+    username = "debug_user_1"
+    password = "password123"
+    
+    print("1. Registering/Logging in...")
+    # Try login first
+    session = login_user(username, password)
+    if not session:
+        # Register
+        reg = register_user(username, password)
+        if reg:
+            session = login_user(username, password)
+        else:
+            print("Could not register or login")
+            return
+
+    print("2. Getting CSRF token...")
+    csrf_token = get_csrf_token(session)
+    if not csrf_token:
+        print("Could not get CSRF token")
+        return
+
+    song_id = 1 # Assuming song 1 exists
+    difficulty = "oni"
+    
+    # Simulate scoresheet.js submission (points only)
+    score_obj = {
+        "points": 123456,
+        "good": 100,
+        "ok": 10,
+        "bad": 0,
+        "maxCombo": 110,
+        "drumroll": 5,
+        "crown": "gold"
+    }
+    
+    print(f"3. Submitting score: {score_obj['points']}")
+    submit_res = submit_score(session, song_id, difficulty, score_obj, csrf_token)
+    print(f"Submit response: {submit_res}")
+    
+    print("4. Fetching leaderboard...")
+    leaderboard_res = get_leaderboard(session, song_id, difficulty)
+    
+    if leaderboard_res['status'] == 'ok':
+        leaderboard = leaderboard_res['leaderboard']
+        found = False
+        for entry in leaderboard:
+            if entry['username'] == username:
+                found = True
+                print(f"Found entry: {entry}")
+                print(f"entry.score_value: {entry.get('score_value')}")
+                print(f"entry.score: {entry.get('score')}")
+                
+                score_value = entry.get('score_value')
+                score_data = entry.get('score')
+                
+                # Check what leaderboard.js would see
+                if score_data and 'score' in score_data:
+                    print(f"JS would assume score: {score_data['score']}")
+                else:
+                    print("JS would assume score: 0 (undefined)")
+                
+                if score_value == 123456:
+                    print("SUCCESS: score_value is correct.")
+                else:
+                    print(f"FAILURE: score_value is incorrect (expected 123456, got {score_value})")
+                
+                if score_data and score_data.get('points') == 123456:
+                     print("SUCCESS: points preserved in score object.")
+                
+        if not found:
+            print("Entry not found in leaderboard (maybe not top 50?)")
+    else:
+        print(f"Failed to get leaderboard: {leaderboard_res}")
+
+if __name__ == "__main__":
+    main()

schema.py

@@ -85,9 +85,10 @@ leaderboard_submit = {
     '$schema': 'http://json-schema.org/schema#',
     'type': 'object',
     'properties': {
-        'song_id': {'type': 'number'},
+        'song_id': {'type': ['number', 'string']},
         'difficulty': {'type': 'string'},
         'score': {'type': 'object'}
     },
     'required': ['song_id', 'difficulty', 'score']
 }
+

setup.sh

@@ -8,7 +8,7 @@ CODENAME=${VERSION_CODENAME:-}
 VERSION=${VERSION_ID:-}
 
 echo "更新系统软件源..."
-apt-get update -y
+apt-get update -y || true
 echo "安装基础依赖..."
 apt-get install -y python3 python3-venv python3-pip git ffmpeg rsync curl gnupg libcap2-bin
 

test_frontend_logic.js

@@ -0,0 +1,32 @@
+
+// Simulation of song objects
+const songs = [
+    { name: "Server Song", id: 123, hash: "hash123" },
+    { name: "Custom Song (No ID)", id: undefined, hash: "hashCustom" },
+    { name: "Custom Song (Null ID)", id: null, hash: "hashNull" },
+    { name: "Edge Case (ID 0)", id: 0, hash: "hashZero" } // Checking if behavior is acceptable
+];
+
+console.log("=== Frontend Logic Test: Song ID Fallback ===");
+
+songs.forEach(song => {
+    // Logic from scoresheet.js / songselect.js
+    const songId = song.id || song.hash;
+
+    console.log(`Song: ${song.name}`);
+    console.log(`  Raw ID: ${song.id}, Hash: ${song.hash}`);
+    console.log(`  Resolved songId: ${songId}`);
+
+    if (song.id && songId === song.id) {
+        console.log("  ✅ Correctly used ID");
+    } else if (!song.id && songId === song.hash) {
+        console.log("  ✅ Correctly fell back to Hash");
+    } else if (song.id === 0 && songId === song.hash) {
+        console.log("  ⚠️ ID was 0, used Hash. (Acceptable if ID > 0 always)");
+    } else {
+        console.log("  ❌ FAILED logic mismatch");
+    }
+    console.log("---");
+});
+
+console.log("Tests Completed.");