@apocaliss92/scrypted-reolink-native 0.1.10 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@apocaliss92/scrypted-reolink-native",
-   "version": "0.1.10",
+   "version": "0.1.11",
    "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> {
@@ -182,7 +186,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
 
         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) {

package/src/common.ts

@@ -1277,7 +1277,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                     client,
                     ipAddress,
                     cachedNetPort: this.cachedNetPort,
-                    isFromNvr,
+                    nvrDevice: this.nvrDevice,
                     rtspChannel,
                     logger,
                 },

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;
 }