classify session

backend/routes.coffee

@@ -1,114 +1,24 @@
-# node libraries
-#(require 'debug').enable 'routes'
-logger = (require 'logging').default 'routes'
+# local libraries
+# (require 'debug').enable 'routes'
 path = (require 'path')
 
-# my libraries
-FFTCGDB = (require './db')
-FFTCGSESSION = (require './session')
+# shared libraries
+SHARE =
+  logger: (require 'logging').default 'routes'
+  jsonschemas:
+    user: (require './routes/schema/user.schema')()
 
-# open fftcg.db (persistent data)
-fftcgdb = new FFTCGDB path.resolve(__dirname, 'fftcg.db'), true
-# open session storage (volatile data)
-session = new FFTCGSESSION
-
-JSONSCHEMA =
-  user: ->
-    body:
-      login:    type: 'string'
-      password: type: 'string'
-
-    response:
-      200:
-        type: 'object'
-        required: ['success']
-        properties:
-          success:  type: 'boolean'
-          err:      type: 'string'
-          user:
-            type: 'object'
-            required: ['user', 'login']
-            properties:
-              user:   type: 'number'
-              login:  type: 'string'
-        # user is required iff success
-        # err is required otherwise
-        if:
-          properties:
-            success:
-              const: true
-        then:
-          required: ['user']
-        else:
-          required: ['err']
+  # fftcg.db (persistent data)
+  fftcgdb: new (require './db') path.resolve(__dirname, 'fftcg.db'), true
+  # session storage (volatile data)
+  session: new (require './session')
 
 
 module.exports = [
-# test
-  url: '/test'
-  method: 'POST'
-  handler: (request, reply) ->
-    logger.info 'Cookies', request.cookies
-    logger.info 'Body', request.body
-    logger.info 'Query', request.query
-    logger.info 'Params', request.params
-
-    reply.setCookie 'foo', 'foo'
-    reply.send
-      hello: 'world'
-,
-# register user
-  url: '/user/register'
-  method: 'POST'
-  schema: JSONSCHEMA.user()
-
-  handler: (request, reply) ->
-    fftcgdb.register request.body.login, request.body.password
-      .then (user) ->
-        logger.info "OK registration '#{request.body.login}'"
-        reply.send
-          success: true
-          user: user
-
-      .catch (err) ->
-        logger.debug "FAIL registration '#{request.body.login}'"
-        reply.send
-          success: false
-          err: err
-,
-# log in user
-  url: '/user/login'
-  method: 'POST'
-  schema: JSONSCHEMA.user()
-
-  handler: (request, reply) ->
-    session_id = request.cookies.session ? ''
-
-    new Promise (resolve) ->
-      session.check session_id
-        .then (user) ->
-          logger.debug "OK '#{user.login}' resumed session '#{session_id}'"
-          resolve user
-
-        .catch ->
-          fftcgdb.login request.body.login, request.body.password
-            .then (user) ->
-              # login successful: start new session
-              session.start user
-                .then (session_id) ->
-                  logger.info "OK '#{user.login}' created session '#{session_id}'"
-                  reply.setCookie 'session', session_id
-                  resolve user
-
-            .catch (err) ->
-              logger.info "FAIL login for '#{request.body.login}'"
-              reply.send
-                success: false
-                msg: err
-
-    .then (user) ->
-      reply.send
-        success: true
-        user: user
-,
+  # test
+  (require './routes/test') SHARE
+  # register user
+  (require './routes/user/register') SHARE
+  # log in user
+  (require './routes/user/login') SHARE
 ]

backend/routes/schema/user.schema.coffee

@@ -0,0 +1,28 @@
+module.exports = ->
+  body:
+    login:    type: 'string'
+    password: type: 'string'
+
+  response:
+    200:
+      type: 'object'
+      required: ['success']
+      properties:
+        success:  type: 'boolean'
+        err:      type: 'string'
+        user:
+          type: 'object'
+          required: ['user', 'login']
+          properties:
+            user:   type: 'number'
+            login:  type: 'string'
+      # user is required iff success
+      # err is required otherwise
+      if:
+        properties:
+          success:
+            const: true
+      then:
+        required: ['user']
+      else:
+        required: ['err']

backend/routes/test.coffee

@@ -0,0 +1,12 @@
+module.exports = (SHARE) ->
+  url: '/test'
+  method: 'POST'
+  handler: (request, reply) ->
+    logger.info 'Cookies', request.cookies
+    logger.info 'Body', request.body
+    logger.info 'Query', request.query
+    logger.info 'Params', request.params
+
+    reply.setCookie 'foo', 'foo'
+    reply.send
+      hello: 'world'

backend/routes/user/login.coffee

