iobroker.agent-dvr 0.3.0 → 0.4.0

package/admin/i18n/de.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Lade Kameras und Streams…",
   "cfgCameraColumn": "AgentDVR Kamera",
   "cfgStreamSourceColumn": "Stream-Quelle",
-  "reload": "Neu laden"
-}
+  "reload": "Neu laden",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "MJPEG-Proxy",
+  "cfgEnableStreamProxy_tt": "MJPEG- und Snapshot-URLs über ioBroker leiten (nur im MJPEG-Stream-Modus nötig — FLV und go2rtc laufen immer über ioBroker)"
+}

package/admin/i18n/en.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Loading cameras and streams…",
   "cfgCameraColumn": "AgentDVR Camera",
   "cfgStreamSourceColumn": "Stream Source",
-  "reload": "Reload"
-}
+  "reload": "Reload",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "MJPEG proxy",
+  "cfgEnableStreamProxy_tt": "Route MJPEG and snapshot URLs through ioBroker (only needed for MJPEG stream mode — FLV and go2rtc are always proxied)"
+}

package/admin/i18n/es.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Cargando cámaras y streams…",
   "cfgCameraColumn": "Cámara AgentDVR",
   "cfgStreamSourceColumn": "Fuente de stream",
-  "reload": "Recargar"
-}
+  "reload": "Recargar",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "Proxy MJPEG",
+  "cfgEnableStreamProxy_tt": "Enrutar MJPEG y snapshots a través de ioBroker (solo en modo MJPEG — FLV y go2rtc siempre se enrutan)"
+}

package/admin/i18n/fr.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Chargement des caméras et des flux…",
   "cfgCameraColumn": "Caméra AgentDVR",
   "cfgStreamSourceColumn": "Source du flux",
-  "reload": "Recharger"
-}
+  "reload": "Recharger",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "Proxy MJPEG",
+  "cfgEnableStreamProxy_tt": "Acheminer MJPEG et instantanés via ioBroker (uniquement en mode MJPEG — FLV et go2rtc sont toujours proxied)"
+}

package/admin/i18n/it.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Caricamento telecamere e stream…",
   "cfgCameraColumn": "Telecamera AgentDVR",
   "cfgStreamSourceColumn": "Sorgente stream",
-  "reload": "Ricarica"
-}
+  "reload": "Ricarica",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "Proxy MJPEG",
+  "cfgEnableStreamProxy_tt": "Instradare MJPEG e snapshot tramite ioBroker (solo in modalità MJPEG — FLV e go2rtc sono sempre proxied)"
+}

package/admin/i18n/nl.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Camera's en streams laden…",
   "cfgCameraColumn": "AgentDVR Camera",
   "cfgStreamSourceColumn": "Streambron",
-  "reload": "Herladen"
-}
+  "reload": "Herladen",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "MJPEG-proxy",
+  "cfgEnableStreamProxy_tt": "MJPEG- en snapshot-URLs via ioBroker routen (alleen nodig in MJPEG-modus — FLV en go2rtc worden altijd geproxied)"
+}

package/admin/i18n/pl.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Ładowanie kamer i strumieni…",
   "cfgCameraColumn": "Kamera AgentDVR",
   "cfgStreamSourceColumn": "Źródło strumienia",
-  "reload": "Odśwież"
-}
+  "reload": "Odśwież",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "Proxy MJPEG",
+  "cfgEnableStreamProxy_tt": "Kieruj MJPEG i migawki przez ioBroker (tylko w trybie MJPEG — FLV i go2rtc są zawsze proxied)"
+}

package/admin/i18n/pt.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Carregando câmeras e streams…",
   "cfgCameraColumn": "Câmera AgentDVR",
   "cfgStreamSourceColumn": "Fonte de stream",
