@apocaliss92/scrypted-reolink-native 0.1.14 → 0.1.16

package/package.json

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

package/src/common.ts

@@ -263,6 +263,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             defaultValue: [],
             choices: getDebugLogChoices(),
             onPut: async (ov, value) => {
+                const logger = this.getBaichuanLogger();
                 const oldApiOptions = getApiRelevantDebugLogs(ov || []);
                 const newApiOptions = getApiRelevantDebugLogs(value || []);
 
@@ -288,7 +289,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                             // Trigger reconnection
                             await this.ensureClient();
                         } catch (e) {
-                            this.getBaichuanLogger().warn('Failed to reset client after debug logs change', e);
+                            logger.warn('Failed to reset client after debug logs change', e);
                         }
                     }, 2000);
                 }
@@ -566,16 +567,21 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             onClose: async () => {
                 // Reset client state on close
                 // The base class already handles cleanup
-                // Resubscribe to events after reconnection
-                // Use setTimeout to allow the connection to be re-established first
-                setTimeout(async () => {
-                    try {
-                        await this.subscribeToEvents();
-                    } catch (e) {
-                        const logger = this.getBaichuanLogger();
-                        logger.warn('Failed to resubscribe to events after reconnection', e);
-                    }
-                }, 1000);
+                // For battery cameras, don't auto-resubscribe after idle disconnects
+                // (idle disconnects are normal for battery cameras to save power)
+                // Events will be resubscribed when ensureClient() is called for actual operations
+                const isBattery = this.options.type === 'battery';
+                if (!isBattery) {
+                    // For non-battery cameras, resubscribe to events after reconnection
+                    setTimeout(async () => {
+                        try {
+                            await this.subscribeToEvents();
+                        } catch (e) {
+                            const logger = this.getBaichuanLogger();
+                            logger.warn('Failed to resubscribe to events after reconnection', e);
+                        }
+                    }, 1000);
+                }
             },
             onSimpleEvent: this.onSimpleEvent,
             getEventSubscriptionEnabled: () => this.isEventDispatchEnabled?.() ?? false,
@@ -686,6 +692,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
     }
 
     onSimpleEvent = (ev: ReolinkSimpleEvent) => {
+        const logger = this.getBaichuanLogger();
+
         try {
             const logger = this.getBaichuanLogger();
 
@@ -732,7 +740,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             });
         }
         catch (e) {
-            this.getBaichuanLogger().warn('Error in onSimpleEvent handler', e);
+            logger.warn('Error in onSimpleEvent handler', e);
         }
     }
 
@@ -827,6 +835,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
 
     // PanTiltZoom interface implementation
     async ptzCommand(command: PanTiltZoomCommand): Promise<void> {
+        const logger = this.getBaichuanLogger();
+
         const client = await this.ensureClient();
         if (!client) {
             return;
@@ -839,13 +849,13 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
         if (preset !== undefined && preset !== null) {
             const presetId = Number(preset);
             if (!Number.isFinite(presetId)) {
-                this.getBaichuanLogger().warn(`Invalid PTZ preset id: ${preset}`);
+                logger.warn(`Invalid PTZ preset id: ${preset}`);
                 return;
             }
             if (this.ptzPresets) {
                 await this.ptzPresets.moveToPreset(presetId);
             } else {
-                this.getBaichuanLogger().warn('PTZ presets not available');
+                logger.warn('PTZ presets not available');
             }
             return;
         }
@@ -880,14 +890,14 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
 
             const step = Number(this.storageSettings.values.ptzZoomStep);
             if (!Number.isFinite(step) || step <= 0) {
-                this.getBaichuanLogger().warn('Invalid PTZ zoom step, using default 0.1');
+                logger.warn('Invalid PTZ zoom step, using default 0.1');
                 return;
             }
 
             // Get current zoom factor and apply step
             const info = await client.getZoomFocus(channel);
             if (!info?.zoom) {
-                this.getBaichuanLogger().warn('Zoom command requested but camera did not report zoom support.');
+                logger.warn('Zoom command requested but camera did not report zoom support.');
                 return;
             }
 
@@ -1095,6 +1105,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
     }
 
     async updateDeviceInfo(): Promise<void> {
+        const logger = this.getBaichuanLogger();
+
         const { ipAddress, rtspChannel } = this.storageSettings.values;
         try {
             const api = await this.ensureClient();
@@ -1105,8 +1117,10 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                 ipAddress,
                 deviceData,
             });
+
+            logger.log(`Device info updated: ${JSON.stringify(deviceData)}`);
         } catch (e) {
-            this.getBaichuanLogger().warn('Failed to fetch device info', e);
+            logger.warn('Failed to fetch device info', e);
         }
     }
 
