pepr 0.48.1 → 0.49.0

package/src/lib/controller/createHooks.ts

@@ -0,0 +1,34 @@
+import { ControllerHooks } from ".";
+import { resolveIgnoreNamespaces } from "../assets/webhooks";
+import { Capability } from "../core/capability";
+import { isWatchMode, isDevMode } from "../core/envChecks";
+import { setupWatch } from "../processors/watch-processor";
+import { PeprModuleOptions } from "../types";
+
+/**
+ * Creates controller hooks with proper handling of watch setup
+ *
+ * @param opts Module options including hooks
+ * @param capabilities List of capabilities
+ * @param ignoreNamespaces Namespaces to ignore
+ * @returns Controller hooks configuration
+ */
+export function createControllerHooks(
+  opts: PeprModuleOptions,
+  capabilities: Capability[],
+  ignoreNamespaces: string[] = [],
+): ControllerHooks {
+  return {
+    beforeHook: opts.beforeHook,
+    afterHook: opts.afterHook,
+    onReady: async (): Promise<void> => {
+      if (isWatchMode() || isDevMode()) {
+        try {
+          setupWatch(capabilities, resolveIgnoreNamespaces(ignoreNamespaces));
+        } catch (error) {
+          throw new Error(`WatchError: Could not set up watch.`, { cause: error });
+        }
+      }
+    },
+  };
+}

package/src/lib/controller/index.ts

@@ -132,10 +132,10 @@ export class Controller {
 
     // Listen for the SIGTERM signal and gracefully close the server
     process.on("SIGTERM", () => {
-      Log.info("Received SIGTERM, closing server");
+      Log.info("Received SIGTERM, closing server.");
       server.close(() => {
-        Log.info("Server closed");
-        process.exit(0);
+        Log.info("Server closed.");
+        process.exit(143);
       });
     });
   };

package/src/lib/core/module.ts

@@ -2,14 +2,12 @@
 // SPDX-FileCopyrightText: 2023-Present The Pepr Authors
 import { clone } from "ramda";
 import { Capability } from "./capability";
-import { Controller, ControllerHooks } from "../controller";
+import { Controller } from "../controller";
 import { ValidateError } from "../errors";
 import { CapabilityExport } from "../types";
-import { setupWatch } from "../processors/watch-processor";
-import Log from "../../lib/telemetry/logger";
-import { resolveIgnoreNamespaces } from "../assets/webhooks";
-import { isBuildMode, isDevMode, isWatchMode } from "./envChecks";
+import { isBuildMode } from "./envChecks";
 import { PackageJSON, PeprModuleOptions, ModuleConfig } from "../types";
+import { createControllerHooks } from "../controller/createHooks";
 
 export class PeprModule {
   #controller!: Controller;
@@ -59,21 +57,11 @@ export class PeprModule {
       return;
     }
 
-    const controllerHooks: ControllerHooks = {
-      beforeHook: opts.beforeHook,
-      afterHook: opts.afterHook,
-      onReady: async (): Promise<void> => {
-        // Wait for the controller to be ready before setting up watches
-        if (isWatchMode() || isDevMode()) {
-          try {
-            setupWatch(capabilities, resolveIgnoreNamespaces(pepr?.alwaysIgnore?.namespaces));
-          } catch (e) {
-            Log.error(e, "Error setting up watch");
-            process.exit(1);
-          }
-        }
-      },
-    };
+    const controllerHooks = createControllerHooks(
+      opts,
+      capabilities,
+      pepr?.alwaysIgnore?.namespaces,
+    );
 
     this.#controller = new Controller(config, capabilities, controllerHooks);