@apocaliss92/scrypted-reolink-native 0.4.53 → 0.5.0

package/package.json

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

package/src/baichuan-base.ts

@@ -728,10 +728,20 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
         return; // Connection changed, stop this interval
       }
 
-      // If event subscription is not active, skip — the library's
-      // built-in event watchdog handles auto-recovery with exponential
-      // backoff (including after reconnection / camera reboot).
+      // If event subscription is not active but the connection is live,
+      // attempt to re-subscribe. This handles the case where the camera
+      // rebooted and the onClose retries exhausted before it came back up,
+      // leaving a live socket with no active event subscription.
       if (!this.eventSubscriptionActive) {
+        if (this.baichuanApi?.client.isSocketConnected()) {
+          try {
+            await this.subscribeToEvents();
+          } catch (e) {
+            logger.debug(
+              `Event check: auto-subscribe attempt failed: ${e?.message || String(e)}`,
+            );
+          }
+        }
         return;
       }
 

package/src/camera.ts

@@ -601,6 +601,19 @@ export class ReolinkCamera
         await this.runDiagnostics();
       },
     },
+    dumpModelFixtures: {
+      subgroup: "Diagnostics",
+      title: "Dump Model Fixtures",
+      description:
+        "Capture all API responses for this device and save as fixture files. " +
+        "Useful for regression testing and debugging capability detection.",
+      type: "button",
+      hide: true,
+      immediate: true,
+      onPut: async () => {
+        await this.dumpModelFixtures();
+      },
+    },
     // Multifocal composite stream PIP settings
     pipPosition: {
       title: "PIP Position",
@@ -1611,6 +1624,42 @@ export class ReolinkCamera
     }
   }
 
+  async dumpModelFixtures(): Promise<void> {
+    const logger = this.getBaichuanLogger();
+    const channel = this.storageSettings.values.rtspChannel || 0;
+    const basePath =
+      this.storageSettings.values.diagnosticsOutputPath ||
+      path.join(process.env.SCRYPTED_PLUGIN_VOLUME, "diagnostics", this.name);
+    const outDir = path.join(basePath, "model-fixtures", `ch${channel}`);
+
+    logger.log(`Dumping model fixtures: channel=${channel}, outDir=${outDir}`);
+
+    try {
+      const api = await this.ensureClient();
+      const { captureModelFixtures: capture } =
+        await import("@apocaliss92/reolink-baichuan-js");
+      const result = await capture({
+        api,
+        channel,
+        outDir,
+        log: (...args: unknown[]) => logger.log(String(args.join(" "))),
+      });
+
+      logger.log(
+        `Model fixtures captured: ${result.summary.ok}/${result.summary.total} ok, ${result.summary.failed} failed`,
+      );
+      if (result.summary.errors.length) {
+        logger.warn(
+          `Failed calls:\n${result.summary.errors.map((e) => `  - ${e}`).join("\n")}`,
+        );
+      }
+      logger.log(`Output: ${outDir}`);
+    } catch (e) {
+      logger.error("Failed to dump model fixtures", e?.message || String(e));
+      throw e;
+    }
+  }
+
   protected async onBeforeCleanup(): Promise<void> {
     // Unsubscribe from events if needed
     if (this.baichuanApi) {