iobroker.agent-dvr 0.0.6 → 0.2.0

package/lib/web.js

@@ -42,13 +42,15 @@ class AgentDvrWeb {
                 adapter.getForeignStatesAsync(ns + '.cam_*.status.recording'),
                 adapter.getForeignStatesAsync(ns + '.cam_*.status.detected'),
                 adapter.getForeignStatesAsync(ns + '.cam_*.status.alerted'),
-            ]).then(([nameStates, mjpegStates, snapStates, onlineStates, ptzStates, recStates, detStates, alertStates]) => {
+                adapter.getForeignStatesAsync(ns + '.cam_*.data.width'),
+                adapter.getForeignStatesAsync(ns + '.cam_*.data.height'),
+            ]).then(([nameStates, mjpegStates, snapStates, onlineStates, ptzStates, recStates, detStates, alertStates, widthStates, heightStates]) => {
                 const cameras = {};
 
                 Object.entries(nameStates || {}).forEach(([id, state]) => {
                     const rel    = id.slice(ns.length + 1);
                     const camKey = rel.split('.')[0];
-                    const m      = camKey.match(/^cam_(\d+)_/);
+                    const m      = camKey.match(/^cam_(\d+)/);
                     cameras[camKey] = {
                         name:        (state && state.val != null) ? String(state.val) : camKey,
                         oid:         m ? m[1] : null,
@@ -106,6 +108,23 @@ class AgentDvrWeb {
                     });
                 }
 
+                // 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.
+                const wMap = {}, hMap = {};
+                Object.entries(widthStates  || {}).forEach(([id, s]) => {
+                    const k = id.slice(ns.length + 1).split('.')[0];
+                    if (s && typeof s.val === 'number') wMap[k] = s.val;
+                });
+                Object.entries(heightStates || {}).forEach(([id, s]) => {
+                    const k = id.slice(ns.length + 1).split('.')[0];
+                    if (s && typeof s.val === 'number') hMap[k] = s.val;
+                });
+                Object.entries(cameras).forEach(([k, cam]) => {
+                    const w = wMap[k], h = hMap[k];
+                    cam.aspect = (w >= 100 && h >= 100 && w / h >= 0.3 && w / h <= 4) ? w + '/' + h : '';
+                });
+
                 res.setHeader('Content-Type', 'application/json');
                 res.end(JSON.stringify({ instance: ns, base, cameras }));
             }).catch(err => {
@@ -132,15 +151,41 @@ class AgentDvrWeb {
                 dashColorOnline:     native.dashColorOnline     || '#22c55e',
                 dashColorOffline:    native.dashColorOffline    || '#ef4444',
                 dashTagPosition:     native.dashTagPosition     || 'top-right',
-                go2rtcEnabled:       !!native.go2rtcEnabled,
+                dashStreamType:      native.dashStreamType      || 'mjpeg',
                 go2rtcUrl:           native.go2rtcUrl           || '',
                 go2rtcMapping:       Array.isArray(native.go2rtcMapping) ? native.go2rtcMapping : [],
+                cameraStreams:       (native.cameraStreams && typeof native.cameraStreams === 'object') ? native.cameraStreams : {},
+                dashLiveSource:      native.dashLiveSource      || 'agentdvr',
             }));
         });
 
+        // ── 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 : '';
+            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 size = String(req.query.size || '');
+            const sizeStr = /^\d{1,5}x\d{1,5}$/.test(size) ? '&size=' + size : '';
+            const url = base + '/video.mp4?oid=' + oid + sizeStr;
+            let target;
+            try { target = new URL(url); } catch (_) { res.status(500).end(); return; }
+            const mod = target.protocol === 'https:' ? https : http;
+            const upReq = mod.get(url, upstream => {
+                res.setHeader('Content-Type', 'video/x-flv');
+                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(8000, () => upReq.destroy());
+            upReq.on('error', () => { if (!res.headersSent) res.status(502).end(); else res.end(); });
+            req.on('close', () => { try { upReq.destroy(); } catch (_) {} });
+        });
+
         // ── go2rtc streams proxy ─────────────────────────────────────────────
         app.get('/' + ROUTE + '/api/go2rtc/streams', (req, res) => {
-            if (!native.go2rtcEnabled || !native.go2rtcUrl) {
+            if (!native.go2rtcUrl) {
                 res.setHeader('Content-Type', 'application/json');
                 res.end('{"streams":[]}');
                 return;
@@ -235,6 +280,8 @@ class AgentDvrWeb {
                 if (err) { res.status(404).end('Not found'); return; }
                 const ext = path.extname(file).toLowerCase();
                 res.setHeader('Content-Type', MIME[ext] || 'application/octet-stream');
+                // HTML must never be cached so updates are visible immediately
+                if (ext === '.html') res.setHeader('Cache-Control', 'no-store');
                 res.end(data);
             });
         });
@@ -244,7 +291,7 @@ class AgentDvrWeb {
         // ── WebSocket proxy for go2rtc (bypasses browser cross-origin block) ─
         server.on('upgrade', (req, socket, head) => {
             if (!(req.url || '').startsWith('/' + ROUTE + '/api/ws')) return;
-            if (!native.go2rtcEnabled || !native.go2rtcUrl) {
+            if (!native.go2rtcUrl) {
                 socket.write('HTTP/1.1 503 Service Unavailable\r\n\r\n');
                 socket.destroy();
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.agent-dvr",
-  "version": "0.0.6",
+  "version": "0.2.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",