@simplysm/sd-cli 13.0.66 → 13.0.68

package/src/workers/library.worker.ts

@@ -1,6 +1,7 @@
 import path from "path";
 import esbuild from "esbuild";
 import { createWorker, FsWatcher } from "@simplysm/core-node";
+import { errorMessage } from "@simplysm/core-common";
 import { consola } from "consola";
 import type { SdBuildPackageConfig } from "../sd-config.types";
 import {
@@ -13,7 +14,7 @@ import {
   getTypecheckEnvFromTarget,
   writeChangedOutputFiles,
 } from "../utils/esbuild-config";
-import { registerCleanupHandlers } from "../utils/worker-utils";
+import { registerCleanupHandlers, createOnceGuard } from "../utils/worker-utils";
 
 //#region Types
 
@@ -146,13 +147,12 @@ async function build(info: LibraryBuildInfo): Promise<LibraryBuildResult> {
   } catch (err) {
     return {
       success: false,
-      errors: [err instanceof Error ? err.message : String(err)],
+      errors: [errorMessage(err)],
     };
   }
 }
 
-/** startWatch 호출 여부 플래그 */
-let isWatchStarted = false;
+const guardStartWatch = createOnceGuard("startWatch");
 
 /**
  * esbuild context 생성 및 초기 빌드 수행
@@ -232,10 +232,7 @@ async function createAndBuildContext(
  * @throws 이미 watch가 시작된 경우
  */
 async function startWatch(info: LibraryWatchInfo): Promise<void> {
-  if (isWatchStarted) {
-    throw new Error("startWatch는 Worker당 한 번만 호출할 수 있습니다.");
-  }
-  isWatchStarted = true;
+  guardStartWatch();
 
   try {
     // 첫 번째 빌드 완료 대기를 위한 Promise
@@ -284,13 +281,13 @@ async function startWatch(info: LibraryWatchInfo): Promise<void> {
         }
       } catch (err) {
         sender.send("error", {
-          message: err instanceof Error ? err.message : String(err),
+          message: errorMessage(err),
         });
       }
     });
   } catch (err) {
     sender.send("error", {
-      message: err instanceof Error ? err.message : String(err),
+      message: errorMessage(err),
     });
   }
 }

package/src/workers/server-runtime.worker.ts

@@ -1,5 +1,6 @@
 import proxy from "@fastify/http-proxy";
 import { createWorker } from "@simplysm/core-node";
+import { errorMessage } from "@simplysm/core-common";
 import { consola } from "consola";
 import net from "net";
 import { pathToFileURL } from "url";
@@ -60,14 +61,14 @@ async function cleanup(): Promise<void> {
 process.on("uncaughtException", (err) => {
   logger.error("Server Runtime 미처리 오류", err);
   sender.send("error", {
-    message: err instanceof Error ? err.message : String(err),
+    message: errorMessage(err),
   });
 });
 
 process.on("unhandledRejection", (reason) => {
   logger.error("Server Runtime 미처리 Promise 거부", reason);
   sender.send("error", {
-    message: reason instanceof Error ? reason.message : String(reason),
+    message: errorMessage(reason),
   });
 });
 
@@ -144,7 +145,7 @@ async function start(info: ServerRuntimeStartInfo): Promise<void> {
   } catch (err) {
     logger.error("Server Runtime 시작 실패", err);
     sender.send("error", {
-      message: err instanceof Error ? err.message : String(err),
+      message: errorMessage(err),
     });
   }
 }

package/src/workers/server.worker.ts

@@ -1,8 +1,9 @@
 import path from "path";
 import fs from "fs";
-import cp from "child_process";
+import { execaSync } from "execa";
 import esbuild from "esbuild";
 import { createWorker, FsWatcher, pathNorm } from "@simplysm/core-node";
