@lage-run/cli 0.23.5 → 0.23.6

package/CHANGELOG.json

@@ -2,7 +2,28 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Thu, 10 Oct 2024 20:14:49 GMT",
+      "date": "Fri, 11 Oct 2024 22:09:05 GMT",
+      "version": "0.23.6",
+      "tag": "@lage-run/cli_v0.23.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "cd7a1ed3a889ba4f57205b9779eb292863685dec",
+            "comment": "moved the picker creation to be just once to be reused in a singletargetworker"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/reporters to v1.2.12",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 10 Oct 2024 20:14:59 GMT",
       "version": "0.23.5",
       "tag": "@lage-run/cli_v0.23.5",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,21 @@
 # Change Log - @lage-run/cli
 
-<!-- This log was last generated on Thu, 10 Oct 2024 20:14:49 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 11 Oct 2024 22:09:05 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 0.23.6
+
+Fri, 11 Oct 2024 22:09:05 GMT
+
+### Patches
+
+- moved the picker creation to be just once to be reused in a singletargetworker (kchau@microsoft.com)
+- Bump @lage-run/reporters to v1.2.12
+
 ## 0.23.5
 
-Thu, 10 Oct 2024 20:14:49 GMT
+Thu, 10 Oct 2024 20:14:59 GMT
 
 ### Patches
 

package/lib/commands/server/action.js

@@ -21,7 +21,8 @@ async function serverAction(options) {
     const { port =5332 , host ="localhost" , timeout =1  } = options;
     const logger = (0, _logger.default)();
     options.logLevel = options.logLevel ?? "info";
-    options.reporter = options.reporter ?? "json";
+    options.logFile = options.logFile ?? "node_modules/.cache/lage/server.log";
+    options.reporter = options.reporter ?? "verboseFileLog";
     (0, _initializeReporters.initializeReporters)(logger, options);
     logger.info(`Starting server on http://${host}:${port}`);
     const abortController = new AbortController();

package/lib/commands/server/lageService.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="node" />
 import type { Logger } from "@lage-run/logger";
 import type { ILageService } from "@lage-run/rpc";
+interface ServiceControls {
+    abortController: AbortController;
+    countdownToShutdown: () => void;
+    clearCountdown: () => void;
+}
 export declare function createLageService({ cwd, serverControls, logger, maxWorkers, }: {
     cwd: string;
-    serverControls: {
-        abortController: AbortController;
-        countdownToShutdown: () => void;
-        clearCountdown: () => void;
-    };
+    serverControls: ServiceControls;
     logger: Logger;
     maxWorkers?: number;
 }): Promise<ILageService>;
+export {};

package/lib/commands/server/lageService.js

@@ -36,7 +36,7 @@ let initializedPromise;
  * @param cwd
  * @param logger
  * @returns
- */ async function initialize(cwd, logger) {
+ */ async function initialize({ cwd , logger , serverControls , nodeArg , taskArgs , maxWorkers  }) {
     if (initializedPromise) {
         return await initializedPromise;
     }
@@ -72,31 +72,41 @@ let initializedPromise;
         });
         logger.info("Initializing Package Tree");
         await packageTree.initialize();
+        const pool = new _workerthreadspool.WorkerPool({
+            script: require.resolve("./singleTargetWorker.js"),
+            maxWorkers,
+            workerOptions: {
+                stderr: true,
+                stdout: true,
+                workerData: {
+                    runners: {
+                        ...(0, _runnerPickerOptions.runnerPickerOptions)(nodeArg, config.npmClient, taskArgs),
+                        ...config.runners
+                    }
+                }
+            }
+        });
+        serverControls.abortController.signal.addEventListener("abort", ()=>{
+            pool?.close();
+        });
+        pool?.on("idle", ()=>{
+            logger.info("All workers are idle, shutting down after timeout");
+            serverControls.countdownToShutdown();
+        });
         return {
             config,
             targetGraph,
             packageTree,
             dependencyMap,
-            root
+            root,
+            pool
         };
     }
     initializedPromise = createInitializedPromise();
     return await initializedPromise;
 }
-let pool;
 async function createLageService({ cwd , serverControls , logger , maxWorkers  }) {
     logger.info(`Server started with ${maxWorkers} workers`);
-    pool = new _workerthreadspool.WorkerPool({
-        script: require.resolve("./singleTargetWorker.js"),
-        maxWorkers
-    });
-    serverControls.abortController.signal.addEventListener("abort", ()=>{
-        pool?.close();
-    });
-    pool?.on("idle", ()=>{
-        logger.info("All workers are idle, shutting down after timeout");
-        serverControls.countdownToShutdown();
-    });
     return {
         async ping () {
             return {
@@ -105,7 +115,17 @@ async function createLageService({ cwd , serverControls , logger , maxWorkers  }
         },
         async runTarget (request) {
             serverControls.clearCountdown();
-            const { config , targetGraph , dependencyMap , packageTree , root  } = await initialize(cwd, logger);
+            // THIS IS A BIG ASSUMPTION; TODO: memoize based on the parameters of the initialize() call
+            // The first request sets up the nodeArg and taskArgs - we are assuming that all requests to run this target are coming from the same
+            // `lage info` call
+            const { config , targetGraph , dependencyMap , packageTree , root , pool  } = await initialize({
+                cwd,
+                logger,
+                nodeArg: request.nodeOptions,
+                taskArgs: request.taskArgs,
+                serverControls,
+                maxWorkers
+            });
             logger.info("Running target", request);
             const runners = (0, _runnerPickerOptions.runnerPickerOptions)(request.nodeOptions, config.npmClient, request.taskArgs);
             const id = (0, _targetgraph.getTargetId)(request.packageName, request.task);

package/lib/commands/server/singleTargetWorker.js

@@ -4,10 +4,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 const _workerthreadspool = require("@lage-run/worker-threads-pool");
 const _runners = require("@lage-run/runners");
+const _worker_threads = require("worker_threads");
+async function setup(options) {
+    const { runners  } = options;
+    const runnerPicker = new _runners.TargetRunnerPicker(runners);
+    return {
+        options,
+        runnerPicker
+    };
+}
 (async ()=>{
+    const { runnerPicker  } = await setup(_worker_threads.workerData);
     async function run(data, abortSignal) {
         let value = undefined;
-        const runnerPicker = new _runners.TargetRunnerPicker(data.runners);
         const runner = await runnerPicker.pick(data.target);
         value = await runner.run({
             target: data.target,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.23.5",
+  "version": "0.23.6",
   "description": "Command Line Interface for Lage",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@lage-run/globby": "^14.2.0",
     "@lage-run/hasher": "^1.6.0",
     "@lage-run/logger": "^1.3.1",
-    "@lage-run/reporters": "^1.2.11",
+    "@lage-run/reporters": "^1.2.12",
     "@lage-run/rpc": "^1.2.3",
     "@lage-run/runners": "^1.0.3",
     "@lage-run/scheduler": "^1.3.3",