@apocaliss92/scrypted-reolink-native 0.1.19 → 0.1.21

package/src/multifocal.ts

@@ -41,12 +41,12 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
         },
         diagnosticsRun: {
             subgroup: 'Diagnostics',
-            title: 'Run NVR Diagnostics',
-            description: 'Collect NVR diagnostics and display results in logs.',
+            title: 'Run Diagnostics',
+            description: 'Collect diagnostics and display results in logs.',
             type: 'button',
             immediate: true,
             onPut: async () => {
-                await this.runNvrDiagnostics();
+                await this.runDiagnostics();
             },
         },
     });
@@ -201,64 +201,70 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
         const logger = this.getBaichuanLogger();
 
         try {
-            const channelsInfo = await api.getNvrChannelsInfo();
-            const deviceInfo = await api.getInfo();
+            // const channelsInfo = await api.getNvrChannelsInfo();
+            // const deviceInfo = await api.getInfo();
             const { support } = await api.getDeviceCapabilities();
             const channelNum = support?.channelNum ?? 1;
             logger.log(`Sync entities from remote for ${channelNum} channels`);
             const channels = Array.from({ length: channelNum }, (_, i) => i + 1);
 
-            logger.log(JSON.stringify({ channelsInfo, deviceInfo, channels }));
-
-            // for (const channel of channels) {
-            //     try {
-            //         const name = deviceInfo?.name || `Channel ${channel}`;
-            //         const uid = deviceInfo?.uid;
-            //         const isBattery = !!(abilities?.battery?.ver ?? 0);
-
-            //         const nativeId = this.buildNativeId(channel, uid, isBattery);
-            //         const interfaces = [ScryptedInterface.VideoCamera];
-            //         if (isBattery) {
-            //             interfaces.push(ScryptedInterface.Battery);
-            //         }
-            //         const type = abilities.supportDoorbellLight ? ScryptedDeviceType.Doorbell : ScryptedDeviceType.Camera;
-
-            //         const device: Device = {
-            //             nativeId,
-            //             name,
-            //             providerNativeId: this.nativeId,
-            //             interfaces,
-            //             type,
-            //             info: {
-            //                 manufacturer: 'Reolink',
-            //                 model: channelInfo?.typeInfo,
-            //                 serialNumber: uid,
-            //             }
-            //         };
-
-            //         this.channelToNativeIdMap.set(channel, nativeId);
-
-            //         if (sdk.deviceManager.getNativeIds().includes(nativeId)) {
-            //             continue;
-            //         }
-
-            //         if (this.discoveredDevices.has(nativeId)) {
-            //             continue;
-            //         }
-
-            //         this.discoveredDevices.set(nativeId, {
-            //             device,
-            //             description: `${name} (Channel ${channel})`,
-            //             rtspChannel: channel,
-            //             deviceData: devicesData[channel],
-            //         });
-
-            //         logger.debug(`Discovered channel ${channel}: ${name}`);
-            //     } catch (e: any) {
-            //         logger.debug(`Error processing channel ${channel}: ${e?.message || String(e)}`);
-            //     }
+            const multifocalInfo = await api.getDualLensChannelInfo();
+
+            logger.log(`Multichannel info: ${JSON.stringify(multifocalInfo)}`);
+
+            // if (channelNum === 2) {
+
             // }
 
+            for (const channel of channels) {
+                //     try {
+                //         const name = deviceInfo?.name || `Channel ${channel}`;
+                //         const uid = deviceInfo?.uid;
+                //         const isBattery = !!(abilities?.battery?.ver ?? 0);
+
+                //         const nativeId = this.buildNativeId(channel, uid, isBattery);
+                //         const interfaces = [ScryptedInterface.VideoCamera];
+                //         if (isBattery) {
+                //             interfaces.push(ScryptedInterface.Battery);
+                //         }
+                //         const type = abilities.supportDoorbellLight ? ScryptedDeviceType.Doorbell : ScryptedDeviceType.Camera;
+
+                //         const device: Device = {
+                //             nativeId,
+                //             name,
+                //             providerNativeId: this.nativeId,
+                //             interfaces,
+                //             type,
+                //             info: {
+                //                 manufacturer: 'Reolink',
+                //                 model: channelInfo?.typeInfo,
+                //                 serialNumber: uid,
+                //             }
+                //         };
+
+                //         this.channelToNativeIdMap.set(channel, nativeId);
+
+                //         if (sdk.deviceManager.getNativeIds().includes(nativeId)) {
+                //             continue;
+                //         }
+
+                //         if (this.discoveredDevices.has(nativeId)) {
+                //             continue;
+                //         }
+
+                //         this.discoveredDevices.set(nativeId, {
+                //             device,
+                //             description: `${name} (Channel ${channel})`,
+                //             rtspChannel: channel,
+                //             deviceData: devicesData[channel],
+                //         });
+
+                //         logger.debug(`Discovered channel ${channel}: ${name}`);
+                //     } catch (e: any) {
+                //         logger.debug(`Error processing channel ${channel}: ${e?.message || String(e)}`);
+                //     }
+            }
+
             // logger.log(`Channel discovery completed. ${JSON.stringify({ devicesData, channels })}`);
         } catch (e) {
             logger.error('Failed to sync entities from remote', e);
@@ -391,7 +397,7 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
 
         const nativeId = this.channelToNativeIdMap.get(channel);
         if (!nativeId) {
-            logger.error(`No camera found for channel ${channel}, ignoring event`);
+            logger.debug(`No camera found for channel ${channel}, ignoring event`);
             return;
         }
 
@@ -413,9 +419,9 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
         await this.subscribeToEvents();
     }
 
