Alernative Abort Approach

tnc-ca-geo · Sep 18, 2023 · 95753ff · 95753ff
1 parent dc95221
commit 95753ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/ingest-image/package.json b/ingest-image/package.json
@@ -21,9 +21,7 @@
         "mime-types": "^2.1.35",
         "rimraf": "^5.0.0",
         "sharp": "^0.32.0",
-        "strtime": "^1.1.2",
-        "undici": "^5.24.0",
-        "uuid": "^9.0.0"
+        "strtime": "^1.1.2"
     },
     "devDependencies": {
         "eslint": "^8.33.0",

diff --git a/ingest-image/task.js b/ingest-image/task.js
@@ -17,13 +17,6 @@ import { createHash } from 'node:crypto';
 import { pipeline } from 'node:stream/promises';
 import fs from 'node:fs';
 import fsp from 'node:fs/promises';
-import { fetch, setGlobalDispatcher, Agent } from 'undici';
-
-setGlobalDispatcher(new Agent({
-    connect: {
-        timeout: 10_000
-    }
-}));
 
 const region = process.env.AWS_DEFAULT_REGION || 'us-west-2';
 
@@ -374,15 +367,22 @@ export default class Task {
 
 async function fetcher(url, body) {
     console.log('Posting metadata to API', JSON.stringify(body));
+
+    const controller = new AbortController();
+    const id = setTimeout(() => controller.abort(), 10_000);
+
     const res = await fetch(url, {
         method: 'POST',
+        signal: controller.signal,
         headers: {
             'Content-Type': 'application/json',
             'x-api-key': APIKEY
         },
         body: JSON.stringify(body)
     });
 
+    clearTimeout(id);
+
     if (!res.ok) {
         const texterr = await res.text();
         let jsonerr;