multiple changes

- If the session is no longer valid, the site autoredirects to the login page
- The status interval and online timeout are now customisable
- Fixed issue causing page to be slightly larger than viewport
- FIxed issue where authentication was required even with no password

Author: jbritain

README.md

@@ -25,7 +25,9 @@ services:
       - IP=192.168.1.123 # the target's IP address
       - PORT=8080 # port to run on
       - PASSWORD=pleasechangeme # password required to access yoink, leave blank if you do not need authentication
-    # - TOKEN_KEY=7%ocK!w"GS1au4EKg;o9 # ONLY SET THIS IF YOU DO NOT WANT RESTARTING YOINK TO INVALIDATE SESSION TOKENS. I RECOMMEND YOU LEAVE IT BLANK
+      - STATUS_INTERVAL=5000 # how often the frontend pings to request server status, in ms
+      - ONLINE_TIMOUT=30000 # how long before it is decided the server did not respond to the WOL ping. Has no actual effect, only means the status returns to 'offline' sooner
+    # - TOKEN_KEY=7%ocK!w"GS1au4EKg;o9 # ONLY SET THIS IF YOU DO NOT WANT RESTARTING YOINK TO INVALIDATE SESSION TOKENS. I RECOMMEND YOU DO NOT SET THIS VALUE. IF YOU DO SET IT, DO NOT SHARE IT WITH ANYONE AS IT CAN BE USED TO REVERSE ENGINEER THE PASSWORD
 ```
 
 ### With Node.js

docker-compose.yml

@@ -9,4 +9,6 @@ services:
       - MAC=00:11:22:33:44:55 # the target's MAC address
       - IP=192.168.1.123 # the target's IP address
       - PORT=8080 # port to run on
-      - PASSWORD=pleasechangeme # password, leave blank for no authentication
+      - PASSWORD=pleasechangeme # password, leave blank for no authentication
+      - STATUS_INTERVAL=5000 # how often the frontend pings to request server status, in ms
+      - ONLINE_TIMOUT=30000 # how long before it is decided the server did not respond to the WOL ping. Has no actual effect, only means the status returns to 'offline' sooner

src/index.js

@@ -28,6 +28,7 @@ function generateToken(){ // hash password into a token
 }
 
 function checkAuth(token){ // checks validity of token
+    if (PASSWORD == "") return true;
     if (typeof token !== "string" || token === "") return false;
 
     try {
@@ -47,6 +48,8 @@ const IP = process.env.IP;
 const NAME = process.env.NAME;
 const PASSWORD = process.env.PASSWORD || "";
 const TOKEN_KEY = process.env.TOKEN_KEY || crypto.randomBytes(64).toString('hex');
+const STATUS_INTERVAL = process.env.status_INTERVAL || 1000;
+const ONLINE_TIMEOUT = process.env.ONLINE_TIMEOUT || 20000
 
 assert(MAC);
 assert(IP);
@@ -70,7 +73,9 @@ app.get("/", async (req, res) => {
         } else {
             res.render("index.njk", {
                 name: NAME,
-                message: message
+                message: message,
+                statusInterval: STATUS_INTERVAL,
+                onlineTimeout: ONLINE_TIMEOUT
             })
         }        
     } catch(e) {

src/public/main.css

@@ -71,6 +71,7 @@ body {
 footer {
     position: absolute;
     bottom: 0px;
+    left: 0px;
     text-align: center;
     width: 100%;
     padding: 16px;

src/public/main.js

@@ -4,10 +4,13 @@ const indicator = document.getElementById("indicator");
 const favicon = document.getElementById("favicon");
 let serverStatus = "Waiting for response...";
 let awaitingOnline = false;
-const onlineTimeout = 20000; // time in ms to wait before deciding wol ping didn't work
 
 var wakeFailed;
 
+function redirectAuth(){
+    window.location.href = "/auth";
+}
+
 function yoink(){
     fetch(`${window.location.href}yoink`, {
         method: 'POST'
@@ -22,6 +25,8 @@ function yoink(){
                 awaitingOnline = false;
                 getStatus();
             }, onlineTimeout)
+        } else if (res.status === 401){
+            redirectAuth()
         }
     })
 }
@@ -30,7 +35,12 @@ function getStatus(){ // check if target machine is online
     fetch(`${window.location.href}status`, {
         method: 'GET'
     })
-    .then(res => res.text())
+    .then(res => {
+        if (res.status == 401) {
+            redirectAuth();
+        }
+        res.text()
+    })
     .then(online => {
 
         if (awaitingOnline && serverOnline){
@@ -49,8 +59,8 @@ function getStatus(){ // check if target machine is online
 
 
         button.disabled = (serverOnline || awaitingOnline);
+        setTimeout(getStatus, statusInterval); // run function again after delay
     });
 }
 
 getStatus();
-setInterval(getStatus, 1000);

src/views/index.njk

@@ -8,5 +8,9 @@
         <button id="yoinkButton" onclick="yoink()">{{message}}</button>
     </div>
 
+    <script>
+        const statusInterval = {{statusInterval}};
+        const onlineTimeout = {{onlineTimeout}};
+    </script>
     <script src="/main.js"></script>
 {% endblock %}