@apocaliss92/scrypted-reolink-native 0.4.43 → 0.4.45

package/package.json

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

package/src/accessories/chime.ts

@@ -57,6 +57,31 @@ export class ReolinkCameraChime
     return this.storageSettings.values.wirelessChimeId ?? -1;
   }
 
+  /**
+   * Refresh chime ID from device when -1.
+   * Python lib: GetDingDongList uses deviceId; GetDingDongCfg uses ringId (skips if < 0).
+   * Returns true if we have a valid chimeId; false if still not discovered.
+   */
+  private async ensureChimeId(): Promise<boolean> {
+    if (this.wirelessChimeId >= 0) return true;
+    const channel = this.camera.storageSettings.values.rtspChannel;
+    const api = await this.camera.ensureClient();
+    const list = await api.getDingDongList(channel);
+    if (list.length > 0 && list[0].id >= 0) {
+      this.storageSettings.values.wirelessChimeId = list[0].id;
+      this.logger.log(`Chime: discovered chimeId=${list[0].id} from GetDingDongList`);
+      return true;
+    }
+    const configs = await api.getDingDongCfg(channel);
+    const cfg = configs.find(c => c.id >= 0);
+    if (cfg) {
+      this.storageSettings.values.wirelessChimeId = cfg.id;
+      this.logger.log(`Chime: discovered chimeId=${cfg.id} from GetDingDongCfg`);
+      return true;
+    }
+    return false;
+  }
+
   private async getChimeCfg(): Promise<ChimeCfg | undefined> {
     const channel = this.camera.storageSettings.values.rtspChannel;
     const chimeId = this.wirelessChimeId;
@@ -70,6 +95,7 @@ export class ReolinkCameraChime
    * Determine if the chime is active by checking if any event type is enabled.
    */
   async syncStateFromDevice(): Promise<boolean | undefined> {
+    await this.ensureChimeId();
     const cfg = await this.getChimeCfg();
     if (!cfg) return undefined;
     const eventTypes = Object.values(cfg.type);
@@ -78,12 +104,18 @@ export class ReolinkCameraChime
   }
 
   async turnOn(): Promise<void> {
-    const channel = this.camera.storageSettings.values.rtspChannel;
-    const chimeId = this.wirelessChimeId;
-    this.logger.log(`Chime: enable all events (device=${this.nativeId}, chimeId=${chimeId})`);
     this.camera.auxDeviceCooldowns.chime = Date.now();
     try {
       await this.camera.withBaichuanRetry(async () => {
+        const discovered = await this.ensureChimeId();
+        if (!discovered) {
+          throw new Error(
+            "Wireless chime not discovered. Ensure a Reolink Chime is paired with the doorbell and try again.",
+          );
+        }
+        const channel = this.camera.storageSettings.values.rtspChannel;
+        const chimeId = this.wirelessChimeId;
+        this.logger.log(`Chime: enable all events (device=${this.nativeId}, chimeId=${chimeId})`);
         const cfg = await this.getChimeCfg();
         if (!cfg) throw new Error(`Chime config not found for chimeId=${chimeId}`);
         const api = await this.camera.ensureClient();
@@ -106,12 +138,18 @@ export class ReolinkCameraChime
   }
 
   async turnOff(): Promise<void> {
-    const channel = this.camera.storageSettings.values.rtspChannel;
-    const chimeId = this.wirelessChimeId;
-    this.logger.log(`Chime: disable all events (device=${this.nativeId}, chimeId=${chimeId})`);
     this.camera.auxDeviceCooldowns.chime = Date.now();
     try {
       await this.camera.withBaichuanRetry(async () => {
+        const discovered = await this.ensureChimeId();
+        if (!discovered) {
+          throw new Error(
+            "Wireless chime not discovered. Ensure a Reolink Chime is paired with the doorbell and try again.",
+          );
+        }
+        const channel = this.camera.storageSettings.values.rtspChannel;
+        const chimeId = this.wirelessChimeId;
+        this.logger.log(`Chime: disable all events (device=${this.nativeId}, chimeId=${chimeId})`);
         const cfg = await this.getChimeCfg();
         if (!cfg) throw new Error(`Chime config not found for chimeId=${chimeId}`);
         const api = await this.camera.ensureClient();

package/src/camera.ts

@@ -126,6 +126,30 @@ export class ReolinkCamera
       title: "Debug logs",
       type: "boolean",
       immediate: true,
+      onPut: async (ov, value) => {
+        if (ov === value) return;
+        const logger = this.getBaichuanLogger();
+        if (this.resetBaichuanClient) {
+          if (this.debugLogsResetTimeout) {
+            clearTimeout(this.debugLogsResetTimeout);
+            this.debugLogsResetTimeout = undefined;
+          }
+          this.debugLogsResetTimeout = setTimeout(async () => {
+            this.debugLogsResetTimeout = undefined;
+            try {
+              await this.resetBaichuanClient("debugLogs changed");
+              this.baichuanApi = undefined;
+              this.ensureClientPromise = undefined;
+              await this.ensureClient();
+            } catch (e) {
+              logger.warn(
+                "Failed to reset client after debug logs change",
+                e?.message || String(e),
+              );
+            }
+          }, 2000);
+        }
+      },
     },
     // Basic connection settings
     ipAddress: {
@@ -1674,10 +1698,11 @@ export class ReolinkCamera
         if (this.cachedCapabilities) return this.cachedCapabilities;
 
         const client = await this.ensureClient();
-        const { capabilities } = await client.getDeviceCapabilities(
+        const { capabilities, debug } = await client.getDeviceCapabilities(
           this.storageSettings.values.rtspChannel ?? 0,
         );
         this.cachedCapabilities = capabilities;
+        logger.debug("Device capabilities retrieved", debug);
         return capabilities;
       }
     } catch (e) {
@@ -2284,7 +2309,13 @@ export class ReolinkCamera
     const logger = this.getBaichuanLogger();
     logger.debug(`Reporting devices: ${JSON.stringify(abilities)}`);
 
-    const { hasSiren, hasFloodlight, hasPir, hasAutotracking, hasWirelessChime } = abilities;
+    const {
+      hasSiren,
+      hasFloodlight,
+      hasPir,
+      hasAutotracking,
+      hasWirelessChime,
+    } = abilities;
 
     // Define native IDs for all sub-devices
     const motionSirenNativeId = `${this.nativeId}${motionSirenSuffix}`;
@@ -2670,8 +2701,13 @@ export class ReolinkCamera
     const api = await this.ensureClient();
 
     const channel = this.storageSettings.values.rtspChannel;
-    const { hasSiren, hasFloodlight, hasPir, hasAutotracking, hasWirelessChime } =
-      await this.getAbilities();
+    const {
+      hasSiren,
+      hasFloodlight,
+      hasPir,
+      hasAutotracking,
+      hasWirelessChime,
+    } = await this.getAbilities();
 
     // Cooldown period: 15 seconds after a manual state change
     // Camera can take 10+ seconds to reflect state changes in its API response
@@ -2818,10 +2854,7 @@ export class ReolinkCamera
             }
           }
         } catch (e) {
-          logger.warn(
-            "Failed to align chime state",
-            e?.message || String(e),
-          );
+          logger.warn("Failed to align chime state", e?.message || String(e));
         }
       }
     }

package/src/nvr.ts

@@ -51,6 +51,26 @@ export class ReolinkNativeNvrDevice
       title: "Debug Events",
       type: "boolean",
       immediate: true,
+      onPut: async (ov, value) => {
+        if (ov === value) return;
+        const logger = this.getBaichuanLogger();
+        if (this.debugLogsResetTimeout) {
+          clearTimeout(this.debugLogsResetTimeout);
+          this.debugLogsResetTimeout = undefined;
+        }
+        this.debugLogsResetTimeout = setTimeout(async () => {
+          this.debugLogsResetTimeout = undefined;
+          try {
+            await this.cleanupBaichuanApi();
+            await this.ensureBaichuanClient();
+          } catch (e) {
+            logger.warn(
+              "Failed to reset client after debug logs change",
+              e?.message || String(e),
+            );
+          }
+        }, 2000);
+      },
     },
     // eventSource: {
     //     title: 'Event Source',