backend/routes.coffee

@@ -1,24 +1,114 @@
-# local libraries
+# node libraries
 #(require 'debug').enable 'routes'
+logger = (require 'logging').default 'routes'
 path = (require 'path')
 
-# shared libraries
+# my libraries
-SHARE =
+FFTCGDB = (require './db')
-  logger: (require 'logging').default 'routes'
+FFTCGSESSION = (require './session')
-  jsonschemas:
-    user: (require './routes/schema/user.schema')()
 
-  # fftcg.db (persistent data)
+# open fftcg.db (persistent data)
-  fftcgdb: new (require './db') path.resolve(__dirname, 'fftcg.db'), true
+fftcgdb = new FFTCGDB path.resolve(__dirname, 'fftcg.db'), true
-  # session storage (volatile data)
+# open session storage (volatile data)
-  session: new (require './session')
+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']
 
 
 module.exports = [
 # test
-  (require './routes/test') 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'
+,
 # register user
-  (require './routes/user/register') SHARE
+  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
-  (require './routes/user/login') SHARE
+  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
+,
 ]

backend/routes/schema/user.schema.coffee

@@ -1,28 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

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

backend/session.coffee

@@ -5,14 +5,13 @@ logger = (require 'logging').default 'session'
 
 # expiry times in seconds
 EXPIRY =
-  # games expire 1 week after creation
+  # games expire 1 week after last action
   game:    1 * 60 * 60 * 24 * 7
   # logins expire 1 month after last action
   login:   1 * 60 * 60 * 24 * 7 * 4
 
 
-class FFTCGSESSION
+FFTCGSESSION = () ->
-  constructor: ->
   @db = redis.createClient
     host: 'redis'
     port: 6379
@@ -20,8 +19,12 @@ class FFTCGSESSION
   @db.on 'error', (err) ->
     logger.error err.message
 
-  start: (data) ->
+  return
-    new Promise (resolve) =>
+
+FFTCGSESSION::start = (data) ->
+  that = @
+
+  new Promise (resolve) ->
     # hash data
     hmac = crypto.createHmac 'sha256', Math.random().toString()
     hmac.update (JSON.stringify data)
@@ -29,18 +32,20 @@ class FFTCGSESSION
     logger.debug 'digest', digest
 
     # push (hash, data) into DB for the configured timespan
-      @db.setex digest, EXPIRY.login, (JSON.stringify data), (err) ->
+    that.db.setex digest, EXPIRY.login, (JSON.stringify data), (err) ->
       resolve digest
 
-  check: (digest) ->
+FFTCGSESSION::check = (digest) ->
-    new Promise (resolve, reject) =>
+  that = @
+
+  new Promise (resolve, reject) ->
     # refresh expiry timer on digest
-      @db.expire digest, EXPIRY.login, (err, res) =>
+    that.db.expire digest, EXPIRY.login, (err, res) ->
       if res == 0
         reject null
 
       else
-          @db.get digest, (err, res) ->
+        that.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.1.0:
+chokidar@^2.0.4:
-  version "2.1.1"
+  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
-  integrity sha512-gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ==
+  integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
   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.10"
+  version "1.18.9"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead"
-  integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ==
+  integrity sha512-oj/eEVTEI47pzYAjGkpcNw0xYwTl4XSTUQv2NPQI6PpN3b75PhpuYk3Vb3U80xHCyM2Jm+1j68ULHXl4OR3Afw==
   dependencies:
-    chokidar "^2.1.0"
+    chokidar "^2.0.4"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"