@apocaliss92/scrypted-reolink-native 0.1.3 → 0.1.5

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@apocaliss92/scrypted-reolink-native",
-   "version": "0.1.3",
-   "description": "Reolink Native plugin for Scrypted",
+   "version": "0.1.5",
+   "description": "Use any reolink camera with Scrypted, even older/unsupported models without HTTP protocol support",
    "author": "@apocaliss92",
    "license": "Apache",
    "scripts": {

package/src/camera-battery.ts

@@ -1,4 +1,4 @@
-import type { ReolinkBaichuanApi } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
+import type { ReolinkBaichuanApi, SleepStatus } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
 import sdk, {
     type MediaObject,
     RequestPictureOptions,
@@ -28,16 +28,18 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         return debugLogs.includes(DebugLogOption.BatteryInfo);
     }
 
-    constructor(nativeId: string, public plugin: ReolinkNativePlugin) {
+    constructor(nativeId: string, public plugin: ReolinkNativePlugin, nvrDevice?: any) {
         super(nativeId, plugin, {
             type: 'battery',
+            nvrDevice,
         });
     }
 
     async takePicture(options?: RequestPictureOptions): Promise<MediaObject> {
-        const { snapshotCacheMinutes = 5 } = this.storageSettings.values;
-        const cacheMs = snapshotCacheMinutes * 60_000;
-        if (!this.forceNewSnapshot && cacheMs > 0 && this.lastPicture && Date.now() - this.lastPicture.atMs < cacheMs) {
+        // const { snapshotCacheMinutes = 5 } = this.storageSettings.values;
+        // const cacheMs = snapshotCacheMinutes * 60_000;
+        // if (!this.forceNewSnapshot && cacheMs > 0 && this.lastPicture && Date.now() - this.lastPicture.atMs < cacheMs) {
+        if (!this.forceNewSnapshot && this.lastPicture) {
             this.console.log(`Returning cached snapshot, taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
             return this.lastPicture.mo;
         }
@@ -50,7 +52,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         this.forceNewSnapshot = false;
 
         this.takePictureInFlight = (async () => {
-            const channel = this.getRtspChannel();
+            const channel = this.storageSettings.values.rtspChannel;
             const snapshotBuffer = await this.withBaichuanClient(async (api) => {
                 return await api.getSnapshot(channel);
             });
@@ -75,6 +77,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
     async init(): Promise<void> {
         this.startPeriodicTasks();
         await this.alignAuxDevicesState();
+        await this.updateBatteryInfo();
     }
 
     async release(): Promise<void> {
@@ -101,9 +104,27 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         this.console.log('Starting periodic tasks for battery camera');
 
         // Check sleeping state every 5 seconds (non-blocking)
-        this.sleepCheckTimer = setInterval(() => {
-            this.checkSleepingState().catch(() => { });
-        }, 5_000);
+        if (!this.nvrDevice) {
+            this.sleepCheckTimer = setInterval(async () => {
+                try {
+                    const api = this.baichuanApi;
+                    const channel = this.storageSettings.values.rtspChannel;
+
+                    if (!api) {
+                        if (!this.sleeping) {
+                            this.console.log('Camera is sleeping: no active Baichuan client');
+                            this.sleeping = true;
+                        }
+                        return;
+                    }
+
+                    const sleepStatus = api.getSleepStatus({ channel });
+                    await this.updateSleepingState(sleepStatus);
+                } catch (e) {
+                    this.console.warn('Error checking sleeping state:', e);
+                }
+            }, 5_000);
+        }
 
         // Update battery and snapshot every N minutes
         const { batteryUpdateIntervalMinutes = 10 } = this.storageSettings.values;
@@ -115,30 +136,13 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         this.console.log(`Periodic tasks started: sleep check every 5s, battery update every ${batteryUpdateIntervalMinutes} minutes`);
     }
 
-    private async checkSleepingState(): Promise<void> {
+    async updateSleepingState(sleepStatus: SleepStatus): Promise<void> {
         try {
-            // IMPORTANT: do not call ensureClient() here.
-            // If the camera is asleep or disconnected, ensureClient() may reconnect/login and wake it.
-            const api = this.baichuanApi;
-            const channel = this.getRtspChannel();
-
-            // If there is no existing client, assume sleeping/idle.
-            if (!api) {
-                if (!this.sleeping) {
-                    this.console.log('Camera is sleeping: no active Baichuan client');
-                    this.sleeping = true;
-                }
-                return;
-            }
-
-            // Passive sleep detection (no request sent to camera)
-            const sleepStatus = api.getSleepStatus({ channel });
             if (this.isBatteryInfoLoggingEnabled()) {
                 this.console.log('getSleepStatus result:', JSON.stringify(sleepStatus));
             }
 
             if (sleepStatus.state === 'sleeping') {
-                // Camera is sleeping
                 if (!this.sleeping) {
                     this.console.log(`Camera is sleeping: ${sleepStatus.reason}`);
                     this.sleeping = true;
@@ -151,15 +155,12 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
                     this.sleeping = false;
                 }
 
-                // When camera wakes up (transition from sleeping to awake), align auxiliary devices state and force snapshot (once)
                 if (wasSleeping) {
                     this.alignAuxDevicesState().catch(() => { });
                     if (this.forceNewSnapshot) {
                         this.takePicture().catch(() => { });
                     }
                 }
-                // NOTE: We don't call getBatteryInfo() here anymore to avoid timeouts.
-                // Battery updates are handled by updateBatteryAndSnapshot() which properly wakes the camera.
             } else {
                 // Unknown state
                 this.console.debug(`Sleep status unknown: ${sleepStatus.reason}`);
@@ -170,6 +171,41 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         }
     }
 
+    async updateBatteryInfo() {
+        const api = await this.ensureClient();
+        const channel = this.storageSettings.values.rtspChannel;
+
+        const batteryInfo = await api.getBatteryInfo(channel);
+        if (this.isBatteryInfoLoggingEnabled()) {
+            this.console.log('getBatteryInfo result:', JSON.stringify(batteryInfo));
+        }
+
+        if (batteryInfo.batteryPercent !== undefined) {
+            const oldLevel = this.lastBatteryLevel;
+            this.batteryLevel = batteryInfo.batteryPercent;
+            this.lastBatteryLevel = batteryInfo.batteryPercent;
+
+            // Log only if battery level changed
+            if (oldLevel !== undefined && oldLevel !== batteryInfo.batteryPercent) {
+                if (batteryInfo.chargeStatus !== undefined) {
+                    // chargeStatus: "0"=charging, "1"=discharging, "2"=full
+                    const charging = batteryInfo.chargeStatus === "0" || batteryInfo.chargeStatus === "2";
+                    this.console.log(`Battery level changed: ${oldLevel}% → ${batteryInfo.batteryPercent}% (charging: ${charging})`);
+                } else {
+                    this.console.log(`Battery level changed: ${oldLevel}% → ${batteryInfo.batteryPercent}%`);
+                }
+            } else if (oldLevel === undefined) {
+                // First time setting battery level
+                if (batteryInfo.chargeStatus !== undefined) {
+                    const charging = batteryInfo.chargeStatus === "0" || batteryInfo.chargeStatus === "2";
+                    this.console.log(`Battery level set: ${batteryInfo.batteryPercent}% (charging: ${charging})`);
+                } else {
+                    this.console.log(`Battery level set: ${batteryInfo.batteryPercent}%`);
+                }
+            }
+        }
+    }
+
     private async updateBatteryAndSnapshot(): Promise<void> {
         // Prevent multiple simultaneous calls
         if (this.batteryUpdateInProgress) {
@@ -179,7 +215,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
 
         this.batteryUpdateInProgress = true;
         try {
-            const channel = this.getRtspChannel();
+            const channel = this.storageSettings.values.rtspChannel;
             const updateIntervalMinutes = this.storageSettings.values.batteryUpdateIntervalMinutes ?? 10;
             this.console.log(`Force battery update interval started (every ${updateIntervalMinutes} minutes)`);
 
@@ -192,7 +228,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
 
             // Check current sleep status
             let sleepStatus = api.getSleepStatus({ channel });
-            
+
             // If camera is sleeping, wake it up
             if (sleepStatus.state === 'sleeping') {
                 this.console.log('Camera is sleeping, waking up for periodic update...');
@@ -208,7 +244,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
                 const wakeTimeoutMs = 30000; // 30 seconds max
                 const startWakePoll = Date.now();
                 let awake = false;
-                
+
                 while (Date.now() - startWakePoll < wakeTimeoutMs) {
                     await new Promise(resolve => setTimeout(resolve, 1000)); // Check every second
                     sleepStatus = api.getSleepStatus({ channel });
@@ -231,35 +267,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
             // Now that camera is awake, update all states
             // 1. Update battery info
             try {
-                const batteryInfo = await api.getBatteryInfo(channel);
-                if (this.isBatteryInfoLoggingEnabled()) {
-                    this.console.log('getBatteryInfo result:', JSON.stringify(batteryInfo));
-                }
-                
-                if (batteryInfo.batteryPercent !== undefined) {
-                    const oldLevel = this.lastBatteryLevel;
-                    this.batteryLevel = batteryInfo.batteryPercent;
-                    this.lastBatteryLevel = batteryInfo.batteryPercent;
-
-                    // Log only if battery level changed
-                    if (oldLevel !== undefined && oldLevel !== batteryInfo.batteryPercent) {
-                        if (batteryInfo.chargeStatus !== undefined) {
-                            // chargeStatus: "0"=charging, "1"=discharging, "2"=full
-                            const charging = batteryInfo.chargeStatus === "0" || batteryInfo.chargeStatus === "2";
-                            this.console.log(`Battery level changed: ${oldLevel}% → ${batteryInfo.batteryPercent}% (charging: ${charging})`);
-                        } else {
-                            this.console.log(`Battery level changed: ${oldLevel}% → ${batteryInfo.batteryPercent}%`);
-                        }
-                    } else if (oldLevel === undefined) {
-                        // First time setting battery level
-                        if (batteryInfo.chargeStatus !== undefined) {
-                            const charging = batteryInfo.chargeStatus === "0" || batteryInfo.chargeStatus === "2";
-                            this.console.log(`Battery level set: ${batteryInfo.batteryPercent}% (charging: ${charging})`);
-                        } else {
-                            this.console.log(`Battery level set: ${batteryInfo.batteryPercent}%`);
-                        }
-                    }
-                }
+                await this.updateBatteryInfo();
             } catch (e) {
                 this.console.warn('Failed to get battery info during periodic update:', e);
             }
@@ -289,14 +297,14 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
     async resetBaichuanClient(reason?: any): Promise<void> {
         try {
             this.unsubscribedToEvents?.();
-            
+
             // Close all stream servers before closing the main connection
             // This ensures streams are properly cleaned up when using shared connection
             if (this.streamManager) {
                 const reasonStr = reason?.message || reason?.toString?.() || 'connection reset';
                 await this.streamManager.closeAllStreams(reasonStr);
             }
-            
+
             await this.baichuanApi?.close();
         }
         catch (e) {

package/src/camera.ts

@@ -32,9 +32,10 @@ export class ReolinkNativeCamera extends CommonCameraMixin {
     private statusPollTimer: NodeJS.Timeout | undefined;
 
 
-    constructor(nativeId: string, public plugin: ReolinkNativePlugin) {
+    constructor(nativeId: string, public plugin: ReolinkNativePlugin, nvrDevice?: any) {
         super(nativeId, plugin, {
             type: 'regular',
+            nvrDevice,
         });
     }
 
@@ -101,17 +102,14 @@ export class ReolinkNativeCamera extends CommonCameraMixin {
 
     async createStreamClient(): Promise<ReolinkBaichuanApi> {
         const { ipAddress, username, password } = this.storageSettings.values;
-        if (!ipAddress || !username || !password) {
-            throw new Error('Missing camera credentials');
-        }
 
         const debugOptions = this.getBaichuanDebugOptions();
         const api = await createBaichuanApi(
             {
                 inputs: {
                     host: ipAddress,
-                    username,
-                    password,
+                    username: username,
+                    password: password,
                     logger: this.console,
                     debugOptions
                 },
@@ -208,18 +206,18 @@ export class ReolinkNativeCamera extends CommonCameraMixin {
     }
 
     async takePicture(options?: RequestPictureOptions) {
-        return this.withBaichuanRetry(async () => {
-            try {
+        try {
+            return this.withBaichuanRetry(async () => {
                 const client = await this.ensureClient();
                 const snapshotBuffer = await client.getSnapshot();
                 const mo = await this.createMediaObject(snapshotBuffer, 'image/jpeg');
 
                 return mo;
-            } catch (e) {
-                this.getLogger().error('Error taking snapshot', e);
-                throw e;
-            }
-        });
+            });
+        } catch (e) {
+            this.getLogger().error('Error taking snapshot', e);
+            throw e;
+        }
     }
 
     async getPictureOptions(): Promise<ResponsePictureOptions[]> {