@envsync-cloud/deploy-cli 0.6.6 → 0.6.8

package/dist/index.js

@@ -635,6 +635,10 @@ function renderTraefikDynamicConfig(config) {
     "      loadBalancer:",
     "        servers:",
     "          - url: http://web_nginx:8080",
+    "    browser-otlp:",
+    "      loadBalancer:",
+    "        servers:",
+    `          - url: http://clickstack:${config.services.clickstack_otlp_http_port}`,
     "  routers:",
     "    landing-router:",
     `      rule: Host(\`${hosts.landing}\`)`,
@@ -646,6 +650,18 @@ function renderTraefikDynamicConfig(config) {
     "      service: web",
     "      entryPoints: [websecure]",
     "      tls: {}",
+    "    landing-otlp-router:",
+    `      rule: Host(\`${hosts.landing}\`) && (PathPrefix(\`/v1/traces\`) || PathPrefix(\`/v1/logs\`) || PathPrefix(\`/v1/metrics\`))`,
+    "      service: browser-otlp",
+    "      priority: 100",
+    "      entryPoints: [websecure]",
+    "      tls: {}",
+    "    web-otlp-router:",
+    `      rule: Host(\`${hosts.app}\`) && (PathPrefix(\`/v1/traces\`) || PathPrefix(\`/v1/logs\`) || PathPrefix(\`/v1/metrics\`))`,
+    "      service: browser-otlp",
+    "      priority: 100",
+    "      entryPoints: [websecure]",
+    "      tls: {}",
     "    api-router:",
     `      rule: Host(\`${hosts.api}\`)`,
     "      service: envsync-api",
@@ -666,15 +682,17 @@ function renderNginxConf(kind) {
     "}"
   ].join("\n") + "\n";
 }
-function renderFrontendRuntimeConfig(config) {
+function renderFrontendRuntimeConfig(config, kind) {
   const hosts = domainMap(config.domain.root_domain);
+  const otelEndpoint = kind === "web" ? `https://${hosts.app}` : `https://${hosts.landing}`;
   return `window.__ENVSYNC_RUNTIME_CONFIG__ = ${JSON.stringify({
     apiBaseUrl: `https://${hosts.api}`,
     appBaseUrl: `https://${hosts.app}`,
     authBaseUrl: `https://${hosts.auth}`,
     keycloakRealm: config.auth.keycloak_realm,
     webClientId: config.auth.web_client_id,
-    apiDocsUrl: `https://${hosts.api}/docs`
+    apiDocsUrl: `https://${hosts.api}/docs`,
+    otelEndpoint
   }, null, 2)};
 `;
 }
@@ -1231,7 +1249,7 @@ function runBootstrapInit(config) {
     ],
     { quiet: true }
   ).trim();
-  const result = JSON.parse(output);
+  const result = parseBootstrapInitJson(output);
   if (!result.openfgaStoreId || !result.openfgaModelId) {
     throw new Error("Bootstrap init did not return OpenFGA IDs");
   }
@@ -1241,6 +1259,31 @@ function runBootstrapInit(config) {
     openfgaModelId: result.openfgaModelId
   };
 }
+function parseBootstrapInitJson(output) {
+  const trimmed = output.trim();
+  if (!trimmed) {
+    throw new Error("Bootstrap init returned no JSON output");
+  }
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    const lines = trimmed.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+    for (let index = lines.length - 1; index >= 0; index -= 1) {
+      const candidate = lines[index];
+      if (!candidate.startsWith("{") || !candidate.endsWith("}")) continue;
+      try {
+        return JSON.parse(candidate);
+      } catch {
+        continue;
+      }
+    }
+    throw new Error(
+      `Bootstrap init returned non-JSON output.
+Captured stdout:
+${trimmed}`
+    );
+  }
+}
 function hasCompleteBootstrapState(generated) {
   return REQUIRED_BOOTSTRAP_ENV_KEYS.every((key) => {
     switch (key) {
@@ -1587,8 +1630,8 @@ async function cmdDeploy() {
   }
   extractStaticBundle(config.images.web, `${RELEASES_ROOT}/web/current`);
   extractStaticBundle(config.images.landing, `${RELEASES_ROOT}/landing/current`);
-  writeFileMaybe(`${RELEASES_ROOT}/web/current/runtime-config.js`, renderFrontendRuntimeConfig(config));
-  writeFileMaybe(`${RELEASES_ROOT}/landing/current/runtime-config.js`, renderFrontendRuntimeConfig(config));
+  writeFileMaybe(`${RELEASES_ROOT}/web/current/runtime-config.js`, renderFrontendRuntimeConfig(config, "web"));
+  writeFileMaybe(`${RELEASES_ROOT}/landing/current/runtime-config.js`, renderFrontendRuntimeConfig(config, "landing"));
   if (currentOptions.dryRun) {
     logDryRun(`Would deploy full stack for ${config.services.stack_name}`);
     logCommand("docker", ["stack", "deploy", "-c", STACK_FILE, config.services.stack_name]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envsync-cloud/deploy-cli",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "CLI for self-hosted EnvSync deployment on Docker Swarm",
   "type": "module",
   "bin": {