michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-03-20 16:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cameras: fix signal + timeout combined usage

Browse Source
This commit is contained in:
Koushik Dutta
2024-03-27 22:05:05 -07:00
parent 30f9e358b7
commit 3c1801ad01
12 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/amcrest/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/amcrest",
"version": "0.0.143",
"version": "0.0.144",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/amcrest",
"version": "0.0.143",
"version": "0.0.144",
"license": "Apache",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/amcrest/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/amcrest",
"version": "0.0.143",
"version": "0.0.144",
"description": "Amcrest Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

4
plugins/hikvision/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/hikvision",
"version": "0.0.145",
"version": "0.0.146",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/hikvision",
"version": "0.0.145",
"version": "0.0.146",
"license": "Apache",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/hikvision/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/hikvision",
"version": "0.0.145",
"version": "0.0.146",
"description": "Hikvision Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

4
plugins/onvif/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/onvif",
"version": "0.1.12",
"version": "0.1.13",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/onvif",
"version": "0.1.12",
"version": "0.1.13",
"license": "Apache",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/onvif/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/onvif",
"version": "0.1.12",
"version": "0.1.13",
"description": "ONVIF Camera Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

4
plugins/reolink/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/reolink",
"version": "0.0.64",
"version": "0.0.65",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/reolink",
"version": "0.0.64",
"version": "0.0.65",
"license": "Apache",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/reolink/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/reolink",
"version": "0.0.64",
"version": "0.0.65",
"description": "Reolink Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

4
plugins/snapshot/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/snapshot",
"version": "0.2.41",
"version": "0.2.42",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/snapshot",
"version": "0.2.41",
"version": "0.2.42",
"dependencies": {
"@types/node": "^20.10.6",
"sharp": "^0.33.1",

2
plugins/snapshot/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/snapshot",
"version": "0.2.41",
"version": "0.2.42",
"description": "Snapshot Plugin for Scrypted",
"scripts": {
"scrypted-setup-project": "scrypted-setup-project",

7
server/src/fetch/http-fetch.ts
View File

@@ -98,6 +98,8 @@ export async function httpFetch<T extends HttpFetchOptions<Readable>>(options: T
if (options.timeout) {
controller = new AbortController();
timeout = setTimeout(() => controller.abort(), options.timeout);
options.signal?.addEventListener('abort', () => controller.abort('abort'));
}
const request = proto.request(url, {
@@ -109,11 +111,6 @@ export async function httpFetch<T extends HttpFetchOptions<Readable>>(options: T
timeout: options.timeout,
});
if (controller)
options.signal?.addEventListener('abort', () => controller.abort('abort'));
else
options.signal?.addEventListener('abort', () => request.destroy(new Error('abort')));
if (body)
body.pipe(request);
else

2
server/src/fetch/index.ts
View File

@@ -129,6 +129,8 @@ export async function domFetch<T extends HttpFetchOptions<BodyInit>>(options: T)
if (options.timeout) {
controller = new AbortController();
timeout = setTimeout(() => controller.abort(), options.timeout);
options.signal?.addEventListener('abort', () => controller.abort('abort'));
}
try {