@apocaliss92/scrypted-reolink-native 0.3.13 → 0.3.15

package/package.json

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

package/src/camera.ts

@@ -2444,13 +2444,16 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
 
                     // Order streams based on preferredStreams setting
                     const preferredOrder = this.storageSettings.values.preferredStreams || 'Default';
-                    let supportedStreams: any[] = [];
+                    let supportedStreams: ReolinkSupportedStream[] = [];
 
                     if (preferredOrder === 'Default') {
                         // Default: Native -> RTSP -> RTMP
-                        supportedStreams = [...nativeStreams, ...rtspStreams, ...rtmpStreams];
-                        // // Default: RTSP -> RTMP -> Native
-                        // supportedStreams = [...rtspStreams, ...rtmpStreams, ...nativeStreams];
+                        // BUT for multifocal cameras without NVR, prefer RTSP -> RTMP -> Native
+                        if (this.multiFocalDevice && !this.nvrDevice) {
+                            supportedStreams = [...rtspStreams, ...rtmpStreams, ...nativeStreams];
+                        } else {
+                            supportedStreams = [...nativeStreams, ...rtspStreams, ...rtmpStreams];
+                        }
                     } else if (preferredOrder === 'Native') {
                         supportedStreams = [...nativeStreams, ...rtspStreams, ...rtmpStreams];
                     } else if (preferredOrder === 'RTSP') {
@@ -2791,11 +2794,22 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             this.storageSettings.settings.username.defaultValue = parentDevice.storageSettings.values.username;
             this.storageSettings.settings.password.defaultValue = parentDevice.storageSettings.values.password;
             this.storageSettings.settings.ipAddress.defaultValue = parentDevice.storageSettings.values.ipAddress;
+        } else {
+            this.storageSettings.settings.username.hide = false;
+            this.storageSettings.settings.password.hide = false;
+            this.storageSettings.settings.ipAddress.hide = false;
+            this.storageSettings.settings.uid.hide = false;
         }
 
         this.updateVideoClipsAutoLoad();
 
         this.onDeviceEvent(ScryptedInterface.Settings, '');
+
+        try {
+            await this.getVideoStreamOptions();
+        } catch (e) {
+            logger.error('Failed to get video stream options in init', e?.message || String(e));
+        }
     }
 
     async updateSleepingState(sleepStatus: SleepStatus): Promise<void> {