@apocaliss92/scrypted-reolink-native 0.4.34 → 0.4.35

package/package.json

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

package/src/intercom-mixin.ts

@@ -25,48 +25,8 @@ export class ReolinkNativeIntercomMixin
   private intercomEngine?: ReolinkBaichuanIntercom;
 
   storageSettings = new StorageSettings(this, {
-    // Connection settings (hidden when attached to an internal Reolink Native camera)
-    intercomIpAddress: {
-      group: "Connection",
-      title: "IP Address",
-      description: "Camera IP address for Baichuan connection",
-      type: "string",
-    },
-    intercomUsername: {
-      group: "Connection",
-      title: "Username",
-      type: "string",
-      defaultValue: "admin",
-    },
-    intercomPassword: {
-      group: "Connection",
-      title: "Password",
-      type: "password",
-    },
-    intercomUid: {
-      group: "Connection",
-      title: "UID",
-      description: "Required for battery/UDP cameras",
-      type: "string",
-    },
-    intercomChannel: {
-      group: "Connection",
-      title: "Channel",
-      description: "RTSP channel number (0-based)",
-      type: "number",
-      defaultValue: 0,
-    },
-    intercomTransport: {
-      group: "Connection",
-      title: "Transport",
-      description: "Connection transport protocol",
-      type: "string",
-      choices: ["tcp", "udp"],
-      defaultValue: "tcp",
-    },
-    // Audio pipeline settings (always visible)
     intercomBlocksPerPayload: {
-      group: "Audio",
+      group: "Intercom",
       title: "Blocks Per Payload",
       description:
         "Lower reduces latency (more packets). Typical: 1-4. Requires restarting talk session to take effect.",
@@ -74,7 +34,7 @@ export class ReolinkNativeIntercomMixin
       defaultValue: 1,
     },
     intercomMaxBacklogMs: {
-      group: "Audio",
+      group: "Intercom",
       title: "Max Backlog (ms)",
       description:
         "Maximum PCM backlog before dropping old audio to cap latency. Higher improves stability on slow systems but increases latency. Typical: 80-250. Requires restarting talk session to take effect.",
@@ -82,7 +42,7 @@ export class ReolinkNativeIntercomMixin
       defaultValue: 120,
     },
     intercomGain: {
-      group: "Audio",
+      group: "Intercom",
       title: "Gain",
       description:
         "Output gain multiplier applied before encoding. 1.0 = normal, 2.0 ≈ +6dB, 0.5 ≈ -6dB. Requires restarting talk session to take effect.",
@@ -103,21 +63,13 @@ export class ReolinkNativeIntercomMixin
     return this.provider.plugin?.camerasMap?.get(this.id);
   }
 
-  private isReolinkPluginCamera(): boolean {
-    try {
-      const device = sdk.systemManager.getDeviceById(this.id);
-      return device?.pluginId === "@scrypted/reolink";
-    } catch {
-      return false;
-    }
-  }
-
   private async getReolinkPluginCredentials(): Promise<
     { host?: string; username?: string; password?: string } | undefined
   > {
-    if (!this.isReolinkPluginCamera()) return undefined;
-
     try {
+      const device = sdk.systemManager.getDeviceById(this.id);
+      if (device?.pluginId !== "@scrypted/reolink") return undefined;
+
       const settings: Setting[] = await this.mixinDevice.getSettings();
       const map = new Map(
         settings.map((s: Setting) => [s.key, s.value?.toString()]),
@@ -174,7 +126,7 @@ export class ReolinkNativeIntercomMixin
       };
     }
 
-    // External path: use shared client from plugin registry
+    // External path (@scrypted/reolink): use shared client from plugin registry
     return {
       get blocksPerPayload() {
         return Math.max(
@@ -194,10 +146,10 @@ export class ReolinkNativeIntercomMixin
         return Number.isFinite(v) ? Math.max(20, Math.min(5000, v)) : 120;
       },
       get channel() {
-        return self.storageSettings.values.intercomChannel ?? 0;
+        return 0;
       },
       get isBatteryCamera() {
-        return self.storageSettings.values.intercomTransport === "udp";
+        return false;
       },
       get deviceId() {
         return self.id;
@@ -211,34 +163,20 @@ export class ReolinkNativeIntercomMixin
   }
 
   private async ensureExternalApi(): Promise<ReolinkBaichuanApi> {
-    let { intercomIpAddress, intercomUsername, intercomPassword,
-          intercomUid, intercomTransport } =
-      this.storageSettings.values;
+    const creds = await this.getReolinkPluginCredentials();
 
-    // Auto-detect credentials from @scrypted/reolink camera settings
-    if (!intercomIpAddress || !intercomUsername || !intercomPassword) {
-      const creds = await this.getReolinkPluginCredentials();
-      if (creds) {
-        intercomIpAddress ||= creds.host;
-        intercomUsername ||= creds.username;
-        intercomPassword ||= creds.password;
-      }
-    }
-
-    if (!intercomIpAddress || !intercomUsername || !intercomPassword) {
+    if (!creds?.host || !creds?.username || !creds?.password) {
       throw new Error(
-        "Intercom connection settings incomplete: IP, username, and password are required",
+        "Could not read camera credentials from @scrypted/reolink settings",
       );
     }
 
-    const transport: BaichuanTransport =
-      intercomTransport === "udp" ? "udp" : "tcp";
+    const transport: BaichuanTransport = "tcp";
 
     return await this.provider.plugin.acquireExternalClient(this.id, {
-      host: intercomIpAddress,
-      username: intercomUsername,
-      password: intercomPassword,
-      uid: intercomUid,
+      host: creds.host,
+      username: creds.username,
+      password: creds.password,
       transport,
       logger: this.console,
     });
@@ -258,27 +196,7 @@ export class ReolinkNativeIntercomMixin
   }
 
   async getMixinSettings(): Promise<Setting[]> {
-    const isInternal = !!this.getInternalCamera();
-    const isReolinkPlugin = this.isReolinkPluginCamera();
-    const hideConnection = isInternal || isReolinkPlugin;
-    const settings = await this.storageSettings.getSettings();
-
-    const connectionKeys = new Set([
-      "intercomIpAddress",
-      "intercomUsername",
-      "intercomPassword",
-      "intercomUid",
-      "intercomChannel",
-      "intercomTransport",
-    ]);
-
-    for (const setting of settings) {
-      if (connectionKeys.has(setting.key)) {
-        (setting as any).hide = hideConnection;
-      }
-    }
-
-    return settings;
+    return this.storageSettings.getSettings();
   }
 
   async putMixinSetting(