@apocaliss92/scrypted-reolink-native 0.2.14 → 0.2.16

package/package.json

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

package/src/camera.ts

@@ -787,7 +787,6 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             const api = await this.ensureClient();
 
             if (useNvr) {
-                // Fetch from NVR using VOD listing so clip.id/fileId is a real file path (e.g. /mnt/sda/...)
                 const channel = this.storageSettings.values.rtspChannel ?? 0;
 
                 logger.debug(`[NVR VOD] Listing recordings: channel=${channel}, start=${start.toISOString()}, end=${end.toISOString()}`);
@@ -2098,7 +2097,18 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             }
         } else {
             const logger = this.getBaichuanLogger();
-            const shouldTakeNewSnapshot = this.forceNewSnapshot;
+            let shouldTakeNewSnapshot = this.forceNewSnapshot;
+
+            if (this.lastPicture) {
+                const batteryUpdateIntervalMinutes = this.storageSettings.values.batteryUpdateIntervalMinutes ?? 60;
+                const updateIntervalMs = batteryUpdateIntervalMinutes * 60_000;
+                const timeSinceLastSnapshot = Date.now() - this.lastPicture.atMs;
+
+                if (timeSinceLastSnapshot >= updateIntervalMs) {
+                    shouldTakeNewSnapshot = true;
+                    logger.log(`Snapshot expired: ${Math.round(timeSinceLastSnapshot / 60_000)} minutes since last snapshot (interval: ${batteryUpdateIntervalMinutes} minutes)`);
+                }
+            }
 
             if (!shouldTakeNewSnapshot && this.lastPicture) {
                 logger.log(`Returning cached snapshot, taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
@@ -2112,6 +2122,7 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
 
             this.takePictureInFlight = (async () => {
                 const client = await this.ensureClient();
+                await client.wakeUp();
                 const mo = await this.takePictureInternal(client);
                 this.lastPicture = { mo, atMs: Date.now() };
                 logger.log(`Snapshot taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);

package/src/main.ts

@@ -32,6 +32,7 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
     nvrDeviceId: string;
     private thumbnailQueue: ThumbnailRequest[] = [];
     private thumbnailProcessing = false;
+    private thumbnailPendingRequests = new Map<string, Promise<MediaObject>>();
 
     constructor(nativeId: string) {
         super(nativeId);
@@ -340,12 +341,23 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
      * Add a thumbnail generation request to the queue
      */
     async generateThumbnail(request: ThumbnailRequestInput): Promise<MediaObject> {
+        // Create a unique key for this request (deviceId:fileId)
+        const requestKey = `${request.deviceId}:${request.fileId}`;
+
+        // Check if this thumbnail is already in queue or being processed
+        const existingRequest = this.thumbnailPendingRequests.get(requestKey);
+        if (existingRequest) {
+            const logger = request.device?.getBaichuanLogger?.() || request.logger || console;
+            logger.debug(`[Thumbnail] Request already in queue: fileId=${request.fileId}, reusing existing promise`);
+            return existingRequest;
+        }
+
         const queueLength = this.thumbnailQueue.length;
         // Use device logger if available, otherwise fallback to provided logger
         const logger = request.device?.getBaichuanLogger?.() || request.logger || console;
         logger.log(`[Thumbnail] Download start: fileId=${request.fileId}, queuePosition=${queueLength + 1}`);
 
-        return new Promise((resolve, reject) => {
+        const promise = new Promise<MediaObject>((resolve, reject) => {
             this.thumbnailQueue.push({
                 ...request,
                 resolve,
@@ -353,6 +365,16 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
             });
             this.processThumbnailQueue();
         });
+
+        // Track this request
+        this.thumbnailPendingRequests.set(requestKey, promise);
+
+        // Remove from tracking when the promise resolves or rejects
+        promise.finally(() => {
+            this.thumbnailPendingRequests.delete(requestKey);
+        });
+
+        return promise;
     }
 
     /**