@apocaliss92/scrypted-reolink-native 0.1.2 → 0.1.4

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@apocaliss92/scrypted-reolink-native",
-   "version": "0.1.2",
-   "description": "Reolink Native plugin for Scrypted",
+   "version": "0.1.4",
+   "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[]> {

package/src/common.ts

@@ -18,11 +18,13 @@ import {
     StreamManager,
 } from "./stream-utils";
 import { getDeviceInterfaces } from "./utils";
+import { ReolinkNativeNvrDevice } from "./nvr";
 
 export type CameraType = 'battery' | 'regular';
 
 export interface CommonCameraMixinOptions {
     type: CameraType;
+    nvrDevice?: ReolinkNativeNvrDevice; // Optional reference to NVR device
 }
 
 class ReolinkCameraSiren extends ScryptedDeviceBase implements OnOff {
@@ -138,7 +140,7 @@ class ReolinkCameraPirSensor extends ScryptedDeviceBase implements OnOff, Settin
         await this.storageSettings.putSetting(key, value);
 
         // Apply the new settings to the camera
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
         const enabled = this.on ? 1 : 0;
         const sensitive = this.storageSettings.values.sensitive;
         const reduceAlarm = this.storageSettings.values.reduceAlarm ? 1 : 0;
@@ -166,7 +168,7 @@ class ReolinkCameraPirSensor extends ScryptedDeviceBase implements OnOff, Settin
     }
 
     private async updatePirSettings(): Promise<void> {
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
         const enabled = this.on ? 1 : 0;
         const sensitive = this.storageSettings.values.sensitive;
         const reduceAlarm = this.storageSettings.values.reduceAlarm ? 1 : 0;
@@ -227,24 +229,29 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
                 await this.credentialsChanged();
             }
         },