+import { errorMessage } from "@simplysm/core-common";
 import { consola } from "consola";
 import {
   parseRootTsconfig,
@@ -15,7 +16,7 @@ import {
   collectNativeModuleExternals,
   writeChangedOutputFiles,
 } from "../utils/esbuild-config";
-import { registerCleanupHandlers } from "../utils/worker-utils";
+import { registerCleanupHandlers, createOnceGuard } from "../utils/worker-utils";
 import { collectDeps } from "../utils/package-utils";
 import { copyPublicFiles, watchPublicFiles } from "../utils/copy-public";
 
@@ -196,7 +197,7 @@ function generateProductionFiles(info: ServerBuildInfo, externals: string[]): vo
     distPkgJson["dependencies"] = deps;
   }
   if (info.packageManager === "volta") {
-    const nodeVersion = cp.execSync("node -v").toString().trim();
+    const nodeVersion = execaSync("node", ["-v"]).stdout.trim();
     distPkgJson["volta"] = { node: nodeVersion };
   }
   fs.writeFileSync(path.join(distDir, "package.json"), JSON.stringify(distPkgJson, undefined, 2));
@@ -268,8 +269,7 @@ function generateProductionFiles(info: ServerBuildInfo, externals: string[]): vo
         : `  interpreter: cp.execSync("mise which node").toString().trim(),\n`;
 
     const pm2Config = [
-      `const cp = require("child_process");`,
-      ``,
+      ...(info.packageManager !== "volta" ? [`const cp = require("child_process");`, ``] : []),
       `module.exports = {`,
       `  name: ${JSON.stringify(pm2Name)},`,
       `  script: "main.js",`,
@@ -353,13 +353,12 @@ async function build(info: ServerBuildInfo): Promise<ServerBuildResult> {
     return {
       success: false,
       mainJsPath,
-      errors: [err instanceof Error ? err.message : String(err)],
+      errors: [errorMessage(err)],
     };
   }
 }
 
-/** startWatch 호출 여부 플래그 */
-let isWatchStarted = false;
+const guardStartWatch = createOnceGuard("startWatch");
 
 /**
  * esbuild context 생성 및 초기 빌드 수행
@@ -455,10 +454,7 @@ async function createAndBuildContext(
  * @throws 이미 watch가 시작된 경우
  */
 async function startWatch(info: ServerWatchInfo): Promise<void> {
-  if (isWatchStarted) {
-    throw new Error("startWatch는 Worker당 한 번만 호출할 수 있습니다.");
-  }
-  isWatchStarted = true;
+  guardStartWatch();
 
   try {
     // 첫 번째 빌드 완료 대기를 위한 Promise
@@ -543,13 +539,13 @@ async function startWatch(info: ServerWatchInfo): Promise<void> {
         }
       } catch (err) {
         sender.send("error", {
-          message: err instanceof Error ? err.message : String(err),
+          message: errorMessage(err),
         });
       }
     });
   } catch (err) {
     sender.send("error", {
-      message: err instanceof Error ? err.message : String(err),
+      message: errorMessage(err),
     });
   }
 }

package/templates/add-client/__CLIENT__/package.json.hbs

