@apocaliss92/scrypted-reolink-native 0.5.5 → 0.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apocaliss92/scrypted-reolink-native",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "Use any reolink camera with Scrypted, even older/unsupported models without HTTP protocol support",
   "author": "@apocaliss92",
   "license": "Apache",
@@ -13,7 +13,8 @@
     "scrypted-setup-project": "scrypted-setup-project",
     "prescrypted-setup-project": "scrypted-package-json",
     "build": "scrypted-webpack",
-    "prepublishOnly": "NODE_ENV=production scrypted-webpack",
+    "prepublish-patch": "./prepublish-patch.sh",
+    "prepublishOnly": "./prepublish-patch.sh && NODE_ENV=production scrypted-webpack",
     "prescrypted-vscode-launch": "scrypted-webpack",
     "scrypted-vscode-launch": "scrypted-deploy-debug",
     "scrypted-deploy-debug": "scrypted-deploy-debug",

package/prepublish-patch.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Prepublish: build linked library, reinstall, bump plugin patch version.
+# Runs automatically before npm publish via prepublishOnly.
+#
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LIB_DIR="${SCRIPT_DIR}/../reolink-baichuan-js"
+
+# ── Step 1: Build the library ───────────────────────────────────
+echo "Building reolink-baichuan-js..."
+cd "${LIB_DIR}"
+npm run build
+echo "Library built."
+
+# ── Step 2: Reinstall in plugin (picks up fresh dist/) ──────────
+echo "Installing dependencies..."
+cd "${SCRIPT_DIR}"
+npm install
+echo "Dependencies installed."
+
+# ── Step 3: Bump plugin patch version ───────────────────────────
+echo "Bumping plugin patch version..."
+npm version patch --no-git-tag-version
+NEW_VERSION=$(node -p "require('./package.json').version")
+echo "Plugin version: ${NEW_VERSION}"

package/src/accessories/siren.ts

@@ -26,8 +26,6 @@ export class ReolinkCameraSiren extends ScryptedDeviceBase implements OnOff {
       await this.camera.withBaichuanRetry(async () => {
         const api = await this.camera.ensureClient();
         await api.setSiren(channel, false);
-        const sirenState = await api.getSiren(channel);
-        this.on = sirenState.enabled;
       });
       this.logger.log(`Siren toggle: turnOff ok (device=${this.nativeId})`);
     } catch (e: any) {
@@ -48,11 +46,10 @@ export class ReolinkCameraSiren extends ScryptedDeviceBase implements OnOff {
       await this.camera.withBaichuanRetry(async () => {
         const api = await this.camera.ensureClient();
         await api.setSiren(channel, true);
-        const sirenState = await api.getSiren(channel);
-        this.on = sirenState.enabled;
       });
       this.logger.log(`Siren toggle: turnOn ok (device=${this.nativeId})`);
     } catch (e: any) {
+      this.on = false;
       this.logger.error(
         `Siren toggle: turnOn failed (device=${this.nativeId})`,
         e?.message || String(e),

package/src/camera.ts

@@ -1989,6 +1989,14 @@ export class ReolinkCamera
           });
           return;
 
+        case "battery":
+          if (ev.battery) {
+            this.updateBatteryInfo(ev.battery as any).catch((e) => {
+              logger.debug("Error updating battery from push", e?.message || String(e));
+            });
+          }
+          return;
+
         case "offline":
         case "online":
           this.updateOnlineState(ev.type === "online").catch((e) => {
@@ -2787,19 +2795,10 @@ export class ReolinkCamera
       }
     }
 
-    // Align siren state (direct control)
-    if (hasSiren && this.siren) {
-      if (isInCooldown(this.auxDeviceCooldowns.siren)) {
-        logger.log(`[alignAuxDevicesState] Skipping siren (in cooldown)`);
-      } else {
-        try {
-          const sirenState = await api.getSiren(channel);
-          this.siren.on = sirenState.enabled;
-        } catch (e) {
-          logger.warn("Failed to align siren state", e?.message || String(e));
-        }
-      }
-    }
+    // Siren direct control: state is managed manually by turnOn/turnOff.
+    // The camera reports siren as "off" immediately after triggering (fire-and-forget),
+    // so polling would always reset the switch to OFF. We skip alignment entirely
+    // and let the user control the switch: ON triggers the siren, OFF stops it.
 
     // Align motion-floodlight state
     if (hasFloodlight && this.motionFloodlight) {
@@ -3288,7 +3287,6 @@ export class ReolinkCamera
         );
       }
 
-      logger.log(`Refreshed device capabilities`);
       logger.log(
         `Refreshed device capabilities: ${JSON.stringify({ capabilities, abilities, support, presets, objects })}`,
       );
