safely try read .git-revision in api.js; fixed logs in routes to include /api/

Author: marcorobol

backend/src/routes/agents.js

@@ -7,7 +7,7 @@ const { myGrid } = require('../grid');
 // GET /agents get the list of all the agents on the grid
 router.get('/', async (req, res) => {
 
-    console.log( `GET /agents` );
+    console.log( `GET /api/agents` );
 
     const agents = Array.from( await myGrid.agents.values() ).map( agent => {
         return {
@@ -24,7 +24,7 @@ router.get('/', async (req, res) => {
 // DELETE /agents/:id delete an agent from the grid
 router.delete('/:id', async (req, res) => {
 
-    console.log( `DELETE /agents/${req.params.id}` );
+    console.log( `DELETE /api/agents/${req.params.id}` );
 
     const id = req.params.id;
     const agent = myGrid.agents.get( id );

backend/src/routes/api.js

@@ -1,27 +1,55 @@
 const express = require('express');
 const router = express.Router();
-const config = require('../../config');
-const { myGrid } = require('../grid');
-const { execSync } = require('child_process');
 const fs = require('fs');
 
+const packageVersion = new Promise( res =>
+    fs.readFile('./package.json', { encoding: 'utf8'}, (err, data) => {
+        
+        let packageVersion = 'no package.json';
+        
+        try {
+            if ( err )
+                throw err;
+            else if ( data )
+                packageVersion = JSON.parse(data).version;
+        } catch (error) {
+            console.error('Error while reading package.json', error);
+        }
+        
+        console.log( 'api.js packageVersion =', 'no package.json' );
+        res( packageVersion )
+    } )
+);
+
+const commitHash = new Promise( res =>
+    fs.readFile('./.git-revision', { encoding: 'utf8'}, (err, data) => {
+
+        let commitHash = 'no git';
+
+        try {
+            if ( err )
+                throw err;
+            else if ( data )
+                commitHash = data.toString().trim();
+        } catch (error) {
+            console.error('Error while reading commit hash from .git-revision', error);
+        }
+        
+        console.log( 'api.js commitHash =', commitHash );
+        res( commitHash );
+
+    } )
+);
+
 // GET /configs 
 router.get('/', async (req, res) => {
 
-    console.log(`GET /version`)
+    console.log(`GET /api`);
 
-    const packageVersion = await new Promise( res =>
-        fs.readFile('./package.json', { encoding: 'utf8'}, (err, data) => res( JSON.parse(data).version ) )
-    );
-    
-    const commitHash = await new Promise( res =>
-        fs.readFile('./.git-revision', { encoding: 'utf8'}, (err, data) => res( data.toString().trim() ) )
-    );
-    
     res.status(200).json( {
         message: 'Welcome to the API',
-        commitHash,
-        packageVersion
+        commitHash: await commitHash,
+        packageVersion: await packageVersion
     } );
 
 })

backend/src/routes/configs.js

@@ -6,7 +6,7 @@ const { myGrid } = require('../grid');
 // GET /configs 
 router.get('/', async (req, res) => {
 
-    console.log(`GET /configs`)
+    console.log(`GET /api/configs`)
     res.status(200).json( config );
 
 })

backend/src/routes/levels.js

@@ -6,7 +6,7 @@ const router = express.Router();
 // GET /all levels
 router.get('/', async (req, res) => {
 
-    console.log(`GET /levels`);
+    console.log(`GET /api/levels`);
 
     // load all .js files from levels directory
     fs.readdir( './levels', (err, files) => {
@@ -39,7 +39,7 @@ router.get('/', async (req, res) => {
 router.get('/:levelName', async (req, res) => {
     const levelName = req.params.levelName;
 
-    console.log(`GET /levels/${levelName}`);
+    console.log(`GET /api/levels/${levelName}`);
 
     const level = { self: '/api/levels/' + levelName };
     try {

backend/src/routes/npcs.js

@@ -7,7 +7,7 @@ const { myNPCSpawner } = require('../grid');
 // GET /npcs get the list of all npcs on the grid
 router.get('/', async (req, res) => {
 
-    console.log( `GET /npcs` );
+    console.log( `GET /api/npcs` );
 
     const agents = Array.from( await myNPCSpawner.NPCs.values() ).map( npc => {
         return {
@@ -50,7 +50,7 @@ router.get('/:id', async (req, res) => {
 // PATCH /npcs/:id start or stop the npc with id
 router.patch('/:id', async (req, res) => {
 
-    console.log( `PATCH /npcs/${req.params.id}`, req.body );
+    console.log( `PATCH /api/npcs/${req.params.id}`, req.body );
 
     const npc = myNPCSpawner.NPCs.get( req.params.id );
     if ( npc ) {
@@ -79,7 +79,7 @@ router.patch('/:id', async (req, res) => {
 // POST /npcs create a new npc
 router.post('/', async (req, res) => {
 
-    console.log( `POST /npcs`, req.body );
+    console.log( `POST /api/npcs`, req.body );
 
     const npc = myNPCSpawner.createNPC();
     res.status(200).json( {