From c88f0bba0469292e02e03c590c7c4ea586606dce Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sat, 13 Jun 2026 16:50:55 +0200
Subject: [PATCH] Reduce duplication when invoking `finishWorkerTask`

By utilizing `Promise.prototype.finally()` more it's possible to avoid a bit of duplication when invoking `finishWorkerTask`.
---
 src/core/worker.js | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/core/worker.js b/src/core/worker.js
index 35c36d4ea..d03902dd2 100644
--- a/src/core/worker.js
+++ b/src/core/worker.js
@@ -579,16 +579,9 @@ class WorkerMessageHandler {
         const task = new WorkerTask(`GetAnnotations: page ${pageIndex}`);
         startWorkerTask(task);
 
-        return page.getAnnotationsData(handler, task, intent).then(
-          data => {
-            finishWorkerTask(task);
-            return data;
-          },
-          reason => {
-            finishWorkerTask(task);
-            throw reason;
-          }
-        );
+        return page.getAnnotationsData(handler, task, intent).finally(() => {
+          finishWorkerTask(task);
+        });
       });
     });
 
@@ -773,7 +766,7 @@ class WorkerMessageHandler {
                     imagePromises,
                     changes
                   )
-                  .finally(function () {
+                  .finally(() => {
                     finishWorkerTask(task);
                   });
               })
@@ -818,7 +811,7 @@ class WorkerMessageHandler {
 
                 return page
                   .save(handler, task, annotationStorage, changes)
-                  .finally(function () {
+                  .finally(() => {
                     finishWorkerTask(task);
                   });
               })
@@ -928,9 +921,7 @@ class WorkerMessageHandler {
             pageIndex,
           })
           .then(
-            function (operatorListInfo) {
-              finishWorkerTask(task);
-
+            operatorListInfo => {
               if (start) {
                 info(
                   `page=${pageIndex + 1} - getOperatorList: time=` +
@@ -939,8 +930,7 @@ class WorkerMessageHandler {
               }
               sink.close();
             },
-            function (reason) {
-              finishWorkerTask(task);
+            reason => {
               if (task.terminated) {
                 return; // ignoring errors from the terminated thread
               }
@@ -949,7 +939,10 @@ class WorkerMessageHandler {
               // TODO: Should `reason` be re-thrown here (currently that casues
               //       "Uncaught exception: ..." messages in the console)?
             }
-          );
+          )
+          .finally(() => {
+            finishWorkerTask(task);
+          });
       });
     });
 
@@ -973,9 +966,7 @@ class WorkerMessageHandler {
             disableNormalization,
           })
           .then(
-            function () {
-              finishWorkerTask(task);
-
+            () => {
               if (start) {
                 info(
                   `page=${pageIndex + 1} - getTextContent: time=` +
@@ -984,8 +975,7 @@ class WorkerMessageHandler {
               }
               sink.close();
             },
-            function (reason) {
-              finishWorkerTask(task);
+            reason => {
               if (task.terminated) {
                 return; // ignoring errors from the terminated thread
               }
@@ -994,7 +984,10 @@ class WorkerMessageHandler {
               // TODO: Should `reason` be re-thrown here (currently that casues
               //       "Uncaught exception: ..." messages in the console)?
             }
-          );
+          )
+          .finally(() => {
+            finishWorkerTask(task);
+          });
       });
     });