cleanup code

README.md

@@ -5,7 +5,7 @@ Configuration is done using environment variables.
 - `WOLBODGE_ADDRESS`: The address that WoLBodge should listen on, defaults to `:3000`.
 - `WOLBODGE_STORAGE_TYPE`: Storage type to pick, defaults to `ram`.
   - `ram`: Sessions are stored in RAM.
-- `WOLBODGE_DEVICE_TYPE`: Device type to pick, defaults to `test`:
+- `WOLBODGE_DEVICE_TYPE`: Device type to pick, defaults to `test`.
   - `test`: A dummy device, used for testing.
   - `libgpiod`: Uses the libgpiod commands under the hood. The gpio chip is specified using `WOLBODGE_DEVICE_GPIOCHIP`, the power button pin using `WOLBODGE_DEVICE_POWER_BUTTON_PIN` and the power LED pin using `WOLBODGE_DEVICE_POWER_LED_PIN`.
 
@@ -36,3 +36,7 @@ if [ $exit_code != 0 ]; then
     exit 1
 fi
 ```
+
+## TODOs
+- Alerts when a session has existed for a long time
+- Command device that can use commands to turn on/off a device

cron.go

@@ -1,66 +0,0 @@
-package main
-
-import (
-	"log"
-	"time"
-
-	"git.1e99.eu/1e99/wolbodge/devices"
-	"git.1e99.eu/1e99/wolbodge/sessions"
-)
-
-func DeviceCheck(logger *log.Logger, device devices.Device, wantStatus func() (bool, error), exit <-chan bool) {
-	for {
-		select {
-		case <-exit:
-			break
-		default:
-			status, err := device.Status()
-			if err != nil {
-				logger.Printf("Failed to fetch device status, waiting 1 minute until next attempt: %s", err)
-				time.Sleep(1 * time.Minute)
-				continue
-			}
-
-			want, err := wantStatus()
-			if err != nil {
-				logger.Printf("Failed to fetch want status, waiting 1 minute until next attempt: %s", err)
-				time.Sleep(1 * time.Minute)
-				continue
-			}
-
-			if status == want {
-				// Don't lock up our single-threaded session storage too much
-				time.Sleep(2 * time.Second)
-				continue
-			}
-
-			err = device.PushPowerButton()
-			if err != nil {
-				logger.Printf("Failed to push power button, waiting 2 minutes until next attempt: %s", err)
-				// Cooldown to not overwhelm the device with start/stop requests
-				time.Sleep(2 * time.Minute)
-				return
-			}
-
-			logger.Printf("Pushed power button")
-			time.Sleep(2 * time.Minute)
-		}
-	}
-}
-
-func PruneStorage(logger *log.Logger, storage sessions.Storage, interval time.Duration, exit <-chan bool) {
-	for {
-		select {
-		case <-exit:
-			break
-		default:
-			/*pruned, err := storage.PruneTickets()
-			if err != nil {
-				logger.Printf("Failed to prune tickets: %s", err)
-			}
-
-			logger.Printf("Pruned %d tickets", pruned)
-			time.Sleep(interval)*/
-		}
-	}
-}

devices/devices.go

@@ -1,6 +1,51 @@
 package devices
 
+import (
+	"log"
+	"time"
+)
+
 type Device interface {
 	Status() (bool, error)
 	PushPowerButton() error
 }
+
+func KeepDeviceInSync(logger *log.Logger, device Device, wantStatus func() (bool, error), exit <-chan bool) {
+	for {
+		select {
+		case <-exit:
+			break
+		default:
+			status, err := device.Status()
+			if err != nil {
+				logger.Printf("Failed to fetch device status, waiting 1 minute until next attempt: %s", err)
+				time.Sleep(1 * time.Minute)
+				continue
+			}
+
+			want, err := wantStatus()
+			if err != nil {
+				logger.Printf("Failed to fetch want status, waiting 1 minute until next attempt: %s", err)
+				time.Sleep(1 * time.Minute)
+				continue
+			}
+
+			if status == want {
+				// Don't lock up our single-threaded session storage too much
+				time.Sleep(2 * time.Second)
+				continue
+			}
+
+			err = device.PushPowerButton()
+			if err != nil {
+				logger.Printf("Failed to push power button, waiting 2 minutes until next attempt: %s", err)
+				// Cooldown to not overwhelm the device with start/stop requests
+				time.Sleep(2 * time.Minute)
+				return
+			}
+
+			logger.Printf("Pushed power button")
+			time.Sleep(2 * time.Minute)
+		}
+	}
+}

devices/libgpiod.go

@@ -8,6 +8,7 @@ import (
 )
 
 // TODO: Do not use subprocesses here, they are unreliable, provide hidden dependencies and are a common target for vulnerabilities.
+// TODO: Improve pulldown, pullup
 func NewLibgpiod(gpiochip string, powerButtonPin int, powerLEDPin int) Device {
 	device := &libgpiod{
 		gpiochip:       gpiochip,

main.go

@@ -5,8 +5,8 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"time"
 
+	"git.1e99.eu/1e99/wolbodge/devices"
 	"git.1e99.eu/1e99/wolbodge/routes"
 
 	_ "embed"
@@ -46,8 +46,7 @@ func Run() error {
 	mux.Handle("DELETE /api/session/{session_id}", routes.APIEndSession(storage))
 
 	exit := make(chan bool)
-	go PruneStorage(logger, storage, 10*time.Second, exit)
+	go devices.KeepDeviceInSync(logger, device, storage.HasSessions, exit)
-	go DeviceCheck(logger, device, storage.HasSessions, exit)
 
 	logger.Printf("Listening on %s", address)
 	err = http.ListenAndServe(address, mux)