@apocaliss92/scrypted-reolink-native 0.1.4 → 0.1.5

package/package.json

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

package/src/common.ts

@@ -6,19 +6,18 @@ import { createBaichuanApi, normalizeUid, type BaichuanTransport } from "./conne
 import { convertDebugLogsToApiOptions, DebugLogOption, getApiRelevantDebugLogs, getDebugLogChoices } from "./debug-options";
 import { ReolinkBaichuanIntercom } from "./intercom";
 import ReolinkNativePlugin from "./main";
+import { ReolinkNativeNvrDevice } from "./nvr";
 import { ReolinkPtzPresets } from "./presets";
 import {
     buildVideoStreamOptionsFromRtspRtmp,
     createRfc4571MediaObjectFromStreamManager,
     expectedVideoTypeFromUrlMediaStreamOptions,
-    fetchVideoStreamOptionsFromApi,
     isNativeStreamId,
     parseStreamProfileFromId,
     selectStreamOption,
-    StreamManager,
+    StreamManager
 } from "./stream-utils";
-import { getDeviceInterfaces } from "./utils";
-import { ReolinkNativeNvrDevice } from "./nvr";
+import { getDeviceInterfaces, updateDeviceInfo } from "./utils";
 
 export type CameraType = 'battery' | 'regular';
 
@@ -989,29 +988,18 @@ export abstract class CommonCameraMixin extends ScryptedDeviceBase implements Vi
         }
     }
 
-    // Device info update
     async updateDeviceInfo(): Promise<void> {
-        const ip = this.storageSettings.values.ipAddress;
+        const { ipAddress, rtspChannel } = this.storageSettings.values;
         try {
             const api = await this.ensureClient();
-            const deviceData = await api.getInfo(this.storageSettings.values.rtspChannel);
-            const info = this.info || {};
-            info.ip = ip;
-
-            info.serialNumber = deviceData?.serialNumber || deviceData?.itemNo;
-            info.firmware = deviceData?.firmwareVersion || deviceData?.firmVer;
-            info.version = deviceData?.hardwareVersion || deviceData?.boardInfo;
-            info.model = deviceData?.type || deviceData?.typeInfo;
-            info.manufacturer = 'Reolink';
-            info.managementUrl = `http://${ip}`;
-            this.info = info;
+            const deviceData = await api.getInfo(this.nvrDevice ? rtspChannel : undefined);
+
+            await updateDeviceInfo({
+                device: this,
+                ipAddress,
+                deviceData,
+            });
         } catch (e) {
-            // If API call fails, at least set basic info
-            const info = this.info || {};
-            info.ip = ip;
-            info.manufacturer = 'Reolink native';
-            info.managementUrl = `http://${ip}`;
-            this.info = info;
             this.getLogger().warn('Failed to fetch device info', e);
         }
     }

package/src/main.ts

@@ -76,7 +76,6 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
             device.storageSettings.values.ipAddress = ipAddress;
             device.storageSettings.values.username = username;
             device.storageSettings.values.password = password;
-            device.updateDeviceInfo(deviceInfo);
 
             return nativeId;
         }
@@ -144,7 +143,6 @@ class ReolinkNativePlugin extends ScryptedDeviceBase implements DeviceProvider,
             device.storageSettings.values.ipAddress = ipAddress;
             device.storageSettings.values.capabilities = capabilities;
             device.storageSettings.values.uid = detection.uid;
-            device.updateDeviceInfo();
 
             return nativeId;
         }

package/src/nvr.ts

@@ -5,7 +5,7 @@ import { ReolinkNativeCamera } from "./camera";
 import { ReolinkNativeBatteryCamera } from "./camera-battery";
 import { normalizeUid } from "./connect";
 import ReolinkNativePlugin from "./main";
-import { getDeviceInterfaces } from "./utils";
+import { getDeviceInterfaces, updateDeviceInfo } from "./utils";
 
 export class ReolinkNativeNvrDevice extends ScryptedDeviceBase implements Settings, DeviceDiscovery, DeviceProvider, Reboot {
     storageSettings = new StorageSettings(this, {
@@ -99,6 +99,7 @@ export class ReolinkNativeNvrDevice extends ScryptedDeviceBase implements Settin
     async init() {
         const api = await this.ensureClient();
         const logger = this.getLogger();
+        await this.updateDeviceInfo();
 
         setInterval(async () => {
             if (this.processing || !api) {
@@ -169,16 +170,20 @@ export class ReolinkNativeNvrDevice extends ScryptedDeviceBase implements Settin
         }, 1000);
     }
 
-    updateDeviceInfo(deviceInfo: Record<string, string>) {
-        const info = this.info || {};
-        info.ip = this.storageSettings.values.ipAddress;
-        info.serialNumber = deviceInfo?.serialNumber || deviceInfo?.itemNo;
-        info.firmware = deviceInfo?.firmwareVersion || deviceInfo?.firmVer;
-        info.version = deviceInfo?.hardwareVersion || deviceInfo?.boardInfo;
-        info.model = deviceInfo?.type || deviceInfo?.typeInfo;
-        info.manufacturer = 'Reolink native';
-        info.managementUrl = `http://${info.ip}`;
-        this.info = info;
+    async updateDeviceInfo(): Promise<void> {
+        const { ipAddress } = this.storageSettings.values;
+        try {
+            const api = await this.ensureClient();
+            const deviceData = await api.getInfo();
+
+            await updateDeviceInfo({
+                device: this,
+                ipAddress,
+                deviceData,
+            });
+        } catch (e) {
+            this.getLogger().warn('Failed to fetch device info', e);
+        }
     }
 
     async getSettings(): Promise<Setting[]> {
@@ -355,8 +360,6 @@ export class ReolinkNativeNvrDevice extends ScryptedDeviceBase implements Settin
         device.storageSettings.values.uid = entry.deviceData.channelStatus.uid;
         device.storageSettings.values.isFromNvr = true;
 
-        device.updateDeviceInfo();
-
         this.discoveredDevices.delete(adopt.nativeId);
         return device?.id;
     }

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;
+    }
 }