@@ -1182,6 +1196,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
      * This should be called periodically for regular cameras and once when battery cameras wake up.
      */
     async alignAuxDevicesState(): Promise<void> {
+        const logger = this.getBaichuanLogger();
+
         const api = this.baichuanApi;
         if (!api) return;
 
@@ -1195,7 +1211,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                     const sirenState = await api.getSiren(channel);
                     this.siren.on = sirenState.enabled;
                 } catch (e) {
-                    this.getBaichuanLogger().debug('Failed to align siren state', e);
+                    logger.debug('Failed to align siren state', e);
                 }
             }
 
@@ -1208,7 +1224,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                         this.floodlight.brightness = wl.brightness;
                     }
                 } catch (e) {
-                    this.getBaichuanLogger().debug('Failed to align floodlight state', e);
+                    logger.debug('Failed to align floodlight state', e);
                 }
             }
 
@@ -1232,16 +1248,18 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                         }
                     }
                 } catch (e) {
-                    this.getBaichuanLogger().debug('Failed to align PIR state', e);
+                    logger.debug('Failed to align PIR state', e);
                 }
             }
         } catch (e) {
-            this.getBaichuanLogger().debug('Failed to align auxiliary devices state', e);
+            logger.debug('Failed to align auxiliary devices state', e);
         }
     }
 
     // Video stream helper methods
     protected addRtspCredentials(rtspUrl: string): string {
+        const logger = this.getBaichuanLogger();
+
         const { username, password } = this.storageSettings.values;
         if (!username) {
             return rtspUrl;
@@ -1266,7 +1284,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             return url.toString();
         } catch (e) {
             // If URL parsing fails, return original URL
-            this.getBaichuanLogger().warn('Failed to parse URL for credentials', e);
+            logger.warn('Failed to parse URL for credentials', e);
             return rtspUrl;
         }
     }
@@ -1284,6 +1302,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
     }
 
     protected async ensureNetPortCache(): Promise<void> {
+        const logger = this.getBaichuanLogger();
+
         if (this.cachedNetPort) {
             return;
         }
@@ -1307,7 +1327,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
         } catch (e) {
             // Only log if it's not a recoverable error to avoid spam
             if (!this.isRecoverableBaichuanError?.(e)) {
-                this.getBaichuanLogger().warn('Failed to get net port, using defaults', e);
+                logger.warn('Failed to get net port, using defaults', e);
             }
             // Use defaults if we can't get the ports
             this.cachedNetPort = {
@@ -1363,7 +1383,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
         }
 
         if (streams.length) {
-            this.getBaichuanLogger().log('Fetched video stream options', { streams, netPort: this.cachedNetPort });
+            logger.log('Fetched video stream options', { streams, netPort: this.cachedNetPort });
             this.cachedVideoStreamOptions = streams;
             return streams;
         }
@@ -1492,14 +1512,14 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                     info: this.info,
                 };
 
-                this.getBaichuanLogger().log(`Updating device interfaces: ${JSON.stringify(device)}`);
+                logger.log(`Updating device interfaces: ${JSON.stringify(device)}`);
 
                 await sdk.deviceManager.onDeviceDiscovered(device);
             } catch (e) {
-                this.getBaichuanLogger().error('Failed to update device interfaces', e);
+                logger.error('Failed to update device interfaces', e);
             }
 