-    private async runNvrDiagnostics(): Promise<void> {
+    private async runDiagnostics(): Promise<void> {
         const logger = this.getBaichuanLogger();
-        logger.log(`Starting NVR diagnostics...`);
+        logger.log(`Starting Multifocal diagnostics...`);
 
         try {
             const { ipAddress, username, password } = this.storageSettings.values;
@@ -423,23 +429,12 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
                 throw new Error('Missing device credentials');
             }
 
-            const { ReolinkCgiApi } = await import("@apocaliss92/reolink-baichuan-js");
-            const cgiApi = new ReolinkCgiApi({
-                host: ipAddress,
-                username,
-                password,
-            });
+            const api = await this.ensureBaichuanClient();
 
-            await cgiApi.login();
-
-            const diagnostics = await cgiApi.collectNvrDiagnostics({
-                logger: this.console,
-            });
+            const multifocalDiagnostics = await api.collectMultifocalDiagnostics(logger);
 
             logger.log(`NVR diagnostics completed successfully.`);
-
-            // Print diagnostics to console
-            cgiApi.printNvrDiagnostics(diagnostics, this.console);
+            logger.log(JSON.stringify(multifocalDiagnostics));
         } catch (e) {
             logger.error('Failed to run NVR diagnostics', e);
             throw e;

package/src/nvr.ts

@@ -208,7 +208,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
             const targetCamera = nativeId ? this.cameraNativeMap.get(nativeId) : undefined;
 
             if (!targetCamera) {
-                logger.info(`No camera found for channel ${channel}, ignoring event`);
+                logger.debug(`No camera found for channel ${channel}, ignoring event`);
                 return;
             }
 
@@ -262,18 +262,13 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
     }
 
     async subscribeToAllEvents(): Promise<void> {
-        const logger = this.getBaichuanLogger();
         const eventSource = this.storageSettings.values.eventSource || 'Native';
 
-        // Only subscribe if Native is selected
         if (eventSource !== 'Native') {
             await this.unsubscribeFromAllEvents();
-            return;
+        } else {
+            await super.subscribeToEvents();
         }
-
-        // Use base class implementation
-        await super.subscribeToEvents();
-        logger.log('Subscribed to all events for NVR cameras');
     }
 
     private async runNvrDiagnostics(): Promise<void> {
@@ -288,7 +283,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
             });
 
             logger.log(`NVR diagnostics completed successfully.`);
