aktueller stand

web/Dockerfile

@@ -1,5 +1,6 @@
 FROM nginx:alpine
 
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY index.html /usr/share/nginx/html/
 COPY posts.html /usr/share/nginx/html/
 COPY dashboard.html /usr/share/nginx/html/
@@ -22,6 +23,23 @@ COPY login.js /usr/share/nginx/html/
 COPY vendor /usr/share/nginx/html/vendor/
 COPY assets /usr/share/nginx/html/assets/
 
+RUN set -e; \
+  ASSET_VERSION="$(sha256sum \
+    /usr/share/nginx/html/app.js \
+    /usr/share/nginx/html/dashboard.js \
+    /usr/share/nginx/html/settings.js \
+    /usr/share/nginx/html/daily-bookmarks.js \
+    /usr/share/nginx/html/automation.js \
+    /usr/share/nginx/html/login.js \
+    /usr/share/nginx/html/vendor/list.min.js \
+    /usr/share/nginx/html/style.css \
+    /usr/share/nginx/html/dashboard.css \
+    /usr/share/nginx/html/settings.css \
+    /usr/share/nginx/html/daily-bookmarks.css \
+    /usr/share/nginx/html/automation.css \
+    | sha256sum | awk '{print $1}')"; \
+  sed -i "s/__ASSET_VERSION__/${ASSET_VERSION}/g" /usr/share/nginx/html/index.html /usr/share/nginx/html/login.html
+
 EXPOSE 80
 
 CMD ["nginx", "-g", "daemon off;"]

web/app.js

@@ -2031,18 +2031,17 @@ function cancelPendingAutoOpen(showMessage = false) {
   }
 }
 
-function getPendingVisibleCandidates() {
+function getPendingCandidates({ includeHidden = false } = {}) {
   if (currentTab !== 'pending') {
-    return { items: [], totalVisible: 0, cooldownBlocked: 0 };
+    return { items: [], totalConsidered: 0, cooldownBlocked: 0 };
   }
   const { filteredItems } = getPostListState();
   const visibleCount = Math.min(filteredItems.length, getVisibleCount(currentTab));
-  const visibleItems = filteredItems
-    .slice(0, visibleCount)
+  const consideredItems = (includeHidden ? filteredItems : filteredItems.slice(0, visibleCount))
     .filter(({ post }) => post && post.url);
-  const items = visibleItems.filter(({ post }) => !isPendingOpenCooldownActive(post.id));
-  const cooldownBlocked = Math.max(0, visibleItems.length - items.length);
-  return { items, totalVisible: visibleItems.length, cooldownBlocked };
+  const items = consideredItems.filter(({ post }) => !isPendingOpenCooldownActive(post.id));
+  const cooldownBlocked = Math.max(0, consideredItems.length - items.length);
+  return { items, totalConsidered: consideredItems.length, cooldownBlocked };
 }
 
 function openPendingBatch({ auto = false } = {}) {
@@ -2052,13 +2051,14 @@ function openPendingBatch({ auto = false } = {}) {
   if (!auto) {
     cancelPendingAutoOpen(false);
   }
-  const { items: candidates, totalVisible, cooldownBlocked } = getPendingVisibleCandidates();
+  const includeHidden = true;
+  const { items: candidates, totalConsidered, cooldownBlocked } = getPendingCandidates({ includeHidden });
   if (!candidates.length) {
     if (!auto) {
-      if (totalVisible === 0) {
+      if (totalConsidered === 0) {
         setPendingBulkStatus('Keine offenen Beiträge zum Öffnen.', true);
       } else if (cooldownBlocked > 0) {
-        setPendingBulkStatus('Alle sichtbaren Beiträge sind noch im Cooldown (40 min).', true);
+        setPendingBulkStatus('Alle Beiträge sind noch im Cooldown (40 min).', true);
       } else {
         setPendingBulkStatus('Keine offenen Beiträge zum Öffnen.', true);
       }
@@ -2116,7 +2116,7 @@ function maybeAutoOpenPending(reason = '', delayMs = PENDING_AUTO_OPEN_DELAY_MS)
   if (pendingAutoOpenTriggered) {
     return;
   }
-  const { items: candidates } = getPendingVisibleCandidates();
+  const { items: candidates } = getPendingCandidates({ includeHidden: true });
   if (!candidates.length) {
     hidePendingAutoOpenOverlay();
     return;

web/index.html

@@ -17,6 +17,7 @@
     (function gateAssets() {
       const API_URL = 'https://fb.srv.medeba-media.de/api';
       const LOGIN_PAGE = 'login.html';
+      const ASSET_VERSION = '__ASSET_VERSION__';
       const cssFiles = [
         { href: 'style.css' },
         { href: 'dashboard.css' },
@@ -33,6 +34,14 @@
         'daily-bookmarks.js'
       ];
 
+      function withVersion(value) {
+        if (!ASSET_VERSION) {
+          return value;
+        }
+        const joiner = value.includes('?') ? '&' : '?';
+        return `${value}${joiner}v=${ASSET_VERSION}`;
+      }
+
       function redirectToLogin() {
         try {
           const redirect = encodeURIComponent(window.location.href);
@@ -46,7 +55,7 @@
         cssFiles.forEach(({ href, id, disabled }) => {
           const link = document.createElement('link');
           link.rel = 'stylesheet';
-          link.href = href;
+          link.href = withVersion(href);
           if (id) link.id = id;
           if (disabled) link.disabled = true;
           document.head.appendChild(link);
@@ -60,7 +69,7 @@
             return;
           }
           const script = document.createElement('script');
-          script.src = list[index];
+          script.src = withVersion(list[index]);
           script.onload = () => loadScriptsSequentially(list, index + 1).then(resolve).catch(reject);
           script.onerror = reject;
           document.body.appendChild(script);

web/login.html

@@ -106,6 +106,6 @@
       <div id="status" class="status" role="status" aria-live="polite"></div>
     </form>
   </div>
-  <script src="login.js"></script>
+  <script src="login.js?v=__ASSET_VERSION__"></script>
 </body>
 </html>

web/nginx.conf

@@ -0,0 +1,31 @@
+server {
+  listen 80;
+  server_name _;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+
+  location ~* \.(html)$ {
+    add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+    try_files $uri $uri/ /index.html;
+  }
+
+  location ~* \.(js|css)$ {
+    add_header Cache-Control "public, max-age=31536000, immutable";
+    try_files $uri =404;
+  }
+
+  location ^~ /assets/ {
+    add_header Cache-Control "public, max-age=31536000, immutable";
+    try_files $uri =404;
+  }
+
+  location ^~ /vendor/ {
+    add_header Cache-Control "public, max-age=31536000, immutable";
+    try_files $uri =404;
+  }
+}