iobroker.agent-dvr 0.2.1 → 0.3.0

package/admin/i18n/es.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "URL base del servidor go2rtc, p. ej. http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Selecciona la fuente de stream por cámara: MJPEG, MP4/FLV (vía AgentDVR) o un stream go2rtc.",
   "cfgIpMissing": "La dirección IP de AgentDVR es obligatoria",
-  "cfgNoCamerasFound": "No se encontraron cámaras — ¿el adaptador está configurado y ha realizado al menos un sondeo?"
-}
+  "cfgNoCamerasFound": "No se encontraron cámaras — ¿el adaptador está configurado y ha realizado al menos un sondeo?",
+  "loadingCamerasAndStreams": "Cargando cámaras y streams…",
+  "cfgCameraColumn": "Cámara AgentDVR",
+  "cfgStreamSourceColumn": "Fuente de stream",
+  "reload": "Recargar"
+}

package/admin/i18n/fr.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "URL de base du serveur go2rtc, par ex. http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Sélectionnez la source de flux par caméra : MJPEG, MP4/FLV (via AgentDVR) ou un flux go2rtc.",
   "cfgIpMissing": "L'adresse IP AgentDVR est requise",
-  "cfgNoCamerasFound": "Aucune caméra trouvée — l'adaptateur est-il configuré et a-t-il effectué au moins un sondage ?"
-}
+  "cfgNoCamerasFound": "Aucune caméra trouvée — l'adaptateur est-il configuré et a-t-il effectué au moins un sondage ?",
+  "loadingCamerasAndStreams": "Chargement des caméras et des flux…",
+  "cfgCameraColumn": "Caméra AgentDVR",
+  "cfgStreamSourceColumn": "Source du flux",
+  "reload": "Recharger"
+}

package/admin/i18n/it.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "URL base del server go2rtc, es. http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Seleziona la sorgente del flusso per telecamera: MJPEG, MP4/FLV (tramite AgentDVR) o un flusso go2rtc.",
   "cfgIpMissing": "L'indirizzo IP di AgentDVR è obbligatorio",
-  "cfgNoCamerasFound": "Nessuna telecamera trovata — l'adattatore è configurato e ha eseguito almeno un polling?"
-}
+  "cfgNoCamerasFound": "Nessuna telecamera trovata — l'adattatore è configurato e ha eseguito almeno un polling?",
+  "loadingCamerasAndStreams": "Caricamento telecamere e stream…",
+  "cfgCameraColumn": "Telecamera AgentDVR",
+  "cfgStreamSourceColumn": "Sorgente stream",
+  "reload": "Ricarica"
+}

package/admin/i18n/nl.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "Basis-URL van de go2rtc-server, bijv. http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Selecteer de streambron per camera: MJPEG, MP4/FLV (via AgentDVR) of een go2rtc-stream.",
   "cfgIpMissing": "Het AgentDVR IP-adres is vereist",
-  "cfgNoCamerasFound": "Geen camera's gevonden — is de adapter geconfigureerd en heeft hij minstens één keer gepolld?"
-}
+  "cfgNoCamerasFound": "Geen camera's gevonden — is de adapter geconfigureerd en heeft hij minstens één keer gepolld?",
+  "loadingCamerasAndStreams": "Camera's en streams laden…",
+  "cfgCameraColumn": "AgentDVR Camera",
+  "cfgStreamSourceColumn": "Streambron",
+  "reload": "Herladen"
+}

package/admin/i18n/pl.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "Bazowy URL serwera go2rtc, np. http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Wybierz źródło strumienia dla każdej kamery: MJPEG, MP4/FLV (przez AgentDVR) lub strumień go2rtc.",
   "cfgIpMissing": "Adres IP AgentDVR jest wymagany",
-  "cfgNoCamerasFound": "Nie znaleziono kamer — czy adapter jest skonfigurowany i przeprowadził co najmniej jedno odpytywanie?"
-}
+  "cfgNoCamerasFound": "Nie znaleziono kamer — czy adapter jest skonfigurowany i przeprowadził co najmniej jedno odpytywanie?",
+  "loadingCamerasAndStreams": "Ładowanie kamer i strumieni…",
+  "cfgCameraColumn": "Kamera AgentDVR",
+  "cfgStreamSourceColumn": "Źródło strumienia",
+  "reload": "Odśwież"
+}

package/admin/i18n/pt.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "URL base do servidor go2rtc, ex. http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Selecione a fonte de fluxo por câmera: MJPEG, MP4/FLV (via AgentDVR) ou um fluxo go2rtc.",
   "cfgIpMissing": "O endereço IP do AgentDVR é obrigatório",
