From 9c68dc558549129fd5b522877257ade45f4898d9 Mon Sep 17 00:00:00 2001 From: zefie Date: Sun, 8 Aug 2021 11:04:59 -0400 Subject: [PATCH] update version reporting to include git branch, in prep for v1.0 --- zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js | 5 ++++- zefie_wtvp_minisrv/ServiceVault/wtv-home/splash.js | 4 +--- zefie_wtvp_minisrv/ServiceVault/wtv-register/splash.js | 4 +--- zefie_wtvp_minisrv/ServiceVault/wtv-tricks/info.js | 8 ++++---- zefie_wtvp_minisrv/app.js | 8 ++------ 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js index 8de6389e..a7a23a4e 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js @@ -24,7 +24,10 @@ function go() { location.href=document.access.url.value; } -

Welcome to `+ z_title + `

+Welcome to `+ z_title + `
+`; +if (minisrv_config.config.git_commit) data += "" + "  ".repeat(32) + "git revision " + minisrv_config.config.git_commit + "
"; +data += ` Encryption Status: ${cryptstatus}
Connection Speed: &rate;

diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/splash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/splash.js index fe5894e9..52aa1306 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/splash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/splash.js @@ -24,9 +24,7 @@ data = ` Mini service zefie minisrv v${minisrv_config.version}`; -if (getGitRevision()) { - data += " (git " + getGitRevision().substring(0, 8) + ")"; -} +if (minisrv_config.config.git_commit) data += " (git " + minisrv_config.config.git_commit + ")"; data += ` &rate; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-register/splash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-register/splash.js index ed4370f6..e2cca5fe 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-register/splash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-register/splash.js @@ -24,9 +24,7 @@ data = ` Mini service zefie minisrv v${minisrv_config.version}`; -if (getGitRevision()) { - data += " (git " + getGitRevision().substring(0, 8) + ")"; -} +if (minisrv_config.config.git_commit) data += " (git " + minisrv_config.config.git_commit + ")"; data += ` &rate; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/info.js b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/info.js index bff8a5f4..7c9a45a8 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/info.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/info.js @@ -50,6 +50,10 @@ Content-Type: text/html` Connected to: Mini Service + + Host/Port: + + ${service_ip}/${minisrv_config.services[service_name].port} Service: @@ -76,10 +80,6 @@ Content-Type: text/html` Client IP number: ${socket.remoteAddress} - - Service IP number: - - ${service_ip} `; if (ssid_sessions[socket.ssid].getSessionData("registered")) { data += ` diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index b2c4071f..d42cacc7 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -1279,7 +1279,7 @@ function getGitRevision() { if (rev.indexOf(':') === -1) { return rev; } else { - return fs.readFileSync(__dirname + path.sep + ".." + path.sep + ".git" + path.sep + rev.substring(5)).toString().trim(); + return fs.readFileSync(__dirname + path.sep + ".." + path.sep + ".git" + path.sep + rev.substring(5)).toString().trim().substring(0,8) + "-" + rev.split('/').pop(); } } catch (e) { return null; @@ -1288,11 +1288,7 @@ function getGitRevision() { // SERVER START var git_commit = getGitRevision() -if (git_commit) { - var z_title = "zefie's wtv minisrv v" + require('./package.json').version + " (git " + git_commit.substring(0,8) + ")"; -} else { - var z_title = "zefie's wtv minisrv v" + require('./package.json').version; -} +var z_title = "zefie's wtv minisrv v" + require('./package.json').version; console.log("**** Welcome to " + z_title + " ****"); console.log(" *** Reading global configuration..."); try {