@apocaliss92/scrypted-reolink-native 0.1.3 → 0.1.5

package/src/presets.ts

@@ -90,7 +90,7 @@ export class ReolinkPtzPresets {
 
     async refreshPtzPresets(): Promise<PtzPreset[]> {
         const client = await this.camera.ensureClient();
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
         const presets = await client.getPtzPresets(channel);
         this.setCachedPtzPresets(presets);
         this.syncEnabledPresetsSettingAndCaps(presets);
@@ -99,14 +99,14 @@ export class ReolinkPtzPresets {
 
     async moveToPreset(presetId: number): Promise<void> {
         const client = await this.camera.ensureClient();
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
         await client.moveToPtzPreset(channel, presetId);
     }
 
     /** Create a new PTZ preset at current position. */
     async createPtzPreset(name: string, presetId?: number): Promise<PtzPreset> {
         const client = await this.camera.ensureClient();
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
         const trimmed = String(name ?? '').trim();
         if (!trimmed) throw new Error('Preset name is required');
         const existing = await client.getPtzPresets(channel);
@@ -150,7 +150,7 @@ export class ReolinkPtzPresets {
     /** Overwrite an existing preset with the current PTZ position (and keep its current name). */
     async updatePtzPresetToCurrentPosition(presetId: number): Promise<void> {
         const client = await this.camera.ensureClient();
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
 
         const current = this.getCachedPtzPresets();
         const found = current.find((p) => p.id === presetId);
@@ -163,7 +163,7 @@ export class ReolinkPtzPresets {
     /** Best-effort delete/disable a preset (firmware dependent). */
     async deletePtzPreset(presetId: number): Promise<void> {
         const client = await this.camera.ensureClient();
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
         await client.deletePtzPreset(channel, presetId);
 
         // Keep enabled preset list clean (remove deleted id), but do not rewrite names for others.
@@ -181,7 +181,7 @@ export class ReolinkPtzPresets {
     /** Rename a preset while trying to preserve its position (will move camera to that preset first). */
     async renamePtzPreset(presetId: number, newName: string): Promise<void> {
         const client = await this.camera.ensureClient();
-        const channel = this.camera.getRtspChannel();
+        const channel = this.camera.storageSettings.values.rtspChannel;
         const trimmed = String(newName ?? '').trim();
         if (!trimmed) throw new Error('Preset name is required');
 

package/src/stream-utils.ts

@@ -97,14 +97,18 @@ export async function fetchVideoStreamOptionsFromApi(
 }
 
 export async function buildVideoStreamOptionsFromRtspRtmp(
-    client: ReolinkBaichuanApi,
-    channel: number,
-    ipAddress: string,
-    username: string,
-    password: string,
-    cachedNetPort?: { rtsp?: { port?: number; enable?: number }; rtmp?: { port?: number; enable?: number } },
+    props: {
+        client: ReolinkBaichuanApi,
+        ipAddress: string,
+        cachedNetPort: { rtsp?: { port?: number; enable?: number }; rtmp?: { port?: number; enable?: number } },
+        isFromNvr: boolean,
+        rtspChannel: number,
+        logger: Console
+    },
 ): Promise<UrlMediaStreamOptions[]> {
-    const streams: UrlMediaStreamOptions[] = [];
+    const { client, ipAddress, cachedNetPort, rtspChannel, logger } = props;
+    const rtspStreams: UrlMediaStreamOptions[] = [];
+    const rtmpStreams: UrlMediaStreamOptions[] = [];
 
     // Use cached net port if provided, otherwise fetch it
     const netPort = cachedNetPort || await client.getNetPort();
@@ -113,13 +117,8 @@ export async function buildVideoStreamOptionsFromRtspRtmp(
     const rtspPort = netPort.rtsp?.port ?? 554;
     const rtmpPort = netPort.rtmp?.port ?? 1935;
 
-    if (!rtspEnabled && !rtmpEnabled) {
-        // If neither RTSP nor RTMP are enabled, return empty array
-        return streams;
-    }
-
     // Get stream metadata to build options
-    const streamMetadata = await client.getStreamMetadata(channel);
+    const streamMetadata = await client.getStreamMetadata(rtspChannel);
     const list = streamMetadata?.streams || [];
 
     for (const stream of list) {
@@ -134,12 +133,12 @@ export async function buildVideoStreamOptionsFromRtspRtmp(
         if (rtspEnabled && profile !== 'ext') {
             // RTSP format: rtsp://ip:port/h264Preview_XX_profile
             // XX is 1-based channel with 2-digit padding
-            const channelStr = String(channel + 1).padStart(2, '0');
+            const channelStr = String(rtspChannel + 1).padStart(2, '0');
             const profileStr = profile === 'main' ? 'main' : 'sub';
             const rtspPath = `/h264Preview_${channelStr}_${profileStr}`;
             const rtspId = `h264Preview_${channelStr}_${profileStr}`;
 
-            streams.push({
+            rtspStreams.push({
                 name: `RTSP ${rtspId}`,
                 id: rtspId,
                 container: 'rtsp',
@@ -160,14 +159,14 @@ export async function buildVideoStreamOptionsFromRtspRtmp(
             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${channel}_${streamName}.bcs`;
+            const rtmpPath = `/bcs/channel${rtspChannel}_${streamName}.bcs`;
             const rtmpUrl = new URL(`rtmp://${ipAddress}:${rtmpPort}${rtmpPath}`);
             const params = rtmpUrl.searchParams;
-            params.set('channel', channel.toString());
+            params.set('channel', rtspChannel.toString());
             params.set('stream', streamType.toString());
             // Credentials will be added by addRtspCredentials as user/password query params
 
-            streams.push({
+            rtmpStreams.push({
                 name: `RTMP ${rtmpId}`,
                 id: rtmpId,
                 container: 'rtmp',
@@ -177,12 +176,14 @@ export async function buildVideoStreamOptionsFromRtspRtmp(
         }
     }
 
-    // Sort streams: RTMP first, then RTSP
-    streams.sort((a, b) => {
-        if (a.container === 'rtmp' && b.container !== 'rtmp') return -1;
-        if (a.container !== 'rtmp' && b.container === 'rtmp') return 1;
-        return 0;
-    });
+
+    const nativeStreams = await fetchVideoStreamOptionsFromApi(client, rtspChannel, logger);
+
+    const streams: UrlMediaStreamOptions[] = [
+        ...rtspStreams,
+        ...rtmpStreams,
+        ...nativeStreams,
+    ];
 
     return streams;
 }
@@ -378,7 +379,7 @@ export class StreamManager {
     async closeAllStreams(reason?: string): Promise<void> {
         const servers = Array.from(this.nativeRfcServers.values());
         this.nativeRfcServers.clear();
-        
+
         await Promise.allSettled(
             servers.map(async (server) => {
                 try {

package/src/utils.ts

@@ -1,5 +1,5 @@
-import type { DeviceCapabilities } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
-import { ScryptedDeviceType, ScryptedInterface } from "@scrypted/sdk";
+import type { DeviceCapabilities, ReolinkDeviceInfo } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
+import { DeviceBase, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface } from "@scrypted/sdk";
 
 export const getDeviceInterfaces = (props: {
     capabilities: DeviceCapabilities,
@@ -49,4 +49,33 @@ export const getDeviceInterfaces = (props: {
     }
 
     return { interfaces, type: capabilities.isDoorbell ? ScryptedDeviceType.Doorbell : ScryptedDeviceType.Camera };
+}
+
+export const updateDeviceInfo = async (props: {
+    device: DeviceBase,
+    ipAddress: string,
+    deviceData: ReolinkDeviceInfo
+}) => {
+    const { device, ipAddress, deviceData } = props;
+    try {
+        const info = device.info || {};
+
+        info.ip = ipAddress;
+        info.serialNumber = deviceData?.serialNumber || deviceData?.itemNo;
+        info.firmware = deviceData?.firmwareVersion;
+        info.version = deviceData?.hardwareVersion;
+        info.model = deviceData?.type;
+        info.manufacturer = 'Reolink';
+        info.managementUrl = `http://${ipAddress}`;
+        device.info = info;
+    } catch (e) {
+        // If API call fails, at least set basic info
+        const info = device.info || {};
+        info.ip = ipAddress;
+        info.manufacturer = 'Reolink native';
+        info.managementUrl = `http://${ipAddress}`;
+        device.info = info;
+
+        throw e;
+    }
 }