@abstractframework/continuum 0.3.1 → 0.4.0

package/bin/settings.js

@@ -22,6 +22,8 @@
 import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from 'fs';
 import { homedir } from 'os';
 import { dirname, join } from 'path';
+import { MountRequestError, resolveGatewayUrl } from '@abstractframework/app-server';
+import { request_gate } from './request_gate.js';
 
 const TRUE_VALUES = new Set(['1', 'true', 'yes', 'y', 'on']);
 const FALSE_VALUES = new Set(['0', 'false', 'no', 'n', 'off']);
@@ -50,7 +52,12 @@ export const SETTINGS = [
   {
     key: 'gateway_url',
     flag: '--gateway-url',
+    // The same spellings as every AbstractFramework app
+    // (@abstractframework/app-server parseAppFlags).
+    aliases: ['--gateway', '--url'],
     type: 'url',
+    // With no flag, setting or environment: the gateway installed on this
+    // computer (~/.abstractframework/gateway.json), else this URL.
     default: 'http://127.0.0.1:8080',
     env: ['ABSTRACTCONTINUUM_GATEWAY_URL', 'ABSTRACTGATEWAY_URL'],
     metavar: '<url>',
@@ -134,7 +141,7 @@ export const SETTINGS = [
 export const UI_WRITABLE_KEYS = ['hub_seat'];
 
 const BY_KEY = new Map(SETTINGS.map((s) => [s.key, s]));
-const BY_FLAG = new Map(SETTINGS.map((s) => [s.flag, s]));
+const BY_FLAG = new Map(SETTINGS.flatMap((s) => [s.flag, ...(s.aliases || [])].map((f) => [f, s])));
 
 export function setting_spec(key) {
   return BY_KEY.get(key) || null;
@@ -195,11 +202,16 @@ export function coerce(spec, raw) {
 /**
  * THE precedence function: flag > settings file > environment (legacy) >
  * default, per key. Returns `{ [key]: { value, source } }` with source one
- * of "flag" | "setting" | "env" | "default". An invalid file or env value
- * is skipped (reported in `problems`) so one bad entry cannot stop the
- * server; an invalid FLAG never reaches here (parse_args refuses it).
+ * of "flag" | "setting" | "env" | "pointer" | "default". An invalid file or
+ * env value is skipped (reported in `problems`) so one bad entry cannot
+ * stop the server; an invalid FLAG never reaches here (parse_args refuses
+ * it).
+ *
+ * gateway_url with nothing chosen follows the kit's local gateway pointer
+ * (`~/.abstractframework/gateway.json` under `home`, source "pointer"),
+ * else the built-in default: the same reader as every other app.
  */
-export function resolve_settings({ flags = {}, file = {}, env = {} } = {}) {
+export function resolve_settings({ flags = {}, file = {}, env = {}, home, pointer } = {}) {
   const out = {};
   const problems = [];
   for (const spec of SETTINGS) {
@@ -227,6 +239,10 @@ export function resolve_settings({ flags = {}, file = {}, env = {} } = {}) {
         break;
       }
     }
+    if (!picked && k === 'gateway_url') {
+      const r = resolveGatewayUrl({ home, pointer, warn: (m) => problems.push(m) });
+      picked = { value: r.url, source: r.source === 'pointer' ? 'pointer' : 'default' };
+    }
     if (!picked) picked = { value: spec.default, source: 'default' };
     out[k] = picked;
   }
@@ -276,7 +292,13 @@ export function display_value(spec, value) {
   return String(value);
 }
 
-export const SOURCE_WORDS = { flag: 'launch flag', setting: 'setting', env: 'environment (legacy)', default: 'default' };
+export const SOURCE_WORDS = {
+  flag: 'launch flag',
+  setting: 'setting',
+  env: 'environment (legacy)',
+  pointer: 'the gateway installed on this computer',
+  default: 'default',
+};
 
 /**
  * Parse argv. Shapes:
@@ -379,7 +401,7 @@ export function apply_session_proxy_gates(settings, env) {
  * without a restart). Port, host, gateway URL and the sign-in gates are
  * read once at start.
  */
-export function createLiveSettings({ flags = {}, settingsPath, env = process.env, onProblem = () => {} }) {
+export function createLiveSettings({ flags = {}, settingsPath, env = process.env, home, onProblem = () => {} }) {
   let stamp = '';
   let file = {};
   let resolved = null;
@@ -398,7 +420,7 @@ export function createLiveSettings({ flags = {}, settingsPath, env = process.env
     } catch (e) {
       onProblem(`settings file ${settingsPath}: ${e.message}`);
     }
-    const r = resolve_settings({ flags, file, env });
+    const r = resolve_settings({ flags, file, env, home });
     for (const p of r.problems) onProblem(p);
     resolved = r.settings;
     return resolved;
@@ -421,21 +443,6 @@ function send_json(res, status, body) {
   res.end(JSON.stringify(body));
 }
 
-function is_loopback_peer(req) {
-  const peer = String(req.socket && req.socket.remoteAddress ? req.socket.remoteAddress : '');
-  return peer === '127.0.0.1' || peer === '::1' || peer === '::ffff:127.0.0.1' || peer === '';
-}
-
-function same_origin(req) {
-  const origin = String((req.headers && req.headers.origin) || '').trim();
-  if (!origin) return true;
-  try {
-    return new URL(origin).host.toLowerCase() === String((req.headers && req.headers.host) || '').trim().toLowerCase();
-  } catch {
-    return false;
-  }
-}
-
 /** Public view: every setting with its source; secrets as presence only. */
 export function settings_view(live, extra = {}) {
   const s = live.get();
@@ -449,9 +456,11 @@ export function settings_view(live, extra = {}) {
 
 /**
  * GET/PUT /api/continuum/settings — the Settings page's door to this
- * server's own settings. Local only: the socket peer must be loopback
- * (the same gate as the hub proxy, which this seat setting steers) and a
- * browser Origin must match the Host. PUT takes `{ hub_seat: "<seat>" }`
+ * server's own settings. Local only: the BROWSER must run on this computer
+ * (bin/request_gate.js — behind the gateway's /apps/continuum/ that is the
+ * forwarded client address, never the socket peer; the same gate as the hub
+ * proxy, which this seat setting steers) and a browser Origin must match
+ * the host it addressed. PUT takes `{ hub_seat: "<seat>" }`
  * or `{ hub_seat: null }` (back to the default) and persists to the
  * settings file.
  */
@@ -462,11 +471,19 @@ export function createSettingsRoute({ live, extra = () => ({}) }) {
     path: SETTINGS_ROUTE,
     handle(req, res, pathname) {
       if (pathname !== SETTINGS_ROUTE) return false;
-      if (!is_loopback_peer(req)) {
+      let gate;
+      try {
+        gate = request_gate(req);
+      } catch (e) {
+        if (!(e instanceof MountRequestError)) throw e;
+        send_json(res, e.status, { error: 'bad_request', detail: e.message });
+        return true;
+      }
+      if (!gate.loopback) {
         send_json(res, 403, { error: 'settings_non_loopback', detail: "Continuum's settings can only be changed from the computer it runs on." });
         return true;
       }
-      if (!same_origin(req)) {
+      if (!gate.same_origin) {
         send_json(res, 403, { error: 'settings_cross_origin', detail: 'Cross-origin requests to the settings route are refused.' });
         return true;
       }

package/dist/assets/{abnfDiagram-VRR7QNED-DkP5u0Ku.js → abnfDiagram-VRR7QNED-CptTkH57.js}

@@ -1,2 +1,2 @@
-import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-DI56DwNK.js";import{p as f}from"./chunk-JWPE2WC7-CuM7Hcrw.js";import{_ as n,l as o}from"./mermaid.core-CkQqPHPZ.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-Cz79Fwdx.js";import"./index-DTn9k-3t.js";var v=d().RailroadAbnf.parser.LangiumParser,i=n(e=>{const r=e.alternatives.map(g);return r.length===1?r[0]:{type:"choice",alternatives:r}},"transformAlternation"),g=n(e=>{const r=e.elements.map(y);return r.length===1?r[0]:{type:"sequence",elements:r}},"transformConcatenation"),b=n(e=>{if(e.includes("*")){const[t,s]=e.split("*"),l=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:l,max:m}}const r=parseInt(e,10);return{min:r,max:r}},"parseRepeat"),y=n(e=>{const r=A(e.primary);if(!e.repeat)return r;const{min:t,max:s}=b(e.repeat);return t===0&&s===1?{type:"optional",element:r}:{type:"repetition",element:r,min:t,max:s}},"transformElement"),A=n(e=>{switch(e.$type){case"AbnfStringLiteral":return{type:"terminal",value:e.value};case"AbnfNumVal":return{type:"terminal",value:e.value};case"AbnfRuleName":return{type:"nonterminal",name:e.name};case"AbnfGroup":return i(e.element);case"AbnfOptionalGroup":return{type:"optional",element:i(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:i(e.definition)}),"transformRule"),h=n(e=>{f(e,a),e.title&&a.setTitle(e.title),e.rules.map(r=>a.addRule(P(r)))},"populateDb"),R={parse:n(e=>{a.clear(),o.debug("[ABNF Parser] Starting Langium parse");const r=v.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new c(r);const t=r.value;o.debug("[ABNF Parser] Parsed rules:",t.rules.length),h(t),o.debug("[ABNF Parser] Parse complete")},"parse"),parser:{yy:a}},B={parser:R,db:a,renderer:u,styles:p};export{B as diagram};
-//# sourceMappingURL=abnfDiagram-VRR7QNED-DkP5u0Ku.js.map
+import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-CzzOSJWb.js";import{p as f}from"./chunk-JWPE2WC7-DaTATpXD.js";import{_ as n,l as o}from"./mermaid.core-rvwxvqSK.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-DFRQoaMD.js";import"./index-Cn7OlSFa.js";var v=d().RailroadAbnf.parser.LangiumParser,i=n(e=>{const r=e.alternatives.map(g);return r.length===1?r[0]:{type:"choice",alternatives:r}},"transformAlternation"),g=n(e=>{const r=e.elements.map(y);return r.length===1?r[0]:{type:"sequence",elements:r}},"transformConcatenation"),b=n(e=>{if(e.includes("*")){const[t,s]=e.split("*"),l=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:l,max:m}}const r=parseInt(e,10);return{min:r,max:r}},"parseRepeat"),y=n(e=>{const r=A(e.primary);if(!e.repeat)return r;const{min:t,max:s}=b(e.repeat);return t===0&&s===1?{type:"optional",element:r}:{type:"repetition",element:r,min:t,max:s}},"transformElement"),A=n(e=>{switch(e.$type){case"AbnfStringLiteral":return{type:"terminal",value:e.value};case"AbnfNumVal":return{type:"terminal",value:e.value};case"AbnfRuleName":return{type:"nonterminal",name:e.name};case"AbnfGroup":return i(e.element);case"AbnfOptionalGroup":return{type:"optional",element:i(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:i(e.definition)}),"transformRule"),h=n(e=>{f(e,a),e.title&&a.setTitle(e.title),e.rules.map(r=>a.addRule(P(r)))},"populateDb"),R={parse:n(e=>{a.clear(),o.debug("[ABNF Parser] Starting Langium parse");const r=v.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new c(r);const t=r.value;o.debug("[ABNF Parser] Parsed rules:",t.rules.length),h(t),o.debug("[ABNF Parser] Parse complete")},"parse"),parser:{yy:a}},B={parser:R,db:a,renderer:u,styles:p};export{B as diagram};
+//# sourceMappingURL=abnfDiagram-VRR7QNED-CptTkH57.js.map

package/dist/assets/{arc-vxPq5BjA.js → arc-oQ5R3mHX.js}

@@ -1,2 +1,2 @@
-import{Y as ln,$ as an,a0 as F,a1 as q,a2 as j,a3 as un,a4 as y,a5 as tn,a6 as J,a7 as _,a8 as rn,a9 as o,aa as on,ab as sn,ac as fn}from"./mermaid.core-CkQqPHPZ.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function dn(l){return l.endAngle}function mn(l){return l&&l.padAngle}function pn(l,h,I,D,v,A,z,a){var O=I-l,i=D-h,n=z-v,d=a-A,u=d*O-n*i;if(!(u*u<y))return u=(n*(h-A)-d*(l-v))/u,[l+u*O,h+u*i]}function U(l,h,I,D,v,A,z){var a=l-I,O=h-D,i=(z?A:-A)/J(a*a+O*O),n=i*O,d=-i*a,u=l+n,s=h+d,f=I+n,c=D+d,B=(u+f)/2,t=(s+c)/2,m=f-u,g=c-s,R=m*m+g*g,T=v-A,P=u*c-f*s,S=(g<0?-1:1)*J(on(0,T*T*R-P*P)),Y=(P*g-m*S)/R,$=(-P*m-g*S)/R,w=(P*g+m*S)/R,p=(-P*m+g*S)/R,x=Y-B,e=$-t,r=w-B,C=p-t;return x*x+e*e>r*r+C*C&&(Y=w,$=p),{cx:Y,cy:$,x01:-n,y01:-d,x11:Y*(v/T-1),y11:$*(v/T-1)}}function hn(){var l=cn,h=yn,I=j(0),D=null,v=gn,A=dn,z=mn,a=null,O=ln(i);function i(){var n,d,u=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-un,c=A.apply(this,arguments)-un,B=rn(c-f),t=c>f;if(a||(a=n=O()),s<u&&(d=s,s=u,u=d),!(s>y))a.moveTo(0,0);else if(B>tn-y)a.moveTo(s*F(f),s*q(f)),a.arc(0,0,s,f,c,!t),u>y&&(a.moveTo(u*F(c),u*q(c)),a.arc(0,0,u,c,f,t));else{var m=f,g=c,R=f,T=c,P=B,S=B,Y=z.apply(this,arguments)/2,$=Y>y&&(D?+D.apply(this,arguments):J(u*u+s*s)),w=_(rn(s-u)/2,+I.apply(this,arguments)),p=w,x=w,e,r;if($>y){var C=sn($/u*q(Y)),K=sn($/s*q(Y));(P-=C*2)>y?(C*=t?1:-1,R+=C,T-=C):(P=0,R=T=(f+c)/2),(S-=K*2)>y?(K*=t?1:-1,m+=K,g-=K):(S=0,m=g=(f+c)/2)}var G=s*F(m),H=s*q(m),L=u*F(T),M=u*q(T);if(w>y){var N=s*F(g),Q=s*q(g),V=u*F(R),W=u*q(R),E;if(B<an)if(E=pn(G,H,V,W,N,Q,L,M)){var X=G-E[0],Z=H-E[1],b=N-E[0],k=Q-E[1],nn=1/q(fn((X*b+Z*k)/(J(X*X+Z*Z)*J(b*b+k*k)))/2),en=J(E[0]*E[0]+E[1]*E[1]);p=_(w,(u-en)/(nn-1)),x=_(w,(s-en)/(nn+1))}else p=x=0}S>y?x>y?(e=U(V,W,G,H,s,x,t),r=U(N,Q,L,M,s,x,t),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<w?a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,s,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),!t),a.arc(r.cx,r.cy,x,o(r.y11,r.x11),o(r.y01,r.x01),!t))):(a.moveTo(G,H),a.arc(0,0,s,m,g,!t)):a.moveTo(G,H),!(u>y)||!(P>y)?a.lineTo(L,M):p>y?(e=U(L,M,N,Q,u,-p,t),r=U(G,H,V,W,u,-p,t),a.lineTo(e.cx+e.x01,e.cy+e.y01),p<w?a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,u,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),t),a.arc(r.cx,r.cy,p,o(r.y11,r.x11),o(r.y01,r.x01),!t))):a.arc(0,0,u,T,R,t)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,d=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-an/2;return[F(d)*n,q(d)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:j(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:j(+n),i):h},i.cornerRadius=function(n){return arguments.length?(I=typeof n=="function"?n:j(+n),i):I},i.padRadius=function(n){return arguments.length?(D=n==null?null:typeof n=="function"?n:j(+n),i):D},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:j(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:j(+n),i):A},i.padAngle=function(n){return arguments.length?(z=typeof n=="function"?n:j(+n),i):z},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{hn as d};
-//# sourceMappingURL=arc-vxPq5BjA.js.map
+import{Y as ln,$ as an,a0 as F,a1 as q,a2 as j,a3 as un,a4 as y,a5 as tn,a6 as J,a7 as _,a8 as rn,a9 as o,aa as on,ab as sn,ac as fn}from"./mermaid.core-rvwxvqSK.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function dn(l){return l.endAngle}function mn(l){return l&&l.padAngle}function pn(l,h,I,D,v,A,z,a){var O=I-l,i=D-h,n=z-v,d=a-A,u=d*O-n*i;if(!(u*u<y))return u=(n*(h-A)-d*(l-v))/u,[l+u*O,h+u*i]}function U(l,h,I,D,v,A,z){var a=l-I,O=h-D,i=(z?A:-A)/J(a*a+O*O),n=i*O,d=-i*a,u=l+n,s=h+d,f=I+n,c=D+d,B=(u+f)/2,t=(s+c)/2,m=f-u,g=c-s,R=m*m+g*g,T=v-A,P=u*c-f*s,S=(g<0?-1:1)*J(on(0,T*T*R-P*P)),Y=(P*g-m*S)/R,$=(-P*m-g*S)/R,w=(P*g+m*S)/R,p=(-P*m+g*S)/R,x=Y-B,e=$-t,r=w-B,C=p-t;return x*x+e*e>r*r+C*C&&(Y=w,$=p),{cx:Y,cy:$,x01:-n,y01:-d,x11:Y*(v/T-1),y11:$*(v/T-1)}}function hn(){var l=cn,h=yn,I=j(0),D=null,v=gn,A=dn,z=mn,a=null,O=ln(i);function i(){var n,d,u=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-un,c=A.apply(this,arguments)-un,B=rn(c-f),t=c>f;if(a||(a=n=O()),s<u&&(d=s,s=u,u=d),!(s>y))a.moveTo(0,0);else if(B>tn-y)a.moveTo(s*F(f),s*q(f)),a.arc(0,0,s,f,c,!t),u>y&&(a.moveTo(u*F(c),u*q(c)),a.arc(0,0,u,c,f,t));else{var m=f,g=c,R=f,T=c,P=B,S=B,Y=z.apply(this,arguments)/2,$=Y>y&&(D?+D.apply(this,arguments):J(u*u+s*s)),w=_(rn(s-u)/2,+I.apply(this,arguments)),p=w,x=w,e,r;if($>y){var C=sn($/u*q(Y)),K=sn($/s*q(Y));(P-=C*2)>y?(C*=t?1:-1,R+=C,T-=C):(P=0,R=T=(f+c)/2),(S-=K*2)>y?(K*=t?1:-1,m+=K,g-=K):(S=0,m=g=(f+c)/2)}var G=s*F(m),H=s*q(m),L=u*F(T),M=u*q(T);if(w>y){var N=s*F(g),Q=s*q(g),V=u*F(R),W=u*q(R),E;if(B<an)if(E=pn(G,H,V,W,N,Q,L,M)){var X=G-E[0],Z=H-E[1],b=N-E[0],k=Q-E[1],nn=1/q(fn((X*b+Z*k)/(J(X*X+Z*Z)*J(b*b+k*k)))/2),en=J(E[0]*E[0]+E[1]*E[1]);p=_(w,(u-en)/(nn-1)),x=_(w,(s-en)/(nn+1))}else p=x=0}S>y?x>y?(e=U(V,W,G,H,s,x,t),r=U(N,Q,L,M,s,x,t),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<w?a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,s,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),!t),a.arc(r.cx,r.cy,x,o(r.y11,r.x11),o(r.y01,r.x01),!t))):(a.moveTo(G,H),a.arc(0,0,s,m,g,!t)):a.moveTo(G,H),!(u>y)||!(P>y)?a.lineTo(L,M):p>y?(e=U(L,M,N,Q,u,-p,t),r=U(G,H,V,W,u,-p,t),a.lineTo(e.cx+e.x01,e.cy+e.y01),p<w?a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,u,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),t),a.arc(r.cx,r.cy,p,o(r.y11,r.x11),o(r.y01,r.x01),!t))):a.arc(0,0,u,T,R,t)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,d=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-an/2;return[F(d)*n,q(d)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:j(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:j(+n),i):h},i.cornerRadius=function(n){return arguments.length?(I=typeof n=="function"?n:j(+n),i):I},i.padRadius=function(n){return arguments.length?(D=n==null?null:typeof n=="function"?n:j(+n),i):D},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:j(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:j(+n),i):A},i.padAngle=function(n){return arguments.length?(z=typeof n=="function"?n:j(+n),i):z},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{hn as d};
+//# sourceMappingURL=arc-oQ5R3mHX.js.map