feat: port 3030, add REFRESH_INTERVAL

feat: change default port to 3030
feat: port 3030, add REFRESH_INTERVAL config
2026-05-19 16:01:48 +10:00 · 2026-05-19 16:01:14 +10:00 · 2026-05-19 16:01:01 +10:00 · 2026-05-19 15:59:43 +10:00 · 2026-05-19 15:57:35 +10:00 · 2026-05-19 15:56:43 +10:00
7 changed files with 214 additions and 385 deletions
@@ -10,6 +10,7 @@ TRANSITION_DURATION=2
 IMAGE_FIT=contain
 SHUFFLE=true
 BACKGROUND_BLUR=true
+REFRESH_INTERVAL=300

 # Overlays
 SHOW_CLOCK=true
@@ -17,9 +18,9 @@ SHOW_DATE=true
 SHOW_EXIF=true
 SHOW_PROGRESS=true

-# Auto-start (optional)
+# Auto-start (optional — or use URL params instead)
 # ALBUM_ID=
 # SHOW_FAVORITES_ONLY=false

 # Server
-PORT=3000
+PORT=3030
@@ -11,10 +11,10 @@ RUN npm install --production && npm cache clean --force
 COPY server.js ./
 COPY public/ ./public/

-EXPOSE 3000
+EXPOSE 3030

 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
-  CMD wget -qO- http://localhost:3000/api/config || exit 1
+  CMD wget -qO- http://localhost:3030/api/config || exit 1

 RUN addgroup -g 1001 -S appgroup && \
    adduser -S appuser -u 1001 -G appgroup
@@ -6,26 +6,26 @@ services:
    container_name: frambe
    restart: unless-stopped
    ports:
-      - "3000:3000"
+      - "3030:3030"
    environment:
-      # REQUIRED: Your Immich server URL (no trailing slash)
+      # REQUIRED
      - IMMICH_URL=http://your-immich-server:2283
-      # REQUIRED: Your Immich API key
      - IMMICH_API_KEY=your-api-key-here

-      # OPTIONAL: Slideshow settings
-      - SLIDESHOW_INTERVAL=30        # Seconds between photos
-      - TRANSITION_DURATION=2         # Crossfade duration in seconds
-      - IMAGE_FIT=contain             # 'contain' or 'cover'
-      - SHUFFLE=true                  # Randomise photo order
-      - BACKGROUND_BLUR=true          # Blurred background behind photos
+      # Slideshow
+      - SLIDESHOW_INTERVAL=30
+      - TRANSITION_DURATION=2
+      - IMAGE_FIT=contain
+      - SHUFFLE=true
+      - BACKGROUND_BLUR=true
+      - REFRESH_INTERVAL=300        # Seconds between album/person refresh checks

-      # OPTIONAL: Overlay settings
-      - SHOW_CLOCK=true               # Show time overlay
-      - SHOW_DATE=true                # Show date overlay
-      - SHOW_EXIF=true                # Show photo location/camera info
-      - SHOW_PROGRESS=true            # Show progress bar
+      # Overlays
+      - SHOW_CLOCK=true
+      - SHOW_DATE=true
+      - SHOW_EXIF=true
+      - SHOW_PROGRESS=true

