@apocaliss92/scrypted-reolink-native 0.1.10 → 0.1.12

package/package.json

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

package/src/baichuan-base.ts

@@ -35,7 +35,7 @@ export class BaichuanLogger implements Console {
     }
 
     private formatMessage(level: string, ...args: any[]): string {
-        const timestamp = new Date().toISOString();
+        const timestamp = new Date().toLocaleString();
         const prefix = `[${this.deviceName}] [${timestamp}] [${level}]`;
         return `${prefix} ${args.map(arg => typeof arg === 'object' ? JSON.stringify(arg) : String(arg)).join(' ')}`;
     }

package/src/camera-battery.ts

@@ -36,16 +36,19 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
     }
 
     async takePicture(options?: RequestPictureOptions): Promise<MediaObject> {
+        const logger = this.getBaichuanLogger();
         // Allow new snapshot if:
         // 1. forceNewSnapshot is true, OR
         // 2. Camera is awake AND last snapshot was taken at least 10 seconds ago
-        const minSnapshotIntervalMs = 10_000; // 10 seconds
-        const now = Date.now();
-        const shouldTakeNewSnapshot = this.forceNewSnapshot || 
-            (!this.sleeping && this.lastPicture && (now - this.lastPicture.atMs >= minSnapshotIntervalMs));
+        // const minSnapshotIntervalMs = 10_000; // 10 seconds
+        // const now = Date.now();
+        const shouldTakeNewSnapshot = this.forceNewSnapshot;
+        // const now = Date.now();
+        // const shouldTakeNewSnapshot = this.forceNewSnapshot || 
+        //     (!this.sleeping && this.lastPicture && (now - this.lastPicture.atMs >= minSnapshotIntervalMs));
 
         if (!shouldTakeNewSnapshot && this.lastPicture) {
-            this.getBaichuanLogger().debug(`Returning cached snapshot, taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
+            logger.debug(`Returning cached snapshot, taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
             return this.lastPicture.mo;
         }
 
@@ -53,7 +56,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
             return await this.takePictureInFlight;
         }
 
-        this.getBaichuanLogger().log(`Taking new snapshot from camera (forceNewSnapshot: ${this.forceNewSnapshot})`);
+        logger.log(`Taking new snapshot from camera (forceNewSnapshot: ${this.forceNewSnapshot})`);
         this.forceNewSnapshot = false;
 
         this.takePictureInFlight = (async () => {
@@ -63,7 +66,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
             });
             const mo = await sdk.mediaManager.createMediaObject(snapshotBuffer, 'image/jpeg');
             this.lastPicture = { mo, atMs: Date.now() };
-            this.getBaichuanLogger().log(`Snapshot taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
+            logger.log(`Snapshot taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
             return mo;
         })();
 
@@ -104,9 +107,10 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
 
     private startPeriodicTasks(): void {
         if (this.periodicStarted) return;
+        const logger = this.getBaichuanLogger();
         this.periodicStarted = true;
 
-        this.getBaichuanLogger().log('Starting periodic tasks for battery camera');
+        logger.log('Starting periodic tasks for battery camera');
 
         // Check sleeping state every 5 seconds (non-blocking)
         if (!this.nvrDevice) {
@@ -117,7 +121,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
 
                     if (!api) {
                         if (!this.sleeping) {
-                            this.getBaichuanLogger().log('Camera is sleeping: no active Baichuan client');
+                            logger.log('Camera is sleeping: no active Baichuan client');
                             this.sleeping = true;
                         }
                         return;
@@ -126,7 +130,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
                     const sleepStatus = api.getSleepStatus({ channel });
                     await this.updateSleepingState(sleepStatus);
                 } catch (e) {
-                    this.getBaichuanLogger().warn('Error checking sleeping state:', e);
+                    logger.warn('Error checking sleeping state:', e);
                 }
             }, 5_000);
         }
