@xiboplayer/cache 0.5.4 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiboplayer/cache",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Offline caching and download management with parallel chunk downloads",
   "type": "module",
   "main": "./src/index.js",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "spark-md5": "^3.0.2",
-    "@xiboplayer/utils": "0.5.4"
+    "@xiboplayer/utils": "0.5.6"
   },
   "devDependencies": {
     "vitest": "^2.0.0",

package/src/download-manager.js

@@ -34,6 +34,12 @@ const DEFAULT_MAX_CHUNKS_PER_FILE = 3; // Max parallel chunk downloads per file
 const CHUNK_THRESHOLD = 100 * 1024 * 1024; // Files > 100MB get chunked
 const MAX_RETRIES = 3;
 const RETRY_DELAY_MS = 500; // Fast: 500ms, 1s, 1.5s → total ~3s
+
+// getData (widget data) retry config — CMS "cache not ready" (HTTP 500) resolves
+// when the XTR task runs (30-120s). Use longer backoff to ride it out.
+const GETDATA_MAX_RETRIES = 4;
+const GETDATA_RETRY_DELAYS = [15_000, 30_000, 60_000, 120_000]; // 15s, 30s, 60s, 120s
+const GETDATA_REENQUEUE_DELAY_MS = 60_000; // Re-add to queue after 60s if all retries fail
 const URGENT_CONCURRENCY = 2; // Slots when urgent chunk is active (bandwidth focus)
 const FETCH_TIMEOUT_MS = 600_000; // 10 minutes — 100MB chunk at ~2 Mbps
 const HEAD_TIMEOUT_MS = 15_000; // 15 seconds for HEAD requests
@@ -100,12 +106,12 @@ export function isUrlExpired(url, graceSeconds = 30) {
 /**
  * Rewrite an absolute CMS URL through the local proxy when running behind
  * the proxy server (Chromium kiosk or Electron).
- * Detection: SW/window on localhost:8765 = proxy mode.
+ * Detection: SW/window on localhost (any port) = proxy mode.
  */
 export function rewriteUrlForProxy(url) {
   if (!url.startsWith('http')) return url;
   const loc = typeof self !== 'undefined' ? self.location : undefined;
-  if (!loc || loc.hostname !== 'localhost' || loc.port !== '8765') return url;
+  if (!loc || loc.hostname !== 'localhost') return url;
   const parsed = new URL(url);
   const cmsOrigin = parsed.origin;
   return `/file-proxy?cms=${encodeURIComponent(cmsOrigin)}&url=${encodeURIComponent(parsed.pathname + parsed.search)}`;
@@ -127,6 +133,8 @@ export class DownloadTask {
     this.blob = null;
     this._parentFile = null;
     this._priority = PRIORITY.normal;
+    // Widget data (getData) uses longer retry backoff — CMS "cache not ready" is transient
+    this.isGetData = fileInfo.isGetData || false;
   }
 
   getUrl() {
@@ -144,7 +152,9 @@ export class DownloadTask {
       headers['Range'] = `bytes=${this.rangeStart}-${this.rangeEnd}`;
     }
 
-    for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+    const maxRetries = this.isGetData ? GETDATA_MAX_RETRIES : MAX_RETRIES;
+
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
       const ac = new AbortController();
       const timer = setTimeout(() => ac.abort(), FETCH_TIMEOUT_MS);
       try {
@@ -163,10 +173,12 @@ export class DownloadTask {
 
       } catch (error) {
         const msg = ac.signal.aborted ? `Timeout after ${FETCH_TIMEOUT_MS / 1000}s` : error.message;
-        if (attempt < MAX_RETRIES) {
-          const delay = RETRY_DELAY_MS * attempt;
+        if (attempt < maxRetries) {
+          const delay = this.isGetData
+            ? GETDATA_RETRY_DELAYS[attempt - 1]
+            : RETRY_DELAY_MS * attempt;
           const chunkLabel = this.chunkIndex != null ? ` chunk ${this.chunkIndex}` : '';
-          log.warn(`[DownloadTask] ${this.fileInfo.type}/${this.fileInfo.id}${chunkLabel} attempt ${attempt}/${MAX_RETRIES} failed: ${msg}. Retrying in ${delay / 1000}s...`);
+          log.warn(`[DownloadTask] ${this.fileInfo.type}/${this.fileInfo.id}${chunkLabel} attempt ${attempt}/${maxRetries} failed: ${msg}. Retrying in ${delay / 1000}s...`);
           await new Promise(resolve => setTimeout(resolve, delay));
         } else {
           this.state = 'failed';
@@ -859,6 +871,22 @@ export class DownloadQueue {
         this.running--;
         task._parentFile._runningCount--;
         this._activeTasks = this._activeTasks.filter(t => t !== task);
+
+        // getData (widget data): defer re-enqueue instead of permanent failure.
+        // CMS "cache not ready" resolves when the XTR task runs (30-120s).
+        if (task.isGetData) {
+          log.warn(`[DownloadQueue] getData ${key} failed all retries, scheduling re-enqueue in ${GETDATA_REENQUEUE_DELAY_MS / 1000}s`);
+          setTimeout(() => {
+            task.state = 'pending';
+            task._parentFile.state = 'downloading';
+            this.queue.push(task);
+            log.info(`[DownloadQueue] getData ${key} re-enqueued for retry`);
+            this.processQueue();
+          }, GETDATA_REENQUEUE_DELAY_MS);
+          this.processQueue();
+          return;
+        }
+
         this.processQueue();
         task._parentFile.onTaskFailed(task, err);
       });

package/src/widget-html.js

@@ -13,6 +13,7 @@
  */
 
 import { createLogger } from '@xiboplayer/utils';
+import { rewriteUrlForProxy } from './download-manager.js';
 
 const log = createLogger('Cache');
 const CACHE_NAME = 'xibo-media-v1';
@@ -110,7 +111,7 @@ export async function cacheWidgetHtml(layoutId, regionId, mediaId, html) {
       if (existing) return; // Already cached
 
       try {
-        const resp = await fetch(originalUrl);
+        const resp = await fetch(rewriteUrlForProxy(originalUrl));
         if (!resp.ok) {
           log.warn(`Failed to fetch static resource: ${filename} (HTTP ${resp.status})`);
           return;
@@ -149,7 +150,7 @@ export async function cacheWidgetHtml(layoutId, regionId, mediaId, html) {
             if (existingFont) return; // Already cached (by SW or previous widget)
 
             try {
-              const fontResp = await fetch(fontUrl);
+              const fontResp = await fetch(rewriteUrlForProxy(fontUrl));
               if (!fontResp.ok) {
                 log.warn(`Failed to fetch font: ${fontFile} (HTTP ${fontResp.status})`);
                 return;