-      # OPTIONAL: Auto-start with specific album or favorites
-      # - ALBUM_ID=                   # Auto-start with this album UUID
-      # - SHOW_FAVORITES_ONLY=false   # Auto-start showing only favorites
+      # Auto-start (optional — or use URL params instead)
+      # - ALBUM_ID=
+      # - SHOW_FAVORITES_ONLY=false
@@ -1,6 +1,6 @@
 {
  "name": "frambe",
-  "version": "1.1.0",
+  "version": "1.2.0",
  "description": "Frambe — a lightweight digital photo frame web app for Immich",
  "main": "server.js",
  "scripts": {
@@ -6,43 +6,37 @@
  <meta name="apple-mobile-web-app-capable" content="yes">
  <meta name="apple-mobile-web-app-status-bar-style" content="black">
  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="theme-color" content="#0f0f1a">
  <title>Frambe</title>
+  <link rel="icon" type="image/png" sizes="128x128" href="/img/icon.png">
+  <link rel="apple-touch-icon" href="/apple-touch-icon.png">
  <link rel="stylesheet" href="/css/style.css">
 </head>
 <body>
-  <!-- Setup Screen -->
  <div id="setup-screen" class="screen">
    <div class="setup-container">
      <div class="setup-header">
-        <h1>🖼️ Frambe</h1>
+        <img src="/img/icon.png" alt="Frambe" class="setup-logo">
+        <h1>Frambe</h1>
        <p class="subtitle" id="connection-status">Connecting to Immich…</p>
      </div>
-
      <div id="setup-content" class="setup-content">
-        <!-- Album Selection -->
        <div class="section">
          <h2>Select Photo Source</h2>
          <div class="source-buttons">
            <button id="btn-all-photos" class="source-btn" onclick="selectSource('random')">
-              <span class="source-icon">🎲</span>
-              <span>Random Photos</span>
+              <span class="source-icon">🎲</span><span>Random Photos</span>
            </button>
            <button id="btn-favorites" class="source-btn" onclick="selectSource('favorites')">
-              <span class="source-icon">⭐</span>
-              <span>Favorites</span>
+              <span class="source-icon">⭐</span><span>Favorites</span>
            </button>
          </div>
          <div id="albums-list" class="albums-list">
            <p class="loading-text">Loading albums…</p>
          </div>
        </div>
-
-        <!-- Start Button -->
-        <button id="btn-start" class="start-btn" disabled onclick="startSlideshow()">
-          ▶ Start Slideshow
-        </button>
+        <button id="btn-start" class="start-btn" disabled onclick="startSlideshow()">▶ Start Slideshow</button>
      </div>
-
      <div id="setup-error" class="setup-error" style="display:none">
        <p>⚠️ Cannot connect to Immich</p>
        <p class="error-detail" id="error-detail"></p>
@@ -51,16 +45,10 @@
    </div>
  </div>

-  <!-- Slideshow Screen -->
  <div id="slideshow-screen" class="screen" style="display:none">
-    <!-- Background blur layer -->
    <div id="bg-blur" class="bg-blur"></div>
-
-    <!-- Photo layers (double-buffered for crossfade) -->
    <div id="photo-layer-a" class="photo-layer active"></div>
    <div id="photo-layer-b" class="photo-layer"></div>
-
-    <!-- Overlay: Clock & Info -->
    <div id="overlay" class="overlay">
      <div class="overlay-top-right">
        <div id="clock" class="clock"></div>
@@ -68,21 +56,14 @@
      </div>
      <div class="overlay-bottom">
        <div id="exif-info" class="exif-info"></div>
-        <div id="progress-bar" class="progress-bar">
-          <div id="progress-fill" class="progress-fill"></div>
-        </div>
+        <div id="progress-bar" class="progress-bar"><div id="progress-fill" class="progress-fill"></div></div>
      </div>
    </div>
-
-    <!-- Touch/Click controls (invisible) -->
    <div class="touch-zone touch-left" onclick="prevPhoto()"></div>
    <div class="touch-zone touch-center" onclick="toggleOverlay()"></div>
    <div class="touch-zone touch-right" onclick="nextPhoto()"></div>
-
-    <!-- Settings button (hidden until overlay shown) -->
    <button id="btn-settings" class="settings-btn" onclick="exitSlideshow()">✕</button>
  </div>
-
  <script src="/js/app.js"></script>
 </body>
 </html>
@@ -1,56 +1,44 @@
 // === Frambe - Frontend Application ===
 (function () {
  'use strict';
+  var config = {}, assets = [], currentIndex = -1, activeLayer = 'a', slideshowTimer = null;
+  var overlayVisible = true, overlayTimeout = null, selectedSource = null, selectedAlbumId = null;
+  var selectedPersonId = null, isRunning = false, refreshTimer = null, urlDriven = false;

-  // --- State ---
-  var config = {};
-  var assets = [];
-  var currentIndex = -1;
-  var activeLayer = 'a';
-  var slideshowTimer = null;
-  var progressTimer = null;
-  var progressStart = 0;
-  var overlayVisible = true;
-  var overlayTimeout = null;
-  var selectedSource = null;
-  var selectedAlbumId = null;
-  var isRunning = false;
-  var preloadedImages = {};
+  var $setupScreen = document.getElementById('setup-screen'), $slideshowScreen = document.getElementById('slideshow-screen');
+  var $connectionStatus = document.getElementById('connection-status'), $setupContent = document.getElementById('setup-content');
+  var $setupError = document.getElementById('setup-error'), $errorDetail = document.getElementById('error-detail');
+  var $albumsList = document.getElementById('albums-list'), $btnStart = document.getElementById('btn-start');
+  var $layerA = document.getElementById('photo-layer-a'), $layerB = document.getElementById('photo-layer-b');
+  var $bgBlur = document.getElementById('bg-blur'), $clock = document.getElementById('clock');
+  var $dateDisplay = document.getElementById('date-display'), $exifInfo = document.getElementById('exif-info');
+  var $progressFill = document.getElementById('progress-fill'), $overlay = document.getElementById('overlay');
+  var $btnSettings = document.getElementById('btn-settings'), $progressBar = document.getElementById('progress-bar');

-  // --- DOM Elements ---
-  var $setupScreen = document.getElementById('setup-screen');
-  var $slideshowScreen = document.getElementById('slideshow-screen');
-  var $connectionStatus = document.getElementById('connection-status');
-  var $setupContent = document.getElementById('setup-content');
-  var $setupError = document.getElementById('setup-error');
-  var $errorDetail = document.getElementById('error-detail');
-  var $albumsList = document.getElementById('albums-list');
-  var $btnStart = document.getElementById('btn-start');
-  var $layerA = document.getElementById('photo-layer-a');
-  var $layerB = document.getElementById('photo-layer-b');
-  var $bgBlur = document.getElementById('bg-blur');
-  var $clock = document.getElementById('clock');
-  var $dateDisplay = document.getElementById('date-display');
-  var $exifInfo = document.getElementById('exif-info');
-  var $progressFill = document.getElementById('progress-fill');
-  var $overlay = document.getElementById('overlay');
-  var $btnSettings = document.getElementById('btn-settings');
-  var $progressBar = document.getElementById('progress-bar');
+  function getUrlParams() {
+    var p = {}, s = window.location.search.substring(1); if (!s) return p;
+    var pairs = s.split('&');
+    for (var i = 0; i < pairs.length; i++) { var kv = pairs[i].split('='); p[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1] || ''); }
+    return p;
+  }

  async function init() {
    document.body.classList.add('setup-mode');
    try {
-      var configRes = await fetch('/api/config');
-      config = await configRes.json();
+      config = await (await fetch('/api/config')).json();
      if (!config.connected) { showError('API key not configured. Set IMMICH_API_KEY in your environment.'); return; }
-      var serverRes = await fetch('/api/server-info');
-      var serverInfo = await serverRes.json();
-      if (!serverInfo.ok) { showError('Cannot reach Immich server: ' + serverInfo.error); return; }
-      $connectionStatus.textContent = 'Connected to Immich v' + serverInfo.version.major + '.' + serverInfo.version.minor + '.' + serverInfo.version.patch;
+      var si = await (await fetch('/api/server-info')).json();
+      if (!si.ok) { showError('Cannot reach Immich server: ' + si.error); return; }
+      $connectionStatus.textContent = 'Connected to Immich v' + si.version.major + '.' + si.version.minor + '.' + si.version.patch;
      $connectionStatus.classList.add('connected');
-      await loadAlbums();
+      var params = getUrlParams();
+      if (params.album) { urlDriven = true; selectedSource = 'album'; selectedAlbumId = params.album; $btnStart.disabled = false; startSlideshow(); return; }
+      if (params.person) { urlDriven = true; selectedSource = 'person'; selectedPersonId = params.person; $btnStart.disabled = false; startSlideshow(); return; }
+      if (params.favorites === '' || params.favorites === 'true' || params.favorites === '1') { urlDriven = true; selectedSource = 'favorites'; $btnStart.disabled = false; startSlideshow(); return; }
+      if (params.random === '' || params.random === 'true' || params.random === '1') { urlDriven = true; selectedSource = 'random'; $btnStart.disabled = false; startSlideshow(); return; }
      if (config.albumId) { selectedSource = 'album'; selectedAlbumId = config.albumId; $btnStart.disabled = false; startSlideshow(); return; }
      if (config.showFavoritesOnly) { selectedSource = 'favorites'; $btnStart.disabled = false; startSlideshow(); return; }
+      await loadAlbums();
    } catch (err) { showError('Failed to initialize: ' + err.message); }
  }

@@ -58,180 +46,138 @@

  async function loadAlbums() {
    try {
-      var res = await fetch('/api/albums');
-      var albums = await res.json();
+      var albums = await (await fetch('/api/albums')).json();
      if (!albums.length) { $albumsList.innerHTML = '<p class="loading-text">No albums found</p>'; return; }
      var html = '';
      for (var i = 0; i < albums.length; i++) {
-        var a = albums[i];
-        var thumbUrl = a.albumThumbnailAssetId ? '/api/assets/' + a.albumThumbnailAssetId + '/thumbnail?size=thumbnail' : '';
+        var a = albums[i], thu = a.albumThumbnailAssetId ? '/api/assets/' + a.albumThumbnailAssetId + '/thumbnail?size=thumbnail' : '';
        html += '<div class="album-item" data-id="' + a.id + '" onclick="selectAlbum(\'' + a.id + '\', this)">';
-        html += thumbUrl ? '<img class="album-thumb" src="' + thumbUrl + '" alt="" loading="lazy">' : '<div class="album-thumb" style="display:flex;align-items:center;justify-content:center;font-size:1.2rem;">📁</div>';
+        html += thu ? '<img class="album-thumb" src="' + thu + '" alt="" loading="lazy">' : '<div class="album-thumb" style="display:flex;align-items:center;justify-content:center;font-size:1.2rem">📁</div>';
        html += '<div class="album-info"><div class="album-name">' + escapeHtml(a.albumName) + '</div><div class="album-count">' + a.assetCount + ' photos</div></div></div>';
      }
      $albumsList.innerHTML = html;
-    } catch (err) { $albumsList.innerHTML = '<p class="loading-text">Failed to load albums</p>'; }
+    } catch (e) { $albumsList.innerHTML = '<p class="loading-text">Failed to load albums</p>'; }
  }

-  window.selectSource = function (source) {
-    selectedSource = source; selectedAlbumId = null;
-    document.getElementById('btn-all-photos').classList.toggle('selected', source === 'random');
-    document.getElementById('btn-favorites').classList.toggle('selected', source === 'favorites');
-    var albumItems = document.querySelectorAll('.album-item');
-    for (var i = 0; i < albumItems.length; i++) albumItems[i].classList.remove('selected');
+  window.selectSource = function (src) {
+    selectedSource = src; selectedAlbumId = null; selectedPersonId = null;
+    document.getElementById('btn-all-photos').classList.toggle('selected', src === 'random');
+    document.getElementById('btn-favorites').classList.toggle('selected', src === 'favorites');
+    var items = document.querySelectorAll('.album-item');
+    for (var i = 0; i < items.length; i++) items[i].classList.remove('selected');
    $btnStart.disabled = false;
  };
-
-  window.selectAlbum = function (albumId, el) {
-    selectedSource = 'album'; selectedAlbumId = albumId;
+  window.selectAlbum = function (id, el) {
+    selectedSource = 'album'; selectedAlbumId = id; selectedPersonId = null;
    document.getElementById('btn-all-photos').classList.remove('selected');
    document.getElementById('btn-favorites').classList.remove('selected');
-    var albumItems = document.querySelectorAll('.album-item');
-    for (var i = 0; i < albumItems.length; i++) albumItems[i].classList.remove('selected');
-    el.classList.add('selected');
-    $btnStart.disabled = false;
+    var items = document.querySelectorAll('.album-item');
+    for (var i = 0; i < items.length; i++) items[i].classList.remove('selected');
+    el.classList.add('selected'); $btnStart.disabled = false;
  };

  async function loadAssets() {
-    var res;
-    if (selectedSource === 'album' && selectedAlbumId) { res = await fetch('/api/albums/' + selectedAlbumId); var album = await res.json(); assets = album.assets || []; }
-    else if (selectedSource === 'favorites') { res = await fetch('/api/assets/favorites'); assets = await res.json(); }
-    else { res = await fetch('/api/assets/random?count=100'); assets = await res.json(); }
+    if (selectedSource === 'album' && selectedAlbumId) { var al = await (await fetch('/api/albums/' + selectedAlbumId)).json(); assets = al.assets || []; }
+    else if (selectedSource === 'person' && selectedPersonId) { assets = await (await fetch('/api/people/' + selectedPersonId)).json(); }
+    else if (selectedSource === 'favorites') { assets = await (await fetch('/api/assets/favorites')).json(); }
+    else { assets = await (await fetch('/api/assets/random?count=100')).json(); }
    if (config.shuffle) shuffleArray(assets);
  }

+  function startRefreshTimer() {
+    if (refreshTimer) clearInterval(refreshTimer);
+    refreshTimer = setInterval(async function () {
+      try {
+        var oldIds = {}; for (var i = 0; i < assets.length; i++) oldIds[assets[i].id] = true;
+        var nw, r;
+        if (selectedSource === 'album' && selectedAlbumId) { r = await (await fetch('/api/albums/' + selectedAlbumId)).json(); nw = r.assets || []; }
+        else if (selectedSource === 'person' && selectedPersonId) { nw = await (await fetch('/api/people/' + selectedPersonId)).json(); }
+        else if (selectedSource === 'favorites') { nw = await (await fetch('/api/assets/favorites')).json(); }
+        else return;
+        var added = 0;
+        for (var j = 0; j < nw.length; j++) { if (!oldIds[nw[j].id]) { assets.push(nw[j]); added++; } }
+        if (added > 0) console.log('Frambe: added ' + added + ' new photo(s)');
+      } catch (e) { console.warn('Frambe: refresh failed', e.message); }
+    }, (config.refreshInterval || 300) * 1000);
+  }
+
  window.startSlideshow = async function () {
    if (!selectedSource) return;
-    $btnStart.disabled = true;
-    $btnStart.innerHTML = '<span class="spinner"></span> Loading…';
+    $btnStart.disabled = true; $btnStart.innerHTML = '<span class="spinner"></span> Loading…';
    try {
      await loadAssets();
      if (!assets.length) { $btnStart.textContent = 'No photos found'; setTimeout(function () { $btnStart.textContent = '▶ Start Slideshow'; $btnStart.disabled = false; }, 2000); return; }
      $setupScreen.style.display = 'none'; $slideshowScreen.style.display = 'block';
      document.body.classList.remove('setup-mode'); isRunning = true;
-      var transMs = (config.transitionDuration || 2) * 1000;
-      $layerA.style.transition = 'opacity ' + transMs + 'ms ease';
-      $layerB.style.transition = 'opacity ' + transMs + 'ms ease';
-      $bgBlur.style.transition = 'opacity ' + (transMs * 0.75) + 'ms ease';
-      if (!config.showClock) $clock.style.display = 'none';
-      if (!config.showDate) $dateDisplay.style.display = 'none';
-      if (!config.showExif) $exifInfo.style.display = 'none';
-      if (!config.showProgress) $progressBar.style.display = 'none';
+      var t = (config.transitionDuration || 2) * 1000;
+      $layerA.style.transition = 'opacity ' + t + 'ms ease'; $layerB.style.transition = 'opacity ' + t + 'ms ease';
+      $bgBlur.style.transition = 'opacity ' + (t * 0.75) + 'ms ease';
+      if (!config.showClock) $clock.style.display = 'none'; if (!config.showDate) $dateDisplay.style.display = 'none';
+      if (!config.showExif) $exifInfo.style.display = 'none'; if (!config.showProgress) $progressBar.style.display = 'none';
      if (!config.backgroundBlur) $bgBlur.style.display = 'none';
      updateClock(); setInterval(updateClock, 1000);
-      currentIndex = -1; showNextPhoto(); scheduleOverlayHide();
+      currentIndex = -1; showNextPhoto(); scheduleOverlayHide(); startRefreshTimer();
    } catch (err) { $btnStart.textContent = 'Error: ' + err.message; setTimeout(function () { $btnStart.textContent = '▶ Start Slideshow'; $btnStart.disabled = false; }, 3000); }
  };

  window.exitSlideshow = function () {
-    isRunning = false; clearTimeout(slideshowTimer); clearInterval(progressTimer);
-    $slideshowScreen.style.display = 'none'; $setupScreen.style.display = 'flex';
-    document.body.classList.add('setup-mode');
+    if (urlDriven) { window.location.href = window.location.pathname; return; }
+    isRunning = false; clearTimeout(slideshowTimer); if (refreshTimer) clearInterval(refreshTimer);
+    $slideshowScreen.style.display = 'none'; $setupScreen.style.display = 'flex'; document.body.classList.add('setup-mode');
    $btnStart.textContent = '▶ Start Slideshow'; $btnStart.disabled = false;
    $layerA.style.backgroundImage = ''; $layerB.style.backgroundImage = ''; $bgBlur.style.backgroundImage = '';
-    $layerA.classList.add('active'); $layerB.classList.remove('active'); $bgBlur.classList.remove('visible');
-    activeLayer = 'a';
+    $layerA.classList.add('active'); $layerB.classList.remove('active'); $bgBlur.classList.remove('visible'); activeLayer = 'a';
  };

  function showNextPhoto() { currentIndex++; if (currentIndex >= assets.length) { if (config.shuffle) shuffleArray(assets); currentIndex = 0; } showPhoto(currentIndex); }
  function showPrevPhoto() { currentIndex--; if (currentIndex < 0) currentIndex = assets.length - 1; showPhoto(currentIndex); }
-
-  function showPhoto(index) {
-    if (!assets[index]) return;
-    clearTimeout(slideshowTimer); clearInterval(progressTimer);
-    var asset = assets[index];
-    var imageUrl = '/api/assets/' + asset.id + '/thumbnail?size=preview';
-    var img = new Image();
-    img.onload = function () { displayImage(imageUrl, asset); };
-    img.onerror = function () { setTimeout(showNextPhoto, 500); };
-    img.src = imageUrl;
-    preloadNext(index + 1);
+  function showPhoto(idx) {
+    if (!assets[idx]) return; clearTimeout(slideshowTimer);
+    var a = assets[idx], url = '/api/assets/' + a.id + '/thumbnail?size=preview';
+    var img = new Image(); img.onload = function () { displayImage(url, a); }; img.onerror = function () { setTimeout(showNextPhoto, 500); }; img.src = url;
+    preloadNext(idx + 1);
  }
-
  function displayImage(url, asset) {
-    var fitStyle = config.imageFit || 'contain';
-    var incomingLayer, outgoingLayer;
-    if (activeLayer === 'a') { incomingLayer = $layerB; outgoingLayer = $layerA; activeLayer = 'b'; }
-    else { incomingLayer = $layerA; outgoingLayer = $layerB; activeLayer = 'a'; }
-    incomingLayer.style.backgroundImage = 'url(' + url + ')';
-    incomingLayer.style.backgroundSize = fitStyle;
-    incomingLayer.classList.add('active'); outgoingLayer.classList.remove('active');
+    var fit = config.imageFit || 'contain', inc, out;
+    if (activeLayer === 'a') { inc = $layerB; out = $layerA; activeLayer = 'b'; } else { inc = $layerA; out = $layerB; activeLayer = 'a'; }
+    inc.style.backgroundImage = 'url(' + url + ')'; inc.style.backgroundSize = fit;
+    inc.classList.add('active'); out.classList.remove('active');
    if (config.backgroundBlur) { $bgBlur.style.backgroundImage = 'url(' + url + ')'; $bgBlur.classList.add('visible'); }
    updateExifInfo(asset); startProgress();
-    var interval = (config.slideshowInterval || 30) * 1000;
-    slideshowTimer = setTimeout(showNextPhoto, interval);
+    slideshowTimer = setTimeout(showNextPhoto, (config.slideshowInterval || 30) * 1000);
  }
-
-  function preloadNext(index) { if (index >= assets.length) index = 0; if (!assets[index]) return; var img = new Image(); img.src = '/api/assets/' + assets[index].id + '/thumbnail?size=preview'; }
-
-  function updateExifInfo(asset) {
-    if (!config.showExif || !asset.exifInfo) { $exifInfo.textContent = ''; return; }
-    var parts = [], exif = asset.exifInfo;
-    var location = [exif.city, exif.state, exif.country].filter(Boolean).join(', ');
-    if (location) parts.push('📍 ' + location);
-    if (exif.dateTimeOriginal) { parts.push(formatDate(new Date(exif.dateTimeOriginal))); }
-    else if (asset.fileCreatedAt) { parts.push(formatDate(new Date(asset.fileCreatedAt))); }
-    if (exif.make || exif.model) { parts.push('📷 ' + [exif.make, exif.model].filter(Boolean).join(' ')); }
-    $exifInfo.textContent = parts.join('  •  ');
+  function preloadNext(i) { if (i >= assets.length) i = 0; if (!assets[i]) return; var img = new Image(); img.src = '/api/assets/' + assets[i].id + '/thumbnail?size=preview'; }
+  function updateExifInfo(a) {
+    if (!config.showExif || !a.exifInfo) { $exifInfo.textContent = ''; return; }
+    var p = [], e = a.exifInfo, loc = [e.city, e.state, e.country].filter(Boolean).join(', ');
+    if (loc) p.push('📍 ' + loc);
+    if (e.dateTimeOriginal) p.push(formatDate(new Date(e.dateTimeOriginal)));
+    else if (a.fileCreatedAt) p.push(formatDate(new Date(a.fileCreatedAt)));
+    if (e.make || e.model) p.push('📷 ' + [e.make, e.model].filter(Boolean).join(' '));
+    $exifInfo.textContent = p.join('  •  ');
  }
-
  function startProgress() {
    if (!config.showProgress) return;
-    $progressFill.style.transition = 'none'; $progressFill.style.width = '0%';
-    progressStart = Date.now(); var duration = (config.slideshowInterval || 30) * 1000;
-    $progressFill.offsetWidth;
-    $progressFill.style.transition = 'width ' + duration + 'ms linear'; $progressFill.style.width = '100%';
+    $progressFill.style.transition = 'none'; $progressFill.style.width = '0%'; $progressFill.offsetWidth;
+    $progressFill.style.transition = 'width ' + ((config.slideshowInterval || 30) * 1000) + 'ms linear'; $progressFill.style.width = '100%';
  }
-
  function updateClock() {
-    var now = new Date();
-    if (config.showClock) { $clock.textContent = padZero(now.getHours()) + ':' + padZero(now.getMinutes()); }
-    if (config.showDate) { $dateDisplay.textContent = now.toLocaleDateString(undefined, { weekday: 'long', day: 'numeric', month: 'long', year: 'numeric' }); }
+    var n = new Date();
+    if (config.showClock) $clock.textContent = padZero(n.getHours()) + ':' + padZero(n.getMinutes());
+    if (config.showDate) $dateDisplay.textContent = n.toLocaleDateString(undefined, { weekday: 'long', day: 'numeric', month: 'long', year: 'numeric' });
  }
-
-  window.toggleOverlay = function () {
-    overlayVisible = !overlayVisible;
-    if (overlayVisible) { $overlay.classList.remove('hidden'); $btnSettings.classList.add('visible'); scheduleOverlayHide(); }
-    else { $overlay.classList.add('hidden'); $btnSettings.classList.remove('visible'); }
-  };
-
+  window.toggleOverlay = function () { overlayVisible = !overlayVisible; if (overlayVisible) { $overlay.classList.remove('hidden'); $btnSettings.classList.add('visible'); scheduleOverlayHide(); } else { $overlay.classList.add('hidden'); $btnSettings.classList.remove('visible'); } };
  function scheduleOverlayHide() { clearTimeout(overlayTimeout); overlayTimeout = setTimeout(function () { $overlay.classList.add('hidden'); $btnSettings.classList.remove('visible'); overlayVisible = false; }, 8000); }
-
  window.nextPhoto = function () { showNextPhoto(); if (overlayVisible) scheduleOverlayHide(); };
  window.prevPhoto = function () { showPrevPhoto(); if (overlayVisible) scheduleOverlayHide(); };
-
-  document.addEventListener('keydown', function (e) {
-    if (!isRunning) return;
-    switch (e.key) {
-      case 'ArrowRight': case ' ': e.preventDefault(); nextPhoto(); break;
-      case 'ArrowLeft': e.preventDefault(); prevPhoto(); break;
-      case 'Escape': exitSlideshow(); break;
-      case 'f': toggleFullscreen(); break;
-      case 'i': toggleOverlay(); break;
-    }
-  });
-
-  function toggleFullscreen() {
-    if (!document.fullscreenElement && !document.webkitFullscreenElement) { var el = document.documentElement; if (el.requestFullscreen) el.requestFullscreen(); else if (el.webkitRequestFullscreen) el.webkitRequestFullscreen(); }
-    else { if (document.exitFullscreen) document.exitFullscreen(); else if (document.webkitExitFullscreen) document.webkitExitFullscreen(); }
-  }
-
+  document.addEventListener('keydown', function (e) { if (!isRunning) return; switch (e.key) { case 'ArrowRight': case ' ': e.preventDefault(); nextPhoto(); break; case 'ArrowLeft': e.preventDefault(); prevPhoto(); break; case 'Escape': exitSlideshow(); break; case 'f': toggleFullscreen(); break; case 'i': toggleOverlay(); break; } });
+  function toggleFullscreen() { if (!document.fullscreenElement && !document.webkitFullscreenElement) { var el = document.documentElement; if (el.requestFullscreen) el.requestFullscreen(); else if (el.webkitRequestFullscreen) el.webkitRequestFullscreen(); } else { if (document.exitFullscreen) document.exitFullscreen(); else if (document.webkitExitFullscreen) document.webkitExitFullscreen(); } }
  function shuffleArray(arr) { for (var i = arr.length - 1; i > 0; i--) { var j = Math.floor(Math.random() * (i + 1)); var t = arr[i]; arr[i] = arr[j]; arr[j] = t; } }
  function padZero(n) { return n < 10 ? '0' + n : '' + n; }
  function formatDate(d) { var m = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']; return d.getDate() + ' ' + m[d.getMonth()] + ' ' + d.getFullYear(); }
  function escapeHtml(s) { var d = document.createElement('div'); d.appendChild(document.createTextNode(s)); return d.innerHTML; }
-
  async function requestWakeLock() { try { if ('wakeLock' in navigator) await navigator.wakeLock.request('screen'); } catch (e) {} }
  document.addEventListener('visibilitychange', function () { if (document.visibilityState === 'visible' && isRunning) requestWakeLock(); });
-
-  function preventSleep() {
-    try {
-      var v = document.createElement('video'); v.setAttribute('playsinline',''); v.setAttribute('muted',''); v.setAttribute('loop','');
-      v.style.cssText = 'position:absolute;width:1px;height:1px;opacity:0.01';
-      v.src = 'data:video/mp4;base64,AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAAAAhtZGF0AAAA1m1vb3YAAABsbXZoZAAAAAAAAAAAAAAAAAAAA+gAAAAAAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAYdHJhawAAAFx0a2hkAAAAAwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAJBtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAADIAAAAAAAAhhdmMxAAAAAAAAAAAAAAAAAAAAAAAA';
-      document.body.appendChild(v); v.play().catch(function(){});
-    } catch(e){}
-  }
-
+  function preventSleep() { try { var v = document.createElement('video'); v.setAttribute('playsinline',''); v.setAttribute('muted',''); v.setAttribute('loop',''); v.style.cssText = 'position:absolute;width:1px;height:1px;opacity:0.01'; v.src = 'data:video/mp4;base64,AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAAAAhtZGF0AAAA1m1vb3YAAABsbXZoZAAAAAAAAAAAAAAAAAAAA+gAAAAAAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAYdHJhawAAAFx0a2hkAAAAAwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAJBtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAADIAAAAAAAAhhdmMxAAAAAAAAAAAAAAAAAAAAAAAA'; document.body.appendChild(v); v.play().catch(function(){}); } catch(e){} }
  init(); requestWakeLock(); preventSleep();
 })();
@@ -4,9 +4,8 @@ const path = require('path');
 require('dotenv').config();

 const app = express();
-const PORT = process.env.PORT || 3000;
+const PORT = process.env.PORT || 3030;

-// --- Configuration ---
 const IMMICH_URL = (process.env.IMMICH_URL || 'http://localhost:2283').replace(/\/+$/, '');
 const API_KEY = process.env.IMMICH_API_KEY || '';
 const SLIDESHOW_INTERVAL = parseInt(process.env.SLIDESHOW_INTERVAL, 10) || 30;
@@ -20,230 +19,132 @@ const BACKGROUND_BLUR = process.env.BACKGROUND_BLUR !== 'false';
 const SHUFFLE = process.env.SHUFFLE !== 'false';
 const ALBUM_ID = process.env.ALBUM_ID || '';
 const SHOW_FAVORITES_ONLY = process.env.SHOW_FAVORITES_ONLY === 'true';
+const REFRESH_INTERVAL = parseInt(process.env.REFRESH_INTERVAL, 10) || 300;

-// --- Shared headers for Immich API ---
 function immichHeaders() {
-  return {
-    'x-api-key': API_KEY,
-    'Accept': 'application/json',
-    'Content-Type': 'application/json',
-  };
+  return { 'x-api-key': API_KEY, 'Accept': 'application/json', 'Content-Type': 'application/json' };
 }

-// --- Middleware ---
 app.use(express.static(path.join(__dirname, 'public')));
 app.use(express.json());

-// --- API: Config endpoint (sends safe config to frontend) ---
 app.get('/api/config', (_req, res) => {
  res.json({
-    slideshowInterval: SLIDESHOW_INTERVAL,
-    transitionDuration: TRANSITION_DURATION,
-    showClock: SHOW_CLOCK,
-    showDate: SHOW_DATE,
-    showExif: SHOW_EXIF,
-    showProgress: SHOW_PROGRESS,
-    imageFit: IMAGE_FIT,
-    backgroundBlur: BACKGROUND_BLUR,
-    shuffle: SHUFFLE,
-    albumId: ALBUM_ID,
-    showFavoritesOnly: SHOW_FAVORITES_ONLY,
+    slideshowInterval: SLIDESHOW_INTERVAL, transitionDuration: TRANSITION_DURATION,
+    showClock: SHOW_CLOCK, showDate: SHOW_DATE, showExif: SHOW_EXIF, showProgress: SHOW_PROGRESS,
+    imageFit: IMAGE_FIT, backgroundBlur: BACKGROUND_BLUR, shuffle: SHUFFLE,
+    albumId: ALBUM_ID, showFavoritesOnly: SHOW_FAVORITES_ONLY, refreshInterval: REFRESH_INTERVAL,
    connected: !!API_KEY,
  });
 });

-// --- API: Server info / connectivity check ---
 app.get('/api/server-info', async (_req, res) => {
  try {
-    const response = await fetch(`${IMMICH_URL}/api/server/version`, {
-      headers: immichHeaders(),
-    });
-    if (!response.ok) throw new Error(`Immich returned ${response.status}`);
-    const data = await response.json();
-    res.json({ ok: true, version: data });
-  } catch (err) {
-    res.status(502).json({ ok: false, error: err.message });
-  }
+    const r = await fetch(`${IMMICH_URL}/api/server/version`, { headers: immichHeaders() });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    res.json({ ok: true, version: await r.json() });
+  } catch (err) { res.status(502).json({ ok: false, error: err.message }); }
 });

-// --- API: List albums ---
 app.get('/api/albums', async (_req, res) => {
  try {
-    const response = await fetch(`${IMMICH_URL}/api/albums`, {
-      headers: immichHeaders(),
-    });
-    if (!response.ok) throw new Error(`Immich returned ${response.status}`);
-    const albums = await response.json();
-    // Return simplified album list
-    const simplified = albums.map((a) => ({
-      id: a.id,
-      albumName: a.albumName,
-      assetCount: a.assetCount,
-      albumThumbnailAssetId: a.albumThumbnailAssetId,
-      updatedAt: a.updatedAt,
-    }));
-    res.json(simplified);
-  } catch (err) {
-    res.status(502).json({ error: err.message });
-  }
+    const r = await fetch(`${IMMICH_URL}/api/albums`, { headers: immichHeaders() });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    const albums = await r.json();
+    res.json(albums.map(a => ({ id: a.id, albumName: a.albumName, assetCount: a.assetCount, albumThumbnailAssetId: a.albumThumbnailAssetId, updatedAt: a.updatedAt })));
+  } catch (err) { res.status(502).json({ error: err.message }); }
 });

-// --- API: Get album assets ---
+function mapAsset(a) {
+  return {
+    id: a.id, originalFileName: a.originalFileName, fileCreatedAt: a.fileCreatedAt, isFavorite: a.isFavorite,
+    exifInfo: a.exifInfo ? { make: a.exifInfo.make, model: a.exifInfo.model, city: a.exifInfo.city, state: a.exifInfo.state, country: a.exifInfo.country, description: a.exifInfo.description, dateTimeOriginal: a.exifInfo.dateTimeOriginal } : null,
+  };
+}
+
 app.get('/api/albums/:id', async (req, res) => {
  try {
-    const response = await fetch(`${IMMICH_URL}/api/albums/${req.params.id}`, {
-      headers: immichHeaders(),
-    });
-    if (!response.ok) throw new Error(`Immich returned ${response.status}`);
-    const album = await response.json();
-    // Filter to images only, return simplified asset data
-    const assets = (album.assets || [])
-      .filter((a) => a.type === 'IMAGE')
-      .map((a) => ({
-        id: a.id,
-        originalFileName: a.originalFileName,
-        fileCreatedAt: a.fileCreatedAt,
-        exifInfo: a.exifInfo
-          ? {
-              make: a.exifInfo.make,
-              model: a.exifInfo.model,
-              city: a.exifInfo.city,
-              state: a.exifInfo.state,
-              country: a.exifInfo.country,
-              description: a.exifInfo.description,
-              dateTimeOriginal: a.exifInfo.dateTimeOriginal,
-            }
-          : null,
-      }));
-    res.json({
-      id: album.id,
-      albumName: album.albumName,
-      assetCount: assets.length,
-      assets,
-    });
-  } catch (err) {
-    res.status(502).json({ error: err.message });
-  }
+    const r = await fetch(`${IMMICH_URL}/api/albums/${req.params.id}`, { headers: immichHeaders() });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    const album = await r.json();
+    const assets = (album.assets || []).filter(a => a.type === 'IMAGE').map(mapAsset);
+    res.json({ id: album.id, albumName: album.albumName, assetCount: assets.length, assets });
+  } catch (err) { res.status(502).json({ error: err.message }); }
+});
+
+app.get('/api/people', async (_req, res) => {
+  try {
+    const r = await fetch(`${IMMICH_URL}/api/people`, { headers: immichHeaders() });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    const data = await r.json();
+    res.json((data.people || data || []).map(p => ({ id: p.id, name: p.name, thumbnailPath: p.thumbnailPath })));
+  } catch (err) { res.status(502).json({ error: err.message }); }
+});
+
+app.get('/api/people/:id', async (req, res) => {
+  try {
+    const r = await fetch(`${IMMICH_URL}/api/people/${req.params.id}/assets`, { headers: immichHeaders() });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    const assets = await r.json();
+    res.json((Array.isArray(assets) ? assets : []).filter(a => a.type === 'IMAGE').map(mapAsset));
+  } catch (err) { res.status(502).json({ error: err.message }); }
+});
+
+app.get('/api/people/:id/thumbnail', async (req, res) => {
+  try {
+    const r = await fetch(`${IMMICH_URL}/api/people/${req.params.id}/thumbnail`, { headers: { 'x-api-key': API_KEY } });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    res.set('Content-Type', r.headers.get('content-type') || 'image/jpeg');
+    res.set('Cache-Control', 'public, max-age=86400');
+    r.body.pipe(res);
+  } catch (err) { res.status(502).json({ error: err.message }); }
 });

-// --- API: Get random assets (when no album selected) ---
 app.get('/api/assets/random', async (req, res) => {
  try {
    const count = Math.min(parseInt(req.query.count, 10) || 50, 250);
-    const response = await fetch(`${IMMICH_URL}/api/assets/random?count=${count}`, {
-      headers: immichHeaders(),
-    });
-    if (!response.ok) throw new Error(`Immich returned ${response.status}`);
-    const assets = await response.json();
-    const images = assets
-      .filter((a) => a.type === 'IMAGE')
-      .map((a) => ({
-        id: a.id,
-        originalFileName: a.originalFileName,
-        fileCreatedAt: a.fileCreatedAt,
-        isFavorite: a.isFavorite,
-        exifInfo: a.exifInfo
-          ? {
-              make: a.exifInfo.make,
-              model: a.exifInfo.model,
-              city: a.exifInfo.city,
-              state: a.exifInfo.state,
-              country: a.exifInfo.country,
-              description: a.exifInfo.description,
-              dateTimeOriginal: a.exifInfo.dateTimeOriginal,
-            }
-          : null,
-      }));
-    res.json(images);
-  } catch (err) {
-    res.status(502).json({ error: err.message });
-  }
+    const r = await fetch(`${IMMICH_URL}/api/assets/random?count=${count}`, { headers: immichHeaders() });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    res.json((await r.json()).filter(a => a.type === 'IMAGE').map(mapAsset));
+  } catch (err) { res.status(502).json({ error: err.message }); }
 });

-// --- API: Get favorites ---
 app.get('/api/assets/favorites', async (_req, res) => {
  try {
-    const body = JSON.stringify({
-      isFavorite: true,
-      type: 'IMAGE',
-      size: 250,
-      page: 1,
-    });
-    const response = await fetch(`${IMMICH_URL}/api/search/metadata`, {
-      method: 'POST',
-      headers: immichHeaders(),
-      body,
-    });
-    if (!response.ok) throw new Error(`Immich returned ${response.status}`);
-    const data = await response.json();
-    const images = (data.assets?.items || []).map((a) => ({
-      id: a.id,
-      originalFileName: a.originalFileName,
-      fileCreatedAt: a.fileCreatedAt,
-      isFavorite: true,
-      exifInfo: a.exifInfo
-        ? {
-            make: a.exifInfo.make,
-            model: a.exifInfo.model,
-            city: a.exifInfo.city,
-            state: a.exifInfo.state,
-            country: a.exifInfo.country,
-            description: a.exifInfo.description,
-            dateTimeOriginal: a.exifInfo.dateTimeOriginal,
-          }
-        : null,
-    }));
-    res.json(images);
-  } catch (err) {
-    res.status(502).json({ error: err.message });
-  }
+    const r = await fetch(`${IMMICH_URL}/api/search/metadata`, { method: 'POST', headers: immichHeaders(), body: JSON.stringify({ isFavorite: true, type: 'IMAGE', size: 250, page: 1 }) });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    const data = await r.json();
+    res.json((data.assets?.items || []).map(a => ({ ...mapAsset(a), isFavorite: true })));
+  } catch (err) { res.status(502).json({ error: err.message }); }
 });

