From 03bb6643ca4687bb358df8065f81b334c8ae268f Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Fri, 18 Nov 2022 11:23:51 -0800 Subject: [PATCH] rtsp/hikvision: fix camera number bug and settings hang --- plugins/hikvision/package-lock.json | 4 ++-- plugins/hikvision/package.json | 2 +- plugins/rtsp/src/rtsp.ts | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/hikvision/package-lock.json b/plugins/hikvision/package-lock.json index c95c93abe..4f3fc1fb4 100644 --- a/plugins/hikvision/package-lock.json +++ b/plugins/hikvision/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/hikvision", - "version": "0.0.114", + "version": "0.0.115", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/hikvision", - "version": "0.0.114", + "version": "0.0.115", "license": "Apache", "dependencies": { "@koush/axios-digest-auth": "^0.8.5", diff --git a/plugins/hikvision/package.json b/plugins/hikvision/package.json index 7d77abcb9..1865cd387 100644 --- a/plugins/hikvision/package.json +++ b/plugins/hikvision/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/hikvision", - "version": "0.0.114", + "version": "0.0.115", "description": "HikVision Plugin for Scrypted", "author": "Scrypted", "license": "Apache", diff --git a/plugins/rtsp/src/rtsp.ts b/plugins/rtsp/src/rtsp.ts index 7a53dae5d..e5e0fa114 100644 --- a/plugins/rtsp/src/rtsp.ts +++ b/plugins/rtsp/src/rtsp.ts @@ -365,6 +365,8 @@ export abstract class RtspSmartCamera extends RtspCamera { this.constructedVideoStreamOptions = timeoutPromise(5000, this.getConstructedVideoStreamOptions()).finally(() => { this.constructedVideoStreamOptions = undefined; }); + + return this.constructedVideoStreamOptions; } putSettingBase(key: string, value: SettingValue): Promise {