@@ -3539,6 +3537,7 @@ export class ReolinkCamera
         }
 
         if (wasSleeping) {
+          this.updateBatteryInfo().catch(() => {});
           this.alignAuxDevicesState().catch(() => {});
           if (this.forceNewSnapshot) {
             this.takePicture().catch(() => {});
@@ -3620,42 +3619,26 @@ export class ReolinkCamera
     if (batteryInfo.batteryPercent !== undefined) {
       const oldLevel = this.batteryLevel;
       const oldChargeState = this.chargeState;
-      // adapterStatus: "adapter" | "solarPanel" | "none" — sotto carica se adapter collegato (anche con chargeComplete)
-      const isSottoCarica =
+      // adapterStatus: "adapter" | "solarPanel" = charging, "none" = not charging
+      const isCharging =
         batteryInfo.adapterStatus === "adapter" ||
         batteryInfo.adapterStatus === "solarPanel";
-      const newChargeState =
-        batteryInfo.adapterStatus !== undefined
-          ? isSottoCarica
-            ? ChargeState.Charging
-            : ChargeState.NotCharging
-          : undefined;
+      const newChargeState = isCharging
+        ? ChargeState.Charging
+        : ChargeState.NotCharging;
 
       this.batteryLevel = batteryInfo.batteryPercent;
-      if (newChargeState !== undefined) {
-        this.chargeState = newChargeState;
-      }
+      this.chargeState = newChargeState;
 
       // Log only if battery level changed
       if (oldLevel !== batteryInfo.batteryPercent) {
-        if (batteryInfo.adapterStatus !== undefined) {
-          logger.log(
-            `Battery level changed: ${oldLevel}% → ${batteryInfo.batteryPercent}% (sotto carica: ${isSottoCarica}, adapterStatus: ${batteryInfo.adapterStatus}, chargeStatus: ${batteryInfo.chargeStatus ?? "—"})`,
-          );
-        } else {
-          logger.log(
-            `Battery level changed: ${oldLevel}% → ${batteryInfo.batteryPercent}%`,
-          );
-        }
+        logger.log(
+          `Battery level changed: ${oldLevel}% → ${batteryInfo.batteryPercent}% (charging: ${isCharging}, adapter: ${batteryInfo.adapterStatus ?? "unknown"}, status: ${batteryInfo.chargeStatus ?? "unknown"})`,
+        );
       } else if (oldLevel === undefined) {
-        // First time setting battery level
-        if (batteryInfo.adapterStatus !== undefined) {
-          logger.log(
-            `Battery level set: ${batteryInfo.batteryPercent}% (sotto carica: ${isSottoCarica}, adapterStatus: ${batteryInfo.adapterStatus})`,
-          );
-        } else {
-          logger.log(`Battery level set: ${batteryInfo.batteryPercent}%`);
-        }
+        logger.log(
+          `Battery level set: ${batteryInfo.batteryPercent}% (charging: ${isCharging}, adapter: ${batteryInfo.adapterStatus ?? "unknown"})`,
+        );
       }
 
       // Forward battery/charge state changes to Scrypted (plugin, HomeKit, etc.)
@@ -3703,49 +3686,16 @@ export class ReolinkCamera
           return;
         }
 
-        // Check current sleep status
-        let sleepStatus = api.getSleepStatus({ channel });
+        // Check current sleep status — only update if already awake
+        const sleepStatus = api.getSleepStatus({ channel });
 
-        // If camera is sleeping, wake it up
         if (sleepStatus.state === "sleeping") {
-          logger.log("Camera is sleeping, waking up for periodic update...");
-          try {
-            await api.wakeUp(channel, { waitAfterWakeMs: 2000 });
-            logger.log("Wake command sent, waiting for camera to wake up...");
-          } catch (wakeError) {
-            logger.error(
-              "Failed to wake up camera:",
-              wakeError?.message || String(wakeError),
-            );
-            return;
-          }
-
-          // Poll until camera is awake (with timeout)
-          const wakeTimeoutMs = 30000; // 30 seconds max
-          const startWakePoll = Date.now();
-          let awake = false;
-
-          while (Date.now() - startWakePoll < wakeTimeoutMs) {
-            await new Promise((resolve) => setTimeout(resolve, 1000)); // Check every second
-            sleepStatus = api.getSleepStatus({ channel });
-            if (sleepStatus.state === "awake") {
-              awake = true;
-              logger.log("Camera is now awake");
-              this.sleeping = false;
-              break;
-            }
-          }
-
-          if (!awake) {
-            logger.error(
-              "Camera did not wake up within timeout, skipping update",
-            );
-            return;
-          }
-        } else if (sleepStatus.state === "awake") {
-          this.sleeping = false;
+          logger.debug("Camera is sleeping, skipping periodic battery update");
+          return;
         }
 
+        this.sleeping = false;
+
         // Now that camera is awake, update all states
         // 1. Update battery info
         try {