From 95f1e618f9d7dd947fc9f3ed7075bf4b4cff709a Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 4 Jul 2024 14:44:15 -0700 Subject: [PATCH 1/3] unifi-protect: ips --- external/unifi-protect | 2 +- plugins/unifi-protect/package-lock.json | 4 ++-- plugins/unifi-protect/package.json | 2 +- plugins/unifi-protect/src/main.ts | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/external/unifi-protect b/external/unifi-protect index bf6fdbdc6..14f895045 160000 --- a/external/unifi-protect +++ b/external/unifi-protect @@ -1 +1 @@ -Subproject commit bf6fdbdc657d107bd89a376f84b55c5147254829 +Subproject commit 14f895045ee4617a50f2cf9e0e110e200168e288 diff --git a/plugins/unifi-protect/package-lock.json b/plugins/unifi-protect/package-lock.json index 6f3c599ef..7bc078d1e 100644 --- a/plugins/unifi-protect/package-lock.json +++ b/plugins/unifi-protect/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/unifi-protect", - "version": "0.0.153", + "version": "0.0.154", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/unifi-protect", - "version": "0.0.153", + "version": "0.0.154", "license": "Apache", "dependencies": { "@koush/unifi-protect": "file:../../external/unifi-protect", diff --git a/plugins/unifi-protect/package.json b/plugins/unifi-protect/package.json index 0ad0d350d..4fdf698f2 100644 --- a/plugins/unifi-protect/package.json +++ b/plugins/unifi-protect/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/unifi-protect", - "version": "0.0.153", + "version": "0.0.154", "description": "Unifi Protect Plugin for Scrypted", "author": "Scrypted", "license": "Apache", diff --git a/plugins/unifi-protect/src/main.ts b/plugins/unifi-protect/src/main.ts index 2163d888e..74fdb50e5 100644 --- a/plugins/unifi-protect/src/main.ts +++ b/plugins/unifi-protect/src/main.ts @@ -353,6 +353,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device model: camera.type, firmware: camera.firmwareVersion, version: camera.hardwareRevision, + ip: camera.host, serialNumber: camera.id, mac: camera.mac, managementUrl, @@ -399,6 +400,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device info: { manufacturer: 'Ubiquiti', model: sensor.type, + ip: sensor.host, firmware: sensor.firmwareVersion, version: sensor.hardwareRevision, serialNumber: sensor.id, @@ -426,6 +428,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device info: { manufacturer: 'Ubiquiti', model: light.type, + ip: light.host, firmware: light.firmwareVersion, version: light.hardwareRevision, serialNumber: light.id, @@ -450,6 +453,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device info: { manufacturer: 'Ubiquiti', model: lock.type, + ip: lock.host, firmware: lock.firmwareVersion, version: lock.hardwareRevision.toString(), serialNumber: lock.id, From 644df95f213a5f884ee1fa0823aa6c13c3d9f0f1 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 4 Jul 2024 14:49:05 -0700 Subject: [PATCH 2/3] reolink: add more hw info --- plugins/reolink/package-lock.json | 4 ++-- plugins/reolink/package.json | 2 +- plugins/reolink/src/main.ts | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/reolink/package-lock.json b/plugins/reolink/package-lock.json index b3ba538ea..e403b7f0d 100644 --- a/plugins/reolink/package-lock.json +++ b/plugins/reolink/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/reolink", - "version": "0.0.79", + "version": "0.0.80", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/reolink", - "version": "0.0.79", + "version": "0.0.80", "license": "Apache", "dependencies": { "@scrypted/common": "file:../../common", diff --git a/plugins/reolink/package.json b/plugins/reolink/package.json index 3daf9f89c..2d3054362 100644 --- a/plugins/reolink/package.json +++ b/plugins/reolink/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/reolink", - "version": "0.0.79", + "version": "0.0.80", "description": "Reolink Plugin for Scrypted", "author": "Scrypted", "license": "Apache", diff --git a/plugins/reolink/src/main.ts b/plugins/reolink/src/main.ts index c21727bc9..2d9ecd551 100644 --- a/plugins/reolink/src/main.ts +++ b/plugins/reolink/src/main.ts @@ -246,6 +246,10 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R return; const info = this.info || {}; info.ip = ip; + info.serialNumber = this.storageSettings.values.deviceInfo?.serial; + info.firmware = this.storageSettings.values.deviceInfo?.firmVer; + info.version = this.storageSettings.values.deviceInfo?.hardVer; + info.model = this.storageSettings.values.deviceInfo?.model; info.manufacturer = 'Reolink'; info.managementUrl = `http://${ip}`; this.info = info; From f769c1fbecd9950c76c8919899ba4f9f2e946691 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 4 Jul 2024 14:50:15 -0700 Subject: [PATCH 3/3] reolink: add more hw info --- plugins/reolink/package-lock.json | 4 ++-- plugins/reolink/package.json | 2 +- plugins/reolink/src/main.ts | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/reolink/package-lock.json b/plugins/reolink/package-lock.json index e403b7f0d..f0e0742f9 100644 --- a/plugins/reolink/package-lock.json +++ b/plugins/reolink/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/reolink", - "version": "0.0.80", + "version": "0.0.81", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/reolink", - "version": "0.0.80", + "version": "0.0.81", "license": "Apache", "dependencies": { "@scrypted/common": "file:../../common", diff --git a/plugins/reolink/package.json b/plugins/reolink/package.json index 2d3054362..530a34220 100644 --- a/plugins/reolink/package.json +++ b/plugins/reolink/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/reolink", - "version": "0.0.80", + "version": "0.0.81", "description": "Reolink Plugin for Scrypted", "author": "Scrypted", "license": "Apache", diff --git a/plugins/reolink/src/main.ts b/plugins/reolink/src/main.ts index 2d9ecd551..20cb855f8 100644 --- a/plugins/reolink/src/main.ts +++ b/plugins/reolink/src/main.ts @@ -636,8 +636,7 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R name: 'Reolink Siren', nativeId: sirenNativeId, info: { - manufacturer: 'Reolink', - serialNumber: this.nativeId, + ...this.info, }, interfaces: [ ScryptedInterface.OnOff