-        mixinsSetup: {
+        isFromNvr: {
             type: 'boolean',
             hide: true,
+            defaultValue: false,
         },
-        snapshotCacheMinutes: {
-            title: "Snapshot Cache Minutes",
-            subgroup: 'Advanced',
-            description: "Return a cached snapshot if taken within the last N minutes.",
-            type: "number",
-            defaultValue: 5,
+        mixinsSetup: {
+            type: 'boolean',
             hide: true,
         },
+        // snapshotCacheMinutes: {
+        //     title: "Snapshot Cache Minutes",
+        //     subgroup: 'Advanced',
+        //     description: "Return a cached snapshot if taken within the last N minutes.",
+        //     type: "number",
+        //     defaultValue: 60,
+        //     hide: true,
+        // },
         batteryUpdateIntervalMinutes: {
             title: "Battery Update Interval (minutes)",
             subgroup: 'Advanced',
-            description: "How often to wake up the camera and update battery status and snapshot (default: 10 minutes).",
+            description: "How often to wake up the camera and update battery status and snapshot (default: 60 minutes).",
             type: "number",
-            defaultValue: 10,
+            defaultValue: 60,
             hide: true,
         },
         // Regular camera specific
@@ -493,21 +500,15 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
     initComplete?: boolean;
     resetBaichuanClient?(reason?: any): Promise<void>;
 
+    protected nvrDevice?: any; // Optional reference to NVR device
+
     constructor(nativeId: string, public plugin: ReolinkNativePlugin, public options: CommonCameraMixinOptions) {
         super(nativeId);
         // Set protocol based on camera type
-        this.protocol = options.type === 'battery' ? 'udp' : 'tcp';
+        this.protocol = !options.nvrDevice && options.type === 'battery' ? 'udp' : 'tcp';
 
-        this.streamManager = new StreamManager({
-            createStreamClient: () => this.createStreamClient(),
-            getLogger: () => this.getLogger(),
-            credentials: {
-                username: this.storageSettings.values.username || '',
-                password: this.storageSettings.values.password || '',
-            },
-            // For battery cameras, we use a shared connection
-            sharedConnection: options.type === 'battery',
-        });
+        // Store NVR device reference if provided
+        this.nvrDevice = options.nvrDevice;
 
         setTimeout(async () => {
             await this.parentInit();
@@ -517,12 +518,6 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         throw new Error("Method not implemented.");
     }
 
-    // Common method implementations
-    public getRtspChannel(): number {
-        const channel = this.storageSettings.values.rtspChannel;
-        return channel !== undefined ? Number(channel) : 0;
-    }
-
     public getAbilities(): DeviceCapabilities {
         return this.storageSettings.values.capabilities;
     }
@@ -589,7 +584,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
                 return;
             }
 
-            const channel = this.getRtspChannel();
+            const channel = this.storageSettings.values.rtspChannel;
             if (ev?.channel !== undefined && ev.channel !== channel) {
                 if (this.isEventLogsEnabled()) {
                     logger.debug(`Event channel ${ev.channel} does not match camera channel ${channel}, ignoring`);
@@ -637,6 +632,10 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
     }
 
     async subscribeToEvents(): Promise<void> {
+        if (this.nvrDevice) {
+            return;
+        }
+
         const logger = this.getLogger();
         const selection = Array.from(this.getDispatchEventsSelection?.() ?? new Set()).sort();
         const enabled = selection.length > 0;
@@ -676,7 +675,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
     // VideoTextOverlays interface implementation
     async getVideoTextOverlays(): Promise<Record<string, VideoTextOverlay>> {
         const client = await this.ensureClient();
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
 
         let osd = this.storageSettings.values.cachedOsd;
 
@@ -698,7 +697,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
 
     async setVideoTextOverlay(id: 'osdChannel' | 'osdTime', value: VideoTextOverlay): Promise<void> {
         const client = await this.ensureClient();
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
 
         const osd = await client.getOsd(channel);
 
@@ -728,7 +727,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
             return;
         }
 
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
 
         // Preset navigation.
         const preset = command.preset;
@@ -959,9 +958,10 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         });
     }
 
-    // Settings methods
     async getSettings(): Promise<Setting[]> {
-        return await this.storageSettings.getSettings();
+        const settings = await this.storageSettings.getSettings();
+
+        return settings;
     }
 
     async putSetting(key: string, value: string): Promise<void> {
@@ -994,7 +994,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         const ip = this.storageSettings.values.ipAddress;
         try {
             const api = await this.ensureClient();
-            const deviceData = await api.getInfo();
+            const deviceData = await api.getInfo(this.storageSettings.values.rtspChannel);
             const info = this.info || {};
             info.ip = ip;
 
@@ -1002,7 +1002,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
             info.firmware = deviceData?.firmwareVersion || deviceData?.firmVer;
             info.version = deviceData?.hardwareVersion || deviceData?.boardInfo;
             info.model = deviceData?.type || deviceData?.typeInfo;
-            info.manufacturer = 'Reolink native';
+            info.manufacturer = 'Reolink';
             info.managementUrl = `http://${ip}`;
             this.info = info;
         } catch (e) {
@@ -1041,7 +1041,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
     }
 
     async setSirenEnabled(enabled: boolean): Promise<void> {
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
 
         await this.withBaichuanRetry(async () => {
             const api = await this.ensureClient();
@@ -1050,7 +1050,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
     }
 
     async setFloodlightState(on?: boolean, brightness?: number): Promise<void> {
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
 
         await this.withBaichuanRetry(async () => {
             const api = await this.ensureClient();
@@ -1059,7 +1059,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
     }
 
     async setPirEnabled(enabled: boolean): Promise<void> {
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
 
         // Get current PIR settings from the sensor if available
         let sensitive: number | undefined;
@@ -1091,7 +1091,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         const api = this.baichuanApi;
         if (!api) return;
 
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
         const { hasSiren, hasFloodlight, hasPir } = this.getAbilities();
 
         try {
@@ -1234,16 +1234,13 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
             return [];
         }
 
-        // while (this.fetchingStreams) {
-        //     await new Promise((resolve) => setTimeout(resolve, 500));
-        // }
         this.fetchingStreams = true;
 
         let streams: UrlMediaStreamOptions[] = [];
 
         const client = await this.ensureClient();
 
-        const { ipAddress, username, password, rtspChannel } = this.storageSettings.values;
+        const { ipAddress, rtspChannel, isFromNvr } = this.storageSettings.values;
 
         try {
             await this.ensureNetPortCache();
@@ -1255,12 +1252,14 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
 
         try {
             streams = await buildVideoStreamOptionsFromRtspRtmp(
-                client,
-                rtspChannel,
-                ipAddress,
-                username,
-                password,
-                this.cachedNetPort,
+                {
+                    client,
+                    ipAddress,
+                    cachedNetPort: this.cachedNetPort,
+                    isFromNvr,
+                    rtspChannel,
+                    logger,
+                },
             );
         } catch (e) {
             if (!this.isRecoverableBaichuanError?.(e)) {
@@ -1269,12 +1268,8 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
             this.cachedNetPort = undefined;
         }
 
-
-        const nativeStreams = await fetchVideoStreamOptionsFromApi(client, rtspChannel, this.getLogger());
-        streams = [...streams, ...nativeStreams];
-
         if (streams.length) {
-            logger.log('Fetched video stream options', streams);
+            logger.log('Fetched video stream options', { streams, netPort: this.cachedNetPort });
             this.cachedVideoStreamOptions = streams;
             return streams;
         }
@@ -1308,7 +1303,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         }
 
         const profile = parseStreamProfileFromId(selected.id) || 'main';
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
         const streamKey = `${channel}_${profile}`;
         const expectedVideoType = expectedVideoTypeFromUrlMediaStreamOptions(selected);
 
@@ -1356,10 +1351,6 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         this.ensureClientPromise = (async () => {
             const { ipAddress, username, password, uid } = this.storageSettings.values;
 
-            if (!ipAddress || !username || !password) {
-                throw new Error('Missing camera credentials');
-            }
-
             // Only tear down previous session if it exists and is not connected
             if (this.baichuanApi) {
                 const isConnected = this.baichuanApi.client.isSocketConnected();
@@ -1409,8 +1400,8 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
                 {
                     inputs: {
                         host: ipAddress,
-                        username,
-                        password,
+                        username: username,
+                        password: password,
                         uid: normalizedUid,
                         logger: this.console,
                         debugOptions,
@@ -1472,7 +1463,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         this.refreshingState = true;
 
         const logger = this.getLogger();
-        const channel = this.getRtspChannel();
+        const channel = this.storageSettings.values.rtspChannel;
 
         try {
             const { capabilities, abilities, support, presets, objects } = await this.withBaichuanRetry(async () => {
@@ -1492,7 +1483,7 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
 
                 const device: Device = {
                     nativeId: this.nativeId,
-                    providerNativeId: this.plugin?.nativeId,
+                    providerNativeId: this.nvrDevice?.nativeId ?? this.plugin?.nativeId,
                     name: this.name,
                     interfaces,
                     type,
@@ -1564,8 +1555,21 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         }
 
         const isBattery = this.options.type === 'battery';
+        const { username, password } = this.storageSettings.values;
 
-        this.storageSettings.settings.snapshotCacheMinutes.hide = !isBattery;
+        this.streamManager = new StreamManager({
+            createStreamClient: () => this.createStreamClient(),
+            getLogger: () => this.getLogger(),
+            credentials: {
+                username,
+                password
+            },
+            // For battery cameras, we use a shared connection
+            sharedConnection: isBattery,
+        });
+
+
+        // this.storageSettings.settings.snapshotCacheMinutes.hide = !isBattery;
         this.storageSettings.settings.uid.hide = !isBattery;
         this.storageSettings.settings.batteryUpdateIntervalMinutes.hide = !isBattery;
 
@@ -1591,6 +1595,19 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
             logger.warn('Failed to subscribe to Baichuan events', e);
         }
 
+        const { isFromNvr } = this.storageSettings.values;
+
+        if (isFromNvr && this.nvrDevice) {
+            this.storageSettings.settings.username.hide = true;
+            this.storageSettings.settings.password.hide = true;
+            this.storageSettings.settings.ipAddress.hide = true;
+            this.storageSettings.settings.uid.hide = true;
+
+            this.storageSettings.settings.username.defaultValue = this.nvrDevice.storageSettings.values.username;
+            this.storageSettings.settings.password.defaultValue = this.nvrDevice.storageSettings.values.password;
+            this.storageSettings.settings.ipAddress.defaultValue = this.nvrDevice.storageSettings.values.ipAddress;
+        }
+
         await this.init();
         this.initComplete = true;
     }