everything-dev 1.16.1 → 1.16.3

package/src/plugin.ts

@@ -1,10 +1,10 @@
-import { randomBytes } from "node:crypto";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import * as p from "@clack/prompts";
 import { Effect } from "effect";
 import { syncApiContractBridge } from "./api-contract";
 import { buildRuntimeConfig, detectLocalPackages, prepareDevelopmentRuntimeConfig } from "./app";
+import { ensureEnvFile, writeGeneratedInfra } from "./cli/infra";
 import {
   copyFilteredFiles,
   fetchParentConfig,
@@ -13,12 +13,14 @@ import {
   readTemplatekeep,
   resolveSourceDir,
   runBunInstall,
+  runDockerComposeUp,
   runTypesGen,
   writeInitSnapshot,
 } from "./cli/init";
 import { promptInitOptions } from "./cli/prompts";
 import { getStatus } from "./cli/status";
 import { syncTemplate } from "./cli/sync";
+import { timePhase } from "./cli/timing";
 import { upgradeTemplate } from "./cli/upgrade";
 import {
   buildRuntimePluginsForConfig,
@@ -29,8 +31,12 @@ import {
   resolveLocalDevelopmentPath,
   writeResolvedConfig,
 } from "./config";
-import { type BosConfigResult, bosContract, type PluginListResult } from "./contract";
-import { devApp, startApp } from "./dev-session";
+import {
+  type BosConfigResult,
+  bosContract,
+  type PhaseTiming,
+  type PluginListResult,
+} from "./contract";
 import {
   buildRegistryConfigUrl,
   buildRegistryConfigUrlForNetwork,
@@ -57,36 +63,8 @@ import { run } from "./utils/run";
 import { saveBosConfig } from "./utils/save-config";
 import { colors } from "./utils/theme";
 
-function ensureEnvFile(configDir: string, opts?: { domain?: string }): void {
-  const envPath = join(configDir, ".env");
-  const examplePath = join(configDir, ".env.example");
-
-  if (existsSync(envPath)) return;
-
-  if (!existsSync(examplePath)) return;
-
-  const content = readFileSync(examplePath, "utf-8");
-  const lines = content.split("\n");
-
-  const secret = randomBytes(32).toString("base64url");
-  const corsOrigin = opts?.domain
-    ? `http://localhost:3000,https://${opts.domain}`
-    : "http://localhost:3000";
-
-  const updated = lines
-    .map((line) => {
-      if (/^BETTER_AUTH_SECRET=/.test(line)) {
-        return `BETTER_AUTH_SECRET=${secret}`;
-      }
-      if (/^CORS_ORIGIN=/.test(line)) {
-        return `CORS_ORIGIN=${corsOrigin}`;
-      }
-      return line;
-    })
-    .join("\n");
-
-  writeFileSync(envPath, updated);
-  p.log.info(`Created .env from .env.example with generated BETTER_AUTH_SECRET`);
+async function loadDevSession() {
+  return import("./dev-session");
 }
 
 const buildCommands: Record<string, { cmd: string; args: string[] }> = {
@@ -869,6 +847,7 @@ export default createPlugin({
         interactive: input.interactive,
       };
 
+      const { devApp } = await loadDevSession();
       devApp(orchestrator, services, runtimeConfig);
 
       return {
@@ -1029,6 +1008,7 @@ export default createPlugin({
         noLogs: true,
       };
 
+      const { startApp } = await loadDevSession();
       startApp(orchestrator, services, runtimeConfig);
       return {
         status: "running" as const,
@@ -1292,6 +1272,7 @@ export default createPlugin({
 
     init: builder.init.handler(async ({ input }) => {
       try {
+        const timings: PhaseTiming[] = [];
         let extendsAccount = input.extendsAccount;
         let extendsGateway = input.extendsGateway;
         let directory = input.directory;
@@ -1314,7 +1295,9 @@ export default createPlugin({
         let parentPluginKeys: string[] = [];
         let parentConfig: BosConfig | null = null;
         try {
-          parentConfig = await fetchParentConfig(extendsAccount, extendsGateway);
+          parentConfig = await timePhase(timings, "parent config", () =>
+            fetchParentConfig(extendsAccount!, extendsGateway!),
+          );
           if (parentConfig?.plugins && typeof parentConfig.plugins === "object") {
             parentPluginKeys = Object.keys(parentConfig.plugins);
           }
@@ -1342,11 +1325,14 @@ export default createPlugin({
         }
 
         directory = directory || domain || extendsGateway;
+        const targetDir = resolve(directory);
         plugins = plugins ?? [];
 
         if (!parentConfig) {
           try {
-            parentConfig = await fetchParentConfig(extendsAccount, extendsGateway);
+            parentConfig = await timePhase(timings, "parent config", () =>
+              fetchParentConfig(extendsAccount!, extendsGateway!),
+            );
           } catch {
             return {
               status: "error" as const,
@@ -1358,6 +1344,7 @@ export default createPlugin({
               extends: `bos://${extendsAccount}/${extendsGateway}`,
               plugins: plugins ?? [],
               filesCopied: 0,
+              timings,
               error: `No config found at bos://${extendsAccount}/${extendsGateway} — are you sure this is the right parent?`,
             };
           }
@@ -1367,11 +1354,13 @@ export default createPlugin({
           sourceDir,
           parentConfig: resolvedParentConfig,
           cleanup,
-        } = await resolveSourceDir({
-          extendsAccount,
-          extendsGateway,
-          source: input.source,
-        });
+        } = await timePhase(timings, "template source", () =>
+          resolveSourceDir({
+            extendsAccount,
+            extendsGateway,
+            source: input.source,
+          }),
+        );
 
         parentConfig = resolvedParentConfig;
 
@@ -1405,44 +1394,84 @@ export default createPlugin({
           const s = p.spinner();
           s.start("Setting up project");
 
-          const filesCopied = await copyFilteredFiles(sourceDir, directory, patterns, {
-            withHost,
-            plugins,
-            pluginRoutes,
-          });
+          const filesCopied = await timePhase(timings, "copy files", () =>
+            copyFilteredFiles(sourceDir, targetDir, patterns, {
+              withHost,
+              plugins,
+              pluginRoutes,
+            }),
+          );
 
-          await personalizeConfig(directory, {
-            extendsAccount,
-            extendsGateway,
-            account: account || extendsAccount,
-            domain: domain || extendsGateway,
-            plugins,
-            pluginRoutes,
-            workspaceOpts: { sourceDir },
-            withHost,
-          });
+          await timePhase(timings, "personalize config", () =>
+            personalizeConfig(targetDir, {
+              extendsAccount,
+              extendsGateway,
+              account: account || extendsAccount,
+              domain: domain || extendsGateway,
+              plugins,
+              pluginRoutes,
+              workspaceOpts: { sourceDir },
+              withHost,
+            }),
+          );
 
-          await writeInitSnapshot(directory, extendsAccount, extendsGateway, sourceDir, patterns, {
-            withHost,
-            plugins,
-            pluginRoutes,
-          });
+          await timePhase(timings, "write snapshot", () =>
+            writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
+              withHost,
+              plugins,
+              pluginRoutes,
+            }),
+          );
 
-          ensureEnvFile(directory, { domain });
+          const initConfig = await timePhase(timings, "resolve config", () =>
+            loadConfig({ cwd: targetDir }),
+          );
+          if (initConfig?.runtime) {
+            await timePhase(timings, "generate env/docker", async () => {
+              writeGeneratedInfra(targetDir, initConfig.runtime);
+            });
+          }
+          await timePhase(timings, "create env file", async () => {
+            ensureEnvFile(targetDir);
+          });
 
           if (!input.noInstall) {
-            await runBunInstall(directory);
-            await runTypesGen(directory);
-            await generateDatabaseMigrations(directory);
+            await timePhase(timings, "install dependencies", () => runBunInstall(targetDir));
+            await timePhase(timings, "generate types", () => runTypesGen(targetDir));
+            await timePhase(timings, "generate migrations", () =>
+              generateDatabaseMigrations(targetDir),
+            );
           }
 
-          const initConfig = await loadConfig({ cwd: directory });
-          if (initConfig?.config) {
-            await generateCodeArtifacts(directory, initConfig.config);
+          if (input.noInstall && initConfig?.config) {
+            await timePhase(timings, "generate code artifacts", () =>
+              generateCodeArtifacts(targetDir, initConfig.config),
+            );
           }
 
           s.stop("Project initialized");
 
+          if (!input.noInteractive) {
+            const shouldStartDocker = await p.confirm({
+              message: "Run docker compose up -d --wait?",
+              initialValue: true,
+            });
+
+            if (shouldStartDocker === true) {
+              const dockerSpinner = p.spinner();
+              dockerSpinner.start("Starting Docker services");
+              try {
+                await timePhase(timings, "docker compose up", () => runDockerComposeUp(targetDir));
+                dockerSpinner.stop("Docker services ready");
+              } catch (error) {
+                dockerSpinner.stop("Docker services not started");
+                p.log.warn(
+                  `docker compose up -d --wait failed: ${error instanceof Error ? error.message : error}`,
+                );
+              }
+            }
+          }
+
           return {
             status: "initialized" as const,
             directory,
@@ -1453,6 +1482,7 @@ export default createPlugin({
             extends: `bos://${extendsAccount}/${extendsGateway}`,
             plugins,
             filesCopied,
+            timings,
           };
         } finally {
           await cleanup();
@@ -1471,6 +1501,7 @@ export default createPlugin({
               : "",
           plugins: input.plugins ?? [],
           filesCopied: 0,
+          timings: [],
           error: error instanceof Error ? error.message : "Unknown error",
         };
       }