@apocaliss92/nodelink-js 0.1.7 → 0.1.9

package/README.md

@@ -1,6 +1,12 @@
-# @apocaliss92/nodelink-js
+<p align="center">
+  <img src="assets/icon.png" alt="nodelink.js" width="128" height="128">
+</p>
 
-A TypeScript library for interacting with Reolink IP cameras and NVRs using the proprietary Baichuan protocol and CGI API.
+<h1 align="center">nodelink.js</h1>
+
+<p align="center">
+  A TypeScript library for interacting with Reolink IP cameras and NVRs using the proprietary Baichuan protocol and CGI API.
+</p>
 
 ## Credits
 
@@ -381,10 +387,7 @@ CAMERA_PASSWORD=your-password
 The library supports custom loggers:
 
 ```typescript
-import {
-  ReolinkBaichuanApi,
-  createLogger,
-} from "@apocaliss92/nodelink-js";
+import { ReolinkBaichuanApi, createLogger } from "@apocaliss92/nodelink-js";
 
 const logger = createLogger({ level: "debug" });
 

package/dist/{DiagnosticsTools-MTXG65O3.js → DiagnosticsTools-EC7DADEQ.js}

@@ -9,7 +9,7 @@ import {
   runMultifocalDiagnosticsConsecutively,
   sampleStreams,
   testChannelStreams
-} from "./chunk-MC2BRLLE.js";
+} from "./chunk-TZFZ5WJX.js";
 export {
   collectCgiDiagnostics,
   collectMultifocalDiagnostics,
@@ -22,4 +22,4 @@ export {
   sampleStreams,
   testChannelStreams
 };
-//# sourceMappingURL=DiagnosticsTools-MTXG65O3.js.map
+//# sourceMappingURL=DiagnosticsTools-EC7DADEQ.js.map

package/dist/{chunk-MC2BRLLE.js → chunk-TZFZ5WJX.js}

@@ -267,17 +267,20 @@ function parseRecordingFileName(fileName) {
   let widthRaw;
   let heightRaw;
   let hexValue = "";
+  let sizeHex;
   if (parts.length === 6) {
     startDate = parts[1] ?? "";
     startTime = parts[2] ?? "";
     endTime = parts[3] ?? "";
     hexValue = parts[4] ?? "";
+    sizeHex = parts[5];
   } else if (parts.length === 7) {
     startDate = parts[1] ?? "";
     startTime = parts[2] ?? "";
     endTime = parts[3] ?? "";
     animalTypeRaw = parts[4];
     hexValue = parts[5] ?? "";
+    sizeHex = parts[6];
   } else if (parts.length === 9) {
     devType = "hub";
     startDate = parts[1] ?? "";
@@ -287,6 +290,7 @@ function parseRecordingFileName(fileName) {
     widthRaw = parts[5];
     heightRaw = parts[6];
     hexValue = parts[7] ?? "";
+    sizeHex = parts[8];
   } else {
     return void 0;
   }
@@ -317,6 +321,12 @@ function parseRecordingFileName(fileName) {
   if (animalTypeRaw != null) parsed.animalTypeRaw = animalTypeRaw;
   if (widthRaw != null) parsed.widthRaw = widthRaw;
   if (heightRaw != null) parsed.heightRaw = heightRaw;
+  if (sizeHex && /^[0-9a-fA-F]+$/.test(sizeHex)) {
+    const sizeBytes = parseInt(sizeHex, 16);
+    if (Number.isFinite(sizeBytes) && sizeBytes > 0) {
+      parsed.sizeBytes = sizeBytes;
+    }
+  }
   return parsed;
 }
 
@@ -2178,15 +2188,18 @@ var ReolinkCgiApi = class _ReolinkCgiApi {
     if (detectionClasses.length === 0) {
       detectionClasses.push("motion");
     }
+    const sizeBytes = typeof vodFile.size === "string" ? parseInt(vodFile.size, 10) : vodFile.size;
     const result = {
       fileName: vodFile.name,
       id: vodFile.name,
-      sizeBytes: vodFile.size,
       startTime,
       endTime,
       recordType: vodFile.type,
       detectionClasses
     };
+    if (Number.isFinite(sizeBytes)) {
+      result.sizeBytes = sizeBytes;
+    }
     if (parsed) {
       result.parsedFileName = parsed;
     }
@@ -4043,13 +4056,31 @@ var BaichuanVideoStream = class _BaichuanVideoStream extends EventEmitter {
           searchStart = bodyEnd + Buffer.from("</body>").length;
         dataToParse = rawCandidate.subarray(searchStart);
       }
+      let encryptLen;
+      if (frame.extension && frame.extension.length > 0) {
+        try {
+          const extDec = this.client.tryDecryptXml(
+            frame.extension,
+            frame.header.channelId,
+            enc
+          );
+          const encryptLenMatch = extDec.match(
+            /<encryptLen>(\d+)<\/encryptLen>/i
+          );
+          if (encryptLenMatch && encryptLenMatch[1]) {
+            encryptLen = parseInt(encryptLenMatch[1], 10);
+          }
+        } catch {
+        }
+      }
       const dataAfterXml = this.chooseDecryptedOrRawCandidate({
         raw: dataToParse,
         enc,
         channelId: frame.header.channelId,
         // Some NVR/Hub streams appear to include non-media bytes even when payloadOffset is present.
         // Allow a one-time resync at startup to avoid delaying the first keyframe.
-        allowResync: frame.payload.length === 0 || totalFramesReceived <= 10 && totalMediaPackets === 0
+        allowResync: frame.payload.length === 0 || totalFramesReceived <= 10 && totalMediaPackets === 0,
+        ...encryptLen !== void 0 ? { encryptLen } : {}
       });
       if (this.bcMediaCodec.getRemainingBuffer().length === 0 && dataAfterXml.length <= 600) {
         const s = _BaichuanVideoStream.scoreBcMediaLike(dataAfterXml);
@@ -4162,15 +4193,38 @@ var BaichuanVideoStream = class _BaichuanVideoStream extends EventEmitter {
             }
           }
         };
-        const prependParamSetsIfNeeded = (annexB, videoType) => {
+        const prependParamSetsIfNeeded = (annexB, videoType, isPframe = false) => {
           if (videoType === "H264") {
             const nals = splitAnnexBToNalPayloads(annexB);
             if (nals.length === 0) return annexB;
             const types = nals.map((n) => (n[0] ?? 0) & 31);
-            if (types.includes(7) && types.includes(8)) return annexB;
             const hasVcl = types.some(
               (t) => t === 1 || t === 5 || t === 19 || t === 20
             );
+            if (isPframe && !hasVcl) {
+              if (dbg.traceNativeStream) {
+                this.logger?.warn(
+                  `[BaichuanVideoStream] Dropping P-frame without VCL (only param sets): types=${types.join(",")}`
+                );
+              }
+              return Buffer.alloc(0);
+            }
+            if (types.includes(7) && types.includes(8)) {
+              let ppsIdFromSlice = null;
+              for (const nal of nals) {
+                const t = (nal[0] ?? 0) & 31;
+                if (t === 1 || t === 5) {
+                  ppsIdFromSlice = parseSlicePpsIdFromNal(nal);
+                  break;
+                }
+              }
+              if (ppsIdFromSlice != null && ppsIdFromSlice <= 255) {
+                this.lastPrependedPpsId = ppsIdFromSlice;
+              } else {
+                this.lastPrependedPpsId = -1;
+              }
+              return annexB;
+            }
             if (!hasVcl) return annexB;
             let ppsId = null;
             for (const nal of nals) {
@@ -4217,11 +4271,19 @@ var BaichuanVideoStream = class _BaichuanVideoStream extends EventEmitter {
             const nals = splitAnnexBToNalPayloads2(annexB);
             if (nals.length === 0) return annexB;
             const types = nals.map((n) => getH265NalType(n)).filter((t) => t !== null);
-            if (types.includes(32) && types.includes(33) && types.includes(34))
-              return annexB;
             const hasVcl = types.some(
               (t) => t >= 0 && t <= 9 || t >= 16 && t <= 23
             );
+            if (isPframe && !hasVcl) {
+              if (dbg.traceNativeStream) {
+                this.logger?.warn(
+                  `[BaichuanVideoStream] Dropping H.265 P-frame without VCL (only param sets): types=${types.join(",")}`
+                );
+              }
+              return Buffer.alloc(0);
+            }
+            if (types.includes(32) && types.includes(33) && types.includes(34))
+              return annexB;
             if (!hasVcl) return annexB;
             if (this.lastPrependedParamSetsH265) return annexB;
             if (!this.lastVps || !this.lastSpsH265 || !this.lastPpsH265)
@@ -4403,7 +4465,7 @@ var BaichuanVideoStream = class _BaichuanVideoStream extends EventEmitter {
           }
           for (const p of parts) {
             maybeCacheParamSets(p, "Pframe", videoType);
-            const outP0 = prependParamSetsIfNeeded(p, videoType);
+            const outP0 = prependParamSetsIfNeeded(p, videoType, true);
             if (outP0.length === 0) continue;
             const outP = outP0;
             dumpNalSummary(outP, "Pframe", media.microseconds);
@@ -4916,7 +4978,7 @@ async function createDiagnosticsBundle(params) {
 }
 function sanitizeFfmpegError(error) {
   return error.replace(
-    /([a-z]+:\/\/)([^:@\/\s]+):([^@\/\s]+)@/gi,
+    /([a-z]+:\/\/)([^:@/\s]+):([^@/\s]+)@/gi,
     (match, protocol, username, password) => {
       return `${protocol}***:***@`;
     }
@@ -7235,4 +7297,4 @@ export {
   parseRecordingFileName,
   ReolinkCgiApi
 };
-//# sourceMappingURL=chunk-MC2BRLLE.js.map
+//# sourceMappingURL=chunk-TZFZ5WJX.js.map