@@ -138,7 +142,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
             this.updateBatteryAndSnapshot().catch(() => { });
         }, updateIntervalMs);
 
-        this.getBaichuanLogger().log(`Periodic tasks started: sleep check every 5s, battery update every ${batteryUpdateIntervalMinutes} minutes`);
+        logger.log(`Periodic tasks started: sleep check every 5s, battery update every ${batteryUpdateIntervalMinutes} minutes`);
     }
 
     async updateSleepingState(sleepStatus: SleepStatus): Promise<void> {
@@ -176,13 +180,33 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         }
     }
 
+    async checkRecordingAction(newBatteryLevel: number) {
+        const nvrDeviceId = this.plugin.nvrDeviceId;
+        if (nvrDeviceId && this.mixins.includes(nvrDeviceId)) {
+            const logger = this.getBaichuanLogger();
+
+            const settings = await this.thisDevice.getSettings();
+            const isRecording = !settings.find(setting => setting.key === 'recording:privacyMode')?.value;
+            const { lowThresholdBatteryRecording, highThresholdBatteryRecording } = this.storageSettings.values;
+
+            if (isRecording && newBatteryLevel < lowThresholdBatteryRecording) {
+                logger.log(`Recording is enabled, but battery level is below low threshold (${newBatteryLevel}% < ${lowThresholdBatteryRecording}%), disabling recording`);
+                await this.thisDevice.putSetting('recording:privacyMode', true);
+            } else if (!isRecording && newBatteryLevel > highThresholdBatteryRecording) {
+                logger.log(`Recording is disabled, but battery level is above high threshold (${newBatteryLevel}% > ${highThresholdBatteryRecording}%), enabling recording`);
+                await this.thisDevice.putSetting('recording:privacyMode', false);
+            }
+
+        }
+    }
+
     async updateBatteryInfo() {
         const api = await this.ensureClient();
         const channel = this.storageSettings.values.rtspChannel;
 
         const batteryInfo = await api.getBatteryInfo(channel);
         if (this.isBatteryInfoLoggingEnabled()) {
-                this.getBaichuanLogger().debug('getBatteryInfo result:', JSON.stringify(batteryInfo));
+            this.getBaichuanLogger().debug('getBatteryInfo result:', JSON.stringify(batteryInfo));
         }
 
         if (batteryInfo.batteryPercent !== undefined) {
@@ -190,6 +214,8 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
             this.batteryLevel = batteryInfo.batteryPercent;
             this.lastBatteryLevel = batteryInfo.batteryPercent;
 
+            let shouldCheckRecordingAction = true;
+
             // Log only if battery level changed
             if (oldLevel !== undefined && oldLevel !== batteryInfo.batteryPercent) {
                 if (batteryInfo.chargeStatus !== undefined) {
@@ -207,6 +233,12 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
                 } else {
                     this.getBaichuanLogger().log(`Battery level set: ${batteryInfo.batteryPercent}%`);
                 }
+            } else {
+                shouldCheckRecordingAction = false;
+            }
+
+            if (shouldCheckRecordingAction) {
+                await this.checkRecordingAction(batteryInfo.batteryPercent);
             }
         }
     }

package/src/common.ts

