@apocaliss92/nodelink-js 0.6.5 → 0.6.6

package/dist/cli/rtsp-server.js

@@ -3,7 +3,7 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-WQ2TQCYP.js";
+} from "../chunk-JQ5NSEVD.js";
 import "../chunk-IQVVVSXO.js";
 import {
   __require

package/dist/index.cjs

@@ -17700,6 +17700,30 @@ function buildSetNtpXml(current, patch) {
   );
 }
 
+// src/reolink/baichuan/utils/channelEnumeration.ts
+async function resolveBaichuanChannels(deps) {
+  const fromPush = dedupeSorted(deps.pushChannels);
+  if (fromPush.length > 0) return fromPush;
+  const slots = dedupeSorted(deps.supportChnIds);
+  const candidates = slots.length > 0 ? slots : [0];
+  const probed = await Promise.all(
+    candidates.map(
+      async (channel) => await deps.probe(channel) ? channel : void 0
+    )
+  );
+  return dedupeSorted(
+    probed.filter((c) => c !== void 0)
+  );
+}
+function dedupeSorted(values) {
+  const set = /* @__PURE__ */ new Set();
+  for (const v of values) {
+    const n = Number(v);
+    if (Number.isFinite(n) && n >= 0) set.add(n);
+  }
+  return [...set].sort((a, b) => a - b);
+}
+
 // src/reolink/baichuan/utils/dst.ts
 init_xml();
 var parseNumberSafe3 = (text) => {
@@ -24109,13 +24133,21 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    * @param options.source - Data source for the channel list (default: `"cgi"`):
    *   - `"cgi"`: Uses HTTP `GetChannelstatus` — returns the channel list immediately,
    *     no dependency on async push messages. Recommended for first-call discovery.
-   *   - `"baichuan"`: Uses the cmd_id 145 push cache populated when the NVR sends channel
-   *     info after login + event subscription. This push is *asynchronous*: if it has not
-   *     arrived yet, the result will have zero channels. Callers must retry (nvr.ts does this
-   *     with a 1-second loop). Note: explicitly requesting cmd_id 145 is not supported.
+   *   - `"baichuan"`: HTTP-free discovery. Prefers the cmd_id 145 push cache when
+   *     populated; otherwise actively probes the channel slots advertised by Support
+   *     (`items[].chnID`) via `getInfo`. Use this for hubs with HTTP disabled.
+   *
+   * When the api was constructed with `nativeOnly`, the source is forced to
+   * `"baichuan"` regardless of this option (no HTTP/CGI is ever attempted).
    */
   async getNvrChannelsSummary(options) {
-    const source = options?.source ?? "cgi";
+    const source = this.nativeOnly ? "baichuan" : options?.source ?? "cgi";
+    const support = await this.getSupportInfo().catch(() => {
+      this.logger.error?.(
+        "[ReolinkBaichuanApi] getNvrChannelsSummary: failed to get support info"
+      );
+      return void 0;
+    });
     let channels;
     const cgiStatusByChannel = /* @__PURE__ */ new Map();
     if (options?.channels?.length) {
@@ -24145,15 +24177,31 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
         channels = [];
       }
     } else {
-      const pushInfo2 = this.getChannelInfoFromPushCache();
-      channels = Array.from(pushInfo2.keys()).map((c) => Number(c)).filter((n) => Number.isFinite(n));
+      const pushChannels = Array.from(
+        this.getChannelInfoFromPushCache().keys()
+      ).map((c) => Number(c)).filter((n) => Number.isFinite(n));
+      const supportChnIds = (support?.items ?? []).map((i) => Number(i.chnID)).filter((n) => Number.isFinite(n));
+      const probeTimeoutMs = options?.timeoutMs ?? 2500;
+      channels = await resolveBaichuanChannels({
+        pushChannels,
+        supportChnIds,
+        probe: async (channel) => {
+          try {
+            await this.getInfo(channel, {
+              timeoutMs: probeTimeoutMs,
+              tags: ["type", "name"]
+            });
+            return true;
+          } catch {
+            return false;
+          }
+        }
+      });
+      this.logger.debug?.(
+        `[ReolinkBaichuanApi] getNvrChannelsSummary: baichuan resolved ${channels.length} channel(s): [${channels.join(", ")}]`
+      );
     }
     channels = channels.sort((a, b) => a - b);
-    const support = await this.getSupportInfo().catch(() => {
-      this.logger.error?.(
-        "[ReolinkBaichuanApi] getNvrChannelsSummary: failed to get support info"
-      );
-    });
     const truthyNumberLike = (v) => {
       if (typeof v === "number") return v > 0;
       if (typeof v === "string") {