Backend: Point to new CORPUS URL

Signed-off-by: Fred Boniface <fred@fjla.uk>

UpNext.md

@@ -24,10 +24,10 @@
 * DB Indexes:
     - "stations": 3ALPHA, STANOX, TIPLOC
     - "corpus": 3ALPHA, NLC
+* DB Indexes:.
+    - "corpus": NLCDESC(TEXT)
 
 ## Backend:
 
-* DB Indexes:.
-    - "corpus": NLCDESC(TEXT)
 * Rewrite sanitizing functions to remove external dependancy.
 * Undo changed to make everything an array - frontend code to handle this.

app.js

@@ -20,6 +20,7 @@ const ldbRtr   = require('./src/routes/ldb.routes');        // /ldb endpoints
 const kubeRtr  = require('./src/routes/kube.routes');       // /kube endpoints
 const findRtr  = require('./src/routes/find.routes');       // /find endpoints
 const issueRtr = require('./src/routes/issue.routes')       // /issue endpoints
+const statRtr  = require('./src/routes/stats.routes');      // /stat endpoints
 const initDb   = require('./src/utils/dbinit.utils');       // DB Init Utility
 
 // Set Server Configurations
@@ -59,6 +60,7 @@ app.use('/api/v1/ldb', ldbRtr);
 app.use('/api/v1/kube', kubeRtr);
 app.use('/api/v1/find', findRtr);
 app.use('/api/v1/issue', issueRtr);
+app.use('/api/v1/stats', statRtr)
 
 // Start Express
 app.listen(srvPort, srvListen, (error) =>{

src/controllers/stats.controllers.js

@@ -0,0 +1,13 @@
+const stat = require('../services/stats.services');
+
+async function get(req, res, next) {
+    try {
+        res.json(await stat.hits())
+    } catch (err) {
+        console.error(`Controller Error`, err);
+        next(err);
+    }
+}
+
+module.exports = {
+    get}

src/routes/list.routes.js

@@ -16,6 +16,5 @@ const listController = require('../controllers/list.controllers');
 
 router.get('/stations', listController.getStations);
 router.get('/corpus', listController.getCorpus);
-router.get('/hits', listController.hits)
 
 module.exports = router;

src/routes/stats.routes.js

@@ -0,0 +1,8 @@
+const express = require('express');
+const router = express.Router();
+const statsController = require('../controllers/stats.controllers');
+
+
+router.get('/', statsController.get);
+
+module.exports = router;

src/services/corpus.services.js

@@ -29,7 +29,7 @@ async function get() {
 async function fetch() {
     log.out("corpus.fetch: Fetching CORPUS Data from Network Rail")
     authHead = Buffer.from(`${corpusUser}:${corpusPass}`).toString('base64')
-    const url = 'https://datafeeds.networkrail.co.uk/ntrod/SupportingFileAuthenticate?type=CORPUS'
+    const url = 'https://publicdatafeeds.networkrail.co.uk/ntrod/SupportingFileAuthenticate?type=CORPUS'
     const options = {
         method: 'get',
         timeout: 20000,

src/services/list.services.js

@@ -14,17 +14,7 @@ async function getCorpus(){
     return out;
 }
 
-async function hits(){
-    var dat = await db.query("meta", {target: "counters"});
-    log.out(`listServices.meta: fetched server meta`)
-    let out = {}
-    out.host = os.hostname()
-    out.dat = dat
-    return out;
-}
-
 module.exports = {
     getStations,
-    getCorpus,
+    getCorpus
-    hits
 }

src/services/stats.services.js

@@ -0,0 +1,16 @@
+const log    = require('../utils/log.utils');          // Log Helper
+const db     = require('../services/dbAccess.services')
+const os     = require('os')
+
+async function hits(){
+    var dat = await db.query("meta", {target: "counters"});
+    log.out(`listServices.meta: fetched server meta`)
+    let out = {}
+    out.host = os.hostname()
+    out.dat = dat
+    return out;
+}
+
+module.exports = {
+    hits
+}

static/conf/nginx.conf

@@ -39,7 +39,7 @@ http {
             proxy_pass http://localhost:8460;
             proxy_cache_key $scheme://$host$uri$is_args$query_string;
             proxy_ignore_headers Cache-Control;
-            proxy_cache_valid 200 20m;  # Change to 1m for release.
+            proxy_cache_valid 200 2m;  # Evaluate whether 2m or 1m is more appropriate
             gzip on;
             brotli on;
         }

static/index.html

@@ -62,7 +62,7 @@
 
     <!-- Footer -->
     <footer>
-      <p>Created by <a href="https://fredboniface.co.uk" target="_blank" rel="noreferrer noopener">Fred Boniface</a> - 0.0.1-dev-2023013109</p>
+      <p>Created by <a href="https://fredboniface.co.uk" target="_blank" rel="noreferrer noopener">Fred Boniface</a> - 0.0.1-dev-2023020201</p>
     </footer>
 
   </body>

static/js/stat.js

@@ -5,7 +5,7 @@ async function init() {
 }
 
 async function get() {
-    var url = `${window.location.origin}/api/v1/list/hits`;
+    var url = `${window.location.origin}/api/v1/stats`;
     var resp = await fetch(url);
     return await resp.json();
 }

static/sw.js

@@ -1,6 +1,6 @@
 /* Service Worker */
 
-const appVersion = "0.0.1-dev-2023013109"
+const appVersion = "0.0.1-dev-2023020201"
 const cacheName = `owlboard-${appVersion}`
 const cacheIDs = [cacheName]
 const cacheFiles = [