iobroker.agent-dvr 0.2.2 → 0.4.0

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "agent-dvr",
-    "version": "0.2.2",
+    "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",
+        "ru": "Новые кнопки управления (расписание, детектор, чувствительность), URL-состояния для микрофонов, нативный полноэкранный режим, сворачиваемый фильтр меток",
+        "pt": "Novos botões de controlo (schedule, detector, sensibilidade), URLs de áudio para microfones, tela cheia nativa, filtro de etiquetas recolhível",
+        "nl": "Nieuwe besturingsknoppen (schema, detector, gevoeligheid), audio-URL-staten voor microfoons, native browserfullscreen, inklapbaar labelfilter",
+        "fr": "Nouveaux boutons de commande (planification, détecteur, sensibilité), états URL audio pour microphones, plein écran natif, filtre d'étiquettes rétractable",
+        "it": "Nuovi pulsanti di controllo (pianificazione, rilevatore, sensibilità), stati URL audio per microfoni, schermo intero nativo, filtro etichette comprimibile",
+        "es": "Nuevos botones de control (programación, detector, sensibilidad), estados de URL de audio para micrófonos, pantalla completa nativa, filtro de etiquetas plegable",
+        "pl": "Nowe przyciski sterowania (harmonogram, detektor, czułość), stany URL audio dla mikrofonów, natywny pełny ekran, zwijany filtr etykiet",
+        "zh-cn": "新增控制按钮（计划、检测器、灵敏度），麦克风音频URL状态，本地浏览器全屏，可折叠标签过滤器",
+        "uk": "Нові кнопки керування (розклад, детектор, чутливість), стани URL аудіо для мікрофонів, нативний повноекранний режим, згортуваний фільтр міток"
+      },
       "0.2.2": {
         "en": "fix: translate remaining German strings in DashboardPanel to English via I18n.t()\nfix: add i18n keys loadingCamerasAndStreams, cfgCameraColumn, cfgStreamSourceColumn, reload in all 11 languages\nchore: replace POSIX mv with cross-platform node rename in src-admin build script",
         "de": "Behebung: Die verbleibenden deutschen Zeichenketten im DashboardPanel werden mithilfe von I18n.t() ins Englische übersetzt.\nBehebung: Hinzufügen der i18n-Schlüssel loadingCamerasAndStreams, cfgCameraColumn, cfgStreamSourceColumn und reload in allen 11 Sprachen\nAufgabe: Ersetzen Sie POSIX mv durch plattformübergreifendes Node-Rename im src-admin-Build-Skript.",
@@ -67,32 +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 代理）；自动删除过时摄像头；修正录像上一个/下一个顺序"
-      },
-      "0.0.4": {
-        "en": "fix DP roles: snapshot_b64 role state, profile selector role level",
-        "de": "DP-Rollen korrigiert: snapshot_b64 role state, Profil-Selektor role level",
-        "ru": "исправлены роли DP: snapshot_b64 role state, селектор профиля role level",
-        "pt": "corrigir roles DP: snapshot_b64 role state, seletor de perfil role level",
-        "nl": "DP-rollen gecorrigeerd: snapshot_b64 role state, profielkiezer role level",
-        "fr": "correction des rôles DP: snapshot_b64 role state, sélecteur de profil role level",
-        "it": "corretto ruoli DP: snapshot_b64 role state, selettore profilo role level",
-        "es": "corregir roles DP: snapshot_b64 role state, selector de perfil role level",
-        "pl": "poprawiono role DP: snapshot_b64 role state, selektor profilu role level",
-        "uk": "виправлено ролі DP: snapshot_b64 role state, вибір профілю role level",
-        "zh-cn": "修正 DP 角色：snapshot_b64 角色 state，配置文件选择器角色 level"
       }
     },
     "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.2.2",
+  "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",