@simplysm/sd-cli 14.0.16 → 14.0.18

package/src/electron/electron.ts

@@ -3,20 +3,14 @@ import fs from "fs";
 import module from "module";
 import { cpx, fsx, pathx } from "@simplysm/core-node";
 import { consola, LogLevels } from "consola";
-import type { SdElectronConfig } from "../sd-config.types.js";
+import type { NpmConfig, SdElectronConfig } from "../sd-config.types.js";
 import { createEnvBanner } from "../utils/esbuild-config.js";
 
-interface NpmConfig {
-  name: string;
-  version: string;
-  description?: string;
-  dependencies?: Record<string, string>;
-}
-
 export class Electron {
   private static readonly _logger = consola.withTag("sd:cli:electron");
 
   private readonly _electronPath: string;
+  private readonly _srcPath: string;
 
   private constructor(
     private readonly _pkgPath: string,
@@ -25,6 +19,7 @@ export class Electron {
     private readonly _exclude: string[],
   ) {
     this._electronPath = pathx.posixResolve(this._pkgPath, ".electron");
+    this._srcPath = pathx.posixResolve(this._electronPath, "src");
   }
 
   static async create(
@@ -44,10 +39,6 @@ export class Electron {
     }
   }
 
-  private _localBin(name: string): string {
-    return pathx.posixResolve(this._pkgPath, "node_modules/.bin", name);
-  }
-
   private async _exec(
     cmd: string,
     args: string[],
@@ -70,20 +61,26 @@ export class Electron {
 
   async initialize(): Promise<void> {
     Electron._logger.debug("initialize 시작");
-    const srcPath = pathx.posixResolve(this._electronPath, "src");
 
     Electron._logger.debug("package.json 설정 시작");
-    await this._setupPackageJson(srcPath);
+    await this._setupNpmConf();
     Electron._logger.debug("package.json 설정 완료");
 
-    Electron._logger.debug("npm install 시작");
-    await this._exec("npm", ["install"], srcPath);
-    Electron._logger.debug("npm install 완료");
+    // pnpm-workspace.yaml 생성 (상위 workspace 탐색 차단)
+    const workspaceYamlPath = pathx.posixResolve(this._srcPath, "pnpm-workspace.yaml");
+    if (!(await fsx.exists(workspaceYamlPath))) {
+      await fsx.write(workspaceYamlPath, "");
+    }
+
+    Electron._logger.debug("pnpm install 시작");
+    await this._exec("pnpm", ["install"], this._srcPath);
+    await this._exec("pnpm", ["approve-builds", "--all"], this._srcPath);
+    Electron._logger.debug("pnpm install 완료");
 
     const reinstallDeps = this._config.reinstallDependencies ?? [];
     if (reinstallDeps.length > 0) {
       Electron._logger.debug(`electron-rebuild 시작 (${reinstallDeps.join(", ")})`);
-      await this._exec(this._localBin("electron-rebuild"), [], srcPath);
+      await this._exec("pnpm", ["exec", "electron-rebuild"], this._srcPath);
       Electron._logger.debug("electron-rebuild 완료");
     }
     Electron._logger.debug("initialize 완료");
@@ -91,9 +88,9 @@ export class Electron {
 
   async run(url: string): Promise<void> {
     Electron._logger.debug(`run 시작 (url: ${url})`);
-    const srcPath = pathx.posixResolve(this._electronPath, "src");
 
     await this.initialize();
+    await this._copyPublicAssets();
 
     const esbuild = await import("esbuild");
     const entryPoint = pathx.posixResolve(this._pkgPath, "src/electron-main.ts");
@@ -104,7 +101,6 @@ export class Electron {
 
     const builtinModules = module.builtinModules.flatMap((m) => [m, `node:${m}`]);
     const reinstallDeps = this._config.reinstallDependencies ?? [];
-    await fsx.mkdir(srcPath);
 
     let currentElectron: cpx.SpawnProcess | null = null;
     let isRestarting = false;
@@ -112,9 +108,10 @@ export class Electron {
 
     const spawnElectron = () => {
       Electron._logger.debug("Electron 프로세스 시작");
-      currentElectron = cpx.spawn(this._localBin("electron"), ["."], {
-        cwd: srcPath,
+      currentElectron = cpx.spawn("pnpm", ["exec", "electron", "."], {
+        cwd: this._srcPath,
         stdio: "inherit",
+        shell: true,
         reject: false,
       });
 
@@ -132,7 +129,7 @@ export class Electron {
     Electron._logger.debug("esbuild context 생성 시작");
     const ctx = await esbuild.context({
       entryPoints: [entryPoint],
-      outfile: pathx.posixResolve(srcPath, "electron-main.js"),
+      outfile: pathx.posixResolve(this._srcPath, "electron-main.js"),
       platform: "node",
       target: "node20",
       format: "cjs",
@@ -205,18 +202,19 @@ export class Electron {
 
   async build(outPath: string): Promise<void> {
     Electron._logger.debug("build 시작");
-    const srcPath = pathx.posixResolve(this._electronPath, "src");
+
+    await this.initialize();
 
     Electron._logger.debug("메인 프로세스 번들링 시작");
-    await this._bundleMainProcess(srcPath);
+    await this._bundleMainProcess();
     Electron._logger.debug("메인 프로세스 번들링 완료");
 
     Electron._logger.debug("웹 에셋 복사 시작");
-    await this._copyWebAssets(outPath, srcPath);
+    await this._copyWebAssets(outPath);
     Electron._logger.debug("웹 에셋 복사 완료");
 
     Electron._logger.debug("electron-builder 실행 시작");
-    await this._runElectronBuilder(srcPath);
+    await this._runElectronBuilder();
     Electron._logger.debug("electron-builder 실행 완료");
 
     Electron._logger.debug("빌드 산출물 복사 시작");
@@ -230,14 +228,19 @@ export class Electron {
 
   //#region Private - Initialization
 
-  private async _setupPackageJson(srcPath: string): Promise<void> {
-    await fsx.mkdir(srcPath);
+  private async _setupNpmConf(): Promise<void> {
+    await fsx.mkdir(this._srcPath);
+
+    const mainDeps: Record<string, string | undefined> = {
+      ...this._npmConfig.dependencies,
+      ...this._npmConfig.devDependencies,
+    };
 
     const reinstallDeps = this._config.reinstallDependencies ?? [];
 
     const dependencies: Record<string, string> = {};
     for (const dep of reinstallDeps) {
-      const version = this._npmConfig.dependencies?.[dep];
+      const version = mainDeps[dep];
       if (version != null) {
         dependencies[dep] = version;
       }
@@ -245,33 +248,39 @@ export class Electron {
 
     for (const excludePkg of this._exclude) {
       if (!(excludePkg in dependencies)) {
-        const version = this._npmConfig.dependencies?.[excludePkg];
+        const version = mainDeps[excludePkg];
         if (version != null) {
           dependencies[excludePkg] = version;
         }
       }
     }
 
+    const devDependencies: Record<string, string> = {};
+    devDependencies["electron"] = "^41";
+    devDependencies["@electron/rebuild"] = "^4";
+    devDependencies["electron-builder"] = "^26";
+
     const packageJson: Record<string, unknown> = {
       name: this._npmConfig.name.replace(/^@/, "").replace(/\//, "-"),
       version: this._npmConfig.version,
       description: this._npmConfig.description,
       main: "electron-main.js",
       dependencies,
+      devDependencies,
     };
 
     if (this._config.postInstallScript != null) {
       packageJson["scripts"] = { postinstall: this._config.postInstallScript };
     }
 
-    await fsx.writeJson(pathx.posixResolve(srcPath, "package.json"), packageJson, { space: 2 });
+    await fsx.writeJson(pathx.posixResolve(this._srcPath, "package.json"), packageJson, { space: 2 });
   }
 
   //#endregion
 
   //#region Private - Bundling
 
-  private async _bundleMainProcess(outDir: string): Promise<void> {
+  private async _bundleMainProcess(): Promise<void> {
     const esbuild = await import("esbuild");
     const entryPoint = pathx.posixResolve(this._pkgPath, "src/electron-main.ts");
 
@@ -282,14 +291,12 @@ export class Electron {
     const builtinModules = module.builtinModules.flatMap((m) => [m, `node:${m}`]);
     const reinstallDeps = this._config.reinstallDependencies ?? [];
 
-    await fsx.mkdir(outDir);
-
     const envBanner = createEnvBanner(this._config.env);
 
     Electron._logger.debug(`esbuild 번들링: ${entryPoint}`);
     await esbuild.build({
       entryPoints: [entryPoint],
-      outfile: pathx.posixResolve(outDir, "electron-main.js"),
+      outfile: pathx.posixResolve(this._srcPath, "electron-main.js"),
       platform: "node",
       target: "node20",
       format: "cjs",
@@ -301,15 +308,27 @@ export class Electron {
 
   //#endregion
 
+  private async _copyPublicAssets(): Promise<void> {
+    const publicPath = pathx.posixResolve(this._pkgPath, "public");
+    if (!(await fsx.exists(publicPath))) return;
+
+    const items = await fsx.readdir(publicPath);
+    for (const item of items) {
+      const source = pathx.posixResolve(publicPath, item);
+      const dest = pathx.posixResolve(this._srcPath, item);
+      await fsx.copy(source, dest);
+    }
+  }
+
   //#region Private - Build
 
-  private async _copyWebAssets(outPath: string, srcPath: string): Promise<void> {
+  private async _copyWebAssets(outPath: string): Promise<void> {
     const items = await fsx.readdir(outPath);
     for (const item of items) {
       if (item === "electron") continue;
 
       const source = pathx.posixResolve(outPath, item);
-      const dest = pathx.posixResolve(srcPath, item);
+      const dest = pathx.posixResolve(this._srcPath, item);
       await fsx.copy(source, dest);
     }
   }
@@ -331,7 +350,7 @@ export class Electron {
     }
   }
 
-  private async _runElectronBuilder(srcPath: string): Promise<void> {
+  private async _runElectronBuilder(): Promise<void> {
     if (!Electron._canCreateSymlink()) {
       throw new Error(
         "Symlink 생성 권한이 필요합니다. Windows 개발자 모드를 활성화하세요.",
@@ -349,7 +368,7 @@ export class Electron {
       },
       nsis: this._config.nsisOptions ?? {},
       directories: {
-        app: srcPath,
+        app: this._srcPath,
         output: distPath,
       },
       removePackageScripts: false,
@@ -366,9 +385,9 @@ export class Electron {
 
     Electron._logger.debug(`electron-builder 설정: ${configFilePath}`);
     await this._exec(
-      this._localBin("electron-builder"),
-      ["--win", "--config", configFilePath],
-      this._pkgPath,
+      "pnpm",
+      ["exec", "electron-builder", "--win", "--config", configFilePath],
+      this._srcPath,
     );
   }
 

package/src/engines/BaseEngine.ts

@@ -112,7 +112,7 @@ export abstract class BaseEngine<
     logger.debug(`[${this._pkg.name}] run 시작 (js: ${output.js}, dts: ${output.dts}, env: ${output.env ?? "none"})`);
     this._createWorker();
     const result = await this._callBuild(output);
-    logger.debug(`[${this._pkg.name}] run 완료 (success: ${result.success})`);
+    logger.debug(`[${this._pkg.name}] run 완료 (success: ${result.build.success})`);
     return result;
   }
 

package/src/engines/NgtscEngine.ts

@@ -53,7 +53,6 @@ export class NgtscEngine extends BaseEngine<
     });
 
     return {
-      success: result.build.success,
       build: {
         success: result.build.success,
         errors: result.build.errors ?? [],

package/src/engines/ServerEsbuildEngine.ts

@@ -58,7 +58,6 @@ export class ServerEsbuildEngine extends BaseEngine<
     });
 
     return {
-      success: result.build.success,
       build: {
         success: result.build.success,
         errors: result.build.errors ?? [],

package/src/engines/TscEngine.ts

@@ -54,7 +54,6 @@ export class TscEngine extends BaseEngine<
     });
 
     return {
-      success: result.build.success,
       build: {
         success: result.build.success,
         errors: result.build.errors ?? [],

package/src/engines/ViteEngine.ts

@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import path from "path";
 import { Worker, type WorkerProxy } from "@simplysm/core-node";
 import { consola } from "consola";
 import type * as ClientWorkerModule from "../workers/client.worker";
@@ -81,7 +83,6 @@ export class ViteEngine implements BuildEngine {
 
     logger.debug(`[${this._pkg.name}] ViteEngine.run 완료 (success: ${result.success})`);
     return {
-      success: result.success,
       build: {
         success: result.success,
         errors: result.errors ?? [],
@@ -196,6 +197,11 @@ export class ViteEngine implements BuildEngine {
    */
   async stop(): Promise<void> {
     logger.debug(`[${this._pkg.name}] ViteEngine stop 시작`);
+
+    // .dev-port 파일 삭제
+    const portFile = path.join(this._pkg.dir, "dist", ".dev-port");
+    try { fs.unlinkSync(portFile); } catch { /* 파일 없으면 무시 */ }
+
     await stopEngineWorker(this._worker, this._isWatchMode);
     this._worker = undefined;
     logger.debug(`[${this._pkg.name}] ViteEngine stop 완료`);

package/src/engines/index.ts

@@ -10,16 +10,6 @@ import type { BuildEngine, BuildPackageInfo, ClientPackageInfo, ServerPackageInf
 
 const logger = consola.withTag("sd:cli:engine");
 
-export { BaseEngine } from "./BaseEngine";
-export type { BaseEngineOptions, CommonBuildWorkerEvents, CommonBuildWorkerModule } from "./BaseEngine";
-export { NgtscEngine } from "./NgtscEngine";
-export type { NgtscEngineOptions } from "./NgtscEngine";
-export { ServerEsbuildEngine } from "./ServerEsbuildEngine";
-export type { ServerEsbuildEngineOptions } from "./ServerEsbuildEngine";
-export { TscEngine } from "./TscEngine";
-export type { TscEngineOptions } from "./TscEngine";
-export { ViteEngine } from "./ViteEngine";
-export type { ViteEngineOptions } from "./ViteEngine";
 export type { BuildEngine, BuildOutput, BuildPackageInfo, ClientPackageInfo, EngineResult, PackageInfo, ServerPackageInfo } from "./types";
 
 /**

package/src/engines/types.ts

@@ -45,7 +45,6 @@ export interface BuildOutput {
  * BuildEngine.run() 반환값
  */
 export interface EngineResult {
-  success: boolean;
   build: {
     success: boolean;
     errors: string[];

package/src/infra/SignalHandler.ts

@@ -7,7 +7,6 @@
 export class SignalHandler {
   private _terminateResolver: (() => void) | null = null;
   private readonly _terminatePromise: Promise<void>;
-  private _terminated = false;
 
   constructor() {
     this._terminatePromise = new Promise((resolve) => {
@@ -17,8 +16,8 @@ export class SignalHandler {
     const handler = () => {
       process.off("SIGINT", handler);
       process.off("SIGTERM", handler);
-      this._terminated = true;
       this._terminateResolver?.();
+      this._terminateResolver = null;
     };
 
     process.on("SIGINT", handler);
@@ -32,21 +31,12 @@ export class SignalHandler {
     return this._terminatePromise;
   }
 
-  /**
-   * 종료 여부를 확인한다
-   */
-  isTerminated(): boolean {
-    return this._terminated;
-  }
-
   /**
    * 프로그래밍 방식으로 종료를 요청한다
-   * (테스트나 외부에서 종료를 트리거할 때 사용)
+   * (테스트에서 종료를 트리거할 때 사용)
    */
   requestTermination(): void {
-    if (!this._terminated) {
-      this._terminated = true;
-      this._terminateResolver?.();
-    }
+    this._terminateResolver?.();
+    this._terminateResolver = null;
   }
 }

package/src/orchestrators/BuildOrchestrator.ts

@@ -200,8 +200,8 @@ export class BuildOrchestrator {
 
     // 결과 수집
     const results: BuildStepResult[] = [];
-    // 에러 추적 (콜백에서 변경 추적을 위해 객체로 래핑)
-    const state = { hasError: false };
+    // results에 포함되지 않는 에러 추적 (네이티브 빌드 실패, rejected 태스크 등)
+    let hasUntrackedError = false;
 
     // 파일 캐시 (진단 출력용)
     const fileCache = new Map<string, string>();
@@ -249,7 +249,6 @@ export class BuildOrchestrator {
             warnings: engineResult.build.warnings.length > 0 ? engineResult.build.warnings : undefined,
             diagnostics,
           });
-          if (!engineResult.build.success) state.hasError = true;
 
         } finally {
           await engine.stop();
@@ -289,7 +288,6 @@ export class BuildOrchestrator {
             warnings: engineResult.build.warnings.length > 0 ? engineResult.build.warnings : undefined,
             diagnostics,
           });
-          if (!engineResult.build.success) state.hasError = true;
 
         } finally {
           await engine.stop();
@@ -327,7 +325,6 @@ export class BuildOrchestrator {
             warnings: engineResult.build.warnings.length > 0 ? engineResult.build.warnings : undefined,
             diagnostics,
           });
-          if (!engineResult.build.success) state.hasError = true;
 
           // 네이티브 빌드 (빌드 성공 시에만 실행)
           if (engineResult.build.success) {
@@ -362,7 +359,7 @@ export class BuildOrchestrator {
               const nativeResults = await Promise.allSettled(nativeBuildPromises);
               for (const nativeResult of nativeResults) {
                 if (nativeResult.status === "rejected") {
-                  state.hasError = true;
+                  hasUntrackedError = true;
                   const err = nativeResult.reason;
                   this._logger.error(
                     `[${name}] 네이티브 빌드 실패: ${err instanceof Error ? err.message : String(err)}`,
@@ -391,7 +388,7 @@ export class BuildOrchestrator {
         if (stack != null) {
           this._logger.debug(`빌드 예외 스택:\n${stack}`);
         }
-        state.hasError = true;
+        hasUntrackedError = true;
       }
     }
     this._logger.success("빌드 실행 완료");
@@ -429,13 +426,14 @@ export class BuildOrchestrator {
     // 최종 결과 로그
     const errorCount = results.filter((r) => !r.success).length;
     const warningCount = results.filter((r) => r.warnings != null).length;
-    if (state.hasError) {
+    const hasError = errorCount > 0 || hasUntrackedError;
+    if (hasError) {
       this._logger.error("빌드 에러 발생", { errorCount, warningCount });
     } else {
       this._logger.info("빌드 완료", { errorCount, warningCount });
     }
 
-    return state.hasError;
+    return hasError;
   }
 
   /**

package/src/orchestrators/DevWatchOrchestrator.ts

@@ -156,15 +156,11 @@ export class DevWatchOrchestrator {
     this._resultCollector = new ResultCollector();
     this._rebuildManager = new RebuildManager(this._logger);
 
-    // 배치 완료 핸들러
+    // 배치 완료 핸들러 (watch 모드만 여기서 등록, dev 모드는 _startDevMode() 끝에서 등록)
     if (this._options.mode === "watch") {
       this._rebuildManager.on("batchComplete", (_completedKeys) => {
         printErrors(this._resultCollector.toMap());
       });
-    } else {
-      this._rebuildManager.on("batchComplete", (completedKeys) => {
-        this._onDevBatchComplete(completedKeys);
-      });
     }
 
     // 라이브러리 패키지용 BuildEngine 생성 (watch 모드 전용)
@@ -418,9 +414,26 @@ export class DevWatchOrchestrator {
       }
     }
 
-    // Print initial results
-    printErrors(this._resultCollector.toMap());
-    printServers(this._resultCollector.toMap(), this._serverClientsMap);
+    // 모든 엔진 준비 완료 후 서버 런타임 시작 (클라이언트 포트 확보 보장)
+    await this._restartServers();
+
+    // 독립 클라이언트만 존재하고 서버가 없는 경우 URL 출력 예약
+    if (this._serverPackages.length === 0) {
+      const hasIndependentClients = this._clientPackages.some(({ name }) => {
+        const isServerConnected = [...this._serverClientsMap.values()].some(
+          (clients) => clients.includes(name),
+        );
+        return !isServerConnected && this._getClientPort(name) != null;
+      });
+      if (hasIndependentClients) {
+        this._schedulePrintServers();
+      }
+    }
+
+    // dev 모드 배치 완료 핸들러 등록 (이후 watch 이벤트용)
+    this._rebuildManager.on("batchComplete", (completedKeys) => {
+      this._onDevBatchComplete(completedKeys);
+    });
   }
 
   private _onDevBatchComplete(completedKeys: string[]): void {
@@ -464,7 +477,6 @@ export class DevWatchOrchestrator {
     await Promise.all(restartPromises);
     this._logger.debug("서버 재시작 완료");
     printErrors(this._resultCollector.toMap());
-    this._schedulePrintServers();
   }
 
   private _schedulePrintServers(): void {

package/src/sd-cli-entry.ts

@@ -2,10 +2,10 @@
 /* eslint-disable no-console */
 
 // 사이드 이펙트: Map/Array prototype 확장 (getOrCreate 등)
-import "@simplysm/core-common";
+import { env } from "@simplysm/core-common";
 import yargs, { type Argv } from "yargs";
 import { hideBin } from "yargs/helpers";
-import { runCheck, type CheckType } from "./commands/check";
+import { type CheckType, runCheck } from "./commands/check";
 import { runWatch } from "./commands/watch";
 import { runDev } from "./commands/dev";
 import { runBuild } from "./commands/build";
@@ -15,14 +15,12 @@ import path from "path";
 import fs from "fs";
 import { fileURLToPath } from "url";
 import { EventEmitter } from "node:events";
-import { consola, LogLevels } from "consola";
-import { SdCliReporter } from "./utils/SdCliReporter";
+import { consola } from "consola";
+import { setupConsola } from "@simplysm/core-node";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 100;
 
-consola.options.reporters = [new SdCliReporter()];
-
 const COMMAND_NAMES = ["check", "watch", "dev", "device", "build", "publish", "replace-deps"];
 
 async function collectYargsHelp(argv: string[]): Promise<string> {
@@ -36,7 +34,6 @@ async function collectYargsHelp(argv: string[]): Promise<string> {
   } catch {
     // yargs가 help 출력 후 throw할 수 있음
   } finally {
-  
     console.log = orig;
   }
   return lines.join("\n");
@@ -58,9 +55,9 @@ export function createCliParser(argv: string[]): Argv {
       async () => {
         for (const cmdName of COMMAND_NAMES) {
           const helpText = await collectYargsHelp([cmdName, "--help"]);
-        
+
           console.log(helpText);
-        
+
           console.log();
         }
       },
@@ -78,9 +75,9 @@ export function createCliParser(argv: string[]): Argv {
     })
     .middleware((args) => {
       if (args.debug) {
-        consola.level = LogLevels.debug;
-        process.env["SD_DEBUG"] = "true";
+        env("SD_DEBUG", "true");
       }
+      setupConsola({ cli: true });
     })
     .command(
       "check [targets..]",
@@ -113,9 +110,7 @@ export function createCliParser(argv: string[]): Argv {
           types: (() => {
             const validTypes = ["typecheck", "lint", "test"] as const;
             const types = args.type.split(",").map((t) => t.trim());
-            const invalidTypes = types.filter(
-              (t) => !validTypes.includes(t as CheckType),
-            );
+            const invalidTypes = types.filter((t) => !validTypes.includes(t as CheckType));
             if (invalidTypes.length > 0) {
               throw new Error(
                 `Invalid check type(s): ${invalidTypes.join(", ")}. Valid types: ${validTypes.join(", ")}`,
@@ -197,11 +192,11 @@ export function createCliParser(argv: string[]): Argv {
             describe: "Client package to run (e.g., my-client-app)",
           })
           .options({
-            "url": {
+            url: {
               type: "string",
               description: "Dev server URL (auto-detected from sd.config.ts if omitted)",
             },
-            "opt": {
+            opt: {
               type: "string",
               array: true,
               alias: "o",

package/src/sd-config.types.ts

@@ -1,3 +1,14 @@
+/** npm package.json 구조 */
+export interface NpmConfig {
+  name: string;
+  version: string;
+  description?: string;
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+  peerDependencies?: Record<string, string>;
+  volta?: unknown;
+}
+
 /**
  * 빌드 타겟 타입 (esbuild로 빌드)
  * - node: Node.js 전용 패키지
@@ -169,7 +180,7 @@ export interface SdElectronConfig {
 //#region PWA 설정 타입
 
 /**
- * PWA manifest 설정 (VitePWA manifest 옵션의 서브셋)
+ * PWA manifest 설정
  */
 export interface SdPwaManifestConfig {
   name?: string;