@apocaliss92/scrypted-reolink-native 0.0.3 → 0.0.5

package/src/main.ts

@@ -1,6 +1,7 @@
-import sdk, { DeviceCreator, DeviceCreatorSettings, DeviceInformation, DeviceProvider, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedNativeId, Setting } from "@scrypted/sdk";
+import sdk, { DeviceCreator, DeviceCreatorSettings, DeviceInformation, DeviceProvider, ScryptedDeviceBase, ScryptedDeviceType, ScryptedNativeId, Setting } from "@scrypted/sdk";
 import { ReolinkNativeCamera } from "./camera";
 import { connectBaichuanWithTcpUdpFallback, maskUid } from "./connect";
+import { getDeviceInterfaces } from "./utils";
 
 class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider, DeviceCreator {
     devices = new Map<string, ReolinkNativeCamera>();
@@ -9,17 +10,6 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
         return 'Reolink Native camera';
     }
 
-    getCameraInterfaces() {
-        return [
-            ScryptedInterface.Reboot,
-            ScryptedInterface.VideoCameraConfiguration,
-            ScryptedInterface.Camera,
-            ScryptedInterface.AudioSensor,
-            ScryptedInterface.MotionSensor,
-            ScryptedInterface.VideoTextOverlays,
-        ];
-    }
-
     async getDevice(nativeId: ScryptedNativeId): Promise<ReolinkNativeCamera> {
         if (this.devices.has(nativeId)) {
             return this.devices.get(nativeId);
@@ -59,19 +49,25 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
                 const deviceInfo = await api.getInfo();
                 const name = deviceInfo?.name;
                 const rtspChannel = 0;
-                const { abilities, capabilities } = await api.getDeviceCapabilities(rtspChannel);
+                const { abilities, capabilities } = await api.getDeviceCapabilities(rtspChannel, { probeAi: false });
 
                 this.console.log(JSON.stringify({ abilities, capabilities, deviceInfo }));
 
                 nativeId = deviceInfo.serialNumber;
+                const type = capabilities.isDoorbell ? ScryptedDeviceType.DataSource : ScryptedDeviceType.Camera;
 
                 settings.newCamera ||= name;
 
+                const interfaces = getDeviceInterfaces({
+                    capabilities,
+                    logger: this.console,
+                });
+
                 await sdk.deviceManager.onDeviceDiscovered({
                     nativeId,
                     name,
-                    interfaces: this.getCameraInterfaces(),
-                    type: ScryptedDeviceType.Camera,
+                    interfaces,
+                    type,
                     providerNativeId: this.nativeId,
                 });
 

package/src/presets.ts

@@ -113,54 +113,39 @@ export class ReolinkPtzPresets {
         const existing = await client.getPtzPresets(channel);
         const existingIds = new Set(existing.map((p) => p.id));
 
-        const maxAttempts = 5;
-        let lastUpdated: PtzPreset[] = [];
-        let chosenId: number | undefined;
-
-        const initialId = presetId ?? this.nextFreePresetId(existing);
-        for (let attempt = 0; attempt < maxAttempts; attempt++) {
-            const id = presetId ?? (initialId + attempt);
-            if (!presetId && existingIds.has(id)) continue;
-
-            await client.setPtzPreset(channel, id, trimmed);
+        const id = presetId ?? this.nextFreePresetId(existing);
+        if (presetId === undefined && existingIds.has(id)) {
+            // Should not happen because nextFreePresetId returns unused id.
+            throw new Error(`PTZ preset id already in use: ${id}`);
+        }
 
-            const updated = await client.getPtzPresets(channel);
-            lastUpdated = updated;
+        await client.setPtzPreset(channel, id, trimmed);
 
-            const persisted = updated.some((p) => p.id === id);
-            if (persisted) {
-                chosenId = id;
-                break;
-            }
+        const updated = await client.getPtzPresets(channel);
+        const persisted = updated.some((p) => p.id === id);
+        this.setCachedPtzPresets(updated);
 
-            // If the camera isn't exposing any presets at all, it may be keeping low IDs reserved/disabled.
-            // Try the next ID.
-        }
-
-        if (chosenId === undefined) {
-            this.setCachedPtzPresets(lastUpdated);
-            this.syncEnabledPresetsSettingAndCaps(lastUpdated);
+        if (!persisted) {
+            this.syncEnabledPresetsSettingAndCaps(updated);
             throw new Error(
-                `PTZ preset save did not persist (camera returned an empty/unchanged preset list). Try a different preset id.`
+                `PTZ preset save did not persist (camera returned an empty/unchanged preset list). Try again.`
             );
         }
 
-        this.setCachedPtzPresets(lastUpdated);
-
         // If the "presets" setting is in use, auto-add the newly created preset so it becomes
         // immediately selectable/visible in the UI. If it's empty/unconfigured, don't start using it.
         const enabled = (this.storageSettings.values.presets ?? []) as string[];
         if (enabled.length) {
-            const already = enabled.some((e) => this.parsePresetIdFromSettingValue(e) === chosenId);
+            const already = enabled.some((e) => this.parsePresetIdFromSettingValue(e) === id);
             if (!already) {
-                enabled.push(`${chosenId}=${trimmed}`);
+                enabled.push(`${id}=${trimmed}`);
                 this.storageSettings.values.presets = enabled;
             }
         }
 
         // Re-apply enabled mapping (so custom names/filters remain effective after setCachedPtzPresets).
-        this.syncEnabledPresetsSettingAndCaps(lastUpdated);
-        return { id: chosenId, name: trimmed };
+        this.syncEnabledPresetsSettingAndCaps(updated);
+        return { id, name: trimmed };
     }
 
     /** Overwrite an existing preset with the current PTZ position (and keep its current name). */

package/src/utils.ts

@@ -1,60 +1,52 @@
-
-import MqttClient from '../../scrypted-apocaliss-base/src/mqtt-client';
-
-export const getMqttTopics = (cameraName: string) => {
-    const statusTopic = `neolink/${cameraName}/status`;
-    const batteryStatusTopic = `neolink/${cameraName}/status/battery_level`;
-    const motionStatusTopic = `neolink/${cameraName}/status/motion`;
-    const disconnecteStatusdTopic = `neolink/${cameraName}/status/disconnected`;
-    const previewStatusTopic = `neolink/${cameraName}/status/preview`;
-    const ptzPresetsStatusTopic = `neolink/${cameraName}/status/ptz/preset`;
-
-    const batteryQueryTopic = `neolink/${cameraName}/query/battery`;
-    const previewQueryTopic = `neolink/${cameraName}/query/preview`;
-    const ptzPreviewQueryTopic = `neolink/${cameraName}/query/ptz/preset`;
-
-    const ptzControlTopic = `neolink/${cameraName}/control/ptz`;
-    const ptzPresetControlTopic = `neolink/${cameraName}/control/preset`;
-    const floodlightControlTopic = `neolink/${cameraName}/control/floodlight`;
-    const floodlightTasksControlTopic = `neolink/${cameraName}/control/floodlight_tasks`;
-    const sirenControlTopic = `neolink/${cameraName}/control/siren`;
-    const rebootControlTopic = `neolink/${cameraName}/control/reboot`;
-    const ledControlTopic = `neolink/${cameraName}/control/led`;
-    const irControlTopic = `neolink/${cameraName}/control/ir`;
-    const pirControlTopic = `neolink/${cameraName}/control/pir`;
-
-    return {
-        statusTopic,
-        batteryStatusTopic,
-        motionStatusTopic,
-        disconnecteStatusdTopic,
-        ptzPresetsStatusTopic,
-        previewStatusTopic,
-        batteryQueryTopic,
-        previewQueryTopic,
-        ptzPreviewQueryTopic,
-        ptzControlTopic,
-        ptzPresetControlTopic,
-        floodlightControlTopic,
-        floodlightTasksControlTopic,
-        sirenControlTopic,
-        rebootControlTopic,
-        ledControlTopic,
-        irControlTopic,
-        pirControlTopic,
-    }
-}
-
-export const subscribeToNeolinkTopic = async (client: MqttClient, topic: string, console: Console, cb: (value?: any) => void) => {
-    client.subscribe([topic], async (messageTopic, message) => {
-        const messageString = message.toString();
-        if (messageTopic === topic) {
-            cb(messageString);
+import type { DeviceCapabilities } from "@apocaliss92/reolink-baichuan-js" with { "resolution-mode": "import" };
+import { ScryptedInterface } from "@scrypted/sdk";
+
+export const getDeviceInterfaces = (props: {
+    capabilities: DeviceCapabilities,
+    logger: Console
+}) => {
+    const { capabilities, logger } = props;
+
+    const interfaces = [
+        ScryptedInterface.VideoCamera,
+        ScryptedInterface.Settings,
+        ScryptedInterface.Reboot,
+        ScryptedInterface.VideoCameraConfiguration,
+        ScryptedInterface.Camera,
+        ScryptedInterface.AudioSensor,
+        ScryptedInterface.MotionSensor,
+        ScryptedInterface.VideoTextOverlays,
+    ];
+
+    try {
+        const {
+            hasPtz,
+            hasSiren,
+            hasFloodlight,
+            hasPir,
+            hasBattery,
+            hasIntercom,
+            isDoorbell,
+        } = capabilities;
+
+        if (hasPtz) {
+            interfaces.push(ScryptedInterface.PanTiltZoom);
         }
-    });
-
-}
+        interfaces.push(ScryptedInterface.ObjectDetector);
+        if (hasSiren || hasFloodlight || hasPir)
+            interfaces.push(ScryptedInterface.DeviceProvider);
+        if (hasBattery) {
+            interfaces.push(ScryptedInterface.Battery, ScryptedInterface.Sleep);
+        }
+        if (hasIntercom) {
+            interfaces.push(ScryptedInterface.Intercom);
+        }
+        if (isDoorbell) {
+            interfaces.push(ScryptedInterface.BinarySensor);
+        }
+    } catch (e) {
+        logger.error('Error getting device interfaces', e);
+    }
 
-export const unsubscribeFromNeolinkTopic = async (client: MqttClient, topic: string, console: Console) => {
-    client.unsubscribe([topic]);
+    return interfaces;
 }