@maintainer-pro/ai-bridge 0.1.13 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maintainer-pro/ai-bridge",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Local bridge daemon that pairs a machine to Maintainer Pro and configures multiple client sandboxes.",
   "keywords": [
     "maintainer-pro",
@@ -28,7 +28,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@maintainer-pro/ai-cli": "^0.1.7",
-    "@maintainer-pro/ai-server": "^0.1.6"
+    "@maintainer-pro/ai-cli": "^0.1.8",
+    "@maintainer-pro/ai-server": "^0.1.7"
   }
 }

package/src/daemon.mjs

@@ -5200,6 +5200,12 @@ async function main() {
 
   if (args.pair || !cfg.token || !cfg.adminUrl) {
     cfg = await pairFlow(args);
+  } else if (typeof args.adminUrl === "string" && args.adminUrl.trim()) {
+    const next = args.adminUrl.replace(/\/$/, "");
+    if (cfg.adminUrl && cfg.adminUrl !== next) {
+      log(`admin URL ${cfg.adminUrl} → ${next}`);
+    }
+    cfg.adminUrl = next;
   }
 
   cfg.noAiServer = Boolean(args.noAiServer);
@@ -5557,6 +5563,11 @@ async function main() {
       clearHeartbeatTimer();
       clearPingTimer();
       if (socket === ws) socket = null;
+      if (Number(code) === 1008) {
+        warn(
+          "Admin rejected this computer’s token. This admin is not the one in ~/.maintainer-pro/bridge.json. Generate a new pair code (Admin → Bridges → Add computer) and run the pair command."
+        );
+      }
       scheduleReconnect(code, reason);
     };
 

package/src/share-rewrite.mjs

@@ -237,17 +237,36 @@ function notModifiedResult(headers, etag) {
 
 function rewriteLocation(value, publicBase, port) {
   if (!publicBase) return value;
+  const base = String(publicBase).replace(/\/$/, "");
+  const prefix = proxyPathPrefix(publicBase);
   try {
     const u = new URL(value, `http://127.0.0.1:${Number(port) || 0}`);
-    if (u.hostname === "127.0.0.1" || u.hostname === "localhost") {
-      return `${String(publicBase).replace(/\/$/, "")}${u.pathname}${u.search}${u.hash}`;
+    const host = String(u.hostname || "").toLowerCase();
+    const local =
+      host === "127.0.0.1" ||
+      host === "localhost" ||
+      host === "::1" ||
+      host === "0.0.0.0";
+    if (!local) return value;
+    let path = u.pathname || "/";
+    if (prefix && (path === prefix || path.startsWith(`${prefix}/`))) {
+      path = path.slice(prefix.length) || "/";
     }
+    return `${base}${path}${u.search}${u.hash}`;
   } catch {
     /* keep */
   }
   return value;
 }
 
+function rewriteLinkHeader(value, publicBase) {
+  const prefix = proxyPathPrefix(publicBase);
+  if (!prefix || !value) return value;
+  return String(value).replace(/<(\/(?!\/)[^>\s]*)>/g, (full, path) =>
+    alreadyPrefixed(path, prefix) ? full : `<${prefix}${path}>`
+  );
+}
+
 function gzipIfRequested(payload, headers, acceptEncoding) {
   if (payload.length < 1024) return payload;
   if (!/\bgzip\b/i.test(acceptEncoding || "")) return payload;
@@ -411,9 +430,38 @@ function alreadyPrefixed(path, pathPrefix) {
   return path === pathPrefix || path.startsWith(`${pathPrefix}/`);
 }
 
+function rewriteNextFlightCanonical(body, pathPrefix) {
+  if (!pathPrefix || !body) return body;
+  const encoded = JSON.stringify(pathPrefix);
+  const escaped = pathPrefix.replaceAll("\\", "\\\\").replaceAll('"', '\\"');
+  let out = body;
+  if (out.includes(`"c":["",""]`)) {
+    out = out.split(`"c":["",""]`).join(`"c":[${encoded}]`);
+  }
+  if (out.includes('\\"c\\":[\\"\\",\\"\\"]')) {
+    out = out
+      .split('\\"c\\":[\\"\\",\\"\\"]')
+      .join(`\\"c\\":[\\"${escaped}\\"]`);
+  }
+  out = out.replace(/("b":"[^"]+","p":)""/g, `$1${encoded}`);
+  out = out.replace(
+    /(\\?"b\\":\\?"[^"]+\\?",\\?"p\\":)\\?"\\?"/g,
+    `$1\\"${escaped}\\"`
+  );
+  if (out.includes(`"assetPrefix":""`)) {
+    out = out.split(`"assetPrefix":""`).join(`"assetPrefix":${encoded}`);
+  }
+  if (out.includes('\\"assetPrefix\\":\\"\\"')) {
+    out = out
+      .split('\\"assetPrefix\\":\\"\\"')
+      .join(`\\"assetPrefix\\":\\"${escaped}\\"`);
+  }
+  return out;
+}
+
 function rewriteNextTurbopackBasePath(body, pathPrefix) {
   if (!pathPrefix) return body;
-  let out = body;
+  let out = rewriteNextFlightCanonical(body, pathPrefix);
   if (out.includes("TURBOPACK compile-time value")) {
     const next = JSON.stringify(pathPrefix);
     out = out
@@ -486,6 +534,7 @@ function prefixRootPaths(body, publicBase, contentType = "") {
     out = out.replace(/\s+crossorigin(?:\s*=\s*(["']).*?\1)?/gi, "");
   }
   if (isNextDocument(out)) {
+    out = rewriteNextFlightCanonical(out, pathPrefix);
     out = prefixQuotedRoots(out, pathPrefix, ["/_next/", "/__nextjs_"]);
     out = out.replace(
       /(url\(\s*['"]?)(\/(?!\/)[^)"']*)/gi,
@@ -610,7 +659,7 @@ function injectNextProxyShim(html, publicBase) {
     return html;
   }
   const p = JSON.stringify(prefix);
-  const script = `<script data-mp-proxy-next>(function(p){if(!p)return;function add(v){if(typeof v!=="string"||!v)return v;if(v.charAt(0)==="/"&&v.charAt(1)!=="/"){if(v===p||v.indexOf(p+"/")===0)return v;var root=p.slice(0,p.lastIndexOf("/"));if(root&&(v===root||v.indexOf(root+"/")===0)return v;if(v==="/api/v1"||v.indexOf("/api/v1/")===0)return v;return p+v}try{var u=new URL(v,location.href);var host=String(u.hostname||"").toLowerCase();if(host.charAt(0)==="["&&host.charAt(host.length-1)==="]")host=host.slice(1,-1);var local=host==="localhost"||host==="127.0.0.1"||host==="::1"||host==="0.0.0.0";if(!local){if(u.pathname===p){u.pathname="/";return u.toString()}if(u.pathname.indexOf(p+"/")===0){u.pathname=u.pathname.slice(p.length)||"/";return u.toString()}return v}var samePort=String(u.port||"")===String(location.port||"");if(samePort){u.pathname=add(u.pathname);return u.toString()}if(u.pathname===p||u.pathname.indexOf(p+"/")===0){u.protocol=location.protocol;u.host=location.host;return u.toString()}}catch(e){}return v}function mapSel(sel){if(typeof sel!=="string")return sel;var pairs=[["src=\\"/_next/","src=\\""+p+"/_next/"],["href=\\"/_next/","href=\\""+p+"/_next/"]];for(var i=0;i<pairs.length;i++){if(sel.indexOf(pairs[i][0])!==-1)return sel.split(pairs[i][0]).join(pairs[i][1])}return sel}function patchQS(proto,name){var orig=proto[name];proto[name]=function(sel){var r=orig.call(this,sel);if(name==="querySelector"){if(r)return r}else if(r.length)return r;var s2=mapSel(sel);return s2===sel?r:orig.call(this,s2)}}patchQS(Document.prototype,"querySelector");patchQS(Document.prototype,"querySelectorAll");patchQS(Element.prototype,"querySelector");patchQS(Element.prototype,"querySelectorAll");var sa=Element.prototype.setAttribute;Element.prototype.setAttribute=function(n,v){if((n==="src"||n==="href")&&typeof v==="string")v=add(v);return sa.call(this,n,v)};function patchUrlProp(ctor,prop){try{var d=Object.getOwnPropertyDescriptor(ctor.prototype,prop);if(!d||!d.set)return;Object.defineProperty(ctor.prototype,prop,{configurable:true,enumerable:true,get:d.get,set:function(v){d.set.call(this,add(v))}})}catch(e){}}patchUrlProp(HTMLScriptElement,"src");patchUrlProp(HTMLLinkElement,"href");var f=window.fetch;window.fetch=function(input,init){if(typeof input==="string")input=add(input);else if(typeof Request!=="undefined"&&input instanceof Request)input=new Request(add(input.url),input);else if(typeof URL!=="undefined"&&input instanceof URL)input=new URL(add(input.href));return f.call(this,input,init)};var xo=XMLHttpRequest.prototype.open;XMLHttpRequest.prototype.open=function(m,u){if(typeof u==="string")arguments[1]=add(u);return xo.apply(this,arguments)};var ps=history.pushState.bind(history);history.pushState=function(s,t,u){if(typeof u==="string")u=add(u);return ps(s,t,u)};var rs=history.replaceState.bind(history);history.replaceState=function(s,t,u){if(typeof u==="string")u=add(u);return rs(s,t,u)};var WS=window.WebSocket;function WrappedWS(url,protocols){if(typeof url==="string")url=add(url);return protocols!==undefined?new WS(url,protocols):new WS(url)}WrappedWS.prototype=WS.prototype;WrappedWS.CONNECTING=WS.CONNECTING;WrappedWS.OPEN=WS.OPEN;WrappedWS.CLOSING=WS.CLOSING;WrappedWS.CLOSED=WS.CLOSED;window.WebSocket=WrappedWS})(${p})</script>`;
+  const script = `<script data-mp-proxy-next>(function(p){if(!p)return;function add(v){if(typeof v!=="string"||!v)return v;function collapse(path){var d=p+p;while(path.indexOf(d)===0)path=p+path.slice(d.length);return path}if(v.charAt(0)==="/"&&v.charAt(1)!=="/"){if(v===p||v.indexOf(p+"/")===0)return collapse(v);var root=p.slice(0,p.lastIndexOf("/"));if(root&&(v===root||v.indexOf(root+"/")===0))return v;if(v==="/api/v1"||v.indexOf("/api/v1/")===0)return v;return collapse(p+v)}try{var u=new URL(v,location.href);var host=String(u.hostname||"").toLowerCase();if(host.charAt(0)==="["&&host.charAt(host.length-1)==="]")host=host.slice(1,-1);var local=host==="localhost"||host==="127.0.0.1"||host==="::1"||host==="0.0.0.0";if(!local){if(u.pathname===p){u.pathname="/";return u.toString()}if(u.pathname.indexOf(p+"/")===0){u.pathname=u.pathname.slice(p.length)||"/";return u.toString()}return v}var samePort=String(u.port||"")===String(location.port||"");if(samePort){u.pathname=add(u.pathname);return u.toString()}if(u.pathname===p||u.pathname.indexOf(p+"/")===0){u.protocol=location.protocol;u.host=location.host;return u.toString()}u.pathname=add(u.pathname||"/");u.protocol=location.protocol;u.host=location.host;return u.toString()}catch(e){}return v}function mapSel(sel){if(typeof sel!=="string")return sel;var pairs=[["src=\\"/_next/","src=\\""+p+"/_next/"],["href=\\"/_next/","href=\\""+p+"/_next/"]];for(var i=0;i<pairs.length;i++){if(sel.indexOf(pairs[i][0])!==-1)return sel.split(pairs[i][0]).join(pairs[i][1])}return sel}function patchQS(proto,name){var orig=proto[name];proto[name]=function(sel){var r=orig.call(this,sel);if(name==="querySelector"){if(r)return r}else if(r.length)return r;var s2=mapSel(sel);return s2===sel?r:orig.call(this,s2)}}patchQS(Document.prototype,"querySelector");patchQS(Document.prototype,"querySelectorAll");patchQS(Element.prototype,"querySelector");patchQS(Element.prototype,"querySelectorAll");var sa=Element.prototype.setAttribute;Element.prototype.setAttribute=function(n,v){if((n==="src"||n==="href")&&typeof v==="string")v=add(v);return sa.call(this,n,v)};function patchUrlProp(ctor,prop){try{var d=Object.getOwnPropertyDescriptor(ctor.prototype,prop);if(!d||!d.set)return;Object.defineProperty(ctor.prototype,prop,{configurable:true,enumerable:true,get:d.get,set:function(v){d.set.call(this,add(v))}})}catch(e){}}patchUrlProp(HTMLScriptElement,"src");patchUrlProp(HTMLLinkElement,"href");var f=window.fetch;window.fetch=function(input,init){if(typeof input==="string")input=add(input);else if(typeof Request!=="undefined"&&input instanceof Request)input=new Request(add(input.url),input);else if(typeof URL!=="undefined"&&input instanceof URL)input=new URL(add(input.href));return f.call(this,input,init)};var xo=XMLHttpRequest.prototype.open;XMLHttpRequest.prototype.open=function(m,u){if(typeof u==="string")arguments[1]=add(u);return xo.apply(this,arguments)};var ps=history.pushState.bind(history);history.pushState=function(s,t,u){if(typeof u==="string")u=add(u);return ps(s,t,u)};var rs=history.replaceState.bind(history);history.replaceState=function(s,t,u){if(typeof u==="string")u=add(u);return rs(s,t,u)};var WS=window.WebSocket;function WrappedWS(url,protocols){if(typeof url==="string")url=add(url);return protocols!==undefined?new WS(url,protocols):new WS(url)}WrappedWS.prototype=WS.prototype;WrappedWS.CONNECTING=WS.CONNECTING;WrappedWS.OPEN=WS.OPEN;WrappedWS.CLOSING=WS.CLOSING;WrappedWS.CLOSED=WS.CLOSED;window.WebSocket=WrappedWS;try{var la=location.assign.bind(location);location.assign=function(u){return la(add(String(u)))};var lr=location.replace.bind(location);location.replace=function(u){return lr(add(String(u)))}}catch(e){}try{var hd=Object.getOwnPropertyDescriptor(Location.prototype,"href");if(hd&&hd.set){Object.defineProperty(location,"href",{configurable:true,enumerable:true,get:function(){return hd.get.call(location)},set:function(v){hd.set.call(location,add(String(v)))}})}}catch(e){}})(${p})</script>`;
   return html.replace(/<head([^>]*)>/i, `<head$1>${script}`);
 }
 
@@ -649,6 +698,9 @@ export function processShareHttpResponse(opts) {
   if (headers.location) {
     headers.location = rewriteLocation(headers.location, publicBase, port);
   }
+  if (headers.link) {
+    headers.link = rewriteLinkHeader(headers.link, publicBase);
+  }
 
   const cachedKey = rewriteCacheKey(publicBase, path);
   const hit =