@apocaliss92/scrypted-reolink-native 0.3.12 → 0.3.14

package/package.json

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

package/src/camera.ts

@@ -341,19 +341,26 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             defaultValue: [],
         },
         intercomBlocksPerPayload: {
-            subgroup: 'Advanced',
-            title: 'Intercom Blocks Per Payload',
+            subgroup: 'Intercom',
+            title: 'Blocks Per Payload',
             description: 'Lower reduces latency (more packets). Typical: 1-4. Requires restarting talk session to take effect.',
             type: 'number',
             defaultValue: 1,
         },
         intercomMaxBacklogMs: {
-            subgroup: 'Advanced',
-            title: 'Intercom Max Backlog (ms)',
+            subgroup: 'Intercom',
+            title: 'Max Backlog (ms)',
             description: 'Maximum PCM backlog before dropping old audio to cap latency. Higher improves stability on slow systems but increases latency. Typical: 80-250. Requires restarting talk session to take effect.',
             type: 'number',
             defaultValue: 120,
         },
+        intercomGain: {
+            subgroup: 'Intercom',
+            title: 'Gain',
+            description: 'Output gain multiplier applied before encoding. 1.0 = normal, 2.0 ≈ +6dB, 0.5 ≈ -6dB. Requires restarting talk session to take effect.',
+            type: 'number',
+            defaultValue: 1.0,
+        },
         // PTZ Presets
         presets: {
             subgroup: 'PTZ',
@@ -2437,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') {

package/src/intercom.ts

@@ -33,6 +33,13 @@ export class ReolinkBaichuanIntercom {
         return Math.max(1, Math.min(8, this.camera.storageSettings.values.intercomBlocksPerPayload ?? 1));
     }
 
+    private get outputGain(): number {
+        const configured = Number(this.camera.storageSettings.values.intercomGain);
+        // Keep safe bounds: too high can clip and distort.
+        if (Number.isFinite(configured)) return Math.max(0.1, Math.min(10, configured));
+        return 1.0;
+    }
+
     async start(media: MediaObject): Promise<void> {
         const logger = this.camera.getBaichuanLogger();
 
@@ -44,13 +51,14 @@ export class ReolinkBaichuanIntercom {
         await this.stop();
         const channel = this.camera.storageSettings.values.rtspChannel;
 
-        // IMPORTANT: intercom must run on its own independent Baichuan session (separate socket)
-        // to avoid interference with any other sessions (streams/events/etc).
-        const intercomStreamKey = `intercom_${Date.now()}_${Math.random().toString(16).slice(2)}`;
-        const intercomApi = await this.camera.withBaichuanRetry(async () => {
-            return await this.camera.createStreamClient(intercomStreamKey);
-        });
-        this.intercomApi = intercomApi;
+        try {
+            // IMPORTANT: intercom must run on its own independent Baichuan session (separate socket)
+            // to avoid interference with any other sessions (streams/events/etc).
+            const intercomStreamKey = `intercom_${Date.now()}_${Math.random().toString(16).slice(2)}`;
+            const intercomApi = await this.camera.withBaichuanRetry(async () => {
+                return await this.camera.createStreamClient(intercomStreamKey);
+            });
+            this.intercomApi = intercomApi;
 
         // Best-effort: log codec requirements exposed by the camera.
         // This mirrors neolink's source of truth: TalkAbility (cmd_id=10).
@@ -97,6 +105,9 @@ export class ReolinkBaichuanIntercom {
             
             return await api.createTalkSession(channel, {
                 blocksPerPayload: this.blocksPerPayload,
+                // IMPORTANT: for dedicated intercom sessions, teardown should be owned by the socket/session.
+                // This mirrors stream behavior (closeApiOnTeardown) but for talk: session.stop() will close.
+                closeSocketOnStop: true,
             });
         });
 
@@ -155,9 +166,12 @@ export class ReolinkBaichuanIntercom {
 
         // IMPORTANT: incoming audio from Scrypted/WebRTC is typically Opus.
         // We must decode to PCM before IMA ADPCM encoding, otherwise it will be noise.
+        const gain = this.outputGain;
         const ffmpegArgs = this.buildFfmpegPcmArgs(ffmpegInput, {
             sampleRate,
             channels: 1,
+            gain,
+            logger,
         });
 
         logger.log("Intercom ffmpeg decode args", ffmpegArgs);
@@ -193,6 +207,12 @@ export class ReolinkBaichuanIntercom {
         });
 
         logger.log("Intercom started (ffmpeg decode -> PCM -> IMA ADPCM)");
+        }
+        catch (e) {
+            // Ensure the dedicated session gets torn down even if start fails half-way.
+            await this.stop();
+            throw e;
+        }
     }
 
     stop(): Promise<void> {
@@ -250,8 +270,10 @@ export class ReolinkBaichuanIntercom {
                 }
             }
 
-            // Close the dedicated intercom API session to keep it independent and short-lived.
-            if (intercomApi) {
+            // Socket teardown is handled by session.stop() (closeSocketOnStop).
+            // Fallback cleanup: if we never created a session but we did create a dedicated client,
+            // ensure it doesn't leak.
+            if (!session && intercomApi) {
                 try {
                     await Promise.race([intercomApi.close(), sleepMs(2000)]);
                 }
@@ -344,6 +366,8 @@ export class ReolinkBaichuanIntercom {
         options: {
             sampleRate: number;
             channels: number;
+            gain?: number;
+            logger?: any;
         },
     ): string[] {
         const inputArgs = ffmpegInput.inputArguments ?? [];
@@ -375,6 +399,16 @@ export class ReolinkBaichuanIntercom {
             throw new Error("FFmpegInput missing url/input");
         }
 
+        const gain = options.gain ?? 1.0;
+        const hasExistingAudioFilter = sanitizedArgs.includes("-af") || sanitizedArgs.includes("-filter:a") || sanitizedArgs.includes("-filter_complex");
+        const gainArgs = (gain !== 1.0)
+            ? (
+                hasExistingAudioFilter
+                    ? (options.logger?.warn?.("Intercom gain skipped: FFmpegInput already contains audio filters") ?? undefined, [])
+                    : ["-filter:a", `volume=${gain}`]
+            )
+            : [];
+
         return [
             ...sanitizedArgs,
             "-i", url,
@@ -387,6 +421,7 @@ export class ReolinkBaichuanIntercom {
             "-flush_packets", "1",
 
             "-vn", "-sn", "-dn",
+            ...gainArgs,
             "-acodec", "pcm_s16le",
             "-ar", options.sampleRate.toString(),
             "-ac", options.channels.toString(),