@apocaliss92/scrypted-reolink-native 0.1.38 → 0.1.40

package/package.json

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

package/src/common.ts

@@ -304,8 +304,8 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
             title: 'Discovery Method',
             description: 'UDP discovery method for battery cameras (BCUDP).',
             type: 'string',
-            choices: ['local', 'remote', 'map', 'relay'],
-            defaultValue: 'local',
+            choices: ['local-direct', 'local-broadcast', 'remote', 'map', 'relay'],
+            defaultValue: 'local-direct',
             hide: true,
             onPut: async () => {
                 await this.credentialsChanged();
@@ -761,6 +761,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
                     start,
                     end,
                     streamType: "main",
+                    source: "baichuan"
                 });
 
                 logger.debug(`[NVR VOD] Found ${enrichedRecordings.length} enriched recordings from NVR`);
@@ -2478,7 +2479,7 @@ export abstract class CommonCameraMixin extends BaseBaichuanClass implements Vid
         this.storageSettings.settings.teleChannel.hide = !this.isMultiFocal;
 
         this.storageSettings.settings.uid.hide = !this.isBattery;
-        this.storageSettings.settings.discoveryMethod.hide = !this.isBattery;
+        this.storageSettings.settings.discoveryMethod.hide = !this.isBattery && !this.nvrDevice;
 
         if (this.isBattery && !this.storageSettings.values.mixinsSetup) {
             try {

package/src/connect.ts

@@ -9,7 +9,7 @@ export type BaichuanConnectInputs = {
     uid?: string;
     logger?: Console;
     debugOptions?: BaichuanClientOptions['debugOptions'];
-    udpDiscoveryMethod?: "local" | "remote" | "map" | "relay";
+    udpDiscoveryMethod?: BaichuanClientOptions["udpDiscoveryMethod"];
 };
 
 export function normalizeUid(uid?: string): string | undefined {

package/src/nvr.ts

@@ -533,7 +533,10 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
 
                 this.channelToNativeIdMap.set(channel, nativeId);
 
-                if (sdk.deviceManager.getNativeIds().includes(nativeId)) {
+                const allNativeIds = sdk.deviceManager.getNativeIds();
+
+                if (allNativeIds.some(nativeId => nativeId.includes(uid)) ||
+                    allNativeIds.includes(nativeId)) {
                     continue;
                 }