-            
+
             cgiApi.printNvrDiagnostics(diagnostics, this.console);
         } catch (e) {
             logger.error('Failed to run NVR diagnostics', e);
@@ -340,8 +335,12 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
     }
 
     async init() {
-        const api = await this.ensureClient();
         const logger = this.getBaichuanLogger();
+        
+        // Ensure both APIs are ready before proceeding
+        const api = await this.ensureClient();
+        await this.ensureBaichuanClient();
+        
         await this.updateDeviceInfo();
 
         // Initialize event subscriptions based on selected source
@@ -473,12 +472,40 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
     }
 
     async syncEntitiesFromRemote() {
-        const api = await this.ensureClient();
         const logger = this.getBaichuanLogger();
+        
+        // Ensure both APIs are ready before syncing
+        const api = await this.ensureClient();
+        const baichuanApi = await this.ensureBaichuanClient();
+        
+        // Wait for Baichuan connection to be fully established
+        if (baichuanApi?.client) {
+            // Check if already connected
+            if (!baichuanApi.client.isSocketConnected()) {
+                logger.debug('Waiting for Baichuan connection to be established...');
+                // Wait up to 5 seconds for connection
+                let attempts = 0;
+                while (!baichuanApi.client.isSocketConnected() && attempts < 50) {
+                    await new Promise(resolve => setTimeout(resolve, 100));
+                    attempts++;
+                }
+                if (!baichuanApi.client.isSocketConnected()) {
+                    logger.warn('Baichuan connection not established after waiting, proceeding anyway');
+                } else {
+                    logger.debug('Baichuan connection established');
+                }
+            }
+        }
 
         const { devicesData, channels } = await api.getDevicesInfo();
+
+        if (!channels.length) {
+            logger.debug(`No channels found, ${JSON.stringify({ devicesData, channels })}`);
+            return;
+        }
+
         logger.log(`Sync entities from remote for ${channels.length} channels`);
-        // Process each channel that was successfully discovered
+
         for (const channel of channels) {
             try {
                 const { channelStatus, channelInfo, abilities } = devicesData[channel];

package/src/stream-utils.ts

@@ -10,9 +10,7 @@ import sdk, {
     type RequestMediaStreamOptions,
     type ResponseMediaStreamOptions,
 } from "@scrypted/sdk";
-
 import type { UrlMediaStreamOptions } from "../../scrypted/plugins/rtsp/src/rtsp";
-import { ReolinkNativeNvrDevice } from "./nvr";
 
 export interface StreamManagerOptions {
     /**
@@ -60,145 +58,6 @@ export function parseStreamProfileFromId(id: string | undefined): StreamProfile
     return;
 }
 
-/**
- * Check if a stream ID represents a native Baichuan stream (prefixed with "native_")
- */
-export function isNativeStreamId(id: string | undefined): boolean {
-    return id?.startsWith('native_') ?? false;
-}
-
-export async function fetchVideoStreamOptionsFromApi(
-    client: ReolinkBaichuanApi,
-    channel: number,
-    logger: Console,
-): Promise<UrlMediaStreamOptions[]> {
-    const streamMetadata = await client.getStreamMetadata(channel);
-
-    const streams: UrlMediaStreamOptions[] = [];
-    const list = streamMetadata?.streams || [];
-
-    for (const stream of list) {
-        const profile = stream.profile as StreamProfile;
-        const codec = String(stream.videoEncType || '').includes('264')
-            ? 'h264'
-            : String(stream.videoEncType || '').includes('265')
-                ? 'h265'
-                : String(stream.videoEncType || '').toLowerCase();
-
-        streams.push({
-            name: `Native ${profile}`,
-            id: `native_${profile}`,
-            container: 'rtp',
-            video: { codec, width: stream.width, height: stream.height },
-            url: ``,
-        });
-    }
-
-    return streams;
-}
-
-export async function buildVideoStreamOptions(
-    props: {
-        client: ReolinkBaichuanApi,
-        ipAddress: string,
-        cachedNetPort: { rtsp?: { port?: number; enable?: number }; rtmp?: { port?: number; enable?: number } },
-        nvrDevice?: ReolinkNativeNvrDevice,
-        rtspChannel: number,
-        logger: Console
-    },
-): Promise<UrlMediaStreamOptions[]> {
-    const { client, ipAddress, cachedNetPort, rtspChannel, logger, nvrDevice } = props;
-    const rtspStreams: UrlMediaStreamOptions[] = [];
-    const rtmpStreams: UrlMediaStreamOptions[] = [];
-
-    // Use cached net port if provided, otherwise fetch it
-    const netPort = cachedNetPort || await client.getNetPort();
-    const rtspEnabled = netPort.rtsp?.enable === 1;
-    const rtmpEnabled = netPort.rtmp?.enable === 1;
-    const rtspPort = netPort.rtsp?.port ?? 554;
-    const rtmpPort = netPort.rtmp?.port ?? 1935;
-
-    // Get stream metadata to build options
-    const streamMetadata = await client.getStreamMetadata(rtspChannel);
-    const list = streamMetadata?.streams || [];
-
-    for (const stream of list) {
-        const profile = stream.profile as StreamProfile;
-        const codec = String(stream.videoEncType || '').includes('264')
-            ? 'h264'
-            : String(stream.videoEncType || '').includes('265')
-                ? 'h265'
-                : String(stream.videoEncType || '').toLowerCase();
-
-        // Build RTSP URL if enabled (RTSP doesn't support ext stream, only main and sub)
-        if (rtspEnabled && profile !== 'ext') {
-            // RTSP format: rtsp://ip:port/h264Preview_XX_profile
-            // XX is 1-based channel with 2-digit padding
-            const channelStr = String(rtspChannel + 1).padStart(2, '0');
-            const profileStr = profile === 'main' ? 'main' : 'sub';
-            const rtspPath = `/h264Preview_${channelStr}_${profileStr}`;
-            const rtspId = `h264Preview_${channelStr}_${profileStr}`;
-
-            rtspStreams.push({
-                name: `RTSP ${rtspId}`,
-                id: rtspId,
-                container: 'rtsp',
-                video: { codec, width: stream.width, height: stream.height },
-                url: `rtsp://${ipAddress}:${rtspPort}${rtspPath}`,
-            });
-        }
-
-        // Build RTMP URL if enabled (RTMP supports main, sub, and ext streams)
-        if (rtmpEnabled) {
-            // RTMP format: /bcs/channelX_stream.bcs?channel=X&stream=stream_type&user=username&password=password
-            // Based on reolink_aio api.py line 3295-3298:
-            // - stream in path is "main", "sub", or "ext" (not "main.bcs")
-            // - stream_type in query: 0 for main/ext, 1 for sub
-            // - credentials: user and password as query parameters
-            const streamName = profile === 'main' ? 'main' : profile === 'sub' ? 'sub' : 'ext';
-            const streamType = profile === 'sub' ? 1 : 0; // 0 for main/ext, 1 for sub
-            const rtmpId = `${streamName}.bcs`; // ID for Scrypted (main.bcs, sub.bcs, ext.bcs)
-
-            // Use channel directly (0-based) in path, matching reolink_aio behavior
-            const rtmpPath = `/bcs/channel${rtspChannel}_${streamName}.bcs`;
-            const rtmpUrl = new URL(`rtmp://${ipAddress}:${rtmpPort}${rtmpPath}`);
-            const params = rtmpUrl.searchParams;
-            params.set('channel', rtspChannel.toString());
-            params.set('stream', streamType.toString());
-            // Credentials will be added by addRtspCredentials as user/password query params
-
-            rtmpStreams.push({
-                name: `RTMP ${rtmpId}`,
-                id: rtmpId,
-                container: 'rtmp',
-                video: { codec, width: stream.width, height: stream.height },
-                url: rtmpUrl.toString(),
-            });
-        }
-    }
-
-
-    const nativeStreams = await fetchVideoStreamOptionsFromApi(client, rtspChannel, logger);
-
-    let streams: UrlMediaStreamOptions[] = [];
-
-    if (nvrDevice && nvrDevice.info.model === 'HOMEHUB') {
-        streams = [
-            ...nativeStreams,
-            ...rtspStreams,
-            ...rtmpStreams,
-        ];
-    } else {
-        streams = [
-            ...rtspStreams,
-            ...rtmpStreams,
-            ...nativeStreams,
-        ];
-    }
-
-    return streams;
-}
-
 export function selectStreamOption(
     vsos: UrlMediaStreamOptions[] | undefined,
     request: RequestMediaStreamOptions,

package/src/utils.ts

@@ -1,6 +1,25 @@
 import type { DeviceCapabilities, ReolinkDeviceInfo } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
 import { DeviceBase, ScryptedDeviceType, ScryptedInterface } from "@scrypted/sdk";
 
+/**
+ * Enumeration of operation types that may require specific channel assignments
+ */
+export enum OperationChannelType {
+    PAN = 'pan',
+    TILT = 'tilt',
+    ZOOM = 'zoom',
+    INTERCOM = 'intercom',
+    GOTO = 'goto',
+    PRESET = 'preset',
+    PATROL = 'patrol',
+    TRACK = 'track',
+}
+
+/**
+ * Type for channel-specific operation mappings
+ */
+export type OperationChannelMap = Partial<Record<OperationChannelType, number>>;
+
 export const nvrSuffix = `-nvr`;
 export const batteryCameraSuffix = `-battery-cam`;
 export const multifocalSuffix = `-multifocal`;