@@ -4,7 +4,7 @@
   "type": "module",
   "private": true,
   "dependencies": {
-    "@simplysm/solid": "~13.0.66",
+    "@simplysm/solid": "~13.0.68",
 {{#if router}}
     "@solidjs/router": "^0.15.4",
 {{/if}}

package/templates/add-server/__SERVER__/package.json.hbs

@@ -4,7 +4,7 @@
   "type": "module",
   "private": true,
   "dependencies": {
-    "@simplysm/core-common": "~13.0.66",
-    "@simplysm/service-server": "~13.0.66"
+    "@simplysm/core-common": "~13.0.68",
+    "@simplysm/service-server": "~13.0.68"
   }
 }

package/templates/init/package.json.hbs

@@ -15,9 +15,9 @@
     "vitest": "vitest"
   },
   "devDependencies": {
-    "@simplysm/sd-cli": "~13.0.66",
-    "@simplysm/sd-claude": "~13.0.66",
-    "@simplysm/lint": "~13.0.66",
+    "@simplysm/sd-cli": "~13.0.68",
+    "@simplysm/sd-claude": "~13.0.68",
+    "@simplysm/lint": "~13.0.68",
     "@types/node": "^20.19.33",
     "eslint": "^9.39.2",
     "prettier": "^3.8.1",

package/dist/utils/spawn.d.ts

@@ -1,26 +0,0 @@
-/**
- * spawn 옵션
- */
-export interface SpawnOptions {
-    /** 작업 디렉토리 */
-    cwd?: string;
-    /** 환경변수 (process.env와 병합) */
-    env?: Record<string, string | undefined>;
-    /** 색상 출력 강제 여부 (기본값: NO_COLOR 환경변수 존중) */
-    forceColor?: boolean;
-}
-/**
- * child_process.spawn을 Promise로 래핑한 함수.
- *
- * - stdout/stderr를 캡처하여 반환
- * - NO_COLOR 환경변수 존중 (forceColor로 오버라이드 가능)
- * - 종료 코드가 0이 아니면 에러 throw
- * - Windows에서는 shell: true (.cmd 파일 실행 필요), 그 외는 shell: false
- *
- * @param cmd - 실행할 명령어
- * @param args - 명령어 인자
- * @param options - 실행 옵션
- * @returns stdout 출력 (stderr는 stdout에 병합됨)
- */
-export declare function spawn(cmd: string, args: string[], options?: SpawnOptions): Promise<string>;
-//# sourceMappingURL=spawn.d.ts.map

package/dist/utils/spawn.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\spawn.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,cAAc;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC,0CAA0C;IAC1C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAoDhG"}

package/dist/utils/spawn.js

@@ -1,50 +0,0 @@
-import { spawn as cpSpawn } from "child_process";
-async function spawn(cmd, args, options) {
-  return new Promise((resolve, reject) => {
-    const noColor = process.env["NO_COLOR"] != null;
-    const useColor = options?.forceColor ?? !noColor;
-    const colorEnv = useColor ? {
-      FORCE_COLOR: "1",
-      CLICOLOR_FORCE: "1",
-      COLORTERM: "truecolor"
-    } : {};
-    const spawnOptions = {
-      cwd: options?.cwd,
-      env: {
-        ...process.env,
-        ...colorEnv,
-        ...options?.env
-      },
-      // Windows에서 npm, pnpm 등은 .cmd 파일이므로 shell을 통해 실행해야 함
-      shell: process.platform === "win32",
-      stdio: ["ignore", "pipe", "pipe"]
-    };
-    const child = cpSpawn(cmd, args, spawnOptions);
-    let output = "";
-    child.stdout?.on("data", (data) => {
-      output += data.toString();
-    });
-    child.stderr?.on("data", (data) => {
-      output += data.toString();
-    });
-    child.on("error", (err) => {
-      reject(new Error(`spawn \uC2E4\uD328 (${cmd}): ${err.message}`));
-    });
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve(output);
-      } else {
-        reject(
-          new Error(`\uBA85\uB839\uC5B4 \uC2E4\uD328 (${cmd} ${args.join(" ")})
-\uC885\uB8CC \uCF54\uB4DC: ${code}
-\uCD9C\uB825:
-${output}`)
-        );
-      }
-    });
-  });
-}
-export {
-  spawn
-};
-//# sourceMappingURL=spawn.js.map

