@apocaliss92/scrypted-reolink-native 0.3.7 → 0.3.9

package/package.json

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

package/src/baichuan-base.ts

@@ -485,7 +485,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
      */
     private getAllActiveConnections(): ReolinkBaichuanApi[] {
         const connections: ReolinkBaichuanApi[] = [];
-        
+
         // Add main connection if exists and is valid
         if (this.baichuanApi) {
             const isConnected = this.baichuanApi.client.isSocketConnected();
@@ -494,7 +494,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
                 connections.push(this.baichuanApi);
             }
         }
-        
+
         // Add all stream clients that are valid
         for (const streamClient of this.streamClients.values()) {
             const isConnected = streamClient.client.isSocketConnected();
@@ -503,7 +503,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
                 connections.push(streamClient);
             }
         }
-        
+
         return connections;
     }
 
@@ -512,7 +512,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
      */
     private startConnectionMaintenance(api: ReolinkBaichuanApi): void {
         const logger = this.getBaichuanLogger();
-        
+
         // Stop any existing intervals
         this.stopConnectionMaintenance();
 
@@ -526,11 +526,11 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
                 // Get all active connections (main + stream clients)
                 const allConnections = this.getAllActiveConnections();
                 logger.debug(`Pinging ${allConnections.length} connections`);
-                
+
                 if (allConnections.length === 0) {
                     this.consecutivePingFailures++;
                     logger.debug(`No active connections found, failures=${this.consecutivePingFailures}`);
-                    
+
                     if (this.consecutivePingFailures >= 3) {
                         logger.log('No active connections detected, renewing connection');
                         await this.cleanupBaichuanApi();
@@ -557,7 +557,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
                 if (failedPings.length > 0) {
                     this.consecutivePingFailures++;
                     logger.debug(`Ping failed for ${failedPings.length}/${allConnections.length} connections, failures=${this.consecutivePingFailures}`);
-                    
+
                     if (this.consecutivePingFailures >= 3) {
                         logger.log(`Multiple ping failures detected (${failedPings.length} connections), renewing connection`);
                         await this.cleanupBaichuanApi();
@@ -584,7 +584,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
             try {
                 // Check if there are active streams
                 const hasActiveStreams = this.getStreamManager?.()?.hasActiveStreams() ?? false;
-                
+
                 if (!hasActiveStreams) {
                     logger.log('No active streams detected, renewing connection (auto-renewal)');
                     await this.cleanupBaichuanApi();
@@ -617,7 +617,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
      */
     private startEventCheck(api: ReolinkBaichuanApi): void {
         const logger = this.getBaichuanLogger();
-        
+
         // Stop any existing interval
         this.stopEventCheck();
 
@@ -640,16 +640,16 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
                 if (this.lastEventTime > 0 && timeSinceLastEvent > fiveMinutesMs) {
                     logger.log(`No events received in the last ${Math.round(timeSinceLastEvent / 60_000)} minutes, restarting event listener`);
                     // Restart event subscription
-                    await this.unsubscribeFromEvents();
-                    await this.subscribeToEvents();
+                    await this.unsubscribeFromEvents(true);
+                    await this.subscribeToEvents(true);
                 } else if (this.lastEventTime === 0) {
                     // If lastEventTime is 0, it means we just subscribed but haven't received any events yet
                     // Wait a bit longer before considering it a problem
                     const timeSinceSubscription = now - (this.connectionTime || now);
                     if (timeSinceSubscription > fiveMinutesMs) {
                         logger.log(`No events received since subscription (${Math.round(timeSinceSubscription / 60_000)} minutes ago), restarting event listener`);
-                        await this.unsubscribeFromEvents();
-                        await this.subscribeToEvents();
+                        await this.unsubscribeFromEvents(true);
+                        await this.subscribeToEvents(true);
                     }
                 }
             } catch (e) {
@@ -672,7 +672,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
     /**
      * Subscribe to Baichuan simple events
      */
-    async subscribeToEvents(): Promise<void> {
+    async subscribeToEvents(silent: boolean = false): Promise<void> {
         const logger = this.getBaichuanLogger();
         const callbacks = this.getConnectionCallbacks();
 
@@ -691,7 +691,7 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
         }
 
         // Unsubscribe first if handler exists (idempotent)
-        await this.unsubscribeFromEvents();
+        await this.unsubscribeFromEvents(silent);
 
         // Get Baichuan client connection
         const api = await this.ensureBaichuanClient();
@@ -717,11 +717,11 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
                 // Call original handler
                 originalHandler(ev);
             };
-            
+
             await api.onSimpleEvent(wrappedHandler);
             this.eventSubscriptionActive = true;
             this.lastEventTime = Date.now(); // Initialize on subscription
-            logger.log('Subscribed to Baichuan events');
+            logger.debug('Subscribed to Baichuan events');
         }
         catch (e) {
             logger.warn('Failed to subscribe to events', e?.message || String(e));
@@ -731,8 +731,9 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
 
     /**
      * Unsubscribe from Baichuan simple events
+     * @param silent If true, don't log unsubscription messages
      */
-    async unsubscribeFromEvents(): Promise<void> {
+    async unsubscribeFromEvents(silent: boolean = false): Promise<void> {
         const logger = this.getBaichuanLogger();
         const callbacks = this.getConnectionCallbacks();
 

package/src/camera.ts

@@ -1731,7 +1731,7 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
      * If this device has a parent (nvrDevice or multiFocalDevice), events will be forwarded from the parent.
      * This ensures that only the root device in the hierarchy subscribes to events, avoiding duplicate subscriptions.
      */
-    async subscribeToEvents(): Promise<void> {
+    async subscribeToEvents(silent: boolean = false): Promise<void> {
         // If this device has a parent (NVR or MultiFocal), don't subscribe - events will be forwarded from parent
         if (this.nvrDevice || this.multiFocalDevice) {
             const logger = this.getBaichuanLogger();
@@ -1754,7 +1754,9 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
         }
 
         if (!enabled) {
-            logger.log('Event subscription disabled, unsubscribing');
+            if (!silent) {
+                logger.log('Event subscription disabled, unsubscribing');
+            }
             if (this.doorbellBinaryTimeout) {
                 clearTimeout(this.doorbellBinaryTimeout);
                 this.doorbellBinaryTimeout = undefined;
@@ -1766,8 +1768,10 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
         // IMPORTANT: use base subscription logic so the callback is properly bound.
         // Passing `this.onSimpleEvent` directly would lose `this` and can result in silent failures.
         try {
-            await super.subscribeToEvents();
-            logger.log(`Subscribed to events (${selection.join(', ')}) on ${this.protocol} connection`);
+            await super.subscribeToEvents(silent);
+            if (!silent) {
+                logger.log(`Subscribed to events (${selection.join(', ')}) on ${this.protocol} connection`);
+            }
         }
         catch (e) {
             logger.warn('Failed to subscribe to Baichuan events', e?.message || String(e));