Feature/use redis as db

UserDb.js

@@ -12,7 +12,6 @@ class UserDb extends Map {
     this.file = file
     this.lastHash = 0
     this.writeCounter = 0
-    this.forcedSave = 0
   }
   load() {
     let data = []
@@ -75,10 +74,6 @@ class UserDb extends Map {
     }, 500)
   }
   forceSave() {
-    if (this.forcedSave > 0) {
-      return
-    }
-    this.forcedSave = 1
     const data = []
     this.forEach((v, k) => {
       data.push(v.serialize())

encode-url.js

@@ -25,18 +25,20 @@ if (!secretKey) {
   console.log("[ERROR] no secret key")
   return
 }
-function getYmdDate() {
-  const now = new Date()
+function getYmdDate(now) {
+  // const now = new Date()
   let month = ("0" + (now.getMonth() + 1)).slice(-2)
   let day = ("0" + now.getDate()).slice(-2)
   return `${now.getFullYear()}${month}${day}`
 }
-const now = getYmdDate()
+const today = getYmdDate(new Date())
+const yesterday = getYmdDate(new Date(Date.now() - 86400000))
+const date = today
 hosts.forEach((host) => {
   experimentIds.forEach((experimentId) => {
-    console.log(`URLS for experiment: ${experimentId}`)
+    console.log(`URLS for experiment: ${experimentId} with date: ${date}.`)
     users.forEach((u) => {
-      const dataToSign = `${u}:${now}:${experimentId}`
+      const dataToSign = `${u}:${date}:${experimentId}`
       const signatureWordArray = CryptoJS.HmacSHA256(dataToSign, secretKey)
       const signatureHex = CryptoJS.enc.Hex.stringify(signatureWordArray)
       console.log(

server.js

@@ -55,8 +55,12 @@ if (options.resetDb && fs.existsSync(userDbFile)) {
  * @type {Map<`${userId}:${experimentId}`, User>}
  */
 const usersDb = new UserDb(userDbFile)
-
+let shuttingDown = 0
 process.on("SIGINT", async () => {
+  if (shuttingDown > 0) {
+    return
+  }
+  shuttingDown = 1
   console.log("\nGracefully shutting down from SIGINT (Ctrl-C)")
   await usersDb.forceSave()
   setTimeout(() => {
@@ -162,30 +166,47 @@ const validateSignature = (req, res, next) => {
 
 // Middleware to validate signature
 const validateHmac = (req, res, next) => {
-  function getYmdDate() {
-    const now = new Date()
+  function getYmdDate(now) {
+    // const now = new Date()
     let month = ("0" + (now.getMonth() + 1)).slice(-2)
     let day = ("0" + now.getDate()).slice(-2)
     return `${now.getFullYear()}${month}${day}`
   }
-  const today = getYmdDate()
+
+  function getHexSignature(dataToSign, secretKey) {
+    const signatureWordArray = CryptoJS.HmacSHA256(dataToSign, secretKey)
+    return CryptoJS.enc.Hex.stringify(signatureWordArray)
+  }
+
+  const today = getYmdDate(new Date())
+  const yesterday = getYmdDate(new Date(Date.now() - 86400000))
+
+  // console.log(`today: ${today}, yesterday: ${yesterday}.`)
 
   const respondent = req.query.respondent
   const check = req.query.check
   const experimentId = req.params.experimentId || ""
 
-  const dataToSign = `${respondent}:${today}:${experimentId}`
-  const signatureWordArray = CryptoJS.HmacSHA256(dataToSign, secretKey)
-  const signatureHex = CryptoJS.enc.Hex.stringify(signatureWordArray)
+  // let dataToSign = `${respondent}:${today}:${experimentId}`
+  // const signatureWordArray = CryptoJS.HmacSHA256(dataToSign, secretKey)
+  // const signatureHex = CryptoJS.enc.Hex.stringify(signatureWordArray)
+  todaySignature = getHexSignature(
+    `${respondent}:${today}:${experimentId}`,
+    secretKey,
+  )
+  yesterdaySignature = getHexSignature(
+    `${respondent}:${yesterday}:${experimentId}`,
+    secretKey,
+  )
 
-  if (signatureHex === check) {
+  if (todaySignature === check || yesterdaySignature === check) {
     req.user = {
       userId: respondent,
       oTreeVars: {},
     }
     next()
   } else {
-    res.status(401).json({ message: "Unauthorized: Invalid signature" })
+    res.status(401).json({ message: "Unauthorized: invalid signature" })
   }
 }