Fix listObjects delay

listObjects caused the cache restore to take a minimum of 10 seconds because the timeout was not cleared when the Promise is resolved or rejected.
tespkg · Feb 20, 2024 · cba095d · cba095d
1 parent f914804
commit cba095d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -102862,21 +102862,23 @@ function listObjects(mc, bucket, prefix) {
         const h = mc.listObjectsV2(bucket, prefix, true);
         const r = [];
         let resolved = false;
+        const timeout = setTimeout(() => {
+            if (!resolved)
+                reject(new Error("list objects no result after 10 seconds"));
+        }, 10000);
         h.on("data", (obj) => {
             r.push(obj);
         });
         h.on("error", (e) => {
             resolved = true;
             reject(e);
+            clearTimeout(timeout);
         });
         h.on("end", () => {
             resolved = true;
             resolve(r);
+            clearTimeout(timeout);
         });
-        setTimeout(() => {
-            if (!resolved)
-                reject(new Error("list objects no result after 10 seconds"));
-        }, 10000);
     });
 }
 exports.listObjects = listObjects;

diff --git a/dist/save/index.js b/dist/save/index.js
@@ -102789,21 +102789,23 @@ function listObjects(mc, bucket, prefix) {
         const h = mc.listObjectsV2(bucket, prefix, true);
         const r = [];
         let resolved = false;
+        const timeout = setTimeout(() => {
+            if (!resolved)
+                reject(new Error("list objects no result after 10 seconds"));
+        }, 10000);
         h.on("data", (obj) => {
             r.push(obj);
         });
         h.on("error", (e) => {
             resolved = true;
             reject(e);
+            clearTimeout(timeout);
         });
         h.on("end", () => {
             resolved = true;
             resolve(r);
+            clearTimeout(timeout);
         });
-        setTimeout(() => {
-            if (!resolved)
-                reject(new Error("list objects no result after 10 seconds"));
-        }, 10000);
     });
 }
 exports.listObjects = listObjects;

diff --git a/dist/saveOnly/index.js b/dist/saveOnly/index.js
@@ -102789,21 +102789,23 @@ function listObjects(mc, bucket, prefix) {
         const h = mc.listObjectsV2(bucket, prefix, true);
         const r = [];
         let resolved = false;
+        const timeout = setTimeout(() => {
+            if (!resolved)
+                reject(new Error("list objects no result after 10 seconds"));
+        }, 10000);
         h.on("data", (obj) => {
             r.push(obj);
         });
         h.on("error", (e) => {
             resolved = true;
             reject(e);
+            clearTimeout(timeout);
         });
         h.on("end", () => {
             resolved = true;
             resolve(r);
+            clearTimeout(timeout);
         });
-        setTimeout(() => {
-            if (!resolved)
-                reject(new Error("list objects no result after 10 seconds"));
-        }, 10000);
     });
 }
 exports.listObjects = listObjects;

diff --git a/src/utils.ts b/src/utils.ts
@@ -149,21 +149,24 @@ export function listObjects(
     const h = mc.listObjectsV2(bucket, prefix, true);
     const r: minio.BucketItem[] = [];
     let resolved = false;
+    const timeout = setTimeout(() => {
+      if (!resolved)
+        reject(new Error("list objects no result after 10 seconds"));
+    }, 10000);
+
     h.on("data", (obj) => {
       r.push(obj);
     });
     h.on("error", (e) => {
       resolved = true;
       reject(e);
+      clearTimeout(timeout)
     });
     h.on("end", () => {
       resolved = true;
       resolve(r);
+      clearTimeout(timeout)
     });
-    setTimeout(() => {
-      if (!resolved)
-        reject(new Error("list objects no result after 10 seconds"));
-    }, 10000);
   });
 }