-// --- API: Proxy image (thumbnail) ---
 app.get('/api/assets/:id/thumbnail', async (req, res) => {
  try {
-    const size = req.query.size || 'preview'; // 'thumbnail' or 'preview'
-    const response = await fetch(
-      `${IMMICH_URL}/api/assets/${req.params.id}/thumbnail?size=${size}`,
-      { headers: { 'x-api-key': API_KEY } }
-    );
-    if (!response.ok) throw new Error(`Immich returned ${response.status}`);
-    const contentType = response.headers.get('content-type');
-    res.set('Content-Type', contentType || 'image/jpeg');
+    const size = req.query.size || 'preview';
+    const r = await fetch(`${IMMICH_URL}/api/assets/${req.params.id}/thumbnail?size=${size}`, { headers: { 'x-api-key': API_KEY } });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    res.set('Content-Type', r.headers.get('content-type') || 'image/jpeg');
    res.set('Cache-Control', 'public, max-age=86400');
-    response.body.pipe(res);
-  } catch (err) {
-    res.status(502).json({ error: err.message });
-  }
+    r.body.pipe(res);
+  } catch (err) { res.status(502).json({ error: err.message }); }
 });

-// --- API: Proxy full-size image ---
 app.get('/api/assets/:id/original', async (req, res) => {
  try {
-    const response = await fetch(
-      `${IMMICH_URL}/api/assets/${req.params.id}/original`,
-      { headers: { 'x-api-key': API_KEY } }
-    );
-    if (!response.ok) throw new Error(`Immich returned ${response.status}`);
-    const contentType = response.headers.get('content-type');
-    res.set('Content-Type', contentType || 'image/jpeg');
+    const r = await fetch(`${IMMICH_URL}/api/assets/${req.params.id}/original`, { headers: { 'x-api-key': API_KEY } });
+    if (!r.ok) throw new Error(`Immich returned ${r.status}`);
+    res.set('Content-Type', r.headers.get('content-type') || 'image/jpeg');
    res.set('Cache-Control', 'public, max-age=86400');
-    response.body.pipe(res);
-  } catch (err) {
-    res.status(502).json({ error: err.message });
-  }
+    r.body.pipe(res);
+  } catch (err) { res.status(502).json({ error: err.message }); }
 });

