@celilo/e2e 0.7.12 → 0.7.13-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/e2e",
-  "version": "0.7.12",
+  "version": "0.7.13-alpha.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",
@@ -60,5 +60,6 @@
     "type": "git",
     "url": "https://github.com/psbanka/infra",
     "directory": "packages/e2e"
-  }
+  },
+  "gitHead": "8e436b714b3a163fe62a84394732ce28f50e7452"
 }

package/src/docker-compose-generator.ts

@@ -1,8 +1,36 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { stringify } from 'yaml';
 import { SIMULATOR_IPS } from './simulator-ips';
 import type { MachineSpec, NetworkConfig, TopologyPreset } from './types';
 import { ZONE_GATEWAYS } from './types';
 
+/**
+ * Volumes for the registry container. Picks between source-bootstrap and
+ * uploads-bootstrap based on where the @celilo/e2e package lives:
+ *
+ * - **Monorepo dev** — `../../modules` from the compose file (which lives
+ *   in `packages/e2e/`) resolves to `<repo>/modules`. The registry runs
+ *   in BOOTSTRAP_MODULES_DIR mode and packs source modules on the fly,
+ *   so edits to a module's source flow through without manual repack.
+ *
+ * - **npm-installed consumer** (lunacycle and friends) — `../../modules`
+ *   would resolve to `<consumer>/node_modules/modules`, which doesn't
+ *   exist. Docker fails the mount with "permission denied" trying to
+ *   create that path. Instead we bind the pre-shipped `./netapps/` dir
+ *   (always present in the npm tarball) to `/uploads`, and the registry's
+ *   scanUploadsDir picks up the .netapp files.
+ *
+ * Detection: check whether the would-be monorepo modules dir is real.
+ * `import.meta.dir` is `<pkgDir>/src/`, so `../../../modules` from there
+ * is `<repo>/modules` in the monorepo and `<consumer>/node_modules/modules`
+ * (nonexistent) in a consumer install.
+ */
+function getRegistryVolumes(): string[] {
+  const monorepoModules = join(import.meta.dir, '..', '..', '..', 'modules');
+  return existsSync(monorepoModules) ? ['../../modules:/modules:ro'] : ['./netapps:/uploads:ro'];
+}
+
 const NETWORK_DRIVER_OPTS = {
   'com.docker.network.bridge.enable_ip_masquerade': 'false',
   'com.docker.network.endpoint.sysctls': 'net.ipv4.conf.IFNAME.rp_filter=0',
@@ -233,7 +261,7 @@ export function generateSharedInfraYaml(): string {
     build: { context: '.', dockerfile: 'docker/Dockerfile.registry' },
     networks: { 'internet-external': { ipv4_address: SIMULATOR_IPS.REGISTRY } },
     cap_add: ['NET_ADMIN'],
-    volumes: ['../../modules:/modules:ro'],
+    volumes: getRegistryVolumes(),
   });
 
   // External website prober simulator — mimics isitup.org's /api.json endpoint.
@@ -598,7 +626,7 @@ export function generateComposeYaml(config: NetworkConfig, celiloRoot = '..'): s
     build: { context: '.', dockerfile: 'docker/Dockerfile.registry' },
     networks: { 'internet-external': { ipv4_address: SIMULATOR_IPS.REGISTRY } },
     cap_add: ['NET_ADMIN'],
-    volumes: ['../../modules:/modules:ro'],
+    volumes: getRegistryVolumes(),
   });
 
   const allMachines = [