Fix idle check

Author: thinknathan

src/utils/processImage.ts

@@ -18,6 +18,11 @@ function errorCallback(err: unknown) {
 	}
 }
 
+/**
+ * Called on a worker thread to signal current work is complete
+ */
+const workerIsDone = () => parentPort?.postMessage('complete');
+
 /**
  * Processes the given image with various image manipulation options.
  *
@@ -203,21 +208,26 @@ function continueProcessing(image: Jimp, options: Options): void {
 	}
 	outputFilename = `${outputFilename}.png`;
 
-	image.write(outputFilename, errorCallback);
-	console.log(`Image saved: ${outputFilename}`);
+	image
+		.writeAsync(outputFilename)
+		.then(() => {
+			console.log(`Image saved: ${outputFilename}`);
+
+			if (!isMainThread) {
+				workerIsDone();
+			}
+		})
+		.catch(errorCallback);
 }
 
 // If used as a worker thread, get file name from message
 if (!isMainThread) {
-	const workIsDone = () => parentPort?.postMessage('complete');
-
 	parentPort?.on(
 		'message',
 		async (message: { filePath: string; options: Options }) => {
 			const { filePath, options } = message;
 			options.filename = filePath;
 			processImage(options, true);
-			workIsDone();
 		},
 	);
 }

src/utils/processPath.ts

@@ -21,7 +21,6 @@ export async function processPath(
 
 			// Check if it's a file (not a subdirectory)
 			if ((await fs.stat(filePath)).isFile()) {
-				console.log(filePath, options);
 				workerPool.addTask(filePath, options);
 			}
 		}

src/utils/workerPool.ts

@@ -64,8 +64,8 @@ export class WorkerPool {
 			path.join(__dirname, 'processImage.js'),
 		) as TWorker;
 
-		worker.postMessage({ filePath, options });
 		worker.isIdle = false;
+		worker.postMessage({ filePath, options });
 
 		// Listen for messages and errors from the worker
 		worker.on('message', () => {
@@ -93,6 +93,7 @@ export class WorkerPool {
 			} else {
 				const worker = this.workers.find((w) => w.isIdle);
 				if (worker) {
+					worker.isIdle = false;
 					worker.postMessage(nextTask);
 				} else {
 					// Something went wrong, there are no idle workers somehow

utils/processImage.js

@@ -18,6 +18,10 @@ function errorCallback(err) {
         console.error(err);
     }
 }
+/**
+ * Called on a worker thread to signal current work is complete
+ */
+const workerIsDone = () => worker_threads_1.parentPort?.postMessage('complete');
 /**
  * Processes the given image with various image manipulation options.
  *
@@ -168,16 +172,21 @@ function continueProcessing(image, options) {
         outputFilename = `${outputFilename}-z_${pixelSize}`;
     }
     outputFilename = `${outputFilename}.png`;
-    image.write(outputFilename, errorCallback);
-    console.log(`Image saved: ${outputFilename}`);
+    image
+        .writeAsync(outputFilename)
+        .then(() => {
+        console.log(`Image saved: ${outputFilename}`);
+        if (!worker_threads_1.isMainThread) {
+            workerIsDone();
+        }
+    })
+        .catch(errorCallback);
 }
 // If used as a worker thread, get file name from message
 if (!worker_threads_1.isMainThread) {
-    const workIsDone = () => worker_threads_1.parentPort?.postMessage('complete');
     worker_threads_1.parentPort?.on('message', async (message) => {
         const { filePath, options } = message;
         options.filename = filePath;
         processImage(options, true);
-        workIsDone();
     });
 }

utils/processPath.js

@@ -16,7 +16,6 @@ async function processPath(directoryPath, options, maxWorkers) {
             const filePath = path.join(directoryPath, file);
             // Check if it's a file (not a subdirectory)
             if ((await fs.stat(filePath)).isFile()) {
-                console.log(filePath, options);
                 workerPool.addTask(filePath, options);
             }
         }

utils/workerPool.js

@@ -50,8 +50,8 @@ class WorkerPool {
      */
     createWorker(filePath, options) {
         const worker = new worker_threads_1.Worker(path.join(__dirname, 'processImage.js'));
-        worker.postMessage({ filePath, options });
         worker.isIdle = false;
+        worker.postMessage({ filePath, options });
         // Listen for messages and errors from the worker
         worker.on('message', () => {
             worker.isIdle = true;
@@ -76,6 +76,7 @@ class WorkerPool {
             else {
                 const worker = this.workers.find((w) => w.isIdle);
                 if (worker) {
+                    worker.isIdle = false;
                     worker.postMessage(nextTask);
                 }
                 else {