npm - @rubytech/create-maxy - Versions diffs - 1.0.743 → 1.0.744 - Mend

@rubytech/create-maxy 1.0.743 → 1.0.744

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

package/payload/server/maxy-edge.js CHANGED Viewed

@@ -16,13 +16,13 @@ import {
   sanitizeClientCorrId,
   streamActionEvents,
   vncLog
-} from "./chunk-JLVVVQN7.js";
+} from "./chunk-2T4RRIJK.js";
 import "./chunk-TXPEEAV6.js";
 // server/edge.ts
 import { createServer, request as httpRequest } from "http";
 import { createConnection as createConnection2 } from "net";
-import { readFileSync as readFileSync3, existsSync as existsSync4, watchFile } from "fs";
+import { readFileSync as readFileSync4, existsSync as existsSync5, watchFile } from "fs";
 import { homedir } from "os";
 import { join as join3 } from "path";
@@ -666,23 +666,90 @@ function createEdgeAdminApp(opts) {
   return app6;
 }
-// server/edge.ts
-var PLATFORM_ROOT2 = process.env.MAXY_PLATFORM_ROOT || "";
-var BRAND_JSON_PATH = PLATFORM_ROOT2 ? join3(PLATFORM_ROOT2, "config", "brand.json") : "";
-var BRAND = { configDir: ".maxy" };
-if (BRAND_JSON_PATH && existsSync4(BRAND_JSON_PATH)) {
+// server/edge-fallback.ts
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
+var BRAND_DEFAULTS = { configDir: ".maxy", productName: "Maxy" };
+function loadBrand(path) {
+  if (!path || !existsSync4(path)) return { ...BRAND_DEFAULTS };
   try {
-    const parsed = JSON.parse(readFileSync3(BRAND_JSON_PATH, "utf-8"));
-    if (typeof parsed.configDir === "string") BRAND.configDir = parsed.configDir;
+    const parsed = JSON.parse(readFileSync3(path, "utf-8"));
+    return {
+      configDir: typeof parsed.configDir === "string" ? parsed.configDir : BRAND_DEFAULTS.configDir,
+      productName: typeof parsed.productName === "string" ? parsed.productName : BRAND_DEFAULTS.productName
+    };
   } catch (err) {
     console.error(`[edge] brand.json parse error: ${err.message}`);
+    return { ...BRAND_DEFAULTS };
   }
 }
+function classifyUpstreamError(err) {
+  return err && err.code === "ECONNREFUSED" ? "econnrefused-coldstart" : "other";
+}
+var HTML_ESCAPES = { "<": "&lt;", ">": "&gt;", "&": "&amp;", '"': "&quot;", "'": "&#39;" };
+function escapeHtml(s) {
+  return String(s).replace(/[<>&"']/g, (c) => HTML_ESCAPES[c] ?? c);
+}
+function buildHoldingPage(productName) {
+  const safeName = escapeHtml(productName);
+  return `<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <title>${safeName}</title>
+  <style>
+    html, body { margin: 0; padding: 0; height: 100%; }
+    body {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+      background: #fafaf8;
+      color: #2a2a2a;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+    }
+    .name { font-size: 1.4rem; font-weight: 500; margin: 0 0 0.5rem; }
+    .sub { font-size: 0.95rem; color: #888; margin: 0; }
+    .dot {
+      display: inline-block; width: 6px; height: 6px; border-radius: 50%;
+      background: currentColor; margin: 0 2px; opacity: 0.3;
+      animation: pulse 1.4s infinite ease-in-out;
+    }
+    .dot:nth-child(2) { animation-delay: 0.2s; }
+    .dot:nth-child(3) { animation-delay: 0.4s; }
+    @keyframes pulse { 0%, 80%, 100% { opacity: 0.3; } 40% { opacity: 1; } }
+  </style>
+</head>
+<body>
+  <p class="name">${safeName} is starting</p>
+  <p class="sub"><span class="dot"></span><span class="dot"></span><span class="dot"></span></p>
+  <script>
+    (function () {
+      var attempts = 0;
+      var MAX = 120;
+      function poll() {
+        if (attempts++ >= MAX) return;
+        fetch('/api/health', { cache: 'no-store' })
+          .then(function (r) { if (r.ok) location.reload(); else setTimeout(poll, 1500); })
+          .catch(function () { setTimeout(poll, 1500); });
+      }
+      setTimeout(poll, 1500);
+    })();
+  </script>
+</body>
+</html>
+`;
+}
+// server/edge.ts
+var PLATFORM_ROOT2 = process.env.MAXY_PLATFORM_ROOT || "";
+var BRAND_JSON_PATH = PLATFORM_ROOT2 ? join3(PLATFORM_ROOT2, "config", "brand.json") : "";
+var BRAND = loadBrand(BRAND_JSON_PATH);
 var ALIAS_DOMAINS_PATH = join3(homedir(), BRAND.configDir, "alias-domains.json");
 function loadAliasDomains() {
   try {
-    if (!existsSync4(ALIAS_DOMAINS_PATH)) return /* @__PURE__ */ new Set();
-    const parsed = JSON.parse(readFileSync3(ALIAS_DOMAINS_PATH, "utf-8"));
+    if (!existsSync5(ALIAS_DOMAINS_PATH)) return /* @__PURE__ */ new Set();
+    const parsed = JSON.parse(readFileSync4(ALIAS_DOMAINS_PATH, "utf-8"));
     if (!Array.isArray(parsed)) return /* @__PURE__ */ new Set();
     return new Set(parsed.filter((h) => typeof h === "string"));
   } catch {
@@ -735,12 +802,22 @@ function forwardHttp(clientReq, clientRes) {
     upstreamRes.pipe(clientRes);
   });
   upstream.on("error", (err) => {
-    console.error(`[edge] upstream http error path=${clientReq.url} err=${err.message}`);
-    if (!clientRes.headersSent) {
-      clientRes.writeHead(502, { "content-type": "text/plain" });
-      clientRes.end("Bad Gateway (maxy-ui unavailable)");
-    } else {
+    const errClass = classifyUpstreamError(err);
+    console.error(
+      `[edge] upstream http error path=${clientReq.url} err=${err.message} err-class=${errClass} upstream=${UPSTREAM_HOST}:${UPSTREAM_PORT}`
+    );
+    if (clientRes.headersSent) {
       clientRes.destroy();
+      return;
+    }
+    const accept = String(clientReq.headers["accept"] ?? "");
+    const isHtmlNavigation = errClass === "econnrefused-coldstart" && clientReq.method === "GET" && accept.includes("text/html");
+    if (isHtmlNavigation) {
+      clientRes.writeHead(200, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" });
+      clientRes.end(buildHoldingPage(BRAND.productName));
+    } else {
+      clientRes.writeHead(502, { "content-type": "text/plain" });
+      clientRes.end(`Bad Gateway (${BRAND.productName} unavailable)`);
     }
   });
   clientReq.on("aborted", () => upstream.destroy());
@@ -827,6 +904,7 @@ server.on("upgrade", (req, socket, head) => {
 });
 server.listen(EDGE_PORT, EDGE_HOSTNAME, () => {
   console.log(`[edge] listening on http://${EDGE_HOSTNAME}:${EDGE_PORT}`);
+  console.log(`[edge] brand=${BRAND.productName}`);
   console.log(`[edge] /websockify \u2192 ${WEBSOCKIFY_HOST}:${WEBSOCKIFY_PORT}`);
   console.log(`[edge] everything else \u2192 ${UPSTREAM_HOST}:${UPSTREAM_PORT}`);
 });

package/payload/server/server.js CHANGED Viewed

@@ -46,7 +46,7 @@ import {
   vncLog,
   waitForExit,
   writeChromiumWrapper
-} from "./chunk-JLVVVQN7.js";
+} from "./chunk-2T4RRIJK.js";
 import {
   GREETING_DIRECTIVE,
   HAIKU_MODEL,