From cb4effa348fd5d4512a5af6d966965dd77efc069 Mon Sep 17 00:00:00 2001
From: Lightling <contact@lightling.xyz>
Date: Wed, 14 Feb 2024 22:32:00 -0500
Subject: [PATCH] fix /search mode prematurely starting

sometimes 'exit' would be called before 'close', and 'close' didn't do the safety check 'exit' did, making `--running` run twice; additionally, proc.exitCode was always null, check codeOrError instead from the proc.on callback
---
 lib/dl.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/dl.js b/lib/dl.js
index 37ca244..998575c 100644
--- a/lib/dl.js
+++ b/lib/dl.js
@@ -46,16 +46,16 @@ export const getMany = (userDb, threadMax, directory, mode) => new Promise((reso
   let index = 0;
 
   const get = () => {
-    const checkError = (proc, currentIndex, type, codeOrError) => {
+    const checkError = (currentIndex, type, codeOrError) => {
       userDb[currentIndex].logs.push(codeOrError.toString())
-      if (!!proc.exitCode && userDb[currentIndex].running) {
+      if (typeof codeOrError === 'number' && userDb[currentIndex].running) {
         userDb[currentIndex].running = false;
         onFinish(currentIndex, type);
       }
     };
 
     const onFinish = (currentIndex, type) => {
-      log(ctx, `Finished ${userDb[currentIndex].user} under ${mode} mode.${type === 'close' ? '' : ' (Closed due to ' + type}`);
+      log(ctx, `Finished ${userDb[currentIndex].user} under ${mode} mode.${type === 'close' ? '' : ' (Closed due to ' + type + ')'}`);
       --running;
       get();
     };
@@ -73,10 +73,10 @@ export const getMany = (userDb, threadMax, directory, mode) => new Promise((reso
       proc.stdout.on('data', data => {
         userDb[currentIndex].logs.push(trimNewlinesEnd(data));
       });
-      proc.stderr.on('data', data => checkError(proc, currentIndex, 'stderr', trimNewlinesEnd(data)));
-      proc.on('close', code => onFinish(currentIndex, 'close', code));
-      proc.on('error', err => checkError(proc, currentIndex, 'error', trimNewlinesEnd(err)));
-      proc.on('exit', code => checkError(proc, currentIndex, 'exit', code));
+      proc.stderr.on('data', data => checkError(currentIndex, 'stderr', trimNewlinesEnd(data)));
+      proc.on('close', code => checkError(currentIndex, 'close', code));
+      proc.on('error', err => checkError(currentIndex, 'error', trimNewlinesEnd(err)));
+      proc.on('exit', code => checkError(currentIndex, 'exit', code));
     }
 
     if (running === 0) {