ranked logging

server/api/challs/submit.js

@@ -50,7 +50,8 @@
     req.log.info({
       chall: challengeid,
       flag: submittedFlag,
-      type: challenge.type
+      type: challenge.type,
+      challenge: challenge
     }, 'flag submission attempt')
 
     if (!challenge) {
@@ -77,7 +78,7 @@
     const bufCorrectFlag = Buffer.from(challenge.flag)
 
     const challengeType = challenge.type
     let submittedHash, submittedScore = null
 
     if (challengeType === 'ranked') {
       const parts = submittedFlag.split('.')
@@ -86,7 +87,7 @@
       }
       [submittedHash, submittedScore] = parts
       // The user will receive SHA256(FLAG || answerLength) || '.' || answerLength
 
       const correctHash = crypto.createHash('sha256').update(bufCorrectFlag).update(submittedScore).digest('hex')
       if (submittedHash != correctHash) {
         return responses.badFlagRanked

server/cache/leaderboard.js

@@ -131,6 +131,7 @@ export const setLeaderboard = async ({ challengeValues, solveAmount, leaderboard
   challengeValues.forEach((value, key) => {
     challengeInfo.push(key, `${value},${solveAmount.get(key)}`)
   })
+  console.dir({ challengeValues, solveAmount, leaderboard, leaderboardUpdate }, { depth: null })
   await redisEvalsha(
     await setLeaderboardScript,
     keys.length,

server/challenges/index.ts

@@ -1,7 +1,7 @@
 import config from '../config/server'
 import path from 'path'
 import { Challenge, CleanedChallenge } from './types'
 import { Provider, ProviderConstructor } from './Provider'
 import { challUpdateEmitter, publishChallUpdate } from '../cache/challs'
 import { EventEmitter } from 'events'
 
@@ -35,6 +35,7 @@
 }
 
 const onUpdate = (newChallenges: Challenge[]): void => {
+  console.dir({ newChallenges }, { depth: null })
   challenges = newChallenges
   challengesMap = new Map(newChallenges.map(c => [c.id, c]))
   cleanedChallenges = challenges.map(cleanChallenge)

server/leaderboard/calculate.js

@@ -12,6 +12,7 @@ const {
   }
 } = workerData
 
+console.dir({ allChallenges }, { depth: null })
 const solveAmount = new Map()
 const challengeTiebreakEligibles = new Map()
 for (let i = 0; i < allChallenges.length; i++) {
@@ -81,6 +82,7 @@ const calculateScores = (sample) => {
     ))
   }
 
+  const rankedSolvesForLogging = []
   for (let i = 0; i < users.length; i++) {
     const user = users[i]
     let currScore = 0
@@ -100,7 +102,17 @@ const calculateScores = (sample) => {
           rankedMetadata.minScore,
           rankedMetadata.maxScore,
           solveScore
-    )
+        )
+        rankedSolvesForLogging.push({
+          userId: user.id,
+          challengeId: solvedChallId,
+          score: solveScore,
+          value,
+          min: rankedMetadata.min,
+          max: rankedMetadata.max,
+          minScore: rankedMetadata.minScore,
+          maxScore: rankedMetadata.maxScore
+        })
       } else {
         // Add the score for the specific solve loaded from the challengeValues array using ids
 
@@ -121,6 +133,9 @@ const calculateScores = (sample) => {
     ])
   }
 
+  console.dir({ rankedSolvesForLogging }, { depth: null })
+  console.dir({ challengeRankedMetadata }, { depth: null })
+
   return {
     challengeValues,
     userScores
@@ -159,6 +174,8 @@ samples.forEach((sample) => {
 const { userScores, challengeValues } = calculateScores(leaderboardUpdate)
 const sortedUsers = userScores.sort(userCompare).map((user) => user.slice(0, 4))
 
+console.log({ sortedUsers })
+
 parentPort.postMessage({
   leaderboard: sortedUsers,
   graphLeaderboards,

server/leaderboard/index.js

@@ -11,12 +11,14 @@ const fetchData = async () => {
     database.users.getAllUsers(),
     cache.leaderboard.getGraphUpdate()
   ])
-  return {
+  const workerData = {
     solves,
     users,
     graphUpdate,
     allChallenges: getAllChallenges()
   }
+  console.dir({ workerData }, { depth: null })
+  return workerData
 }
 
 let updating = false
@@ -32,6 +34,7 @@ const runUpdate = async () => {
     }
   })
   worker.once('message', async (data) => {
+    console.dir({ leaderboardData: data }, { depth: null })
     await cache.leaderboard.setLeaderboard(data)
     await cache.leaderboard.setGraph({ leaderboards: data.graphLeaderboards })
     updating = false

server/providers/challenges/database/index.ts

@@ -26,6 +26,8 @@ class DatabaseProvider extends EventEmitter implements Provider {
         }
       })
 
+      console.dir({ databaseUpdateChallenges: this.challenges }, { depth: null })
+
       this.emit('update', this.challenges)
     } catch (e) {
       // TODO: wrap error?