@@ -2,8 +2,8 @@ import type { DeviceCapabilities, PtzCommand, PtzPreset, ReolinkBaichuanApi, Reo
 import sdk, { BinarySensor, Brightness, Camera, Device, DeviceProvider, Intercom, MediaObject, MediaStreamUrl, ObjectDetectionTypes, ObjectDetector, ObjectsDetected, OnOff, PanTiltZoom, PanTiltZoomCommand, RequestMediaStreamOptions, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, Setting, Settings, SettingValue, VideoCamera, VideoTextOverlay, VideoTextOverlays } from "@scrypted/sdk";
 import { StorageSettings } from "@scrypted/sdk/storage-settings";
 import type { UrlMediaStreamOptions } from "../../scrypted/plugins/rtsp/src/rtsp";
-import { BaseBaichuanClass, type BaichuanConnectionConfig, type BaichuanConnectionCallbacks } from "./baichuan-base";
-import { createBaichuanApi, normalizeUid, type BaichuanTransport } from "./connect";
+import { BaseBaichuanClass, type BaichuanConnectionCallbacks, type BaichuanConnectionConfig } from "./baichuan-base";
+import { normalizeUid, type BaichuanTransport } from "./connect";
 import { convertDebugLogsToApiOptions, DebugLogDisplayNames, DebugLogOption, getApiRelevantDebugLogs, getDebugLogChoices } from "./debug-options";
 import { ReolinkBaichuanIntercom } from "./intercom";
 import ReolinkNativePlugin from "./main";
@@ -254,6 +254,22 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             defaultValue: 60,
             hide: true,
         },