-            this.getBaichuanLogger().log(`Refreshed device capabilities: ${JSON.stringify({ capabilities, abilities, support, presets })}`);
+            logger.log(`Refreshed device capabilities: ${JSON.stringify({ capabilities, abilities, support, presets })}`);
         }
         catch (e) {
             logger.error('Failed to refresh abilities', e);
@@ -1561,7 +1581,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
 
         this.streamManager = new StreamManager({
             createStreamClient: () => this.createStreamClient(),
-            getLogger: () => this.getBaichuanLogger() as Console,
+            getLogger: () => logger as Console,
             credentials: {
                 username,
                 password

package/src/nvr.ts

@@ -53,7 +53,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
         rtspChannel: number;
         deviceData: DeviceInfoResponse;
     }>();
-    lastHubInfoCheck: number | undefined;
+    lastNvrInfoCheck: number | undefined;
     lastErrorsCheck: number | undefined;
     lastDevicesStatusCheck: number | undefined;
     cameraNativeMap = new Map<string, ReolinkNativeCamera | ReolinkNativeBatteryCamera>();
@@ -169,7 +169,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
             // Find camera for this channel
             const channel = ev?.channel;
             if (channel === undefined) {
-                logger.debug('Event has no channel, ignoring');
+                logger.error('Event has no channel, ignoring');
                 return;
             }
 
@@ -177,7 +177,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
             const targetCamera = nativeId ? this.cameraNativeMap.get(nativeId) : undefined;
 
             if (!targetCamera) {
-                logger.debug(`No camera found for channel ${channel}, ignoring event`);
+                logger.error(`No camera found for channel ${channel}, ignoring event`);
                 return;
             }
 
@@ -211,7 +211,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
                     motion = true;
                     break;
                 default:
-                    logger.debug(`Unknown event type: ${ev?.type}`);
+                    logger.error(`Unknown event type: ${ev?.type}`);
                     return;
             }
 
@@ -309,13 +309,12 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
                     // Note: ReolinkCgiApi doesn't have checkErrors, skip for now
                 }
 
-                if (!this.lastHubInfoCheck || now - this.lastHubInfoCheck > 1000 * 60 * 5) {
-                    logger.log('Starting Hub info data fetch');
-                    this.lastHubInfoCheck = now;
-                    const { hubData } = await api.getHubInfo();
+                if (!this.lastNvrInfoCheck || now - this.lastNvrInfoCheck > 1000 * 60 * 5) {
+                    logger.log('Starting NVR info data fetch');
+                    this.lastNvrInfoCheck = now;
+                    const { nvrData } = await api.getNvrInfo();
                     const { devicesData, channelsResponse, response } = await api.getDevicesInfo();
-                    logger.log('Hub info data fetched');
-                    logger.debug(`${JSON.stringify({ hubData, devicesData, channelsResponse, response })}`);
+                    logger.log(`NVR info data fetched: ${JSON.stringify({ nvrData, devicesData, channelsResponse, response })}`);
 
                     await this.discoverDevices(true);
                 }
@@ -355,6 +354,8 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
     }
 
     async updateDeviceInfo(): Promise<void> {
+        const logger = this.getBaichuanLogger();
+
         const { ipAddress } = this.storageSettings.values;
         try {
             const api = await this.ensureClient();
@@ -365,8 +366,10 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
                 ipAddress,
                 deviceData,
             });
+
+            logger.log(`Device info updated: ${JSON.stringify(deviceData)}`);
         } catch (e) {
-            this.getBaichuanLogger().warn('Failed to fetch device info', e);
+            logger.warn('Failed to fetch device info', e);
         }
     }
 
@@ -422,12 +425,8 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
         const api = await this.ensureClient();
         const logger = this.getBaichuanLogger();
 
-        logger.log('Starting channels discovery using getDevicesInfo...');
-
         const { devicesData, channels } = await api.getDevicesInfo();
-
-        logger.log(`getDevicesInfo completed. Found ${channels.length} channels.`);
-
+        logger.log(`Sync entities from remote for ${channels.length} channels`);
         // Process each channel that was successfully discovered
         for (const channel of channels) {
             try {
@@ -479,7 +478,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
             }
         }
 
-        logger.log(`Channel discovery completed. Found ${this.discoveredDevices.size} devices.`);
+        logger.log(`Channel discovery completed. ${JSON.stringify({ devicesData, channels })}`);
     }
 
     async discoverDevices(scan?: boolean): Promise<DiscoveredDevice[]> {
@@ -532,7 +531,8 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
         await sdk.deviceManager.onDeviceDiscovered(actualDevice);
 
         const device = await this.getDevice(adopt.nativeId);
-        this.getBaichuanLogger().debug('Adopted device', entry, device?.name);
+        const logger = this.getBaichuanLogger();
+        logger.log('Adopted device', entry, device?.name);
         const { username, password, ipAddress } = this.storageSettings.values;
 
         device.storageSettings.values.rtspChannel = entry.rtspChannel;