-  "reload": "Recarregar"
-}
+  "reload": "Recarregar",
+  "hdrProxy": "Proxy",
+  "cfgEnableStreamProxy": "Proxy MJPEG",
+  "cfgEnableStreamProxy_tt": "Rotear MJPEG e snapshots pelo ioBroker (necessário apenas no modo MJPEG — FLV e go2rtc já são sempre proxied)"
+}

package/admin/i18n/ru.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Загрузка камер и потоков…",
   "cfgCameraColumn": "Камера AgentDVR",
   "cfgStreamSourceColumn": "Источник потока",
-  "reload": "Обновить"
-}
+  "reload": "Обновить",
+  "hdrProxy": "Прокси",
+  "cfgEnableStreamProxy": "MJPEG-прокси",
+  "cfgEnableStreamProxy_tt": "Маршрутизировать MJPEG и снимки через ioBroker (только для режима MJPEG — FLV и go2rtc всегда проксируются)"
+}

package/admin/i18n/uk.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "Завантаження камер і потоків…",
   "cfgCameraColumn": "Камера AgentDVR",
   "cfgStreamSourceColumn": "Джерело потоку",
-  "reload": "Оновити"
-}
+  "reload": "Оновити",
+  "hdrProxy": "Проксі",
+  "cfgEnableStreamProxy": "MJPEG-проксі",
+  "cfgEnableStreamProxy_tt": "Маршрутизувати MJPEG і знімки через ioBroker (лише для режиму MJPEG — FLV і go2rtc завжди проксіюються)"
+}

package/admin/i18n/zh-cn.json

@@ -135,5 +135,8 @@
   "loadingCamerasAndStreams": "正在加载摄像头和流…",
   "cfgCameraColumn": "AgentDVR 摄像头",
   "cfgStreamSourceColumn": "流来源",
-  "reload": "重新加载"
-}
+  "reload": "重新加载",
+  "hdrProxy": "代理",
+  "cfgEnableStreamProxy": "MJPEG 代理",
+  "cfgEnableStreamProxy_tt": "通过 ioBroker 路由 MJPEG 和快照（仅 MJPEG 模式需要 — FLV 和 go2rtc 始终通过代理）"
+}

package/admin/index_m.html

@@ -18,7 +18,7 @@
       };
       document.head.appendChild(script);
     </script>