package/dist/utils/spawn.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/utils/spawn.ts"],
-  "mappings": "AAAA,SAAS,SAAS,eAAoD;AA2BtE,eAAsB,MAAM,KAAa,MAAgB,SAAyC;AAChG,SAAO,IAAI,QAAgB,CAAC,SAAS,WAAW;AAE9C,UAAM,UAAU,QAAQ,IAAI,UAAU,KAAK;AAC3C,UAAM,WAAW,SAAS,cAAc,CAAC;AAEzC,UAAM,WAAW,WACb;AAAA,MACE,aAAa;AAAA,MACb,gBAAgB;AAAA,MAChB,WAAW;AAAA,IACb,IACA,CAAC;AAEL,UAAM,eAA+B;AAAA,MACnC,KAAK,SAAS;AAAA,MACd,KAAK;AAAA,QACH,GAAG,QAAQ;AAAA,QACX,GAAG;AAAA,QACH,GAAG,SAAS;AAAA,MACd;AAAA;AAAA,MAEA,OAAO,QAAQ,aAAa;AAAA,MAC5B,OAAO,CAAC,UAAU,QAAQ,MAAM;AAAA,IAClC;AAEA,UAAM,QAAQ,QAAQ,KAAK,MAAM,YAAY;AAE7C,QAAI,SAAS;AAEb,UAAM,QAAQ,GAAG,QAAQ,CAAC,SAAiB;AACzC,gBAAU,KAAK,SAAS;AAAA,IAC1B,CAAC;AAED,UAAM,QAAQ,GAAG,QAAQ,CAAC,SAAiB;AACzC,gBAAU,KAAK,SAAS;AAAA,IAC1B,CAAC;AAED,UAAM,GAAG,SAAS,CAAC,QAAQ;AACzB,aAAO,IAAI,MAAM,uBAAa,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC;AAAA,IACvD,CAAC;AAED,UAAM,GAAG,SAAS,CAAC,SAAS;AAC1B,UAAI,SAAS,GAAG;AACd,gBAAQ,MAAM;AAAA,MAChB,OAAO;AACL;AAAA,UACE,IAAI,MAAM,oCAAW,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC;AAAA,6BAAa,IAAI;AAAA;AAAA,EAAU,MAAM,EAAE;AAAA,QAC/E;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH;",
-  "names": []
-}

package/src/utils/spawn.ts

@@ -1,80 +0,0 @@
-import { spawn as cpSpawn, type SpawnOptions as CpSpawnOptions } from "child_process";
-
-/**
- * spawn 옵션
- */
-export interface SpawnOptions {
-  /** 작업 디렉토리 */
-  cwd?: string;
-  /** 환경변수 (process.env와 병합) */
-  env?: Record<string, string | undefined>;
-  /** 색상 출력 강제 여부 (기본값: NO_COLOR 환경변수 존중) */
-  forceColor?: boolean;
-}
-
-/**
- * child_process.spawn을 Promise로 래핑한 함수.
- *
- * - stdout/stderr를 캡처하여 반환
- * - NO_COLOR 환경변수 존중 (forceColor로 오버라이드 가능)
- * - 종료 코드가 0이 아니면 에러 throw
- * - Windows에서는 shell: true (.cmd 파일 실행 필요), 그 외는 shell: false
- *
- * @param cmd - 실행할 명령어
- * @param args - 명령어 인자
- * @param options - 실행 옵션
- * @returns stdout 출력 (stderr는 stdout에 병합됨)
- */
-export async function spawn(cmd: string, args: string[], options?: SpawnOptions): Promise<string> {
-  return new Promise<string>((resolve, reject) => {
-    // NO_COLOR 환경변수 존중 (https://no-color.org/)
-    const noColor = process.env["NO_COLOR"] != null;
-    const useColor = options?.forceColor ?? !noColor;
-
-    const colorEnv = useColor
-      ? {
-          FORCE_COLOR: "1",
-          CLICOLOR_FORCE: "1",
-          COLORTERM: "truecolor",
-        }
-      : {};
-
-    const spawnOptions: CpSpawnOptions = {
-      cwd: options?.cwd,
-      env: {
-        ...process.env,
-        ...colorEnv,
-        ...options?.env,
-      },
-      // Windows에서 npm, pnpm 등은 .cmd 파일이므로 shell을 통해 실행해야 함
-      shell: process.platform === "win32",
-      stdio: ["ignore", "pipe", "pipe"],
-    };
-
-    const child = cpSpawn(cmd, args, spawnOptions);
-
-    let output = "";
-
-    child.stdout?.on("data", (data: Buffer) => {
-      output += data.toString();
-    });
-
-    child.stderr?.on("data", (data: Buffer) => {
-      output += data.toString();
-    });
-
-    child.on("error", (err) => {
-      reject(new Error(`spawn 실패 (${cmd}): ${err.message}`));
-    });
-
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve(output);
-      } else {
-        reject(
-          new Error(`명령어 실패 (${cmd} ${args.join(" ")})\n종료 코드: ${code}\n출력:\n${output}`),
-        );
-      }
-    });
-  });
-}