@rubytech/create-maxy 1.0.782 → 1.0.784

package/package.json

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

package/payload/platform/scripts/wifi-provision-server/server.js

@@ -39,6 +39,10 @@ const RESULT_FILE = args["result-file"] || "/tmp/wifi-provision-result";
 const BRAND_JSON = args["brand-json"] || "";
 const HOSTNAME = args.hostname || "maxy";
 const PORTAL_HOST = args["portal-host"] || "";
+// Brand service port (e.g. 19200). Distinct from PORT, which is the
+// captive portal's own listen port (always 80). Used only to render the
+// post-connect URL.
+const DEVICE_PORT = parseInt(args["device-port"] || "19200", 10);
 
 // ── Load brand config ─────────────────────────────────────────────────
 // All visual surfaces (colour, font, logo) come from brand.json so the
@@ -243,9 +247,11 @@ function portalHTML() {
   }
   .address-box a {
     color: ${colors.primary};
-    text-decoration: none;
+    text-decoration: underline;
     font-size: 16px;
     font-weight: 600;
+    display: block;
+    -webkit-tap-highlight-color: ${colors.primary};
   }
   .hint { color: #888; font-size: 13px; margin-top: 12px; line-height: 1.5; }
 </style>
@@ -285,13 +291,13 @@ function portalHTML() {
     <div class="card" style="padding:32px 16px">
       <div class="success-icon">&#10003;</div>
       <h1>Connected!</h1>
-      <p class="hint">${escapedBrandName} is now online. Redirecting in <span id="redirect-countdown">20</span>s…</p>
+      <p class="hint">${escapedBrandName} is now online. Redirecting in <span id="redirect-countdown">15</span>s…</p>
       <div class="address-box">
-        <a id="device-link" href="#" target="_blank"></a>
+        <a id="device-link" href="#"></a>
       </div>
-      <p class="hint" id="ip-fallback" style="display:none">If the page above doesn't load (some Android browsers don't resolve <code>.local</code>), use this direct IP:</p>
-      <div class="address-box" id="ip-fallback-box" style="display:none">
-        <a id="device-link-ip" href="#" target="_blank"></a>
+      <p class="hint" id="manual-hint" style="display:none">If your phone doesn't redirect automatically, open this in your normal browser:</p>
+      <div class="address-box" id="manual-box" style="display:none">
+        <span id="device-link-text" style="user-select:all"></span>
       </div>
       <p class="hint">This access point will close shortly.<br>Your phone will reconnect to your WiFi automatically.</p>
     </div>
@@ -301,7 +307,10 @@ function portalHTML() {
 (function() {
   "use strict";
   var selectedSSID = "";
-  var devicePort = ${PORT === 80 ? '""' : JSON.stringify(":" + PORT)};
+  // The brand service port (19200, configurable via --port), NOT the
+  // captive portal port (always 80). devicePort is appended to the
+  // post-connect URL so the link points at the admin server.
+  var devicePort = ${DEVICE_PORT === 80 ? '""' : JSON.stringify(":" + DEVICE_PORT)};
   var deviceHostname = ${JSON.stringify(HOSTNAME)};
 
   // Safe text insertion — no innerHTML for user-controlled content
@@ -410,37 +419,44 @@ function portalHTML() {
       ? "http://" + data.hostname + ".local" + devicePort
       : null;
     var ipAddr = data.ip ? "http://" + data.ip + devicePort : null;
-    // Display: prefer the friendly .local URL.
-    // Auto-redirect target: the raw IP. On Android (notably Brave) the
-    // mDNS .local lookup fails and the auto-navigate would dead-end;
-    // the IP works on every platform.
-    var displayAddr = hostnameAddr || ipAddr;
+    // Auto-navigate target: prefer the IP because mDNS .local resolution
+    // is flaky on Android (notably Brave) and the redirect dead-ends.
+    // The displayed link uses the same URL so what the user sees is what
+    // they get if they tap.
     var redirectAddr = ipAddr || hostnameAddr;
     var link = document.getElementById("device-link");
-    link.href = displayAddr;
-    link.textContent = displayAddr;
-    if (hostnameAddr && ipAddr && hostnameAddr !== ipAddr) {
-      var ipLink = document.getElementById("device-link-ip");
-      ipLink.href = ipAddr;
-      ipLink.textContent = ipAddr;
-      document.getElementById("ip-fallback").style.display = "block";
-      document.getElementById("ip-fallback-box").style.display = "block";
+    link.href = redirectAddr;
+    link.textContent = redirectAddr;
+    // Always surface a manual fallback line — captive webviews on some
+    // phone OSes silently swallow JS navigation, and the user needs to
+    // be able to copy-paste the URL into a real browser.
+    var manualText = document.getElementById("device-link-text");
+    if (manualText) {
+      manualText.textContent = redirectAddr;
+      document.getElementById("manual-hint").style.display = "block";
+      document.getElementById("manual-box").style.display = "block";
     }
     showScreen("success-screen");
-    // Countdown timing: the Pi keeps the AP up for ~10s after writing the
-    // success result (so this poll can land), then tears it down. The
-    // phone then needs ~5s to drop the AP SSID and auto-rejoin its home
-    // WiFi. A 20s countdown crosses both gates so the redirect lands
-    // when the phone is back on its home network and the device is
-    // routable on its new IP.
-    var remaining = 20;
+    // 15s countdown: the Pi keeps the AP up for ~10s after writing the
+    // success result so this poll can land, then tears it down; the
+    // phone then needs ~5s to drop the AP SSID and rejoin home WiFi.
+    var remaining = 15;
     var countdownEl = document.getElementById("redirect-countdown");
     var ticker = setInterval(function() {
       remaining -= 1;
       if (countdownEl) countdownEl.textContent = String(remaining);
       if (remaining <= 0) {
         clearInterval(ticker);
-        window.location.href = redirectAddr;
+        // Try multiple navigation primitives — captive webviews on some
+        // platforms ignore one but accept another.
+        try { window.location.replace(redirectAddr); } catch(e) {}
+        try { window.location.href = redirectAddr; } catch(e) {}
+        // Last-resort: synthesise a click on a freshly-built anchor.
+        try {
+          var a = document.createElement("a");
+          a.href = redirectAddr; a.rel = "noopener";
+          document.body.appendChild(a); a.click();
+        } catch(e) {}
       }
     }, 1000);
   }

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

@@ -60,6 +60,24 @@ LOG_FILE="${LOG_DIR}/wifi-provision.log"
 
 mkdir -p "$LOG_DIR"
 
+# Resolve the brand service's public port so the captive portal can render
+# the post-connect URL with the correct port (the captive portal itself
+# runs on :80, but the device's admin URL is on the brand port). Mirrors
+# the same precedence as the installer: ~/{configDir}/.env override, then
+# the systemd unit's Environment=PORT, then the documented default.
+BRAND_PORT="19200"
+if [ -f "${MAXY_DIR}/.env" ]; then
+  _p=$(grep -E '^PORT=' "${MAXY_DIR}/.env" 2>/dev/null | tail -1 | cut -d= -f2 | tr -d '"' | tr -d "'")
+  [ -n "$_p" ] && BRAND_PORT="$_p"
+fi
+if [ "$BRAND_PORT" = "19200" ]; then
+  _svc="${INSTALL_HOME}/.config/systemd/user/${HOSTNAME_NAME}.service"
+  if [ -f "$_svc" ]; then
+    _p=$(grep -E '^Environment=PORT=' "$_svc" 2>/dev/null | tail -1 | cut -d= -f3)
+    [ -n "$_p" ] && BRAND_PORT="$_p"
+  fi
+fi
+
 # ── Derived constants ────────────────────────────────────────────────
 # SSID: lowercase the product name and replace spaces with hyphens — gives
 # `maxy`, `real-agent`, etc. (kebab-case, no "-Setup" suffix). The user's
@@ -290,6 +308,7 @@ DNSMASQ_EOF
     --brand-json "$BRAND_JSON" \
     --hostname "$HOSTNAME_NAME" \
     --portal-host "$PORTAL_HOST" \
+    --device-port "$BRAND_PORT" \
     >> "$LOG_FILE" 2>&1 &
   HTTP_SERVER_PID=$!
   sleep 1