-// --- Fallback: serve index.html for SPA ---
-app.get('*', (_req, res) => {
-  res.sendFile(path.join(__dirname, 'public', 'index.html'));
-});
+app.get('*', (_req, res) => { res.sendFile(path.join(__dirname, 'public', 'index.html')); });

-// --- Start ---
 app.listen(PORT, '0.0.0.0', () => {
  console.log(`🖼️  Frambe running on http://0.0.0.0:${PORT}`);
  console.log(`📡 Immich server: ${IMMICH_URL}`);
  console.log(`🔑 API Key: ${API_KEY ? '***configured***' : '⚠️  NOT SET'}`);
  if (ALBUM_ID) console.log(`📁 Default album: ${ALBUM_ID}`);
-  console.log(`⏱️  Slideshow interval: ${SLIDESHOW_INTERVAL}s`);
+  console.log(`⏱️  Slideshow: ${SLIDESHOW_INTERVAL}s | Refresh: ${REFRESH_INTERVAL}s`);
 });
Author	SHA1	Message	Date
jessikitty	3cfcc3f983	feat: port 3030, add REFRESH_INTERVAL	2026-05-19 16:01:48 +10:00
jessikitty	245766d841	feat: change default port to 3030	2026-05-19 16:01:14 +10:00
jessikitty	d32180d352	feat: port 3030, add REFRESH_INTERVAL config	2026-05-19 16:01:01 +10:00
jessikitty	4feaaf30d0	feat: URL params (?album=, ?person=, ?favorites, ?random), periodic refresh, person support	2026-05-19 15:59:43 +10:00
jessikitty	be6f0fc30f	feat: add app icon, apple-touch-icon, theme-color meta	2026-05-19 15:57:35 +10:00
jessikitty	00bfa926e4	feat: port 3030, person API endpoints, refresh interval config, mapAsset helper	2026-05-19 15:56:43 +10:00
jessikitty	ea2828d071	feat(1.2.0): bump version — port 3030, URL params, person support, auto-refresh, app icon	2026-05-19 15:56:04 +10:00