@simplysm/sd-cli 7.0.25 → 7.0.39

package/src/entry-points/SdCliWorkspace.ts

@@ -9,6 +9,8 @@ import semver from "semver/preload";
 import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
 import { SdServiceServer } from "@simplysm/sd-service/server";
 import { SdCliNpm } from "./SdCliNpm";
+import { SdCliLocalUpdate } from "./SdCliLocalUpdate";
+import { NextHandleFunction } from "connect";
 
 export class SdCliWorkspace {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
@@ -25,6 +27,11 @@ export class SdCliWorkspace {
     this._logger.debug("프로젝트 설정 가져오기...");
     const config = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), true, opt.optNames);
 
+    if (config.localUpdates) {
+      this._logger.debug("로컬 라이브러리 업데이트 변경감지 시작...");
+      await new SdCliLocalUpdate(this._rootPath).watchAsync({ confFileRelPath: opt.confFileRelPath });
+    }
+
     this._logger.debug("패키지 목록 구성...");
     const pkgs = await this._getPackagesAsync(config);
 
@@ -41,11 +48,7 @@ export class SdCliWorkspace {
           this._logger.debug(`[${pkg.name}] 빌드를 시작합니다...`);
         })
         .on("complete", async (results) => {
-          if (pkg.type === "server") {
-            if (results.some((item) => item.severity === "error")) {
-              return;
-            }
-
+          if (pkg.config.type === "server" && !results.some((item) => item.severity === "error")) {
             await this._restartServerAsync(pkg);
           }
 
@@ -56,6 +59,7 @@ export class SdCliWorkspace {
             changeCount--;
             if (changeCount === 0) {
               this._loggingResults(totalResultMap);
+              this._loggingOpenClientHrefs();
               this._logger.info("모든 빌드가 완료되었습니다.");
             }
           }, 500);
@@ -67,7 +71,16 @@ export class SdCliWorkspace {
     const buildCompletedPackageNames: string[] = [];
     await pkgs.parallelAsync(async (pkg) => {
       await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
-      await pkg.watchAsync();
+      if (pkg.config.type === "client") {
+        const middlewares = (await pkg.watchAsync()) as NextHandleFunction[];
+
+        const serverInfo = this._serverInfoMap.getOrCreate(pkg.config.server, { middlewares: [], clientInfos: [] });
+        serverInfo.middlewares.push(...middlewares);
+        serverInfo.clientInfos.push({ pkgKey: pkg.name.split("/").last()! });
+      }
+      else {
+        await pkg.watchAsync();
+      }
       buildCompletedPackageNames.push(pkg.name);
     });
   }
@@ -81,21 +94,26 @@ export class SdCliWorkspace {
     const entryFilePath = path.resolve(pkg.rootPath, entryFileRelPath);
 
     this._logger.log(`서버(${pkg.name}) 재시작...`);
-    const serverInfo = this._serverInfoMap.getOrCreate(pkg.name, {});
-    if (serverInfo.server) {
-      await serverInfo.server.closeAsync();
-      delete serverInfo.server;
-    }
-
-    serverInfo.server = (await import("file:///" + entryFilePath + "?update=" + Uuid.new().toString())).default as SdServiceServer | undefined;
-    if (!serverInfo.server) {
-      this._logger.error(`${entryFilePath}(0, 0): 'SdServiceServer'를 'export'해야 합니다.`);
-      return;
-    }
+    try {
+      const serverInfo = this._serverInfoMap.getOrCreate(pkg.name, { middlewares: [], clientInfos: [] });
+      if (serverInfo.server) {
+        await serverInfo.server.closeAsync();
+        delete serverInfo.server;
+      }
 
-    await Wait.until(() => serverInfo.server!.isOpen);
+      serverInfo.server = (await import("file:///" + entryFilePath + "?update=" + Uuid.new().toString())).default as SdServiceServer | undefined;
+      if (!serverInfo.server) {
+        this._logger.error(`${entryFilePath}(0, 0): 'SdServiceServer'를 'export'해야 합니다.`);
+        return;
+      }
+      serverInfo.server.devMiddlewares = serverInfo.middlewares;
+      await Wait.until(() => serverInfo.server!.isOpen);
 
-    this._logger.log(`서버(${pkg.name}) 재시작 완료`);
+      this._logger.log(`서버(${pkg.name}) 재시작 완료`);
+    }
+    catch (err) {
+      this._logger.error(`서버(${pkg.name}) 재시작중 오류 발생`, err);
+    }
   }
 
   public async buildAsync(opt: { confFileRelPath: string; optNames: string[] }): Promise<void> {
@@ -148,9 +166,9 @@ export class SdCliWorkspace {
     // GIT 사용중일 경우, 커밋되지 않은 수정사항이 있는지 확인
     if (FsUtil.exists(path.resolve(process.cwd(), ".git"))) {
       this._logger.debug("GIT 커밋여부 확인...");
-      const gitStatusResult = await SdProcess.execAsync("git status");
+      const gitStatusResult = await SdProcess.spawnAsync("git status");
       if (gitStatusResult.includes("Changes") || gitStatusResult.includes("Untracked")) {
-        throw new Error("커밋되지 않은 정보가 있습니다.");
+        throw new Error("커밋되지 않은 정보가 있습니다.\n" + gitStatusResult);
       }
     }
 
@@ -172,9 +190,9 @@ export class SdCliWorkspace {
     // GIT 사용중일경우, 새 버전 커밋 및 TAG 생성
     if (FsUtil.exists(path.resolve(process.cwd(), ".git"))) {
       this._logger.debug("새 버전 커밋 및 TAG 생성...");
-      await SdProcess.execAsync("git add .");
-      await SdProcess.execAsync(`git commit -m "v${this._npmConfig.version}"`);
-      await SdProcess.execAsync(`git tag -a "v${this._npmConfig.version}" -m "v${this._npmConfig.version}"`);
+      await SdProcess.spawnAsync("git add .");
+      await SdProcess.spawnAsync(`git commit -m "v${this._npmConfig.version}"`);
+      await SdProcess.spawnAsync(`git tag -a "v${this._npmConfig.version}" -m "v${this._npmConfig.version}"`);
     }
 
     this._logger.debug("배포 시작...");
@@ -220,7 +238,7 @@ export class SdCliWorkspace {
       if (i !== sec) {
         process.stdout.cursorTo(0);
       }
-      process.stdout.write(msg + " " + i);
+      process.stdout.write(`${msg} ${i}`);
       await Wait.time(1000);
     }
 
@@ -246,7 +264,7 @@ export class SdCliWorkspace {
         pkgName: item[0],
         ...item1
       })))
-      .orderBy((item) => item.pkgName + "_" + item.filePath);
+      .orderBy((item) => `${item.pkgName}_${item.filePath}`);
 
     const warnings = totalResults
       .filter((item) => item.severity === "warning")
@@ -272,8 +290,29 @@ export class SdCliWorkspace {
       this._logger.warn(`경고: ${warnings.length}건, 오류: ${errors.length}건`);
     }
   }
+
+  private _loggingOpenClientHrefs(): void {
+    const clientHrefs: string[] = [];
+
+    const serverInfos = Array.from(this._serverInfoMap.values());
+    for (const serverInfo of serverInfos) {
+      if (!serverInfo.server) continue;
+
+      const protocolStr = serverInfo.server.options.ssl ? "https" : "http";
+      const portStr = serverInfo.server.options.port.toString();
+
+      for (const clientInfo of serverInfo.clientInfos) {
+        clientHrefs.push(`${protocolStr}://localhost:${portStr}/${clientInfo.pkgKey}/`);
+      }
+    }
+    if (clientHrefs.length > 0) {
+      this._logger.log(`오픈된 클라이언트: ${clientHrefs.join(", ")}`);
+    }
+  }
 }
 
 interface IServerInfo {
   server?: SdServiceServer;
+  middlewares: NextHandleFunction[];
+  clientInfos: { pkgKey: string }[];
 }

