@apocaliss92/nodelink-js 0.6.5 → 0.6.7

package/dist/cli/rtsp-server.cjs

@@ -8836,6 +8836,38 @@ function createRtspFlow(transport, videoType) {
   return new H265Flow(transport);
 }
 
+// src/baichuan/stream/rtpVideoTimestamp.ts
+var U32 = 4294967296;
+var DEFAULT_VIDEO_CLOCK_RATE = 9e4;
+function deriveRtpVideoTimestamp(state, frameMicroseconds, clockRate = DEFAULT_VIDEO_CLOCK_RATE) {
+  if (frameMicroseconds === null || frameMicroseconds === void 0 || !Number.isFinite(frameMicroseconds)) {
+    return { timestamp: state.timestamp, state };
+  }
+  const curRaw = frameMicroseconds >>> 0;
+  if (state.baseUnwrappedUs === void 0) {
+    return {
+      timestamp: state.timestamp,
+      state: {
+        ...state,
+        unwrappedUs: curRaw,
+        lastRawUs: curRaw,
+        baseUnwrappedUs: curRaw,
+        baseTimestamp: state.timestamp
+      }
+    };
+  }
+  const lastRaw = state.lastRawUs ?? curRaw;
+  let forwardDelta = curRaw - lastRaw >>> 0;
+  if (forwardDelta > U32 / 2) forwardDelta = 0;
+  const unwrappedUs = (state.unwrappedUs ?? curRaw) + forwardDelta;
+  const deltaUs = unwrappedUs - state.baseUnwrappedUs;
+  const timestamp = state.baseTimestamp + Math.round(deltaUs * clockRate / 1e6) >>> 0;
+  return {
+    timestamp,
+    state: { ...state, unwrappedUs, lastRawUs: curRaw, timestamp }
+  };
+}
+
 // src/baichuan/stream/BaichuanRtspServer.ts
 init_H264Converter();
 init_H265Converter();
@@ -9410,7 +9442,10 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events3.E
     let useTcpInterleaved = false;
     let clientUdpSocket = null;
     let clientUdpSocketAudio = null;
+    let cleanedUp = false;
     const cleanup = () => {
+      if (cleanedUp) return;
+      cleanedUp = true;
       const sessionDurationMs = Date.now() - connectTime;
       const res = this.clientResources.get(clientId);
       const framesSent = res?.framesSent ?? 0;
@@ -10158,22 +10193,25 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events3.E
         resources.rtpVideoTimestamp = 0;
       if (resources.rtpVideoBaseTimestamp === void 0)
         resources.rtpVideoBaseTimestamp = resources.rtpVideoTimestamp;
-      if (resources.rtpVideoBaseMicroseconds === void 0) {
+      const { timestamp, state } = deriveRtpVideoTimestamp(
+        {
+          timestamp: resources.rtpVideoTimestamp,
+          baseTimestamp: resources.rtpVideoBaseTimestamp,
+          unwrappedUs: resources.rtpVideoUnwrappedUs,
+          lastRawUs: resources.rtpVideoLastRawUs,
+          baseUnwrappedUs: resources.rtpVideoBaseUnwrappedUs
+        },
+        frameMicroseconds,
+        videoClockRate
+      );
+      resources.rtpVideoTimestamp = timestamp;
+      resources.rtpVideoBaseTimestamp = state.baseTimestamp;
+      resources.rtpVideoUnwrappedUs = state.unwrappedUs;
+      resources.rtpVideoLastRawUs = state.lastRawUs;
+      resources.rtpVideoBaseUnwrappedUs = state.baseUnwrappedUs;
+      resources.rtpVideoLastTimestamp = timestamp;
+      if (resources.rtpVideoBaseMicroseconds === void 0)
         resources.rtpVideoBaseMicroseconds = frameMicroseconds >>> 0;
-        resources.rtpVideoLastTimestamp = resources.rtpVideoTimestamp;
-        return;
-      }
-      const baseUs = resources.rtpVideoBaseMicroseconds >>> 0;
-      const curUs = frameMicroseconds >>> 0;
-      const deltaUs = curUs - baseUs >>> 0;
-      const baseTs = (resources.rtpVideoBaseTimestamp ?? 0) >>> 0;
-      let ts = baseTs + Math.round(deltaUs * videoClockRate / 1e6) >>> 0;
-      const last = resources.rtpVideoLastTimestamp;
-      if (last !== void 0 && ts <= last >>> 0) {
-        ts = (last >>> 0) + 1 >>> 0;
-      }
-      resources.rtpVideoTimestamp = ts;
-      resources.rtpVideoLastTimestamp = ts;
     };
     const sendVideoAccessUnit = (videoType, accessUnitAnnexB, advanceTimestamp = true) => {
       const nals = _BaichuanRtspServer.splitAnnexBNals(accessUnitAnnexB);
@@ -17027,6 +17065,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) => {
@@ -23405,13 +23467,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) {
@@ -23441,15 +23511,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") {