@rubytech/create-maxy-code 0.1.49 → 0.1.57

package/payload/server/maxy-edge.js

@@ -14,12 +14,13 @@ import {
   parseCookieValue,
   primeSudo,
   requireAdminCookie,
+  requirePortEnv,
   sanitizeClientCorrId,
   streamActionEvents,
   vncLog,
   websockifyLog
-} from "./chunk-MEGIQYUD.js";
-import "./chunk-4P2MPERV.js";
+} from "./chunk-2IKQERHN.js";
+import "./chunk-X3Y6ENKA.js";
 import "./chunk-JSBRDJBE.js";
 
 // server/edge.ts
@@ -596,32 +597,57 @@ function countClientErrors24h() {
 
 // server/routes/admin/version.ts
 var PLATFORM_ROOT = process.env.MAXY_PLATFORM_ROOT ?? resolve(process.cwd(), "..");
-var brandHostname = "maxy";
-var brandNpmPackage = "@rubytech/create-maxy";
-var brandJsonPath = join2(PLATFORM_ROOT, "config", "brand.json");
-if (existsSync3(brandJsonPath)) {
+var DEFAULT_HOSTNAME = "maxy";
+var DEFAULT_NPM_PACKAGE = "@rubytech/create-maxy";
+var FETCH_TIMEOUT_MS = 5e3;
+var fallbackLogged = /* @__PURE__ */ new Set();
+function logFallbackOnce(reason, field, usingDefault) {
+  const key = `${reason}:${field}`;
+  if (fallbackLogged.has(key)) return;
+  fallbackLogged.add(key);
+  console.log(`[admin/version] brand-config-fallback reason=${reason} field=${field} using=${usingDefault}`);
+}
+function resolveBrandConfig() {
+  const brandJsonPath = join2(PLATFORM_ROOT, "config", "brand.json");
+  if (!existsSync3(brandJsonPath)) {
+    logFallbackOnce("file-missing", "hostname", DEFAULT_HOSTNAME);
+    logFallbackOnce("file-missing", "npm.packageName", DEFAULT_NPM_PACKAGE);
+    return { hostname: DEFAULT_HOSTNAME, npmPackage: DEFAULT_NPM_PACKAGE };
+  }
+  let parsed;
   try {
-    const brand = JSON.parse(readFileSync2(brandJsonPath, "utf-8"));
-    if (brand.hostname) brandHostname = brand.hostname;
-    if (brand.npm?.packageName) brandNpmPackage = brand.npm.packageName;
+    parsed = JSON.parse(readFileSync2(brandJsonPath, "utf-8"));
   } catch {
+    logFallbackOnce("parse-failed", "hostname", DEFAULT_HOSTNAME);
+    logFallbackOnce("parse-failed", "npm.packageName", DEFAULT_NPM_PACKAGE);
+    return { hostname: DEFAULT_HOSTNAME, npmPackage: DEFAULT_NPM_PACKAGE };
   }
+  let hostname = DEFAULT_HOSTNAME;
+  let npmPackage = DEFAULT_NPM_PACKAGE;
+  if (typeof parsed?.hostname === "string" && parsed.hostname) {
+    hostname = parsed.hostname;
+  } else {
+    logFallbackOnce("field-missing", "hostname", DEFAULT_HOSTNAME);
+  }
+  if (typeof parsed?.npm?.packageName === "string" && parsed.npm.packageName) {
+    npmPackage = parsed.npm.packageName;
+  } else {
+    logFallbackOnce("field-missing", "npm.packageName", DEFAULT_NPM_PACKAGE);
+  }
+  return { hostname, npmPackage };
 }
-var VERSION_FILE = resolve(PLATFORM_ROOT, `config/.${brandHostname}-version`);
-var NPM_PACKAGE = brandNpmPackage;
-var REGISTRY_URL = `https://registry.npmjs.org/${NPM_PACKAGE}/latest`;
-var FETCH_TIMEOUT_MS = 5e3;
 var PROCESS_STARTED_AT = (/* @__PURE__ */ new Date()).toISOString();
-function readInstalled() {
-  if (!existsSync3(VERSION_FILE)) return "unknown";
-  const content = readFileSync2(VERSION_FILE, "utf-8").trim();
+function readInstalled(versionFile) {
+  if (!existsSync3(versionFile)) return "unknown";
+  const content = readFileSync2(versionFile, "utf-8").trim();
   return content || "unknown";
 }
-async function fetchLatest() {
+async function fetchLatest(npmPackage) {
+  const registryUrl = `https://registry.npmjs.org/${npmPackage}/latest`;
   try {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
-    const res = await fetch(REGISTRY_URL, { signal: controller.signal });
+    const res = await fetch(registryUrl, { signal: controller.signal });
     clearTimeout(timer);
     if (!res.ok) {
       console.error(`[admin/version] npm registry returned ${res.status}`);
@@ -654,13 +680,15 @@ function isNewer(latest, installed) {
 }
 var app5 = new Hono();
 app5.get("/", async (c) => {
-  const installed = readInstalled();
-  const latest = await fetchLatest();
+  const { hostname, npmPackage } = resolveBrandConfig();
+  const versionFile = resolve(PLATFORM_ROOT, `config/.${hostname}-version`);
+  const installed = readInstalled(versionFile);
+  const latest = await fetchLatest(npmPackage);
   const updateAvailable = installed !== "unknown" && latest !== null && isNewer(latest, installed);
   const outcome = installed === "unknown" ? "stale-version-file" : latest === null ? "fetch-failed" : "ok";
   const clientErrors24h = countClientErrors24h();
   console.log(
-    `[admin/version] outcome=${outcome} installed=${installed} latest=${latest ?? "null"} updateAvailable=${updateAvailable} clientErrors24h=${clientErrors24h} processStartedAt=${PROCESS_STARTED_AT}`
+    `[admin/version] outcome=${outcome} installed=${installed} latest=${latest ?? "null"} updateAvailable=${updateAvailable} clientErrors24h=${clientErrors24h} processStartedAt=${PROCESS_STARTED_AT} versionFile=${versionFile} npmPackage=${npmPackage}`
   );
   return c.json({ installed, latest, updateAvailable, clientErrors24h, processStartedAt: PROCESS_STARTED_AT });
 });
@@ -730,10 +758,10 @@ function inlineAsset(filePath) {
 function readString(value, fallback) {
   return typeof value === "string" && value.length > 0 ? value : fallback;
 }
-function loadBrand(brandJsonPath2, assetsDir = "") {
-  if (!brandJsonPath2 || !existsSync4(brandJsonPath2)) return { ...BRAND_DEFAULTS };
+function loadBrand(brandJsonPath, assetsDir = "") {
+  if (!brandJsonPath || !existsSync4(brandJsonPath)) return { ...BRAND_DEFAULTS };
   try {
-    const parsed = JSON.parse(readFileSync3(brandJsonPath2, "utf-8"));
+    const parsed = JSON.parse(readFileSync3(brandJsonPath, "utf-8"));
     const logoFile = typeof parsed.assets?.logo === "string" ? parsed.assets.logo : null;
     const logoDataUri = logoFile && assetsDir ? inlineAsset(join3(assetsDir, logoFile)) : null;
     return {
@@ -853,10 +881,10 @@ watchFile(ALIAS_DOMAINS_PATH, { interval: 2e3 }, () => {
 function isPublicHost(host) {
   return host.startsWith("public.") || aliasDomains.has(host);
 }
-var EDGE_PORT = parseInt(process.env.EDGE_PORT ?? process.env.PORT ?? "19200", 10);
+var EDGE_PORT = requirePortEnv("EDGE_PORT", { tag: "edge" });
 var EDGE_HOSTNAME = process.env.EDGE_HOSTNAME ?? "0.0.0.0";
 var UPSTREAM_HOST = process.env.MAXY_UI_HOST ?? "127.0.0.1";
-var UPSTREAM_PORT = parseInt(process.env.MAXY_UI_PORT ?? "19199", 10);
+var UPSTREAM_PORT = requirePortEnv("MAXY_UI_PORT", { tag: "edge" });
 var WEBSOCKIFY_HOST = process.env.WEBSOCKIFY_HOST ?? "127.0.0.1";
 var WEBSOCKIFY_PORT2 = parseInt(process.env.WEBSOCKIFY_PORT ?? String(WEBSOCKIFY_PORT), 10);
 var HOP_BY_HOP2 = /* @__PURE__ */ new Set([