@apocaliss92/scrypted-reolink-native 0.3.1 → 0.3.3

package/package.json

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

package/src/camera.ts

@@ -20,7 +20,7 @@ import {
     StreamManager,
     StreamManagerOptions
 } from "./stream-utils";
-import { floodlightSuffix, getDeviceInterfaces, pirSuffix, recordingsToVideoClips, sanitizeFfmpegOutput, sirenSuffix, updateDeviceInfo } from "./utils";
+import { floodlightSuffix, getDeviceInterfaces, pirSuffix, recordingsToVideoClips, removeAuthUrls, sanitizeFfmpegOutput, sirenSuffix, updateDeviceInfo } from "./utils";
 
 export type CameraType = 'battery' | 'regular' | 'multi-focal' | 'multi-focal-battery';
 
@@ -2405,9 +2405,9 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
                     });
 
                     logger.debug(`Supported streams: ${JSON.stringify({
-                        nativeStreams,
-                        rtmpStreams,
-                        rtspStreams,
+                        nativeStreams: removeAuthUrls(nativeStreams),
+                        rtmpStreams: removeAuthUrls(rtmpStreams),
+                        rtspStreams: removeAuthUrls(rtspStreams),
                         variantType,
                         onNvr: this.isOnNvr,
                         channel: rtspChannel,
@@ -2534,7 +2534,12 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
         if (!this.streamManager) {
             const logger = this.getBaichuanLogger();
             logger.warn('StreamManager not initialized, initializing now...');
-            this.initStreamManager(logger);
+            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;
@@ -2731,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();

package/src/main.ts

@@ -5,6 +5,7 @@ import { ReolinkNativeNvrDevice } from "./nvr";
 import { batteryCameraSuffix, batteryMultifocalSuffix, cameraSuffix, extractThumbnailFromVideo, getDeviceInterfaces, handleVideoClipRequest, multifocalSuffix, nvrSuffix } from "./utils";
 import { randomBytes } from "crypto";
 import { ReolinkCamera } from "./camera";
+import type { AutoDetectMode } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
 
 interface ThumbnailRequest {
     deviceId: string;
@@ -65,8 +66,19 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
             throw new Error('IP address, username, and password are required');
         }
 
-        this.console.log(`[AutoDetect] Starting device type detection for ${ipAddress}...`);
+        const deviceTypeSetting = settings.deviceType?.toString() || 'Auto';
+        const forceType = deviceTypeSetting === 'Auto' ? undefined : deviceTypeSetting.toLowerCase();
+
+        this.console.log(`[AutoDetect] Starting device type detection for ${ipAddress}...${forceType ? ` (forcing type: ${forceType})` : ''}`);
         const { autoDetectDeviceType } = await import("@apocaliss92/reolink-baichuan-js");
+        // 'Auto', 'NVR', 'Battery Camera', 'Regular Camera
+        const mode: AutoDetectMode = forceType === 'Auto' ? 'auto' :
+            forceType === 'Battery Camera' ? 'udp' :
+                forceType === 'Regular Camera' ? 'tcp' :
+                    forceType === 'NVR' ? 'tcp' :
+                        'auto';
+
+        const maxRetries = mode === 'auto' ? 2 : 10;
 
         const detection = await autoDetectDeviceType(
             {
@@ -75,6 +87,8 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
                 password,
                 uid,
                 logger: this.console,
+                mode,
+                maxRetries,
             },
         );
         const { ip, mac } = detection.hostNetworkInfo ?? {}
@@ -235,6 +249,14 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
                 key: 'uid',
                 title: 'UID',
                 description: 'Reolink UID (optional, required for battery cameras if TCP connection fails)',
+            },
+            {
+                key: 'deviceType',
+                title: 'Device Type',
+                description: 'Device type detection mode. Use "Auto" for automatic detection, or force a specific type.',
+                type: 'string',
+                choices: ['Auto', 'NVR', 'Battery Camera', 'Regular Camera'],
+                value: 'Auto',
             }
         ]
     }

package/src/utils.ts

@@ -1,4 +1,4 @@
-import type { DeviceCapabilities, EnrichedRecordingFile, NativeVideoStreamVariant, ParsedRecordingFileName, RecordingFile, ReolinkBaichuanApi, ReolinkDeviceInfo, VodFile, VodSearchResponse } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
+import type { DeviceCapabilities, EnrichedRecordingFile, NativeVideoStreamVariant, ParsedRecordingFileName, RecordingFile, ReolinkBaichuanApi, ReolinkDeviceInfo, ReolinkSupportedStream, VodFile, VodSearchResponse } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
 import sdk, { DeviceBase, HttpRequest, HttpResponse, MediaObject, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, VideoClip, VideoClips } from "@scrypted/sdk";
 import { spawn } from "node:child_process";
 import { Readable } from "stream";
@@ -1071,4 +1071,6 @@ export async function vodSearchResultsToVideoClips(
     }
 
     return clips;
-}
+}
+
+export const removeAuthUrls = (streams: ReolinkSupportedStream[]) => streams.map(({ urlWithAuth, ...rest }) => ({ rest }));