@@ -0,0 +1,37 @@
+module.exports = (SHARE) ->
+  url: '/user/login'
+  method: 'POST'
+  schema: SHARE.jsonschemas.user
+
+  handler: (request, reply) ->
+    session_id = request.cookies.session ? ''
+
+    new Promise (resolve) ->
+      SHARE.session.check session_id
+      .then (user) ->
+        # active session found
+        SHARE.logger.debug "OK '#{user.login}' resumed session '#{session_id}'"
+        resolve user
+
+      .catch ->
+        SHARE.fftcgdb.login request.body.login, request.body.password
+        .then (user) ->
+          # login successful: start new session
+          SHARE.session.start user
+          .then (session_id) ->
+            logger.info "OK '#{user.login}' created session '#{session_id}'"
+            reply.setCookie 'session', session_id
+            resolve user
+
+        .catch (err) ->
+          # login failed
+          SHARE.logger.info "FAIL login for '#{request.body.login}'"
+          reply.send
+            success: false
+            err: err
+
+    .then (user) ->
+      # tell about the user who logged in
+      reply.send
+        success: true
+        user: user

backend/routes/user/register.coffee

@@ -0,0 +1,19 @@
+module.exports = (SHARE) ->
+  url: '/user/register'
+  method: 'POST'
+  schema: SHARE.jsonschemas.user
+
+  handler: (request, reply) ->
+    SHARE.fftcgdb.register(request.body.login, request.body.password)
+    .then (user) ->
+      SHARE.logger.info "OK registration '#{request.body.login}'"
+      reply.send
+        success: true
+        user: user
+      return
+
+    .catch (err) ->
+      SHARE.logger.debug "FAIL registration '#{request.body.login}'"
+      reply.send
+        success: false
+        err: err

backend/server.coffee

@@ -1,6 +1,8 @@
 # node libraries
+# (require 'debug').enable 'FFTCG'
 logger = (require 'logging').default 'FFTCG'
-fastify = (require 'fastify') logger: logger
+fastify = (require 'fastify')
+  logger: level: 'warn'
 path = (require 'path')
 
 # my libraries
@@ -21,9 +23,11 @@ fastify.ready()
     logger.error err
     process.exit 1
 
+fastify.addHook 'onRequest', (req, res, next) ->
+  logger.debug 'requested', req.url
+  next()
 
-for route in routes
-  fastify.route route
+fastify.route route for route in routes
 
 fastify.listen 3001, '0.0.0.0'
   .catch (err) ->

backend/session.coffee

@@ -5,47 +5,42 @@ logger = (require 'logging').default 'session'
 
 # expiry times in seconds
 EXPIRY =
-  # games expire 1 week after last action
+  # games expire 1 week after creation
   game:    1 * 60 * 60 * 24 * 7
   # logins expire 1 month after last action
   login:   1 * 60 * 60 * 24 * 7 * 4
 
 
-FFTCGSESSION = () ->
-  @db = redis.createClient
-    host: 'redis'
-    port: 6379
+class FFTCGSESSION
+  constructor: ->
+    @db = redis.createClient
+      host: 'redis'
+      port: 6379
 
-  @db.on 'error', (err) ->
-    logger.error err.message
+    @db.on 'error', (err) ->
+      logger.error err.message
 
-  return
+  start: (data) ->
+    new Promise (resolve) =>
+      # hash data
+      hmac = crypto.createHmac 'sha256', Math.random().toString()
+      hmac.update (JSON.stringify data)
+      digest = hmac.digest 'base64'
+      logger.debug 'digest', digest
 
-FFTCGSESSION::start = (data) ->
-  that = @
+      # push (hash, data) into DB for the configured timespan
+      @db.setex digest, EXPIRY.login, (JSON.stringify data), (err) ->
+        resolve digest
 
-  new Promise (resolve) ->
-    # hash data
-    hmac = crypto.createHmac 'sha256', Math.random().toString()
-    hmac.update (JSON.stringify data)
-    digest = hmac.digest 'base64'
-    logger.debug 'digest', digest
+  check: (digest) ->
+    new Promise (resolve, reject) =>
+      # refresh expiry timer on digest
+      @db.expire digest, EXPIRY.login, (err, res) =>
+        if res == 0
+          reject null
 
-    # push (hash, data) into DB for the configured timespan
-    that.db.setex digest, EXPIRY.login, (JSON.stringify data), (err) ->
-      resolve digest
-
-FFTCGSESSION::check = (digest) ->
-  that = @
-
-  new Promise (resolve, reject) ->
-    # refresh expiry timer on digest
-    that.db.expire digest, EXPIRY.login, (err, res) ->
-      if res == 0
-        reject null
-
-      else
-        that.db.get digest, (err, res) ->
-          resolve JSON.parse res
+        else
+          @db.get digest, (err, res) ->
+            resolve JSON.parse res
 
 module.exports = FFTCGSESSION

backend/yarn.lock

@@ -345,10 +345,10 @@ chalk@^2.0.1, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chokidar@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
-  integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
+chokidar@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184"
+  integrity sha512-gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -1629,11 +1629,11 @@ node-pre-gyp@^0.11.0:
     tar "^4"
 
 nodemon@^1.18.9:
-  version "1.18.9"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead"
-  integrity sha512-oj/eEVTEI47pzYAjGkpcNw0xYwTl4XSTUQv2NPQI6PpN3b75PhpuYk3Vb3U80xHCyM2Jm+1j68ULHXl4OR3Afw==
+  version "1.18.10"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe"
+  integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ==
   dependencies:
-    chokidar "^2.0.4"
+    chokidar "^2.1.0"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"