package/src/packages/SdCliPackage.ts

@@ -6,6 +6,9 @@ import { ObjectUtil } from "@simplysm/sd-core-common";
 import { SdCliTsLibBuilder } from "../builder/SdCliTsLibBuilder";
 import { SdCliJsLibBuilder } from "../builder/SdCliJsLibBuilder";
 import { SdCliServerBuilder } from "../builder/SdCliServerBuilder";
+import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
+import { SdCliClientBuilder } from "../builder/SdCliClientBuilder";
+import { NextHandleFunction } from "connect";
 
 export class SdCliPackage extends EventEmitter {
   private readonly _npmConfig: INpmConfig;
@@ -22,22 +25,16 @@ export class SdCliPackage extends EventEmitter {
     return this._npmConfig.main;
   }
 
-  public get type(): TSdCliPackageConfig["type"] {
-    return this._config.type;
-  }
-
   public get allDependencies(): string[] {
     return [
-      ...Object.keys(this._npmConfig.dependencies ?? {}),
-      ...Object.keys(this._npmConfig.optionalDependencies ?? {}),
-      // ...Object.keys(this._npmConfig.devDependencies ?? {}),
-      ...Object.keys(this._npmConfig.peerDependencies ?? {})
+      ...SdCliNpmConfigUtil.getDependencies(this._npmConfig).defaults,
+      ...SdCliNpmConfigUtil.getDependencies(this._npmConfig).optionals
     ].distinct();
   }
 
   public constructor(private readonly _workspaceRootPath: string,
                      public readonly rootPath: string,
-                     private readonly _config: TSdCliPackageConfig) {
+                     public readonly config: TSdCliPackageConfig) {
     super();
 
     const npmConfigFilePath = path.resolve(this.rootPath, "package.json");
@@ -70,8 +67,8 @@ export class SdCliPackage extends EventEmitter {
     await FsUtil.writeJsonAsync(npmConfigFilePath, this._npmConfig, { space: 2 });
   }
 
-  public async watchAsync(): Promise<void> {
-    await (await this._createBuilderAsync())
+  public async watchAsync(): Promise<NextHandleFunction[] | void> {
+    return await (await this._createBuilderAsync())
       .on("change", () => {
         this.emit("change");
       })
@@ -86,24 +83,27 @@ export class SdCliPackage extends EventEmitter {
   }
 
   public async publishAsync(): Promise<void> {
-    if (this._config.type === "library" && this._config.publish === "npm") {
-      await SdProcess.execAsync("npm publish --quiet --access public", { cwd: this.rootPath });
+    if (this.config.type === "library" && this.config.publish === "npm") {
+      await SdProcess.spawnAsync("npm publish --quiet --access public", { cwd: this.rootPath });
     }
   }
 
-  private async _createBuilderAsync(): Promise<SdCliJsLibBuilder | SdCliTsLibBuilder | SdCliServerBuilder> {
+  private async _createBuilderAsync(): Promise<SdCliJsLibBuilder | SdCliTsLibBuilder | SdCliServerBuilder | SdCliClientBuilder> {
     const isTs = FsUtil.exists(path.resolve(this.rootPath, "tsconfig.json"));
 
     if (isTs) {
       await this._genBuildTsconfigAsync();
     }
 
-    if (this._config.type === "library") {
-      const isAngular = isTs && this.allDependencies.includes("@angular/core");
-      return isTs ? new SdCliTsLibBuilder(this.rootPath, isAngular) : new SdCliJsLibBuilder(this.rootPath);
+    if (this.config.type === "library") {
+      // const isAngular = isTs && this.allDependencies.includes("@angular/core");
+      return isTs ? new SdCliTsLibBuilder(this.rootPath) : new SdCliJsLibBuilder(this.rootPath);
+    }
+    else if (this.config.type === "server") {
+      return new SdCliServerBuilder(this.rootPath, this.config, this._workspaceRootPath);
     }
     else {
-      return new SdCliServerBuilder(this.rootPath, this._config, this._workspaceRootPath);
+      return new SdCliClientBuilder(this.rootPath, this.config, this._workspaceRootPath);
     }
   }
 

package/src/utils/SdCliBuildResultUtil.ts

@@ -11,7 +11,7 @@ export class SdCliBuildResultUtil {
         : undefined;
     if (!severity) return undefined;
 
-    const code = "TS" + diag.code;
+    const code = `TS${diag.code}`;
     const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
 
 
@@ -47,11 +47,10 @@ export class SdCliBuildResultUtil {
   }
 
   private static _convertFromWebpackError(severity: "warning" | "error", err: webpack.WebpackError): ISdCliPackageBuildResult {
-    console.log(err);
     return {
       filePath: err.file,
-      line: err.loc["start"].line,
-      char: err.loc["start"].column,
+      line: err.file ? err.loc["start"]?.line : undefined,
+      char: err.file ? err.loc["start"]?.column : undefined,
       code: err.name,
       severity,
       message: err.message

package/src/utils/SdCliNpmConfigUtil.ts

@@ -0,0 +1,16 @@
+import { INpmConfig } from "../commons";
+
+export class SdCliNpmConfigUtil {
+  public static getDependencies(npmConfig: INpmConfig): { defaults: string[]; optionals: string[] } {
+    return {
+      defaults: [
+        ...Object.keys(npmConfig.dependencies ?? {}),
+        ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item].optional)
+      ].distinct(),
+      optionals: [
+        ...Object.keys(npmConfig.optionalDependencies ?? {}),
+        ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item].optional)
+      ].distinct()
+    };
+  }
+}

package/tsconfig.json

@@ -14,7 +14,7 @@
         "../sd-core-common/src/index.ts"
       ],
       "@simplysm/sd-service/server": [
-        "../sd-service/src/server.ts"
+        "../sd-service/src/server/index.ts"
       ]
     }
   }