clock endpoint can cause a refresh on version mismatch

damongolding · Sep 4, 2024 · a235d2c · a235d2c
1 parent 384bb2a
commit a235d2c
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 32 deletions.
diff --git a/public/assets/js/kiosk.js b/public/assets/js/kiosk.js
@@ -1,4 +1,6 @@
-{
+"use strict";
+
+(() => {
   const kioskData = JSON.parse(
     document.getElementById("kiosk-data").textContent,
   );
@@ -100,4 +102,4 @@
       startPolling();
     }
   });
-}
+})();
diff --git a/routes/clock.go b/routes/clock.go
@@ -19,11 +19,18 @@ func Clock(baseConfig *config.Config) echo.HandlerFunc {
 			fmt.Println()
 		}
 
+		kioskVersionHeader := c.Request().Header.Get("kiosk-version")
 		requestId := utils.ColorizeRequestId(c.Response().Header().Get(echo.HeaderXRequestID))
 
 		// create a copy of the global config to use with this request
 		requestConfig := *baseConfig
 
+		// If kiosk version on client and server do not match refresh client.
+		if kioskVersionHeader != "" && KioskVersion != kioskVersionHeader {
+			c.Response().Header().Set("HX-Refresh", "true")
+			return c.String(http.StatusTemporaryRedirect, "")
+		}
+
 		err := requestConfig.ConfigWithOverrides(c)
 		if err != nil {
 			log.Error("err overriding config", "err", err)

diff --git a/views/home.templ b/views/home.templ
@@ -154,7 +154,7 @@ templ paramForm(queries url.Values) {
 	</form>
 }
 
-templ clock(queries url.Values) {
+templ clock(queries url.Values, kioskVersion string) {
 	<div
 		id="clock"
 		hx-get="/clock"
@@ -163,6 +163,7 @@ templ clock(queries url.Values) {
 		}
 		hx-trigger="load, every 13s"
 		hx-swap="innerHTML"
+		hx-headers={ fmt.Sprintf(`{"kiosk-version": "%s"}`, kioskVersion) }
 	></div>
 }
 
@@ -191,7 +192,7 @@ templ Home(data PageData) {
 	<html lang="en">
 		<head>
 			<meta charset="UTF-8"/>
-			<meta name="apple-mobile-web-app-capable" content="yes">
+			<meta name="apple-mobile-web-app-capable" content="yes"/>
 			<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 			<meta name="version" content={ data.KioskVersion }/>
 			<title>Immich Kiosk</title>
@@ -235,7 +236,7 @@ templ Home(data PageData) {
 				@progressBar(data.Config.Refresh)
 			}
 			if !data.Config.DisableUi && data.Config.ShowTime {
-				@clock(data.Queries)
+				@clock(data.Queries, data.KioskVersion)
 			}
 			@menu()
 			@paramForm(data.Queries)

diff --git a/views/home_templ.go b/views/home_templ.go