From 7d0f598b3a55da8b58ba2ee012912102346bbded Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Fri, 20 Jun 2025 16:00:58 +0100
Subject: [PATCH] fix(fileimport service): prevent fatal crash when send
 results (#4970)

---
 .../fileimport-service/src/nextGen/main.ts    | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/fileimport-service/src/nextGen/main.ts b/packages/fileimport-service/src/nextGen/main.ts
index a695008f6..2682d2c95 100644
--- a/packages/fileimport-service/src/nextGen/main.ts
+++ b/packages/fileimport-service/src/nextGen/main.ts
@@ -82,17 +82,22 @@ export const main = async () => {
       }
       if (err instanceof Error) {
         encounteredError = true
-        done(err)
-        await sendResult({
-          ...job,
-          result: {
-            status: 'error',
-            reason: err.message,
+        try {
+          await sendResult({
+            ...job,
             result: {
-              durationSeconds: 0
+              status: 'error',
+              reason: err.message,
+              result: {
+                durationSeconds: 0
+              }
             }
-          }
-        })
+          })
+        } catch (sendErr) {
+          jobLogger.fatal({ err: sendErr }, 'Failed to send result for job {jobId}')
+        } finally {
+          done(err)
+        }
       } else {
         throw err
       }