iobroker.agent-dvr 0.1.0 → 0.2.1

package/build/main.js

@@ -282,6 +282,7 @@ window.ADVscan=scan;scan();
 `.trim();
 class AgentDvr extends utils.Adapter {
   pollTimer = void 0;
+  pollBusy = false;
   refreshTimer = void 0;
   authHeader = null;
   baseUrl = "";
@@ -291,6 +292,7 @@ class AgentDvr extends utils.Adapter {
   ptzActive = /* @__PURE__ */ new Map();
   widgetSig = {};
   profileSig = "";
+  lastCamNames = [];
   lastEventFn = {};
   camAspect = {};
   devById = /* @__PURE__ */ new Map();
@@ -352,47 +354,87 @@ class AgentDvr extends utils.Adapter {
     callback();
   }
   onMessage(obj) {
-    if (!obj || obj.command !== "getGo2rtcStreams") {
+    if (!obj) {
       return;
     }
-    void this.fetchGo2rtcStreams().then((streams) => {
-      this.sendTo(obj.from, obj.command, { streams }, obj.callback);
-    });
+    if (obj.command === "getGo2rtcStreams") {
+      const overrideUrl = typeof obj.message === "object" && obj.message !== null ? obj.message.url : void 0;
+      void this.fetchGo2rtcStreams(overrideUrl).then((result) => {
+        this.sendTo(obj.from, obj.command, result, obj.callback);
+      });
+    } else if (obj.command === "getAgentDvrCameras") {
+      this.sendTo(obj.from, obj.command, { cameras: this.lastCamNames }, obj.callback);
+    } else if (obj.command === "getAvailableSources") {
+      void this.fetchAvailableSources().then((result) => {
+        this.sendTo(obj.from, obj.command, result, obj.callback);
+      });
+    }
   }
-  fetchGo2rtcStreams() {
-    return new Promise((resolve) => {
-      const url = this.config.go2rtcUrl;
-      if (!url) {
-        resolve([]);
-        return;
-      }
-      let target;
-      try {
-        target = new URL("/api/streams", url);
-      } catch {
-        resolve([]);
-        return;
-      }
+  async fetchAvailableSources() {
+    const deadline = new Promise(
+      (res) => this.setTimeout(() => res({ result: [{ source: "!", name: "Timeout" }] }), 5e3)
+    );
+    return Promise.race([this._doFetchAvailableSources(), deadline]);
+  }
+  async _doFetchAvailableSources() {
+    const rows = [];
+    for (const c of this.lastCamNames) {
+      rows.push({ source: "AgentDVR", name: `${c.name} (${c.key})` });
+    }
+    const { streams } = await this.fetchGo2rtcStreams();
+    for (const s of streams) {
+      rows.push({ source: "go2rtc", name: s });
+    }
+    if (!rows.length) {
+      rows.push({ source: "\u2014", name: "No sources found (adapter has not polled yet)" });
+    }
+    return { result: rows };
+  }
+  fetchGo2rtcStreams(overrideUrl) {
+    const url = (overrideUrl || this.config.go2rtcUrl || "").replace(/^https:\/\//i, "http://");
+    if (!url) {
+      return Promise.resolve({ streams: [], error: "go2rtcUrl not configured" });
+    }
+    let target;
+    try {
+      target = new URL("/api/streams", url);
+    } catch {
+      return Promise.resolve({ streams: [], error: `Invalid URL: ${url}` });
+    }
+    let httpReq;
+    const fetch = new Promise((resolve) => {
       const mod = target.protocol === "https:" ? https : http;
-      const req = mod.get(target.toString(), (res) => {
+      httpReq = mod.get(target.toString(), (res) => {
         let body = "";
         res.on("data", (c) => {
           body += c.toString();
         });
         res.on("end", () => {
           try {
-            resolve(Object.keys(JSON.parse(body) || {}));
+            const parsed = JSON.parse(body);
+            const streams = Object.keys(parsed || {});
+            resolve({
+              streams,
+              error: streams.length === 0 ? "go2rtc reachable but no streams configured" : void 0
+            });
           } catch {
-            resolve([]);
+            resolve({
+              streams: [],
+              error: `Invalid JSON response from go2rtc (HTTP ${res.statusCode})`
+            });
           }
         });
-        res.on("error", () => resolve([]));
-      });
-      req.setTimeout(4e3, () => {
-        req.destroy();
+        res.on("error", (e) => resolve({ streams: [], error: `Stream error: ${e.message}` }));
       });
-      req.on("error", () => resolve([]));
+      httpReq.on("error", (e) => resolve({ streams: [], error: `Connection error: ${e.message}` }));
     });
+    const timeout = new Promise(
+      (resolve) => this.setTimeout(() => {
+        httpReq == null ? void 0 : httpReq.destroy();
+        resolve({ streams: [], error: `Timeout fetching ${target.toString()}` });
+      }, 3e3)
+    );
+    return Promise.race([fetch, timeout]);
   }
   onStateChange(id, state) {
     if (!state || state.ack !== false) {
@@ -1119,93 +1161,103 @@ class AgentDvr extends utils.Adapter {
   // ---- main poll ----
   async poll() {
     var _a, _b;
-    const res = await this.apiGet("/command/getObjects");
-    const json = asJson(res.data);
-    if (!res.ok || !json) {
-      await this.setStateAsync("info.connection", false, true);
-      await this.setStateAsync("system.online", { val: false, ack: true });
-      this.log.warn(`AgentDVR unreachable: ${res.error || "invalid response"}`);
+    if (this.pollBusy) {
+      this.log.debug("poll() skipped \u2014 previous run still in progress");
       return;
     }
-    await this.setStateAsync("info.connection", true, true);
-    await this.setStateAsync("system.online", { val: true, ack: true });
-    if (json.settings) {
-      await this.flattenWrite(json.settings, "system.settings", 0);
-    }
-    if (this.config.storeRawJson) {
-      const clean = { ...json };
-      delete clean.icons;
-      await this.writeLeaf("system.raw_getObjects", JSON.stringify(clean).slice(0, 6e4));
-    }
-    const devices = findDevices(json);
-    await this.setStateAsync("system.cameraCount", { val: devices.filter((d) => d.ot === 2).length, ack: true });
-    const activeFolders = new Set(devices.map((d) => this.deviceFolder(d)));
-    for (const d of devices) {
-      await this.buildDevice(d);
-    }
-    await this.pruneStaleDevices(activeFolders);
-    const stats = asJson((await this.apiGet("/command/getSystemStats")).data);
-    if (stats) {
-      await this.flattenWrite(stats, "system.stats", 0);
-      const gb = parseSizeGb(stats.disk_free);
-      if (gb !== null) {
-        await this.writeLeaf("system.disk_free_gb", gb);
+    this.pollBusy = true;
+    try {
+      const res = await this.apiGet("/command/getObjects");
+      const json = asJson(res.data);
+      if (!res.ok || !json) {
+        await this.setStateAsync("info.connection", false, true);
+        await this.setStateAsync("system.online", { val: false, ack: true });
+        this.log.warn(`AgentDVR unreachable: ${res.error || "invalid response"}`);
+        return;
       }
-    }
-    const status = asJson((await this.apiGet("/command/getStatus")).data);
-    if (status) {
-      await this.flattenWrite(status, "system.status", 0);
-    }
-    if (this.config.enableSystemControls && Array.isArray(json.profiles)) {
-      const states = {};
-      let activeInd = null;
-      for (const p of json.profiles) {
-        if (p && typeof p === "object") {
-          const po = p;
-          const ind = (_b = (_a = po.id) != null ? _a : po.ind) != null ? _b : po.index;
-          const pname = po.name;
-          if (typeof ind === "number" && (typeof pname === "string" || typeof pname === "number")) {
-            states[ind] = String(pname);
-            if (po.active === true) {
-              activeInd = ind;
-            }
-          }
+      await this.setStateAsync("info.connection", true, true);
+      await this.setStateAsync("system.online", { val: true, ack: true });
+      if (json.settings) {
+        await this.flattenWrite(json.settings, "system.settings", 0);
+      }
+      if (this.config.storeRawJson) {
+        const clean = { ...json };
+        delete clean.icons;
+        await this.writeLeaf("system.raw_getObjects", JSON.stringify(clean).slice(0, 6e4));
+      }
+      const devices = findDevices(json);
+      this.lastCamNames = devices.filter((d) => d.ot === 2).map((d) => ({ key: this.deviceFolder(d), name: d.name }));
+      await this.setStateAsync("system.cameraCount", { val: devices.filter((d) => d.ot === 2).length, ack: true });
+      const activeFolders = new Set(devices.map((d) => this.deviceFolder(d)));
+      for (const d of devices) {
+        await this.buildDevice(d);
+      }
+      await this.pruneStaleDevices(activeFolders);
+      const stats = asJson((await this.apiGet("/command/getSystemStats")).data);
+      if (stats) {
+        await this.flattenWrite(stats, "system.stats", 0);
+        const gb = parseSizeGb(stats.disk_free);
+        if (gb !== null) {
+          await this.writeLeaf("system.disk_free_gb", gb);
         }
       }
-      if (Object.keys(states).length > 0) {
-        const sig = JSON.stringify(states);
-        if (sig !== this.profileSig) {
-          this.profileSig = sig;
-          await this.extendObjectAsync("system.profile.selector", { common: { states } });
-          await this.setStateAsync("system.profile.list", { val: sig, ack: true });
+      const status = asJson((await this.apiGet("/command/getStatus")).data);
+      if (status) {
+        await this.flattenWrite(status, "system.status", 0);
+      }
+      if (this.config.enableSystemControls && Array.isArray(json.profiles)) {
+        const states = {};
+        let activeInd = null;
+        for (const p of json.profiles) {
+          if (p && typeof p === "object") {
+            const po = p;
+            const ind = (_b = (_a = po.id) != null ? _a : po.ind) != null ? _b : po.index;
+            const pname = po.name;
+            if (typeof ind === "number" && (typeof pname === "string" || typeof pname === "number")) {
+              states[ind] = String(pname);
+              if (po.active === true) {
+                activeInd = ind;
+              }
+            }
+          }
         }
-        if (activeInd !== null) {
-          await this.setStateAsync("system.profile.selector", { val: activeInd, ack: true });
+        if (Object.keys(states).length > 0) {
+          const sig = JSON.stringify(states);
+          if (sig !== this.profileSig) {
+            this.profileSig = sig;
+            await this.extendObjectAsync("system.profile.selector", { common: { states } });
+            await this.setStateAsync("system.profile.list", { val: sig, ack: true });
+          }
+          if (activeInd !== null) {
+            await this.setStateAsync("system.profile.selector", { val: activeInd, ack: true });
+          }
         }
       }
-    }
-    if (this.config.enableOverview) {
-      const cams = devices.filter((d) => d.ot === 2);
-      const ovId = "overview";
-      if (!this.ensuredFolders.has(ovId)) {
-        await this.setObjectNotExistsAsync(ovId, {
-          type: "state",
-          common: {
-            name: "Overview (all cameras)",
-            type: "string",
-            role: "html",
-            read: true,
-            write: false,
-            def: ""
-          },
-          native: {}
-        });
-        this.ensuredFolders.add(ovId);
+      if (this.config.enableOverview) {
+        const cams = devices.filter((d) => d.ot === 2);
+        const ovId = "overview";
+        if (!this.ensuredFolders.has(ovId)) {
+          await this.setObjectNotExistsAsync(ovId, {
+            type: "state",
+            common: {
+              name: "Overview (all cameras)",
+              type: "string",
+              role: "html",
+              read: true,
+              write: false,
+              def: ""
+            },
+            native: {}
+          });
+          this.ensuredFolders.add(ovId);
+        }
+        await this.setStateAsync(ovId, { val: this.buildOverviewHtml(cams), ack: true });
       }
-      await this.setStateAsync(ovId, { val: this.buildOverviewHtml(cams), ack: true });
+      await this.setStateAsync("system.lastUpdate", { val: (/* @__PURE__ */ new Date()).toISOString(), ack: true });
+      await this.setStateAsync("system.lastPoll", { val: Date.now(), ack: true });
+    } finally {
+      this.pollBusy = false;
     }
-    await this.setStateAsync("system.lastUpdate", { val: (/* @__PURE__ */ new Date()).toISOString(), ack: true });
-    await this.setStateAsync("system.lastPoll", { val: Date.now(), ack: true });
   }
   scheduleRefresh() {
     if (this.refreshTimer !== void 0) {