-    <script type="module" crossorigin src="./assets/index-DFh6AKdK.js"></script>
+    <script type="module" crossorigin src="./assets/index-B13Ujb6j.js"></script>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "agent-dvr",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "news": {
+      "0.4.0": {
+        "en": "Optional MJPEG and snapshot stream proxy through ioBroker (browser needs only one connection)",
+        "de": "Optionaler MJPEG- und Snapshot-Stream-Proxy über ioBroker (Browser benötigt nur eine Verbindung)",
+        "ru": "Опциональный прокси потоков MJPEG и снимков через ioBroker",
+        "pt": "Proxy opcional de streams MJPEG e snapshots pelo ioBroker",
+        "nl": "Optionele MJPEG- en snapshot-proxy via ioBroker",
+        "fr": "Proxy optionnel pour les flux MJPEG et snapshots via ioBroker",
+        "it": "Proxy opzionale per stream MJPEG e snapshot tramite ioBroker",
+        "es": "Proxy opcional de flujos MJPEG e instantáneas a través de ioBroker",
+        "pl": "Opcjonalny proxy strumieni MJPEG i migawek przez ioBroker",
+        "zh-cn": "可选的 MJPEG 和快照流代理（通过 ioBroker）",
+        "uk": "Опціональний проксі потоків MJPEG і знімків через ioBroker"
+      },
       "0.3.0": {
         "en": "New control buttons (scheduleOn/Off, detectorOn/Off, sensitivityMin/Max/Gain), audio URL states for microphones, native browser fullscreen in dashboard, collapsible tag filter, auto-hide header",
         "de": "Neue Steuertasten (scheduleOn/Off, detectorOn/Off, Empfindlichkeit), Audio-URL-Zustände für Mikrofone, nativer Browser-Vollbild im Dashboard, ausklappbarer Tag-Filter, Auto-Hide-Header",
@@ -80,19 +93,6 @@
         "pl": "dodano dokumentację Live Dashboard i go2rtc WebRTC do README",
         "uk": "додано документацію Live Dashboard і go2rtc WebRTC до README",
         "zh-cn": "README 中新增 Live Dashboard 和 go2rtc WebRTC 文档"
-      },
-      "0.0.5": {
-        "en": "go2rtc WebRTC integration (admin table mapping, ioBroker WS proxy); auto-delete stale cameras; fix recording prev/next order",
-        "de": "go2rtc WebRTC-Integration (Admin-Tabellen-Mapping, ioBroker WS-Proxy); gelöschte Kameras werden automatisch entfernt; Vor/Zurück-Reihenfolge bei Aufnahmen korrigiert",
-        "ru": "интеграция go2rtc WebRTC (таблица в admin, WS-прокси через ioBroker); автоудаление устаревших камер; исправлен порядок кнопок Пред/След для записей",
-        "pt": "integração go2rtc WebRTC (tabela no admin, proxy WS via ioBroker); remoção automática de câmeras obsoletas; ordem anterior/próximo nas gravações corrigida",
-        "nl": "go2rtc WebRTC-integratie (admintabel, ioBroker WS-proxy); automatisch verwijderen van verouderde camera's; volgorde vorige/volgende opnames gecorrigeerd",
-        "fr": "intégration go2rtc WebRTC (table admin, proxy WS ioBroker); suppression automatique des caméras obsolètes; ordre précédent/suivant des enregistrements corrigé",
-        "it": "integrazione go2rtc WebRTC (tabella admin, proxy WS ioBroker); eliminazione automatica telecamere obsolete; ordine precedente/successivo registrazioni corretto",
-        "es": "integración go2rtc WebRTC (tabla en admin, proxy WS ioBroker); eliminación automática de cámaras obsoletas; orden anterior/siguiente en grabaciones corregido",
-        "pl": "integracja go2rtc WebRTC (tabela w admin, proxy WS ioBroker); automatyczne usuwanie nieaktywnych kamer; poprawiona kolejność poprzedni/następny nagrań",
-        "uk": "інтеграція go2rtc WebRTC (таблиця в admin, WS-проксі через ioBroker); автовидалення застарілих камер; виправлено порядок кнопок Попередній/Наступний для записів",
-        "zh-cn": "go2rtc WebRTC 集成（管理表格映射，ioBroker WS 代理）；自动删除过时摄像头；修正录像上一个/下一个顺序"
       }
     },
     "titleLang": {

package/lib/web.js

@@ -28,6 +28,11 @@ class AgentDvrWeb {
         const ns     = instanceSettings ? instanceSettings._id.replace('system.adapter.', '') : 'agent-dvr.0';
         const native = (instanceSettings && instanceSettings.native) ? instanceSettings.native : {};
 
+        // Cache auth header for proxy endpoints
+        this._authHeader = (native.user || native.pass)
+            ? 'Basic ' + Buffer.from((native.user || '') + ':' + (native.pass || '')).toString('base64')
+            : null;
+
         // ── REST API ─────────────────────────────────────────────────────────
         // Must be registered before the static file handler (Express matches in order)
         app.get('/' + ROUTE + '/api/cameras', (req, res) => {
@@ -108,6 +113,16 @@ class AgentDvrWeb {
                     });
                 }
 
+                // Replace stream URLs with proxy URLs when enableStreamProxy is on
+                if (native.enableStreamProxy) {
+                    Object.values(cameras).forEach(cam => {
+                        if (cam.oid) {
+                            cam.mjpegUrl    = '/' + ROUTE + '/api/mjpeg?oid=' + cam.oid;
+                            cam.snapshotUrl = '/' + ROUTE + '/api/snap?oid='  + cam.oid;
+                        }
+                    });
+                }
+
                 // Build aspect from data.width / data.height states written by flattenWrite.
                 // Reading from ioBroker states is reliable regardless of whether the web
                 // extension runs in the same process as the main adapter.
@@ -159,6 +174,53 @@ class AgentDvrWeb {
             }));
         });
 
