@rubytech/create-maxy 1.0.782 → 1.0.783

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy",
-  "version": "1.0.782",
+  "version": "1.0.783",
   "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>
@@ -287,11 +293,11 @@ function portalHTML() {
       <h1>Connected!</h1>
       <p class="hint">${escapedBrandName} is now online. Redirecting in <span id="redirect-countdown">20</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>
+        <a id="device-link-ip" href="#"></a>
       </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

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