@apocaliss92/scrypted-reolink-native 0.3.4 → 0.3.6

package/dist/main.nodejs.js.LICENSE.txt

@@ -1,3 +1,258 @@
 /*! formdata-polyfill. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> */
 
+/*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
 /*! ws. MIT License. Einar Otto Stangvik <einaros@gmail.com> */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * cie94.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * ciede2000.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * cmetric.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * common.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * constants.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * ditherErrorDiffusionArray.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * euclidean.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * helper.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * hueStatistics.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * iq.ts - Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * lab2rgb.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * lab2xyz.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * manhattanNeuQuant.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * nearestColor.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * palette.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * pngQuant.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * point.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * pointContainer.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * rgb2hsl.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * rgb2lab.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * rgb2xyz.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * ssim.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * wuQuant.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * xyz2lab.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * xyz2rgb.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve
+ * MIT License
+ *
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * riemersma.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve TypeScript port:
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * colorHistogram.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve TypeScript port:
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * neuquant.ts - part of Image Quantization Library
+ */
+
+/**
+ * @preserve TypeScript port:
+ * Copyright 2015-2018 Igor Bezkrovnyi
+ * All rights reserved. (MIT Licensed)
+ *
+ * rgbquant.ts - part of Image Quantization Library
+ */

package/package.json

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

package/src/camera.ts

@@ -241,12 +241,7 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
             description: 'Order preference for video streams. Default: RTSP -> RTMP -> Native',
             defaultValue: 'Default',
             choices: ['Default', 'Native', 'RTSP', 'RTMP'],
-            subgroup: 'Streaming',
         },
-        // capabilities: {
-        //     json: true,
-        //     hide: true,
-        // },
         multifocalInfo: {
             json: true,
             hide: true,

package/src/nvr.ts

@@ -369,6 +369,22 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
                     isMultifocal,
                     identifier,
                 });
+                
+                // Check if device already exists in cameraNativeMap with a different nativeId format
+                // (e.g., with chN- prefix). If so, use that nativeId for the mapping.
+                let actualNativeId = nativeId;
+                const existingDevice = Array.from(this.cameraNativeMap.entries()).find(([id, camera]) => {
+                    // Check if the camera matches by channel or UID
+                    const cameraChannel = camera.storageSettings.values.rtspChannel;
+                    const cameraUid = camera.storageSettings.values.uid;
+                    return cameraChannel === channel || (uid && cameraUid === uid);
+                });
+                
+                if (existingDevice) {
+                    actualNativeId = existingDevice[0];
+                    logger.debug(`[syncEntities] Using existing nativeId for channel ${channel}: ${actualNativeId} (instead of ${nativeId})`);
+                }
+                
                 const interfaces = [ScryptedInterface.VideoCamera];
                 if (isBattery) {
                     interfaces.push(ScryptedInterface.Battery);
@@ -388,7 +404,7 @@ export class ReolinkNativeNvrDevice extends BaseBaichuanClass implements Setting
                     }
                 };
 
-                this.channelToNativeIdMap.set(channel, nativeId);
+                this.channelToNativeIdMap.set(channel, actualNativeId);
 
                 const allNativeIds = sdk.deviceManager.getNativeIds().filter(nid => !!nid);