@simplysm/sd-cli 11.1.44 → 11.1.45

package/src/build-cluster.ts

@@ -50,140 +50,146 @@ else {
   const message = JSON.parse(process.env["SD_CLUSTER_MESSAGE"]!) as ISdCliBuildClusterReqMessage;
   const pkgConf = message.projConf.packages[path.basename(message.pkgPath)]!;
 
-  if (message.cmd === "watch") {
-    // [library] javascript
-    if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      await new SdCliJsLibLinter(message.pkgPath)
-        .on("change", () => {
-          sendMessage({
-            type: "change",
-            req: message
-          });
-        })
-        .on("complete", (result) => {
-          sendMessage({
-            type: "complete",
-            result,
-            req: message
-          });
-        })
-        .watchAsync();
+  try {
+    if (message.cmd === "watch") {
+      // [library] javascript
+      if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+        await new SdCliJsLibLinter(message.pkgPath)
+          .on("change", () => {
+            sendMessage({
+              type: "change",
+              req: message
+            });
+          })
+          .on("complete", (result) => {
+            sendMessage({
+              type: "complete",
+              result,
+              req: message
+            });
+          })
+          .watchAsync();
 
-      sendMessage({
-        type: "ready",
-        req: message
-      });
+        sendMessage({
+          type: "ready",
+          req: message
+        });
+      }
+      // [library] typescript
+      else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+        await new SdCliTsLibBuilder(message.projConf, message.pkgPath)
+          .on("change", () => {
+            sendMessage({
+              type: "change",
+              req: message
+            });
+          })
+          .on("complete", (result) => {
+            sendMessage({
+              type: "complete",
+              result,
+              req: message
+            });
+          })
+          .watchAsync();
+        sendMessage({
+          type: "ready",
+          req: message
+        });
+      }
+      // [server]
+      else if (pkgConf.type === "server") {
+        await new SdCliServerBuilder(message.projConf, message.pkgPath)
+          .on("change", () => {
+            sendMessage({
+              type: "change",
+              req: message
+            });
+          })
+          .on("complete", (result) => {
+            sendMessage({
+              type: "complete",
+              result,
+              req: message
+            });
+          })
+          .watchAsync();
+        sendMessage({
+          type: "ready",
+          req: message
+        });
+      }
+      // [client]
+      else if (pkgConf.type === "client") {
+        await new SdCliClientBuilder(message.projConf, message.pkgPath)
+          .on("change", () => {
+            sendMessage({
+              type: "change",
+              req: message
+            });
+          })
+          .on("complete", (result) => {
+            sendMessage({
+              type: "complete",
+              result,
+              req: message
+            });
+          })
+          .watchAsync();
+        sendMessage({
+          type: "ready",
+          req: message
+        });
+      }
+      else {
+        throw new NeverEntryError();
+      }
     }
-    // [library] typescript
-    else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      await new SdCliTsLibBuilder(message.projConf, message.pkgPath)
-        .on("change", () => {
-          sendMessage({
-            type: "change",
-            req: message
-          });
-        })
-        .on("complete", (result) => {
-          sendMessage({
-            type: "complete",
-            result,
-            req: message
-          });
-        })
-        .watchAsync();
-      sendMessage({
-        type: "ready",
-        req: message
-      });
-    }
-    // [server]
-    else if (pkgConf.type === "server") {
-      await new SdCliServerBuilder(message.projConf, message.pkgPath)
-        .on("change", () => {
-          sendMessage({
-            type: "change",
-            req: message
-          });
-        })
-        .on("complete", (result) => {
-          sendMessage({
-            type: "complete",
-            result,
-            req: message
-          });
-        })
-        .watchAsync();
-      sendMessage({
-        type: "ready",
-        req: message
-      });
-    }
-    // [client]
-    else if (pkgConf.type === "client") {
-      await new SdCliClientBuilder(message.projConf, message.pkgPath)
-        .on("change", () => {
-          sendMessage({
-            type: "change",
-            req: message
-          });
-        })
-        .on("complete", (result) => {
-          sendMessage({
-            type: "complete",
-            result,
-            req: message
-          });
-        })
-        .watchAsync();
-      sendMessage({
-        type: "ready",
-        req: message
-      });
-    }
-    else {
-      throw new NeverEntryError();
+    else { // build
+      // [library] javascript
+      if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+        const result = await new SdCliJsLibLinter(message.pkgPath).buildAsync();
+        sendMessage({
+          type: "complete",
+          result,
+          req: message
+        });
+      }
+      // [library] typescript
+      else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+        const result = await new SdCliTsLibBuilder(message.projConf, message.pkgPath).buildAsync();
+        sendMessage({
+          type: "complete",
+          result,
+          req: message
+        });
+      }
+      // [server]
+      else if (pkgConf.type === "server") {
+        const result = await new SdCliServerBuilder(message.projConf, message.pkgPath).buildAsync();
+        sendMessage({
+          type: "complete",
+          result,
+          req: message
+        });
+      }
+      // [client]
+      else if (pkgConf.type === "client") {
+        const result = await new SdCliClientBuilder(message.projConf, message.pkgPath).buildAsync();
+        sendMessage({
+          type: "complete",
+          result,
+          req: message
+        });
+      }
+      else {
+        throw new NeverEntryError();
+      }
     }
   }
