Merge pull request #419 from damongolding/feature/immichframe-sleep

Feature/immichframe-dim-screen

Author: damongolding

frontend/src/ts/immichframe.ts

@@ -0,0 +1,66 @@
+import { triggerNewAsset } from "./polling";
+
+class ImmichFrame {
+  private static instance: ImmichFrame | null = null;
+
+  private readonly SCREENSAVER_DELAY_MS = 4 * 1000;
+
+  private readonly PORT = 53287 as const;
+  private readonly BASE_URL = `http://localhost:${this.PORT}`;
+
+  private readonly endpoints = {
+    DIM: "dim",
+    UNDIM: "undim",
+    NEXT: "next",
+    PREVIOUS: "previous",
+    PAUSE: "pause",
+    SETTINGS: "settings",
+  };
+
+  inSleepMode: boolean = false;
+
+  public static getInstance(): ImmichFrame {
+    if (!ImmichFrame.instance) {
+      ImmichFrame.instance = new ImmichFrame();
+    }
+    return ImmichFrame.instance;
+  }
+
+  public dimScreen(): void {
+    fetch(`${this.BASE_URL}/${this.endpoints.DIM}`).catch((error) =>
+      console.error("Error dimming ImmichFrame screen:", error),
+    );
+  }
+
+  public undimScreen(): void {
+    fetch(`${this.BASE_URL}/${this.endpoints.UNDIM}`).catch((error) =>
+      console.error("Error undimming ImmichFrame screen:", error),
+    );
+  }
+
+  public setScreensaverState(enable: boolean): void {
+    try {
+      if (enable) {
+        if (this.inSleepMode) return;
+
+        this.inSleepMode = true;
+
+        setTimeout(() => this.dimScreen(), this.SCREENSAVER_DELAY_MS);
+      } else {
+        if (!this.inSleepMode) return;
+
+        this.undimScreen();
+
+        this.inSleepMode = false;
+
+        triggerNewAsset();
+      }
+    } catch (error) {
+      console.error("Error in ImmichFrame screen operations:", error);
+    }
+  }
+}
+
+const immichFrame = ImmichFrame.getInstance();
+
+export default immichFrame;

frontend/src/ts/sleep.ts

@@ -1,4 +1,5 @@
 import fullyKiosk from "./fullykiosk";
+import immichFrame from "./immichframe";
 
 /**
  * Toggles UI sleep mode and optionally controls the device screensaver via the Fully Kiosk API.
@@ -15,7 +16,10 @@ function sleepMode(turnOn: boolean, screensaver: boolean): void {
     document.body.classList.remove("sleep");
   }
 
-  if (screensaver) fullyKiosk.setScreensaverState(turnOn);
+  if (screensaver) {
+    fullyKiosk.setScreensaverState(turnOn);
+    immichFrame.setScreensaverState(turnOn);
+  }
 }
 
 export { sleepMode };

internal/templates/partials/redirects.templ

@@ -5,16 +5,27 @@ import (
 	"net/url"
 )
 
+func checkAuthParam(queries url.Values) (bool, string, string) {
+	if queries.Has("password") {
+		return true, queries.Get("password"), "password"
+	}
+	if queries.Has("authsecret") {
+		return true, queries.Get("authsecret"), "authsecret"
+	}
+	return false, "", ""
+}
+
 templ Redirects(redirects []config.Redirect, queries url.Values) {
+	{{ hasPassword, password, paramType := checkAuthParam(queries) }}
 	<div id="redirects-container">
 		<div class="redirects">
 			<div class="redirects--shadow">
-				if queries.Has("password") {
-					<a href={ templ.SafeURL("/?password=" + queries.Get("password")) }>Home</a>
+				if hasPassword {
+					<a href={ templ.SafeURL("/?" + paramType + "=" + password) }>Home</a>
 				}
 				for _ , redirect := range redirects {
-					if queries.Has("password") {
-						<a href={ templ.SafeURL(redirect.Name + "?password=" + queries.Get("password")) }>{ redirect.Name }</a>
+					if hasPassword {
+						<a href={ templ.SafeURL(redirect.Name + "?" + paramType + "=" + password) }>{ redirect.Name }</a>
 					} else {
 						<a href={ templ.SafeURL(redirect.Name) }>{ redirect.Name }</a>
 					}

main.go

@@ -121,7 +121,7 @@ func main() {
 				// skip auth for assets
 				return strings.HasPrefix(c.Request().URL.String(), "/assets")
 			},
-			KeyLookup: "query:password,form:password",
+			KeyLookup: "query:authsecret,form:authsecret,query:password,form:password",
 			Validator: func(queryPassword string, _ echo.Context) (bool, error) {
 				return queryPassword == baseConfig.Kiosk.Password, nil
 			},