@simplysm/sd-cli 13.0.76 → 13.0.77

package/src/utils/worker-events.ts

@@ -63,11 +63,16 @@ export interface WorkerEventHandlerOptions {
  * @param rebuildManager Rebuild manager
  * @returns completeTask function (saves result and signals build completion)
  */
-export function registerWorkerEventHandlers<
-  TEvents extends Record<string, unknown>,
-  T extends BaseWorkerInfo<TEvents>,
->(
-  workerInfo: T,
+export function registerWorkerEventHandlers(
+  workerInfo: {
+    name: string;
+    config: { target: string };
+    worker: {
+      on(event: string, handler: (data: any) => void): void;
+    };
+    isInitialBuild: boolean;
+    buildResolver: (() => void) | undefined;
+  },
   opts: WorkerEventHandlerOptions,
   results: Map<string, BuildResult>,
   rebuildManager: RebuildManager,
@@ -87,8 +92,7 @@ export function registerWorkerEventHandlers<
   });
 
   // Build completion
-  workerInfo.worker.on("build", (_data) => {
-    const data = _data as BuildEventData;
+  workerInfo.worker.on("build", (data) => {
     workerEventsLogger.debug(`[${workerInfo.name}] build: success=${String(data.success)}`);
 
     // Print warnings
@@ -102,14 +106,13 @@ export function registerWorkerEventHandlers<
       name: workerInfo.name,
       target: workerInfo.config.target,
       type: opts.resultType,
-      status: data.success ? "success" : "error",
+      status: data.success === true ? "success" : "error",
       message: data.errors?.join("\n"),
     });
   });
 
   // Error
-  workerInfo.worker.on("error", (_data) => {
-    const data = _data as ErrorEventData;
+  workerInfo.worker.on("error", (data) => {
     workerEventsLogger.debug(`[${workerInfo.name}] error: ${data.message}`);
     completeTask({
       name: workerInfo.name,

package/src/utils/worker-utils.ts

@@ -1,45 +1,45 @@
-import type { ConsolaInstance } from "consola";
-
-/**
- * Register cleanup handlers for worker process shutdown signals
- *
- * Registers SIGINT and SIGTERM handlers to gracefully cleanup resources
- * before process exit. Both handlers execute the cleanup function and
- * exit with code 0.
- *
- * @param cleanup - Async cleanup function to execute on shutdown
- * @param logger - Consola logger instance for error logging
- */
-export function registerCleanupHandlers(
-  cleanup: () => Promise<void>,
-  logger: ConsolaInstance,
-): void {
-  const handleSignal = () => {
-    cleanup()
-      .catch((err) => {
-        logger.error("cleanup failed", err);
-      })
-      .finally(() => {
-        process.exit(0);
-      });
-  };
-
-  process.on("SIGTERM", handleSignal);
-  process.on("SIGINT", handleSignal);
-}
-
-/**
- * Create guard to prevent duplicate calls to Worker function
- *
- * @param label - Function name to use in error message
- * @returns Guard function that throws error if called twice
- */
-export function createOnceGuard(label: string): () => void {
-  let called = false;
-  return () => {
-    if (called) {
-      throw new Error(`${label} can only be called once per Worker`);
-    }
-    called = true;
-  };
-}
+import type { ConsolaInstance } from "consola";
+
+/**
+ * Register cleanup handlers for worker process shutdown signals
+ *
+ * Registers SIGINT and SIGTERM handlers to gracefully cleanup resources
+ * before process exit. Both handlers execute the cleanup function and
+ * exit with code 0.
+ *
+ * @param cleanup - Cleanup function to execute on shutdown (sync or async)
+ * @param logger - Consola logger instance for error logging
+ */
+export function registerCleanupHandlers(
+  cleanup: () => void | Promise<void>,
+  logger: ConsolaInstance,
+): void {
+  const handleSignal = () => {
+    Promise.resolve(cleanup())
+      .catch((err) => {
+        logger.error("cleanup failed", err);
+      })
+      .finally(() => {
+        process.exit(0);
+      });
+  };
+
+  process.on("SIGTERM", handleSignal);
+  process.on("SIGINT", handleSignal);
+}
+
+/**
+ * Create guard to prevent duplicate calls to Worker function
+ *
+ * @param label - Function name to use in error message
+ * @returns Guard function that throws error if called twice
+ */
+export function createOnceGuard(label: string): () => void {
+  let called = false;
+  return () => {
+    if (called) {
+      throw new Error(`${label} can only be called once per Worker`);
+    }
+    called = true;
+  };
+}

package/src/workers/client.worker.ts

@@ -2,7 +2,7 @@ import path from "path";
 import fs from "fs";
 import { build as viteBuild, createServer, type ViteDevServer } from "vite";
 import { createWorker } from "@simplysm/core-node";
-import { errorMessage } from "@simplysm/core-common";
+import { err as errNs } from "@simplysm/core-common";
 import { consola } from "consola";
 import type { SdClientPackageConfig } from "../sd-config.types";
 import { parseRootTsconfig, getCompilerOptionsForPackage } from "../utils/tsconfig";
@@ -143,7 +143,7 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
   } catch (err) {
     return {
       success: false,
-      errors: [errorMessage(err)],
+      errors: [errNs.message(err)],
     };
   }
 }
@@ -211,7 +211,7 @@ async function startWatch(info: ClientWatchInfo): Promise<void> {
     sender.send("serverReady", { port: actualPort });
   } catch (err) {
     sender.send("error", {
-      message: errorMessage(err),
+      message: errNs.message(err),
     });
   }
 }