@apocaliss92/scrypted-reolink-native 0.1.26 → 0.1.28

package/package.json

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

package/src/multiFocal.ts

@@ -181,13 +181,15 @@ export class ReolinkNativeMultiFocalDevice extends CommonCameraMixin implements
         this.storageSettings.values.multifocalInfo = multifocalInfo;
         this.storageSettings.values.capabilities = capabilities;
 
-        logger.debug(`Multichannel info: ${JSON.stringify({ multifocalInfo, capabilities, support, abilities, features, objects, presets })}`);
+        // TODO: Remove this after debugging
+        logger.log(`Multichannel info: ${JSON.stringify({ multifocalInfo, capabilities, support, abilities, features, objects, presets })}`);
+        // logger.debug(`Multichannel info: ${JSON.stringify({ multifocalInfo, capabilities, support, abilities, features, objects, presets })}`);
 
         for (const channelInfo of multifocalInfo?.channels ?? []) {
             const { channel, lensType } = channelInfo;
 
             const name = `${this.name} - ${lensType}`;
-            const nativeId = this.buildNativeId(channel);
+            const nativeId = `${this.nativeId}-channel${channel}${this.isBattery ? batteryCameraSuffix : cameraSuffix}`;
 
             this.channelToNativeIdMap.set(channel, nativeId);
             const { interfaces, capabilities: deviceCapabilities } = this.getInterfaces(channel);
@@ -209,8 +211,16 @@ export class ReolinkNativeMultiFocalDevice extends CommonCameraMixin implements
 
             await sdk.deviceManager.onDeviceDiscovered(device);
 
+            // TODO: Remove this after debugging
+            logger.log(`Discovering lens device ${nativeId}: ${JSON.stringify({ interfaces, deviceCapabilities })}`);
+
             const camera = await this.getDevice(nativeId);
 
+            if (!camera) {
+                logger.error(`Failed to get device ${nativeId}`);
+                continue;
+            }
+
             camera.storageSettings.values.rtspChannel = channel;
             camera.classes = objects;
             camera.presets = presets;
@@ -222,6 +232,8 @@ export class ReolinkNativeMultiFocalDevice extends CommonCameraMixin implements
                 camera.storageSettings.values.uid = uid;
             }
         }
+
+        await super.reportDevices();
     }
 
     async getDevice(nativeId: string) {
@@ -254,10 +266,6 @@ export class ReolinkNativeMultiFocalDevice extends CommonCameraMixin implements
         super.releaseDevice(id, nativeId);
     }
 
-    buildNativeId(channel: number): string {
-        return `${this.nativeId}-channel${channel}`;
-    }
-
     forwardNativeEvent(ev: ReolinkSimpleEvent): void {
         const logger = this.getBaichuanLogger();
         const channel = ev?.channel;