@elench/testkit 0.1.135 → 0.1.137

package/lib/runner/template.mjs

@@ -12,9 +12,11 @@ export function resolveRuntimeInstanceConfigs(runtimeConfigs, runtimeId, runtime
   const portMap = buildPortMap(runtimeConfigs, runtimeId, {
     index: options.portNamespaceIndex || 0,
     stride: options.portNamespaceStride || 1,
+    portOffset: options.portOffset || 0,
   });
   const baseUrlByService = new Map();
   const readyUrlByService = new Map();
+  const publicBaseUrlByService = new Map();
   const stateDirByService = new Map();
 
   for (const config of runtimeConfigs) {
@@ -48,6 +50,9 @@ export function resolveRuntimeInstanceConfigs(runtimeConfigs, runtimeId, runtime
       })
     );
   }
+  for (const [serviceName, baseUrl] of baseUrlByService.entries()) {
+    publicBaseUrlByService.set(serviceName, publicUrl(baseUrl, options.publicHost || null));
+  }
 
   const urlMappings = [];
   for (const config of runtimeConfigs) {
@@ -67,6 +72,8 @@ export function resolveRuntimeInstanceConfigs(runtimeConfigs, runtimeId, runtime
       portMap,
       baseUrlByService,
       readyUrlByService,
+      publicBaseUrlByService,
+      options.publicHost || null,
       stateDirByService,
       urlMappings
     )
@@ -76,7 +83,7 @@ export function resolveRuntimeInstanceConfigs(runtimeConfigs, runtimeId, runtime
 export function buildPortMap(runtimeConfigs, runtimeId, namespace = {}) {
   const portMap = new Map();
   const seen = new Map();
-  const offset = runtimePortOffset(runtimeId, namespace);
+  const offset = runtimePortOffset(runtimeId, namespace) + Number(namespace.portOffset || 0);
 
   for (const config of runtimeConfigs) {
     if (!config.testkit.local) continue;
@@ -113,6 +120,8 @@ export function resolveRuntimeConfig(
   portMap,
   baseUrlByService,
   readyUrlByService,
+  publicBaseUrlByService,
+  publicHost,
   stateDirByService,
   urlMappings
 ) {
@@ -129,6 +138,8 @@ export function resolveRuntimeConfig(
     portMap,
     baseUrlByService,
     readyUrlByService,
+    publicBaseUrlByService,
+    publicHost,
     stateDirByService,
     urlMappings,
     leaseId: null,
@@ -242,7 +253,11 @@ function buildExecutionEnvWithContext(config, lease, extraEnv, processEnv, optio
     ...resolveEnvTemplates(localEnv, templateContext),
     ...resolveEnvTemplates(extraEnv, templateContext),
     TESTKIT_ACTIVE: "1",
+    TESTKIT_MODE: options.mode || config.testkit?.mode || "test",
     ...(config.runtimeId ? { TESTKIT_RUNTIME_ID: String(config.runtimeId) } : {}),
+    ...(config.testkit?.localEnvironmentName
+      ? { TESTKIT_LOCAL_ENV: String(config.testkit.localEnvironmentName) }
+      : {}),
     ...(lease?.leaseId ? { TESTKIT_LEASE_ID: String(lease.leaseId) } : {}),
     ...(lease?.leaseDir ? { TESTKIT_LEASE_DIR: lease.leaseDir } : {}),
   };
@@ -357,6 +372,16 @@ export function resolveTemplateString(value, context) {
         }
         return readyUrl;
       }
+      case "publicHost":
+        return context.publicHost || "127.0.0.1";
+      case "publicBaseUrl": {
+        const serviceName = arg || context.serviceName;
+        const publicBaseUrl = context.publicBaseUrlByService?.get(serviceName) || context.baseUrlByService.get(serviceName);
+        if (!publicBaseUrl) {
+          throw new Error(`Unknown publicBaseUrl placeholder for service "${serviceName}"`);
+        }
+        return publicBaseUrl;
+      }
       case "dbUrl":
       case "dbHost":
       case "dbPort":
@@ -372,6 +397,19 @@ export function resolveTemplateString(value, context) {
   });
 }
 
+function publicUrl(rawUrl, publicHost) {
+  if (!publicHost) return rawUrl;
+  try {
+    const url = new URL(rawUrl);
+    url.hostname = publicHost;
+    let next = url.toString();
+    if (!rawUrl.endsWith("/") && url.pathname === "/" && next.endsWith("/")) next = next.slice(0, -1);
+    return next;
+  } catch {
+    return rawUrl;
+  }
+}
+
 function resolveEnvTemplates(values, templateContext) {
   return Object.fromEntries(
     Object.entries(values || {}).map(([key, value]) => [

package/node_modules/@elench/next-analysis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/next-analysis",
-  "version": "0.1.135",
+  "version": "0.1.137",
   "description": "SWC-backed Next.js source analysis primitives for Erench tools",
   "type": "module",
   "exports": {

package/node_modules/@elench/testkit-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-bridge",
-  "version": "0.1.135",
+  "version": "0.1.137",
   "description": "Browser bridge helpers for testkit",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@elench/testkit-protocol": "0.1.135"
+    "@elench/testkit-protocol": "0.1.137"
   },
   "private": false
 }

package/node_modules/@elench/testkit-protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-protocol",
-  "version": "0.1.135",
+  "version": "0.1.137",
   "description": "Shared browser protocol for testkit bridge and extension consumers",
   "type": "module",
   "main": "./dist/index.js",

package/node_modules/@elench/ts-analysis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/ts-analysis",
-  "version": "0.1.135",
+  "version": "0.1.137",
   "description": "TypeScript compiler-backed source analysis primitives for Erench tools",
   "type": "module",
   "exports": {