-  else { // build
-    // [library] javascript
-    if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      const result = await new SdCliJsLibLinter(message.pkgPath).buildAsync();
-      sendMessage({
-        type: "complete",
-        result,
-        req: message
-      });
-    }
-    // [library] typescript
-    else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      const result = await new SdCliTsLibBuilder(message.projConf, message.pkgPath).buildAsync();
-      sendMessage({
-        type: "complete",
-        result,
-        req: message
-      });
-    }
-    // [server]
-    else if (pkgConf.type === "server") {
-      const result = await new SdCliServerBuilder(message.projConf, message.pkgPath).buildAsync();
-      sendMessage({
-        type: "complete",
-        result,
-        req: message
-      });
-    }
-    // [client]
-    else if (pkgConf.type === "client") {
-      const result = await new SdCliClientBuilder(message.projConf, message.pkgPath).buildAsync();
-      sendMessage({
-        type: "complete",
-        result,
-        req: message
-      });
-    }
-    else {
-      throw new NeverEntryError();
-    }
+  catch (err) {
+    logger.error(`${message.pkgPath}:${message.cmd}`, err);
+    throw err;
   }
 }
 

package/src/builders/SdCliTsLibBuilder.ts

@@ -85,7 +85,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
     affectedFileSet: Set<string>;
     buildResults: ISdCliPackageBuildResult[];
   }> {
-    this._debug(`BUILD && CHECK...`);
+    this._debug(`BUILD & CHECK...`);
     this._builder = this._builder ?? new SdTsCompiler({
       pkgPath: this._pkgPath,
       emit: true,

package/src/entry/SdCliProject.ts

@@ -61,7 +61,7 @@ export class SdCliProject {
 
     logger.debug("빌드 프로세스 이벤트 준비...");
     const resultCache = new Map<string, ISdCliPackageBuildResult[]>();
-    let busyCount = 0;
+    let busyReqCntMap = new Map<string, number>();
     const serverInfoMap = new Map<string, {
       // server
       pkgOrOpt?: { path: string; conf: ISdCliServerPackageConfig } | { port: number }; // persist
@@ -76,10 +76,13 @@ export class SdCliProject {
     }>();
     cluster.on("message", (message: ISdCliBuildClusterResMessage) => {
       if (message.type === "change") {
-        if (busyCount === 0) {
+        if (Array.from(busyReqCntMap.values()).every(v => v === 0)) {
           logger.log("빌드를 시작합니다...");
         }
-        busyCount++;
+        busyReqCntMap.set(
+          message.req.cmd + "|" + message.req.pkgPath,
+          (busyReqCntMap.get(message.req.cmd + "|" + message.req.pkgPath) ?? 0) + 1
+        );
       }
       else if (message.type === "complete") {
         resultCache.delete("none");
@@ -149,8 +152,12 @@ export class SdCliProject {
         }
 
         setTimeout(async () => {
-          busyCount--;
-          if (busyCount === 0) {
+          busyReqCntMap.set(
+            message.req.cmd + "|" + message.req.pkgPath,
+            (busyReqCntMap.get(message.req.cmd + "|" + message.req.pkgPath) ?? 0) - 1
+          );
+          logger.debug("남아있는 예약 빌드", busyReqCntMap);
+          if (Array.from(busyReqCntMap.values()).every(v => v === 0)) {
             for (const serverPkgNameOrPort of serverInfoMap.keys()) {
               const serverInfo = serverInfoMap.get(serverPkgNameOrPort)!;
               if (serverInfo.pkgOrOpt && serverInfo.hasChanges) {
@@ -206,7 +213,10 @@ export class SdCliProject {
     });
 
     logger.debug("빌드 프로세스 명령 전송...");
-    busyCount++;
+    busyReqCntMap.set(
+      "all",
+      (busyReqCntMap.get("all") ?? 0) + 1
+    );
     logger.log("빌드를 시작합니다...");
 
     await pkgPaths.parallelAsync(async (pkgPath) => {
@@ -222,8 +232,11 @@ export class SdCliProject {
       }
     });
 
-    busyCount--;
-    if (busyCount === 0) {
+    busyReqCntMap.set(
+      "all",
+      (busyReqCntMap.get("all") ?? 0) - 1
+    );
+    if (Array.from(busyReqCntMap.values()).every(v => v === 0)) {
       const buildResults = Array.from(resultCache.values()).mapMany();
       this._logging(buildResults, logger);
     }