fixed some vulns

- fixed issue with config-safe-states

README.MD

@@ -21,8 +21,6 @@ We've introduced a new packaging system. It is based on [electron-builder](https
 chmod +x ./build.sh
 ./build.sh
 ```
-
-> Binary Builds may be faulty or non-working. They are not officially supported.
 *Small disclaimer: Please do not use openCountdown for military or life-depending applications. Please also refrain from using openCountdown for launching rockets.*
 
 

index.js

@@ -1,14 +1,14 @@
 const express = require("express");
 const fs = require("fs");
 const bodyParser = require("body-parser");
-const ws = require('ws');
+const ws = require("ws");
 const helper = require("./helpers.js");
-const loggy = require("./logging")
+const loggy = require("./logging");
 const Eta = require("eta");
-const _ = require("underscore")
+const _ = require("underscore");
-const path = require("path")
+const path = require("path");
 
-loggy.init(true)
+loggy.init(true);
 
 loggy.log("Preparing server", "info", "Server");
 const app = express();
@@ -27,25 +27,26 @@ app.use(
 
 // Allowed urls for requests to /assets/
 const allowsURLs = [
-  'bootstrap-icons/font/bootstrap-icons.css',
+  "bootstrap-icons/font/bootstrap-icons.css",
-  'js-cookie/dist/js.cookie.min.js',
+  "js-cookie/dist/js.cookie.min.js",
-  'bootstrap/dist/css/bootstrap.min.css',
+  "bootstrap/dist/css/bootstrap.min.css",
-  'mdbootstrap/css/style.css',
+  "mdbootstrap/css/style.css",
-  'bootstrap/dist/js/bootstrap.bundle.min.js',
+  "bootstrap/dist/js/bootstrap.bundle.min.js",
-  'jquery/dist/jquery.min.js',
+  "jquery/dist/jquery.min.js",
-  'darkreader/darkreader.js',
+  "darkreader/darkreader.js",
-  'bootstrap-duration-picker/dist/bootstrap-duration-picker.css',
+  "bootstrap-duration-picker/dist/bootstrap-duration-picker.css",
-  'flatpickr/dist/flatpickr.min.css',
+  "flatpickr/dist/flatpickr.min.css",
-  'bootstrap-duration-picker/dist/bootstrap-duration-picker-debug.js',
+  "bootstrap-duration-picker/dist/bootstrap-duration-picker-debug.js",
-  'flatpickr/dist/flatpickr.js',
+  "flatpickr/dist/flatpickr.js",
-  'bootstrap-icons/font/fonts/bootstrap-icons.woff2',
+  "bootstrap-icons/font/fonts/bootstrap-icons.woff2",
-  'bootstrap/dist/css/bootstrap.min.css.map',
+  "bootstrap/dist/css/bootstrap.min.css.map",
-  'less/dist/less.min.js',
+  "less/dist/less.min.js",
-  'less/dist/less.min.js.map',
+  "less/dist/less.min.js.map",
-  'mdbootstrap/js/mdb.min.js'
+  "mdbootstrap/js/mdb.min.js",
 ];
 
-let loadedData = {}
+let loadedData = {};
+let dataToBeWritten = {}
 
 loggy.log("Loading config", "info", "Config");
 if (fs.existsSync("data-persistence.json")) {
@@ -68,19 +69,27 @@ currentState = {
   showMessage: false,
   messageAppearTime: 0,
   showProgressbar: true,
-  colorSegments: { 40000: "yellow", 20000: "#FFAE00", 5000: "#ff0000", "START": "green" },
+  colorSegments: {
+    40000: "yellow",
+    20000: "#FFAE00",
+    5000: "#ff0000",
+    START: "green",
+  },
   textColors: {},
   srvTime: 0,
   enableColoredText: true,
   debug: false,
-  sessionToken: Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15),
+  enableOverrun: true,
+  sessionToken:
+    Math.random().toString(36).substring(2, 15) +
+    Math.random().toString(36).substring(2, 15),
 };
 
 let configObject = {
   language: "en_uk",
-  port: 3000
+  port: 3000,
-}
+};
-if(!fs.existsSync("config.json")) {
+if (!fs.existsSync("config.json")) {
   fs.writeFileSync("config.json", "{}");
 }
 const tempJsonText = JSON.parse(fs.readFileSync("config.json", "utf8"));
@@ -88,9 +97,9 @@ configObject = _.extend(configObject, tempJsonText);
 fs.writeFileSync("config.json", JSON.stringify(configObject));
 
 currentState = Object.assign({}, currentState, loadedData);
-currentState.textColors = currentState.colorSegments
+currentState.textColors = currentState.colorSegments;
 
-loggy.log("Searching for languages", "info", "Language")
+loggy.log("Searching for languages", "info", "Language");
 const languagesRaw = fs.readdirSync("./lang");
 const languages = [];
 for (let i = 0; i < languagesRaw.length; i++) {
@@ -98,19 +107,19 @@ for (let i = 0; i < languagesRaw.length; i++) {
     languages.push(languagesRaw[i].replace(".json", ""));
   }
 }
-loggy.log("Found " + languages.length + " languages", "info", "Language")
+loggy.log("Found " + languages.length + " languages", "info", "Language");
 
-
+loggy.log("Reading language file", "info", "Language");
-
+let languageProfile = JSON.parse(
-loggy.log("Reading language file", "info", "Language")
+  fs.readFileSync("lang/" + configObject.language + ".json", "utf8")
-let languageProfile = JSON.parse(fs.readFileSync("lang/" + configObject.language + ".json", "utf8"));
+);
 
 loggy.log("Preparing websocket", "info", "Websocket");
 const wsServer = new ws.Server({ noServer: true });
-wsServer.on('connection', socket => {
+wsServer.on("connection", (socket) => {
-  socket.on('message', function incoming(data) {
+  socket.on("message", function incoming(data) {
     if (data.toString() == "new client") {
-      updatedData()
+      updatedData();
     }
   });
 });
@@ -126,7 +135,7 @@ wsServer.broadcast = function broadcast(data) {
 let updatey = undefined;
 
 function updatedData() {
-  currentState.srvTime = new Date().getTime()
+  currentState.srvTime = new Date().getTime();
   wsServer.broadcast(JSON.stringify(currentState));
   clearTimeout(updatey);
   setTimeout(updatedData, 5000);
@@ -140,28 +149,35 @@ app.get("/", function (req, res) {
       Eta.render(data, {
         lang: languageProfile,
         additional: {
-          languages: languages
+          languages: languages,
-        }
+        },
-      }));
+      })
+    );
   } catch (e) {
     loggy.log("Error rendering template", "error", "Server");
     const dataN = fs.readFileSync("templates/brokenTranslation.html", "utf8");
     res.send(
       Eta.render(dataN, {
         additional: {
-          languages: languages
+          languages: languages,
-        }
+        },
-      }));
+      })
+    );
   }
 });
 
 app.get("/timer", function (req, res) {
+  const data = fs.readFileSync("templates/ng-timerview.html", "utf8");
+  res.send(data);
+});
+
+app.get("/timer-old", function (req, res) {
   const data = fs.readFileSync("templates/timerPage.html", "utf8");
   res.send(data);
 });
 
 app.get("/api/v1/data", function (req, res) {
-  currentState.srvTime = new Date().getTime()
+  currentState.srvTime = new Date().getTime();
   res.json(currentState);
 });
 
@@ -182,166 +198,181 @@ app.get("/api/v1/system", function (req, res) {
     nodeEnv: process.env,
     nodeConfig: process.config,
     nodeTitle: process.title,
-    systemVersion: tempPkgObj.version
+    systemVersion: tempPkgObj.version,
-  }
+  };
   res.json(systemData);
 });
 
-
 app.get("/api/v1/set/mode", function (req, res) {
   currentState.mode = req.query.mode;
-  updatedData()
+  updatedData();
   res.json({ status: "ok" });
 });
 
 app.get("/api/v1/set/layout/showMillis", function (req, res) {
-  const resy = helper.wrapBooleanConverter(req.query.show, res)
+  const resy = helper.wrapBooleanConverter(req.query.show, res);
   if (resy != undefined) {
     currentState.showMilliSeconds = resy;
-    if (req.query.persist === 'true') {
+    if (req.query.persist === "true") {
-      dataToBeWritten.showMilliSeconds = currentState.showMilliSeconds
+      dataToBeWritten.showMilliSeconds = currentState.showMilliSeconds;
     }
     res.json({ status: "ok" });
   }
-  updatedData()
+  updatedData();
-
 });
 
 app.get("/api/v1/set/timerGoal", function (req, res) {
   currentState.countdownGoal = new Date(parseInt(req.query.time)).getTime(); // ToDO error handling
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/set/addMillisToTimer", function (req, res) {
   currentState.timeAmountInital = req.query.time;
-  currentState.countdownGoal = new Date().getTime() + parseInt(req.query.time)
+  currentState.countdownGoal = new Date().getTime() + parseInt(req.query.time);
   currentState.pauseMoment = new Date().getTime();
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/set/relativAddMillisToTimer", function (req, res) {
-  currentState.timeAmountInital = req.query.time;
+	
-  currentState.countdownGoal = currentState.countdownGoal + parseInt(req.query.time)
+	currentState.timeAmountInital = parseInt(req.query.time) + parseInt(currentState.timeAmountInital);
-  currentState.pauseMoment = new Date().getTime();
+	currentState.countdownGoal = currentState.countdownGoal + parseInt(req.query.time);
-  res.json({ status: "ok" });
+	// currentState.pauseMoment = new Date().getTime();
-  updatedData()
+	
+	res.json({ status: "ok" });
+	updatedData();
 });
 
 app.get("/api/v1/ctrl/timer/pause", function (req, res) {
   currentState.timerRunState = false;
   currentState.pauseMoment = new Date().getTime();
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/timer/play", function (req, res) {
-
   if (currentState.timerRunState == false) {
-    currentState.timerRunState = true
+    currentState.timerRunState = true;
-    currentState.countdownGoal += new Date().getTime() - currentState.pauseMoment;
+    currentState.countdownGoal +=
+      new Date().getTime() - currentState.pauseMoment;
   }
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/timer/restart", function (req, res) {
-  currentState.countdownGoal = new Date().getTime() + parseInt(currentState.timeAmountInital)
+  currentState.countdownGoal =
+    new Date().getTime() + parseInt(currentState.timeAmountInital);
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/set/layout/showTime", function (req, res) {
-  const resy = helper.wrapBooleanConverter(req.query.show, res)
+  const resy = helper.wrapBooleanConverter(req.query.show, res);
   if (resy != undefined) {
     currentState.showTimeOnCountdown = resy;
-    if (req.query.persist === 'true') {
+    if (req.query.persist === "true") {
-      dataToBeWritten.showTimeOnCountdown = currentState.showTimeOnCountdown
+      dataToBeWritten.showTimeOnCountdown = currentState.showTimeOnCountdown;
     }
     res.json({ status: "ok" });
   }
-  updatedData()
+  updatedData();
+});
+
+app.get("/api/v1/set/enableOverrun", function (req, res) {
+  const resy = helper.wrapBooleanConverter(req.query.enable, res);
+  if (resy != undefined) {
+    currentState.enableOverrun = resy;
+    if (req.query.persist === "true") {
+      dataToBeWritten.enableOverrun = currentState.enableOverrun;
+    }
+    res.json({ status: "ok" });
+  }
+  updatedData();
 });
 
 app.get("/api/v1/set/progressbar/show", function (req, res) {
-  currentState.showProgressbar = (req.query.show === 'true');
+  currentState.showProgressbar = req.query.show === "true";
-  if (req.query.persist === 'true') {
+  if (req.query.persist === "true") {
-    dataToBeWritten.showProgressbar = currentState.showProgressbar
+    dataToBeWritten.showProgressbar = currentState.showProgressbar;
   }
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/set/progressbar/colors", function (req, res) {
   try {
-    let data = req.query.colors
+    let data = req.query.colors;
     if (req.query.isBase64 === "true") {
-      data = atob(data)
+	let buff = new Buffer(data, 'base64');
+	data = buff.toString('ascii');
     }
     currentState.colorSegments = JSON.parse(data);
-    if (req.query.persist === 'true') {
+    if (req.query.persist === "true") {
-      dataToBeWritten.colorSegments = currentState.colorSegments
+      dataToBeWritten.colorSegments = currentState.colorSegments;
     }
     res.json({ status: "ok" });
   } catch (error) {
     res.json({ status: "error", message: error });
-    console.error(error)
+    console.error(error);
   }
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/set/text/colors", function (req, res) {
   try {
     if (req.query.copy === "true") {
-      currentState.textColors = currentState.colorSegments
+      currentState.textColors = currentState.colorSegments;
       res.json({ status: "ok" });
     } else {
-      let data = req.query.colors
+      let data = req.query.colors;
       if (req.query.isBase64 === "true") {
-        data = atob(data)
+        let buff = new Buffer(data, 'base64');
+	let data = buff.toString('ascii');
       }
-      console.debug(data)
+      console.debug(data);
       currentState.textColors = JSON.parse(data);
-      if (req.query.persist === 'true') {
+      if (req.query.persist === "true") {
-        dataToBeWritten.textColors = currentState.textColors
+        dataToBeWritten.textColors = currentState.textColors;
       }
     }
     res.json({ status: "ok" });
   } catch (error) {
     res.json({ status: "error", message: error });
-    console.error(error)
+    console.error(error);
   }
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/set/text/enableColoring", function (req, res) {
-  currentState.enableColoredText = (req.query.enable === 'true');
+  currentState.enableColoredText = req.query.enable === "true";
-  if (req.query.persist === 'true') {
+  if (req.query.persist === "true") {
-    dataToBeWritten.enableColoredText = currentState.enableColoredText
+    dataToBeWritten.enableColoredText = currentState.enableColoredText;
   }
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/message/show", function (req, res) {
-  currentState.message = req.query.msg
+  currentState.message = req.query.msg;
-  currentState.showMessage = true
+  currentState.showMessage = true;
-  currentState.messageAppearTime = new Date().getTime()
+  currentState.messageAppearTime = new Date().getTime();
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/debug", function (req, res) {
-  currentState.debug = (req.query.enable === 'true');
+  currentState.debug = req.query.enable === "true";
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/message/hide", function (req, res) {
-  currentState.showMessage = false
+  currentState.showMessage = false;
   res.json({ status: "ok" });
-  updatedData()
+  updatedData();
 });
 
 app.get("/api/v1/storage/commit", function (req, res) {
@@ -352,10 +383,9 @@ app.get("/api/v1/storage/commit", function (req, res) {
   } catch (error) {
     res.json({ status: "error", reason: error });
   }
-  updatedData()
+  updatedData();
 });
 
-
 app.get("/api/v1/storage/delete", function (req, res) {
   if (req.query.delete === "true") {
     if (fs.existsSync("data-persistence.json")) {
@@ -364,126 +394,159 @@ app.get("/api/v1/storage/delete", function (req, res) {
     } else {
       res.json({ status: "error", reason: "No persistence data was found" });
     }
-
   } else {
-
+  }
-  } res.json({ status: "error", reason: "Missing delete argument" });
+  res.json({ status: "error", reason: "Missing delete argument" });
-  updatedData()
+  updatedData();
 });
 
 // UI Routes
 // Returns an object containg all available languages
-app.get("/api/ui/v1/lang/list", function handleLangList(req, res){
+app.get("/api/ui/v1/lang/list", function handleLangList(req, res) {
   const tempRespObject = {
     status: "ok",
-    languages: languages
+    languages: languages,
-  }
+  };
   res.json(tempRespObject);
-})
+});
 
 app.get("/api/ui/v1/lang/set", function (req, res) {
-  if(req.query.lang == undefined || req.query.lang == ""){
+  if (req.query.lang == undefined || req.query.lang == "") {
     res.json({ status: "error", reason: "Missing language" });
     return;
   }
   const testLang = req.query.lang;
-  loggy.log("Reloading language file", "info", "Language")
+  loggy.log("Reloading language file", "info", "Language");
-  if(!fs.existsSync("lang/" + testLang + ".json")){
+  if (!fs.existsSync("lang/" + testLang + ".json")) {
-    loggy.log("Language reload failed, file does not exist", "error", "Language")
+    loggy.log(
-    res.status(500).json({ status: "error", reason: "Language file not found" });
+      "Language reload failed, file does not exist",
-    return
+      "error",
+      "Language"
+    );
+    res
+      .status(500)
+      .json({ status: "error", reason: "Language file not found" });
+    return;
   }
   const tempLang = fs.readFileSync("lang/" + testLang + ".json", "utf8");
   const tempLangObj = helper.tryToParseJson(tempLang);
-  if(!tempLangObj){
+  if (!tempLangObj) {
-    loggy.log("Language reload failed, file is not valid", "error", "Language")
+    loggy.log("Language reload failed, file is not valid", "error", "Language");
-    res.status(500).json({ status: "error", reason: "Language file is not valid" });
+    res
-    return
+      .status(500)
+      .json({ status: "error", reason: "Language file is not valid" });
+    return;
   }
-  if(tempLangObj._metadata == undefined){
+  if (tempLangObj._metadata == undefined) {
-    loggy.log("Language reload failed, file is not valid, metadata missing", "error", "Language")
+    loggy.log(
-    res.status(500).json({ status: "error", reason: "Language file is not valid" });
+      "Language reload failed, file is not valid, metadata missing",
-    return
+      "error",
+      "Language"
+    );
+    res
+      .status(500)
+      .json({ status: "error", reason: "Language file is not valid" });
+    return;
   }
-  loggy.log("Language reloaded, loaded " + tempLangObj._metadata.lang + "@" + tempLangObj._metadata.version, "info", "Language")
+  loggy.log(
+    "Language reloaded, loaded " +
+      tempLangObj._metadata.lang +
+      "@" +
+      tempLangObj._metadata.version,
+    "info",
+    "Language"
+  );
   configObject.language = req.query.lang;
   languageProfile = tempLangObj;
   res.status(200).json({ status: "ok" });
   fs.writeFileSync("config.json", JSON.stringify(configObject));
 });
 
-
 app.use("/assets/*", function handleModuleFiles(req, res) {
-  if(allowsURLs.indexOf(req.params[0]) > -1){
+  if (allowsURLs.indexOf(req.params[0]) > -1) {
     res.sendFile(path.join(__dirname, "node_modules", req.params[0]));
   } else {
-    loggy.log("Attempt to access restricted asset file " + req.params[0], "error", "Security")
+    loggy.log(
-    res.status(403).json({ status: "error", reason: "Access to restricted asset file denied" });
+      "Attempt to access restricted asset file " + req.params[0],
+      "error",
+      "Security"
+    );
+    res.status(403).json({
+      status: "error",
+      reason: "Access to restricted asset file denied",
+    });
   }
   // console.log(recordedURLs)
-})
+});
 
 app.use(function (req, res, next) {
   res.status(404);
   loggy.log("Server responded with 404 error", "warn", "Server", true);
 
   // respond with html page
-  if (req.accepts('html')) {
+  if (req.accepts("html")) {
     const data = fs.readFileSync("templates/errorPages/404.html", "utf8");
-    res.status(404)
+    res.status(404);
     res.send(data);
     return;
   }
 
   // respond with json
-  if (req.accepts('json')) {
+  if (req.accepts("json")) {
-    res.json({ error: 'Not found' });
+    res.json({ error: "Not found" });
     return;
   }
 
   // default to plain-text. send()
-  res.type('txt').send('Not found');
+  res.type("txt").send("Not found");
 });
 
-
-
-
-
 /*app.use(function(err, req, res, next) {
   console.error(err.stack);
   if(String(err.stack).includes("TypeError: Cannot read properties of undefined")) {
-    const data = fs.readFileSync("templates/brokenTranslation.html", "utf8");
+	const data = fs.readFileSync("templates/brokenTranslation.html", "utf8");
-    res.send(data);
+	res.send(data);
   }else{
-    res.status(500).send('Something broke!');
+	res.status(500).send('Something broke!');
   }
  
 });*/
 
-
-
 loggy.log("Starting server", "info", "Server");
 
 const port = configObject.port;
 
-process.on('SIGINT', function () {
+process.on("SIGINT", function () {
-  loggy.log("Caught interrupt signal and shutting down gracefully", "info", "Shutdown");
+  loggy.log(
+    "Caught interrupt signal and shutting down gracefully",
+    "info",
+    "Shutdown"
+  );
   server.close(); // Make the express server stop
-  loggy.log("Goodbye! 👋", "magic", "Shutdown", true)
+  loggy.log("Goodbye! 👋", "magic", "Shutdown", true);
   loggy.close(); // Close and write log
   process.exit(); // Quit the application
 });
 
 const server = app.listen(port);
-server.on('upgrade', (request, socket, head) => {
+server.on("upgrade", (request, socket, head) => {
-  wsServer.handleUpgrade(request, socket, head, socket => {
+  wsServer.handleUpgrade(request, socket, head, (socket) => {
-    wsServer.emit('connection', socket, request);
+    wsServer.emit("connection", socket, request);
   });
 });
 
-
 loggy.log("=======================", "info", "", true);
 loggy.log("Server running on port " + port, "magic", "", true);
-loggy.log("Visit http://localhost:" + port + "/timer for the timer view", "magic", "", true);
+loggy.log(
-loggy.log("Visit http://localhost:" + port + " for the admin view", "magic", "", true);
+  "Visit http://localhost:" + port + "/timer for the timer view",
+  "magic",
+  "",
+  true
+);
+loggy.log(
+  "Visit http://localhost:" + port + " for the admin view",
+  "magic",
+  "",
+  true
+);
 loggy.log("=======================", "info", "", true);

lang/de_de.json

@@ -30,8 +30,9 @@
     {
         "timer": "Timer",
         "clock": "Uhr",
-        "black": "Schwarz",
+        "black": "Leer",
-        "test": "Testbild"
+        "test": "Testbild",
+	"screensaver": "Bildschirmschoner"
     },
     "labels":
     {
@@ -45,7 +46,8 @@
         "enableTextClrs": "Text Farben aktivieren:",
         "textClrs": "Text Farben",
         "addRow": "Neue Zeile",
-        "timeVar": "Aktiviere zeitabweichungs display:"
+        "timeVar": "Aktiviere zeitabweichungs display:",
+	"allowOverrun": "Überlauf erlauben: "
     },
     "untis": 
     {

lang/en_uk.json

@@ -32,7 +32,8 @@
         "timer": "Timer",
         "clock": "Clock",
         "black": "Black",
-        "test": "Testimage"
+        "test": "Testimage",
+	"screensaver": "Screensaver"
     },
     "labels":
     {
@@ -48,7 +49,8 @@
         "addRow": "Add Row",
         "timeVar": "Enable time variance display:",
         "language": "Select a language",
-        "apply": "Apply"
+        "apply": "Apply",
+	"allowOverrun": "Allow overrun:"
     },
     "untis": 
     {

lang/proto_black.json

@@ -31,7 +31,8 @@
         "timer": "████",
         "clock": "█████",
         "black": "████",
-        "test": "███████"
+        "test": "███████",
+	"screensaver": "████████"
     },
     "labels":
     {
@@ -45,7 +46,8 @@
         "enableTextClrs": "██████ ████ ███████:",
         "textClrs": "████ ██████",
         "addRow": "███ ███",
-        "timeVar": "██████ ████ ███████ ███████:"
+        "timeVar": "██████ ████ ███████ ███████:",
+	"allowOverrun": "██████ ████████:"
     },
     "untis": 
     {

log-journal.json

@@ -1 +0,0 @@
-[{"timestamp":"2022-08-18 16:19:06.649","level":"info","module":"Logging","message":"2022-08-18 16:19:06.649 [info]  [Logging] Logging initialized"},{"timestamp":"2022-08-18 16:19:06.651","level":"info","module":"Server","message":"2022-08-18 16:19:06.651 [info]  [Server] Preparing server"},{"timestamp":"2022-08-18 16:19:06.652","level":"info","module":"Server","message":"2022-08-18 16:19:06.652 [info]  [Server] Preparing static routes"},{"timestamp":"2022-08-18 16:19:06.654","level":"info","module":"Server","message":"2022-08-18 16:19:06.654 [info]  [Server] Preparing middlewares"},{"timestamp":"2022-08-18 16:19:06.655","level":"info","module":"Config","message":"2022-08-18 16:19:06.655 [info]  [Config] Loading config"},{"timestamp":"2022-08-18 16:19:06.658","level":"info","module":"Language","message":"2022-08-18 16:19:06.658 [info]  [Language] Searching for languages"},{"timestamp":"2022-08-18 16:19:06.659","level":"info","module":"Language","message":"2022-08-18 16:19:06.659 [info]  [Language] Found 3 languages"},{"timestamp":"2022-08-18 16:19:06.659","level":"info","module":"Language","message":"2022-08-18 16:19:06.659 [info]  [Language] Reading language file"},{"timestamp":"2022-08-18 16:19:06.675","level":"info","module":"Websocket","message":"2022-08-18 16:19:06.675 [info]  [Websocket] Preparing websocket"},{"timestamp":"2022-08-18 16:19:06.675","level":"info","module":"Server","message":"2022-08-18 16:19:06.675 [info]  [Server] Preparing routes"},{"timestamp":"2022-08-18 16:19:06.678","level":"info","module":"Server","message":"2022-08-18 16:19:06.678 [info]  [Server] Starting server"},{"timestamp":"2022-08-18 16:22:57.338","level":"info","module":"Shutdown","message":"2022-08-18 16:22:57.338 [info]  [Shutdown] Caught interrupt signal and shutting down gracefully"}]

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "opencountdown",
-	"version": "1.0.4",
+	"version": "1.0.7",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "opencountdown",
-			"version": "1.0.4",
+			"version": "1.0.7",
 			"license": "LGPL-3.0",
 			"dependencies": {
 				"body-parser": "^1.20.1",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencountdown",
-	"version": "1.0.5",
+	"version": "1.0.7",
 	"description": "An opensource countdown",
 	"main": "startHandler.js",
 	"scripts": {
@@ -10,26 +10,26 @@
 	"author": "TheGreydiamond",
 	"license": "LGPL-3.0",
 	"dependencies": {
-		"body-parser": "^1.20.1",
+		"body-parser": "^1.20.2",
-		"bootstrap": "^5.2.2",
+		"bootstrap": "^5.3.1",
 		"bootstrap-duration-picker": "^2.1.3",
-		"bootstrap-icons": "^1.10.1",
+		"bootstrap-icons": "^1.10.5",
 		"colors": "^1.4.0",
 		"darkreader": "^4.9.58",
-		"eta": "^1.12.3",
+		"eta": "^1.14.2",
-		"express": "^4.18.2",
+		"express": "^4.19.2",
 		"flatpickr": "^4.6.13",
-		"jquery": "^3.6.1",
+		"jquery": "^3.7.0",
 		"js-cookie": "^3.0.1",
 		"less": "^4.1.3",
 		"mdbootstrap": "^4.20.0",
 		"open": "^8.4.0",
 		"underscore": "^1.13.6",
-		"ws": "^8.11.0"
+		"ws": "^8.18.0"
 	},
 	"devDependencies": {
-		"electron": "^21.2.3",
+		"electron": "^25.9.8",
-		"electron-builder": "^23.6.0"
+		"electron-builder": "^24.6.3"
 	},
 	"build": {
 		"extraMetadata": {

static/css/smallerTextMod.css

@@ -1,3 +1,7 @@
 body {
     font-size:0.3em;
 }
+
+.moverLogo {
+    height: 80px !important;
+}

static/css/styles.css

@@ -111,3 +111,47 @@ animation:fade 1000ms infinite;
   font-size: x-large;
   font-family: sans-serif;
 }
+
+:root {
+	--my-end-left: 99%;
+	--my-end-top: 99%;
+    }
+    
+
+#moveClock {
+	font-size: 6em;
+	font-family: sans-serif;
+	position: absolute;
+	-webkit-animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	-moz-animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	-o-animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	transition: all 0.8s ease;
+}
+
+
+@-webkit-keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left) }
+      }
+      @-moz-keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left); }
+      }
+      @-o-keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left); }
+      }
+      @keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left); }
+      }
+      
+      @-webkit-keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }
+      @-moz-keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }
+      @-o-keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }
+      @keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }

static/js/interface.js

@@ -25,7 +25,7 @@ function convertColorSegments(elementId) {
 $(function () {
     // $(".numVal").bind("DOMSubtreeModified", alert);
 
-    const modes = ["timer", "clock", "black", "test"]
+    const modes = ["timer", "clock", "black", "test", "screensaver"]
     let selectPresetTime = 0;
 
     if (Cookies.get("interfaceColor") != undefined) {
@@ -131,6 +131,7 @@ $(function () {
         $("#showMillis")[0].checked = jsonResult.showMilliSeconds;
         $("#progBarShow")[0].checked = jsonResult.showProgressbar;
         $("#textColors")[0].checked = jsonResult.enableColoredText;
+	$("#allowOverrun")[0].checked = jsonResult.enableOverrun;
         console.log(document.getElementById("tableCopySource"))
 
         let tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
@@ -266,6 +267,7 @@ $(function () {
         const showMillisB = $("#showMillis")[0].checked
         const progBarShowB = $("#progBarShow")[0].checked
         const textColorsB = $("#textColors")[0].checked
+	const allowOverrun = $("#allowOverrun")[0].checked
 
         const colors = convertColorSegments("colors1")
         const colors2 = convertColorSegments("colors2")
@@ -276,6 +278,8 @@ $(function () {
         allPathes.push("/api/v1/set/text/enableColoring?enable=" + textColorsB)
         allPathes.push("/api/v1/set/progressbar/colors?isBase64=true&colors=" + btoa(JSON.stringify(colors)))
         allPathes.push("/api/v1/set/text/colors?isBase64=true&colors=" + btoa(JSON.stringify(colors2)))
+	allPathes.push("/api/v1/set/enableOverrun?enable=" + allowOverrun)
+
 
 
         for (pI in allPathes) {
@@ -301,11 +305,13 @@ $(function () {
         const showMillisB = $("#showMillis")[0].checked
         const progBarShowB = $("#progBarShow")[0].checked
         const textColorsB = $("#textColors")[0].checked
+	const allowOverrun = $("#allowOverrun")[0].checked
 
         allPathes.push("/api/v1/set/layout/showTime?persist=true&show=" + showTimeB)
         allPathes.push("/api/v1/set/layout/showMillis?persist=true&show=" + showMillisB)
         allPathes.push("/api/v1/set/progressbar/show?persist=true&show=" + progBarShowB)
         allPathes.push("/api/v1/set/text/enableColoring?persist=true&enable=" + textColorsB)
+	allPathes.push("/api/v1/set/enableOverrun?persist=true&enable=" + allowOverrun)
 
         for (pI in allPathes) {
             const path = allPathes[pI];

static/js/script.js

@@ -13,44 +13,44 @@ let lastTime = "00:00:00";
 let timerCountdownFirst = true;
 
 socket.onopen = function (e) {
-  // alert("[open] Connection established");
+	// alert("[open] Connection established");
-  //alert("Sending to server");
+	//alert("Sending to server");
-  socket.send("new client");
+	socket.send("new client");
 };
 
 socket.onmessage = function (event) {
-  // alert(`[message] Data received from server: ${event.data}`);
+	// alert(`[message] Data received from server: ${event.data}`);
-  let inData = JSON.parse(event.data)
+	let inData = JSON.parse(event.data)
-  if (isFirstPacket) {
+	if (isFirstPacket) {
-    isFirstPacket = false
+		isFirstPacket = false
-    dataFame = JSON.parse(event.data);
+		dataFame = JSON.parse(event.data);
-    timeDiff = new Date().getTime() - dataFame.srvTime
+		timeDiff = new Date().getTime() - dataFame.srvTime
-  } else {
+	} else {
-    if (inData.sessionToken == dataFame.sessionToken) {
+		if (inData.sessionToken == dataFame.sessionToken) {
-      dataFame = JSON.parse(event.data);
+			dataFame = JSON.parse(event.data);
-      timeDiff = new Date().getTime() - dataFame.srvTime
+			timeDiff = new Date().getTime() - dataFame.srvTime
-    } else {
+		} else {
-      if (ackdSessionToken == false) {
+			if (ackdSessionToken == false) {
 
-        ackdSessionToken = true
+				ackdSessionToken = true
 
-        if (confirm("Session token mismatch, reload the page?")) {
+				if (confirm("Session token mismatch, reload the page?")) {
-          location.reload();
+					location.reload();
-        }
+				}
-      }
+			}
-    }
+		}
-  }
+	}
 
 };
 
 socket.onclose = function (event) {
-  if (event.wasClean) {
+	if (event.wasClean) {
-    console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+		console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
-  } else {
+	} else {
-    // e.g. server process killed or network down
+		// e.g. server process killed or network down
-    // event.code is usually 1006 in this case
+		// event.code is usually 1006 in this case
-    console.error('[close] Connection died');
+		console.error('[close] Connection died');
-  }
+	}
 };
 
 allowFullscreen = true
@@ -58,229 +58,229 @@ let dataFame = {}
 let timeDiff = 0
 
 function enterFullscreen(element) {
-  if (element.requestFullscreen) {
+	if (element.requestFullscreen) {
-    element.requestFullscreen();
+		element.requestFullscreen();
-  } else if (element.msRequestFullscreen) {
+	} else if (element.msRequestFullscreen) {
-    element.msRequestFullscreen();
+		element.msRequestFullscreen();
-  } else if (element.webkitRequestFullscreen) {
+	} else if (element.webkitRequestFullscreen) {
-    element.webkitRequestFullscreen();
+		element.webkitRequestFullscreen();
-  }
+	}
 }
 
 function returnData() {
-  return (JSON.parse(document.getElementById("incomeData").innerHTML))
+	return (JSON.parse(document.getElementById("incomeData").innerHTML))
 }
 
 function percentage(partialValue, totalValue) {
-  return (100 * partialValue) / totalValue;
+	return (100 * partialValue) / totalValue;
 }
 
 function updateFullscreen() {
-  if (JSON.parse(document.getElementById("incomeData").innerHTML).defaultFullScreen && allowFullscreen) {
+	if (JSON.parse(document.getElementById("incomeData").innerHTML).defaultFullScreen && allowFullscreen) {
-    enterFullscreen(document.documentElement)
+		enterFullscreen(document.documentElement)
-  }
+	}
 }
 
 
 function msToTime(s, data) {
-  isSmallerThenZero = false
+	isSmallerThenZero = false
-  if (s < 0) {
+	if (s < 0) {
-    isSmallerThenZero = true
+		isSmallerThenZero = true
-  }
+	}
 
-  var ms = s % 1000;
+	var ms = s % 1000;
-  s = (s - ms) / 1000;
+	s = (s - ms) / 1000;
-  var secs = s % 60;
+	var secs = s % 60;
-  s = (s - secs) / 60;
+	s = (s - secs) / 60;
-  var mins = s % 60;
+	var mins = s % 60;
-  var hrs = (s - mins) / 60;
+	var hrs = (s - mins) / 60;
-  let out = ""
+	let out = ""
 
-  if (!data.showMilliSeconds) {
+	if (!data.showMilliSeconds) {
-    out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2)
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2)
-  } else {
+	} else {
-    out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2) + '.' + ('000' + Math.abs(ms)).slice(-3)
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2) + '.' + ('000' + Math.abs(ms)).slice(-3)
-  }
+	}
 
-  if (isSmallerThenZero) {
+	if (isSmallerThenZero) {
-    out = "-" + out
+		out = "-" + out
-  }
+	}
-  return out;
+	return out;
 }
 
 function findProgessColor(colors, value) {
-  const allColors = Object.keys(colors);
+	const allColors = Object.keys(colors);
-  let resColor = colors["START"]
+	let resColor = colors["START"]
-  for (let color in allColors) {
+	for (let color in allColors) {
-    const currColor = allColors[color]
+		const currColor = allColors[color]
-    // console.log(color, currColor, parseInt(currColor), value, colors[String(currColor)], resColor)
+		// console.log(color, currColor, parseInt(currColor), value, colors[String(currColor)], resColor)
-    if (value <= parseInt(currColor)) {
+		if (value <= parseInt(currColor)) {
-      resColor = colors[String(currColor)]
+			resColor = colors[String(currColor)]
-      break
+			break
-    }
+		}
-  }
+	}
-  return (resColor)
+	return (resColor)
 }
 
 function requestBackend() {
-  resp = httpGet("/api/v1/data");
+	resp = httpGet("/api/v1/data");
-  resp.onloadend = function (e) {
+	resp.onloadend = function (e) {
-    if (resp.status == 200) {
+		if (resp.status == 200) {
-      resp = resp.responseText;
+			resp = resp.responseText;
-      var data = JSON.parse(resp);
+			var data = JSON.parse(resp);
-      timeDiff = new Date().getTime() - data.srvTime
+			timeDiff = new Date().getTime() - data.srvTime
-      dataFame = data;
+			dataFame = data;
-    }
+		}
-  }
+	}
 }
 
 let isSlowed = false
 
 function handleRecovery() {
-  var img = document.body.appendChild(document.createElement("img"));
+	var img = document.body.appendChild(document.createElement("img"));
-  img.onload = function () {
+	img.onload = function () {
-    location.reload();
+		location.reload();
-  };
+	};
-  img.src = "SMPTE_Color_Bars.svg";
+	img.src = "SMPTE_Color_Bars.svg";
 }
 
 let recoInter = -1
 
 function handleUpdate() {
-  var data = dataFame;
+	var data = dataFame;
-  document.getElementById("incomeData").innerHTML = JSON.stringify(data)
+	document.getElementById("incomeData").innerHTML = JSON.stringify(data)
-  document.getElementById("timediff").innerHTML = timeDiff + "<br>" + String(new Date().getTime() - data.srvTime);
+	document.getElementById("timediff").innerHTML = timeDiff + "<br>" + String(new Date().getTime() - data.srvTime);
 
-  if (data.debug) {
+	if (data.debug) {
-    document.getElementById("timediff").style.display = "block";
+		document.getElementById("timediff").style.display = "block";
-  } else {
+	} else {
-    document.getElementById("timediff").style.display = "none";
+		document.getElementById("timediff").style.display = "none";
-  }
+	}
 
-  if (data.defaultFullScreen && document.getElementById("initalDate").innerHTML.includes("true") && allowFullscreen) {
+	if (data.defaultFullScreen && document.getElementById("initalDate").innerHTML.includes("true") && allowFullscreen) {
-    enterFullscreen(document.documentElement);
+		enterFullscreen(document.documentElement);
-    document.getElementById("initalDate").innerHTML = "false"
+		document.getElementById("initalDate").innerHTML = "false"
-  }
+	}
 
-  if (data.showMessage) {
+	if (data.showMessage) {
-    document.getElementById("overlay").style.display = "block";
+		document.getElementById("overlay").style.display = "block";
-    document.getElementById("text").innerHTML = data.message
+		document.getElementById("text").innerHTML = data.message
-  } else {
+	} else {
-    document.getElementById("overlay").style.display = "none";
+		document.getElementById("overlay").style.display = "none";
-  }
+	}
 
-  if (data.showTimeOnCountdown && data.mode == "timer") {
+	if (data.showTimeOnCountdown && data.mode == "timer") {
-    document.getElementById("clockSec").innerHTML = getTime();
+		document.getElementById("clockSec").innerHTML = getTime();
-  } else {
+	} else {
-    document.getElementById("clockSec").innerHTML = "";
+		document.getElementById("clockSec").innerHTML = "";
-  }
+	}
 
-  if (new Date().getTime() - data.messageAppearTime < 5000) {
+	if (new Date().getTime() - data.messageAppearTime < 5000) {
-    if (!document.getElementById("text").classList.contains('blink')) {
+		if (!document.getElementById("text").classList.contains('blink')) {
-      document.getElementById("text").classList.add("blink")
+			document.getElementById("text").classList.add("blink")
-    }
+		}
-  } else {
+	} else {
-    if (document.getElementById("text").classList.contains('blink')) {
+		if (document.getElementById("text").classList.contains('blink')) {
-      document.getElementById("text").classList.remove("blink")
+			document.getElementById("text").classList.remove("blink")
-    }
+		}
-  }
+	}
 
 
-  if (data.mode == "clock") {
+	if (data.mode == "clock") {
-    document.getElementById("timer").innerHTML = getTime();
+		document.getElementById("timer").innerHTML = getTime();
-    document.getElementById("testImg").style.display = "none";
+		document.getElementById("testImg").style.display = "none";
-    document.getElementById("wholeProgBar").style.display = "none";
+		document.getElementById("wholeProgBar").style.display = "none";
-    document.getElementById("clockSec").innerHTML = "";
+		document.getElementById("clockSec").innerHTML = "";
-    document.getElementById("timer").style.color = "white"
+		document.getElementById("timer").style.color = "white"
-    timerCountdownFirst = true;
+		timerCountdownFirst = true;
 
-  } else if (data.mode == "timer") {
+	} else if (data.mode == "timer") {
-    if(data.showProgressbar) {
+		if (data.showProgressbar) {
-      document.getElementById("wholeProgBar").style.display = "block";
+			document.getElementById("wholeProgBar").style.display = "block";
-    } else {
+		} else {
-      document.getElementById("wholeProgBar").style.display = "none";
+			document.getElementById("wholeProgBar").style.display = "none";
-    }
+		}
 
-    const now = new Date()
+		const now = new Date()
 
-    if(timerCountdownFirst){
+		if (timerCountdownFirst) {
-      const diff = data.countdownGoal - now.getTime()
+			const diff = data.countdownGoal - now.getTime()
-      timerCountdownFirst = false
+			timerCountdownFirst = false
-      document.getElementById("timer").innerHTML = msToTime(diff, data);
+			document.getElementById("timer").innerHTML = msToTime(diff, data);
-      if (diff > 0) {
+			if (diff > 0) {
-        document.getElementById("progBar").style.width = percentage(diff, data.timeAmountInital) + "%";
+				document.getElementById("progBar").style.width = percentage(diff, data.timeAmountInital) + "%";
-      } else {
+			} else {
-        document.getElementById("progBar").style.width = "0%";
+				document.getElementById("progBar").style.width = "0%";
-      }
+			}
 
-      document.getElementById("progBar").style.backgroundColor = findProgessColor(data.colorSegments, diff)
+			document.getElementById("progBar").style.backgroundColor = findProgessColor(data.colorSegments, diff)
-      document.getElementById("testImg").style.display = "none";
+			document.getElementById("testImg").style.display = "none";
-      if (data.enableColoredText) {
+			if (data.enableColoredText) {
-        document.getElementById("timer").style.color = findProgessColor(data.textColors, diff)
+				document.getElementById("timer").style.color = findProgessColor(data.textColors, diff)
-      } else {
+			} else {
-        document.getElementById("timer").style.color = "white"
+				document.getElementById("timer").style.color = "white"
-      }
+			}
-    }
+		}
 
-    if (data.timerRunState) {
+		if (data.timerRunState) {
-      const diff = data.countdownGoal - now.getTime()
+			const diff = data.countdownGoal - now.getTime()
-      document.getElementById("timer").innerHTML = msToTime(diff, data);
+			document.getElementById("timer").innerHTML = msToTime(diff, data);
-      lastTime = msToTime(diff, data);
+			lastTime = msToTime(diff, data);
-      if (diff > 0) {
+			if (diff > 0) {
-        document.getElementById("progBar").style.width = percentage(diff, data.timeAmountInital) + "%";
+				document.getElementById("progBar").style.width = percentage(diff, data.timeAmountInital) + "%";
-      } else {
+			} else {
-        document.getElementById("progBar").style.width = "0%";
+				document.getElementById("progBar").style.width = "0%";
-      }
+			}
 
-      document.getElementById("progBar").style.backgroundColor = findProgessColor(data.colorSegments, diff)
+			document.getElementById("progBar").style.backgroundColor = findProgessColor(data.colorSegments, diff)
-      document.getElementById("testImg").style.display = "none";
+			document.getElementById("testImg").style.display = "none";
-      if (data.enableColoredText) {
+			if (data.enableColoredText) {
-        document.getElementById("timer").style.color = findProgessColor(data.textColors, diff)
+				document.getElementById("timer").style.color = findProgessColor(data.textColors, diff)
-      } else {
+			} else {
-        document.getElementById("timer").style.color = "white"
+				document.getElementById("timer").style.color = "white"
-      }
+			}
 
-    } else {
+		} else {
-      document.getElementById("timer").innerHTML = lastTime
+			document.getElementById("timer").innerHTML = lastTime
-    }
+		}
-  } else if (data.mode == "black") {
+	} else if (data.mode == "black") {
-    timerCountdownFirst = true;
+		timerCountdownFirst = true;
-    document.getElementById("timer").innerHTML = "";
+		document.getElementById("timer").innerHTML = "";
-    document.getElementById("testImg").style.display = "none";
+		document.getElementById("testImg").style.display = "none";
-    document.getElementById("wholeProgBar").style.display = "none";
+		document.getElementById("wholeProgBar").style.display = "none";
-    document.getElementById("clockSec").innerHTML = "";
+		document.getElementById("clockSec").innerHTML = "";
 
-  } else if (data.mode == "test") {
+	} else if (data.mode == "test") {
-    timerCountdownFirst = true;
+		timerCountdownFirst = true;
-    document.getElementById("timer").innerHTML = "";
+		document.getElementById("timer").innerHTML = "";
-    document.getElementById("testImg").style.display = "block";
+		document.getElementById("testImg").style.display = "block";
-    document.getElementById("progBar").style.display = "none";
+		document.getElementById("progBar").style.display = "none";
-    document.getElementById("clockSec").innerHTML = "";
+		document.getElementById("clockSec").innerHTML = "";
-  }
+	}
 }
 
 function httpGet(theUrl) {
-  var xmlHttp = new XMLHttpRequest();
+	var xmlHttp = new XMLHttpRequest();
-  xmlHttp.open("GET", theUrl, true); // false for synchronous request
+	xmlHttp.open("GET", theUrl, true); // false for synchronous request
-  xmlHttp.send(null);
+	xmlHttp.send(null);
-  xmlHttp.onerror = function (e) {
+	xmlHttp.onerror = function (e) {
-    console.log(e);
+		console.log(e);
-  };
+	};
-  return xmlHttp;
+	return xmlHttp;
 }
 
 function getTime() {
-  var date = new Date();
+	var date = new Date();
-  var h = date.getHours(); // 0 - 23
+	var h = date.getHours(); // 0 - 23
-  var m = date.getMinutes(); // 0 - 59
+	var m = date.getMinutes(); // 0 - 59
-  var s = date.getSeconds(); // 0 - 59
+	var s = date.getSeconds(); // 0 - 59
 
-  h = h < 10 ? "0" + h : h;
+	h = h < 10 ? "0" + h : h;
-  m = m < 10 ? "0" + m : m;
+	m = m < 10 ? "0" + m : m;
-  s = s < 10 ? "0" + s : s;
+	s = s < 10 ? "0" + s : s;
 
-  var time = h + ":" + m + ":" + s;
+	var time = h + ":" + m + ":" + s;
-  return time;
+	return time;
 }
 
 
@@ -291,7 +291,7 @@ let temp = new URLSearchParams(window.location.search).get("smaller");
 
 
 if (temp == "true") {
-  var cssURL = '/css/smallerTextMod.css';
+	var cssURL = '/css/smallerTextMod.css';
-  document.head.innerHTML += '<link rel="stylesheet" href="' + cssURL + '"/>'
+	document.head.innerHTML += '<link rel="stylesheet" href="' + cssURL + '"/>'
-  allowFullscreen = false
+	allowFullscreen = false
 }

static/js/timer/timerview.js

@@ -0,0 +1,284 @@
+
+
+// References to the HTML elements
+let warningBox = document.getElementById("warningBanner");
+let timer = document.getElementById("timer");
+let testImage = document.getElementById("testImg");
+let clockSec = document.getElementById("clockSec");
+let timeDiffContainer = document.getElementById("timediff");
+let wholeProgressBar = document.getElementById("wholeProgBar");
+let progressBar = document.getElementById("progBar");
+let overlay = document.getElementById("overlay");
+let overlayText = document.getElementById("text");
+let screensaverText = document.getElementById("moveClock");
+let screensaverClock = document.getElementById("screensaverClock");
+
+// Prepare connection to backend
+let socket = new ReconnectingWebSocket("ws://" + location.hostname + ":" + location.port);
+
+// State variables
+let ackSessionTokenChange = false; // Wether the user has acknowledged the session token mismatch
+let dataFrame = {};
+let timeDiffToServer = 0;
+let sessionToken = ""; // Our current session token
+let defaultToFullscreen = false;
+let allowFullscreen = true; // If the system is allowed to go fullscreen
+
+// Scale down the interface if the smaller parameter is set
+let smallerFlag = new URLSearchParams(window.location.search).get("smaller");
+if (smallerFlag == "true") {
+	var cssURL = '/css/smallerTextMod.css';
+	document.head.innerHTML += '<link rel="stylesheet" href="' + cssURL + '"/>';
+	allowFullscreen = false;
+}
+
+// Handle the screensaver to fit the screen
+setTimeout(handleDVD, 200);
+setTimeout(handleDVD, 400);
+document.body.onresize = handleDVD;
+
+// Handle connection event
+socket.onopen = function (e) {
+	socket.send("new client");
+};
+
+// Handle connection close event 
+socket.onclose = function (event) {
+	warningBox.style.display = "block"; // Show warning banner
+	if (event.wasClean) {
+		console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+	} else {
+		// e.g. server process killed or network down
+		// event.code is usually 1006 in this case
+		console.error('[close] Connection died');
+	}
+};
+
+// Handle incoming data
+socket.onmessage = function (event) {
+	// Parse the incoming data as JSON
+	const inData = JSON.parse(event.data);
+	// Check if the backend has restarted in the background
+	if (inData.sessionToken == sessionToken || sessionToken == "") {
+		dataFrame = JSON.parse(event.data);
+		// Time difference between the client and the server
+		timeDiffToServer = new Date().getTime() - dataFrame.srvTime;
+
+		if(dataFrame.debug) {
+			console.log(dataFrame)
+			timeDiffContainer.innerHTML = timeDiffToServer
+			timeDiffContainer.style.display = "block"
+		} else {
+			timeDiffContainer.style.display = "none"
+		}
+
+		// Process the data
+		handleUpdate();
+	} else {
+		// If the user has not acknowledged the session token mismatch, show a warning
+		if (!ackSessionTokenChange) {
+			ackSessionTokenChange = true;
+			if (confirm("Session token mismatch, reload the page?")) {
+				location.reload();
+			}
+		}
+	}
+};
+
+// Update timer data regularly (every 20ms)
+let updateIntervalReference = setInterval(handleUpdate, 20);
+
+// Helper functions
+
+// Get the current time in a HH:MM:SS format
+function getTime() {
+	var date = new Date();
+	var h = date.getHours(); // 0 - 23
+	var m = date.getMinutes(); // 0 - 59
+	var s = date.getSeconds(); // 0 - 59
+
+	h = h < 10 ? "0" + h : h;
+	m = m < 10 ? "0" + m : m;
+	s = s < 10 ? "0" + s : s;
+
+	var time = h + ":" + m + ":" + s;
+	return time;
+}
+
+function percentage(partialValue, totalValue) {
+	return (100 * partialValue) / totalValue;
+}
+
+function msToTime(s, data) {
+	isSmallerThenZero = false
+	if (s < 0) {
+		isSmallerThenZero = true
+	}
+
+	var ms = s % 1000;
+	s = (s - ms) / 1000;
+	var secs = s % 60;
+	s = (s - secs) / 60;
+	var mins = s % 60;
+	var hrs = (s - mins) / 60;
+	let out = ""
+
+	if (!data.showMilliSeconds) {
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2)
+	} else {
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2) + '.' + ('000' + Math.abs(ms)).slice(-3)
+	}
+
+	if (isSmallerThenZero) {
+		out = "-" + out
+	}
+	return out;
+}
+
+function findProgessColor(colors, value) {
+	const allColors = Object.keys(colors);
+	let resColor = colors["START"]
+	for (let color in allColors) {
+		const currColor = allColors[color]
+		if (value <= parseInt(currColor)) {
+			resColor = colors[String(currColor)]
+			break
+		}
+	}
+	return (resColor)
+}
+
+function handleUpdate() {
+	defaultToFullscreen = dataFrame.defaultFullScreen;
+	switch (dataFrame.mode) {
+		case "timer":
+			// Timer mode
+			timer.style.display = "block";
+			testImage.style.display = "none";
+			screensaverText.style.display = "none";
+
+			if(dataFrame.showTimeOnCountdown) {
+				// Show time on countdown
+				clockSec.innerHTML = getTime();
+				clockSec.style.display = "block";
+			} else {
+				clockSec.style.display = "none";
+			}
+			if(dataFrame.showProgressbar) {
+				// Show progressbar
+				wholeProgressBar.style.display = "block";
+			} else {
+				wholeProgressBar.style.display = "none";
+			}
+			// Calculate the time difference between the goal and the current time
+			const now = new Date();
+			let diff = 0;
+			if(dataFrame.timerRunState) {
+				diff = dataFrame.countdownGoal - now.getTime()
+			} else {
+				diff = (now.getTime() - dataFrame.pauseMoment) + dataFrame.countdownGoal - now.getTime() 
+			}
+			 
+			timer.innerHTML = msToTime(diff, dataFrame);
+
+			// Handle the progressbar
+			if (diff >= 0) {
+				progressBar.style.width = percentage(diff, dataFrame.timeAmountInital) + "%";
+			} else {
+				progressBar.style.width = "0%";
+				if(!dataFrame.enableOverrun) {
+					timer.innerHTML = "00:00:00";
+				}
+			}
+			progressBar.style.backgroundColor = findProgessColor(dataFrame.colorSegments, diff)
+
+			// Handle the text color
+			if (dataFrame.enableColoredText) {
+				timer.style.color = findProgessColor(dataFrame.textColors, diff)
+			} else {
+				timer.style.color = "white"
+			}
+			break;
+		case "clock":
+			// Clock mode
+			timer.innerHTML = getTime();
+			testImage.style.display = "none";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "block";
+			screensaverText.style.display = "none";
+			timer.style.color = "white";
+			break;
+		case "black":
+			// Black screen mode
+			testImage.style.display = "none";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "none";
+			screensaverText.style.display = "none";
+			timer.style.color = "white";
+			break;
+		case "test":
+			// Test image mode
+			testImage.style.display = "block";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "none";
+			screensaverText.style.display = "none";
+			timer.style.color = "white";
+			break;
+		case "screensaver":
+			// Screensaver mode
+			testImage.style.display = "none";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "none";
+			timer.style.color = "white";
+			screensaverText.style.display = "block";
+			screensaverClock.innerHTML = getTime();
+			break;
+	}
+
+	// Handle the message overlay
+	if (dataFrame.showMessage) {
+		overlay.style.display = "block";
+		overlayText.innerHTML = dataFrame.message
+	} else {
+		overlay.style.display = "none";
+	}
+
+	// This will result in the text fading in and out when the message changes
+	if (new Date().getTime() - dataFrame.messageAppearTime < 5000) {
+		if (!overlayText.classList.contains('blink')) {
+			overlayText.classList.add("blink")
+		}
+	} else {
+		if (overlayText.classList.contains('blink')) {
+			overlayText.classList.remove("blink")
+		}
+	}
+}
+
+function handleDVD() {
+	console.info("Recalculating screensaver size")
+	const objHeight = document.body.offsetHeight - screensaverText.offsetHeight;
+	const objWidth = document.body.offsetWidth - screensaverText.offsetWidth;
+	document.documentElement.style.setProperty('--my-end-left', objWidth + "px");
+	document.documentElement.style.setProperty('--my-end-top', objHeight + "px");
+}
+
+function enterFullscreen(element) {
+	if (element.requestFullscreen) {
+		element.requestFullscreen();
+	} else if (element.msRequestFullscreen) {
+		element.msRequestFullscreen();
+	} else if (element.webkitRequestFullscreen) {
+		element.webkitRequestFullscreen();
+	}
+}
+
+function updateFullscreen() {
+	if (defaultToFullscreen && allowFullscreen) {
+		enterFullscreen(document.documentElement)
+	}
+}

templates/newAdminPanel.html

@@ -156,6 +156,9 @@
 
                                 <input type="radio" class="btn-check" name="btnradio" id="btnradio4" autocomplete="off">
                                 <label class="btn btn-outline-primary" for="btnradio4"><%= it.lang.others.test %></label>
+
+				<input type="radio" class="btn-check" name="btnradio" id="btnradio5" autocomplete="off">
+                                <label class="btn btn-outline-primary" for="btnradio5"><%= it.lang.others.screensaver %></label>
                             </div>
                             <br>
                             <br>
@@ -259,6 +262,9 @@
 
                 <label for="progBarShow"><%= it.lang.labels.showProgress %></label>
                 <input type="checkbox" name="progBarShow" id="progBarShow"><br>
+
+		<label for="allowOverrun"><%= it.lang.labels.allowOverrun %></label>
+                <input type="checkbox" name="allowOverrun" id="allowOverrun"><br>
                 <details>
                     <summary><%= it.lang.labels.progbarColors %></summary>
                     <p>

templates/ng-timerview.html

@@ -0,0 +1,64 @@
+<!doctype html>
+
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>openCountdown - Timerpage</title>
+    <meta name="description" content="openCountdown">
+    <meta name="author" content="TheGreydiamond">
+
+    <link rel="stylesheet" href="css/styles.css?v=1.1">
+    
+    <link rel="icon" href="/logo/faviconLogo.svg" type="image/svg+xml">
+</head>
+
+<body onclick="updateFullscreen()" onresize="handleDVD()">
+    <div id="overlay">
+        <div id="text">Message here</div>
+    </div>
+
+    <!-- Collection of warning and errors  -->
+    <noscript>
+	<div class="connectionWarning">
+	    Javascript is disabled. Please enable it to use openCountdown.
+	</div>
+    </noscript>
+
+    <div class="connectionWarning" id="warningBanner" style="display: none;">
+        Connection lost. Trying to reconnect...
+    </div>
+
+    <!-- Color Bar Image -->
+    <img src='SMPTE_Color_Bars.svg' class='testImg' id="testImg" style="display: none;">
+    </img>
+
+    <div class="container">
+        <div class="progWrapper" id="wholeProgBar">
+            <div class="progBar" id="progBar"></div>
+        </div>
+        <div class="timer" id="timer">
+            00:00:00
+        </div>
+        <div class="clockSec" id="clockSec">
+        </div>
+        <div class="clockSec" id="timediff">
+            
+        </div>
+    </div>
+    <div id="moveClock" style="display: none;">
+	<img src="logo/logoProposal-invert.svg"  alt="openCountdown" height="180px" class="moverLogo" >
+	<center><div id="screensaverClock">
+		00:00:00
+	</div>
+</center>
+	
+    </div>
+    <!-- Load scripts -->
+    <script src="js/reconnecting-websocket.min.js"></script>
+    <script src="js/timer/timerview.js"></script>
+</body>
+
+</html>

templates/timerPage.html

@@ -6,12 +6,13 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>openCountdown</title>
+    <title>openCountdown - Timerpage</title>
     <meta name="description" content="openCountdown">
     <meta name="author" content="TheGreydiamond">
 
     <link rel="stylesheet" href="css/styles.css?v=1.1">
     
+    <link rel="icon" href="/logo/faviconLogo.svg" type="image/svg+xml">
 </head>
 
 <body onclick="updateFullscreen()">