@akanjs/cli 2.4.1-rc.4 → 2.4.1-rc.5

package/.build-stamp

@@ -1 +1 @@
-cf0119c268ffd25d9a5f294b48dd17139368114c7beb2e14d958c18a47442b5f
+97b051f1849d61848768f6c43d1dbcc90953864ce31504f1f376a61adb4481fb

package/buildBatch.proc.js

@@ -8,7 +8,8 @@ import {
   CsrArtifactBuilder,
   CssCompiler,
   FontOptimizer,
-  PagesBundleBuilder
+  PagesBundleBuilder,
+  SsrBaseArtifactBuilder
 } from "./index-khzzttv1.js";
 import"./index-0fn1r7gg.js";
 import"./index-6pz1j0zj.js";
@@ -29,6 +30,8 @@ class BuildBatch {
     this.#result = { generation: request.generation, errors: {} };
   }
   async run() {
+    if (this.#request.needs.includes("base"))
+      await this.#buildBase();
     if (this.#request.needs.includes("csr"))
       await this.#buildCsr();
     if (this.#request.needs.includes("pages"))
@@ -52,6 +55,19 @@ class BuildBatch {
       }
     });
   }
+  async#buildBase() {
+    const started = Date.now();
+    try {
+      const { artifact, optimizedFonts } = await new SsrBaseArtifactBuilder(this.#app).build();
+      this.#result.artifact = artifact;
+      this.#result.optimizedFonts = optimizedFonts;
+      this.#logger.verbose(`base-artifact ok buildId=${artifact.pagesBundleBuildId} (${Date.now() - started}ms)`);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.#logger.error(`base-artifact failed: ${message}`);
+      this.#result.errors.base = message;
+    }
+  }
   async#buildCsr() {
     const started = Date.now();
     try {

package/incrementalBuilder.proc.js

@@ -12,8 +12,7 @@ import {
   DevChangePlanner,
   DevGeneratedIndexSync,
   GraphClientEntryDiscovery,
-  RouteClientBuilder,
-  SsrBaseArtifactBuilder
+  RouteClientBuilder
 } from "./index-khzzttv1.js";
 import {
   HmrWatcher,
@@ -92,20 +91,36 @@ class BuildBatchRunner {
   }
 }
 
-// pkgs/@akanjs/devkit/incrementalBuilder/builderReply.ts
-class BuilderReply {
+// pkgs/@akanjs/devkit/incrementalBuilder/builderChannel.ts
+class BuilderChannel {
   static #flushTimeoutMs = 5000;
-  static async send(res) {
+  static #flushing = new Set;
+  static send(message) {
     const send = process.send;
     if (!send)
-      return;
-    await new Promise((resolve) => {
-      const timer = setTimeout(resolve, BuilderReply.#flushTimeoutMs);
-      send.call(process, res, undefined, undefined, () => {
+      return Promise.resolve();
+    const flushed = new Promise((resolve) => {
+      const timer = setTimeout(resolve, BuilderChannel.#flushTimeoutMs);
+      send.call(process, message, undefined, undefined, () => {
         clearTimeout(timer);
         resolve();
       });
     });
+    BuilderChannel.#flushing.add(flushed);
+    flushed.then(() => BuilderChannel.#flushing.delete(flushed));
+    return flushed;
+  }
+  static emit(message) {
+    BuilderChannel.send(message);
+  }
+  static async drain() {
+    let flushed = 0;
+    while (BuilderChannel.#flushing.size) {
+      const pending = [...BuilderChannel.#flushing];
+      flushed += pending.length;
+      await Promise.all(pending);
+    }
+    return flushed;
   }
 }
 
@@ -150,7 +165,7 @@ class IncrementalBuilder {
     return `${this.#app.cwdPath}/.akan/artifact`;
   }
   async handleBuildRoute(msg) {
-    await this.#enqueueWork(`build-route:${msg.routeId}`, async () => BuilderReply.send(await this.#handleBuildRoute(msg)));
+    await this.#enqueueWork(`build-route:${msg.routeId}`, async () => BuilderChannel.send(await this.#handleBuildRoute(msg)));
   }
   async#handleBuildRoute(msg) {
     try {
@@ -189,7 +204,7 @@ class IncrementalBuilder {
   #sendBuildStatus(phase, { generation, ok, files, message }) {
     if (typeof generation !== "number")
       return;
-    process.send?.({
+    BuilderChannel.emit({
       type: "build-status",
       data: {
         generation,
@@ -224,7 +239,7 @@ class IncrementalBuilder {
   #reportMetrics() {
     if (!this.#idle || this.#shuttingDown)
       return;
-    process.send?.({
+    BuilderChannel.emit({
       type: "builder-metrics",
       data: { rssBytes: process.memoryUsage.rss(), generation: this.#generation, workCount: this.#workCount }
     });
@@ -246,7 +261,8 @@ class IncrementalBuilder {
     await this.#cssRebuildQueue.catch(() => {
       return;
     });
-    this.#logger.info(`drained in ${Date.now() - started}ms; exiting for recycle`);
+    const flushed = await BuilderChannel.drain();
+    this.#logger.info(`drained in ${Date.now() - started}ms${flushed ? ` after flushing ${flushed} ipc write(s)` : ""}; exiting for recycle`);
     process.exit(0);
   }
   get shuttingDown() {
@@ -357,7 +373,7 @@ class IncrementalBuilder {
     if (hasSyncErrors) {
       this.#sendBuildStatus("barrel", { generation, ok: false, files, message: indexSync.errors.join(`
 `) });
-      process.send?.(event);
+      BuilderChannel.emit(event);
       return;
     }
     if (indexSync.changedFiles.length > 0)
@@ -382,7 +398,7 @@ class IncrementalBuilder {
       needs.push("pages");
       needs.push("css");
     }
-    process.send?.(event);
+    BuilderChannel.emit(event);
     if (needs.length > 0)
       await this.#runBatch({ generation, needs, changedFiles: files });
     else if (kinds.includes("css")) {
@@ -396,14 +412,15 @@ class IncrementalBuilder {
     changedFiles
   }) {
     const started = Date.now();
-    const result = await this.#batchRunner.run(await this.#batchRequest({ generation, needs, changedFiles }), (msg) => process.send?.(msg));
+    const result = await this.#batchRunner.run(await this.#batchRequest({ generation, needs, changedFiles }), (msg) => BuilderChannel.emit(msg));
     if (result.optimizedFonts)
       this.#optimizedFonts = result.optimizedFonts;
     if (result.cssAssets)
       this.#artifact = { ...this.#artifact, cssAssets: result.cssAssets };
     if (result.crashed) {
       for (const need of needs)
-        this.#sendBuildStatus(need, { generation, ok: false, files: changedFiles, message: result.errors[need] });
+        if (need !== "base")
+          this.#sendBuildStatus(need, { generation, ok: false, files: changedFiles, message: result.errors[need] });
     }
     if (needs.includes("css"))
       this.#logger.verbose(`css-rebuild checked (${Date.now() - started}ms)`);
@@ -430,7 +447,7 @@ class IncrementalBuilder {
   async boot() {
     if (this.#watch)
       await this.installWatcher();
-    process.send?.({ type: "builder-ready" });
+    BuilderChannel.emit({ type: "builder-ready" });
     this.#logger.verbose(`ready (watch=${this.#watch})`);
   }
   async announceRecoveredState(changedFiles) {
@@ -442,7 +459,7 @@ class IncrementalBuilder {
   async announceBootState() {
     const generation = ++this.#generation;
     const reason = "builder-recycle";
-    process.send?.({
+    await BuilderChannel.send({
       type: "pages-updated",
       data: {
         bundlePath: this.#artifact.pagesBundlePath,
@@ -457,7 +474,7 @@ class IncrementalBuilder {
       cssUrl,
       Buffer.from(await Bun.file(path2.join(this.#artifactDir, cssRelPath)).arrayBuffer()).toString("base64")
     ])));
-    process.send?.({
+    await BuilderChannel.send({
       type: "css-updated",
       data: { cssAssets, cssBase64ByUrl, generation, changedFiles: [], reason }
     });
@@ -470,12 +487,12 @@ class IncrementalBuilder {
       const error = result.errors.csr;
       if (error) {
         this.#logger.error(`csr-build failed: ${error}`);
-        await BuilderReply.send({ type: "build-csr-res", id: msg.id, ok: false, error });
+        await BuilderChannel.send({ type: "build-csr-res", id: msg.id, ok: false, error });
         return;
       }
       this.#csrActive = true;
       this.#logger.info(`csr-build ok on demand (${Date.now() - started}ms); rebuilding CSR on every save now`);
-      await BuilderReply.send({ type: "build-csr-res", id: msg.id, ok: true });
+      await BuilderChannel.send({ type: "build-csr-res", id: msg.id, ok: true });
     });
   }
   #shouldRebuildCsr() {
@@ -484,10 +501,25 @@ class IncrementalBuilder {
   static #csrArmedByEnv() {
     return process.env.AKAN_DEV_CSR_REBUILD === "1";
   }
-  static async#buildBootDeps(app) {
-    const { artifact, optimizedFonts } = await new SsrBaseArtifactBuilder(app).build();
+  static async#buildBootDeps(app, runner) {
+    const result = await runner.run({
+      appName: app.name,
+      workspaceRoot: app.workspace.workspaceRoot,
+      repoName: app.workspace.repoName,
+      generation: 0,
+      needs: ["base"],
+      changedFiles: [],
+      pageKeys: null,
+      optimizedFonts: null,
+      cssAssets: null,
+      artifactDir: path2.resolve(`${app.cwdPath}/.akan/artifact`)
+    });
+    if (result.errors.base)
+      throw new Error(result.errors.base);
+    if (!result.artifact || !result.optimizedFonts)
+      throw new Error("boot build reported success without an artifact; the build worker likely died");
     const discovery = await GraphClientEntryDiscovery.create(app);
-    return { artifact, optimizedFonts, discovery };
+    return { artifact: result.artifact, optimizedFonts: result.optimizedFonts, discovery };
   }
   async rearmCsrFromEnv() {
     if (!IncrementalBuilder.#csrArmedByEnv())
@@ -501,18 +533,18 @@ class IncrementalBuilder {
         this.#logger.verbose("csr-rearm ok; this session had CSR armed before the builder restarted");
     });
   }
-  static #recoverBoot(app, bootError, logger) {
+  static #recoverBoot(app, bootError, logger, runner) {
     const firstMessage = bootError instanceof Error ? bootError.message : String(bootError);
     logger.error(`boot build failed; entering degraded watch mode until the error is fixed: ${firstMessage}`);
     let generation = 0;
     const sendFailure = (files, message) => {
-      process.send?.({
+      BuilderChannel.emit({
         type: "build-status",
         data: { generation, phase: "pages", ok: false, files, message: `Boot build failed: ${message}` }
       });
     };
     sendFailure([], firstMessage);
-    process.send?.({ type: "builder-ready" });
+    BuilderChannel.emit({ type: "builder-ready" });
     return new Promise((resolve, reject) => {
       (async () => {
         const roots = await new WatchRootResolver(app).resolve();
@@ -525,7 +557,7 @@ class IncrementalBuilder {
             try {
               if (new Set(batch.kinds).has("config"))
                 await app.getConfig({ refresh: true });
-              const deps = await IncrementalBuilder.#buildBootDeps(app);
+              const deps = await IncrementalBuilder.#buildBootDeps(app, runner);
               const builder = new IncrementalBuilder({ app, watch: true, initialGeneration: generation, ...deps });
               watcher.stop();
               logger.info(`boot build recovered generation=${generation}`);
@@ -567,7 +599,7 @@ class IncrementalBuilder {
       if (msg.type === "build-route") {
         const error = builder?.shuttingDown ? recyclingError : bootingError;
         if (!builder || builder.shuttingDown) {
-          process.send?.({ type: "build-route-res", id: msg.id, ok: false, error });
+          BuilderChannel.emit({ type: "build-route-res", id: msg.id, ok: false, error });
           return;
         }
         builder.handleBuildRoute(msg);
@@ -576,7 +608,7 @@ class IncrementalBuilder {
       if (msg.type === "build-csr") {
         const error = builder?.shuttingDown ? recyclingError : bootingError;
         if (!builder || builder.shuttingDown) {
-          process.send?.({ type: "build-csr-res", id: msg.id, ok: false, error });
+          BuilderChannel.emit({ type: "build-csr-res", id: msg.id, ok: false, error });
           return;
         }
         builder.handleBuildCsr(msg);
@@ -587,12 +619,13 @@ class IncrementalBuilder {
       process.exit(0);
     });
     let recoveredFiles = null;
+    const bootRunner = new BuildBatchRunner({ workspaceRoot, cwd: app.cwdPath });
     try {
-      builder = new IncrementalBuilder({ app, watch, ...await IncrementalBuilder.#buildBootDeps(app) });
+      builder = new IncrementalBuilder({ app, watch, ...await IncrementalBuilder.#buildBootDeps(app, bootRunner) });
     } catch (err) {
       if (!watch)
         throw err;
-      const recovered = await IncrementalBuilder.#recoverBoot(app, err, logger);
+      const recovered = await IncrementalBuilder.#recoverBoot(app, err, logger, bootRunner);
       builder = recovered.builder;
       recoveredFiles = recovered.changedFiles;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.4.1-rc.4",
+  "version": "2.4.1-rc.5",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.4.1-rc.4",
+    "akanjs": "2.4.1-rc.5",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "5.5.23",