-  "cfgNoCamerasFound": "Nenhuma câmera encontrada — o adaptador está configurado e realizou pelo menos uma consulta?"
-}
+  "cfgNoCamerasFound": "Nenhuma câmera encontrada — o adaptador está configurado e realizou pelo menos uma consulta?",
+  "loadingCamerasAndStreams": "Carregando câmeras e streams…",
+  "cfgCameraColumn": "Câmera AgentDVR",
+  "cfgStreamSourceColumn": "Fonte de stream",
+  "reload": "Recarregar"
+}

package/admin/i18n/ru.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "Базовый URL сервера go2rtc, например http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Выберите источник потока для каждой камеры: MJPEG, MP4/FLV (через AgentDVR) или поток go2rtc.",
   "cfgIpMissing": "IP-адрес AgentDVR обязателен",
-  "cfgNoCamerasFound": "Камеры не найдены — настроен ли адаптер и выполнен ли хотя бы один опрос?"
-}
+  "cfgNoCamerasFound": "Камеры не найдены — настроен ли адаптер и выполнен ли хотя бы один опрос?",
+  "loadingCamerasAndStreams": "Загрузка камер и потоков…",
+  "cfgCameraColumn": "Камера AgentDVR",
+  "cfgStreamSourceColumn": "Источник потока",
+  "reload": "Обновить"
+}

package/admin/i18n/uk.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "Базова URL-адреса сервера go2rtc, напр. http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "Виберіть джерело потоку для кожної камери: MJPEG, MP4/FLV (через AgentDVR) або потік go2rtc.",
   "cfgIpMissing": "IP-адреса AgentDVR є обов'язковою",
-  "cfgNoCamerasFound": "Камери не знайдено — адаптер налаштовано та виконано принаймні один опит?"
-}
+  "cfgNoCamerasFound": "Камери не знайдено — адаптер налаштовано та виконано принаймні один опит?",
+  "loadingCamerasAndStreams": "Завантаження камер і потоків…",
+  "cfgCameraColumn": "Камера AgentDVR",
+  "cfgStreamSourceColumn": "Джерело потоку",
+  "reload": "Оновити"
+}

package/admin/i18n/zh-cn.json

@@ -131,5 +131,9 @@
   "cfgGo2rtcUrl_tt": "go2rtc 服务器的基础 URL，例如 http://192.168.1.1:1984",
   "cfgGo2rtcMapping_tt": "为每个摄像头选择流来源：MJPEG、MP4/FLV（通过AgentDVR）或go2rtc流。",
   "cfgIpMissing": "AgentDVR IP地址为必填项",
-  "cfgNoCamerasFound": "未找到摄像头 — 适配器是否已配置并至少轮询过一次？"
-}
+  "cfgNoCamerasFound": "未找到摄像头 — 适配器是否已配置并至少轮询过一次？",
+  "loadingCamerasAndStreams": "正在加载摄像头和流…",
+  "cfgCameraColumn": "AgentDVR 摄像头",
+  "cfgStreamSourceColumn": "流来源",
+  "reload": "重新加载"
+}

package/admin/index_m.html

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

package/build/main.js

@@ -45,6 +45,10 @@ const CAM_COMMANDS = [
   },
   { id: "recOnAlert", path: "/command/recordOnAlertOn", params: ["oid", "ot"], name: "Record on alert: on" },
   { id: "recOnDetect", path: "/command/recordOnDetectOn", params: ["oid", "ot"], name: "Record on detect: on" },
