Merge pull request #36 from NebulaServices/commitinfo

Add commit info to the INFO endpoint

Author: GreenyDEV

.gitignore

@@ -1,4 +1,5 @@
 node_modules 
 dist
 .DS_Store
-**/.DS_Store
+**/.DS_Store
+package-lock.json

index.js

@@ -8,24 +8,30 @@ import open from 'open';
 import { existsSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const gitCommitInfo = require('git-commit-info');
+
 
 if (!existsSync("./dist")) await import("./esbuild.prod.js");
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const port = process.env.PORT || 3000;
 const _v = process.env.npm_package_version;
+const info = { 
+  hashShort: `${JSON.stringify(gitCommitInfo().shortHash).replace('"', "").replace("/", "").replace('\"', "")}`,
+  hash: `${JSON.stringify(gitCommitInfo().hash).replace('"', "").replace("/", "").replace('\"', "")}`,
+  version: _v, 
+}
 
 const bare = createBareServer('/bare/');
 const serverFactory = (handler, opts) => {
   return createServer()
     .on("request", (req, res) => {
-      if (req.url === "/version") {
-        const versionResponse = {
-          version: _v,
-        };
+      if (req.url === "/info") {
         res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify(versionResponse));
+        res.end(JSON.stringify(info));
       } else if (bare.shouldRoute(req)) {
         bare.routeRequest(req, res);
       } else {

package.json

@@ -7,7 +7,8 @@
     "start": "node --max-http-header-size=50000 index",
     "build:dev": "node esbuild.dev.js",
     "build:prod": "node esbuild.prod.js",
-    "build": "node esbuild.prod.js"
+    "build": "node esbuild.prod.js",
+    "webpack": "echo 'Webpack building is no longer a supported build utility.'"
   },
   "keywords": [],
   "author": "",
@@ -27,6 +28,7 @@
     "domhandler": "^5.0.3",
     "esbuild": "^0.19.0",
     "fastify": "^4.21.0",
+    "git-commit-info": "^2.0.2",
     "idb": "^7.0.2",
     "open": "^9.1.0",
     "parse5": "^7.1.2",

static/resources/scripts/settings.js

@@ -90,16 +90,22 @@ class Modal {
 new Modal();
 
 window.addEventListener('DOMContentLoaded', function (){
-    console.log('buh')
+  
 const versionInd = document.getElementById('settings-version')
 const xhr = new XMLHttpRequest();
-xhr.open("GET", '/version');
+xhr.open("GET", '/info');
 xhr.send();
 xhr.responseType = "json";
 xhr.onload = () => {
   if (xhr.readyState == 4 && xhr.status == 200) {
-    console.log(xhr.response)
-    versionInd.innerText = `Dynamic v${xhr.response.version}`
+    const response = xhr.response;
+    versionInd.innerHTML = `Dynamic v${response.version} <span id='hashHover'> (${response.hashShort}) </span> `
+    const hashHover = document.getElementById('hashHover')
+    hashHover.onclick = function displayFullHash(){
+      console.log('cool')
+    hashHover.innerText = `(${response.hash})`
+    hashHover.style.fontSize = `10px`
+  }
   } else {
     versionInd.innerText = 'Unable to get version'
   }