@apocaliss92/scrypted-reolink-native 0.1.24 → 0.1.25

package/package.json

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

package/src/camera-battery.ts

@@ -120,8 +120,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
 
         logger.log('Starting periodic tasks for battery camera');
 
-        // Check sleeping state every 5 seconds (non-blocking)
-        if (!this.nvrDevice) {
+        if (!this.nvrDevice && !this.multiFocalDevice) {
             this.sleepCheckTimer = setInterval(async () => {
                 try {
                     const api = this.baichuanApi;

package/src/common.ts

@@ -527,8 +527,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
     thisDevice: Settings
 
     constructor(
-        nativeId: string, 
-        public plugin: ReolinkNativePlugin, 
+        nativeId: string,
+        public plugin: ReolinkNativePlugin,
         public options: CommonCameraMixinOptions
     ) {
         super(nativeId);
@@ -654,7 +654,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
     }
 
     public getAbilities(): DeviceCapabilities {
-        if(this.options.multiFocalDevice) {
+        if (this.options.multiFocalDevice) {
             return this.options.multiFocalDevice.getInterfaces(this.storageSettings.values.rtspChannel).capabilities;
         } else {
             return this.storageSettings.values.capabilities;
@@ -1116,6 +1116,11 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
     async updateDeviceInfo(): Promise<void> {
         const logger = this.getBaichuanLogger();
 
+        if (this.options.multiFocalDevice) {
+            this.info = this.options.multiFocalDevice.info;
+            return;
+        }
+
         const { ipAddress, rtspChannel } = this.storageSettings.values;
         try {
             const api = await this.ensureClient();
@@ -1446,38 +1451,41 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
         const channel = this.storageSettings.values.rtspChannel;
 
         try {
-            const { capabilities, abilities, support, presets, objects } = await this.withBaichuanRetry(async () => {
-                const api = await this.ensureClient();
-                return await api.getDeviceCapabilities(channel);
-            });
-            this.classes = objects;
-            this.presets = presets;
-            this.storageSettings.values.capabilities = capabilities;
-            this.ptzPresets.setCachedPtzPresets(presets);
-
-            try {
-                const { interfaces, type } = getDeviceInterfaces({
-                    capabilities,
-                    logger: this.console,
+            if (this.options.multiFocalDevice) {
+                // do nothing for now
+            } else {
+                const { capabilities, abilities, support, presets, objects } = await this.withBaichuanRetry(async () => {
+                    const api = await this.ensureClient();
+                    return await api.getDeviceCapabilities(channel);
                 });
+                this.classes = objects;
+                this.presets = presets;
+                this.ptzPresets.setCachedPtzPresets(presets);
 
-                const device: Device = {
-                    nativeId: this.nativeId,
-                    providerNativeId: this.nvrDevice?.nativeId ?? this.plugin?.nativeId,
-                    name: this.name,
-                    interfaces,
-                    type,
-                    info: this.info,
-                };
-
-                logger.log(`Updating device interfaces: ${JSON.stringify(device)}`);
+                try {
+                    const { interfaces, type } = getDeviceInterfaces({
+                        capabilities,
+                        logger: this.console,
+                    });
+
+                    const device: Device = {
+                        nativeId: this.nativeId,
+                        providerNativeId: this.nvrDevice?.nativeId ?? this.plugin?.nativeId,
+                        name: this.name,
+                        interfaces,
+                        type,
+                        info: this.info,
+                    };
+
+                    logger.log(`Updating device interfaces: ${JSON.stringify(device)}`);
+
+                    await sdk.deviceManager.onDeviceDiscovered(device);
+                } catch (e) {
+                    logger.error('Failed to update device interfaces', e);
+                }
 
-                await sdk.deviceManager.onDeviceDiscovered(device);
-            } catch (e) {
-                logger.error('Failed to update device interfaces', e);
+                logger.log(`Refreshed device capabilities: ${JSON.stringify({ capabilities, abilities, support, presets })}`);
             }
-
-            logger.log(`Refreshed device capabilities: ${JSON.stringify({ capabilities, abilities, support, presets })}`);
         }
         catch (e) {
             logger.error('Failed to refresh abilities', e);

package/src/multiFocal.ts

@@ -232,7 +232,7 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
     async reportDevices(): Promise<void> {
         const api = await this.ensureBaichuanClient();
         const logger = this.getBaichuanLogger();
-        const { protocol, username, password, ipAddress, uid } = this.storageSettings.values;
+        const { username, password, ipAddress, uid } = this.storageSettings.values;
 
         const { capabilities, support, abilities, features, objects, presets } = await api.getDeviceCapabilities();