+  { id: "scheduleOn", path: "/command/scheduleOn", params: ["oid", "ot"], name: "Enable schedule" },
+  { id: "scheduleOff", path: "/command/scheduleOff", params: ["oid", "ot"], name: "Disable schedule" },
+  { id: "detectorOn", path: "/command/switchDetector?on=true", params: ["oid", "ot"], name: "Enable detector" },
+  { id: "detectorOff", path: "/command/switchDetector?on=false", params: ["oid", "ot"], name: "Disable detector" },
   { id: "purge", path: "/command/purge", params: ["oid", "ot"], name: "Purge folder (caution!)" }
 ];
 const SYS_COMMANDS = [
@@ -617,6 +621,19 @@ class AgentDvr extends utils.Adapter {
   ensureButton(id, name, entry) {
     return this.ensureControl(id, name, entry, "button");
   }
+  async ensureLevel(id, name, entry, min, max) {
+    if (!this.ensuredFolders.has(id)) {
+      await this.ensurePath(id);
+      await this.setObjectNotExistsAsync(id, {
+        type: "state",
+        common: { name, type: "number", role: "level", read: true, write: true, min, max },
+        native: {}
+      });
+      await this.setStateAsync(id, { val: 0, ack: true });
+      this.ensuredFolders.add(id);
+    }
+    this.registry.set(id, entry);
+  }
   async ensureSelector(id, name, entry, states) {
     if (!this.ensuredFolders.has(id)) {
       await this.ensurePath(id);
@@ -756,8 +773,9 @@ class AgentDvr extends utils.Adapter {
     await this.flattenWrite(d.raw, fid, 0);
     await this.writeStatusDps(d, fid);
     await this.ensureFolder(`${fid}.control`, "Control", "channel");
+    const CAM_ONLY = /* @__PURE__ */ new Set(["snapshot", "objectDetectOn", "objectDetectOff"]);
     for (const c of CAM_COMMANDS) {
-      if (c.id === "snapshot" && d.ot !== 2) {
+      if (CAM_ONLY.has(c.id) && d.ot !== 2) {
         continue;
       }
       await this.ensureButton(`${fid}.control.${c.id}`, c.name, {
@@ -784,12 +802,41 @@ class AgentDvr extends utils.Adapter {
         }
       }
     }
-    if (this.config.enableUrls && d.ot === 2) {
+    if (d.ot === 2) {
+      const sfx = { kind: "levelCmd", path: "/command/setSensitivity", oid: d.oid, ot: d.ot };
+      await this.ensureLevel(
+        `${fid}.control.sensitivityMin`,
+        "Sensitivity min (0-100)",
+        { ...sfx, valueParam: "min" },
+        0,
+        100
+      );
+      await this.ensureLevel(
+        `${fid}.control.sensitivityMax`,
+        "Sensitivity max (0-100)",
+        { ...sfx, valueParam: "max" },
+        0,
+        100
+      );
+      await this.ensureLevel(
+        `${fid}.control.sensitivityGain`,
+        "Sensitivity gain (0-100)",
+        { ...sfx, valueParam: "gain" },
+        0,
+        100
+      );
+    }
+    if (this.config.enableUrls) {
       await this.ensureFolder(`${fid}.urls`, "URLs", "channel");
-      await this.writeLeaf(`${fid}.urls.snapshot`, `${this.baseUrl}/grab.jpg?oid=${d.oid}`);
-      await this.writeLeaf(`${fid}.urls.photo`, `${this.baseUrl}/photo.jpg?oid=${d.oid}`);
-      await this.writeLeaf(`${fid}.urls.mjpeg`, `${this.baseUrl}/video.mjpg?oids=${d.oid}`);
-      await this.writeLeaf(`${fid}.urls.mp4`, `${this.baseUrl}/video.mp4?oids=${d.oid}`);
+      if (d.ot === 2) {
+        await this.writeLeaf(`${fid}.urls.snapshot`, `${this.baseUrl}/grab.jpg?oid=${d.oid}`);
+        await this.writeLeaf(`${fid}.urls.photo`, `${this.baseUrl}/photo.jpg?oid=${d.oid}`);
+        await this.writeLeaf(`${fid}.urls.mjpeg`, `${this.baseUrl}/video.mjpg?oids=${d.oid}`);
+        await this.writeLeaf(`${fid}.urls.mp4`, `${this.baseUrl}/video.mp4?oids=${d.oid}`);
+      } else if (d.ot === 1) {
+        await this.writeLeaf(`${fid}.urls.audio_mp3`, `${this.baseUrl}/audio.mp3?oid=${d.oid}`);
+        await this.writeLeaf(`${fid}.urls.audio_ogg`, `${this.baseUrl}/audio.ogg?oid=${d.oid}`);
+      }
     }
     if (d.ot === 2) {
       const snapId = `${fid}.snapshot_b64`;
@@ -1288,7 +1335,9 @@ class AgentDvr extends utils.Adapter {
         qs.push(`ot=${encodeURIComponent(String(entry.ot))}`);
       }
     }
-    return (entry.path || "") + (qs.length ? `?${qs.join("&")}` : "");
+    const base = entry.path || "";
+    const sep = base.includes("?") ? "&" : "?";
+    return base + (qs.length ? `${sep}${qs.join("&")}` : "");
   }
   async clearPtzSiblings(stateId) {
     const prefix = stateId.slice(0, stateId.lastIndexOf(".") + 1);
@@ -1318,6 +1367,21 @@ class AgentDvr extends utils.Adapter {
       }
       return;
     }
+    if (entry.kind === "levelCmd") {
+      const num = typeof val === "number" ? val : parseFloat(String(val != null ? val : ""));
+      if (!isNaN(num)) {
+        const url2 = `${entry.path}?oid=${encodeURIComponent(String(entry.oid))}&ot=${encodeURIComponent(String(entry.ot))}&${entry.valueParam}=${Math.round(num)}`;
+        const cmdRes2 = await this.apiGet(url2);
+        if (cmdRes2.ok) {
+          this.log.debug(`OK: ${url2}`);
+          await this.setStateAsync(relId, { val: Math.round(num), ack: true });
+        } else {
+          this.log.warn(`Command failed (${url2}): ${cmdRes2.error}`);
+        }
+        this.scheduleRefresh();
+      }
+      return;
+    }
     if (entry.kind === "snapshotB64") {
       const snapId = `${entry.fid}.snapshot_b64`;
       await this.fetchSnapshotB64(entry.oid, snapId);