@apocaliss92/scrypted-reolink-native 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@apocaliss92/scrypted-reolink-native",
-   "version": "0.2.2",
+   "version": "0.2.3",
    "description": "Use any reolink camera with Scrypted, even older/unsupported models without HTTP protocol support",
    "author": "@apocaliss92",
    "license": "Apache",

package/src/camera.ts

@@ -199,6 +199,11 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
     private readonly onSimpleEventBound = (ev: ReolinkSimpleEvent) => this.onSimpleEvent(ev);
 
     storageSettings = new StorageSettings(this, {
+        debugLogs: {
+            title: 'Debug logs',
+            type: 'boolean',
+            immediate: true,
+        },
         // Basic connection settings
         ipAddress: {
             title: 'IP Address',
@@ -262,11 +267,6 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
                 await this.credentialsChanged();
             }
         },
-        debugLogs: {
-            title: 'Debug logs',
-            type: 'boolean',
-            immediate: true,
-        },
         mixinsSetup: {
             type: 'boolean',
             hide: true,
@@ -1319,15 +1319,22 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
     }
 
     protected getStreamClientInputs(): BaichuanConnectionConfig {
-        const { ipAddress, username, password } = this.storageSettings.values;
+        const { ipAddress, username, password, uid, discoveryMethod } = this.storageSettings.values;
         const debugOptions = this.getBaichuanDebugOptions();
 
+        const normalizedUid = this.isBattery ? normalizeUid(uid) : undefined;
+        if (this.isBattery && !normalizedUid) {
+            throw new Error('UID is required for battery cameras (BCUDP)');
+        }
+
         return {
             host: ipAddress,
             username,
             password,
+            uid: normalizedUid,
             transport: this.transport,
             debugOptions,
+            udpDiscoveryMethod: discoveryMethod as BaichuanClientOptions["udpDiscoveryMethod"],
         };
     }
 
@@ -2348,17 +2355,24 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
                 const { rtspChannel, variantType } = this.storageSettings.values;
 
                 try {
-                    // Lens-scoped behavior: request streams only for the current lens/variant.
-                    // This keeps a single native_main and native_sub for the device.
-                    const lensParam: NativeVideoStreamVariant | undefined = variantType as any;
 
                     const { nativeStreams, rtmpStreams, rtspStreams } = await client.buildVideoStreamOptions({
                         onNvr: this.isOnNvr,
                         channel: rtspChannel,
                         compositeOnly: this.isMultiFocal,
-                        ...(lensParam !== undefined ? { lens: lensParam } : {})
+                        lens: variantType,
                     });
 
+                    logger.debug(`Supported streams: ${JSON.stringify({
+                        nativeStreams,
+                        rtmpStreams,
+                        rtspStreams,
+                        variantType,
+                        onNvr: this.isOnNvr,
+                        channel: rtspChannel,
+                        compositeOnly: this.isMultiFocal,
+                    })}`);
+
                     // const urls = client.getRtspUrl(rtspChannel);
 
                     // let supportedStreams: ReolinkSupportedStream[] = [];
@@ -2413,12 +2427,10 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
                     }
                 }
 
-                if (streams.length) {
-                    logger.log('Fetched video stream options', streams.map((s) => s.name).join(', '));
-                    logger.debug(JSON.stringify(streams));
-                    this.cachedVideoStreamOptions = streams;
-                    return streams;
-                }
+                logger.log('Fetched video stream options', streams.map((s) => s.name).join(', '));
+                logger.debug(JSON.stringify({ streams }));
+                this.cachedVideoStreamOptions = streams;
+                return streams;
 
                 return [];
             } finally {
@@ -2605,6 +2617,7 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
                 const { interfaces, type } = getDeviceInterfaces({
                     capabilities,
                     logger: this.console,
+                    lensType: this.storageSettings.values.variantType,
                 });
 
                 const device: Device = {
@@ -2696,7 +2709,7 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
         this.storageSettings.settings.pipSize.hide = !this.isMultiFocal;
         this.storageSettings.settings.pipMargin.hide = !this.isMultiFocal;
 
-        this.storageSettings.settings.uid.hide = !this.isBattery
+        this.storageSettings.settings.uid.hide = !this.isBattery || this.isOnNvr;
         this.storageSettings.settings.discoveryMethod.hide = !this.isBattery && !this.nvrDevice;
 
         if (this.isBattery && !this.storageSettings.values.mixinsSetup) {

package/src/multiFocal.ts

@@ -50,9 +50,10 @@ export class ReolinkNativeMultiFocalDevice extends ReolinkCamera implements Sett
         const { interfaces } = getDeviceInterfaces({
             capabilities,
             logger,
+            lensType,
         });
 
-        // logger.debug(`Interfaces found for lens ${lensType}: ${JSON.stringify({ interfaces, capabilities, multifocalInfo })}`);
+        logger.debug(`Interfaces found for lens ${lensType}: ${JSON.stringify({ interfaces, capabilities, multifocalInfo })}`);
 
         return { interfaces, capabilities };
     }
@@ -193,15 +194,23 @@ export class ReolinkNativeMultiFocalDevice extends ReolinkCamera implements Sett
     }
 
     protected getStreamClientInputs(): BaichuanConnectionConfig {
-        const { ipAddress, username, password } = this.storageSettings.values;
+        const { ipAddress, username, password, uid, discoveryMethod } = this.storageSettings.values;
         const debugOptions = this.getBaichuanDebugOptions();
 
+        // Multifocal battery cams use BCUDP for streaming too; UID is required.
+        const normalizedUid = this.isBattery ? uid?.trim() || undefined : undefined;
+        if (this.isBattery && !normalizedUid) {
+            throw new Error('UID is required for battery cameras (BCUDP)');
+        }
+
         return {
             host: ipAddress,
             username,
             password,
+            uid: normalizedUid,
             transport: this.transport,
             debugOptions,
+            udpDiscoveryMethod: discoveryMethod,
         };
     }
 

package/src/utils.ts

@@ -1,4 +1,4 @@
-import type { DeviceCapabilities, EnrichedRecordingFile, ParsedRecordingFileName, RecordingFile, ReolinkBaichuanApi, ReolinkDeviceInfo, VodFile, VodSearchResponse } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
+import type { DeviceCapabilities, EnrichedRecordingFile, NativeVideoStreamVariant, ParsedRecordingFileName, RecordingFile, ReolinkBaichuanApi, ReolinkDeviceInfo, VodFile, VodSearchResponse } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
 import sdk, { DeviceBase, HttpRequest, HttpResponse, MediaObject, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, VideoClip, VideoClips } from "@scrypted/sdk";
 import { spawn } from "node:child_process";
 import { Readable } from "stream";
@@ -58,9 +58,10 @@ export const pirSuffix = `-pir`;
 
 export const getDeviceInterfaces = (props: {
     capabilities: DeviceCapabilities,
-    logger: Console
+    logger: Console,
+    lensType?: NativeVideoStreamVariant
 }) => {
-    const { capabilities, logger } = props;
+    const { capabilities, logger, lensType } = props;
 
     const interfaces = [
         ScryptedInterface.VideoCamera,
@@ -71,9 +72,12 @@ export const getDeviceInterfaces = (props: {
         ScryptedInterface.AudioSensor,
         ScryptedInterface.MotionSensor,
         ScryptedInterface.VideoTextOverlays,
-        ScryptedInterface.VideoClips,
     ];
 
+    if (!lensType) {
+        interfaces.push(ScryptedInterface.VideoClips);
+    }
+
     try {
         const {
             hasPtz,