@apocaliss92/scrypted-reolink-native 0.3.0 → 0.3.2

package/package.json

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

package/src/camera.ts

@@ -235,6 +235,14 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             defaultValue: 'default',
             choices: ['default', 'autotrack', 'telephoto'] as NativeVideoStreamVariant[],
         },
+        preferredStreams: {
+            type: 'string',
+            title: 'Preferred Stream Order',
+            description: 'Order preference for video streams. Default: RTSP -> RTMP -> Native',
+            defaultValue: 'Default',
+            choices: ['Default', 'Native', 'RTSP', 'RTMP'],
+            subgroup: 'Streaming',
+        },
         // capabilities: {
         //     json: true,
         //     hide: true,
@@ -2406,11 +2414,33 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
                         compositeOnly: this.isMultiFocal,
                     })}`);
 
-                    // const urls = client.getRtspUrl(rtspChannel);
-
-                    // let supportedStreams: ReolinkSupportedStream[] = [];
-                    const supportedStreams = [...nativeStreams, ...rtspStreams, ...rtmpStreams];
-                    // logger.log({ supportedStreams, variantType, lensParam, rtspChannel, onNvr: this.isOnNvr, nativeStreams: nativeStreams.map(s => ({ id: s.id, nativeVariant: s.nativeVariant, lens: s.lens })), rtspStreams: rtspStreams.map(s => ({ id: s.id, lens: s.lens })), rtmpStreams: rtmpStreams.map(s => ({ id: s.id, lens: s.lens })) });
+                    // Update preferredStreams choices based on supported stream types
+                    const availableChoices = ['Default'];
+                    if (nativeStreams.length > 0) availableChoices.push('Native');
+                    if (rtspStreams.length > 0) availableChoices.push('RTSP');
+                    if (rtmpStreams.length > 0) availableChoices.push('RTMP');
+
+                    this.storageSettings.settings.preferredStreams.choices = availableChoices;
+
+                    // Order streams based on preferredStreams setting
+                    const preferredOrder = this.storageSettings.values.preferredStreams || 'Default';
+                    let supportedStreams: any[] = [];
+
+                    if (preferredOrder === 'Default') {
+                        // Default: Native -> RTSP -> RTMP
+                        supportedStreams = [...nativeStreams, ...rtspStreams, ...rtmpStreams];
+                        // // Default: RTSP -> RTMP -> Native
+                        // supportedStreams = [...rtspStreams, ...rtmpStreams, ...nativeStreams];
+                    } else if (preferredOrder === 'Native') {
+                        supportedStreams = [...nativeStreams, ...rtspStreams, ...rtmpStreams];
+                    } else if (preferredOrder === 'RTSP') {
+                        supportedStreams = [...rtspStreams, ...rtmpStreams, ...nativeStreams];
+                    } else if (preferredOrder === 'RTMP') {
+                        supportedStreams = [...rtmpStreams, ...rtspStreams, ...nativeStreams];
+                    } else {
+                        // Fallback to default
+                        supportedStreams = [...rtspStreams, ...rtmpStreams, ...nativeStreams];
+                    }
 
                     for (const supportedStream of supportedStreams) {
                         const { id, metadata, url, name, container, lens, channel, profile, nativeVariant } = supportedStream;
@@ -2500,8 +2530,16 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             return await this.createMediaObject(ret, ScryptedMimeTypes.MediaStreamUrl);
         }
 
+        // Ensure streamManager is initialized before use
         if (!this.streamManager) {
-            throw new Error('StreamManager not initialized');
+            const logger = this.getBaichuanLogger();
+            logger.warn('StreamManager not initialized, initializing now...');
+            try {
+                this.initStreamManager(logger);
+            } catch (e) {
+                logger.error('Failed to initialize StreamManager in getVideoStream', e?.message || String(e), e);
+                throw e;
+            }
         }
 
         const streamKey = selected.id;
@@ -2698,7 +2736,7 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             this.initStreamManager();
         }
         catch (e) {
-            logger.error('Failed to initialize StreamManager', e?.message || String(e));
+            logger.error('Failed to initialize StreamManager in init', e?.message || String(e), e);
         }
 
         const { hasIntercom, hasPtz } = await this.getAbilities();