@celilo/e2e 0.2.0 → 0.3.0

package/config/dns/iamtheinternet.org.zone

@@ -2,14 +2,14 @@ $ORIGIN iamtheinternet.org.
 $TTL 300
 
 @ IN SOA ns1.iamtheinternet.org. admin.iamtheinternet.org. (
-    2024010764 300 60 604800 300
+    2024010769 300 60 604800 300
 )
 
 @       IN NS   ns1.iamtheinternet.org.
 ns1     IN A    100.64.0.55
 @    IN A    0.0.0.0
 caddy    IN A    100.100.0.100
-www    IN A    10.0.10.10
+www    IN A    100.100.0.100
 deathstar    IN A    100.100.0.100
 test    IN A    0.0.0.0
 auth    IN A    100.100.0.100

package/docker/Dockerfile.management

@@ -22,9 +22,12 @@ RUN update-ca-certificates
 # Point apt at the simulated apt cache proxy (for runtime apt usage)
 RUN echo 'Acquire::http::Proxy "http://100.64.0.2:3142";' > /etc/apt/apt.conf.d/00proxy
 
+# Install celilo CLI from npm — provides the `celilo` command
+RUN bun add -g @celilo/cli@0.1.4
+
 COPY config/ssh/generate-keys.sh /config/ssh/generate-keys.sh
 COPY config/routing/management-routes.sh /startup.sh
 RUN chmod +x /startup.sh /config/ssh/generate-keys.sh
 
