@rubytech/create-maxy 1.0.777 → 1.0.779

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy",
-  "version": "1.0.777",
+  "version": "1.0.779",
   "description": "Install Maxy — AI for Productive People",
   "bin": {
     "create-maxy": "./dist/index.js"

package/payload/platform/plugins/docs/references/troubleshooting.md

@@ -125,7 +125,7 @@ If the initial Cloudflare login fails during setup, {{productName}} will fall ba
 
 Task 795 — `maxy-edge.service` (always-on front door) classifies upstream errors and serves a brand-aware response. There are two distinct user-visible shapes; the right one depends on what failed.
 
-**Branded holding page ("{{productName}} is starting") for ~10 s during an upgrade — this is expected and self-healing.** The edge process binds the public port immediately, but `maxy.service` (the upstream UI) takes ~10 s after restart to apply the neo4j schema and mount its 11 routes. Any browser navigation that lands during that window gets a self-contained HTML holding page that polls `/api/health` and reloads automatically once the upstream binds. No operator action required. The diagnostic line in `~/.maxy/logs/edge.log` is `[edge] upstream http error path=… err=connect ECONNREFUSED 127.0.0.1:<UPSTREAM_PORT> err-class=econnrefused-coldstart upstream=…` and disappears as soon as upstream binds.
+**Branded holding page (brand logo + "Starting") for ~10 s during an upgrade — this is expected and self-healing.** The edge process binds the public port immediately, but `maxy.service` (the upstream UI) takes ~10 s after restart to apply the neo4j schema and mount its 11 routes. Any browser navigation that lands during that window gets a self-contained HTML holding page that polls `/api/health` and reloads automatically once the upstream binds. The page renders the brand logo (inlined as a base64 data URI at edge boot from `<install>/server/public/brand/<assets.logo>`) and the brand display/body fonts (loaded from fonts.googleapis.com) — both paths bypass the unavailable upstream so the page never makes a same-origin asset fetch. When `brand.logoContainsName` is true the logo replaces the productName text; otherwise the page falls back to "{{productName}} is starting". No operator action required. The diagnostic line in `~/.maxy/logs/edge.log` is `[edge] upstream http error path=… err=connect ECONNREFUSED 127.0.0.1:<UPSTREAM_PORT> err-class=econnrefused-coldstart upstream=…` and disappears as soon as upstream binds. Boot-time confirmation that the logo resolved: `[edge] brand=<name> holding-logo=inlined assets-dir=<path>` — `holding-logo=missing` means the logo file wasn't found at `assets-dir`, the page degrades to text-only.
 
 **Branded plain-text 502 ("Bad Gateway ({{productName}} unavailable)") — real upstream failure, not cold-start.** Any error class other than `ECONNREFUSED` (timeouts, resets, host-unreachable) returns the existing 502 path. The diagnostic line carries `err-class=other`. Read the log with `tail -200 ~/.maxy/logs/edge.log | rg 'err-class=other'` and check `~/.maxy/logs/server.log` for upstream stack traces — the upstream itself is the source.
 

package/payload/platform/scripts/wifi-provision.sh

@@ -332,10 +332,28 @@ handle_connect_requests() {
     nmcli device set wlan0 managed yes 2>/dev/null
     sleep 2
 
+    # NM's wifi-list cache is empty immediately after wlan0 is handed back
+    # from hostapd, so `nmcli device wifi connect` reports "No network with
+    # SSID 'X' found" even when hostapd's pre-AP scan saw it. Trigger a
+    # rescan and poll until the target SSID appears in the cache (or 15s
+    # timeout) before attempting the connect.
+    nmcli device wifi rescan 2>/dev/null || true
+    local rescan_elapsed=0
+    while [ "$rescan_elapsed" -lt 15 ]; do
+      if nmcli -t -f SSID device wifi list 2>/dev/null | grep -Fxq "$target_ssid"; then
+        break
+      fi
+      sleep 1
+      rescan_elapsed=$((rescan_elapsed + 1))
+    done
+    log "rescan-before-connect: target=\"${target_ssid}\" elapsed=${rescan_elapsed}s"
+
     # Attempt WiFi connection. Capture exit code before || true so we
     # get nmcli's actual exit status, not the unconditional 0 from || true.
     local connect_output connect_exit
-    connect_output=$(nmcli device wifi connect "$target_ssid" password "$target_password" --wait 30 2>&1)
+    # `--wait` / `-w` is a top-level nmcli option (must precede the
+    # subcommand), not an argument to `device wifi connect`.
+    connect_output=$(nmcli --wait 30 device wifi connect "$target_ssid" password "$target_password" 2>&1)
     connect_exit=$?
 
     if [ $connect_exit -eq 0 ] && wifi_is_connected; then

package/payload/server/maxy-edge.js

@@ -24,7 +24,7 @@ import { createServer, request as httpRequest } from "http";
 import { createConnection as createConnection2 } from "net";
 import { readFileSync as readFileSync4, existsSync as existsSync5, watchFile } from "fs";
 import { homedir } from "os";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 
 // server/ws-proxy.ts
 import { createConnection } from "net";
@@ -668,14 +668,50 @@ function createEdgeAdminApp(opts) {
 
 // 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 };
+import { extname, join as join3 } from "path";
+var BRAND_DEFAULTS = {
+  configDir: ".maxy",
+  productName: "Maxy",
+  background: "#FAFAF8",
+  textColor: "#2A2A2A",
+  displayFont: "'Cormorant', Georgia, serif",
+  bodyFont: "'DM Sans', -apple-system, BlinkMacSystemFont, sans-serif",
+  logoContainsName: false,
+  logoDataUri: null
+};
+var MIME_BY_EXT = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".svg": "image/svg+xml",
+  ".webp": "image/webp",
+  ".gif": "image/gif"
+};
+function inlineAsset(filePath) {
+  if (!existsSync4(filePath)) return null;
+  const mime = MIME_BY_EXT[extname(filePath).toLowerCase()];
+  if (!mime) return null;
+  const bytes = readFileSync3(filePath);
+  return `data:${mime};base64,${bytes.toString("base64")}`;
+}
+function readString(value, fallback) {
+  return typeof value === "string" && value.length > 0 ? value : fallback;
+}
+function loadBrand(brandJsonPath2, assetsDir = "") {
+  if (!brandJsonPath2 || !existsSync4(brandJsonPath2)) return { ...BRAND_DEFAULTS };
   try {
-    const parsed = JSON.parse(readFileSync3(path, "utf-8"));
+    const parsed = JSON.parse(readFileSync3(brandJsonPath2, "utf-8"));
+    const logoFile = typeof parsed.assets?.logo === "string" ? parsed.assets.logo : null;
+    const logoDataUri = logoFile && assetsDir ? inlineAsset(join3(assetsDir, logoFile)) : null;
     return {
-      configDir: typeof parsed.configDir === "string" ? parsed.configDir : BRAND_DEFAULTS.configDir,
-      productName: typeof parsed.productName === "string" ? parsed.productName : BRAND_DEFAULTS.productName
+      configDir: readString(parsed.configDir, BRAND_DEFAULTS.configDir),
+      productName: readString(parsed.productName, BRAND_DEFAULTS.productName),
+      background: readString(parsed.defaultColors?.background, BRAND_DEFAULTS.background),
+      textColor: BRAND_DEFAULTS.textColor,
+      displayFont: readString(parsed.defaultFonts?.display, BRAND_DEFAULTS.displayFont),
+      bodyFont: readString(parsed.defaultFonts?.body, BRAND_DEFAULTS.bodyFont),
+      logoContainsName: parsed.logoContainsName === true,
+      logoDataUri
     };
   } catch (err) {
     console.error(`[edge] brand.json parse error: ${err.message}`);
@@ -689,40 +725,59 @@ var HTML_ESCAPES = { "<": "&lt;", ">": "&gt;", "&": "&amp;", '"': "&quot;", "'":
 function escapeHtml(s) {
   return String(s).replace(/[<>&"']/g, (c) => HTML_ESCAPES[c] ?? c);
 }
-function buildHoldingPage(productName) {
-  const safeName = escapeHtml(productName);
+function firstFontFamily(stack) {
+  const match = stack.match(/^\s*['"]([^'"]+)['"]/);
+  return match ? match[1] : null;
+}
+function googleFontsHref(displayFont, bodyFont) {
+  const families = [firstFontFamily(displayFont), firstFontFamily(bodyFont)].filter((f) => f !== null);
+  if (families.length === 0) return null;
+  const params = families.map((name) => `family=${encodeURIComponent(name)}:wght@400;500;600`).join("&");
+  return `https://fonts.googleapis.com/css2?${params}&display=swap`;
+}
+function buildHoldingPage(brand) {
+  const safeName = escapeHtml(brand.productName);
+  const fontsHref = googleFontsHref(brand.displayFont, brand.bodyFont);
+  const fontsLink = fontsHref ? `<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin><link rel="stylesheet" href="${escapeHtml(fontsHref)}">` : "";
+  const logoBlock = brand.logoDataUri ? `<img class="logo" src="${brand.logoDataUri}" alt="${safeName}">` : "";
+  const headline = brand.logoContainsName && brand.logoDataUri ? '<p class="sub">Starting</p>' : `<p class="name">${safeName} is starting</p>`;
   return `<!doctype html>
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <title>${safeName}</title>
+  ${fontsLink}
   <style>
     html, body { margin: 0; padding: 0; height: 100%; }
     body {
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-      background: #fafaf8;
-      color: #2a2a2a;
+      font-family: ${brand.bodyFont};
+      background: ${brand.background};
+      color: ${brand.textColor};
       display: flex;
       align-items: center;
       justify-content: center;
       flex-direction: column;
+      gap: 1.25rem;
     }
-    .name { font-size: 1.4rem; font-weight: 500; margin: 0 0 0.5rem; }
-    .sub { font-size: 0.95rem; color: #888; margin: 0; }
+    .logo { display: block; max-width: 240px; max-height: 120px; width: auto; height: auto; }
+    .name { font-family: ${brand.displayFont}; font-size: 2rem; font-weight: 500; margin: 0; letter-spacing: -0.01em; }
+    .sub { font-family: ${brand.bodyFont}; font-size: 0.95rem; color: ${brand.textColor}; opacity: 0.55; margin: 0; letter-spacing: 0.04em; text-transform: uppercase; }
+    .dots { display: flex; gap: 6px; align-items: center; }
     .dot {
       display: inline-block; width: 6px; height: 6px; border-radius: 50%;
-      background: currentColor; margin: 0 2px; opacity: 0.3;
+      background: currentColor; 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; } }
+    @keyframes pulse { 0%, 80%, 100% { opacity: 0.25; } 40% { opacity: 0.85; } }
   </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>
+  ${logoBlock}
+  ${headline}
+  <p class="dots"><span class="dot"></span><span class="dot"></span><span class="dot"></span></p>
   <script>
     (function () {
       var attempts = 0;
@@ -743,9 +798,10 @@ function buildHoldingPage(productName) {
 
 // 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");
+var BRAND_JSON_PATH = PLATFORM_ROOT2 ? join4(PLATFORM_ROOT2, "config", "brand.json") : "";
+var BRAND_ASSETS_DIR = PLATFORM_ROOT2 ? join4(PLATFORM_ROOT2, "..", "server", "public", "brand") : "";
+var BRAND = loadBrand(BRAND_JSON_PATH, BRAND_ASSETS_DIR);
+var ALIAS_DOMAINS_PATH = join4(homedir(), BRAND.configDir, "alias-domains.json");
 function loadAliasDomains() {
   try {
     if (!existsSync5(ALIAS_DOMAINS_PATH)) return /* @__PURE__ */ new Set();
@@ -814,7 +870,7 @@ function forwardHttp(clientReq, clientRes) {
     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));
+      clientRes.end(buildHoldingPage(BRAND));
     } else {
       clientRes.writeHead(502, { "content-type": "text/plain" });
       clientRes.end(`Bad Gateway (${BRAND.productName} unavailable)`);
@@ -904,7 +960,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] brand=${BRAND.productName} holding-logo=${BRAND.logoDataUri ? "inlined" : "missing"} assets-dir=${BRAND_ASSETS_DIR || "(none)"}`);
   console.log(`[edge] /websockify \u2192 ${WEBSOCKIFY_HOST}:${WEBSOCKIFY_PORT}`);
   console.log(`[edge] everything else \u2192 ${UPSTREAM_HOST}:${UPSTREAM_PORT}`);
 });