@absolutejs/absolute 0.19.0-beta.674 → 0.19.0-beta.676

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 (!service.port) {
+    throw new Error(`ready path "${path}" requires the service to define a port.`);
   }
-  if (typeof healthcheck === "string") {
+  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 = [];
@@ -3161,10 +3276,30 @@ var pipeProcessLogs = (name, processHandle, appendLog) => {
   forward(processHandle.stdout, "info");
   forward(processHandle.stderr, "error");
 };
-var resolveService = (name, service, options) => {
+var getServicePublicHost = (service) => {
+  const host = service.env?.HOST ?? process.env.HOST ?? "localhost";
+  if (host === "0.0.0.0" || host === "::") {
+    return "localhost";
+  }
+  return host;
+};
+var getServiceProtocol = (service) => service.env?.ABSOLUTE_HTTPS === "true" || process.env.ABSOLUTE_HTTPS === "true" ? "https" : "http";
+var createWorkspaceServiceEnv = (services) => {
+  const workspaceEnv = {};
+  for (const [name, service] of Object.entries(services)) {
+    if (!service.port) {
+      continue;
+    }
+    const envKey = `ABSOLUTE_SERVICE_${name.toUpperCase().replace(/[^A-Z0-9]+/g, "_")}_URL`;
+    workspaceEnv[envKey] = `${getServiceProtocol(service)}://${getServicePublicHost(service)}:${service.port}`;
+  }
+  return workspaceEnv;
+};
+var resolveService = (name, service, workspaceEnv, options) => {
   const cwd = resolve6(service.cwd ?? ".");
   const envVars = {
     ...process.env,
+    ...workspaceEnv,
     ...service.env,
     ABSOLUTE_WORKSPACE_MANAGED: "1",
     ABSOLUTE_WORKSPACE_SERVICE_NAME: name,
@@ -3211,6 +3346,7 @@ var workspace = async (subcommand, options) => {
   }
   const config = await loadRawConfig(options.configPath);
   const services = getWorkspaceServices(config);
+  const workspaceEnv = createWorkspaceServiceEnv(services);
   const orderedNames = topologicallySortServices(services);
   const running = [];
   const serviceBootStartedAt = new Map;
@@ -3283,7 +3419,7 @@ var workspace = async (subcommand, options) => {
       if (!service) {
         throw new Error(`services is missing "${name}"`);
       }
-      const resolved = resolveService(name, service, options);
+      const resolved = resolveService(name, service, workspaceEnv, options);
       const port = (resolved.service.port ?? Number(resolved.env.PORT ?? "")) || DEFAULT_PORT;
       if (port > 0) {
         killStaleProcesses(port, (message) => {
@@ -3320,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

@@ -174803,7 +174803,7 @@ ${registrations}
     ({ tsLibDir } = cached);
     cached.lastUsed = Date.now();
   } else {
-    const tsPath = __require.resolve("/home/alexkahn/abs/absolutejs/node_modules/typescript/lib/typescript.js");
+    const tsPath = __require.resolve("typescript");
     const tsRootDir = dirname9(tsPath);
     tsLibDir = tsRootDir.endsWith("lib") ? tsRootDir : resolve18(tsRootDir, "lib");
     const config = readConfiguration("./tsconfig.json");
@@ -181936,7 +181936,6 @@ var RESERVED_TOP_LEVEL_KEYS = new Set([
   "dev",
   "entry",
   "env",
-  "healthcheck",
   "htmlDirectory",
   "htmxDirectory",
   "images",
@@ -181953,6 +181952,7 @@ var RESERVED_TOP_LEVEL_KEYS = new Set([
   "stylesConfig",
   "svelteDirectory",
   "tailwind",
+  "ready",
   "visibility",
   "vueDirectory"
 ]);
@@ -181993,9 +181993,9 @@ var projectServiceConfig = (config, serviceName) => {
     cwd: _cwd,
     dependsOn: _dependsOn,
     env: _env,
-    healthcheck: _healthcheck,
     kind: _kind,
     port: _port,
+    ready: _ready,
     visibility: _visibility,
     ...serviceConfig
   } = service;
@@ -188898,5 +188898,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=98967D2F4839D93264756E2164756E21
+//# debugId=97D769D373BB628F64756E2164756E21
 //# sourceMappingURL=index.js.map