shift logs to logger

Author: jbolda

packages/server/bin/run-simulation-child.ts

@@ -8,7 +8,6 @@ import type {
 
 main(function* () {
   const args = process.argv.slice(2);
-  console.dir({ args });
   if (args.length < 1) {
     throw new Error("usage: run-simulation-child.js <modulePath>");
   }
@@ -59,7 +58,6 @@ main(function* () {
     console.log(out);
     yield* suspend();
   } finally {
-    console.log("shutting down gracefully...");
     try {
       if (listening && typeof listening.ensureClose === "function") {
         yield* until(listening.ensureClose());

packages/server/src/cli.ts

@@ -2,8 +2,8 @@ import { parseArgs } from "node:util";
 import { main, suspend, type Operation } from "effection";
 import type { ServiceGraph, ServiceDefinition } from "./services.ts";
 
-export function* simulationCLIOp<S extends Record<string, any>>(
-  serviceGraph: (subset?: string[] | string) => Operation<ServiceGraph<S>>
+export function* simulationCLIOp<S extends Record<string, any>, T = any>(
+  serviceGraph: (subset?: string[] | string) => Operation<ServiceGraph<S, T>>
 ) {
   try {
     const { values } = parseArgs({
@@ -20,7 +20,7 @@ export function* simulationCLIOp<S extends Record<string, any>>(
     });
 
     function* printUsage() {
-      console.log(
+      process.stdout.write(
         `Usage: cli [-s|--services serviceName] [--watch] [--watch-debounce ms]`
       );
     }

packages/server/src/services.ts

@@ -9,6 +9,7 @@ import {
 } from "effection";
 
 import { type ServiceUpdate, useWatcher } from "./watch.ts";
+import { stdout } from "./logging.ts";
 
 export type ServiceDefinition<
   S,
@@ -116,7 +117,7 @@ export function useServiceGraph<
         }
         effectiveServices = picked as typeof services;
 
-        console.log(
+        yield* stdout(
           `service graph: starting with services: ${Array.from(included).join(
             ", "
           )}`
@@ -217,7 +218,7 @@ export function useServiceGraph<
       try {
         for (let service of Object.keys(effectiveServices)) {
           yield* spawn(function* () {
-            console.log(`service graph: starting service '${service}'`);
+            yield* stdout(`service graph: starting service '${service}'`);
             yield* withRestarts(service);
           });
         }
@@ -229,7 +230,7 @@ export function useServiceGraph<
           servicePorts,
         });
       } finally {
-        console.log("shutting down service graph");
+        yield* stdout("shutting down service graph");
       }
     });
 }

packages/server/src/simulation.ts

@@ -23,13 +23,13 @@ export function useSimulation<L extends object = Record<string, unknown>>(
       createSim.listen()
     );
 
-    console.log(`${name} simulation started on port ${listening.port}`);
+    yield* stdout(`${name} simulation started on port ${listening.port}`);
 
     try {
       yield* provide(listening);
     } finally {
       yield* until(listening.ensureClose());
-      console.log(`${name} simulation closed on port ${listening.port}`);
+      yield* stdout(`${name} simulation closed on port ${listening.port}`);
     }
   });
 }
@@ -65,8 +65,6 @@ export function useChildSimulation<L extends object = Record<string, unknown>>(
       for (let line of yield* each(process.stdout)) {
         const buf = Buffer.from(line);
         const str = buf.toString();
-        console.log(`stdout: ${str}`);
-        yield* stdout(str);
 
         if (!listening) {
           try {
@@ -76,10 +74,15 @@ export function useChildSimulation<L extends object = Record<string, unknown>>(
                 port: parsed.port,
               } as FoundationSimulatorListening<L>;
               ready.resolve(Ok(listening));
+            } else {
+              yield* stdout(str);
             }
           } catch (_) {
             // ignore lines that are not JSON
+            yield* stdout(str);
           }
+        } else {
+          yield* stdout(str);
         }
 
         yield* each.next();
@@ -114,12 +117,14 @@ export function useChildSimulation<L extends object = Record<string, unknown>>(
     // we know listening is defined here
     listening = listening!;
 
-    console.log(`${name} process simulation started on port ${listening.port}`);
+    yield* stdout(
+      `${name} process simulation started on port ${listening.port}`
+    );
 
     try {
       yield* provide(listening);
     } finally {
-      console.log(`${name} simulation closed on port ${listening?.port}`);
+      yield* stdout(`${name} simulation closed on port ${listening?.port}`);
     }
   });
 }