refactor: extract abort signal combination to utility function

Author: mdesmet

src/dbt_client/dbtIntegration.ts

@@ -13,6 +13,7 @@ import { DBTConfiguration } from "./configuration";
 import path from "path";
 import { parse } from "yaml";
 import * as crypto from "crypto";
+import { combineAbortSignals } from "../utils";
 
 export const DBT_PROJECT_FILE = "dbt_project.yml";
 export const MANIFEST_FILE = "manifest.json";
@@ -124,32 +125,7 @@ export class CLIDBTCommandExecutionStrategy
       );
     }
     // Combine signals if multiple are provided
-    let combinedSignal: AbortSignal | undefined;
-    const signals: AbortSignal[] = [];
-    if (signal !== undefined) {
-      signals.push(signal);
-    }
-    if (command.signal !== undefined) {
-      signals.push(command.signal);
-    }
-
-    if (signals.length > 0) {
-      if (signals.length === 1) {
-        combinedSignal = signals[0];
-      } else {
-        // Create a combined signal if multiple signals are provided
-        const controller = new AbortController();
-        combinedSignal = controller.signal;
-
-        signals.forEach((s) => {
-          if (s.aborted) {
-            controller.abort();
-          } else {
-            s.addEventListener("abort", () => controller.abort());
-          }
-        });
-      }
-    }
+    const combinedSignal = combineAbortSignals(signal, command.signal);
 
     return this.commandProcessExecutionFactory.createCommandProcessExecution({
       command: this.dbtPath,
@@ -208,32 +184,7 @@ export class PythonDBTCommandExecutionStrategy
       );
     }
     // Combine signals if multiple are provided
-    let combinedSignal: AbortSignal | undefined;
-    const signals: AbortSignal[] = [];
-    if (signal !== undefined) {
-      signals.push(signal);
-    }
-    if (command.signal !== undefined) {
-      signals.push(command.signal);
-    }
-
-    if (signals.length > 0) {
-      if (signals.length === 1) {
-        combinedSignal = signals[0];
-      } else {
-        // Create a combined signal if multiple signals are provided
-        const controller = new AbortController();
-        combinedSignal = controller.signal;
-
-        signals.forEach((s) => {
-          if (s.aborted) {
-            controller.abort();
-          } else {
-            s.addEventListener("abort", () => controller.abort());
-          }
-        });
-      }
-    }
+    const combinedSignal = combineAbortSignals(signal, command.signal);
 
     return this.commandProcessExecutionFactory.createCommandProcessExecution({
       command: this.pythonEnvironment.pythonPath,

src/utils.ts

@@ -465,6 +465,37 @@ export function removeProtocol(input: string): string {
   return input.replace(/^[^:]+:\/\//, "");
 }
 
+export function combineAbortSignals(
+  ...signals: (AbortSignal | undefined)[]
+): AbortSignal | undefined {
+  // Filter out undefined signals
+  const validSignals = signals.filter(
+    (signal): signal is AbortSignal => signal !== undefined,
+  );
+
+  if (validSignals.length === 0) {
+    return undefined;
+  }
+
+  if (validSignals.length === 1) {
+    return validSignals[0];
+  }
+
+  // Create a combined signal if multiple signals are provided
+  const controller = new AbortController();
+  const combinedSignal = controller.signal;
+
+  validSignals.forEach((signal) => {
+    if (signal.aborted) {
+      controller.abort();
+    } else {
+      signal.addEventListener("abort", () => controller.abort());
+    }
+  });
+
+  return combinedSignal;
+}
+
 export function getDepthColor(depth: number): string {
   const mediumDepthThreshold = workspace
     .getConfiguration("dbt")