+        lowThresholdBatteryRecording: {
+            title: "Low Threshold Battery Recording (%)",
+            subgroup: 'Recording',
+            description: "Battery level threshold below which recording is disabled (default: 15%).",
+            type: "number",
+            defaultValue: 15,
+            hide: true,
+        },
+        highThresholdBatteryRecording: {
+            title: "High Threshold Battery Recording (%)",
+            subgroup: 'Recording',
+            description: "Battery level threshold above which recording is enabled (default: 35%).",
+            type: "number",
+            defaultValue: 35,
+            hide: true,
+        },
         // Regular camera specific
         dispatchEvents: {
             subgroup: 'Advanced',
@@ -330,7 +346,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
         },
         // PTZ Presets
         presets: {
-            group: 'PTZ',
+            subgroup: 'PTZ',
             title: 'Presets to enable',
             description: 'PTZ Presets in the format "id=name". Where id is the PTZ Preset identifier and name is a friendly name.',
             multiple: true,
@@ -358,11 +374,11 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             description: 'How long a PTZ command moves before sending stop. Higher = more movement per click.',
             type: 'number',
             defaultValue: 300,
-            group: 'PTZ',
+            subgroup: 'PTZ',
             hide: true,
         },
         ptzZoomStep: {
-            group: 'PTZ',
+            subgroup: 'PTZ',
             title: 'PTZ Zoom Step',
             description: 'How much to change zoom per zoom command (in zoom factor units, where 1.0 is normal).',
             type: 'number',
@@ -370,7 +386,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             hide: true,
         },
         ptzCreatePreset: {
-            group: 'PTZ',
+            subgroup: 'PTZ',
             title: 'Create Preset',
             description: 'Enter a name and press Save to create a new PTZ preset at the current position.',
             type: 'string',
@@ -407,7 +423,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             },
         },
         ptzSelectedPreset: {
-            group: 'PTZ',
+            subgroup: 'PTZ',
             title: 'Selected Preset',
             description: 'Select the preset to update or delete. Format: "id=name".',
             type: 'string',
@@ -416,7 +432,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             hide: true,
         },
         ptzUpdateSelectedPreset: {
-            group: 'PTZ',
+            subgroup: 'PTZ',
             title: 'Update Selected Preset Position',
             description: 'Overwrite the selected preset with the current PTZ position.',
             type: 'button',
@@ -439,7 +455,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             },
         },
         ptzDeleteSelectedPreset: {
-            group: 'PTZ',
+            subgroup: 'PTZ',
             title: 'Delete Selected Preset',
             description: 'Delete the selected preset (firmware dependent).',
             type: 'button',
@@ -497,15 +513,16 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
     initComplete?: boolean;
     resetBaichuanClient?(reason?: any): Promise<void>;
 
-    protected nvrDevice?: any; // Optional reference to NVR device
+    protected nvrDevice?: ReolinkNativeNvrDevice;
+    thisDevice: Settings
 
     constructor(nativeId: string, public plugin: ReolinkNativePlugin, public options: CommonCameraMixinOptions) {
         super(nativeId);
-        // Set protocol based on camera type
         this.protocol = !options.nvrDevice && options.type === 'battery' ? 'udp' : 'tcp';
 
         // Store NVR device reference if provided
         this.nvrDevice = options.nvrDevice;
+        this.thisDevice = sdk.systemManager.getDeviceById<Settings>(this.id);
 
         setTimeout(async () => {
             await this.parentInit();
@@ -1277,7 +1294,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                     client,
                     ipAddress,
                     cachedNetPort: this.cachedNetPort,
-                    isFromNvr,
+                    nvrDevice: this.nvrDevice,
                     rtspChannel,
                     logger,
                 },
@@ -1501,6 +1518,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
         // this.storageSettings.settings.snapshotCacheMinutes.hide = !isBattery;
         this.storageSettings.settings.uid.hide = !isBattery;
         this.storageSettings.settings.batteryUpdateIntervalMinutes.hide = !isBattery;
+        this.storageSettings.settings.lowThresholdBatteryRecording.hide = !isBattery;
+        this.storageSettings.settings.highThresholdBatteryRecording.hide = !isBattery;
 
         if (isBattery && !this.storageSettings.values.mixinsSetup) {
             try {

package/src/main.ts

@@ -7,6 +7,14 @@ import { getDeviceInterfaces } from "./utils";
 
 class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider, DeviceCreator {
     devices = new Map<string, ReolinkNativeCamera | ReolinkNativeBatteryCamera | ReolinkNativeNvrDevice>();
+    nvrDeviceId: string;
+
+    constructor(nativeId: string) {
+        super(nativeId);
+
+        const nvrDevice = sdk.systemManager.getDeviceByName('Scrypted NVR');
+        this.nvrDeviceId = nvrDevice?.id;
+    }
 
     getScryptedDeviceCreator(): string {
         return 'Reolink Native camera';

package/src/stream-utils.ts

@@ -12,6 +12,7 @@ import sdk, {
 } from "@scrypted/sdk";
 
 import type { UrlMediaStreamOptions } from "../../scrypted/plugins/rtsp/src/rtsp";
+import { ReolinkNativeNvrDevice } from "./nvr";
 
 export interface StreamManagerOptions {
     /**
@@ -101,12 +102,12 @@ export async function buildVideoStreamOptionsFromRtspRtmp(
         client: ReolinkBaichuanApi,
         ipAddress: string,
         cachedNetPort: { rtsp?: { port?: number; enable?: number }; rtmp?: { port?: number; enable?: number } },
-        isFromNvr: boolean,
+        nvrDevice?: ReolinkNativeNvrDevice,
         rtspChannel: number,
         logger: Console
     },
 ): Promise<UrlMediaStreamOptions[]> {
-    const { client, ipAddress, cachedNetPort, rtspChannel, logger } = props;
+    const { client, ipAddress, cachedNetPort, rtspChannel, logger, nvrDevice } = props;
     const rtspStreams: UrlMediaStreamOptions[] = [];
     const rtmpStreams: UrlMediaStreamOptions[] = [];
 
@@ -179,11 +180,21 @@ export async function buildVideoStreamOptionsFromRtspRtmp(
 
     const nativeStreams = await fetchVideoStreamOptionsFromApi(client, rtspChannel, logger);
 
-    const streams: UrlMediaStreamOptions[] = [
-        ...rtspStreams,
-        ...rtmpStreams,
-        ...nativeStreams,
-    ];
+    let streams: UrlMediaStreamOptions[] = [];
+
+    if (nvrDevice && nvrDevice.info.model === 'HOMEHUB') {
+        streams = [
+            ...nativeStreams,
+            ...rtspStreams,
+            ...rtmpStreams,
+        ];
+    } else {
+        streams = [
+            ...rtspStreams,
+            ...rtmpStreams,
+            ...nativeStreams,
+        ];
+    }
 
     return streams;
 }