+        // ── MJPEG stream proxy (optional: enableStreamProxy) ─────────────────
+        app.get('/' + ROUTE + '/api/mjpeg', (req, res) => {
+            const base = (native.ip && native.port) ? 'http://' + native.ip + ':' + native.port : '';
+            if (!base) { res.status(503).end('AgentDVR not configured'); return; }
+            const oid = String(req.query.oid || '');
+            if (!oid || !/^\d+$/.test(oid)) { res.status(400).end('invalid oid'); return; }
+            const url = base + '/video.mjpg?oid=' + oid;
+            let target;
+            try { target = new URL(url); } catch (_) { res.status(500).end(); return; }
+            const mod = target.protocol === 'https:' ? https : http;
+            const headers = {};
+            if (this._authHeader) headers['Authorization'] = this._authHeader;
+            const upReq = mod.get({ hostname: target.hostname, port: target.port, path: target.pathname + target.search, headers }, upstream => {
+                res.setHeader('Content-Type', upstream.headers['content-type'] || 'multipart/x-mixed-replace');
+                res.setHeader('Cache-Control', 'no-cache');
+                res.setHeader('X-Accel-Buffering', 'no');
+                upstream.pipe(res);
+                upstream.on('error', () => { if (!res.headersSent) res.status(502).end(); else res.end(); });
+            });
+            upReq.setTimeout(0); // no timeout for infinite MJPEG stream
+            upReq.on('error', () => { if (!res.headersSent) res.status(502).end(); else res.end(); });
+            req.on('close', () => { try { upReq.destroy(); } catch (_) {} });
+        });
+
+        // ── Snapshot proxy (optional: enableStreamProxy) ──────────────────────
+        app.get('/' + ROUTE + '/api/snap', (req, res) => {
+            const base = (native.ip && native.port) ? 'http://' + native.ip + ':' + native.port : '';
+            if (!base) { res.status(503).end('AgentDVR not configured'); return; }
+            const oid = String(req.query.oid || '');
+            if (!oid || !/^\d+$/.test(oid)) { res.status(400).end('invalid oid'); return; }
+            const url = base + '/grab.jpg?oid=' + oid;
+            let target;
+            try { target = new URL(url); } catch (_) { res.status(500).end(); return; }
+            const mod = target.protocol === 'https:' ? https : http;
+            const headers = {};
+            if (this._authHeader) headers['Authorization'] = this._authHeader;
+            const upReq = mod.get({ hostname: target.hostname, port: target.port, path: target.pathname + target.search, headers }, upstream => {
+                res.setHeader('Content-Type', upstream.headers['content-type'] || 'image/jpeg');
+                res.setHeader('Cache-Control', 'no-cache');
+                upstream.pipe(res);
+                upstream.on('error', () => { if (!res.headersSent) res.status(502).end(); else res.end(); });
+            });
+            upReq.setTimeout(8000, () => upReq.destroy());
+            upReq.on('error', () => { if (!res.headersSent) res.status(502).end(); else res.end(); });
+            req.on('close', () => { try { upReq.destroy(); } catch (_) {} });
+        });
+
         // ── FLV stream proxy (avoids browser CORS block for flv.js XHR) ────────
         app.get('/' + ROUTE + '/api/stream', (req, res) => {
             const base = (native.ip && native.port) ? 'http://' + native.ip + ':' + native.port : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.agent-dvr",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Connects ioBroker to AgentDVR: auto-discovers cameras, mirrors all device values as data points, delivers real-time triggers on new recordings, and generates a responsive HTML gallery with optional search and tag filtering.",
   "author": {
     "name": "ipod86",