@absolutejs/absolute 0.19.0-beta.675 → 0.19.0-beta.677

package/dist/cli/index.js

@@ -242,9 +242,9 @@ var RESERVED_TOP_LEVEL_KEYS, isObject = (value) => typeof value === "object" &&
     cwd: _cwd,
     dependsOn: _dependsOn,
     env: _env,
-    healthcheck: _healthcheck,
     kind: _kind,
     port: _port,
+    ready: _ready,
     visibility: _visibility,
     ...serviceConfig
   } = service;
@@ -284,7 +284,6 @@ var init_loadConfig = __esm(() => {
     "dev",
     "entry",
     "env",
-    "healthcheck",
     "htmlDirectory",
     "htmxDirectory",
     "images",
@@ -301,6 +300,7 @@ var init_loadConfig = __esm(() => {
     "stylesConfig",
     "svelteDirectory",
     "tailwind",
+    "ready",
     "visibility",
     "vueDirectory"
   ]);
@@ -2482,6 +2482,7 @@ init_constants();
 init_loadConfig();
 init_getDurationString();
 import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
+import { createConnection } from "net";
 import { resolve as resolve6 } from "path";
 
 // src/cli/workspaceTui.ts
@@ -3051,50 +3052,164 @@ var getServiceUrl = (service) => {
   if (!service.port) {
     return null;
   }
-  return `http://localhost:${service.port}/`;
+  return `${getServiceProtocol(service)}://${getServicePublicHost(service)}:${service.port}/`;
 };
-var getHealthcheckUrl = (service) => {
-  if (service.healthcheck) {
-    return service.healthcheck;
-  }
+var getDefaultReadyConfig = (service) => {
   if (isAbsoluteService(service) && service.port) {
-    return `http://127.0.0.1:${service.port}/hmr-status`;
+    return "/hmr-status";
   }
   return;
 };
-var resolveHealthcheck = (healthcheck) => {
-  if (!healthcheck) {
-    return null;
+var normalizeExpectedStatuses = (value) => Array.isArray(value) ? value : [value ?? 200];
+var resolveServiceHttpUrl = (service, path) => {
+  if (!path.startsWith("/")) {
+    throw new Error(`ready path must start with "/" for service probes. Received "${path}".`);
   }
-  if (typeof healthcheck === "string") {
+  if (!service.port) {
+    throw new Error(`ready path "${path}" requires the service to define a port.`);
+  }
+  return `${getServiceProtocol(service)}://${getServicePublicHost(service)}:${service.port}${path}`;
+};
+var resolveHttpReadyProbe = (service, ready) => {
+  if (typeof ready === "string") {
+    if (isAbsoluteService(service)) {
+      return {
+        type: "http",
+        url: resolveServiceHttpUrl(service, ready),
+        method: "GET",
+        expectStatus: [200],
+        headers: {},
+        intervalMs: 250,
+        timeoutMs: 30000
+      };
+    }
     return {
+      type: "http",
+      url: ready,
+      method: "GET",
+      expectStatus: [200],
+      headers: {},
       intervalMs: 250,
-      timeoutMs: 30000,
-      url: healthcheck
+      timeoutMs: 30000
     };
   }
+  if (ready.path && ready.url) {
+    throw new Error('ready HTTP probe cannot define both "path" and "url".');
+  }
+  const url = ready.path ? resolveServiceHttpUrl(service, ready.path) : ready.url ? ready.url : isAbsoluteService(service) ? resolveServiceHttpUrl(service, "/hmr-status") : null;
+  if (!url) {
+    throw new Error('ready HTTP probe requires either "url" or "path".');
+  }
   return {
-    intervalMs: healthcheck.intervalMs ?? 250,
-    timeoutMs: healthcheck.timeoutMs ?? 30000,
-    url: healthcheck.url
+    type: "http",
+    url,
+    method: ready.method ?? "GET",
+    expectStatus: normalizeExpectedStatuses(ready.expectStatus),
+    headers: ready.headers ?? {},
+    intervalMs: ready.intervalMs ?? 250,
+    timeoutMs: ready.timeoutMs ?? 30000
   };
 };
-var waitForHealthcheck = async (healthcheck) => {
-  const resolved = resolveHealthcheck(healthcheck);
+var resolveReadyProbe = (service, ready = service.ready ?? getDefaultReadyConfig(service)) => {
+  if (ready === false || !ready) {
+    return null;
+  }
+  if (typeof ready === "string") {
+    return resolveHttpReadyProbe(service, ready);
+  }
+  if (ready.type === "tcp") {
+    return {
+      type: "tcp",
+      host: ready.host ?? getServicePublicHost(service),
+      port: ready.port,
+      intervalMs: ready.intervalMs ?? 250,
+      timeoutMs: ready.timeoutMs ?? 30000
+    };
+  }
+  if (ready.type === "command") {
+    return {
+      type: "command",
+      command: ready.command,
+      intervalMs: ready.intervalMs ?? 250,
+      timeoutMs: ready.timeoutMs ?? 30000
+    };
+  }
+  if (ready.type === "delay") {
+    return {
+      type: "delay",
+      ms: ready.ms
+    };
+  }
+  return resolveHttpReadyProbe(service, ready);
+};
+var probeHttpReady = async (ready) => {
+  const response = await fetch(ready.url, {
+    method: ready.method,
+    headers: ready.headers,
+    signal: AbortSignal.timeout(Math.min(ready.timeoutMs, 5000))
+  });
+  return ready.expectStatus.includes(response.status);
+};
+var probeTcpReady = async (ready) => new Promise((resolveProbe) => {
+  const socket = createConnection({
+    host: ready.host,
+    port: ready.port
+  });
+  const timeout = setTimeout(() => {
+    socket.destroy();
+    resolveProbe(false);
+  }, Math.min(ready.timeoutMs, 5000));
+  socket.once("connect", () => {
+    clearTimeout(timeout);
+    socket.end();
+    resolveProbe(true);
+  });
+  socket.once("error", () => {
+    clearTimeout(timeout);
+    socket.destroy();
+    resolveProbe(false);
+  });
+});
+var probeCommandReady = async (ready, service) => {
+  const processHandle = Bun.spawn(ready.command, {
+    cwd: service.cwd,
+    env: service.env,
+    stderr: "ignore",
+    stdin: "ignore",
+    stdout: "ignore"
+  });
+  const timeout = setTimeout(() => {
+    try {
+      processHandle.kill();
+    } catch {}
+  }, Math.min(ready.timeoutMs, 5000));
+  try {
+    const exitCode = await processHandle.exited;
+    return exitCode === 0;
+  } finally {
+    clearTimeout(timeout);
+  }
+};
+var waitForReady = async (service) => {
+  const resolved = resolveReadyProbe(service.service);
   if (!resolved) {
     return;
   }
+  if (resolved.type === "delay") {
+    await sleep(resolved.ms);
+    return;
+  }
   const startedAt = Date.now();
   while (Date.now() - startedAt < resolved.timeoutMs) {
     try {
-      const response = await fetch(resolved.url);
-      if (response.ok) {
+      const isReady = resolved.type === "http" ? await probeHttpReady(resolved) : resolved.type === "tcp" ? await probeTcpReady(resolved) : await probeCommandReady(resolved, service);
+      if (isReady) {
         return;
       }
     } catch {}
     await sleep(resolved.intervalMs);
   }
-  throw new Error(`service did not become healthy within ${resolved.timeoutMs}ms (${resolved.url})`);
+  throw new Error(resolved.type === "http" ? `service did not become ready within ${resolved.timeoutMs}ms (${resolved.url})` : resolved.type === "tcp" ? `service did not become ready within ${resolved.timeoutMs}ms (tcp://${resolved.host}:${resolved.port})` : `service did not become ready within ${resolved.timeoutMs}ms (${resolved.command.join(" ")})`);
 };
 var topologicallySortServices = (services) => {
   const ordered = [];
@@ -3341,7 +3456,7 @@ var workspace = async (subcommand, options) => {
         tui.addLog("workspace", `${name} exited with code ${exitCode || 1}. Shutting down workspace.`, "error");
         shutdown(exitCode || 1);
       });
-      await waitForHealthcheck(getHealthcheckUrl(resolved.service));
+      await waitForReady(resolved);
       const startedAt = serviceBootStartedAt.get(name);
       const readyDuration = typeof startedAt === "number" ? `ready in ${getDurationString(performance.now() - startedAt)}` : undefined;
       tui.setServiceStatus(name, "ready", readyDuration);

package/dist/index.js

@@ -172153,6 +172153,26 @@ var init_pageMetadata = __esm(() => {
   };
 });
 
+// src/utils/startupTimings.ts
+var startupTimingsEnabled, formatStartupTimingBlock = (title, steps) => {
+  const totalDuration = steps.reduce((sum, step) => sum + step.durationMs, 0);
+  return [
+    title,
+    ...steps.map((step) => `  - ${step.label}: ${getDurationString(step.durationMs)}`),
+    `  Total: ${getDurationString(totalDuration)}`
+  ].join(`
+`);
+}, logStartupTimingBlock = (title, steps) => {
+  if (!startupTimingsEnabled || steps.length === 0) {
+    return;
+  }
+  console.log(formatStartupTimingBlock(title, steps));
+};
+var init_startupTimings = __esm(() => {
+  init_getDurationString();
+  startupTimingsEnabled = process.env.ABSOLUTE_STARTUP_TIMINGS === "1" || process.env.ABSOLUTE_STARTUP_TIMINGS === "true";
+});
+
 // src/utils/normalizePath.ts
 var normalizePath = (path) => path.replace(/\\/g, "/");
 
@@ -180967,9 +180987,21 @@ var FRAMEWORK_DIR_KEYS, collectDepVendorSourceDirs = (config) => {
     await handleCachedReload();
     return cached;
   }
+  const startupSteps = [];
+  const recordStep = (label, startedAt) => {
+    startupSteps.push({
+      label,
+      durationMs: performance.now() - startedAt
+    });
+  };
+  let stepStartedAt = performance.now();
   const state = createHMRState(config);
+  recordStep("create HMR state", stepStartedAt);
+  stepStartedAt = performance.now();
   const watchPaths = getWatchPaths(config, state.resolvedPaths);
   buildInitialDependencyGraph(state.dependencyGraph, watchPaths);
+  recordStep("initialize dependency graph", stepStartedAt);
+  stepStartedAt = performance.now();
   if (config.reactDirectory) {
     setDevVendorPaths(computeVendorPaths());
   }
@@ -180985,7 +181017,10 @@ var FRAMEWORK_DIR_KEYS, collectDepVendorSourceDirs = (config) => {
   const sourceDirs = collectDepVendorSourceDirs(config);
   const { computeDepVendorPaths: computeDepVendorPaths2 } = await Promise.resolve().then(() => (init_buildDepVendor(), exports_buildDepVendor));
   globalThis.__depVendorPaths = await computeDepVendorPaths2(sourceDirs);
+  recordStep("prepare vendor paths", stepStartedAt);
+  stepStartedAt = performance.now();
   await resolveAbsoluteVersion2();
+  recordStep("resolve version", stepStartedAt);
   const buildStart = performance.now();
   const buildResult = await build2({
     ...config,
@@ -180997,11 +181032,15 @@ var FRAMEWORK_DIR_KEYS, collectDepVendorSourceDirs = (config) => {
   });
   const manifest = buildResult.manifest ?? {};
   const conventions2 = buildResult.conventions ?? {};
+  recordStep("initial build", buildStart);
   if (Object.keys(manifest).length === 0) {
     console.log("\u26A0\uFE0F Manifest is empty - this is OK for HTML/HTMX-only projects");
   }
+  stepStartedAt = performance.now();
   await populateAssetStore(state.assetStore, manifest, state.resolvedPaths.buildDir);
   cleanStaleAssets(state.assetStore, manifest, state.resolvedPaths.buildDir);
+  recordStep("populate asset store", stepStartedAt);
+  stepStartedAt = performance.now();
   const buildReactVendorTask = config.reactDirectory ? buildReactVendor(state.resolvedPaths.buildDir).then(async () => {
     const vendorDir = resolve32(state.resolvedPaths.buildDir, "react", "vendor");
     await loadVendorFiles(state.assetStore, vendorDir, "react");
@@ -181039,19 +181078,25 @@ var FRAMEWORK_DIR_KEYS, collectDepVendorSourceDirs = (config) => {
     buildVueVendorTask,
     buildDepVendorTask
   ]);
+  recordStep("build vendor bundles", stepStartedAt);
+  stepStartedAt = performance.now();
   const { warmCompilers: warmCompilers2 } = await Promise.resolve().then(() => (init_moduleServer(), exports_moduleServer));
   await warmCompilers2({
     svelte: Boolean(config.svelteDirectory),
     vue: Boolean(config.vueDirectory)
   });
+  recordStep("warm compilers", stepStartedAt);
   state.manifest = manifest;
+  stepStartedAt = performance.now();
   startFileWatching(state, config, (filePath) => {
     queueFileChange(state, filePath, config, (newBuildResult) => {
       Object.assign(manifest, newBuildResult.manifest);
       state.manifest = manifest;
     });
   });
+  recordStep("start file watching", stepStartedAt);
   globalThis.__hmrBuildDuration = performance.now() - buildStart;
+  logStartupTimingBlock("AbsoluteJS devBuild timing", startupSteps);
   const result = {
     conventions: conventions2,
     hmrState: state,
@@ -181075,6 +181120,7 @@ var init_devBuild = __esm(() => {
   init_assetStore();
   init_rebuildTrigger();
   init_logger();
+  init_startupTimings();
   FRAMEWORK_DIR_KEYS = [
     "reactDirectory",
     "svelteDirectory",
@@ -181936,7 +181982,6 @@ var RESERVED_TOP_LEVEL_KEYS = new Set([
   "dev",
   "entry",
   "env",
-  "healthcheck",
   "htmlDirectory",
   "htmxDirectory",
   "images",
@@ -181953,6 +181998,7 @@ var RESERVED_TOP_LEVEL_KEYS = new Set([
   "stylesConfig",
   "svelteDirectory",
   "tailwind",
+  "ready",
   "visibility",
   "vueDirectory"
 ]);
@@ -181993,9 +182039,9 @@ var projectServiceConfig = (config, serviceName) => {
     cwd: _cwd,
     dependsOn: _dependsOn,
     env: _env,
-    healthcheck: _healthcheck,
     kind: _kind,
     port: _port,
+    ready: _ready,
     visibility: _visibility,
     ...serviceConfig
   } = service;
@@ -182057,6 +182103,7 @@ var loadIslandRegistry = async (registryPath) => {
 // src/core/prepare.ts
 init_pageMetadata();
 init_resolveConvention();
+init_startupTimings();
 var MS_PER_SECOND2 = 1000;
 var DEFAULT_PORT2 = 3000;
 var MAX_STATIC_ROUTE_COUNT = Number.MAX_SAFE_INTEGER;
@@ -182129,10 +182176,22 @@ var patchManifestIndexes = (manifest, devIndexDir, SRC_URL_PREFIX2) => {
   }
 };
 var prepareDev = async (config, buildDir) => {
+  const startupSteps = [];
+  const recordStep = (label, startedAt) => {
+    startupSteps.push({
+      label,
+      durationMs: performance.now() - startedAt
+    });
+  };
+  let stepStartedAt = performance.now();
   const { patchElysiaRouteRegistrationCallsites: patchElysiaRouteRegistrationCallsites2 } = await Promise.resolve().then(() => (init_devRouteRegistrationCallsite(), exports_devRouteRegistrationCallsite));
   patchElysiaRouteRegistrationCallsites2();
+  recordStep("patch route registration", stepStartedAt);
+  stepStartedAt = performance.now();
   const { devBuild: devBuild2 } = await Promise.resolve().then(() => (init_devBuild(), exports_devBuild));
   const result = await devBuild2(config);
+  recordStep("devBuild", stepStartedAt);
+  stepStartedAt = performance.now();
   const { hmr: hmr2 } = await Promise.resolve().then(() => (init_hmr(), exports_hmr));
   const { staticPlugin } = await import("@elysiajs/static");
   const { createModuleServer: createModuleServer2 } = await Promise.resolve().then(() => (init_moduleServer(), exports_moduleServer));
@@ -182142,6 +182201,8 @@ var prepareDev = async (config, buildDir) => {
     getSvelteVendorPaths: getSvelteVendorPaths2,
     getVueVendorPaths: getVueVendorPaths2
   } = await Promise.resolve().then(() => exports_devVendorPaths);
+  recordStep("load dev runtime modules", stepStartedAt);
+  stepStartedAt = performance.now();
   const depVendorPaths = globalThis.__depVendorPaths ?? {};
   const allVendorPaths = {
     ...getDevVendorPaths2() ?? {},
@@ -182162,19 +182223,25 @@ var prepareDev = async (config, buildDir) => {
     vendorPaths: allVendorPaths
   });
   setGlobalModuleServer2(moduleHandler);
+  recordStep("create module server", stepStartedAt);
   const { warmCache: warmCache2, SRC_URL_PREFIX: SRC_URL_PREFIX2 } = await Promise.resolve().then(() => (init_moduleServer(), exports_moduleServer));
   const prewarmDirs = buildPrewarmDirs(config);
+  stepStartedAt = performance.now();
   await warmPrewarmDirs(prewarmDirs, warmCache2, SRC_URL_PREFIX2);
+  recordStep("prewarm source modules", stepStartedAt);
   if (config.dev?.https) {
     globalThis.__http2Config = {
       hmrState: result.hmrState,
       manifest: result.manifest
     };
   }
+  stepStartedAt = performance.now();
   const hmrPlugin = hmr2(result.hmrState, result.manifest, moduleHandler);
   const { devtoolsJson: devtoolsJson2 } = await Promise.resolve().then(() => (init_devtoolsJson(), exports_devtoolsJson));
   const devIndexDir = resolve35(buildDir, "_src_indexes");
   patchManifestIndexes(result.manifest, devIndexDir, SRC_URL_PREFIX2);
+  recordStep("configure dev plugins", stepStartedAt);
+  stepStartedAt = performance.now();
   if (result.conventions)
     setConventions(result.conventions);
   setCurrentIslandManifest(result.manifest);
@@ -182182,6 +182249,8 @@ var prepareDev = async (config, buildDir) => {
     setCurrentIslandRegistry(await loadIslandRegistry(config.islands.registry));
   }
   setCurrentPageIslandMetadata(await loadPageIslandMetadata(config));
+  recordStep("load runtime metadata", stepStartedAt);
+  stepStartedAt = performance.now();
   const { imageOptimizer: imageOptimizer2 } = await Promise.resolve().then(() => (init_imageOptimizer(), exports_imageOptimizer));
   const absolutejs = new Elysia5({ name: "absolutejs-runtime" }).use(devtoolsJson2(buildDir, {
     normalizeForWindowsContainer: config.dev?.devtools?.normalizeForWindowsContainer,
@@ -182196,6 +182265,8 @@ var prepareDev = async (config, buildDir) => {
     prefix: "",
     staticLimit: MAX_STATIC_ROUTE_COUNT
   })).use(hmrPlugin).use(createSitemapPlugin(buildDir, config.sitemap)).use(createNotFoundPlugin());
+  recordStep("assemble dev runtime", stepStartedAt);
+  logStartupTimingBlock("AbsoluteJS prepareDev timing", startupSteps);
   return {
     absolutejs,
     manifest: result.manifest
@@ -182235,23 +182306,42 @@ var createNotFoundPlugin = () => new Elysia5({ name: "absolutejs-not-found" }).o
   return;
 });
 var prepare = async (configOrPath) => {
+  const startupSteps = [];
+  const recordStep = (label, startedAt) => {
+    startupSteps.push({
+      label,
+      durationMs: performance.now() - startedAt
+    });
+  };
+  let stepStartedAt = performance.now();
   const config = await loadConfig(configOrPath);
+  recordStep("load config", stepStartedAt);
   const nodeEnv = process.env["NODE_ENV"];
   const isDev3 = nodeEnv === "development";
   const buildDir = resolve35(process.env.ABSOLUTE_BUILD_DIR ?? config.buildDirectory ?? "build");
-  if (isDev3)
-    return prepareDev(config, buildDir);
+  if (isDev3) {
+    stepStartedAt = performance.now();
+    const result = await prepareDev(config, buildDir);
+    recordStep("prepare dev runtime", stepStartedAt);
+    logStartupTimingBlock("AbsoluteJS prepare timing", startupSteps);
+    return result;
+  }
+  stepStartedAt = performance.now();
   const manifest = JSON.parse(readFileSync16(`${buildDir}/manifest.json`, "utf-8"));
   setCurrentIslandManifest(manifest);
   if (config.islands?.registry) {
     setCurrentIslandRegistry(await loadIslandRegistry(config.islands.registry));
   }
   setCurrentPageIslandMetadata(await loadPageIslandMetadata(config));
+  recordStep("load production manifest and island metadata", stepStartedAt);
+  stepStartedAt = performance.now();
   const conventionsPath = join24(buildDir, "conventions.json");
   if (existsSync24(conventionsPath)) {
     const conventions2 = JSON.parse(readFileSync16(conventionsPath, "utf-8"));
     setConventions(conventions2);
   }
+  recordStep("load production conventions", stepStartedAt);
+  stepStartedAt = performance.now();
   const { staticPlugin } = await import("@elysiajs/static");
   const staticFiles = staticPlugin({
     assets: buildDir,
@@ -182259,8 +182349,11 @@ var prepare = async (configOrPath) => {
     prefix: "",
     staticLimit: MAX_STATIC_ROUTE_COUNT
   });
+  recordStep("create static plugin", stepStartedAt);
+  stepStartedAt = performance.now();
   const prerenderDir = join24(buildDir, "_prerendered");
   const prerenderMap = loadPrerenderMap(prerenderDir);
+  recordStep("load prerender map", stepStartedAt);
   if (prerenderMap.size > 0) {
     const { PRERENDER_BYPASS_HEADER: PRERENDER_BYPASS_HEADER2, readTimestamp: readTimestamp2, rerenderRoute: rerenderRoute2 } = await Promise.resolve().then(() => (init_prerender(), exports_prerender));
     const revalidateMs = config.static?.revalidate ? config.static.revalidate * MS_PER_SECOND2 : 0;
@@ -182285,12 +182378,18 @@ var prepare = async (configOrPath) => {
         headers: { "content-type": "text/html; charset=utf-8" }
       });
     });
+    stepStartedAt = performance.now();
     const { imageOptimizer: imageOptimizer3 } = await Promise.resolve().then(() => (init_imageOptimizer(), exports_imageOptimizer));
     const absolutejs2 = new Elysia5({ name: "absolutejs-runtime" }).use(imageOptimizer3(config.images, buildDir)).use(prerenderPlugin).use(staticFiles).use(createSitemapPlugin(buildDir, config.sitemap)).use(createNotFoundPlugin());
+    recordStep("assemble production runtime", stepStartedAt);
+    logStartupTimingBlock("AbsoluteJS prepare timing", startupSteps);
     return { absolutejs: absolutejs2, manifest };
   }
+  stepStartedAt = performance.now();
   const { imageOptimizer: imageOptimizer2 } = await Promise.resolve().then(() => (init_imageOptimizer(), exports_imageOptimizer));
   const absolutejs = new Elysia5({ name: "absolutejs-runtime" }).use(imageOptimizer2(config.images, buildDir)).use(staticFiles).use(createSitemapPlugin(buildDir, config.sitemap)).use(createNotFoundPlugin());
+  recordStep("assemble production runtime", stepStartedAt);
+  logStartupTimingBlock("AbsoluteJS prepare timing", startupSteps);
   return { absolutejs, manifest };
 };
 
@@ -188898,5 +188997,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=5420DB14363AEF7064756E2164756E21
+//# debugId=34F91B1BAA5BDB1464756E2164756E21
 //# sourceMappingURL=index.js.map