-WORKDIR /celilo/apps/celilo
+WORKDIR /root
 CMD ["/startup.sh"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/e2e",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "E2E test infrastructure for Celilo-deployed applications. Provides a simulated internet with DNS hierarchy, ACME server, firewalls, and target machines in Docker.",
   "type": "module",
   "main": "./src/index.ts",

package/src/container-manager.ts

@@ -13,7 +13,12 @@ const PACKAGE_ROOT = join(__dirname, '..');
  * Find the Celilo project root by walking up from the package directory.
  * Looks for apps/celilo/ as the marker.
  */
-function findCeliloRoot(): string {
+/**
+ * Try to find the Celilo project root by walking up from the package directory.
+ * Returns undefined if not found — the CLI is pre-installed in Docker so this
+ * is only needed for development (mounting local source).
+ */
+function findCeliloRoot(): string | undefined {
   let dir = PACKAGE_ROOT;
   for (let i = 0; i < 10; i++) {
     if (existsSync(join(dir, 'apps', 'celilo'))) {
@@ -23,10 +28,7 @@ function findCeliloRoot(): string {
     if (parent === dir) break;
     dir = parent;
   }
-  throw new Error(
-    'Could not find Celilo project root (directory containing apps/celilo/).\n' +
-    'Set it explicitly: network().celilo("/path/to/infra").start()',
-  );
+  return undefined;
 }
 
 const COMPOSE_TIMEOUT = 120_000;
@@ -218,7 +220,7 @@ export async function startNetwork(config: NetworkConfig): Promise<NetworkHandle
 
   // Build and start per-test containers only
   console.log('[progress:start] building Docker images | images built');
-  run(`docker compose -f ${COMPOSE_FILE} -p ${projectName} build`, { cwd: composeDir, timeout: 300_000 });
+  run(`docker compose -f ${COMPOSE_FILE} -p ${projectName} build`, { cwd: composeDir, timeout: 600_000 });
 
   console.log('[progress:start] starting containers | containers running');
   run(`docker compose -f ${COMPOSE_FILE} -p ${projectName} up -d`, { cwd: composeDir, timeout: 120_000 });
@@ -296,7 +298,7 @@ export async function startNetwork(config: NetworkConfig): Promise<NetworkHandle
   // Initialize celilo
   console.log('[progress:start] initializing celilo | celilo initialized');
   const initResult = dockerExec(projectName, composeDir, 'management',
-    `cd /celilo/apps/celilo && bun run src/cli/index.ts system init --accept-defaults \
+    `celilo system init --accept-defaults \
       network.dmz.subnet=10.0.10.0/24 \
       network.app.subnet=10.0.20.0/24 \
       network.secure.subnet=10.0.30.0/24 \
@@ -317,7 +319,7 @@ export async function startNetwork(config: NetworkConfig): Promise<NetworkHandle
       const timeoutMs = typeof optsOrTimeout === 'number' ? optsOrTimeout : (optsOrTimeout?.timeoutMs ?? 120_000);
 
       const result = await dockerExecAsync(projectName, composeDir, 'management',
-        `cd /celilo/apps/celilo && bun run src/cli/index.ts ${cmd}`, timeoutMs);
+        `celilo ${cmd}`, timeoutMs);
 
       if (check && result.exitCode !== 0) {
         throw new CeliloCommandError(cmd, result);

package/src/docker-compose-generator.ts

@@ -227,7 +227,7 @@ export function generateSharedInfraYaml(): string {
  * References the shared infrastructure's isp-external network as external.
  * Creates its own internal, dmz, app, secure networks.
  */
-export function generateTestComposeYaml(config: NetworkConfig, celiloRoot = '..'): string {
+export function generateTestComposeYaml(config: NetworkConfig, celiloRoot?: string): string {
   const networks: Record<string, unknown> = {
     internal: networkDef('192.168.0.0/24', '192.168.0.250'),
     dmz: networkDef('10.0.10.0/24', '10.0.10.250'),
@@ -259,7 +259,7 @@ export function generateTestComposeYaml(config: NetworkConfig, celiloRoot = '..'
     networks: { internal: { ipv4_address: '192.168.0.100' } },
     cap_add: ['NET_ADMIN'],
     volumes: [
-      `${celiloRoot}:/celilo`,
+      ...(celiloRoot ? [`${celiloRoot}:/celilo`] : []),
       'ssh-keys:/ssh-keys',
       ...(config.managementVolumes ?? []),
     ],
@@ -371,7 +371,7 @@ export function generateComposeYaml(config: NetworkConfig, celiloRoot = '..'): s
     networks: { internal: { ipv4_address: '192.168.0.100' } },
     cap_add: ['NET_ADMIN'],
     volumes: [
-      `${celiloRoot}:/celilo`,
+      ...(celiloRoot ? [`${celiloRoot}:/celilo`] : []),
       'ssh-keys:/ssh-keys',
       ...(config.managementVolumes ?? []),
     ],

package/src/network-builder.ts

@@ -1,6 +1,36 @@
+import { execSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { startNetwork } from './container-manager';
 import type { NetworkConfig, NetworkHandle, TopologyPreset } from './types';
 
+/**
+ * If a mounted path looks like a celilo module (has scripts/package.json),
+ * ensure its dependencies are installed on the host before Docker starts.
+ */
+async function ensureModuleDeps(hostPath: string): Promise<void> {
+  // Check common locations for a module's scripts dir
+  for (const scriptsDir of [
+    join(hostPath, 'scripts'),
+    join(hostPath, 'celilo', 'scripts'),
+  ]) {
+    const pkgJson = join(scriptsDir, 'package.json');
+    const nodeModules = join(scriptsDir, 'node_modules');
+    if (existsSync(pkgJson) && !existsSync(nodeModules)) {
+      console.log(`[progress:start] installing deps in ${scriptsDir} | deps installed`);
+      try {
+        execSync('bun install', { cwd: scriptsDir, timeout: 30_000, stdio: 'pipe' });
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        throw new Error(
+          `Failed to install module dependencies in ${scriptsDir}:\n${msg}\n\n` +
+          `Fix: cd ${scriptsDir} && bun install`,
+        );
+      }
+    }
+  }
+}
+
 export class NetworkBuilder {
   private config: NetworkConfig = {
     topology: 'default',
@@ -82,6 +112,13 @@ export class NetworkBuilder {
   }
 
   async start(): Promise<NetworkHandle> {
+    // Pre-flight: ensure mounted module directories have deps installed.
+    // Without this, `module import` tries to `bun install` inside Docker
+    // through the simulated internet, which is slow or fails.
+    for (const vol of this.config.managementVolumes) {
+      const [hostPath] = vol.split(':');
+      await ensureModuleDeps(hostPath);
+    }
     return startNetwork(this.config);
   }
 }

package/src/runner.ts

@@ -505,15 +505,6 @@ async function main() {
   console.log(`${bold}╚══════════════════════════════════════════════════════════════╝${reset}`);
   console.log();
 
-  // Shared infra check
-  console.log(`${bold}Shared Infrastructure${reset}`);
-  if (isSharedInfraHealthy()) {
-    console.log(`  ${green}✔ already running (DNS healthy)${reset}`);
-  } else {
-    console.log(`  ${dim}Will start on first test...${reset}`);
-  }
-  console.log();
-
   const suiteStart = Date.now();
   const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
   const resultsDir = join(testDir, 'results', timestamp);