cameras: fix signal + timeout combined usage

koush · Mar 28, 2024 · 3c1801a · 3c1801a
1 parent 30f9e35
commit 3c1801a
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 20 deletions.
diff --git a/plugins/amcrest/package-lock.json b/plugins/amcrest/package-lock.json
diff --git a/plugins/amcrest/package.json b/plugins/amcrest/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.143",
+   "version": "0.0.144",
    "description": "Amcrest Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/hikvision/package-lock.json b/plugins/hikvision/package-lock.json
diff --git a/plugins/hikvision/package.json b/plugins/hikvision/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.145",
+   "version": "0.0.146",
    "description": "Hikvision Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/onvif/package-lock.json b/plugins/onvif/package-lock.json
diff --git a/plugins/onvif/package.json b/plugins/onvif/package.json
@@ -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",

diff --git a/plugins/reolink/package-lock.json b/plugins/reolink/package-lock.json
diff --git a/plugins/reolink/package.json b/plugins/reolink/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/reolink",
-   "version": "0.0.64",
+   "version": "0.0.65",
    "description": "Reolink Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/snapshot/package-lock.json b/plugins/snapshot/package-lock.json
diff --git a/plugins/snapshot/package.json b/plugins/snapshot/package.json
@@ -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",

diff --git a/server/src/fetch/http-fetch.ts b/server/src/fetch/http-fetch.ts
@@ -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

diff --git a/server/src/fetch/index.ts b/server/src/fetch/index.ts
@@ -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 {