reolink: add nvr flag (#1620)

* Reolink - Fix name/model fetching if homehub * Checks removed * style change removed * Change logic for earlier returns --------- Co-authored-by: Gianluca Ruocco <gianluca.ruocco@xarvio.com>
koush · Oct 21, 2024 · 446e8ed · 446e8ed
1 parent 80372b3
commit 446e8ed
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/plugins/reolink/src/main.ts b/plugins/reolink/src/main.ts
@@ -181,6 +181,7 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R
             }
             const api = this.getClient();
             const deviceInfo = await api.getDeviceInfo();
+            this.console.log('deviceInfo', JSON.stringify(deviceInfo));
             this.storageSettings.values.deviceInfo = deviceInfo;
             await this.updateAbilities();
             await this.updateDevice();
@@ -319,7 +320,7 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R
         if (this.hasSiren())
             interfaces.push(ScryptedInterface.DeviceProvider);
 
-        await this.provider.updateDevice(this.nativeId, name, interfaces, type);
+        await this.provider.updateDevice(this.nativeId, this.name ?? name, interfaces, type);
     }
 
     async reboot() {
@@ -625,7 +626,7 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R
         // 1: support main/extern/sub stream
         // 2: support main/sub stream
 
-        const live = this.storageSettings.values.abilities?.value?.Ability?.abilityChn?.[0].live?.ver;
+        const live = this.storageSettings.values.abilities?.value?.Ability?.abilityChn?.[this.getRtspChannel()].live?.ver;
         const [rtmpMain, rtmpExt, rtmpSub, rtspMain, rtspSub] = streams;
         streams.splice(0, streams.length);
 
@@ -634,7 +635,7 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R
         // 1: main stream enc type is H265
 
         // anecdotally, encoders of type h265 do not have a working RTMP main stream.
-        const mainEncType = this.storageSettings.values.abilities?.value?.Ability?.abilityChn?.[0].mainEncType?.ver;
+        const mainEncType = this.storageSettings.values.abilities?.value?.Ability?.abilityChn?.[this.getRtspChannel()].mainEncType?.ver;
 
         if (live === 2) {
             if (mainEncType === 1) {

diff --git a/plugins/reolink/src/reolink-api.ts b/plugins/reolink/src/reolink-api.ts
@@ -232,7 +232,46 @@ export class ReolinkCameraClient {
             this.console.error('error during call to getDeviceInfo', error);
             throw new Error('error during call to getDeviceInfo');
         }
-        return response.body?.[0]?.value?.DevInfo;
+
+        const deviceInfo: DevInfo = await response.body?.[0]?.value?.DevInfo;
+
+        // Will need to check if it's valid for NVR and NVR_WIFI
+        if (['HOMEHUB'].includes(deviceInfo.exactType)) {
+            return deviceInfo;
+        }
+
+        // If the device is listed as homehub, fetch the channel specific information
+        url.search = '';
+        const body = [
+            { cmd: "GetChnTypeInfo", action: 0, param: { channel: this.channelId } },
+            { cmd: "GetChannelstatus", action: 0, param: {} },
+        ]
+
+        const additionalInfoResponse = await this.requestWithLogin({
+            url,
+            method: 'POST',
+            responseType: 'json'
+        }, this.createReadable(body));
+
+        const chnTypeInfo = additionalInfoResponse?.body?.find(elem => elem.cmd === 'GetChnTypeInfo');
+        const chnStatus = additionalInfoResponse?.body?.find(elem => elem.cmd === 'GetChannelstatus');
+
+        if (chnTypeInfo?.value) {
+            deviceInfo.firmVer = chnTypeInfo.value.firmVer;
+            deviceInfo.model = chnTypeInfo.value.typeInfo;
+            deviceInfo.pakSuffix = chnTypeInfo.value.pakSuffix;
+        }
+
+        if (chnStatus?.value) {
+            const specificChannelStatus = chnStatus.value?.status?.find(elem => elem.channel === this.channelId);
+
+            if (specificChannelStatus) {
+                deviceInfo.name = specificChannelStatus.name;
+            }
+        }
+
+
+        return deviceInfo;
     }
 
     async getPtzPresets(): Promise<PtzPreset[]> {