snapshots/fetch: fix request teardown?

koush · Apr 11, 2024 · 96a0a6b · 96a0a6b
1 parent bf783c7
commit 96a0a6b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 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.149",
+   "version": "0.0.150",
    "description": "Amcrest 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.44",
+   "version": "0.2.47",
    "description": "Snapshot Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/src/fetch/http-fetch.ts b/server/src/fetch/http-fetch.ts
@@ -102,12 +102,15 @@ export async function httpFetch<T extends HttpFetchOptions<Readable>>(options: T
         options.signal?.addEventListener('abort', () => controller.abort('abort'));
     }
 
+    const signal = controller?.signal || options.signal;
+    signal?.addEventListener('abort', () => request.destroy(new Error('abort')));
+
     const request = proto.request(url, {
         method: getFetchMethod(options),
         rejectUnauthorized: options.rejectUnauthorized,
         family: options.family,
         headers: nodeHeaders,
-        signal: controller?.signal || options.signal,
+        signal,
         timeout: options.timeout,
     });