mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-11-18 12:42:15 -05:00
Compare commits
16
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7231809140 | ||
|
|
8ca714cf1a | ||
|
|
ffd34de56c | ||
|
|
846c9dae55 | ||
|
|
e750712a39 | ||
|
|
ff8b0c530e | ||
|
|
69c5bfe544 | ||
|
|
3ad95b376a | ||
|
|
bda740b08d | ||
|
|
3c8c5f5883 | ||
|
|
c35544e515 | ||
|
|
0df4a5ec89 | ||
|
|
8e301e7db7 | ||
|
|
b712fb89c6 | ||
|
|
fe2c29371f | ||
|
|
61ee692815 |
+3
-3
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
.configuration-tree{margin-top:.25rem}.configuration-tree>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1.5rem * var(--tw-space-y-reverse))}.configuration-card{min-width:0px}.configuration-card-header{top:var(--configuration-sticky-top, 0px)}.configuration-card .configuration-card{margin-left:1rem;width:calc(100% - 1rem)}.configuration-card-body>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.125rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.125rem * var(--tw-space-y-reverse))}.configuration-card-body{padding:.125rem}.configuration-children>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.125rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.125rem * var(--tw-space-y-reverse))}.configuration-line{display:grid;min-width:0px;grid-template-columns:repeat(1,minmax(0,1fr));align-items:flex-start;gap:.125rem;border-radius:.375rem;--tw-bg-opacity: 1;background-color:rgb(38 38 38 / var(--tw-bg-opacity));padding:.125rem}@media(min-width:640px){.configuration-line{grid-template-columns:minmax(9rem,16rem) minmax(12rem,40rem)}}.configuration-line{justify-content:start}.configuration-key,.configuration-value{min-width:0px}.configuration-key-label{font-size:1rem;line-height:1.5rem;font-weight:600;line-height:1.375;--tw-text-opacity: 1;color:rgb(241 245 249 / var(--tw-text-opacity))}.configuration-root-description,.configuration-branch-description,.configuration-item-description,.configuration-value-description{display:block;font-size:.875rem;line-height:1.25rem;line-height:1.375;--tw-text-opacity: 1;color:rgb(203 213 225 / var(--tw-text-opacity));margin-top:.125rem}.configuration-root-description{margin-bottom:.25rem}.configuration-branch-description,.configuration-item-description{max-width:56rem}.configuration-value-description{margin-bottom:.125rem;max-width:40rem}.configuration-value input:not([type=checkbox]),.configuration-value select,.configuration-value textarea{width:100%;border-radius:.375rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(82 82 82 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(64 64 64 / var(--tw-bg-opacity));padding:.125rem;--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.configuration-value input:not([type=checkbox])::-moz-placeholder,.configuration-value select::-moz-placeholder,.configuration-value textarea::-moz-placeholder{--tw-text-opacity: 1;color:rgb(148 163 184 / var(--tw-text-opacity))}.configuration-value input:not([type=checkbox])::placeholder,.configuration-value select::placeholder,.configuration-value textarea::placeholder{--tw-text-opacity: 1;color:rgb(148 163 184 / var(--tw-text-opacity))}.configuration-value input:not([type=checkbox]):focus,.configuration-value select:focus,.configuration-value textarea:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000);--tw-ring-opacity: 1;--tw-ring-color: rgb(14 165 233 / var(--tw-ring-opacity))}.configuration-value input[type=checkbox]{height:1rem;width:1rem;vertical-align:middle;accent-color:#0ea5e9}.configuration-value .checkbox label{display:flex;min-height:1.75rem;align-items:center;--tw-text-opacity: 1;color:rgb(241 245 249 / var(--tw-text-opacity))}.configuration-value .error-detail{margin-top:.125rem;font-size:.75rem;line-height:1rem;--tw-text-opacity: 1;color:rgb(252 165 165 / var(--tw-text-opacity))}.configuration-value .help-block{margin-top:.125rem;display:block;font-size:.7rem;--tw-text-opacity: 1;color:rgb(100 116 139 / var(--tw-text-opacity))}.configuration-secret{min-width:0px}.configuration-item-actions,.configuration-array-actions{display:flex;flex-wrap:wrap;gap:.125rem}
|
|
||||||
File diff suppressed because one or more lines are too long
+2
-2
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
@@ -0,0 +1,2 @@
|
|||||||
|
import{r as g,R as a}from"./index-5EWtcenj.js";const d="64px",u={},k=({src:s,light:t,oEmbedUrl:o,onClickPreview:n,playIcon:b,previewTabIndex:_,previewAriaLabel:p})=>{const[f,r]=g.useState(null);g.useEffect(()=>{!s||!t||!o||x({src:s,light:t,oEmbedUrl:o})},[s,t,o]);const x=async({src:e,light:i,oEmbedUrl:E})=>{if(a.isValidElement(i))return;if(typeof i=="string"){r(i);return}if(u[e]){r(u[e]);return}r(null);const m=await(await fetch(E.replace("{url}",e))).json();if(m.thumbnail_url){const h=m.thumbnail_url.replace("height=100","height=480").replace("-d_295x166","-d_640");r(h),u[e]=h}},I=e=>{(e.key==="Enter"||e.key===" ")&&n?.(e)},v=e=>{n?.(e)},l=a.isValidElement(t),y={display:"flex",alignItems:"center",justifyContent:"center"},c={preview:{width:"100%",height:"100%",backgroundImage:f&&!l?`url(${f})`:void 0,backgroundSize:"cover",backgroundPosition:"center",cursor:"pointer",...y},shadow:{background:"radial-gradient(rgb(0, 0, 0, 0.3), rgba(0, 0, 0, 0) 60%)",borderRadius:d,width:d,height:d,position:l?"absolute":void 0,...y},playIcon:{borderStyle:"solid",borderWidth:"16px 0 16px 26px",borderColor:"transparent transparent transparent white",marginLeft:"7px"}},w=a.createElement("div",{style:c.shadow,className:"react-player__shadow"},a.createElement("div",{style:c.playIcon,className:"react-player__play-icon"}));return a.createElement("div",{style:c.preview,className:"react-player__preview",tabIndex:_,onClick:v,onKeyDown:I,...p?{"aria-label":p}:{}},l?t:null,b||w)};var C=k;export{C as default};
|
||||||
|
//# sourceMappingURL=Preview-CKTJqKe-.js.map
|
||||||
File diff suppressed because one or more lines are too long
+2
-2
@@ -1,2 +1,2 @@
|
|||||||
import{e as F,r as s,j as e,S as P,C as c,L as q}from"./index-n0JxE1Mv.js";import{o as $,p as D,q as I}from"./api-B8GGCEeo.js";function R(){const l=F(),[a,m]=s.useState(null),[n,b]=s.useState(""),[d,C]=s.useState(""),[p,N]=s.useState(""),[r,S]=s.useState(""),[f,v]=s.useState(""),[o,w]=s.useState(null),[x,h]=s.useState(!1),[g,i]=s.useState("");s.useEffect(()=>{$(l).then(t=>m(t.required)).catch(t=>i(t.message))},[l]);async function j(t){h(!0),i("");try{await t(),m(!1),i("Setup completed. You can now open the administration application and log in.")}catch(u){const E=Array.isArray(u.validationErrors)?` ${u.validationErrors.map(y=>`${y.path}: ${y.message}`).join("; ")}`:"";i(`${u.message}${E}`)}finally{h(!1)}}function k(t){if(t.preventDefault(),r!==f){i("Passwords do not match.");return}j(()=>D(l,{setupCode:n,username:d,discordId:p,password:r}))}function A(t){t.preventDefault(),o&&j(async()=>I(l,{setupCode:n,fileName:o.name,yaml:await o.text()}))}return e.jsxs("div",{className:"min-h-screen bg-neutral-950 p-1 text-slate-100",children:[e.jsx(P,{}),e.jsxs("main",{className:"mx-auto flex min-h-screen w-full max-w-3xl flex-col justify-center gap-0.5",children:[e.jsxs(c,{title:"MultiRover setup",meta:a===null?"checking":a?"required":"complete",bodyClassName:"space-y-0.5 p-1 text-sm",children:[a?e.jsx("p",{children:"Enter the one-time code from setup-code.txt in the server data folder, then create the first lockdown administrator or import an existing configuration."}):null,a===!1?e.jsx(q,{className:"button-dark inline-block",to:"/admin",children:"Open administration"}):null,g?e.jsx("p",{className:"surface p-1 text-sm text-slate-200",children:g}):null]}),a?e.jsxs(e.Fragment,{children:[e.jsxs(c,{title:"Setup authorization",bodyClassName:"p-1",children:[e.jsx("label",{className:"block text-xs font-semibold text-slate-200",children:"One-time setup code"}),e.jsx("input",{className:"field-input mt-0.5 w-full font-mono",value:n,onChange:t=>b(t.target.value)})]}),e.jsx(c,{title:"Create first administrator",bodyClassName:"p-1",children:e.jsxs("form",{className:"grid gap-0.5 md:grid-cols-2",onSubmit:k,children:[e.jsx("input",{className:"field-input",placeholder:"Username",value:d,onChange:t=>C(t.target.value)}),e.jsx("input",{className:"field-input",placeholder:"Discord id (optional)",value:p,onChange:t=>N(t.target.value)}),e.jsx("input",{className:"field-input",type:"password",placeholder:"Password",value:r,onChange:t=>S(t.target.value)}),e.jsx("input",{className:"field-input",type:"password",placeholder:"Confirm password",value:f,onChange:t=>v(t.target.value)}),e.jsx("button",{className:"button-dark md:col-span-2",type:"submit",disabled:x||!n||!d||!r,children:"Create lockdown administrator"})]})}),e.jsxs(c,{title:"Import configuration file",bodyClassName:"space-y-0.5 p-1 text-sm",children:[e.jsx("p",{className:"text-xs text-slate-400",children:"Choose an existing YAML configuration explicitly. The server validates and imports it once, and its secrets are never displayed back in the browser."}),e.jsxs("form",{className:"flex flex-col gap-0.5 md:flex-row",onSubmit:A,children:[e.jsx("input",{className:"field-input flex-1",type:"file",accept:".yaml,.yml,text/yaml",onChange:t=>w(t.target.files?.[0]||null)}),e.jsx("button",{className:"button-dark",type:"submit",disabled:x||!n||!o,children:"Import selected YAML"})]})]})]}):null]})]})}export{R as default};
|
import{e as F,r as s,j as e,S as P,C as c,L as q}from"./index-5EWtcenj.js";import{o as $,p as D,q as I}from"./api-B8GGCEeo.js";function R(){const l=F(),[a,m]=s.useState(null),[n,b]=s.useState(""),[d,C]=s.useState(""),[p,N]=s.useState(""),[r,S]=s.useState(""),[f,v]=s.useState(""),[o,w]=s.useState(null),[x,h]=s.useState(!1),[g,i]=s.useState("");s.useEffect(()=>{$(l).then(t=>m(t.required)).catch(t=>i(t.message))},[l]);async function j(t){h(!0),i("");try{await t(),m(!1),i("Setup completed. You can now open the administration application and log in.")}catch(u){const E=Array.isArray(u.validationErrors)?` ${u.validationErrors.map(y=>`${y.path}: ${y.message}`).join("; ")}`:"";i(`${u.message}${E}`)}finally{h(!1)}}function k(t){if(t.preventDefault(),r!==f){i("Passwords do not match.");return}j(()=>D(l,{setupCode:n,username:d,discordId:p,password:r}))}function A(t){t.preventDefault(),o&&j(async()=>I(l,{setupCode:n,fileName:o.name,yaml:await o.text()}))}return e.jsxs("div",{className:"min-h-screen bg-neutral-950 p-1 text-slate-100",children:[e.jsx(P,{}),e.jsxs("main",{className:"mx-auto flex min-h-screen w-full max-w-3xl flex-col justify-center gap-0.5",children:[e.jsxs(c,{title:"MultiRover setup",meta:a===null?"checking":a?"required":"complete",bodyClassName:"space-y-0.5 p-1 text-sm",children:[a?e.jsx("p",{children:"Enter the one-time code from setup-code.txt in the server data folder, then create the first lockdown administrator or import an existing configuration."}):null,a===!1?e.jsx(q,{className:"button-dark inline-block",to:"/admin",children:"Open administration"}):null,g?e.jsx("p",{className:"surface p-1 text-sm text-slate-200",children:g}):null]}),a?e.jsxs(e.Fragment,{children:[e.jsxs(c,{title:"Setup authorization",bodyClassName:"p-1",children:[e.jsx("label",{className:"block text-xs font-semibold text-slate-200",children:"One-time setup code"}),e.jsx("input",{className:"field-input mt-0.5 w-full font-mono",value:n,onChange:t=>b(t.target.value)})]}),e.jsx(c,{title:"Create first administrator",bodyClassName:"p-1",children:e.jsxs("form",{className:"grid gap-0.5 md:grid-cols-2",onSubmit:k,children:[e.jsx("input",{className:"field-input",placeholder:"Username",value:d,onChange:t=>C(t.target.value)}),e.jsx("input",{className:"field-input",placeholder:"Discord id (optional)",value:p,onChange:t=>N(t.target.value)}),e.jsx("input",{className:"field-input",type:"password",placeholder:"Password",value:r,onChange:t=>S(t.target.value)}),e.jsx("input",{className:"field-input",type:"password",placeholder:"Confirm password",value:f,onChange:t=>v(t.target.value)}),e.jsx("button",{className:"button-dark md:col-span-2",type:"submit",disabled:x||!n||!d||!r,children:"Create lockdown administrator"})]})}),e.jsxs(c,{title:"Import configuration file",bodyClassName:"space-y-0.5 p-1 text-sm",children:[e.jsx("p",{className:"text-xs text-slate-400",children:"Choose an existing YAML configuration explicitly. The server validates and imports it once, and its secrets are never displayed back in the browser."}),e.jsxs("form",{className:"flex flex-col gap-0.5 md:flex-row",onSubmit:A,children:[e.jsx("input",{className:"field-input flex-1",type:"file",accept:".yaml,.yml,text/yaml",onChange:t=>w(t.target.files?.[0]||null)}),e.jsx("button",{className:"button-dark",type:"submit",disabled:x||!n||!o,children:"Import selected YAML"})]})]})]}):null]})]})}export{R as default};
|
||||||
//# sourceMappingURL=SetupApp-CaWv689i.js.map
|
//# sourceMappingURL=SetupApp-DN7XBkOe.js.map
|
||||||
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,2 @@
|
|||||||
|
function u(i){return class extends i{_playedRanges=[];_currentPlayedRange=null;_RANGE_EPSILON=.5;_seeking=!1;connectedCallback(){super.connectedCallback&&super.connectedCallback(),this.addEventListener("play",()=>this.onPlaybackStart({time:this.currentTime})),this.addEventListener("pause",()=>this.onPlaybackStop({time:this.currentTime})),this.addEventListener("ended",()=>this.onPlaybackStop({time:this.currentTime})),this.addEventListener("seeking",()=>this.onSeeking()),this.addEventListener("seeked",()=>this.onSeeked({time:this.currentTime}))}onPlaybackStart(e={}){this._seeking=!1;const{time:t}=e,n=typeof t=="number"?t:this.currentTime;this._currentPlayedRange||(this._currentPlayedRange={start:n,end:n})}onSeeking(){this._seeking=!0,this._commitCurrentRange()}onSeeked(e={}){this._seeking=!1;const{time:t}=e,n=typeof t=="number"?t:this.currentTime;this._currentPlayedRange={start:n,end:n}}onPlaybackStop(e={}){const{time:t}=e,n=typeof t=="number"?t:this.currentTime;this._commitCurrentRange(n)}_commitCurrentRange(e){if(!this._currentPlayedRange)return;typeof e=="number"&&(this._currentPlayedRange.end=e);const{start:t,end:n}=this._currentPlayedRange;this._currentPlayedRange=null,this.addPlayedRange(t,n)}addPlayedRange(e,t){if(e>=t)return;const n=this._RANGE_EPSILON,c=[...this._playedRanges,{start:e,end:t}];c.sort((a,s)=>a.start-s.start);const r=[];for(const a of c){if(!r.length){r.push({...a});continue}const s=r[r.length-1];a.start<=s.end+n?(s.start=Math.min(s.start,a.start),s.end=Math.max(s.end,a.end)):r.push({...a})}this._playedRanges=r}get played(){const e=this.currentTime;return!this.paused&&!this._currentPlayedRange&&typeof e=="number"&&(this._currentPlayedRange={start:e,end:e}),this._currentPlayedRange&&typeof e=="number"&&(e>this._currentPlayedRange.end&&(this._currentPlayedRange.end=e),this.addPlayedRange(this._currentPlayedRange.start,this._currentPlayedRange.end)),this._playedRanges.length?l(this._playedRanges.map(t=>[t.start,t.end])):l([[0,0]])}}}function l(i){return Object.defineProperties(i,{start:{value:d=>i[d][0]},end:{value:d=>i[d][1]}}),i}export{u as M};
|
||||||
|
//# sourceMappingURL=index-B4nclofW.js.map
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+20
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+22
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+20
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+23
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+7
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+35
@@ -0,0 +1,35 @@
|
|||||||
|
import{R as W}from"./index-5EWtcenj.js";const $=["abort","canplay","canplaythrough","durationchange","emptied","encrypted","ended","error","loadeddata","loadedmetadata","loadstart","pause","play","playing","progress","ratechange","seeked","seeking","stalled","suspend","timeupdate","volumechange","waiting","waitingforkey","resize","enterpictureinpicture","leavepictureinpicture","webkitbeginfullscreen","webkitendfullscreen","webkitpresentationmodechanged"],A=globalThis.document?.createElement("template");A&&(A.innerHTML=`
|
||||||
|
<style>
|
||||||
|
:host {
|
||||||
|
display: inline-block;
|
||||||
|
line-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
video,
|
||||||
|
audio {
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: 100%;
|
||||||
|
min-width: 100%;
|
||||||
|
min-height: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<slot></slot>
|
||||||
|
`);const N=(i,{tag:t,is:s})=>{const d=globalThis.document?.createElement(t,{is:s}),f=d?S(d):[];return class g extends i{static Events=$;static template=A;static skipAttributes=[];static#t;static get observedAttributes(){return g.#l(),[...d?.constructor?.observedAttributes??[],"autopictureinpicture","disablepictureinpicture","disableremoteplayback","autoplay","controls","controlslist","crossorigin","loop","muted","playsinline","poster","preload","src"]}static#l(){if(this.#t)return;this.#t=!0;const e=new Set(this.observedAttributes);e.delete("muted");for(let o of f){if(o in this.prototype)continue;if(typeof d[o]=="function")this.prototype[o]=function(...r){this.#e();const a=()=>this.call?this.call(o,...r):this.nativeEl[o].apply(this.nativeEl,r);return this.loadComplete&&!this.isLoaded?this.loadComplete.then(a):a()};else{let r={get(){this.#e();let a=o.toLowerCase();if(e.has(a)){const p=this.getAttribute(a);return p===null?!1:p===""?!0:p}return this.get?.(o)??this.nativeEl?.[o]??this.#s[o]}};o!==o.toUpperCase()&&(r.set=async function(a){this.#e();let p=o.toLowerCase();if(e.has(p)){a===!0||a===!1||a==null?this.toggleAttribute(p,!!a):this.setAttribute(p,a);return}if(this.loadComplete&&!this.isLoaded&&await this.loadComplete,this.set){this.set(o,a);return}this.nativeEl[o]=a}),Object.defineProperty(this.prototype,o,r)}}}#o;#n;#r=!1;#i=!1;#a;#s;constructor(){super(),this.shadowRoot||(this.attachShadow({mode:"open"}),this.shadowRoot.append(this.constructor.template.content.cloneNode(!0))),this.load!==g.prototype.load&&(this.loadComplete=new O)}get loadComplete(){return this.#n}set loadComplete(e){this.#i=!1,this.#n=e,e?.then(()=>{this.#i=!0})}get isLoaded(){return this.#i}get nativeEl(){return this.#a??this.shadowRoot.querySelector(t)??this.querySelector(t)}set nativeEl(e){this.#a=e}get defaultMuted(){return this.hasAttribute("muted")}set defaultMuted(e){this.toggleAttribute("muted",!!e)}get src(){return this.getAttribute("src")}set src(e){this.setAttribute("src",`${e}`)}get preload(){return this.getAttribute("preload")??this.nativeEl?.preload}set preload(e){this.setAttribute("preload",`${e}`)}async#e(){if(this.#o)return;this.#o=!0,this.#u(),this.#c();for(let u of f)this.#d(u);const e=new Map,o=this.shadowRoot.querySelector("slot:not([name])");o?.addEventListener("slotchange",()=>{const u=new Map(e);o.assignedElements().filter(r=>["track","source"].includes(r.localName)).forEach(async r=>{u.delete(r);let a=e.get(r);a||(a=r.cloneNode(),e.set(r,a)),this.loadComplete&&!this.isLoaded&&await this.loadComplete,this.nativeEl.append?.(a)}),u.forEach(r=>r.remove())});for(let u of this.constructor.Events)this.shadowRoot.addEventListener?.(u,r=>{r.target===this.nativeEl&&this.dispatchEvent(new CustomEvent(r.type,{detail:r.detail}))},!0)}#d(e){if(Object.prototype.hasOwnProperty.call(this,e)){const o=this[e];delete this[e],this[e]=o}}#u(){const e=document.createElement(t,{is:s});e.muted=this.hasAttribute("muted");for(let{name:o,value:u}of this.attributes)e.setAttribute(o,u);this.#s={};for(let o of S(e))this.#s[o]=e[o];e.removeAttribute("src"),e.load()}async#c(){if(this.loadComplete&&!this.isLoaded&&await this.loadComplete,!this.nativeEl){const e=document.createElement(t,{is:s});e.part=t,this.shadowRoot.append(e)}this.nativeEl.muted=this.hasAttribute("muted")}attributeChangedCallback(e,o,u){this.#e(),e==="src"&&this.load!==g.prototype.load&&this.#h(),this.#p(e,o,u)}async#h(){this.#r&&(this.loadComplete=new O),this.#r=!0,await Promise.resolve(),await this.load(),this.loadComplete?.resolve(),await this.loadComplete}async#p(e,o,u){this.loadComplete&&!this.isLoaded&&await this.loadComplete,!["id","class",...this.constructor.skipAttributes].includes(e)&&(u===null?this.nativeEl.removeAttribute?.(e):this.nativeEl.setAttribute?.(e,u))}connectedCallback(){this.#e()}}};function S(i){let t=[];for(let s=Object.getPrototypeOf(i);s&&s!==HTMLElement.prototype;s=Object.getPrototypeOf(s))t.push(...Object.getOwnPropertyNames(s));return t}class O extends Promise{constructor(t=()=>{}){let s,d;super((f,c)=>{t(f,c),s=f,d=c}),this.resolve=s,this.reject=d}}const B=globalThis.document?N(HTMLElement,{tag:"video"}):class{};globalThis.document&&N(HTMLElement,{tag:"audio"});var H,R;const L=(H=globalThis.document)==null?void 0:H.createElement("template");L&&(L.innerHTML=`
|
||||||
|
<div class="wistia_embed"></div>
|
||||||
|
`);const P=(R=globalThis.document)==null?void 0:R.createElement("template");P&&(P.innerHTML=`
|
||||||
|
<style>
|
||||||
|
:host {
|
||||||
|
display: inline-block;
|
||||||
|
min-width: 300px;
|
||||||
|
min-height: 150px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
::slotted(.wistia_embed) {
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<slot></slot>
|
||||||
|
`);function D(i,t){if(Object.hasOwn(i,t)){const s=i[t];delete i[t],i[t]=s}}class q extends B{static template=P;static skipAttributes=["src"];#t=null;constructor(){super(),D(this,"config")}get config(){return this.#t}set config(t){this.#t=t}get nativeEl(){var t;return((t=this.api)==null?void 0:t.elem())??this.querySelector("video")}async load(){var t;if((t=this.querySelector(".wistia_embed"))==null||t.remove(),!this.src)return;await new Promise(o=>setTimeout(o,50));const s=/(?:wistia\.com|wi\.st)\/(?:medias|embed)\/(.*)$/i,d=this.src.match(s)[1],f={autoPlay:this.autoplay,silentAutoPlay:this.autoplay?"allow":void 0,preload:this.preload??"metadata",playsinline:this.playsInline,endVideoBehavior:this.loop?"loop":void 0,chromeless:!this.controls,playButton:this.controls,muted:this.defaultMuted,...this.#t??{}};this.append(L.content.cloneNode(!0));const c=this.querySelector(".wistia_embed");c.id||(c.id=z(d)),c.classList.add(`wistia_async_${d}`),await F("https://fast.wistia.com/assets/external/E-v1.js","Wistia"),this.api=await new Promise(o=>{globalThis._wq.push({id:c.id,onReady:o,options:f})})}async attributeChangedCallback(t,s,d){if(t==="controls"){switch(await this.loadComplete,t){case"controls":this.api.bigPlayButtonEnabled(this.controls),this.controls?this.api.releaseChromeless():this.api.requestChromeless();break}return}super.attributeChangedCallback(t,s,d)}get duration(){var t;return(t=this.api)==null?void 0:t.duration()}async play(){return await this.loadComplete,this.api.play(),new Promise(t=>this.addEventListener("playing",t))}}const T={};async function F(i,t){if(T[i])return T[i];if(self[t])return self[t];const s=new Promise((d,f)=>{const c=document.createElement("script");c.defer=!0,c.src=i,c.onload=()=>d(self[t]),c.onerror=f,document.head.append(c)});return T[i]=s,s}let U=0;function z(i){const t=++U;return`${i}${t}`}globalThis.customElements&&!globalThis.customElements.get("wistia-video")&&globalThis.customElements.define("wistia-video",q);var V=q,G=new Set(["style","children","ref","key","suppressContentEditableWarning","suppressHydrationWarning","dangerouslySetInnerHTML"]),J={className:"class",htmlFor:"for"};function I(i){return i.toLowerCase()}function j(i){if(typeof i=="boolean")return i?"":void 0;if(typeof i!="function"&&!(typeof i=="object"&&i!==null))return i}function K({react:i,tagName:t,elementClass:s,events:d,displayName:f,defaultProps:c,toAttributeName:e=I,toAttributeValue:o=j}){const u=Number.parseInt(i.version)>=19,r=i.forwardRef((a,p)=>{var M,k;const m=i.useRef(null),E=i.useRef(new Map),C={},_={},v={},w={};for(const[n,l]of Object.entries(a)){if(G.has(n)){v[n]=l;continue}const h=e(J[n]??n);if(s.prototype&&n in s.prototype&&!(n in(((M=globalThis.HTMLElement)==null?void 0:M.prototype)??{}))&&!((k=s.observedAttributes)!=null&&k.some(b=>b===h))){w[n]=l;continue}if(n.startsWith("on")){C[n]=l;continue}const y=o(l);if(h&&y!=null&&(_[h]=String(y),u||(v[h]=y)),h&&u){const b=j(l);y!==b?v[h]=y:v[h]=l}}if(typeof window<"u"){for(const n in C){const l=C[n],h=n.endsWith("Capture"),y=(d?.[n]??n.slice(2).toLowerCase()).slice(0,h?-7:void 0);i.useLayoutEffect(()=>{const b=m?.current;if(!(!b||typeof l!="function"))return b.addEventListener(y,l,h),()=>{b.removeEventListener(y,l,h)}},[m?.current,l])}i.useLayoutEffect(()=>{if(m.current===null)return;const n=new Map;for(const l in w)x(m.current,l,w[l]),E.current.delete(l),n.set(l,w[l]);for(const[l,h]of E.current)x(m.current,l,void 0);E.current=n})}if(typeof window>"u"&&s?.getTemplateHTML&&s?.shadowRootOptions){const{mode:n,delegatesFocus:l}=s.shadowRootOptions,h=i.createElement("template",{shadowrootmode:n,shadowrootdelegatesfocus:l,dangerouslySetInnerHTML:{__html:s.getTemplateHTML(_,a)},key:"ce-la-react-ssr-template-shadow-root"});v.children=[h,v.children]}return i.createElement(t,{...c,...v,ref:i.useCallback(n=>{m.current=n,typeof p=="function"?p(n):p!==null&&(p.current=n)},[p])},v.children)});return r.displayName=f??s.name,r}function x(i,t,s){var d;i[t]=s,s==null&&t in(((d=globalThis.HTMLElement)==null?void 0:d.prototype)??{})&&i.removeAttribute(t)}var X=K({react:W,tagName:"wistia-video",elementClass:V,toAttributeName(i){return i==="muted"?"":i==="defaultMuted"?"muted":I(i)}});export{X as default};
|
||||||
|
//# sourceMappingURL=react-DxdYv-AY.js.map
|
||||||
File diff suppressed because one or more lines are too long
+18
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+7
@@ -0,0 +1,7 @@
|
|||||||
|
import{_ as N,R as A}from"./index-5EWtcenj.js";import{M as D,C as S}from"./mixin-BY5xW4uI.js";class P extends D(S){static shadowRootOptions={...S.shadowRootOptions};static getTemplateHTML=i=>{const{src:n,...o}=i;return S.getTemplateHTML(o)};#t;attributeChangedCallback(i,n,o){i!=="src"&&super.attributeChangedCallback(i,n,o),i==="src"&&n!=o&&this.load()}async _initThumbnails(i){const n=async(d,m)=>{const v=[],g=i.timescale||1,h=i.startNumber||1,E=i.presentationTimeOffset?i.presentationTimeOffset/g:0,_=i.segmentDuration;for(let l=0;l<d;l++){const T=C({thIndex:l,thduration:m,ttiles:d,tduration:_,startNumber:h,pto:E}),w=T+m,M=new Promise((f,y)=>{this.api.provideThumbnail(T,({url:a,width:s,height:c,x:p,y:b})=>{try{const R=new VTTCue(T,w,`${a}#xywh=${p},${b},${s},${c}`);f(R)}catch(R){y(R)}})});v.push(M)}return await Promise.all(v).catch(l=>console.error("Error processing thumbnails",l))},{totalThumbnails:o,thumbnailDuration:e}=$(i),u=await n(o,e);let r=this.nativeEl.querySelector('track[label="thumbnails"]');if(!r){r=O(),this.nativeEl.appendChild(r);const d=x(u);r.src=d,r.dispatchEvent(new Event("change"))}}async load(){if(this.#t){this.api.attachSource(this.src);return}this.#t=!0;const i=await N(()=>import("./dash.all.min-C9gxBrL1.js"),[]);this.api=i.MediaPlayer().create(),this.api.initialize(this.nativeEl,this.src,this.autoplay),this.api.on(i.MediaPlayer.events.STREAM_INITIALIZED,()=>{const n=this.api.getRepresentationsByType("video");let o=this.videoTracks.getTrackById("main");o||(o=this.addVideoTrack("main"),o.id="main",o.selected=!0),n.forEach(e=>{const u=e.bandwidth??e.bitrate??(Number.isFinite(e.bitrateInKbit)?e.bitrateInKbit*1e3:void 0),r=o.addRendition(e.id,e.width,e.height,e.mimeType??e.codec,u);r.id=e.id}),this.videoRenditions.addEventListener("change",()=>{const e=this.videoRenditions[this.videoRenditions.selectedIndex];e?.id?(this.api.updateSettings({streaming:{abr:{autoSwitchBitrate:{video:!1}}}}),this.api.setRepresentationForTypeById("video",e.id,!0)):this.api.updateSettings({streaming:{abr:{autoSwitchBitrate:{video:!0}}}})}),this.api.isDynamic()||this.api.getRepresentationsByType("image").forEach(async(u,r)=>{r>0||this._initThumbnails(u)})})}}function $(t){var i,n;const o=t.essentialProperties[0],[e,u]=o.value.split("x").map(Number),r=e*u,d=((n=(i=t.adaptation)==null?void 0:i.period)==null?void 0:n.duration)||null,m=t.segmentDuration,v=t.timescale||1,h=m/v/r;return{totalThumbnails:d!=null?Math.ceil(d/h):Math.ceil(m/h),thumbnailDuration:h}}function C({thIndex:t,tduration:i,thduration:n,ttiles:o,startNumber:e,pto:u}){const r=Math.floor(t/o)+e,d=t%o+1,m=(r-1)*i-u,v=(d-1)*n;return m+v}function O(){const t=document.createElement("track");return t.kind="metadata",t.label="thumbnails",t.srclang="en",t.mode="hidden",t.default=!0,t}function x(t){let i=`WEBVTT
|
||||||
|
|
||||||
|
`;for(const e of t)i+=`${o(e.startTime)} --> ${o(e.endTime)}
|
||||||
|
`,i+=`${e.text}
|
||||||
|
|
||||||
|
`;const n=new Blob([i],{type:"text/vtt"});return URL.createObjectURL(n);function o(e){const u=String(Math.floor(e/3600)).padStart(2,"0"),r=String(Math.floor(e%3600/60)).padStart(2,"0"),d=(e%60).toFixed(3).padStart(6,"0");return`${u}:${r}:${d}`}}globalThis.customElements&&!globalThis.customElements.get("dash-video")&&globalThis.customElements.define("dash-video",P);var B=P,H=new Set(["style","children","ref","key","suppressContentEditableWarning","suppressHydrationWarning","dangerouslySetInnerHTML"]),F={className:"class",htmlFor:"for"};function I(t){return t.toLowerCase()}function k(t){if(typeof t=="boolean")return t?"":void 0;if(typeof t!="function"&&!(typeof t=="object"&&t!==null))return t}function W({react:t,tagName:i,elementClass:n,events:o,displayName:e,defaultProps:u,toAttributeName:r=I,toAttributeValue:d=k}){const m=Number.parseInt(t.version)>=19,v=t.forwardRef((g,h)=>{var E,_;const l=t.useRef(null),T=t.useRef(new Map),w={},M={},f={},y={};for(const[a,s]of Object.entries(g)){if(H.has(a)){f[a]=s;continue}const c=r(F[a]??a);if(n.prototype&&a in n.prototype&&!(a in(((E=globalThis.HTMLElement)==null?void 0:E.prototype)??{}))&&!((_=n.observedAttributes)!=null&&_.some(b=>b===c))){y[a]=s;continue}if(a.startsWith("on")){w[a]=s;continue}const p=d(s);if(c&&p!=null&&(M[c]=String(p),m||(f[c]=p)),c&&m){const b=k(s);p!==b?f[c]=p:f[c]=s}}if(typeof window<"u"){for(const a in w){const s=w[a],c=a.endsWith("Capture"),p=(o?.[a]??a.slice(2).toLowerCase()).slice(0,c?-7:void 0);t.useLayoutEffect(()=>{const b=l?.current;if(!(!b||typeof s!="function"))return b.addEventListener(p,s,c),()=>{b.removeEventListener(p,s,c)}},[l?.current,s])}t.useLayoutEffect(()=>{if(l.current===null)return;const a=new Map;for(const s in y)L(l.current,s,y[s]),T.current.delete(s),a.set(s,y[s]);for(const[s,c]of T.current)L(l.current,s,void 0);T.current=a})}if(typeof window>"u"&&n?.getTemplateHTML&&n?.shadowRootOptions){const{mode:a,delegatesFocus:s}=n.shadowRootOptions,c=t.createElement("template",{shadowrootmode:a,shadowrootdelegatesfocus:s,dangerouslySetInnerHTML:{__html:n.getTemplateHTML(M,g)},key:"ce-la-react-ssr-template-shadow-root"});f.children=[c,f.children]}return t.createElement(i,{...u,...f,ref:t.useCallback(a=>{l.current=a,typeof h=="function"?h(a):h!==null&&(h.current=a)},[h])},f.children)});return v.displayName=e??n.name,v}function L(t,i,n){var o;t[i]=n,n==null&&i in(((o=globalThis.HTMLElement)==null?void 0:o.prototype)??{})&&t.removeAttribute(i)}var V=W({react:A,tagName:"dash-video",elementClass:B,toAttributeName(t){return t==="muted"?"":t==="defaultMuted"?"muted":I(t)}});export{V as default};
|
||||||
|
//# sourceMappingURL=react-gdx3v4jU.js.map
|
||||||
File diff suppressed because one or more lines are too long
@@ -12,8 +12,8 @@
|
|||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||||
<!-- site-metadata:inject -->
|
<!-- site-metadata:inject -->
|
||||||
<!-- analytics:inject -->
|
<!-- analytics:inject -->
|
||||||
<script type="module" crossorigin src="/assets/index-n0JxE1Mv.js"></script>
|
<script type="module" crossorigin src="/assets/index-5EWtcenj.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/index-xCRVLGjq.css">
|
<link rel="stylesheet" crossorigin href="/assets/index-3oGy4XGJ.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ const logger = require('../../globals/logger').child('assignment');
|
|||||||
const { MODES, getMode, modeEvents } = require('../modeManager');
|
const { MODES, getMode, modeEvents } = require('../modeManager');
|
||||||
const { roleEvents, getRole, isAdmin, isLockdownAdmin } = require('../roleService');
|
const { roleEvents, getRole, isAdmin, isLockdownAdmin } = require('../roleService');
|
||||||
const roverManager = require('../roverManager');
|
const roverManager = require('../roverManager');
|
||||||
|
const { getOperatingMode } = require('../operatingModeService');
|
||||||
const { compareRoversForAssignment } = require('./roverRanking');
|
const { compareRoversForAssignment } = require('./roverRanking');
|
||||||
|
|
||||||
const socketRefs = new Map(); // socketId -> socket
|
const socketRefs = new Map(); // socketId -> socket
|
||||||
@@ -131,7 +132,7 @@ roverManager.managerEvents.on('switch', ({ socketId, roverId }) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
function assignSocket(socket, options = {}) {
|
function assignSocket(socket, options = {}) {
|
||||||
if (!socket || isAdmin(socket) || getRole(socket) !== 'user') {
|
if (!socket || getOperatingMode(socket) !== 'rover' || isAdmin(socket) || getRole(socket) !== 'user') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// avoid double assignment
|
// avoid double assignment
|
||||||
@@ -311,13 +312,22 @@ function describeAssignment(socketId) {
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
assignmentEvents,
|
assignmentEvents,
|
||||||
|
resumeAssignment: assignSocket,
|
||||||
|
releaseForOperatingMode: (socket) => {
|
||||||
|
// Include direct admin control as well as automatic assignment ownership.
|
||||||
|
const roverIds = new Set(roverManager.getRoversForSocket(socket.id));
|
||||||
|
const assigned = assignments.get(socket.id);
|
||||||
|
if (assigned) roverIds.add(assigned);
|
||||||
|
waiting.delete(socket.id);
|
||||||
|
roverIds.forEach((roverId) => forceRelease(roverId, socket.id));
|
||||||
|
},
|
||||||
describeAssignment,
|
describeAssignment,
|
||||||
forceRelease,
|
forceRelease,
|
||||||
forceReleaseWithNotice,
|
forceReleaseWithNotice,
|
||||||
rerollAssignments,
|
rerollAssignments,
|
||||||
getAssignedRover: (socketId) => assignments.get(socketId) || null,
|
getAssignedRover: (socketId) => assignments.get(socketId) || null,
|
||||||
moveAssignment: (socket, roverId, { releasePrevious = true } = {}) => {
|
moveAssignment: (socket, roverId, { releasePrevious = true } = {}) => {
|
||||||
if (!socket || !roverId) return;
|
if (!socket || !roverId || getOperatingMode(socket) !== 'rover') return;
|
||||||
const previous = assignments.get(socket.id);
|
const previous = assignments.get(socket.id);
|
||||||
if (previous && previous !== roverId && releasePrevious) {
|
if (previous && previous !== roverId && releasePrevious) {
|
||||||
roverManager.releaseControl(previous, socket);
|
roverManager.releaseControl(previous, socket);
|
||||||
|
|||||||
@@ -2,20 +2,14 @@
|
|||||||
// Purpose: Builds normalized chat message/typing payloads and rover context snapshots.
|
// Purpose: Builds normalized chat message/typing payloads and rover context snapshots.
|
||||||
// Scope: Encapsulates chat DTO construction and rover/driver metadata extraction.
|
// Scope: Encapsulates chat DTO construction and rover/driver metadata extraction.
|
||||||
const { v4: uuidv4 } = require('uuid');
|
const { v4: uuidv4 } = require('uuid');
|
||||||
const io = require('../../globals/io');
|
|
||||||
const roverManager = require('../roverManager');
|
const roverManager = require('../roverManager');
|
||||||
const { getRole } = require('../roleService');
|
const { getRole } = require('../roleService');
|
||||||
|
const { getOperatingMode } = require('../operatingModeService');
|
||||||
const { describeAssignment } = require('../assignmentService');
|
const { describeAssignment } = require('../assignmentService');
|
||||||
const { getNickname } = require('../nicknameService');
|
const { getNickname } = require('../nicknameService');
|
||||||
const ptzCameraService = require('../ptzCameraService');
|
const ptzCameraService = require('../ptzCameraService');
|
||||||
|
|
||||||
function resolvePtzChatTarget(socketId) {
|
|
||||||
return ptzCameraService.getChatTargetForSocket(socketId) || null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function resolveRoverId(socketId) {
|
function resolveRoverId(socketId) {
|
||||||
const ptzTarget = resolvePtzChatTarget(socketId);
|
|
||||||
if (ptzTarget?.roverId) return ptzTarget.roverId;
|
|
||||||
const primary = roverManager.getPrimaryRoverForSocket(socketId);
|
const primary = roverManager.getPrimaryRoverForSocket(socketId);
|
||||||
if (primary) return primary;
|
if (primary) return primary;
|
||||||
const assignment = describeAssignment(socketId);
|
const assignment = describeAssignment(socketId);
|
||||||
@@ -24,54 +18,22 @@ function resolveRoverId(socketId) {
|
|||||||
|
|
||||||
function resolveRoverColor(roverId) {
|
function resolveRoverColor(roverId) {
|
||||||
if (!roverId) return null;
|
if (!roverId) return null;
|
||||||
if (String(roverId) === ptzCameraService.PTZ_CAMERA_ID) {
|
|
||||||
return ptzCameraService.getPublicState()?.color || null;
|
|
||||||
}
|
|
||||||
const record = roverManager.rovers.get(String(roverId));
|
const record = roverManager.rovers.get(String(roverId));
|
||||||
return record?.meta?.color || null;
|
return record?.meta?.color || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function resolveRoverName(roverId) {
|
function resolveRoverName(roverId) {
|
||||||
if (!roverId) return null;
|
if (!roverId) return null;
|
||||||
if (String(roverId) === ptzCameraService.PTZ_CAMERA_ID) {
|
|
||||||
return ptzCameraService.getPublicState()?.name || null;
|
|
||||||
}
|
|
||||||
const record = roverManager.rovers.get(String(roverId));
|
const record = roverManager.rovers.get(String(roverId));
|
||||||
return record?.meta?.name || null;
|
return record?.meta?.name || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function isPtzChatTargetId(roverId) {
|
|
||||||
/*
|
|
||||||
PTZ is intentionally treated as a virtual rover for chat identity only. It
|
|
||||||
does not live in roverManager.rovers because movement, video authorization,
|
|
||||||
and queue ownership are PTZ-service concerns, but chat needs one stable
|
|
||||||
"rover-like" id so the existing web UI, Discord bridge, and AI transcript
|
|
||||||
code can all render the same badge without learning PTZ internals.
|
|
||||||
*/
|
|
||||||
return Boolean(roverId) && String(roverId) === ptzCameraService.PTZ_CAMERA_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isPublicChatTargetId(roverId, socket = null) {
|
function isPublicChatTargetId(roverId, socket = null) {
|
||||||
if (!roverId) return false;
|
return Boolean(roverId) && roverManager.canReplayRoverId(roverId, socket) === true;
|
||||||
/*
|
|
||||||
Normal rovers remain governed by the existing replay visibility rule, which
|
|
||||||
is also the rule chat historically used to avoid exposing closed private
|
|
||||||
rover activity. PTZ gets an explicit allow-list entry here because it is a
|
|
||||||
public chat target that deliberately pretends to be a rover, even though it
|
|
||||||
is not a roverManager record.
|
|
||||||
*/
|
|
||||||
if (isPtzChatTargetId(roverId)) return true;
|
|
||||||
return roverManager.canReplayRoverId(roverId, socket) === true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function isPrivateClosedRoverId(roverId) {
|
function isPrivateClosedRoverId(roverId) {
|
||||||
if (!roverId) return false;
|
return Boolean(roverId) && !isPublicChatTargetId(roverId);
|
||||||
/*
|
|
||||||
PTZ uses the existing rover badge fields so chat rows can reuse RoverLabel,
|
|
||||||
but it is not a private rover. Let PTZ-badged messages broadcast normally
|
|
||||||
instead of falling into the closed-private rover path for unknown ids.
|
|
||||||
*/
|
|
||||||
return !isPublicChatTargetId(roverId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeProfileImageUrl(value) {
|
function normalizeProfileImageUrl(value) {
|
||||||
@@ -170,6 +132,8 @@ function buildMessage(socket, text, meta = {}) {
|
|||||||
socketId: socket?.id || null,
|
socketId: socket?.id || null,
|
||||||
nickname: meta.nickname || getNickname(socket) || null,
|
nickname: meta.nickname || getNickname(socket) || null,
|
||||||
role: meta.role || getRole(socket),
|
role: meta.role || getRole(socket),
|
||||||
|
operatingMode: socket ? getOperatingMode(socket) : null,
|
||||||
|
operatingModeDisplay: socket ? ptzCameraService.getOperatingModeDisplay(socket.id) : null,
|
||||||
roverId,
|
roverId,
|
||||||
roverName,
|
roverName,
|
||||||
roverColor,
|
roverColor,
|
||||||
@@ -215,6 +179,8 @@ function buildTypingPayload(socket, meta = {}) {
|
|||||||
socketId,
|
socketId,
|
||||||
nickname: meta.nickname || getNickname(socket) || null,
|
nickname: meta.nickname || getNickname(socket) || null,
|
||||||
role: meta.role || getRole(socket),
|
role: meta.role || getRole(socket),
|
||||||
|
operatingMode: socket ? getOperatingMode(socket) : null,
|
||||||
|
operatingModeDisplay: socket ? ptzCameraService.getOperatingModeDisplay(socket.id) : null,
|
||||||
roverId,
|
roverId,
|
||||||
roverName,
|
roverName,
|
||||||
roverColor,
|
roverColor,
|
||||||
@@ -231,7 +197,6 @@ function buildTypingPayload(socket, meta = {}) {
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
resolveRoverId,
|
resolveRoverId,
|
||||||
isPtzChatTargetId,
|
|
||||||
isPublicChatTargetId,
|
isPublicChatTargetId,
|
||||||
isPrivateClosedRoverId,
|
isPrivateClosedRoverId,
|
||||||
buildRoverCtxSnapshot,
|
buildRoverCtxSnapshot,
|
||||||
|
|||||||
@@ -19,13 +19,6 @@ const { getLastAccessNoticeAt, setLastAccessNoticeAt } = require('./state');
|
|||||||
|
|
||||||
function playTypingNote(roverId, note, socketId) {
|
function playTypingNote(roverId, note, socketId) {
|
||||||
if (!roverId) return;
|
if (!roverId) return;
|
||||||
/*
|
|
||||||
PTZ borrows the roverId field for chat badges, but it has no rover command
|
|
||||||
channel. Skipping the song command here keeps PTZ chat from producing noisy
|
|
||||||
"unknown rover" command attempts while still allowing the message itself to
|
|
||||||
behave like rover chat everywhere else.
|
|
||||||
*/
|
|
||||||
if (String(roverId) === ptzCameraService.PTZ_CAMERA_ID) return;
|
|
||||||
try {
|
try {
|
||||||
issueCommand(roverId, {
|
issueCommand(roverId, {
|
||||||
type: 'song',
|
type: 'song',
|
||||||
@@ -90,8 +83,8 @@ function maybeSendAccessNotice(message, sendSystemMessage) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function maybeSpeak(socket, message, ttsOptions) {
|
function maybeSpeak(socket, message, ttsOptions) {
|
||||||
if (!ttsOptions || !message?.roverId) return;
|
if (!ttsOptions || !message) return;
|
||||||
if (String(message.roverId) === ptzCameraService.PTZ_CAMERA_ID) {
|
if (message.operatingMode === 'ptz') {
|
||||||
/*
|
/*
|
||||||
PTZ has no rover websocket, but it does have a real speaker behind the
|
PTZ has no rover websocket, but it does have a real speaker behind the
|
||||||
Reolink/neolink path. Keep PTZ routing here so chat remains the single
|
Reolink/neolink path. Keep PTZ routing here so chat remains the single
|
||||||
@@ -107,6 +100,7 @@ function maybeSpeak(socket, message, ttsOptions) {
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!message.roverId) return;
|
||||||
const record = roverManager.rovers.get(message.roverId);
|
const record = roverManager.rovers.get(message.roverId);
|
||||||
const ttsEnabled = Boolean(record?.meta?.audio?.ttsEnabled);
|
const ttsEnabled = Boolean(record?.meta?.audio?.ttsEnabled);
|
||||||
if (!ttsEnabled) return;
|
if (!ttsEnabled) return;
|
||||||
|
|||||||
@@ -6,12 +6,14 @@ const { MessageFlags } = require('discord.js');
|
|||||||
function createChannelIO({ client, logger, sanitizeMentions }) {
|
function createChannelIO({ client, logger, sanitizeMentions }) {
|
||||||
const channelCache = new Map();
|
const channelCache = new Map();
|
||||||
const typingMessageCache = new Map();
|
const typingMessageCache = new Map();
|
||||||
|
let stopped = false;
|
||||||
|
|
||||||
async function fetchChannel(id) {
|
async function fetchChannel(id) {
|
||||||
if (!id) return null;
|
if (stopped || !client.isReady() || !id) return null;
|
||||||
if (channelCache.has(id)) return channelCache.get(id);
|
if (channelCache.has(id)) return channelCache.get(id);
|
||||||
try {
|
try {
|
||||||
const channel = await client.channels.fetch(id);
|
const channel = await client.channels.fetch(id);
|
||||||
|
if (stopped) return null;
|
||||||
if (channel) {
|
if (channel) {
|
||||||
channelCache.set(id, channel);
|
channelCache.set(id, channel);
|
||||||
return channel;
|
return channel;
|
||||||
@@ -68,6 +70,7 @@ function createChannelIO({ client, logger, sanitizeMentions }) {
|
|||||||
const content = `-# *${username} is typing...*`;
|
const content = `-# *${username} is typing...*`;
|
||||||
try {
|
try {
|
||||||
const message = await channel.send({ content, allowedMentions: { parse: [] }, flags: [MessageFlags.SuppressNotifications]});
|
const message = await channel.send({ content, allowedMentions: { parse: [] }, flags: [MessageFlags.SuppressNotifications]});
|
||||||
|
if (stopped) return;
|
||||||
const timeoutId = setTimeout(() => {
|
const timeoutId = setTimeout(() => {
|
||||||
clearTypingMessage(entry.guildId, typingId);
|
clearTypingMessage(entry.guildId, typingId);
|
||||||
}, 20000);
|
}, 20000);
|
||||||
@@ -78,6 +81,12 @@ function createChannelIO({ client, logger, sanitizeMentions }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
stop() {
|
||||||
|
stopped = true;
|
||||||
|
for (const record of typingMessageCache.values()) clearTimeout(record.timeoutId);
|
||||||
|
typingMessageCache.clear();
|
||||||
|
channelCache.clear();
|
||||||
|
},
|
||||||
fetchChannel,
|
fetchChannel,
|
||||||
sendToChannel,
|
sendToChannel,
|
||||||
clearTypingMessage,
|
clearTypingMessage,
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ module.exports = {
|
|||||||
adminAlerts: '123456789012345678',
|
adminAlerts: '123456789012345678',
|
||||||
replay: '123456789012345678',
|
replay: '123456789012345678',
|
||||||
humanAlerts: '123456789012345678',
|
humanAlerts: '123456789012345678',
|
||||||
|
liveStatus: '',
|
||||||
},
|
},
|
||||||
roles: {
|
roles: {
|
||||||
stalkerPing: '123456789012345678',
|
stalkerPing: '123456789012345678',
|
||||||
@@ -31,6 +32,7 @@ module.exports = {
|
|||||||
token: string({ title: 'Bot token', description: 'Discord bot token used to log in. The saved value is never returned to the browser.', examples: ['DISCORD_BOT_TOKEN'], writeOnly: true, maxLength: 10000 }),
|
token: string({ title: 'Bot token', description: 'Discord bot token used to log in. The saved value is never returned to the browser.', examples: ['DISCORD_BOT_TOKEN'], writeOnly: true, maxLength: 10000 }),
|
||||||
guildId: string({ title: 'Guild id', description: 'Reserved Discord server identifier. The current bot runtime does not restrict commands or events using this value.', examples: ['123456789012345678'], maxLength: 100 }),
|
guildId: string({ title: 'Guild id', description: 'Reserved Discord server identifier. The current bot runtime does not restrict commands or events using this value.', examples: ['123456789012345678'], maxLength: 100 }),
|
||||||
channels: strictObject({
|
channels: strictObject({
|
||||||
|
liveStatus: string({ title: 'Live status', description: 'Dedicated live fleet report channel ID. The bot deletes ALL other messages here. Requires View Channel, Read Message History, Send Messages, and Manage Messages. Leave empty to disable.', examples: ['123456789012345678'], maxLength: 100 }),
|
||||||
general: string({ description: 'Channel ID used by the button-box stalker-role and everyone-ping rewards.', examples: ['123456789012345678'], maxLength: 100 }),
|
general: string({ description: 'Channel ID used by the button-box stalker-role and everyone-ping rewards.', examples: ['123456789012345678'], maxLength: 100 }),
|
||||||
announcements: string({ description: 'Channel ID used for public-mode openings, objective changes, and all-rovers-unlocked announcements.', examples: ['123456789012345678'], maxLength: 100 }),
|
announcements: string({ description: 'Channel ID used for public-mode openings, objective changes, and all-rovers-unlocked announcements.', examples: ['123456789012345678'], maxLength: 100 }),
|
||||||
adminAlerts: string({ description: 'Channel ID used for rover health, battery, dock, help, and daily fleet-report notifications.', examples: ['123456789012345678'], maxLength: 100 }),
|
adminAlerts: string({ description: 'Channel ID used for rover health, battery, dock, help, and daily fleet-report notifications.', examples: ['123456789012345678'], maxLength: 100 }),
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
// Owns connection replacement and recovery from failed initial logins.
|
||||||
|
function createConnectionManager({ createRuntime, logger }) {
|
||||||
|
let desired = { enabled: false, token: '' };
|
||||||
|
let revision = 0;
|
||||||
|
let runtime = null;
|
||||||
|
let queue = Promise.resolve();
|
||||||
|
let retryTimer = null;
|
||||||
|
let retryDelay = 5000;
|
||||||
|
|
||||||
|
function enqueue(operation) {
|
||||||
|
const pending = queue.then(operation);
|
||||||
|
// Report failures without poisoning subsequent configuration changes.
|
||||||
|
queue = pending.catch((err) => logger.error('Discord connection update failed', err.message));
|
||||||
|
return pending;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function stop() {
|
||||||
|
const previous = runtime;
|
||||||
|
runtime = null;
|
||||||
|
if (!previous) return;
|
||||||
|
previous.stop();
|
||||||
|
// discord.js cannot cancel login while gateway discovery is pending.
|
||||||
|
// Let that attempt settle before destroying it, otherwise it can open a
|
||||||
|
// socket after destroy() has already run and leave an orphan connection.
|
||||||
|
await previous.login;
|
||||||
|
await previous.client.destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
function scheduleRetry(version) {
|
||||||
|
if (version !== revision || !desired.enabled) return;
|
||||||
|
const delay = retryDelay;
|
||||||
|
retryDelay = Math.min(retryDelay * 2, 60000);
|
||||||
|
logger.warn('Retrying Discord login', { delayMs: delay });
|
||||||
|
retryTimer = setTimeout(() => {
|
||||||
|
retryTimer = null;
|
||||||
|
enqueue(() => start(version));
|
||||||
|
}, delay);
|
||||||
|
retryTimer.unref?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function start(version) {
|
||||||
|
if (version !== revision || !desired.enabled) return;
|
||||||
|
await stop();
|
||||||
|
if (version !== revision || !desired.enabled) return;
|
||||||
|
const current = createRuntime();
|
||||||
|
runtime = current;
|
||||||
|
const { client } = current;
|
||||||
|
client.on('error', (err) => logger.error('Discord client error', err.message));
|
||||||
|
client.on('shardError', (err, shardId) => {
|
||||||
|
logger.warn('Discord connection error', { shardId, error: err.message });
|
||||||
|
});
|
||||||
|
client.on('shardDisconnect', (event, shardId) => {
|
||||||
|
logger.warn('Discord disconnected', { shardId, code: event.code });
|
||||||
|
});
|
||||||
|
client.on('clientReady', () => { retryDelay = 5000; });
|
||||||
|
|
||||||
|
// Login must not block configuration saves while the network is down.
|
||||||
|
// Each attempt has its own client, so stale login completion/cleanup cannot
|
||||||
|
// clear the credentials or stop the connection of its replacement.
|
||||||
|
current.login = client.login(desired.token).catch((err) => {
|
||||||
|
if (version !== revision || runtime !== current) return;
|
||||||
|
logger.error('Discord login failed', err.message);
|
||||||
|
enqueue(async () => {
|
||||||
|
if (version !== revision || runtime !== current) return;
|
||||||
|
await stop();
|
||||||
|
// Credentials require an operator edit; retry network/service failures.
|
||||||
|
if (err.code === 'TokenInvalid' || err.status === 401) return;
|
||||||
|
scheduleRetry(version);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function configure({ enabled, token }) {
|
||||||
|
const next = { enabled: Boolean(enabled), token };
|
||||||
|
if (next.enabled === desired.enabled && next.token === desired.token) return queue;
|
||||||
|
desired = next;
|
||||||
|
const version = ++revision;
|
||||||
|
clearTimeout(retryTimer);
|
||||||
|
retryTimer = null;
|
||||||
|
retryDelay = 5000;
|
||||||
|
return enqueue(async () => {
|
||||||
|
if (version !== revision) return;
|
||||||
|
if (desired.enabled) await start(version);
|
||||||
|
else await stop();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
configure,
|
||||||
|
refresh() { runtime?.refresh(); },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { createConnectionManager };
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
const test = require('node:test');
|
||||||
|
const assert = require('node:assert/strict');
|
||||||
|
const { EventEmitter } = require('node:events');
|
||||||
|
const { createConnectionManager } = require('./connection');
|
||||||
|
|
||||||
|
const flush = () => new Promise((resolve) => setImmediate(resolve));
|
||||||
|
|
||||||
|
function deferred() {
|
||||||
|
let resolve;
|
||||||
|
let reject;
|
||||||
|
const promise = new Promise((yes, no) => { resolve = yes; reject = no; });
|
||||||
|
return { promise, resolve, reject };
|
||||||
|
}
|
||||||
|
|
||||||
|
function setup(t, attempts = []) {
|
||||||
|
t.mock.timers.enable({ apis: ['setTimeout'] });
|
||||||
|
const runtimes = [];
|
||||||
|
const logs = [];
|
||||||
|
const manager = createConnectionManager({
|
||||||
|
logger: {
|
||||||
|
warn: (...args) => logs.push(args),
|
||||||
|
error: (...args) => logs.push(args),
|
||||||
|
},
|
||||||
|
createRuntime() {
|
||||||
|
const attempt = attempts[runtimes.length] || {};
|
||||||
|
const client = new EventEmitter();
|
||||||
|
const runtime = {
|
||||||
|
client,
|
||||||
|
stopped: false,
|
||||||
|
destroyed: false,
|
||||||
|
refresh() {},
|
||||||
|
stop() { runtime.stopped = true; },
|
||||||
|
};
|
||||||
|
client.login = async (token) => {
|
||||||
|
runtime.token = token;
|
||||||
|
await attempt.login?.();
|
||||||
|
};
|
||||||
|
client.destroy = async () => {
|
||||||
|
await attempt.destroy?.();
|
||||||
|
runtime.destroyed = true;
|
||||||
|
};
|
||||||
|
runtimes.push(runtime);
|
||||||
|
return runtime;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { manager, runtimes, logs };
|
||||||
|
}
|
||||||
|
|
||||||
|
test('retries a network failure at startup with a fresh client', async (t) => {
|
||||||
|
const { manager, runtimes } = setup(t, [{ login: () => { throw new Error('getaddrinfo EAI_AGAIN'); } }]);
|
||||||
|
await manager.configure({ enabled: true, token: 'token' });
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes[0].stopped, true);
|
||||||
|
assert.equal(runtimes[0].destroyed, true);
|
||||||
|
t.mock.timers.tick(4999);
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes.length, 1);
|
||||||
|
t.mock.timers.tick(1);
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes.length, 2);
|
||||||
|
assert.equal(runtimes[1].token, 'token');
|
||||||
|
assert.notEqual(runtimes[0].client, runtimes[1].client);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('backs off repeated failures and cancels retries when disabled', async (t) => {
|
||||||
|
const failed = { login: () => { throw new Error('Network unavailable'); } };
|
||||||
|
const { manager, runtimes, logs } = setup(t, Array(8).fill(failed));
|
||||||
|
await manager.configure({ enabled: true, token: 'token' });
|
||||||
|
await flush();
|
||||||
|
for (const delay of [5000, 10000, 20000, 40000, 60000]) {
|
||||||
|
t.mock.timers.tick(delay);
|
||||||
|
await flush();
|
||||||
|
}
|
||||||
|
assert.deepEqual(logs.filter(([message]) => message === 'Retrying Discord login').map(([, data]) => data.delayMs),
|
||||||
|
[5000, 10000, 20000, 40000, 60000, 60000]);
|
||||||
|
await manager.configure({ enabled: false, token: 'token' });
|
||||||
|
t.mock.timers.tick(120000);
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes.length, 6);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('waits for logout before logging in with a changed token', async (t) => {
|
||||||
|
const logout = deferred();
|
||||||
|
const { manager, runtimes } = setup(t, [{ destroy: () => logout.promise }]);
|
||||||
|
await manager.configure({ enabled: true, token: 'old' });
|
||||||
|
const change = manager.configure({ enabled: true, token: 'new' });
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes[0].stopped, true);
|
||||||
|
assert.equal(runtimes.length, 1);
|
||||||
|
logout.resolve();
|
||||||
|
await change;
|
||||||
|
assert.equal(runtimes[0].destroyed, true);
|
||||||
|
assert.equal(runtimes[1].token, 'new');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('retires a pending login before replacement and ignores its stale failure', async (t) => {
|
||||||
|
const login = deferred();
|
||||||
|
const { manager, runtimes } = setup(t, [{ login: () => login.promise }]);
|
||||||
|
await manager.configure({ enabled: true, token: 'old' });
|
||||||
|
const change = manager.configure({ enabled: true, token: 'new' });
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes[0].stopped, true);
|
||||||
|
assert.equal(runtimes[0].destroyed, false);
|
||||||
|
login.reject(new Error('Old connection failed'));
|
||||||
|
await change;
|
||||||
|
assert.equal(runtimes[0].destroyed, true);
|
||||||
|
assert.equal(runtimes[1].token, 'new');
|
||||||
|
t.mock.timers.tick(120000);
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes.length, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('re-enabling creates a fresh client; unrelated config edits do not reconnect', async (t) => {
|
||||||
|
const { manager, runtimes } = setup(t);
|
||||||
|
await manager.configure({ enabled: true, token: 'token' });
|
||||||
|
await manager.configure({ enabled: true, token: 'token', channels: { general: 'new-channel' } });
|
||||||
|
assert.equal(runtimes.length, 1);
|
||||||
|
await manager.configure({ enabled: false, token: 'token' });
|
||||||
|
assert.equal(runtimes[0].destroyed, true);
|
||||||
|
await manager.configure({ enabled: true, token: 'token' });
|
||||||
|
assert.equal(runtimes.length, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('invalid credentials wait for a token edit instead of retrying', async (t) => {
|
||||||
|
const { manager, runtimes } = setup(t, [{ login: () => {
|
||||||
|
throw Object.assign(new Error('Invalid token'), { code: 'TokenInvalid' });
|
||||||
|
} }]);
|
||||||
|
await manager.configure({ enabled: true, token: 'bad' });
|
||||||
|
await flush();
|
||||||
|
t.mock.timers.tick(120000);
|
||||||
|
await flush();
|
||||||
|
assert.equal(runtimes.length, 1);
|
||||||
|
await manager.configure({ enabled: true, token: 'fixed' });
|
||||||
|
assert.equal(runtimes[1].token, 'fixed');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('client and gateway errors are logged without throwing', async (t) => {
|
||||||
|
const { manager, runtimes, logs } = setup(t);
|
||||||
|
await manager.configure({ enabled: true, token: 'token' });
|
||||||
|
runtimes[0].client.emit('error', new Error('Client failure'));
|
||||||
|
runtimes[0].client.emit('shardError', new Error('Gateway failure'), 0);
|
||||||
|
runtimes[0].client.emit('shardDisconnect', { code: 1006 }, 0);
|
||||||
|
assert.deepEqual(logs.map(([message]) => message), [
|
||||||
|
'Discord client error', 'Discord connection error', 'Discord disconnected',
|
||||||
|
]);
|
||||||
|
});
|
||||||
@@ -22,8 +22,8 @@ const { MODES, getMode, setMode } = require('../modeManager');
|
|||||||
const { sendExternalMessage, sendExternalTyping } = require('../chatService');
|
const { sendExternalMessage, sendExternalTyping } = require('../chatService');
|
||||||
const { commandReplyToText } = require('../chatService/commandResultFormatter');
|
const { commandReplyToText } = require('../chatService/commandResultFormatter');
|
||||||
const { buildReplayVideo, getReplaySources, getDefaultDiscordSources, validateSources, tryTriggerReplay } = require('../replayEngineV2');
|
const { buildReplayVideo, getReplaySources, getDefaultDiscordSources, validateSources, tryTriggerReplay } = require('../replayEngineV2');
|
||||||
const { getActiveDrivers } = require('../turnService');
|
const { getActiveDrivers, turnEvents } = require('../turnService');
|
||||||
const { getNickname } = require('../nicknameService');
|
const { getNickname, nicknameEvents } = require('../nicknameService');
|
||||||
const { getGlobalObjective, setGlobalObjective, clearGlobalObjective } = require('../globalObjectiveService');
|
const { getGlobalObjective, setGlobalObjective, clearGlobalObjective } = require('../globalObjectiveService');
|
||||||
const { getAdminReason, setAdminReason, clearAdminReason } = require('../adminReasonService');
|
const { getAdminReason, setAdminReason, clearAdminReason } = require('../adminReasonService');
|
||||||
const homeAssistantService = require('../homeAssistantService');
|
const homeAssistantService = require('../homeAssistantService');
|
||||||
@@ -67,12 +67,14 @@ const {
|
|||||||
} = require('../privateRoverAccessRequestService');
|
} = require('../privateRoverAccessRequestService');
|
||||||
const { subscribe } = require('../eventBus');
|
const { subscribe } = require('../eventBus');
|
||||||
const { createPresenceManager } = require('./presence');
|
const { createPresenceManager } = require('./presence');
|
||||||
|
const { createConnectionManager } = require('./connection');
|
||||||
const { createChannelIO } = require('./channelIO');
|
const { createChannelIO } = require('./channelIO');
|
||||||
const { createCommandHandlers } = require('../operatorCommandService');
|
const { createCommandHandlers } = require('../operatorCommandService');
|
||||||
const greenModeService = require('../greenModeService');
|
const greenModeService = require('../greenModeService');
|
||||||
const { createDiscordTransportHandlers, createDiscordCommandRequest } = require('./commandAdapter');
|
const { createDiscordTransportHandlers, createDiscordCommandRequest } = require('./commandAdapter');
|
||||||
const { createIntegrations } = require('./integrations');
|
const { createIntegrations } = require('./integrations');
|
||||||
const { createFleetDailyReports } = require('./fleetDailyReports');
|
const { createFleetDailyReports } = require('./fleetDailyReports');
|
||||||
|
const { createLiveStatus } = require('./liveStatus');
|
||||||
const fleetReportService = require('../fleetReportService');
|
const fleetReportService = require('../fleetReportService');
|
||||||
const { registerPreferredDeliveryProvider } = require('../replayDeliveryService');
|
const { registerPreferredDeliveryProvider } = require('../replayDeliveryService');
|
||||||
const {
|
const {
|
||||||
@@ -86,9 +88,7 @@ const {
|
|||||||
buildStatusMessage,
|
buildStatusMessage,
|
||||||
} = require('../replayDeliveryService/workflow');
|
} = require('../replayDeliveryService/workflow');
|
||||||
|
|
||||||
// Discord helper modules retain references to these objects. Mutating those
|
// Keep configuration object identities stable for the active runtime's helpers.
|
||||||
// references on configuration application updates command and integration
|
|
||||||
// behavior without registering a second tree of Discord/event listeners.
|
|
||||||
const config = structuredClone(loadConfig());
|
const config = structuredClone(loadConfig());
|
||||||
const discordConfig = config.discord || {};
|
const discordConfig = config.discord || {};
|
||||||
let enabled = Boolean(discordConfig.enabled);
|
let enabled = Boolean(discordConfig.enabled);
|
||||||
@@ -106,11 +106,6 @@ const intents = [
|
|||||||
GatewayIntentBits.MessageContent,
|
GatewayIntentBits.MessageContent,
|
||||||
];
|
];
|
||||||
|
|
||||||
const client = new Client({
|
|
||||||
intents,
|
|
||||||
partials: [Partials.Channel, Partials.Message, Partials.Reaction, Partials.User],
|
|
||||||
});
|
|
||||||
|
|
||||||
function sanitizeMentions(text) {
|
function sanitizeMentions(text) {
|
||||||
if (!text) return '';
|
if (!text) return '';
|
||||||
return String(text)
|
return String(text)
|
||||||
@@ -156,300 +151,322 @@ function countReady() {
|
|||||||
return { ready, total };
|
return { ready, total };
|
||||||
}
|
}
|
||||||
|
|
||||||
const channelIO = createChannelIO({
|
// Each connection owns its listeners, timers, and cached Discord objects.
|
||||||
client,
|
// Rebuilding them prevents a reconnect from retaining a destroyed client.
|
||||||
logger,
|
function createDiscordRuntime() {
|
||||||
sanitizeMentions,
|
const client = new Client({
|
||||||
});
|
intents,
|
||||||
|
partials: [Partials.Channel, Partials.Message, Partials.Reaction, Partials.User],
|
||||||
|
});
|
||||||
|
const channelIO = createChannelIO({
|
||||||
|
client,
|
||||||
|
logger,
|
||||||
|
sanitizeMentions,
|
||||||
|
});
|
||||||
|
|
||||||
const presence = createPresenceManager({
|
const presence = createPresenceManager({
|
||||||
client,
|
client,
|
||||||
logger,
|
logger,
|
||||||
getMode,
|
getMode,
|
||||||
getGlobalObjective,
|
getGlobalObjective,
|
||||||
countReady,
|
countReady,
|
||||||
});
|
});
|
||||||
|
|
||||||
const replayCaption = createReplayCaptionBuilder({
|
const replayCaption = createReplayCaptionBuilder({
|
||||||
io,
|
io,
|
||||||
rovers,
|
rovers,
|
||||||
getActiveDrivers,
|
getActiveDrivers,
|
||||||
getNickname,
|
getNickname,
|
||||||
sanitizeMentions,
|
sanitizeMentions,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Discord is the preferred replay host only while this optional feature is
|
// Discord is the preferred replay host only while this optional feature is
|
||||||
// active. The core replay delivery service owns generation and automatically
|
// active. The core replay delivery service owns generation and automatically
|
||||||
// falls back to its local media store when any operation below fails.
|
// falls back to its local media store when any operation below fails.
|
||||||
registerPreferredDeliveryProvider({
|
const unregisterReplayProvider = registerPreferredDeliveryProvider({
|
||||||
async begin(job) {
|
async begin(job) {
|
||||||
const channelId = discordConfig.channels?.replay;
|
const channelId = discordConfig.channels?.replay;
|
||||||
if (!enabled || !channelId) throw new Error('Discord replay delivery is disabled');
|
if (!enabled || !channelId) throw new Error('Discord replay delivery is disabled');
|
||||||
const progressMessage = await channelIO.sendToChannel(channelId, buildAcceptedMessage(job), {}, DEFAULT_ALLOWED_MENTIONS);
|
const progressMessage = await channelIO.sendToChannel(channelId, buildAcceptedMessage(job), {}, DEFAULT_ALLOWED_MENTIONS);
|
||||||
if (!progressMessage) throw new Error('Discord replay progress message could not be sent');
|
if (!progressMessage) throw new Error('Discord replay progress message could not be sent');
|
||||||
const channel = await channelIO.fetchChannel(channelId);
|
const channel = await channelIO.fetchChannel(channelId);
|
||||||
return {
|
return {
|
||||||
channelId,
|
channelId,
|
||||||
progressMessage,
|
progressMessage,
|
||||||
stopTyping: startDiscordTypingLoop(channel, logger, 'web replay delivery'),
|
stopTyping: startDiscordTypingLoop(channel, logger, 'web replay delivery'),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
async deliver({ job, context, buffer, usedSources = job.sources, missingSources = [] }) {
|
async deliver({ job, context, buffer, usedSources = job.sources, missingSources = [] }) {
|
||||||
const progressMessage = context?.progressMessage;
|
const progressMessage = context?.progressMessage;
|
||||||
try {
|
try {
|
||||||
if (progressMessage?.edit) {
|
if (progressMessage?.edit) {
|
||||||
await progressMessage.edit({ content: buildStatusMessage(job, 'uploading'), allowedMentions: DEFAULT_ALLOWED_MENTIONS });
|
await progressMessage.edit({ content: buildStatusMessage(job, 'uploading'), allowedMentions: DEFAULT_ALLOWED_MENTIONS });
|
||||||
|
}
|
||||||
|
// Every delivery path uses the job creation time, so a Discord upload
|
||||||
|
// and a server-hosted fallback always expose the same replay filename.
|
||||||
|
const attachment = new AttachmentBuilder(buffer, { name: buildReplayFilename(job) });
|
||||||
|
const body = replayCaption.build({ job, usedSources, missingSources });
|
||||||
|
const uploadMessage = await channelIO.sendToChannel(context.channelId, body, { files: [attachment] }, DEFAULT_ALLOWED_MENTIONS);
|
||||||
|
if (!uploadMessage) throw new Error('Discord upload did not return a message');
|
||||||
|
const media = buildDiscordReplayMediaPayload({ message: uploadMessage, attachment: firstAttachmentFromMessage(uploadMessage), job });
|
||||||
|
if (!media) throw new Error('Discord upload did not include a replay attachment URL');
|
||||||
|
if (progressMessage?.edit) {
|
||||||
|
// The attachment URL is already durable once Discord returns it. A
|
||||||
|
// cosmetic progress-edit failure must not trigger a duplicate local
|
||||||
|
// replay or replace the successful media payload sent to clients.
|
||||||
|
await progressMessage.edit({ content: buildStatusMessage(job, 'ready'), allowedMentions: DEFAULT_ALLOWED_MENTIONS }).catch((err) => {
|
||||||
|
logger.warn('Discord replay uploaded but progress message update failed', { jobId: job.id, error: err.message });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return media;
|
||||||
|
} catch (err) {
|
||||||
|
err.progressMessage = progressMessage;
|
||||||
|
throw err;
|
||||||
|
} finally {
|
||||||
|
if (context?.stopTyping) context.stopTyping();
|
||||||
}
|
}
|
||||||
// Every delivery path uses the job creation time, so a Discord upload
|
},
|
||||||
// and a server-hosted fallback always expose the same replay filename.
|
async completeFallback({ context, media }) {
|
||||||
const attachment = new AttachmentBuilder(buffer, { name: buildReplayFilename(job) });
|
const publicBaseUrl = String(config.publicUrl || '').replace(/\/$/, '');
|
||||||
const body = replayCaption.build({ job, usedSources, missingSources });
|
const publicUrl = publicBaseUrl ? `${publicBaseUrl}${media.url}` : media.url;
|
||||||
const uploadMessage = await channelIO.sendToChannel(context.channelId, body, { files: [attachment] }, DEFAULT_ALLOWED_MENTIONS);
|
if (context?.progressMessage?.reply) {
|
||||||
if (!uploadMessage) throw new Error('Discord upload did not return a message');
|
await context.progressMessage.reply({
|
||||||
const media = buildDiscordReplayMediaPayload({ message: uploadMessage, attachment: firstAttachmentFromMessage(uploadMessage), job });
|
content: `Replay hosted by the rover server: ${publicUrl}`,
|
||||||
if (!media) throw new Error('Discord upload did not include a replay attachment URL');
|
allowedMentions: DEFAULT_ALLOWED_MENTIONS,
|
||||||
if (progressMessage?.edit) {
|
|
||||||
// The attachment URL is already durable once Discord returns it. A
|
|
||||||
// cosmetic progress-edit failure must not trigger a duplicate local
|
|
||||||
// replay or replace the successful media payload sent to clients.
|
|
||||||
await progressMessage.edit({ content: buildStatusMessage(job, 'ready'), allowedMentions: DEFAULT_ALLOWED_MENTIONS }).catch((err) => {
|
|
||||||
logger.warn('Discord replay uploaded but progress message update failed', { jobId: job.id, error: err.message });
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return media;
|
},
|
||||||
} catch (err) {
|
});
|
||||||
err.progressMessage = progressMessage;
|
|
||||||
throw err;
|
|
||||||
} finally {
|
|
||||||
if (context?.stopTyping) context.stopTyping();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async completeFallback({ context, media }) {
|
|
||||||
const publicBaseUrl = String(config.publicUrl || '').replace(/\/$/, '');
|
|
||||||
const publicUrl = publicBaseUrl ? `${publicBaseUrl}${media.url}` : media.url;
|
|
||||||
if (context?.progressMessage?.reply) {
|
|
||||||
await context.progressMessage.reply({
|
|
||||||
content: `Replay hosted by the rover server: ${publicUrl}`,
|
|
||||||
allowedMentions: DEFAULT_ALLOWED_MENTIONS,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const commandDependencies = {
|
const commandDependencies = {
|
||||||
logger,
|
logger,
|
||||||
client,
|
client,
|
||||||
io,
|
io,
|
||||||
rovers,
|
rovers,
|
||||||
roverManager,
|
roverManager,
|
||||||
getMode,
|
getMode,
|
||||||
MODES,
|
MODES,
|
||||||
setMode,
|
setMode,
|
||||||
lockRover,
|
lockRover,
|
||||||
getNickname,
|
getNickname,
|
||||||
getActiveDrivers,
|
getActiveDrivers,
|
||||||
buildReplayVideo,
|
buildReplayVideo,
|
||||||
getReplaySources,
|
getReplaySources,
|
||||||
getDefaultDiscordSources,
|
getDefaultDiscordSources,
|
||||||
validateSources,
|
validateSources,
|
||||||
tryTriggerReplay,
|
tryTriggerReplay,
|
||||||
getGlobalObjective,
|
getGlobalObjective,
|
||||||
setGlobalObjective,
|
setGlobalObjective,
|
||||||
clearGlobalObjective,
|
clearGlobalObjective,
|
||||||
getAdminReason,
|
getAdminReason,
|
||||||
setAdminReason,
|
setAdminReason,
|
||||||
clearAdminReason,
|
clearAdminReason,
|
||||||
// Room-light lock commands must use the same Home Assistant service instance
|
// Room-light lock commands must use the same Home Assistant service instance
|
||||||
// as sockets, HA button triggers, and idle/darkness policies. Passing the
|
// as sockets, HA button triggers, and idle/darkness policies. Passing the
|
||||||
// service into the shared command router keeps Discord and mirrored web-chat
|
// service into the shared command router keeps Discord and mirrored web-chat
|
||||||
// command behavior aligned without duplicating Home Assistant calls here.
|
// command behavior aligned without duplicating Home Assistant calls here.
|
||||||
homeAssistantService,
|
homeAssistantService,
|
||||||
homeAssistantActivitiesService,
|
homeAssistantActivitiesService,
|
||||||
greenModeService,
|
greenModeService,
|
||||||
liftService,
|
liftService,
|
||||||
neatoService,
|
neatoService,
|
||||||
isFeatureEnabled,
|
isFeatureEnabled,
|
||||||
getGuildConfig,
|
getGuildConfig,
|
||||||
setGuildConfig,
|
setGuildConfig,
|
||||||
removeGuildConfig,
|
removeGuildConfig,
|
||||||
normalizeMode,
|
normalizeMode,
|
||||||
VALID_MODES,
|
VALID_MODES,
|
||||||
listVerifiedUsers,
|
listVerifiedUsers,
|
||||||
removeVerifiedUser,
|
removeVerifiedUser,
|
||||||
listDeterredUsers,
|
listDeterredUsers,
|
||||||
listMutedUsers,
|
listMutedUsers,
|
||||||
deterUser,
|
deterUser,
|
||||||
undeterUser,
|
undeterUser,
|
||||||
muteUser,
|
muteUser,
|
||||||
unmuteUser,
|
unmuteUser,
|
||||||
listUsersForAdmin,
|
listUsersForAdmin,
|
||||||
listUsersWithPermission,
|
listUsersWithPermission,
|
||||||
listRegisteredPermissions,
|
listRegisteredPermissions,
|
||||||
setUserPermission,
|
setUserPermission,
|
||||||
sanitizeMentions,
|
sanitizeMentions,
|
||||||
sendToChannel: channelIO.sendToChannel,
|
sendToChannel: channelIO.sendToChannel,
|
||||||
isAdminUser,
|
isAdminUser,
|
||||||
isLockdownAdminUser,
|
isLockdownAdminUser,
|
||||||
discordConfig,
|
discordConfig,
|
||||||
config,
|
config,
|
||||||
};
|
};
|
||||||
commandDependencies.transportHandlers = createDiscordTransportHandlers(commandDependencies);
|
commandDependencies.transportHandlers = createDiscordTransportHandlers(commandDependencies);
|
||||||
const commands = createCommandHandlers(commandDependencies);
|
const commands = createCommandHandlers(commandDependencies);
|
||||||
|
|
||||||
const integrations = createIntegrations({
|
const integrations = createIntegrations({
|
||||||
logger,
|
|
||||||
client,
|
|
||||||
config,
|
|
||||||
discordConfig,
|
|
||||||
rovers,
|
|
||||||
roverManager,
|
|
||||||
getMode,
|
|
||||||
MODES,
|
|
||||||
getGlobalObjective,
|
|
||||||
getActiveDrivers,
|
|
||||||
getNickname,
|
|
||||||
subscribe,
|
|
||||||
sendExternalMessage,
|
|
||||||
sendExternalTyping,
|
|
||||||
getGuildConfig,
|
|
||||||
listGuildConfigs,
|
|
||||||
attachDmMessage,
|
|
||||||
getRequestByMessageId,
|
|
||||||
approveRequest,
|
|
||||||
denyRequest,
|
|
||||||
attachPrivateAccessDmMessage,
|
|
||||||
getPrivateAccessRequestByMessageId,
|
|
||||||
approvePrivateAccessRequest,
|
|
||||||
denyPrivateAccessRequest,
|
|
||||||
getLockdownAdminIds,
|
|
||||||
isAdminUser,
|
|
||||||
isLockdownAdminUser,
|
|
||||||
sendToChannel: channelIO.sendToChannel,
|
|
||||||
fetchChannel: channelIO.fetchChannel,
|
|
||||||
clearTypingMessage: channelIO.clearTypingMessage,
|
|
||||||
sendTypingMessage: channelIO.sendTypingMessage,
|
|
||||||
schedulePresenceRotation: presence.schedulePresenceRotation,
|
|
||||||
buildReplayVideo,
|
|
||||||
sanitizeMentions,
|
|
||||||
});
|
|
||||||
|
|
||||||
const integrationHandlers = integrations.register();
|
|
||||||
|
|
||||||
function isTextCommand(content) {
|
|
||||||
// Both transports share this parser so command detection cannot drift from
|
|
||||||
// the dispatcher when an installation changes its prefix.
|
|
||||||
return parseCommandText(content, config).matched;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isBridgeChannelMessage(message) {
|
|
||||||
if (!message?.guild?.id || !message?.channelId) return false;
|
|
||||||
const guildConfig = getGuildConfig(message.guild.id);
|
|
||||||
return Boolean(guildConfig?.channelId && String(message.channelId) === String(guildConfig.channelId));
|
|
||||||
}
|
|
||||||
|
|
||||||
function createBridgeMirroredCommandMessage(message) {
|
|
||||||
if (!isBridgeChannelMessage(message) || !isTextCommand(message.content)) return message;
|
|
||||||
const originalReply = message.reply.bind(message);
|
|
||||||
return Object.assign(Object.create(message), {
|
|
||||||
reply: async (payload) => {
|
|
||||||
const sent = await originalReply(payload);
|
|
||||||
const text = sanitizeMentions(commandReplyToText(payload));
|
|
||||||
if (text) {
|
|
||||||
// Discord command replies are mirrored to web chat by the Discord
|
|
||||||
// command adapter, not by the chat bridge. The bridge continues to
|
|
||||||
// ignore bot-authored Discord messages, which prevents typing helper
|
|
||||||
// messages and bot replies from feeding back into chat.
|
|
||||||
sendExternalMessage({
|
|
||||||
text,
|
|
||||||
nickname: client.user?.username || 'Rover bot',
|
|
||||||
role: 'admin',
|
|
||||||
roverId: null,
|
|
||||||
discordGuildId: message.guild.id,
|
|
||||||
discordGuildName: message.guild.name,
|
|
||||||
discordGuildIconUrl: message.guild.iconURL?.({ extension: 'png', size: 64 }) || null,
|
|
||||||
discordChannelId: message.channelId,
|
|
||||||
discordUserId: client.user?.id || null,
|
|
||||||
discordUserName: client.user?.username || 'Rover bot',
|
|
||||||
discordUserAvatarUrl: client.user?.displayAvatarURL?.({ extension: 'png', size: 64 }) || null,
|
|
||||||
bot: true,
|
|
||||||
profileImage: client.user?.displayAvatarURL?.({ extension: 'png', size: 64 }) || null,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return sent;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
client.on('messageCreate', async (message) => {
|
|
||||||
try {
|
|
||||||
await integrationHandlers.handleBridgeInbound(message);
|
|
||||||
const commandMessage = createBridgeMirroredCommandMessage(message);
|
|
||||||
await commands.handleCommand(createDiscordCommandRequest(commandMessage, { isAdminUser, isLockdownAdminUser }));
|
|
||||||
} catch (err) {
|
|
||||||
logger.warn('Error handling Discord message', err.message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let fleetDailyReports = null;
|
|
||||||
|
|
||||||
function restartFleetDailyReports() {
|
|
||||||
fleetDailyReports?.stop();
|
|
||||||
fleetDailyReports = createFleetDailyReports({
|
|
||||||
logger,
|
logger,
|
||||||
|
client,
|
||||||
|
config,
|
||||||
discordConfig,
|
discordConfig,
|
||||||
fleetConfig: config.fleetReports || {},
|
rovers,
|
||||||
fleetReportService,
|
|
||||||
roverManager,
|
roverManager,
|
||||||
|
getMode,
|
||||||
|
MODES,
|
||||||
|
getGlobalObjective,
|
||||||
|
getActiveDrivers,
|
||||||
|
getNickname,
|
||||||
|
subscribe,
|
||||||
|
sendExternalMessage,
|
||||||
|
sendExternalTyping,
|
||||||
|
getGuildConfig,
|
||||||
|
listGuildConfigs,
|
||||||
|
attachDmMessage,
|
||||||
|
getRequestByMessageId,
|
||||||
|
approveRequest,
|
||||||
|
denyRequest,
|
||||||
|
attachPrivateAccessDmMessage,
|
||||||
|
getPrivateAccessRequestByMessageId,
|
||||||
|
approvePrivateAccessRequest,
|
||||||
|
denyPrivateAccessRequest,
|
||||||
|
getLockdownAdminIds,
|
||||||
|
isAdminUser,
|
||||||
|
isLockdownAdminUser,
|
||||||
sendToChannel: channelIO.sendToChannel,
|
sendToChannel: channelIO.sendToChannel,
|
||||||
|
fetchChannel: channelIO.fetchChannel,
|
||||||
|
clearTypingMessage: channelIO.clearTypingMessage,
|
||||||
|
sendTypingMessage: channelIO.sendTypingMessage,
|
||||||
|
schedulePresenceRotation: presence.schedulePresenceRotation,
|
||||||
|
buildReplayVideo,
|
||||||
|
sanitizeMentions,
|
||||||
});
|
});
|
||||||
fleetDailyReports.start();
|
|
||||||
|
const integrationHandlers = integrations.register();
|
||||||
|
const liveStatus = createLiveStatus({
|
||||||
|
client, logger, discordConfig, roverManager, getActiveDrivers, getNickname,
|
||||||
|
io, fetchChannel: channelIO.fetchChannel, sanitizeMentions,
|
||||||
|
turnEvents, nicknameEvents,
|
||||||
|
});
|
||||||
|
|
||||||
|
function isTextCommand(content) {
|
||||||
|
// Both transports share this parser so command detection cannot drift from
|
||||||
|
// the dispatcher when an installation changes its prefix.
|
||||||
|
return parseCommandText(content, config).matched;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isBridgeChannelMessage(message) {
|
||||||
|
if (!message?.guild?.id || !message?.channelId) return false;
|
||||||
|
const guildConfig = getGuildConfig(message.guild.id);
|
||||||
|
return Boolean(guildConfig?.channelId && String(message.channelId) === String(guildConfig.channelId));
|
||||||
|
}
|
||||||
|
|
||||||
|
function createBridgeMirroredCommandMessage(message) {
|
||||||
|
if (!isBridgeChannelMessage(message) || !isTextCommand(message.content)) return message;
|
||||||
|
const originalReply = message.reply.bind(message);
|
||||||
|
return Object.assign(Object.create(message), {
|
||||||
|
reply: async (payload) => {
|
||||||
|
const sent = await originalReply(payload);
|
||||||
|
const text = sanitizeMentions(commandReplyToText(payload));
|
||||||
|
if (text) {
|
||||||
|
// Discord command replies are mirrored to web chat by the Discord
|
||||||
|
// command adapter, not by the chat bridge. The bridge continues to
|
||||||
|
// ignore bot-authored Discord messages, which prevents typing helper
|
||||||
|
// messages and bot replies from feeding back into chat.
|
||||||
|
sendExternalMessage({
|
||||||
|
text,
|
||||||
|
nickname: client.user?.username || 'Rover bot',
|
||||||
|
role: 'admin',
|
||||||
|
roverId: null,
|
||||||
|
discordGuildId: message.guild.id,
|
||||||
|
discordGuildName: message.guild.name,
|
||||||
|
discordGuildIconUrl: message.guild.iconURL?.({ extension: 'png', size: 64 }) || null,
|
||||||
|
discordChannelId: message.channelId,
|
||||||
|
discordUserId: client.user?.id || null,
|
||||||
|
discordUserName: client.user?.username || 'Rover bot',
|
||||||
|
discordUserAvatarUrl: client.user?.displayAvatarURL?.({ extension: 'png', size: 64 }) || null,
|
||||||
|
bot: true,
|
||||||
|
profileImage: client.user?.displayAvatarURL?.({ extension: 'png', size: 64 }) || null,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return sent;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
client.on('messageCreate', async (message) => {
|
||||||
|
try {
|
||||||
|
if (message.channelId === discordConfig.channels?.liveStatus?.trim()) {
|
||||||
|
liveStatus.update(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await integrationHandlers.handleBridgeInbound(message);
|
||||||
|
const commandMessage = createBridgeMirroredCommandMessage(message);
|
||||||
|
await commands.handleCommand(createDiscordCommandRequest(commandMessage, { isAdminUser, isLockdownAdminUser }));
|
||||||
|
} catch (err) {
|
||||||
|
logger.warn('Error handling Discord message', err.message);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let fleetDailyReports = null;
|
||||||
|
|
||||||
|
function restartFleetDailyReports() {
|
||||||
|
fleetDailyReports?.stop();
|
||||||
|
fleetDailyReports = createFleetDailyReports({
|
||||||
|
logger,
|
||||||
|
discordConfig,
|
||||||
|
fleetConfig: config.fleetReports || {},
|
||||||
|
fleetReportService,
|
||||||
|
roverManager,
|
||||||
|
sendToChannel: channelIO.sendToChannel,
|
||||||
|
});
|
||||||
|
fleetDailyReports.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
client.on('clientReady', () => {
|
||||||
|
logger.info('Discord bot logged in', { tag: client.user?.tag });
|
||||||
|
presence.schedulePresenceRotation();
|
||||||
|
// Discord is only a delivery consumer. Starting its scheduler after the bot
|
||||||
|
// is ready avoids failed sends during login while the collector continues to
|
||||||
|
// operate independently of Discord availability.
|
||||||
|
restartFleetDailyReports();
|
||||||
|
liveStatus.start();
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
client,
|
||||||
|
refresh() {
|
||||||
|
if (client.isReady()) restartFleetDailyReports();
|
||||||
|
if (client.isReady()) liveStatus.start();
|
||||||
|
},
|
||||||
|
stop() {
|
||||||
|
for (const event of ['clientReady', 'messageCreate', 'typingStart', 'messageReactionAdd']) {
|
||||||
|
client.removeAllListeners(event);
|
||||||
|
}
|
||||||
|
integrationHandlers.stop();
|
||||||
|
unregisterReplayProvider();
|
||||||
|
presence.stop();
|
||||||
|
liveStatus.stop();
|
||||||
|
channelIO.stop();
|
||||||
|
fleetDailyReports?.stop();
|
||||||
|
},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
client.on('ready', () => {
|
const connection = createConnectionManager({ createRuntime: createDiscordRuntime, logger });
|
||||||
logger.info('Discord bot logged in', { tag: client.user?.tag });
|
|
||||||
presence.schedulePresenceRotation();
|
|
||||||
// Discord is only a delivery consumer. Starting its scheduler after the bot
|
|
||||||
// is ready avoids failed sends during login while the collector continues to
|
|
||||||
// operate independently of Discord availability.
|
|
||||||
restartFleetDailyReports();
|
|
||||||
});
|
|
||||||
|
|
||||||
function replaceObject(target, source = {}) {
|
function replaceObject(target, source = {}) {
|
||||||
Object.keys(target).forEach((key) => delete target[key]);
|
Object.keys(target).forEach((key) => delete target[key]);
|
||||||
Object.assign(target, structuredClone(source));
|
Object.assign(target, structuredClone(source));
|
||||||
}
|
}
|
||||||
|
|
||||||
function applyDiscordConfig(nextDiscordConfig = {}) {
|
async function applyDiscordConfig(nextDiscordConfig = {}) {
|
||||||
const wasEnabled = enabled;
|
|
||||||
const previousToken = discordConfig.token;
|
|
||||||
replaceObject(discordConfig, nextDiscordConfig);
|
replaceObject(discordConfig, nextDiscordConfig);
|
||||||
config.discord = discordConfig;
|
config.discord = discordConfig;
|
||||||
enabled = Boolean(discordConfig.enabled);
|
enabled = Boolean(discordConfig.enabled);
|
||||||
|
await connection.configure(discordConfig);
|
||||||
if (!enabled) {
|
connection.refresh();
|
||||||
fleetDailyReports?.stop();
|
|
||||||
fleetDailyReports = null;
|
|
||||||
if (wasEnabled) client.destroy();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!wasEnabled || previousToken !== discordConfig.token) {
|
|
||||||
if (wasEnabled) client.destroy();
|
|
||||||
// Login health is reported by Discord itself; do not hold the committed
|
|
||||||
// configuration request open while an external network service connects.
|
|
||||||
client.login(discordConfig.token).catch((err) => {
|
|
||||||
logger.error('Discord login failed after configuration change', err.message);
|
|
||||||
});
|
|
||||||
} else if (client.isReady()) {
|
|
||||||
restartFleetDailyReports();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function applySharedConfigSection(section, value) {
|
function applySharedConfigSection(section, value) {
|
||||||
config[section] = structuredClone(value);
|
config[section] = structuredClone(value);
|
||||||
// Fleet delivery owns a timer derived from both Discord and fleet settings.
|
// Fleet delivery owns a timer derived from both Discord and fleet settings.
|
||||||
// Reconnecting is unnecessary; rebuild only that scheduler when ready.
|
// Reconnecting is unnecessary; rebuild only that scheduler when ready.
|
||||||
if (section === 'fleetReports' && client.isReady()) {
|
if (section === 'fleetReports') {
|
||||||
restartFleetDailyReports();
|
connection.refresh();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -458,10 +475,8 @@ registerConfigurationHandler('discord', applyDiscordConfig);
|
|||||||
registerConfigurationHandler(section, (value) => applySharedConfigSection(section, value));
|
registerConfigurationHandler(section, (value) => applySharedConfigSection(section, value));
|
||||||
});
|
});
|
||||||
|
|
||||||
if (enabled) {
|
connection.configure(discordConfig).catch((err) => {
|
||||||
client.login(discordConfig.token).catch((err) => {
|
logger.error('Discord startup failed', err.message);
|
||||||
logger.error('Discord login failed', err.message);
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {};
|
module.exports = {};
|
||||||
|
|||||||
@@ -59,12 +59,6 @@ function createChatBridgeHandlers(deps) {
|
|||||||
function handleChatBridgeOutbound(event) {
|
function handleChatBridgeOutbound(event) {
|
||||||
const payload = event?.payload;
|
const payload = event?.payload;
|
||||||
if (!payload) return;
|
if (!payload) return;
|
||||||
/*
|
|
||||||
Outbound bridge filtering must use chat visibility, not rover replay
|
|
||||||
visibility. PTZ deliberately uses roverId: "ptz-camera" so the existing
|
|
||||||
chat badge path can be reused, but that id is not a roverManager rover and
|
|
||||||
would be dropped by canReplayRoverId().
|
|
||||||
*/
|
|
||||||
if (payload?.roverId && !isPublicChatTargetId(payload.roverId)) return;
|
if (payload?.roverId && !isPublicChatTargetId(payload.roverId)) return;
|
||||||
const guildConfigs = listGuildConfigs();
|
const guildConfigs = listGuildConfigs();
|
||||||
if (!guildConfigs.length) return;
|
if (!guildConfigs.length) return;
|
||||||
|
|||||||
@@ -24,14 +24,8 @@ function formatWebhookUsername(payload) {
|
|||||||
const origin = payload.discordGuildName ? ` (From: ${payload.discordGuildName})` : '';
|
const origin = payload.discordGuildName ? ` (From: ${payload.discordGuildName})` : '';
|
||||||
return `${name}${origin}${botTag}${spectatorTag}${adminTag}`;
|
return `${name}${origin}${botTag}${spectatorTag}${adminTag}`;
|
||||||
}
|
}
|
||||||
/*
|
const tagLabel = payload.operatingModeDisplay?.name || payload.roverName || payload.roverId;
|
||||||
The chat payload already carries the resolved display name for rover-like
|
const roverTag = tagLabel ? ` [${tagLabel}]` : '';
|
||||||
targets. Prefer that name so PTZ, which is intentionally pretending to be a
|
|
||||||
rover in chat, shows up as "PTZ Camera" instead of the internal id
|
|
||||||
"ptz-camera"; fall back to the id for older payloads or missing metadata.
|
|
||||||
*/
|
|
||||||
const roverTagLabel = payload.roverName || payload.roverId;
|
|
||||||
const roverTag = payload.roverId ? ` [${roverTagLabel}]` : '';
|
|
||||||
return `${name}${botTag}${spectatorTag}${adminTag}${roverTag}`;
|
return `${name}${botTag}${spectatorTag}${adminTag}${roverTag}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ function createIntegrations(deps) {
|
|||||||
const userAnnouncements = createUserAnnouncements({ ...deps, sendToChannel, schedulePresenceRotation });
|
const userAnnouncements = createUserAnnouncements({ ...deps, sendToChannel, schedulePresenceRotation });
|
||||||
|
|
||||||
function register() {
|
function register() {
|
||||||
|
let stopped = false;
|
||||||
client.on('typingStart', (typing) => {
|
client.on('typingStart', (typing) => {
|
||||||
chat.handleDiscordTypingStart(typing).catch((err) => logger.warn('Error handling Discord typing', err.message));
|
chat.handleDiscordTypingStart(typing).catch((err) => logger.warn('Error handling Discord typing', err.message));
|
||||||
});
|
});
|
||||||
@@ -33,14 +34,31 @@ function createIntegrations(deps) {
|
|||||||
dm.handlePrivateAccessReaction(reaction, user).catch((err) => logger.warn('Error handling private access reaction', err.message));
|
dm.handlePrivateAccessReaction(reaction, user).catch((err) => logger.warn('Error handling private access reaction', err.message));
|
||||||
});
|
});
|
||||||
|
|
||||||
subscribe('*', handleBusEvent);
|
// Only the active, ready connection consumes server events. Retain each
|
||||||
subscribe('*', userAnnouncements.handleBusEvent);
|
// unsubscribe function so replacement clients never duplicate deliveries.
|
||||||
subscribe('verification.requested', dm.sendVerificationRequestDms);
|
const unsubscribe = [];
|
||||||
subscribe('privateRoverAccess.requested', dm.sendPrivateRoverAccessRequestDms);
|
function subscribeWhileReady(type, handler) {
|
||||||
subscribe('chat:message', chat.handleChatBridgeOutbound);
|
unsubscribe.push(subscribe(type, (event) => {
|
||||||
subscribe('chat:typing', chat.handleChatTypingOutbound);
|
Promise.resolve().then(() => {
|
||||||
|
if (!stopped && client.isReady()) return handler(event);
|
||||||
|
}).catch((err) => {
|
||||||
|
logger.warn('Error handling Discord integration event', { type, error: err.message });
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
subscribeWhileReady('*', handleBusEvent);
|
||||||
|
subscribeWhileReady('*', userAnnouncements.handleBusEvent);
|
||||||
|
subscribeWhileReady('verification.requested', dm.sendVerificationRequestDms);
|
||||||
|
subscribeWhileReady('privateRoverAccess.requested', dm.sendPrivateRoverAccessRequestDms);
|
||||||
|
subscribeWhileReady('chat:message', chat.handleChatBridgeOutbound);
|
||||||
|
subscribeWhileReady('chat:typing', chat.handleChatTypingOutbound);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
stop() {
|
||||||
|
stopped = true;
|
||||||
|
unsubscribe.forEach((remove) => remove());
|
||||||
|
},
|
||||||
handleBridgeInbound: chat.handleBridgeInbound,
|
handleBridgeInbound: chat.handleBridgeInbound,
|
||||||
handleBusEvent,
|
handleBusEvent,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,184 @@
|
|||||||
|
// Owns the single-message live report and the dedicated channel's cleanup.
|
||||||
|
const { PermissionFlagsBits } = require('discord.js');
|
||||||
|
const { buildRoverStatusSnapshot } = require('./batteryEmbeds');
|
||||||
|
|
||||||
|
function createLiveStatus({ client, logger, discordConfig, roverManager, getActiveDrivers,
|
||||||
|
getNickname, io, fetchChannel, sanitizeMentions,
|
||||||
|
turnEvents, nicknameEvents }) {
|
||||||
|
const COOLDOWN_MS = 2000;
|
||||||
|
let timer = null;
|
||||||
|
let sweepTimer = null;
|
||||||
|
let pending = false;
|
||||||
|
let cleanupNeeded = false;
|
||||||
|
let nextUpdateAt = 0;
|
||||||
|
let listening = false;
|
||||||
|
const unsubscribe = [];
|
||||||
|
let stopped = false;
|
||||||
|
let running = false;
|
||||||
|
let channelId = null;
|
||||||
|
let messageId = null;
|
||||||
|
let lastContent = null;
|
||||||
|
|
||||||
|
const clean = (value, limit = 120) => sanitizeMentions(String(value ?? ''))
|
||||||
|
.replace(/[\r\n]+/g, ' ').slice(0, limit);
|
||||||
|
|
||||||
|
function buildReport() {
|
||||||
|
const drivers = getActiveDrivers();
|
||||||
|
const roster = roverManager.getRoster();
|
||||||
|
const lines = [];
|
||||||
|
for (const rover of roster) {
|
||||||
|
const snapshot = buildRoverStatusSnapshot(roverManager.rovers.get(rover.id));
|
||||||
|
const driverId = drivers[rover.id];
|
||||||
|
const driver = driverId ? clean(getNickname(io.sockets.sockets.get(driverId)) || 'Someone', 32) : null;
|
||||||
|
const status = snapshot?.docked ? 'docked' : rover.needsHelp ? 'needs help'
|
||||||
|
: driver ? `${driver} driving` : rover.locked ? 'locked' : 'available';
|
||||||
|
lines.push(`${clean(rover.name, 60)}: ${status}`);
|
||||||
|
}
|
||||||
|
let content = lines.join('\n') || 'No rovers online.';
|
||||||
|
if (content.length > 2000) content = `${content.slice(0, 1950)}\n… More rovers online.`;
|
||||||
|
return { content, allowedMentions: { parse: [] } };
|
||||||
|
}
|
||||||
|
|
||||||
|
function schedule() {
|
||||||
|
if (stopped || running || timer || !pending || !client.isReady()
|
||||||
|
|| !discordConfig.channels?.liveStatus?.trim()) return;
|
||||||
|
// Use a fixed deadline rather than resetting a debounce on every sensor
|
||||||
|
// frame: a continuously changing rover must not postpone updates forever.
|
||||||
|
timer = setTimeout(() => {
|
||||||
|
timer = null;
|
||||||
|
flush();
|
||||||
|
}, Math.max(0, nextUpdateAt - Date.now()));
|
||||||
|
timer.unref?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
function update(forceCleanup = false) {
|
||||||
|
if (stopped) return;
|
||||||
|
pending = true;
|
||||||
|
cleanupNeeded ||= forceCleanup;
|
||||||
|
schedule();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function flush() {
|
||||||
|
if (stopped || running || !client.isReady()) return;
|
||||||
|
pending = false;
|
||||||
|
const target = discordConfig.channels?.liveStatus?.trim();
|
||||||
|
if (target !== channelId) {
|
||||||
|
channelId = target;
|
||||||
|
messageId = null;
|
||||||
|
lastContent = null;
|
||||||
|
}
|
||||||
|
if (!target) return;
|
||||||
|
running = true;
|
||||||
|
const cleanup = cleanupNeeded;
|
||||||
|
cleanupNeeded = false;
|
||||||
|
let usedDiscord = false;
|
||||||
|
const active = () => !stopped && client.isReady()
|
||||||
|
&& discordConfig.channels?.liveStatus?.trim() === target;
|
||||||
|
try {
|
||||||
|
const report = buildReport();
|
||||||
|
const replace = report.content !== lastContent;
|
||||||
|
// Sensor events can arrive many times per second. Compare the rendered
|
||||||
|
// report locally before consuming any Discord API capacity.
|
||||||
|
if (!replace && !cleanup) return;
|
||||||
|
usedDiscord = true;
|
||||||
|
const channel = await fetchChannel(target);
|
||||||
|
if (!active()) return;
|
||||||
|
if (!channel?.isTextBased() || !channel.guild || !channel.messages || !channel.send) {
|
||||||
|
throw new Error('Live status requires a guild text channel');
|
||||||
|
}
|
||||||
|
const permissions = channel.permissionsFor(client.user);
|
||||||
|
if (!permissions?.has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.ReadMessageHistory,
|
||||||
|
PermissionFlagsBits.SendMessages, PermissionFlagsBits.ManageMessages])) {
|
||||||
|
throw new Error('Live status requires View Channel, Read Message History, Send Messages, and Manage Messages');
|
||||||
|
}
|
||||||
|
let found = false;
|
||||||
|
let before;
|
||||||
|
// Paginate the entire history, including pinned and old messages. Individual
|
||||||
|
// deletion also handles messages too old for Discord's bulk-delete endpoint.
|
||||||
|
while (active()) {
|
||||||
|
const messages = await channel.messages.fetch({ limit: 100, before, cache: false });
|
||||||
|
if (!active()) return;
|
||||||
|
for (const message of messages.values()) {
|
||||||
|
if (!active()) return;
|
||||||
|
if (!replace && message.id === messageId) {
|
||||||
|
found = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await message.delete();
|
||||||
|
} catch (err) {
|
||||||
|
if (err.code !== 10008) throw err; // Already-deleted messages need no cleanup.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (messages.size < 100) break;
|
||||||
|
before = messages.last().id;
|
||||||
|
}
|
||||||
|
if (!active()) return;
|
||||||
|
if (replace || !found) {
|
||||||
|
const message = await channel.send(report);
|
||||||
|
if (!active()) return;
|
||||||
|
messageId = message.id;
|
||||||
|
lastContent = report.content;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
cleanupNeeded = true;
|
||||||
|
logger.warn('Discord live status update failed', { channelId: target, error: err.message });
|
||||||
|
} finally {
|
||||||
|
running = false;
|
||||||
|
// Cool down after completion, so slow deletions and rate-limited requests
|
||||||
|
// cannot overlap with another batch. Events received meanwhile stay pending.
|
||||||
|
if (usedDiscord) nextUpdateAt = Date.now() + COOLDOWN_MS;
|
||||||
|
schedule();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const onChange = () => update();
|
||||||
|
function onDelete(message) {
|
||||||
|
if (message.channelId === discordConfig.channels?.liveStatus?.trim()
|
||||||
|
&& message.id === messageId) update(true);
|
||||||
|
}
|
||||||
|
function onBulkDelete(messages) {
|
||||||
|
for (const message of messages.values()) onDelete(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
update,
|
||||||
|
start() {
|
||||||
|
if (stopped) return;
|
||||||
|
if (!listening) {
|
||||||
|
listening = true;
|
||||||
|
for (const event of ['rover', 'sensor', 'lock', 'private', 'help']) {
|
||||||
|
roverManager.managerEvents.on(event, onChange);
|
||||||
|
unsubscribe.push(() => roverManager.managerEvents.off(event, onChange));
|
||||||
|
}
|
||||||
|
turnEvents.on('activeDriver', onChange);
|
||||||
|
nicknameEvents.on('change', onChange);
|
||||||
|
client.on('messageDelete', onDelete);
|
||||||
|
client.on('messageDeleteBulk', onBulkDelete);
|
||||||
|
unsubscribe.push(
|
||||||
|
() => turnEvents.off('activeDriver', onChange),
|
||||||
|
() => nicknameEvents.off('change', onChange),
|
||||||
|
() => client.off('messageDelete', onDelete),
|
||||||
|
() => client.off('messageDeleteBulk', onBulkDelete),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
clearInterval(sweepTimer);
|
||||||
|
sweepTimer = null;
|
||||||
|
if (discordConfig.channels?.liveStatus?.trim()) {
|
||||||
|
// Recover from missed gateway events and failed operations without polling
|
||||||
|
// for normal rover changes, which are handled by the subscriptions above.
|
||||||
|
sweepTimer = setInterval(() => update(true), 30000);
|
||||||
|
sweepTimer.unref?.();
|
||||||
|
}
|
||||||
|
update(true);
|
||||||
|
},
|
||||||
|
stop() {
|
||||||
|
stopped = true;
|
||||||
|
clearTimeout(timer);
|
||||||
|
clearInterval(sweepTimer);
|
||||||
|
unsubscribe.forEach((remove) => remove());
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { createLiveStatus };
|
||||||
@@ -7,6 +7,7 @@ function createPresenceManager({ client, logger, getMode, getGlobalObjective, co
|
|||||||
const PRESENCE_ROTATE_MS = 20000;
|
const PRESENCE_ROTATE_MS = 20000;
|
||||||
let presenceInterval = null;
|
let presenceInterval = null;
|
||||||
let presenceShowObjective = false;
|
let presenceShowObjective = false;
|
||||||
|
let stopped = false;
|
||||||
|
|
||||||
function truncatePresenceText(text, maxLength) {
|
function truncatePresenceText(text, maxLength) {
|
||||||
if (!text) return '';
|
if (!text) return '';
|
||||||
@@ -40,6 +41,7 @@ function createPresenceManager({ client, logger, getMode, getGlobalObjective, co
|
|||||||
}
|
}
|
||||||
|
|
||||||
function schedulePresenceRotation() {
|
function schedulePresenceRotation() {
|
||||||
|
if (stopped) return;
|
||||||
if (presenceInterval) {
|
if (presenceInterval) {
|
||||||
clearInterval(presenceInterval);
|
clearInterval(presenceInterval);
|
||||||
presenceInterval = null;
|
presenceInterval = null;
|
||||||
@@ -59,6 +61,11 @@ function createPresenceManager({ client, logger, getMode, getGlobalObjective, co
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
stop() {
|
||||||
|
stopped = true;
|
||||||
|
clearInterval(presenceInterval);
|
||||||
|
presenceInterval = null;
|
||||||
|
},
|
||||||
schedulePresenceRotation,
|
schedulePresenceRotation,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -370,11 +370,6 @@ function createSnapshotEngine(deps) {
|
|||||||
.filter((entry) => {
|
.filter((entry) => {
|
||||||
const roverId = entry?.roverId ? String(entry.roverId) : null;
|
const roverId = entry?.roverId ? String(entry.roverId) : null;
|
||||||
if (!roverId) return true;
|
if (!roverId) return true;
|
||||||
/*
|
|
||||||
This is a chat transcript filter, not a physical-rover filter. PTZ
|
|
||||||
chat intentionally carries a rover-like id so transcript consumers can
|
|
||||||
render it consistently, even though roverManager cannot replay that id.
|
|
||||||
*/
|
|
||||||
return isPublicChatTargetId(roverId);
|
return isPublicChatTargetId(roverId);
|
||||||
});
|
});
|
||||||
const chatRecent = allRecentMessages
|
const chatRecent = allRecentMessages
|
||||||
@@ -430,6 +425,8 @@ function createSnapshotEngine(deps) {
|
|||||||
type: 'chat',
|
type: 'chat',
|
||||||
nickname: entry.nickname || entry.socketId?.slice(0, 6) || 'unknown',
|
nickname: entry.nickname || entry.socketId?.slice(0, 6) || 'unknown',
|
||||||
text: entry.text || '',
|
text: entry.text || '',
|
||||||
|
operating_mode: entry.operatingMode || null,
|
||||||
|
operating_mode_name: entry.operatingModeDisplay?.name || null,
|
||||||
rover_id: roverId,
|
rover_id: roverId,
|
||||||
rover_ctx: { ...baseCtx, ...storedCtx },
|
rover_ctx: { ...baseCtx, ...storedCtx },
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
const EventEmitter = require('events');
|
||||||
|
|
||||||
|
const operatingModeEvents = new EventEmitter();
|
||||||
|
const transitions = new WeakMap();
|
||||||
|
|
||||||
|
function getOperatingMode(socket) {
|
||||||
|
// Handshake intent reserves the mode before role-driven assignment runs.
|
||||||
|
// It grants no camera permissions; entry still checks access and readiness.
|
||||||
|
return socket?.data?.operatingMode
|
||||||
|
|| (socket?.handshake?.auth?.operatingMode === 'ptz' ? 'ptz' : 'rover');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function transition(socket, operatingMode) {
|
||||||
|
// Resolve services at the action boundary to avoid a dependency cycle with
|
||||||
|
// assignment and camera policy, which both read operating mode.
|
||||||
|
const assignment = require('../assignmentService');
|
||||||
|
const roverManager = require('../roverManager');
|
||||||
|
const ptz = require('../ptzCameraService');
|
||||||
|
if (operatingMode === 'rover' && getOperatingMode(socket) === 'rover') {
|
||||||
|
return { operatingMode, state: ptz.getPublicState(socket) };
|
||||||
|
}
|
||||||
|
if (operatingMode === 'ptz') {
|
||||||
|
await ptz.prepareParticipation(socket);
|
||||||
|
if (socket.disconnected) throw new Error('Session disconnected');
|
||||||
|
ptz.checkParticipationAccess(socket);
|
||||||
|
const leave = roverManager.canLeaveCurrentRover(socket);
|
||||||
|
if (!leave.ok) throw new Error(leave.message);
|
||||||
|
|
||||||
|
// Block new rover ownership before release events notify other services.
|
||||||
|
socket.data.operatingMode = 'ptz';
|
||||||
|
assignment.releaseForOperatingMode(socket);
|
||||||
|
socket.data.ptzEntered = true;
|
||||||
|
} else {
|
||||||
|
ptz.releaseTurn(socket);
|
||||||
|
socket.data.ptzEntered = false;
|
||||||
|
socket.data.operatingMode = 'rover';
|
||||||
|
assignment.resumeAssignment(socket);
|
||||||
|
}
|
||||||
|
operatingModeEvents.emit('change', { socket, operatingMode });
|
||||||
|
return { operatingMode, state: ptz.getPublicState(socket) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function enqueueTransition(socket, action) {
|
||||||
|
// Camera initialization can yield. Serialize switches and turn release per
|
||||||
|
// socket so a late entry cannot undo a subsequent exit or release request.
|
||||||
|
const previous = transitions.get(socket) || Promise.resolve();
|
||||||
|
const next = previous.catch(() => {}).then(() => {
|
||||||
|
if (socket.disconnected) throw new Error('Session disconnected');
|
||||||
|
return action();
|
||||||
|
});
|
||||||
|
transitions.set(socket, next);
|
||||||
|
return next;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setOperatingMode(socket, operatingMode) {
|
||||||
|
if (!['rover', 'ptz'].includes(operatingMode)) {
|
||||||
|
return Promise.reject(new Error('Invalid operating mode'));
|
||||||
|
}
|
||||||
|
return enqueueTransition(socket, () => transition(socket, operatingMode));
|
||||||
|
}
|
||||||
|
|
||||||
|
function runPtzTurnAction(socket, action) {
|
||||||
|
return enqueueTransition(socket, () => {
|
||||||
|
const ptz = require('../ptzCameraService');
|
||||||
|
if (action === 'release') return ptz.releaseTurn(socket);
|
||||||
|
if (action !== 'request') throw new Error('Invalid PTZ turn action');
|
||||||
|
if (getOperatingMode(socket) !== 'ptz' || !socket.data.ptzEntered) {
|
||||||
|
throw new Error('Enter PTZ before requesting a turn');
|
||||||
|
}
|
||||||
|
return ptz.claimTurn(socket);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { getOperatingMode, setOperatingMode, runPtzTurnAction, operatingModeEvents };
|
||||||
@@ -396,11 +396,6 @@ async function runDecision(triggerReason) {
|
|||||||
.filter((entry) => Number(entry?.ts || 0) >= runtime.contextResetAt)
|
.filter((entry) => Number(entry?.ts || 0) >= runtime.contextResetAt)
|
||||||
.filter((entry) => {
|
.filter((entry) => {
|
||||||
if (!entry?.roverId) return true;
|
if (!entry?.roverId) return true;
|
||||||
/*
|
|
||||||
Chat context should preserve every public chat target, including the
|
|
||||||
PTZ virtual rover. Rover replay visibility alone would drop PTZ because
|
|
||||||
it is owned by ptzCameraService instead of roverManager.
|
|
||||||
*/
|
|
||||||
return isPublicChatTargetId(entry.roverId);
|
return isPublicChatTargetId(entry.roverId);
|
||||||
})
|
})
|
||||||
.slice(-(MAX_CHAT_CONTEXT + MAX_BOT_CONTEXT));
|
.slice(-(MAX_CHAT_CONTEXT + MAX_BOT_CONTEXT));
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
// Purpose: Generates server-side TTS files and sends them to the Reolink TrackMix speaker through neolink.
|
// Purpose: Generates server-side TTS files and sends them to the Reolink TrackMix speaker through neolink.
|
||||||
// Scope: Owns file/cache/process details for PTZ speech only; PTZ ownership, chat identity, and camera motion stay in index.js.
|
// Scope: Owns file/cache/process details for PTZ speech only; PTZ ownership, chat identity, and camera motion stay in index.js.
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const fs = require('fs');
|
|
||||||
const fsp = require('fs/promises');
|
const fsp = require('fs/promises');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const { spawn } = require('child_process');
|
const { spawn } = require('child_process');
|
||||||
@@ -78,6 +77,7 @@ function createPtzAudioPlayback(deps) {
|
|||||||
const volume = clampNumber(audioConfig.volume, DEFAULT_VOLUME, 0, 4);
|
const volume = clampNumber(audioConfig.volume, DEFAULT_VOLUME, 0, 4);
|
||||||
const fliteDefaultVoice = String(audioConfig.fliteDefaultVoice || 'kal').trim();
|
const fliteDefaultVoice = String(audioConfig.fliteDefaultVoice || 'kal').trim();
|
||||||
|
|
||||||
|
let disposed = false;
|
||||||
let playbackProc = null;
|
let playbackProc = null;
|
||||||
let playbackSeq = 0;
|
let playbackSeq = 0;
|
||||||
|
|
||||||
@@ -244,12 +244,16 @@ function createPtzAudioPlayback(deps) {
|
|||||||
}, 1200);
|
}, 1200);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function playFile(filePath, context = {}) {
|
async function playFile(filePath, context = {}, authorize = () => {}) {
|
||||||
if (!audioEnabled) throw new Error('PTZ audio disabled');
|
if (disposed || !audioEnabled) throw new Error('PTZ audio unavailable');
|
||||||
|
authorize();
|
||||||
const neolinkConfigPath = await ensureNeolinkConfig();
|
const neolinkConfigPath = await ensureNeolinkConfig();
|
||||||
const stat = await fsp.stat(filePath);
|
const stat = await fsp.stat(filePath);
|
||||||
if (!stat.isFile()) throw new Error(`PTZ TTS file is not a regular file: ${filePath}`);
|
if (!stat.isFile()) throw new Error(`PTZ TTS file is not a regular file: ${filePath}`);
|
||||||
|
|
||||||
|
// Rendering and config IO may outlive a turn or camera configuration.
|
||||||
|
if (disposed) throw new Error('PTZ audio configuration changed');
|
||||||
|
authorize();
|
||||||
stopActivePlayback('new-playback');
|
stopActivePlayback('new-playback');
|
||||||
const seq = ++playbackSeq;
|
const seq = ++playbackSeq;
|
||||||
const args = [
|
const args = [
|
||||||
@@ -302,13 +306,13 @@ function createPtzAudioPlayback(deps) {
|
|||||||
return { pid: proc.pid || null, seq };
|
return { pid: proc.pid || null, seq };
|
||||||
}
|
}
|
||||||
|
|
||||||
async function speakText(text, ttsOptions = {}, context = {}) {
|
async function speakText(text, ttsOptions = {}, context = {}, authorize = () => {}) {
|
||||||
const rendered = await ensureTtsFile(text, ttsOptions);
|
const rendered = await ensureTtsFile(text, ttsOptions);
|
||||||
await playFile(rendered.filePath, {
|
await playFile(rendered.filePath, {
|
||||||
...context,
|
...context,
|
||||||
engine: rendered.engine,
|
engine: rendered.engine,
|
||||||
cached: rendered.cached,
|
cached: rendered.cached,
|
||||||
});
|
}, authorize);
|
||||||
return rendered;
|
return rendered;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -316,6 +320,10 @@ function createPtzAudioPlayback(deps) {
|
|||||||
getState,
|
getState,
|
||||||
speakText,
|
speakText,
|
||||||
stopActivePlayback,
|
stopActivePlayback,
|
||||||
|
dispose: () => {
|
||||||
|
disposed = true;
|
||||||
|
stopActivePlayback('configuration-change');
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,98 @@
|
|||||||
|
// Owns PTZ turns only. Camera IO, permissions and operating-mode entry are supplied
|
||||||
|
// by the service, so queue transitions cannot create physical rover ownership.
|
||||||
|
function createParticipation({ io, events, emitChange, getTurnDurationMs, canParticipate, stopMotion, revokeVideo }) {
|
||||||
|
const state = { operatorSocketId: null, queue: [], deadline: null, generation: 0 };
|
||||||
|
let timer = null;
|
||||||
|
|
||||||
|
function remove(socketId) {
|
||||||
|
state.queue = state.queue.filter((id) => id !== socketId);
|
||||||
|
}
|
||||||
|
|
||||||
|
function stopOperator(reason) {
|
||||||
|
clearTimeout(timer);
|
||||||
|
timer = null;
|
||||||
|
const previous = state.operatorSocketId;
|
||||||
|
state.operatorSocketId = null;
|
||||||
|
state.deadline = null;
|
||||||
|
state.generation += 1;
|
||||||
|
if (!previous) return;
|
||||||
|
revokeVideo(previous);
|
||||||
|
stopMotion(reason).catch(() => {});
|
||||||
|
events.emit('operator', { socketId: previous, action: 'release', reason });
|
||||||
|
}
|
||||||
|
|
||||||
|
function scheduleTurn() {
|
||||||
|
// Uncontested control has no deadline. Starting a new wait gets a full turn,
|
||||||
|
// while later queue changes must not reset an already running countdown.
|
||||||
|
if (!state.operatorSocketId || !state.queue.length) {
|
||||||
|
clearTimeout(timer);
|
||||||
|
timer = null;
|
||||||
|
state.deadline = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (timer) return;
|
||||||
|
const duration = getTurnDurationMs();
|
||||||
|
state.deadline = Date.now() + duration;
|
||||||
|
timer = setTimeout(() => {
|
||||||
|
timer = null;
|
||||||
|
state.queue = state.queue.filter(eligible);
|
||||||
|
if (state.queue.length) {
|
||||||
|
// Preserve PTZ's explicit request-to-rejoin rule after a handoff.
|
||||||
|
stopOperator('turn-expired');
|
||||||
|
advance('turn-expired');
|
||||||
|
} else {
|
||||||
|
scheduleTurn();
|
||||||
|
emitChange('turn-uncontested');
|
||||||
|
}
|
||||||
|
}, duration);
|
||||||
|
}
|
||||||
|
|
||||||
|
function eligible(socketId) {
|
||||||
|
const socket = io.sockets.sockets.get(socketId);
|
||||||
|
return socket && !socket.disconnected && canParticipate(socket);
|
||||||
|
}
|
||||||
|
|
||||||
|
function advance(reason) {
|
||||||
|
state.queue = state.queue.filter(eligible);
|
||||||
|
while (!state.operatorSocketId && state.queue.length) {
|
||||||
|
const next = state.queue.shift();
|
||||||
|
if (!eligible(next)) continue;
|
||||||
|
state.operatorSocketId = next;
|
||||||
|
state.generation += 1;
|
||||||
|
events.emit('operator', { socketId: next, action: 'active' });
|
||||||
|
}
|
||||||
|
scheduleTurn();
|
||||||
|
emitChange(reason);
|
||||||
|
}
|
||||||
|
|
||||||
|
function claim(socket) {
|
||||||
|
if (!eligible(socket.id)) throw new Error('PTZ participation required');
|
||||||
|
if (state.operatorSocketId === socket.id || state.queue.includes(socket.id)) return;
|
||||||
|
state.queue.push(socket.id);
|
||||||
|
advance('queue-join');
|
||||||
|
}
|
||||||
|
|
||||||
|
function release(socketId, reason = 'turn-release') {
|
||||||
|
remove(socketId);
|
||||||
|
if (state.operatorSocketId === socketId) stopOperator(reason);
|
||||||
|
advance(reason);
|
||||||
|
}
|
||||||
|
|
||||||
|
function reconcile() {
|
||||||
|
state.queue = state.queue.filter(eligible);
|
||||||
|
if (state.operatorSocketId && !eligible(state.operatorSocketId)) stopOperator('access-change');
|
||||||
|
advance('access-change');
|
||||||
|
}
|
||||||
|
|
||||||
|
function clear(reason) {
|
||||||
|
state.queue = [];
|
||||||
|
stopOperator(reason);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
state, claim, release, reconcile, clear,
|
||||||
|
revoke: (reason) => { stopOperator(reason); advance(reason); },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { createParticipation };
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
// Socket transport delegates policy and lifecycle decisions to the PTZ service.
|
||||||
|
function registerSocketGateway(deps) {
|
||||||
|
const { io, isAdmin, participation, emitChange, normalizeSocketArgs,
|
||||||
|
runPtzTurnAction, acceptMotionIntent, getStatus, setSpotlight, setIr,
|
||||||
|
listPresets, gotoPreset, createPreset, removePreset, passesMode,
|
||||||
|
normalizeSnapshotIds, addSnapshotSubscription, sendSnapshotFrame,
|
||||||
|
getSnapshot, removeSnapshotSubscriptions } = deps;
|
||||||
|
io.on('connection', (socket) => {
|
||||||
|
socket.on('ptzCamera:revokeOperator', (firstArg, secondArg) => {
|
||||||
|
const { cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
if (!isAdmin(socket)) return cb({ error: 'Admin required' });
|
||||||
|
participation.revoke('admin-revoke');
|
||||||
|
cb({ ok: true });
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:requestTurn', async (firstArg, secondArg) => {
|
||||||
|
const { cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try { cb({ ok: true, state: await runPtzTurnAction(socket, 'request') }); }
|
||||||
|
catch (err) { cb({ error: err.message }); }
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:release', async (firstArg, secondArg) => {
|
||||||
|
const { cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb({ ok: true, state: await runPtzTurnAction(socket, 'release') });
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:motion', (firstArg, secondArg) => {
|
||||||
|
const { payload, cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
/*
|
||||||
|
Acknowledge acceptance of the newest desired state immediately. The
|
||||||
|
serialized ONVIF pump deliberately runs independently of Socket.IO
|
||||||
|
request latency so browser heartbeats cannot accumulate while waiting
|
||||||
|
for a camera SOAP response.
|
||||||
|
*/
|
||||||
|
cb(acceptMotionIntent(socket, payload));
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:status', async (firstArg, secondArg) => {
|
||||||
|
const { cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb({ ok: true, status: await getStatus(socket) });
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:spotlight', async (firstArg, secondArg) => {
|
||||||
|
const { payload, cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb({ ok: true, light: await setSpotlight(socket, payload) });
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:ir', async (firstArg, secondArg) => {
|
||||||
|
const { payload, cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb({ ok: true, ir: await setIr(socket, payload) });
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:presets:list', async (firstArg, secondArg) => {
|
||||||
|
const { cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb({ ok: true, presets: await listPresets(socket) });
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:preset:goto', async (firstArg, secondArg) => {
|
||||||
|
const { payload, cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb(await gotoPreset(socket, payload));
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:preset:create', async (firstArg, secondArg) => {
|
||||||
|
const { payload, cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb(await createPreset(socket, payload));
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:preset:remove', async (firstArg, secondArg) => {
|
||||||
|
const { payload, cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
cb(await removePreset(socket, payload));
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:snapshotSubscribe', (firstArg, secondArg) => {
|
||||||
|
const { payload, cb } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
try {
|
||||||
|
if (!passesMode(socket)) throw new Error('Not authorized for PTZ snapshots');
|
||||||
|
const ids = normalizeSnapshotIds(payload);
|
||||||
|
addSnapshotSubscription(socket, ids);
|
||||||
|
const lastSnapshotState = getSnapshot();
|
||||||
|
if (lastSnapshotState?.frame) sendSnapshotFrame(socket, lastSnapshotState.frame, lastSnapshotState.ts);
|
||||||
|
cb({ ok: true, subscribed: ids });
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.on('ptzCamera:snapshotUnsubscribe', (firstArg, secondArg) => {
|
||||||
|
const { payload } = normalizeSocketArgs(firstArg, secondArg);
|
||||||
|
removeSnapshotSubscriptions(socket.id, normalizeSnapshotIds(payload));
|
||||||
|
});
|
||||||
|
socket.on('disconnect', () => {
|
||||||
|
participation.release(socket.id, 'disconnect');
|
||||||
|
removeSnapshotSubscriptions(socket.id);
|
||||||
|
emitChange('disconnect');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { registerSocketGateway };
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
const labels = {
|
||||||
|
waiting: 'Someone else has control',
|
||||||
|
handoff: 'It’s your turn!',
|
||||||
|
active: 'You control the camera',
|
||||||
|
idleWarning: 'Start driving or your turn will be skipped',
|
||||||
|
activeTimer: 'Your turn',
|
||||||
|
waitingTimer: 'Waiting',
|
||||||
|
untilTurn: 'until your turn',
|
||||||
|
timeRemaining: 'left',
|
||||||
|
showTimer: 'Show turn timer',
|
||||||
|
hideTimer: 'Hide turn timer',
|
||||||
|
showName: 'Show camera name',
|
||||||
|
hideName: 'Hide camera name',
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = labels;
|
||||||
@@ -68,13 +68,13 @@ function getDefaultWebSources(assignment = {}, socket = null) {
|
|||||||
replay`, follows the camera currently controlled by that socket just as it
|
replay`, follows the camera currently controlled by that socket just as it
|
||||||
follows an assigned rover below.
|
follows an assigned rover below.
|
||||||
|
|
||||||
isOperator is deliberately stricter than PTZ access or queue membership:
|
turn.isActive is deliberately stricter than PTZ access or queue membership:
|
||||||
spectators and users waiting for a camera turn must not silently replay a
|
spectators and users waiting for a camera turn must not silently replay a
|
||||||
camera they are not currently operating. Keeping this rule here also makes
|
camera they are not currently operating. Keeping this rule here also makes
|
||||||
every web replay entry point share the same default instead of teaching the
|
every web replay entry point share the same default instead of teaching the
|
||||||
chat-command adapter about PTZ-specific state.
|
chat-command adapter about PTZ-specific state.
|
||||||
*/
|
*/
|
||||||
if (ptzCameraService.getPublicState(socket).isOperator) {
|
if (ptzCameraService.getPublicState(socket).turn.isActive) {
|
||||||
const source = ptzCameraService.getReplaySource();
|
const source = ptzCameraService.getReplaySource();
|
||||||
if (!source) return [];
|
if (!source) return [];
|
||||||
return [{ type: source.type, id: String(source.id), label: source.label || source.id }];
|
return [{ type: source.type, id: String(source.id), label: source.label || source.id }];
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
const { getOperatingMode } = require('../operatingModeService');
|
||||||
// rover Manager private access
|
// rover Manager private access
|
||||||
// Purpose: Encapsulates private-rover visibility and control-authorization policy checks.
|
// Purpose: Encapsulates private-rover visibility and control-authorization policy checks.
|
||||||
// Scope: Keeps runtime behavior unchanged while isolating policy decisions from orchestration wiring.
|
// Scope: Keeps runtime behavior unchanged while isolating policy decisions from orchestration wiring.
|
||||||
@@ -80,6 +81,7 @@ function createPrivateAccessPolicy(deps) {
|
|||||||
allowClosedPrivateGrantInLockdown = false,
|
allowClosedPrivateGrantInLockdown = false,
|
||||||
allowClosedPrivateCurrentDriver = false,
|
allowClosedPrivateCurrentDriver = false,
|
||||||
} = options;
|
} = options;
|
||||||
|
if (getOperatingMode(socket) !== 'rover') return 'Leave PTZ before requesting rover control';
|
||||||
if (!record) return 'Unknown rover';
|
if (!record) return 'Unknown rover';
|
||||||
if (!allowUser && !isAdmin(socket)) return 'Only admins can request control';
|
if (!allowUser && !isAdmin(socket)) return 'Only admins can request control';
|
||||||
if (record.locked && !isAdmin(socket)) return 'Rover locked';
|
if (record.locked && !isAdmin(socket)) return 'Rover locked';
|
||||||
|
|||||||
@@ -5,16 +5,18 @@ const io = require('../../globals/io');
|
|||||||
const logger = require('../../globals/logger').child('sessionService');
|
const logger = require('../../globals/logger').child('sessionService');
|
||||||
const { getFeatureFlags, configurationEvents } = require('../../configuration');
|
const { getFeatureFlags, configurationEvents } = require('../../configuration');
|
||||||
const { getRole, isAdmin, roleEvents } = require('../roleService');
|
const { getRole, isAdmin, roleEvents } = require('../roleService');
|
||||||
|
const { getOperatingMode, setOperatingMode, operatingModeEvents } = require('../operatingModeService');
|
||||||
const { getMode, modeEvents } = require('../modeManager');
|
const { getMode, modeEvents } = require('../modeManager');
|
||||||
const roverManager = require('../roverManager');
|
const roverManager = require('../roverManager');
|
||||||
const { managerEvents } = roverManager;
|
const { managerEvents } = roverManager;
|
||||||
const assignmentService = require('../assignmentService');
|
const assignmentService = require('../assignmentService');
|
||||||
const { getActiveDrivers, getTurnQueues, turnEvents } = require('../turnService');
|
const { getActiveDrivers, getTurnQueues, turnEvents } = require('../turnService');
|
||||||
|
const { buildRoverTurn } = require('../turnService/display');
|
||||||
const { getRoomCameras, roomCameraEvents } = require('../roomCameraService');
|
const { getRoomCameras, roomCameraEvents } = require('../roomCameraService');
|
||||||
const {
|
const {
|
||||||
getPublicState: getPtzCameraState,
|
getPublicState: getPtzCameraState,
|
||||||
getChatTargetForSocket: getPtzChatTargetForSocket,
|
getOperatingModeDisplay,
|
||||||
PTZ_CAMERA_ID,
|
getParticipantSocketIds,
|
||||||
ptzCameraEvents,
|
ptzCameraEvents,
|
||||||
} = require('../ptzCameraService');
|
} = require('../ptzCameraService');
|
||||||
const { getState: getHomeAssistantState, homeAssistantEvents } = require('../homeAssistantService');
|
const { getState: getHomeAssistantState, homeAssistantEvents } = require('../homeAssistantService');
|
||||||
@@ -111,18 +113,13 @@ function buildBandwidthSavingsSessionState(socket, controllableUserCount = 0) {
|
|||||||
|
|
||||||
function countControllableUsers(userEntries = []) {
|
function countControllableUsers(userEntries = []) {
|
||||||
const ids = new Set();
|
const ids = new Set();
|
||||||
|
const ptzParticipants = new Set(getParticipantSocketIds());
|
||||||
userEntries.forEach((entry) => {
|
userEntries.forEach((entry) => {
|
||||||
const role = String(entry?.role || '');
|
const role = String(entry?.role || '');
|
||||||
if (role === 'spectator') return;
|
if (role === 'spectator') return;
|
||||||
const socketId = String(entry?.socketId || '').trim();
|
const socketId = String(entry?.socketId || '').trim();
|
||||||
const roverId = String(entry?.roverId || '').trim();
|
const roverId = String(entry?.roverId || '').trim();
|
||||||
/*
|
if (socketId && (roverId || ptzParticipants.has(socketId))) ids.add(socketId);
|
||||||
buildUserEntry already maps PTZ queued/operators to the PTZ pseudo-rover
|
|
||||||
id and normal drivers to their physical rover. Counting entries after that
|
|
||||||
normalization gives the browser the same conceptual "controllable users"
|
|
||||||
count it shows in the user/queue panels without duplicating PTZ UI logic.
|
|
||||||
*/
|
|
||||||
if (socketId && roverId) ids.add(socketId);
|
|
||||||
});
|
});
|
||||||
return ids.size;
|
return ids.size;
|
||||||
}
|
}
|
||||||
@@ -146,19 +143,14 @@ function buildUserEntry(socket) {
|
|||||||
&& roverManager.isDriver(assignment.roverId, socket)
|
&& roverManager.isDriver(assignment.roverId, socket)
|
||||||
? assignment.roverId
|
? assignment.roverId
|
||||||
: null;
|
: null;
|
||||||
const ptzChatTarget = getPtzChatTargetForSocket(socket.id);
|
|
||||||
return {
|
return {
|
||||||
socketId: socket.id,
|
socketId: socket.id,
|
||||||
userId: socket?.data?.userId || null,
|
userId: socket?.data?.userId || null,
|
||||||
nickname: getNickname(socket) || null,
|
nickname: getNickname(socket) || null,
|
||||||
role,
|
role,
|
||||||
/*
|
operatingMode: getOperatingMode(socket),
|
||||||
PTZ is not inserted into the physical rover roster, but for chat and user
|
operatingModeDisplay: getOperatingModeDisplay(socket.id),
|
||||||
presence it should read like the user moved to a rover-like target. Prefer
|
roverId: verifiedPrimaryRover || verifiedAssignmentRover || null,
|
||||||
the PTZ chat target while the socket is queued or operating so presence,
|
|
||||||
queue lookup, and chat identity all agree.
|
|
||||||
*/
|
|
||||||
roverId: ptzChatTarget?.roverId || verifiedPrimaryRover || verifiedAssignmentRover || null,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,15 +163,7 @@ function buildSession(socket) {
|
|||||||
const controllableUserCount = countControllableUsers(userEntries);
|
const controllableUserCount = countControllableUsers(userEntries);
|
||||||
const users = userEntries.map((entry) => ({
|
const users = userEntries.map((entry) => ({
|
||||||
...entry,
|
...entry,
|
||||||
/*
|
roverId: filterVisibleRoverId(socket, entry.roverId),
|
||||||
PTZ is intentionally not a roverManager record, so the normal physical
|
|
||||||
rover visibility filter would erase the user's PTZ chat target. Preserve
|
|
||||||
it here because getPtzChatTargetForSocket already applied the PTZ access
|
|
||||||
and queue/operator rules before buildUserEntry returned it.
|
|
||||||
*/
|
|
||||||
roverId: entry.roverId === PTZ_CAMERA_ID
|
|
||||||
? entry.roverId
|
|
||||||
: filterVisibleRoverId(socket, entry.roverId),
|
|
||||||
}));
|
}));
|
||||||
const roster = roverManager.getRosterForSocket(socket);
|
const roster = roverManager.getRosterForSocket(socket);
|
||||||
const assignment = assignmentService.describeAssignment(socket?.id || '');
|
const assignment = assignmentService.describeAssignment(socket?.id || '');
|
||||||
@@ -201,6 +185,7 @@ function buildSession(socket) {
|
|||||||
return {
|
return {
|
||||||
socketId: socket?.id || null,
|
socketId: socket?.id || null,
|
||||||
role: getRole(socket),
|
role: getRole(socket),
|
||||||
|
operatingMode: getOperatingMode(socket),
|
||||||
mode: getMode(),
|
mode: getMode(),
|
||||||
isLocalNetwork: isLocalNetwork(getSocketIp(socket)),
|
isLocalNetwork: isLocalNetwork(getSocketIp(socket)),
|
||||||
bandwidthSavings: buildBandwidthSavingsSessionState(socket, controllableUserCount),
|
bandwidthSavings: buildBandwidthSavingsSessionState(socket, controllableUserCount),
|
||||||
@@ -210,7 +195,17 @@ function buildSession(socket) {
|
|||||||
of navigation and layout without maintaining another feature registry.
|
of navigation and layout without maintaining another feature registry.
|
||||||
*/
|
*/
|
||||||
features,
|
features,
|
||||||
roster,
|
roster: roster.map((rover) => ({
|
||||||
|
...rover,
|
||||||
|
turn: buildRoverTurn({
|
||||||
|
rover,
|
||||||
|
mode: getMode(),
|
||||||
|
socketId: socket?.id,
|
||||||
|
turnInfo: turnQueues[rover.id],
|
||||||
|
activeDriverId: activeDrivers[rover.id],
|
||||||
|
users,
|
||||||
|
}),
|
||||||
|
})),
|
||||||
odometers: roverManager.getOdometersForSocket(socket),
|
odometers: roverManager.getOdometersForSocket(socket),
|
||||||
assignment: {
|
assignment: {
|
||||||
...assignment,
|
...assignment,
|
||||||
@@ -280,10 +275,19 @@ function syncAll() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
io.on('connection', (socket) => {
|
io.on('connection', (socket) => {
|
||||||
|
socket.on('session:setOperatingMode', async ({ operatingMode } = {}, cb = () => {}) => {
|
||||||
|
try {
|
||||||
|
cb({ ok: true, ...await setOperatingMode(socket, operatingMode) });
|
||||||
|
} catch (err) {
|
||||||
|
cb({ error: err.message });
|
||||||
|
}
|
||||||
|
});
|
||||||
logger.info('New socket connected', socket.id);
|
logger.info('New socket connected', socket.id);
|
||||||
syncSocket(socket);
|
syncSocket(socket);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
operatingModeEvents.on('change', () => syncAll());
|
||||||
|
|
||||||
roleEvents.on('change', ({ socket }) => {
|
roleEvents.on('change', ({ socket }) => {
|
||||||
if (!socket) return;
|
if (!socket) return;
|
||||||
logger.info('Role changed; syncing session', socket.id);
|
logger.info('Role changed; syncing session', socket.id);
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
const { describeQueue } = require('./queueDisplay');
|
||||||
|
const { TURN_DURATION_MS, IDLE_TIMEOUT_MS } = require('./constants');
|
||||||
|
|
||||||
|
const labels = {
|
||||||
|
waiting: 'Someone else is driving',
|
||||||
|
handoff: 'It’s your turn!',
|
||||||
|
active: 'You’re driving',
|
||||||
|
idleWarning: 'Start driving or your turn will be skipped',
|
||||||
|
activeTimer: 'Your turn',
|
||||||
|
waitingTimer: 'Waiting',
|
||||||
|
untilTurn: 'until your turn',
|
||||||
|
timeRemaining: 'left',
|
||||||
|
showTimer: 'Show turn timer',
|
||||||
|
hideTimer: 'Hide turn timer',
|
||||||
|
showName: 'Show rover name',
|
||||||
|
hideName: 'Hide rover name',
|
||||||
|
};
|
||||||
|
|
||||||
|
// Build this from visibility-filtered session data so private rover state stays private.
|
||||||
|
function buildRoverTurn({ rover, mode, socketId, turnInfo, activeDriverId, users }) {
|
||||||
|
const queue = turnInfo?.queue || [];
|
||||||
|
// Direct ownership can arrive before queue details on load/reconnect.
|
||||||
|
const currentDriverId = activeDriverId || turnInfo?.current || null;
|
||||||
|
const currentIndex = currentDriverId ? queue.indexOf(currentDriverId) : -1;
|
||||||
|
const userIndex = socketId ? queue.indexOf(socketId) : -1;
|
||||||
|
const enabled = mode === 'turns' && queue.length > 1 && currentIndex >= 0 && userIndex >= 0;
|
||||||
|
const turnsAhead = enabled ? (userIndex - currentIndex + queue.length) % queue.length : null;
|
||||||
|
return {
|
||||||
|
target: { id: rover.id, name: rover.name, color: rover.color, fallback: rover.id },
|
||||||
|
...describeQueue(queue, currentDriverId),
|
||||||
|
userLabels: Object.fromEntries(queue.map((id) => [id,
|
||||||
|
users.find((user) => user.socketId === id)?.nickname || id,
|
||||||
|
])),
|
||||||
|
enabled,
|
||||||
|
isActive: turnsAhead === 0,
|
||||||
|
turnsAhead,
|
||||||
|
queueLength: queue.length,
|
||||||
|
deadline: turnInfo?.deadline || null,
|
||||||
|
durationMs: TURN_DURATION_MS,
|
||||||
|
idleDeadline: turnInfo?.idleDeadline || null,
|
||||||
|
idleGraceMs: IDLE_TIMEOUT_MS,
|
||||||
|
labels,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { buildRoverTurn };
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
// turn Service
|
// turn Service
|
||||||
// Purpose: Defines the turn Service module and the helpers/state used by this service unit.
|
// Purpose: Defines the turn Service module and the helpers/state used by this service unit.
|
||||||
// Scope: Keeps runtime behavior unchanged while isolating responsibilities into a clear module boundary.
|
// Scope: Keeps runtime behavior unchanged while isolating responsibilities into a clear module boundary.
|
||||||
|
const { describeQueue } = require('./queueDisplay');
|
||||||
const io = require('../../globals/io');
|
const io = require('../../globals/io');
|
||||||
const { sendAlert } = require('../alertService');
|
const { sendAlert } = require('../alertService');
|
||||||
const { MODES, getMode, modeEvents } = require('../modeManager');
|
const { MODES, getMode, modeEvents } = require('../modeManager');
|
||||||
@@ -431,7 +432,7 @@ function getTurnQueues() {
|
|||||||
driverQueues.forEach((queue, roverId) => {
|
driverQueues.forEach((queue, roverId) => {
|
||||||
payload[roverId] = {
|
payload[roverId] = {
|
||||||
mode,
|
mode,
|
||||||
queue: Array.from(queue.queue),
|
...describeQueue(Array.from(queue.queue), queue.current),
|
||||||
current: queue.current,
|
current: queue.current,
|
||||||
deadline: turnDeadlines.get(roverId) || null,
|
deadline: turnDeadlines.get(roverId) || null,
|
||||||
idleDeadline: idleDeadlines.get(roverId) || null,
|
idleDeadline: idleDeadlines.get(roverId) || null,
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// Shared display ordering only; each service still owns its queue policy.
|
||||||
|
function describeQueue(queue, currentId) {
|
||||||
|
const currentIndex = currentId ? queue.indexOf(currentId) : -1;
|
||||||
|
const nextId = queue.length > 1
|
||||||
|
? queue[(currentIndex + 1) % queue.length]
|
||||||
|
: null;
|
||||||
|
return { queue, currentId, nextId };
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { describeQueue };
|
||||||
@@ -157,11 +157,11 @@ function identifySocket(socket, payload = {}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Spectator-style pages carry identity too, but only the driver surface
|
Spectator-style pages carry identity too, but only the driver and PTZ surfaces
|
||||||
participates in duplicate-driver enforcement. This flag remains on the
|
participate in duplicate-driver enforcement. This flag remains on the
|
||||||
socket because it is connection-specific, not person-specific.
|
socket because it is connection-specific, not person-specific.
|
||||||
*/
|
*/
|
||||||
socket.data.identitySurface = payload.identitySurface === 'driver' ? 'driver' : 'passive';
|
socket.data.identitySurface = ['driver', 'ptz'].includes(payload.identitySurface) ? payload.identitySurface : 'passive';
|
||||||
|
|
||||||
const result = identifyCanonicalSocket(socket, {
|
const result = identifyCanonicalSocket(socket, {
|
||||||
...payload,
|
...payload,
|
||||||
@@ -207,7 +207,7 @@ function enforceSingleDriverSocketPerIdentity(currentSocket) {
|
|||||||
if (
|
if (
|
||||||
!currentSocket?.id ||
|
!currentSocket?.id ||
|
||||||
!currentUserId ||
|
!currentUserId ||
|
||||||
currentSocket.data?.identitySurface !== 'driver' ||
|
!['driver', 'ptz'].includes(currentSocket.data?.identitySurface) ||
|
||||||
!enforceForCurrentSocket
|
!enforceForCurrentSocket
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
@@ -215,7 +215,7 @@ function enforceSingleDriverSocketPerIdentity(currentSocket) {
|
|||||||
|
|
||||||
const duplicates = Array.from(io.sockets.sockets.values()).filter((candidate) => {
|
const duplicates = Array.from(io.sockets.sockets.values()).filter((candidate) => {
|
||||||
if (!candidate?.id || candidate.id === currentSocket.id || candidate.disconnected) return false;
|
if (!candidate?.id || candidate.id === currentSocket.id || candidate.disconnected) return false;
|
||||||
if (candidate?.data?.identitySurface !== 'driver') return false;
|
if (!['driver', 'ptz'].includes(candidate?.data?.identitySurface)) return false;
|
||||||
return getUserIdForSocket(candidate) === currentUserId;
|
return getUserIdForSocket(candidate) === currentUserId;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Generated
+1121
-1256
File diff suppressed because it is too large
Load Diff
+8
-6
@@ -4,7 +4,7 @@
|
|||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "VITE_ROVERD_URL=https://rover.otter.land vite",
|
"dev": "VITE_ROVERD_URL=http://192.168.0.86:8080 vite",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"test": "node --test src/controls/inputs/*.test.js src/components/GamepadMappingSettings/*.test.js",
|
"test": "node --test src/controls/inputs/*.test.js src/components/GamepadMappingSettings/*.test.js",
|
||||||
@@ -15,12 +15,15 @@
|
|||||||
"@rjsf/core": "^6.10.0",
|
"@rjsf/core": "^6.10.0",
|
||||||
"@rjsf/validator-ajv8": "^6.10.0",
|
"@rjsf/validator-ajv8": "^6.10.0",
|
||||||
"@thumbmarkjs/thumbmarkjs": "^1.10.0",
|
"@thumbmarkjs/thumbmarkjs": "^1.10.0",
|
||||||
|
"linkify-react": "^4.3.3",
|
||||||
|
"linkifyjs": "^4.3.3",
|
||||||
"midi-file": "^1.2.4",
|
"midi-file": "^1.2.4",
|
||||||
"papaparse": "^5.5.4",
|
"papaparse": "^5.5.4",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0",
|
"react-dom": "^19.2.0",
|
||||||
"react-icons": "^5.5.0",
|
"react-icons": "^5.7.0",
|
||||||
"react-joystick-component": "^6.2.1",
|
"react-joystick-component": "^6.2.1",
|
||||||
|
"react-player": "^3.4.0",
|
||||||
"react-router-dom": "^7.9.6",
|
"react-router-dom": "^7.9.6",
|
||||||
"three": "^0.184.0",
|
"three": "^0.184.0",
|
||||||
"uplot": "^1.6.32",
|
"uplot": "^1.6.32",
|
||||||
@@ -28,18 +31,17 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.39.1",
|
"@eslint/js": "^9.39.1",
|
||||||
"@tailwindcss/container-queries": "^0.1.1",
|
"@tailwindcss/vite": "^4.3.3",
|
||||||
"@types/react": "^19.2.2",
|
"@types/react": "^19.2.2",
|
||||||
"@types/react-dom": "^19.2.2",
|
"@types/react-dom": "^19.2.2",
|
||||||
"@vitejs/plugin-react": "^5.1.0",
|
"@vitejs/plugin-react": "^5.1.0",
|
||||||
"autoprefixer": "^10.4.22",
|
"baseline-browser-mapping": "^2.11.25",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.1",
|
||||||
"eslint-plugin-react-hooks": "^7.0.1",
|
"eslint-plugin-react-hooks": "^7.0.1",
|
||||||
"eslint-plugin-react-refresh": "^0.4.24",
|
"eslint-plugin-react-refresh": "^0.4.24",
|
||||||
"globals": "^16.5.0",
|
"globals": "^16.5.0",
|
||||||
"postcss": "^8.5.6",
|
|
||||||
"socket.io-client": "4.8.3",
|
"socket.io-client": "4.8.3",
|
||||||
"tailwindcss": "^3.4.14",
|
"tailwindcss": "^4.3.3",
|
||||||
"vite": "^7.2.2",
|
"vite": "^7.2.2",
|
||||||
"vitest": "^5.0.0"
|
"vitest": "^5.0.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
export default {
|
|
||||||
plugins: {
|
|
||||||
tailwindcss: {},
|
|
||||||
autoprefixer: {},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -137,7 +137,7 @@ export default function ConfigurationEditor({ snapshot, socket, runSensitive, on
|
|||||||
return (
|
return (
|
||||||
<div ref={editorRef} className="configuration-editor">
|
<div ref={editorRef} className="configuration-editor">
|
||||||
<CardFrame title="Configuration" meta={`revision ${revision}`} clipOverflow={false} bodyClassName="p-0.5">
|
<CardFrame title="Configuration" meta={`revision ${revision}`} clipOverflow={false} bodyClassName="p-0.5">
|
||||||
<div ref={toolbarRef} className="configuration-toolbar sticky top-0 z-20 mb-0.5 space-y-0.5 border border-neutral-500/60 bg-neutral-900/95 p-0.5 backdrop-blur">
|
<div ref={toolbarRef} className="configuration-toolbar sticky top-0 z-20 mb-0.5 space-y-0.5 border border-neutral-500/60 bg-neutral-900/95 p-0.5 backdrop-blur-sm">
|
||||||
<p className="text-xs text-slate-400">Saving applies the complete revision immediately and reloads each affected service.</p>
|
<p className="text-xs text-slate-400">Saving applies the complete revision immediately and reloads each affected service.</p>
|
||||||
{/* All document actions stay together at the start of the toolbar. The
|
{/* All document actions stay together at the start of the toolbar. The
|
||||||
editor may use a wide canvas, but width is never used to separate a
|
editor may use a wide canvas, but width is never used to separate a
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export default function PasswordConfirmationDialog({ open, busy, error, onCancel
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed inset-0 z-[1000] flex items-center justify-center bg-black/75 p-2">
|
<div className="fixed inset-0 z-1000 flex items-center justify-center bg-black/75 p-2">
|
||||||
<form className="w-full max-w-sm border border-neutral-500/70 bg-neutral-900 p-1 text-slate-100 shadow-2xl" onSubmit={submit}>
|
<form className="w-full max-w-sm border border-neutral-500/70 bg-neutral-900 p-1 text-slate-100 shadow-2xl" onSubmit={submit}>
|
||||||
<h2 className="text-base font-semibold">Confirm password</h2>
|
<h2 className="text-base font-semibold">Confirm password</h2>
|
||||||
<p className="mt-0.5 text-xs text-slate-400">This sensitive action requires recent confirmation of your administrator password.</p>
|
<p className="mt-0.5 text-xs text-slate-400">This sensitive action requires recent confirmation of your administrator password.</p>
|
||||||
|
|||||||
@@ -3,6 +3,9 @@
|
|||||||
* Scope: Keeps route-specific hierarchy and RJSF integration out of the shared global stylesheet.
|
* Scope: Keeps route-specific hierarchy and RJSF integration out of the shared global stylesheet.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* Reuse the shared theme without emitting a second copy of Tailwind. */
|
||||||
|
@reference '../index.css';
|
||||||
|
|
||||||
.configuration-tree {
|
.configuration-tree {
|
||||||
/* The large gap is intentionally limited to root siblings. It makes each
|
/* The large gap is intentionally limited to root siblings. It makes each
|
||||||
top-level configuration section read as a separate YAML block while the
|
top-level configuration section read as a separate YAML block while the
|
||||||
@@ -91,7 +94,7 @@
|
|||||||
.configuration-value input:not([type='checkbox']),
|
.configuration-value input:not([type='checkbox']),
|
||||||
.configuration-value select,
|
.configuration-value select,
|
||||||
.configuration-value textarea {
|
.configuration-value textarea {
|
||||||
@apply w-full rounded-md border border-neutral-600 bg-neutral-700 px-0.5 py-0.5 text-white placeholder:text-slate-400 focus:outline-none focus:ring-1 focus:ring-sky-500;
|
@apply w-full rounded-md border border-neutral-600 bg-neutral-700 px-0.5 py-0.5 text-white placeholder:text-slate-400 focus:outline-hidden focus:ring-1 focus:ring-sky-500;
|
||||||
}
|
}
|
||||||
|
|
||||||
.configuration-value input[type='checkbox'] {
|
.configuration-value input[type='checkbox'] {
|
||||||
|
|||||||
@@ -504,7 +504,7 @@ export default function AdminPanelContent() {
|
|||||||
value={reasonDraft}
|
value={reasonDraft}
|
||||||
onChange={(event) => setReasonDraft(event.target.value)}
|
onChange={(event) => setReasonDraft(event.target.value)}
|
||||||
placeholder="Set an admin mode reason"
|
placeholder="Set an admin mode reason"
|
||||||
className="field-input text-sm min-h-[3.5rem]"
|
className="field-input text-sm min-h-14"
|
||||||
/>
|
/>
|
||||||
<div className="flex gap-0.5 text-xs">
|
<div className="flex gap-0.5 text-xs">
|
||||||
<button type="button" onClick={handleReasonSave} className="button-dark">
|
<button type="button" onClick={handleReasonSave} className="button-dark">
|
||||||
@@ -558,7 +558,7 @@ export default function AdminPanelContent() {
|
|||||||
{updateStates[rover.id] ? 'Updating...' : 'Update'}
|
{updateStates[rover.id] ? 'Updating...' : 'Update'}
|
||||||
</button>
|
</button>
|
||||||
{rover?.private?.enabled ? (
|
{rover?.private?.enabled ? (
|
||||||
<div className="w-full rounded border border-slate-700/70 p-0.5 space-y-0.5 text-[0.7rem]">
|
<div className="w-full rounded-sm border border-slate-700/70 p-0.5 space-y-0.5 text-[0.7rem]">
|
||||||
<div className="text-slate-300">Private safety</div>
|
<div className="text-slate-300">Private safety</div>
|
||||||
<label className="flex items-center gap-0.5">
|
<label className="flex items-center gap-0.5">
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -74,28 +74,28 @@ export default function LlmCommentaryPanel({ state, onClearHistory, clearingHist
|
|||||||
{statPills.map((pill) => (
|
{statPills.map((pill) => (
|
||||||
<span
|
<span
|
||||||
key={pill.label}
|
key={pill.label}
|
||||||
className="rounded border border-slate-600/60 bg-slate-800/70 px-0.5 py-0.25 text-[0.72rem] leading-tight text-slate-200"
|
className="rounded-sm border border-slate-600/60 bg-slate-800/70 px-0.5 py-0.25 text-[0.72rem] leading-tight text-slate-200"
|
||||||
>
|
>
|
||||||
{pill.label}: {pill.value}
|
{pill.label}: {pill.value}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
{errors.message ? (
|
{errors.message ? (
|
||||||
<div className="surface text-xs text-red-300 break-words">Error: {errors.message}</div>
|
<div className="surface text-xs text-red-300 wrap-break-word">Error: {errors.message}</div>
|
||||||
) : null}
|
) : null}
|
||||||
{errors.details ? (
|
{errors.details ? (
|
||||||
<details className="surface text-xs text-red-200">
|
<details className="surface text-xs text-red-200">
|
||||||
<summary className="cursor-pointer select-none text-red-300">Failure details</summary>
|
<summary className="cursor-pointer select-none text-red-300">Failure details</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-red-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-red-200">
|
||||||
{JSON.stringify(errors.details, null, 2)}
|
{JSON.stringify(errors.details, null, 2)}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
) : null}
|
) : null}
|
||||||
{output.generated ? (
|
{output.generated ? (
|
||||||
<div className="surface text-xs text-slate-200 break-words">Generated: {output.generated}</div>
|
<div className="surface text-xs text-slate-200 wrap-break-word">Generated: {output.generated}</div>
|
||||||
) : null}
|
) : null}
|
||||||
{output.posted ? (
|
{output.posted ? (
|
||||||
<div className="surface text-xs text-emerald-200 break-words">Posted: {output.posted}</div>
|
<div className="surface text-xs text-emerald-200 wrap-break-word">Posted: {output.posted}</div>
|
||||||
) : null}
|
) : null}
|
||||||
<div className="grid gap-0.5 md:grid-cols-2">
|
<div className="grid gap-0.5 md:grid-cols-2">
|
||||||
<div className="space-y-0.5">
|
<div className="space-y-0.5">
|
||||||
@@ -120,7 +120,7 @@ export default function LlmCommentaryPanel({ state, onClearHistory, clearingHist
|
|||||||
</div>
|
</div>
|
||||||
<details className="surface text-xs text-slate-200">
|
<details className="surface text-xs text-slate-200">
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Full Monitor Payload</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Full Monitor Payload</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{JSON.stringify(state, null, 2)}
|
{JSON.stringify(state, null, 2)}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
@@ -154,7 +154,7 @@ export default function LlmCommentaryPanel({ state, onClearHistory, clearingHist
|
|||||||
{selectedRun ? (
|
{selectedRun ? (
|
||||||
<details className="surface text-xs text-slate-200" open>
|
<details className="surface text-xs text-slate-200" open>
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Run #{selectedRun.runId} details</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Run #{selectedRun.runId} details</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{JSON.stringify(selectedRun, null, 2)}
|
{JSON.stringify(selectedRun, null, 2)}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
|
|||||||
@@ -58,49 +58,49 @@ export default function OverseerControlPanel({ state, onClearHistory, clearingHi
|
|||||||
|
|
||||||
<details className="surface text-xs text-slate-200" open>
|
<details className="surface text-xs text-slate-200" open>
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Latest Context</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Latest Context</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{input.stateUpdate || '<none>'}
|
{input.stateUpdate || '<none>'}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details className="surface text-xs text-slate-200" open>
|
<details className="surface text-xs text-slate-200" open>
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Exact Model Input (messages[])</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Exact Model Input (messages[])</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{renderModelMessages()}
|
{renderModelMessages()}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details className="surface text-xs text-slate-200">
|
<details className="surface text-xs text-slate-200">
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Exact System Prompt</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Exact System Prompt</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{input.systemPrompt || '<none>'}
|
{input.systemPrompt || '<none>'}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details className="surface text-xs text-slate-200">
|
<details className="surface text-xs text-slate-200">
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Exact Transcript Rows</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Exact Transcript Rows</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{JSON.stringify(input.transcript || [], null, 2)}
|
{JSON.stringify(input.transcript || [], null, 2)}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details className="surface text-xs text-slate-200">
|
<details className="surface text-xs text-slate-200">
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Tool Availability</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Tool Availability</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{JSON.stringify({ available: input.availableTools, blocked: input.blockedTools }, null, 2)}
|
{JSON.stringify({ available: input.availableTools, blocked: input.blockedTools }, null, 2)}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details className="surface text-xs text-slate-200" open>
|
<details className="surface text-xs text-slate-200" open>
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Exact Model Output</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Exact Model Output</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{output.raw || '<none>'}
|
{output.raw || '<none>'}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details className="surface text-xs text-slate-200" open>
|
<details className="surface text-xs text-slate-200" open>
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Live Tool Calls</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Live Tool Calls</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{JSON.stringify(output.liveToolCalls || [], null, 2)}
|
{JSON.stringify(output.liveToolCalls || [], null, 2)}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
@@ -115,7 +115,7 @@ export default function OverseerControlPanel({ state, onClearHistory, clearingHi
|
|||||||
|
|
||||||
<details className="surface text-xs text-slate-200">
|
<details className="surface text-xs text-slate-200">
|
||||||
<summary className="cursor-pointer select-none text-slate-300">Recent Runs</summary>
|
<summary className="cursor-pointer select-none text-slate-300">Recent Runs</summary>
|
||||||
<pre className="mt-0.5 whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">
|
<pre className="mt-0.5 whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">
|
||||||
{JSON.stringify(state.history || [], null, 2)}
|
{JSON.stringify(state.history || [], null, 2)}
|
||||||
</pre>
|
</pre>
|
||||||
</details>
|
</details>
|
||||||
@@ -124,7 +124,7 @@ export default function OverseerControlPanel({ state, onClearHistory, clearingHi
|
|||||||
{showPayload ? 'Hide Full Payload' : 'Show Full Payload'}
|
{showPayload ? 'Hide Full Payload' : 'Show Full Payload'}
|
||||||
</button>
|
</button>
|
||||||
{showPayload ? (
|
{showPayload ? (
|
||||||
<pre className="surface whitespace-pre-wrap break-words text-[0.72rem] text-slate-200">{JSON.stringify(state, null, 2)}</pre>
|
<pre className="surface whitespace-pre-wrap wrap-break-word text-[0.72rem] text-slate-200">{JSON.stringify(state, null, 2)}</pre>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
import ChatMessageRow from '../ChatMessageRow/index.jsx';
|
||||||
|
import ButtonBoxTile from '../ButtonBoxTile/index.jsx';
|
||||||
|
|
||||||
|
function getSafeWikiUrl(rawUrl) {
|
||||||
|
const text = String(rawUrl || '').trim();
|
||||||
|
if (!text) return '';
|
||||||
|
|
||||||
|
try {
|
||||||
|
/*
|
||||||
|
Wiki links are operator-authored registry data, but this still normalizes
|
||||||
|
them before rendering an anchor. Allowing only http/https avoids turning a
|
||||||
|
barcode registry typo into a javascript: link while still supporting both
|
||||||
|
absolute URLs and local wiki paths such as /wiki/object-name.
|
||||||
|
*/
|
||||||
|
const parsed = new URL(text, window.location.origin);
|
||||||
|
if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') return '';
|
||||||
|
return parsed.href;
|
||||||
|
} catch {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function BarcodeScanToast({ payload }) {
|
||||||
|
const wikiUrl = getSafeWikiUrl(payload?.wikiUrl);
|
||||||
|
const label = payload?.label || payload?.code || 'unknown barcode';
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="pointer-events-auto max-w-[80vw] rounded-md bg-neutral-800 px-2 py-1 text-l leading-tight text-slate-100">
|
||||||
|
<style>
|
||||||
|
{`
|
||||||
|
@keyframes barcode-wiki-flat-flash {
|
||||||
|
0%, 100% {
|
||||||
|
background: rgb(233, 186, 14);
|
||||||
|
color: rgb(71, 144, 253);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
background: rgb(125, 49, 255);
|
||||||
|
color: rgb(246, 250, 211);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`}
|
||||||
|
</style>
|
||||||
|
<p className="flex flex-wrap items-center gap-0.5 text-slate-100">
|
||||||
|
<span className="font-semibold text-slate-300 pr-1">Barcode scanned:</span>
|
||||||
|
<span className="font-semibold text-white">{label}</span>
|
||||||
|
{wikiUrl ? (
|
||||||
|
<a
|
||||||
|
href={wikiUrl}
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer"
|
||||||
|
className="rounded-md ml-0.5 px-2 py-1 text-xl font-semibold leading-tight tracking-normal"
|
||||||
|
style={{ animation: 'barcode-wiki-flat-flash 0.35s steps(1, end) infinite' }}
|
||||||
|
>
|
||||||
|
Wiki link
|
||||||
|
</a>
|
||||||
|
) : null}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function UndockedExitWarningToast() {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="w-[min(32rem,80vw)] rounded-md bg-amber-950 px-4 py-3 text-left text-amber-50"
|
||||||
|
role="alert"
|
||||||
|
>
|
||||||
|
<p className="text-xl font-bold leading-tight text-amber-100">Please dock your rover</p>
|
||||||
|
<p className="mt-1 text-base font-medium leading-snug text-amber-50/90">
|
||||||
|
Your rover is still undocked. Please dock it before leaving the page.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function AlertContent({ alert }) {
|
||||||
|
if (alert.kind === 'buttonbox-active' && alert.payload) {
|
||||||
|
const payload = alert.payload;
|
||||||
|
return (
|
||||||
|
<div className={`pointer-events-none w-50 max-w-full rounded-md ${payload.limited ? 'bg-red-950' : 'bg-cyan-900'}`}>
|
||||||
|
<ButtonBoxTile
|
||||||
|
buttonId={payload.buttonId}
|
||||||
|
count={payload.count}
|
||||||
|
goal={payload.goal}
|
||||||
|
rewardNumber={payload.rewardNumber}
|
||||||
|
rewardName={payload.rewardName}
|
||||||
|
rewardDescription={payload.rewardDescription}
|
||||||
|
dailyCount={payload.dailyCount}
|
||||||
|
dailyLimit={payload.dailyLimit}
|
||||||
|
limited={payload.limited}
|
||||||
|
className={payload.limited ? 'bg-red-950 ring-1 ring-red-500/70' : 'bg-cyan-900'}
|
||||||
|
/>
|
||||||
|
{payload.description ? (
|
||||||
|
<p className={['mt-1 text-center text-xs font-semibold', payload.limited ? 'text-red-200' : 'text-cyan-100'].join(' ')}>
|
||||||
|
{payload.description}
|
||||||
|
</p>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (alert.kind === 'chat' && alert.payload) {
|
||||||
|
return <ChatMessageRow message={alert.payload} />;
|
||||||
|
}
|
||||||
|
if (alert.kind === 'chat-typing' && alert.payload) {
|
||||||
|
return (
|
||||||
|
// Override only the feed's typing surface so whole-alert opacity has one owner.
|
||||||
|
<div className="[&>div]:bg-slate-900 [&>div]:opacity-100">
|
||||||
|
<ChatMessageRow message={alert.payload} variant="typing" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (alert.kind === 'barcode-scan' && alert.payload) {
|
||||||
|
return <BarcodeScanToast payload={alert.payload} />;
|
||||||
|
}
|
||||||
|
if (alert.kind === 'undocked-exit-warning') {
|
||||||
|
return <UndockedExitWarningToast />;
|
||||||
|
}
|
||||||
|
const color = typeof alert.color === 'string' ? alert.color.trim() : '';
|
||||||
|
const backgroundColor = /^#?[0-9a-f]{6}$/i.test(color) ? `#${color.replace('#', '')}` : '#2196f3';
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="pointer-events-auto min-w-0 max-w-96 rounded-md px-2 py-1 text-left text-[0.72rem] leading-tight text-white"
|
||||||
|
style={{ backgroundColor: `color-mix(in srgb, ${backgroundColor} 65%, black)` }}
|
||||||
|
>
|
||||||
|
<p className="truncate">
|
||||||
|
<span className="font-semibold">{alert.title || 'Alert'}</span>
|
||||||
|
<span className="text-white/70"> · </span>
|
||||||
|
<span className="text-white">{alert.message}</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,561 +1,95 @@
|
|||||||
// Alert Feed
|
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||||
// Purpose: Defines the Alert Feed module and the local helpers/components used in this file.
|
import { useSessionSelector } from '../../context/SessionContext.jsx';
|
||||||
// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
|
import useLayoutMode from '../../hooks/useLayoutMode.js';
|
||||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
import AlertContent from './AlertContent.jsx';
|
||||||
import { useSessionActions, useSessionSelector } from '../../context/SessionContext.jsx';
|
import useAlertEvents from './useAlertEvents.js';
|
||||||
import { useSocket } from '../../context/SocketContext.jsx';
|
|
||||||
import ChatMessageRow from '../ChatMessageRow/index.jsx';
|
|
||||||
import ButtonBoxTile from '../ButtonBoxTile/index.jsx';
|
|
||||||
|
|
||||||
const LIFETIME_MS = 3000;
|
|
||||||
const BUTTONBOX_LIFETIME_MS = 5000;
|
|
||||||
const BARCODE_SCAN_LIFETIME_MS = 10 * 1000;
|
|
||||||
const MAX_VISIBLE_TOASTS = 6;
|
|
||||||
const RECENT_ALERT_LOOKBACK = 12;
|
const RECENT_ALERT_LOOKBACK = 12;
|
||||||
const DEFAULT_COLOR = '#2196f3';
|
|
||||||
|
|
||||||
function buildKey(alert) {
|
function getAlertKey(alert) {
|
||||||
if (alert.id) return alert.id;
|
return alert.id || (alert.timestamp
|
||||||
if (alert.timestamp) return `${alert.timestamp}-${alert.message}`;
|
? `${alert.timestamp}-${alert.message}`
|
||||||
return `${alert.title || 'alert'}-${alert.message}`;
|
: `${alert.title || 'alert'}-${alert.message}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAlertLifetime(alert) {
|
export default function AlertFeed({ scale = 1, opacity = 0.6 }) {
|
||||||
return Number.isFinite(alert?.lifetimeMs) ? alert.lifetimeMs : LIFETIME_MS;
|
const layout = useLayoutMode();
|
||||||
}
|
const maxVisibleToasts = layout === 'mobile-portrait' || layout === 'mobile-landscape' ? 4 : 10;
|
||||||
|
|
||||||
function buildAlertToken(alert, key) {
|
|
||||||
/*
|
|
||||||
A keyed alert such as a barcode scan intentionally reuses the same id so the
|
|
||||||
visual slot can be refreshed in place. The token must therefore include the
|
|
||||||
arrival timestamp too; otherwise a new scan with the same id would look like
|
|
||||||
the same toast and would not get a fresh timer.
|
|
||||||
*/
|
|
||||||
const receivedAt = alert?.receivedAt ?? '';
|
|
||||||
const timestamp = alert?.timestamp ?? '';
|
|
||||||
const title = alert?.title ?? '';
|
|
||||||
const message = alert?.message ?? '';
|
|
||||||
return `${key}:${receivedAt}:${timestamp}:${title}:${message}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildToastRecord(item) {
|
|
||||||
const lifetimeMs = getAlertLifetime(item.alert);
|
|
||||||
const expiresAt = Date.now() + lifetimeMs;
|
|
||||||
|
|
||||||
return {
|
|
||||||
key: item.key,
|
|
||||||
alert: item.alert,
|
|
||||||
expiresAt,
|
|
||||||
remainingMs: lifetimeMs,
|
|
||||||
paused: false,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function getToastRgb(alert) {
|
|
||||||
return hexToRgb(alert?.color) || hexToRgb(DEFAULT_COLOR);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getToastAccent(alert) {
|
|
||||||
const rgb = getToastRgb(alert);
|
|
||||||
return rgb ? `rgb(${rgb.r}, ${rgb.g}, ${rgb.b})` : DEFAULT_COLOR;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isGenericAlert(alert) {
|
|
||||||
/*
|
|
||||||
The shell needs to know which alerts use the fallback title/message renderer
|
|
||||||
because those alerts historically carried their own color-tinted surface.
|
|
||||||
Matching the same payload guards used by AlertToast keeps the shell styling
|
|
||||||
aligned with the renderer that will actually be selected below.
|
|
||||||
*/
|
|
||||||
if (alert?.kind === 'buttonbox-active' && alert.payload) return false;
|
|
||||||
if (alert?.kind === 'chat' && alert.payload) return false;
|
|
||||||
if (alert?.kind === 'chat-typing' && alert.payload) return false;
|
|
||||||
if (alert?.kind === 'barcode-scan' && alert.payload) return false;
|
|
||||||
if (alert?.kind === 'undocked-exit-warning') return false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function AlertFeed({ scale = 1 }) {
|
|
||||||
const alerts = useSessionSelector((state) => state.alerts);
|
const alerts = useSessionSelector((state) => state.alerts);
|
||||||
const buttonBoxButtons = useSessionSelector((state) => state.session?.buttonBox?.buttons ?? []);
|
|
||||||
const { pushAlert } = useSessionActions();
|
|
||||||
const socket = useSocket();
|
|
||||||
const [toasts, setToasts] = useState([]);
|
const [toasts, setToasts] = useState([]);
|
||||||
const latestTokensRef = useRef(new Set());
|
const seenRef = useRef(new Set());
|
||||||
const timersRef = useRef(new Map());
|
useAlertEvents();
|
||||||
|
|
||||||
const clearToastTimer = useCallback((key) => {
|
useEffect(() => {
|
||||||
const timer = timersRef.current.get(key);
|
// Session history preserves object identity, including distinct arrivals
|
||||||
if (!timer) return;
|
// with the same id and timestamp. Dismissed alerts must not reappear.
|
||||||
clearTimeout(timer);
|
const incoming = alerts.slice(-RECENT_ALERT_LOOKBACK).filter((alert) => !seenRef.current.has(alert));
|
||||||
timersRef.current.delete(key);
|
seenRef.current = new Set(alerts);
|
||||||
|
setToasts((current) => {
|
||||||
|
if (!incoming.length && current.length <= maxVisibleToasts) return current;
|
||||||
|
const next = new Map(current.map((alert) => [getAlertKey(alert), alert]));
|
||||||
|
for (const alert of incoming) {
|
||||||
|
const key = getAlertKey(alert);
|
||||||
|
// Refreshed alerts move to the newest slot and receive a fresh lifetime.
|
||||||
|
next.delete(key);
|
||||||
|
next.set(key, alert);
|
||||||
|
}
|
||||||
|
return [...next.values()].slice(-maxVisibleToasts);
|
||||||
|
});
|
||||||
|
}, [alerts, maxVisibleToasts]);
|
||||||
|
|
||||||
|
const dismiss = useCallback((alert) => {
|
||||||
|
setToasts((current) => current.filter((entry) => entry !== alert));
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const removeToast = useCallback(
|
|
||||||
(key) => {
|
|
||||||
clearToastTimer(key);
|
|
||||||
setToasts((currentToasts) => currentToasts.filter((toast) => toast.key !== key));
|
|
||||||
},
|
|
||||||
[clearToastTimer],
|
|
||||||
);
|
|
||||||
|
|
||||||
const scheduleToastRemoval = useCallback(
|
|
||||||
(key, delayMs) => {
|
|
||||||
clearToastTimer(key);
|
|
||||||
/*
|
|
||||||
Each toast owns exactly one removal timeout. This is cheaper and simpler
|
|
||||||
than polling all visible alerts for progress/fade state, and it still
|
|
||||||
lets hover/focus pause by clearing the one timer for the interacted row.
|
|
||||||
*/
|
|
||||||
const timer = setTimeout(() => removeToast(key), Math.max(0, delayMs));
|
|
||||||
timersRef.current.set(key, timer);
|
|
||||||
},
|
|
||||||
[clearToastTimer, removeToast],
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(
|
|
||||||
() => () => {
|
|
||||||
timersRef.current.forEach((timer) => clearTimeout(timer));
|
|
||||||
timersRef.current.clear();
|
|
||||||
},
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
function onButtonIncrement(payload = {}) {
|
|
||||||
const buttonId = Number(payload.buttonId);
|
|
||||||
if (!Number.isFinite(buttonId) || buttonId < 1 || buttonId > 4) return;
|
|
||||||
const buttons = Array.isArray(buttonBoxButtons) ? buttonBoxButtons : [];
|
|
||||||
const button = buttons.find((entry) => Number(entry?.id) === buttonId) || {};
|
|
||||||
const count = Number.isFinite(payload.count) ? payload.count : Number(button.count) || 0;
|
|
||||||
/*
|
|
||||||
Event fields win over session fields because the button-box event is the
|
|
||||||
exact outcome of this press. Session sync follows immediately after, but
|
|
||||||
using it first can make fast toasts briefly show stale count/limit data.
|
|
||||||
*/
|
|
||||||
const goal = Number.isFinite(payload.goal) ? payload.goal : Number.isFinite(button.goal) ? button.goal : 0;
|
|
||||||
const dailyCount = Number.isFinite(payload.dailyCount)
|
|
||||||
? payload.dailyCount
|
|
||||||
: Number.isFinite(button.dailyCount)
|
|
||||||
? button.dailyCount
|
|
||||||
: 0;
|
|
||||||
const dailyLimit = Number.isFinite(payload.dailyLimit)
|
|
||||||
? payload.dailyLimit
|
|
||||||
: Number.isFinite(button.dailyLimit)
|
|
||||||
? button.dailyLimit
|
|
||||||
: null;
|
|
||||||
const rewardNumber = Number.isFinite(button.rewardNumber) ? button.rewardNumber : '?';
|
|
||||||
const rewardName =
|
|
||||||
typeof button.rewardName === 'string' && button.rewardName.trim()
|
|
||||||
? button.rewardName.trim()
|
|
||||||
: 'Unassigned';
|
|
||||||
const rewardDescription =
|
|
||||||
typeof button.rewardDescription === 'string' && button.rewardDescription.trim()
|
|
||||||
? button.rewardDescription.trim()
|
|
||||||
: null;
|
|
||||||
const description =
|
|
||||||
typeof payload.description === 'string' && payload.description.trim()
|
|
||||||
? payload.description.trim()
|
|
||||||
: null;
|
|
||||||
pushAlert({
|
|
||||||
id: `buttonbox-active-${buttonId}`,
|
|
||||||
kind: 'buttonbox-active',
|
|
||||||
lifetimeMs: BUTTONBOX_LIFETIME_MS,
|
|
||||||
payload: {
|
|
||||||
buttonId,
|
|
||||||
count,
|
|
||||||
goal,
|
|
||||||
dailyCount,
|
|
||||||
dailyLimit,
|
|
||||||
limited: Boolean(payload.limited),
|
|
||||||
description,
|
|
||||||
rewardNumber,
|
|
||||||
rewardName,
|
|
||||||
rewardDescription,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
socket.on('buttonBox:increment', onButtonIncrement);
|
|
||||||
return () => {
|
|
||||||
socket.off('buttonBox:increment', onButtonIncrement);
|
|
||||||
};
|
|
||||||
}, [pushAlert, buttonBoxButtons, socket]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
function onBarcodeScanned(payload = {}) {
|
|
||||||
const label = typeof payload.label === 'string' && payload.label.trim()
|
|
||||||
? payload.label.trim()
|
|
||||||
: payload.code || 'unknown barcode';
|
|
||||||
/*
|
|
||||||
Barcode scans use a fixed alert id because the scanner can fire quickly
|
|
||||||
during games. Reusing the id makes the newest scan replace the previous
|
|
||||||
barcode popup in AlertFeed's keyed visible map instead of building a
|
|
||||||
stack of old scan cards that would hide the current wiki link.
|
|
||||||
*/
|
|
||||||
pushAlert({
|
|
||||||
id: 'barcode-scan-active',
|
|
||||||
kind: 'barcode-scan',
|
|
||||||
lifetimeMs: BARCODE_SCAN_LIFETIME_MS,
|
|
||||||
payload: {
|
|
||||||
...payload,
|
|
||||||
label,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
socket.on('barcode:scanned', onBarcodeScanned);
|
|
||||||
return () => {
|
|
||||||
socket.off('barcode:scanned', onBarcodeScanned);
|
|
||||||
};
|
|
||||||
}, [pushAlert, socket]);
|
|
||||||
|
|
||||||
const latest = useMemo(
|
|
||||||
() =>
|
|
||||||
alerts.slice(-RECENT_ALERT_LOOKBACK).map((alert) => {
|
|
||||||
const key = buildKey(alert);
|
|
||||||
return {
|
|
||||||
alert,
|
|
||||||
key,
|
|
||||||
token: buildAlertToken(alert, key),
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
[alerts],
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
/*
|
|
||||||
The processed-token set is captured before scheduling the state update
|
|
||||||
because React may run the functional updater after this effect continues.
|
|
||||||
Reading latestTokensRef.current inside the updater would race with the ref
|
|
||||||
assignment below and could make brand-new alerts look already processed,
|
|
||||||
leaving the local toast list empty.
|
|
||||||
*/
|
|
||||||
const previousTokens = latestTokensRef.current;
|
|
||||||
const newItems = latest.filter((item) => !previousTokens.has(item.token));
|
|
||||||
|
|
||||||
if (newItems.length) {
|
|
||||||
setToasts((currentToasts) => {
|
|
||||||
const nextByKey = new Map(currentToasts.map((toast) => [toast.key, toast]));
|
|
||||||
|
|
||||||
newItems.forEach((item) => {
|
|
||||||
/*
|
|
||||||
Setting an existing Map key updates its value but keeps its original
|
|
||||||
insertion slot. Deleting first makes refreshed keyed alerts behave
|
|
||||||
like new notifications visually, which is what operators expect when
|
|
||||||
the barcode lane or a button-box lane receives a fresh event.
|
|
||||||
*/
|
|
||||||
nextByKey.delete(item.key);
|
|
||||||
nextByKey.set(item.key, buildToastRecord(item));
|
|
||||||
});
|
|
||||||
|
|
||||||
/*
|
|
||||||
The newest records are the only ones that should consume feed slots.
|
|
||||||
Older active records are dropped immediately so a burst of alerts
|
|
||||||
cannot cover the rest of the rover interface.
|
|
||||||
*/
|
|
||||||
const nextToasts = Array.from(nextByKey.values());
|
|
||||||
const activeKeys = nextToasts.slice(-MAX_VISIBLE_TOASTS).map((toast) => toast.key);
|
|
||||||
const activeKeySet = new Set(activeKeys);
|
|
||||||
|
|
||||||
return nextToasts.filter((toast) => activeKeySet.has(toast.key));
|
|
||||||
});
|
|
||||||
|
|
||||||
newItems.forEach((item) => {
|
|
||||||
scheduleToastRemoval(item.key, getAlertLifetime(item.alert));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
latestTokensRef.current = new Set(latest.map((item) => item.token));
|
|
||||||
}, [latest, scheduleToastRemoval]);
|
|
||||||
|
|
||||||
const pauseToast = useCallback((key) => {
|
|
||||||
const toast = toasts.find((entry) => entry.key === key);
|
|
||||||
if (!toast || toast.paused) return;
|
|
||||||
const remainingMs = Math.max(0, toast.expiresAt - Date.now());
|
|
||||||
|
|
||||||
clearToastTimer(key);
|
|
||||||
setToasts((currentToasts) =>
|
|
||||||
currentToasts.map((toast) => {
|
|
||||||
if (toast.key !== key || toast.paused) return toast;
|
|
||||||
|
|
||||||
/*
|
|
||||||
Remaining time is captured at the moment interaction begins, not at the
|
|
||||||
previous render. That makes hover/focus pauses exact enough that a
|
|
||||||
toast cannot expire while the user is moving toward a link or dismiss
|
|
||||||
button inside it.
|
|
||||||
*/
|
|
||||||
return {
|
|
||||||
...toast,
|
|
||||||
paused: true,
|
|
||||||
remainingMs,
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}, [clearToastTimer, toasts]);
|
|
||||||
|
|
||||||
const resumeToast = useCallback((key) => {
|
|
||||||
const toast = toasts.find((entry) => entry.key === key);
|
|
||||||
if (!toast || !toast.paused) return;
|
|
||||||
const startedAt = Date.now();
|
|
||||||
const remainingMs = Math.max(0, toast.remainingMs);
|
|
||||||
|
|
||||||
setToasts((currentToasts) =>
|
|
||||||
currentToasts.map((toast) => {
|
|
||||||
if (toast.key !== key || !toast.paused) return toast;
|
|
||||||
return {
|
|
||||||
...toast,
|
|
||||||
paused: false,
|
|
||||||
expiresAt: startedAt + remainingMs,
|
|
||||||
remainingMs,
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
scheduleToastRemoval(key, remainingMs);
|
|
||||||
}, [scheduleToastRemoval, toasts]);
|
|
||||||
|
|
||||||
const dismissToast = useCallback((key) => {
|
|
||||||
removeToast(key);
|
|
||||||
}, [removeToast]);
|
|
||||||
|
|
||||||
if (!toasts.length) return null;
|
if (!toasts.length) return null;
|
||||||
|
|
||||||
const containerStyle =
|
|
||||||
scale === 1
|
|
||||||
? undefined
|
|
||||||
: {
|
|
||||||
transform: `translateX(-50%) scale(${scale})`,
|
|
||||||
transformOrigin: 'top center',
|
|
||||||
};
|
|
||||||
const containerClass =
|
|
||||||
scale === 1
|
|
||||||
? 'pointer-events-none fixed top-0.5 left-1/2 z-50 flex -translate-x-1/2 flex-col gap-0.5'
|
|
||||||
: 'pointer-events-none fixed top-0.5 left-1/2 z-50 flex flex-col gap-0.5';
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={containerClass} style={containerStyle} aria-live="polite">
|
<div
|
||||||
{toasts.map((toast) => (
|
className="pointer-events-none fixed top-0.5 left-1/2 z-50 flex w-max max-w-[80vw] flex-col items-center gap-0.5"
|
||||||
<AlertToastShell
|
style={{ transform: `translateX(-50%) scale(${scale})`, transformOrigin: 'top center' }}
|
||||||
key={toast.key}
|
aria-live="polite"
|
||||||
toast={toast}
|
>
|
||||||
onDismiss={dismissToast}
|
{toasts.map((alert) => (
|
||||||
onPause={pauseToast}
|
<AlertToast key={getAlertKey(alert)} alert={alert} opacity={opacity} onDismiss={dismiss} />
|
||||||
onResume={resumeToast}
|
|
||||||
/>
|
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function hexToRgb(hex) {
|
function AlertToast({ alert, opacity, onDismiss }) {
|
||||||
const safe = typeof hex === 'string' ? hex.trim() : '';
|
const [hovered, setHovered] = useState(false);
|
||||||
const match = /^#?([0-9a-fA-F]{6})$/.exec(safe);
|
const [focused, setFocused] = useState(false);
|
||||||
if (!match) return null;
|
const remainingRef = useRef(0);
|
||||||
const value = match[1];
|
const paused = hovered || focused;
|
||||||
return {
|
|
||||||
r: parseInt(value.slice(0, 2), 16),
|
|
||||||
g: parseInt(value.slice(2, 4), 16),
|
|
||||||
b: parseInt(value.slice(4, 6), 16),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function getSafeWikiUrl(rawUrl) {
|
useEffect(() => {
|
||||||
const text = String(rawUrl || '').trim();
|
remainingRef.current = Number.isFinite(alert.lifetimeMs) ? alert.lifetimeMs : 3000;
|
||||||
if (!text) return '';
|
}, [alert]);
|
||||||
|
|
||||||
try {
|
useEffect(() => {
|
||||||
/*
|
if (paused) return;
|
||||||
Wiki links are operator-authored registry data, but this still normalizes
|
const startedAt = Date.now();
|
||||||
them before rendering an anchor. Allowing only http/https avoids turning a
|
const timer = setTimeout(() => onDismiss(alert), Math.max(0, remainingRef.current));
|
||||||
barcode registry typo into a javascript: link while still supporting both
|
return () => {
|
||||||
absolute URLs and local wiki paths such as /wiki/object-name.
|
clearTimeout(timer);
|
||||||
*/
|
remainingRef.current = Math.max(0, remainingRef.current - (Date.now() - startedAt));
|
||||||
const parsed = new URL(text, window.location.origin);
|
};
|
||||||
if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') return '';
|
}, [alert, paused, onDismiss]);
|
||||||
return parsed.href;
|
|
||||||
} catch {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function AlertToastShell({ toast, onDismiss, onPause, onResume }) {
|
|
||||||
const accent = getToastAccent(toast.alert);
|
|
||||||
const generic = isGenericAlert(toast.alert);
|
|
||||||
const rgb = getToastRgb(toast.alert);
|
|
||||||
const genericBackgroundColor = rgb ? `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.18)` : 'rgba(33, 150, 243, 0.18)';
|
|
||||||
const genericBorderColor = rgb ? `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.45)` : 'rgba(33, 150, 243, 0.45)';
|
|
||||||
const shellClass = [
|
|
||||||
'pointer-events-auto w-fit max-w-[80vw] overflow-hidden rounded-md shadow-sm shadow-black/40',
|
|
||||||
generic ? '' : 'border border-white/10 bg-black/75',
|
|
||||||
].join(' ');
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={shellClass}
|
className="pointer-events-auto w-max max-w-full"
|
||||||
onMouseEnter={() => onPause(toast.key)}
|
style={{ opacity }}
|
||||||
onMouseLeave={() => onResume(toast.key)}
|
onMouseEnter={() => setHovered(true)}
|
||||||
onFocusCapture={() => onPause(toast.key)}
|
onMouseLeave={() => setHovered(false)}
|
||||||
onBlurCapture={() => onResume(toast.key)}
|
onFocusCapture={() => setFocused(true)}
|
||||||
style={
|
onBlurCapture={(event) => {
|
||||||
generic
|
// Moving focus between controls inside the toast must not resume expiry.
|
||||||
? {
|
if (!event.currentTarget.contains(event.relatedTarget)) setFocused(false);
|
||||||
/*
|
}}
|
||||||
Generic alerts keep the same color math they used before the shared
|
|
||||||
shell was introduced. Putting it on the shell restores the original
|
|
||||||
brightness while still leaving room for the side dismiss column.
|
|
||||||
*/
|
|
||||||
backgroundColor: genericBackgroundColor,
|
|
||||||
border: `1px solid ${genericBorderColor}`,
|
|
||||||
}
|
|
||||||
: undefined
|
|
||||||
}
|
|
||||||
>
|
>
|
||||||
<div className="flex min-w-0 items-stretch">
|
<AlertContent alert={alert} />
|
||||||
<div className="min-w-0 flex-1">
|
|
||||||
<AlertToast alert={toast.alert} />
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
className={[
|
|
||||||
'flex w-5 shrink-0 flex-col items-center justify-start gap-0.5 border-l py-0.5',
|
|
||||||
generic ? '' : 'border-white/10 bg-black/20',
|
|
||||||
].join(' ')}
|
|
||||||
style={
|
|
||||||
generic
|
|
||||||
? {
|
|
||||||
borderLeftColor: genericBorderColor,
|
|
||||||
backgroundColor: 'rgba(0, 0, 0, 0.08)',
|
|
||||||
}
|
|
||||||
: undefined
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="flex h-4 w-4 items-center justify-center rounded-sm text-xs leading-none text-slate-300 hover:bg-white/10 hover:text-white focus:bg-white/10 focus:text-white focus:outline-none focus:ring-1"
|
|
||||||
style={{ '--tw-ring-color': accent }}
|
|
||||||
onClick={() => onDismiss(toast.key)}
|
|
||||||
title="Dismiss alert"
|
|
||||||
aria-label="Dismiss alert"
|
|
||||||
>
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function BarcodeScanToast({ payload }) {
|
|
||||||
const wikiUrl = getSafeWikiUrl(payload?.wikiUrl);
|
|
||||||
const label = payload?.label || payload?.code || 'unknown barcode';
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="pointer-events-auto max-w-[80vw] rounded-md bg-neutral-800 px-2 py-1 text-l leading-tight text-slate-100">
|
|
||||||
<style>
|
|
||||||
{`
|
|
||||||
@keyframes barcode-wiki-flat-flash {
|
|
||||||
0%, 100% {
|
|
||||||
background: rgb(233, 186, 14);
|
|
||||||
color: rgb(71, 144, 253);
|
|
||||||
}
|
|
||||||
50% {
|
|
||||||
background: rgb(125, 49, 255);
|
|
||||||
color: rgb(246, 250, 211);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
<p className="flex flex-wrap items-center gap-0.5 text-slate-100">
|
|
||||||
<span className="font-semibold text-slate-300 pr-1">Barcode scanned:</span>
|
|
||||||
<span className="font-semibold text-white">{label}</span>
|
|
||||||
{wikiUrl ? (
|
|
||||||
<a
|
|
||||||
href={wikiUrl}
|
|
||||||
target="_blank"
|
|
||||||
rel="noreferrer"
|
|
||||||
className="rounded-md ml-0.5 px-2 py-1 text-xl font-semibold leading-tight tracking-normal"
|
|
||||||
style={{ animation: 'barcode-wiki-flat-flash 0.35s steps(1, end) infinite' }}
|
|
||||||
>
|
|
||||||
Wiki link
|
|
||||||
</a>
|
|
||||||
) : null}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function UndockedExitWarningToast() {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
/*
|
|
||||||
This warning deliberately keeps AlertFeed's existing dark shell and
|
|
||||||
compact rounded geometry while giving a safety-critical instruction
|
|
||||||
enough type size and breathing room to be unmistakable. The responsive
|
|
||||||
width leaves space for the feed shell's separate dismiss column on
|
|
||||||
narrow screens instead of allowing the card to overflow the viewport.
|
|
||||||
*/
|
|
||||||
className="w-[min(32rem,calc(80vw-1.25rem))] border-l-4 border-amber-400 bg-amber-950/90 px-4 py-3 text-left text-amber-50"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<p className="text-xl font-bold leading-tight text-amber-100">Please dock your rover</p>
|
|
||||||
<p className="mt-1 text-base font-medium leading-snug text-amber-50/90">
|
|
||||||
Your rover is still undocked. Please dock it before leaving the page.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function AlertToast({ alert }) {
|
|
||||||
if (alert.kind === 'buttonbox-active' && alert.payload) {
|
|
||||||
const payload = alert.payload;
|
|
||||||
return (
|
|
||||||
<div className="pointer-events-none w-[12.5rem]">
|
|
||||||
<ButtonBoxTile
|
|
||||||
buttonId={payload.buttonId}
|
|
||||||
count={payload.count}
|
|
||||||
goal={payload.goal}
|
|
||||||
rewardNumber={payload.rewardNumber}
|
|
||||||
rewardName={payload.rewardName}
|
|
||||||
rewardDescription={payload.rewardDescription}
|
|
||||||
dailyCount={payload.dailyCount}
|
|
||||||
dailyLimit={payload.dailyLimit}
|
|
||||||
limited={payload.limited}
|
|
||||||
className={payload.limited ? 'bg-red-950/70 ring-1 ring-red-500/70' : 'bg-cyan-900/45'}
|
|
||||||
/>
|
|
||||||
{payload.description ? (
|
|
||||||
<p className={['mt-1 text-center text-xs font-semibold', payload.limited ? 'text-red-200' : 'text-cyan-100'].join(' ')}>
|
|
||||||
{payload.description}
|
|
||||||
</p>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (alert.kind === 'chat' && alert.payload) {
|
|
||||||
return <ChatMessageRow message={alert.payload} />;
|
|
||||||
}
|
|
||||||
if (alert.kind === 'chat-typing' && alert.payload) {
|
|
||||||
return <ChatMessageRow message={alert.payload} variant="typing" />;
|
|
||||||
}
|
|
||||||
if (alert.kind === 'barcode-scan' && alert.payload) {
|
|
||||||
return <BarcodeScanToast payload={alert.payload} />;
|
|
||||||
}
|
|
||||||
if (alert.kind === 'undocked-exit-warning') {
|
|
||||||
return <UndockedExitWarningToast />;
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
/*
|
|
||||||
Generic alerts are the payloads that directly provide title/message/color
|
|
||||||
instead of a richer custom renderer. The surrounding shell owns their
|
|
||||||
color-tinted background so the dismiss column and content share one
|
|
||||||
continuous surface while this renderer stays responsible for one line of
|
|
||||||
compact title/message text.
|
|
||||||
*/
|
|
||||||
className="pointer-events-auto min-w-0 max-w-[24rem] px-1.5 py-0.5 text-left text-[0.72rem] leading-tight text-slate-100"
|
|
||||||
>
|
|
||||||
<p className="truncate text-slate-100">
|
|
||||||
<span className="font-semibold text-slate-300">{alert.title || 'Alert'}</span>
|
|
||||||
<span className="text-slate-500"> · </span>
|
|
||||||
<span className="text-white">{alert.message}</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
import { useEffect } from 'react';
|
||||||
|
import { useSessionActions, useSessionSelector } from '../../context/SessionContext.jsx';
|
||||||
|
import { useSocket } from '../../context/SocketContext.jsx';
|
||||||
|
|
||||||
|
const BUTTONBOX_LIFETIME_MS = 5000;
|
||||||
|
const BARCODE_SCAN_LIFETIME_MS = 10 * 1000;
|
||||||
|
|
||||||
|
export default function useAlertEvents() {
|
||||||
|
const buttonBoxButtons = useSessionSelector((state) => state.session?.buttonBox?.buttons);
|
||||||
|
const { pushAlert } = useSessionActions();
|
||||||
|
const socket = useSocket();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
function onButtonIncrement(payload = {}) {
|
||||||
|
const buttonId = Number(payload.buttonId);
|
||||||
|
if (!Number.isFinite(buttonId) || buttonId < 1 || buttonId > 4) return;
|
||||||
|
const buttons = Array.isArray(buttonBoxButtons) ? buttonBoxButtons : [];
|
||||||
|
const button = buttons.find((entry) => Number(entry?.id) === buttonId) || {};
|
||||||
|
const count = Number.isFinite(payload.count) ? payload.count : Number(button.count) || 0;
|
||||||
|
/*
|
||||||
|
Event fields win over session fields because the button-box event is the
|
||||||
|
exact outcome of this press. Session sync follows immediately after, but
|
||||||
|
using it first can make fast toasts briefly show stale count/limit data.
|
||||||
|
*/
|
||||||
|
const goal = Number.isFinite(payload.goal) ? payload.goal : Number.isFinite(button.goal) ? button.goal : 0;
|
||||||
|
const dailyCount = Number.isFinite(payload.dailyCount)
|
||||||
|
? payload.dailyCount
|
||||||
|
: Number.isFinite(button.dailyCount)
|
||||||
|
? button.dailyCount
|
||||||
|
: 0;
|
||||||
|
const dailyLimit = Number.isFinite(payload.dailyLimit)
|
||||||
|
? payload.dailyLimit
|
||||||
|
: Number.isFinite(button.dailyLimit)
|
||||||
|
? button.dailyLimit
|
||||||
|
: null;
|
||||||
|
const rewardNumber = Number.isFinite(button.rewardNumber) ? button.rewardNumber : '?';
|
||||||
|
const rewardName =
|
||||||
|
typeof button.rewardName === 'string' && button.rewardName.trim()
|
||||||
|
? button.rewardName.trim()
|
||||||
|
: 'Unassigned';
|
||||||
|
const rewardDescription =
|
||||||
|
typeof button.rewardDescription === 'string' && button.rewardDescription.trim()
|
||||||
|
? button.rewardDescription.trim()
|
||||||
|
: null;
|
||||||
|
const description =
|
||||||
|
typeof payload.description === 'string' && payload.description.trim()
|
||||||
|
? payload.description.trim()
|
||||||
|
: null;
|
||||||
|
pushAlert({
|
||||||
|
id: `buttonbox-active-${buttonId}`,
|
||||||
|
kind: 'buttonbox-active',
|
||||||
|
lifetimeMs: BUTTONBOX_LIFETIME_MS,
|
||||||
|
payload: {
|
||||||
|
buttonId,
|
||||||
|
count,
|
||||||
|
goal,
|
||||||
|
dailyCount,
|
||||||
|
dailyLimit,
|
||||||
|
limited: Boolean(payload.limited),
|
||||||
|
description,
|
||||||
|
rewardNumber,
|
||||||
|
rewardName,
|
||||||
|
rewardDescription,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
socket.on('buttonBox:increment', onButtonIncrement);
|
||||||
|
return () => {
|
||||||
|
socket.off('buttonBox:increment', onButtonIncrement);
|
||||||
|
};
|
||||||
|
}, [pushAlert, buttonBoxButtons, socket]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
function onBarcodeScanned(payload = {}) {
|
||||||
|
const label = typeof payload.label === 'string' && payload.label.trim()
|
||||||
|
? payload.label.trim()
|
||||||
|
: payload.code || 'unknown barcode';
|
||||||
|
/*
|
||||||
|
Barcode scans use a fixed alert id because the scanner can fire quickly
|
||||||
|
during games. Reusing the id makes the newest scan replace the previous
|
||||||
|
barcode popup in AlertFeed's keyed visible map instead of building a
|
||||||
|
stack of old scan cards that would hide the current wiki link.
|
||||||
|
*/
|
||||||
|
pushAlert({
|
||||||
|
id: 'barcode-scan-active',
|
||||||
|
kind: 'barcode-scan',
|
||||||
|
lifetimeMs: BARCODE_SCAN_LIFETIME_MS,
|
||||||
|
payload: {
|
||||||
|
...payload,
|
||||||
|
label,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
socket.on('barcode:scanned', onBarcodeScanned);
|
||||||
|
return () => {
|
||||||
|
socket.off('barcode:scanned', onBarcodeScanned);
|
||||||
|
};
|
||||||
|
}, [pushAlert, socket]);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -57,7 +57,7 @@ function centerOfPressure(corners) {
|
|||||||
|
|
||||||
function CornerReading({ className, label, value }) {
|
function CornerReading({ className, label, value }) {
|
||||||
return (
|
return (
|
||||||
<div className={`surface absolute min-w-[5.5rem] text-center ${className}`}>
|
<div className={`surface absolute min-w-22 text-center ${className}`}>
|
||||||
<div className="text-[0.62rem] text-slate-400">{label}</div>
|
<div className="text-[0.62rem] text-slate-400">{label}</div>
|
||||||
<div className="text-sm font-semibold text-slate-100">{formatWeight(value)}</div>
|
<div className="text-sm font-semibold text-slate-100">{formatWeight(value)}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ function GameChoice({ game, disabled, onVote }) {
|
|||||||
type="button"
|
type="button"
|
||||||
disabled={disabled || game.active}
|
disabled={disabled || game.active}
|
||||||
onClick={() => onVote(game.id)}
|
onClick={() => onVote(game.id)}
|
||||||
className="surface flex min-h-[3.5rem] flex-col items-start justify-between border-l-4 border-l-neutral-600 px-1 py-0.75 text-left transition-colors hover:bg-neutral-700 disabled:cursor-not-allowed disabled:opacity-70"
|
className="surface flex min-h-14 flex-col items-start justify-between border-l-4 border-l-neutral-600 px-1 py-0.75 text-left transition-colors hover:bg-neutral-700 disabled:cursor-not-allowed disabled:opacity-70"
|
||||||
style={style}
|
style={style}
|
||||||
>
|
>
|
||||||
<span className="flex w-full items-start justify-between gap-1">
|
<span className="flex w-full items-start justify-between gap-1">
|
||||||
@@ -154,7 +154,7 @@ function DisplaySections({ sections }) {
|
|||||||
{section.items.slice(0, 8).map((item, itemIndex) => (
|
{section.items.slice(0, 8).map((item, itemIndex) => (
|
||||||
<p
|
<p
|
||||||
key={`${item.text}-${itemIndex}`}
|
key={`${item.text}-${itemIndex}`}
|
||||||
className={`break-words text-xs leading-snug ${
|
className={`wrap-break-word text-xs leading-snug ${
|
||||||
item.status === 'active'
|
item.status === 'active'
|
||||||
? 'font-semibold text-neutral-50'
|
? 'font-semibold text-neutral-50'
|
||||||
: item.status === 'complete'
|
: item.status === 'complete'
|
||||||
@@ -302,14 +302,14 @@ function BarcodeGamesPanelContent() {
|
|||||||
fit its fixed timer and participant blocks without crushing the title. */}
|
fit its fixed timer and participant blocks without crushing the title. */}
|
||||||
<div className="grid items-stretch gap-0.5 @[28rem]:grid-cols-[minmax(0,1fr)_9rem_10rem]">
|
<div className="grid items-stretch gap-0.5 @[28rem]:grid-cols-[minmax(0,1fr)_9rem_10rem]">
|
||||||
<div className="surface min-w-0 border-l-4 border-neutral-700 px-1 py-0.75" style={activeTheme.titleBoxStyle}>
|
<div className="surface min-w-0 border-l-4 border-neutral-700 px-1 py-0.75" style={activeTheme.titleBoxStyle}>
|
||||||
<p className="break-words text-xl font-bold leading-tight text-neutral-50" style={activeTheme.textStyle}>
|
<p className="wrap-break-word text-xl font-bold leading-tight text-neutral-50" style={activeTheme.textStyle}>
|
||||||
{display.title || activeGame?.title || 'No game active'}
|
{display.title || activeGame?.title || 'No game active'}
|
||||||
</p>
|
</p>
|
||||||
<p className="mt-0.5 break-words text-sm font-semibold leading-tight text-neutral-200">
|
<p className="mt-0.5 wrap-break-word text-sm font-semibold leading-tight text-neutral-200">
|
||||||
{display.primary || 'Vote for a game to start'}
|
{display.primary || 'Vote for a game to start'}
|
||||||
</p>
|
</p>
|
||||||
{display.secondary ? (
|
{display.secondary ? (
|
||||||
<p className="mt-0.5 break-words text-xs leading-snug text-neutral-300">{display.secondary}</p>
|
<p className="mt-0.5 wrap-break-word text-xs leading-snug text-neutral-300">{display.secondary}</p>
|
||||||
) : null}
|
) : null}
|
||||||
<DisplaySections sections={display.sections} />
|
<DisplaySections sections={display.sections} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ function BatteryBar({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const barShellClass = classNames(
|
const barShellClass = classNames(
|
||||||
'relative overflow-hidden rounded-sm border border-slate-800',
|
'relative overflow-hidden rounded-xs border border-slate-800',
|
||||||
isUrgent || isWarn ? baseToneStrong : 'bg-zinc-900/90',
|
isUrgent || isWarn ? baseToneStrong : 'bg-zinc-900/90',
|
||||||
isUrgent && 'battery-urgent-flash',
|
isUrgent && 'battery-urgent-flash',
|
||||||
isVertical
|
isVertical
|
||||||
@@ -132,7 +132,7 @@ function BatteryBar({
|
|||||||
isVertical ? (compact ? 'text-[0.55rem]' : 'text-[0.65rem]') : 'text-xs',
|
isVertical ? (compact ? 'text-[0.55rem]' : 'text-[0.65rem]') : 'text-xs',
|
||||||
);
|
);
|
||||||
const labelPillClass = classNames(
|
const labelPillClass = classNames(
|
||||||
'rounded px-1.5 py-0.5',
|
'rounded-sm px-1.5 py-0.5',
|
||||||
isBackground ? 'bg-black/30 text-slate-100' : 'bg-black/50 text-slate-100',
|
isBackground ? 'bg-black/30 text-slate-100' : 'bg-black/50 text-slate-100',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ function formatDegrees(value) {
|
|||||||
|
|
||||||
function KeyPill({ label }) {
|
function KeyPill({ label }) {
|
||||||
if (!label) return null;
|
if (!label) return null;
|
||||||
return <span className="rounded bg-slate-800 px-1 py-0.5 text-[0.6rem] font-semibold text-slate-200">{label}</span>;
|
return <span className="rounded-sm bg-slate-800 px-1 py-0.5 text-[0.6rem] font-semibold text-slate-200">{label}</span>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function CameraTiltControl({
|
export default function CameraTiltControl({
|
||||||
@@ -147,7 +147,7 @@ export default function CameraTiltControl({
|
|||||||
<div className={`flex items-center justify-between ${labelRowClass}`.trim()}>
|
<div className={`flex items-center justify-between ${labelRowClass}`.trim()}>
|
||||||
<span className={labelClass}>{label}</span>
|
<span className={labelClass}>{label}</span>
|
||||||
{showValue ? (
|
{showValue ? (
|
||||||
<span className={`rounded bg-slate-800 px-1 py-0.5 text-[0.7rem] font-semibold ${valueClass}`.trim()}>
|
<span className={`rounded-sm bg-slate-800 px-1 py-0.5 text-[0.7rem] font-semibold ${valueClass}`.trim()}>
|
||||||
{formatDegrees(value)}
|
{formatDegrees(value)}
|
||||||
</span>
|
</span>
|
||||||
) : null}
|
) : null}
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ export default function CardFrame({
|
|||||||
// sidebars. Making the card itself a query container lets its contents
|
// sidebars. Making the card itself a query container lets its contents
|
||||||
// respond to the space they actually receive instead of the viewport,
|
// respond to the space they actually receive instead of the viewport,
|
||||||
// which may be wide while a sidebar card is only a few hundred pixels.
|
// which may be wide while a sidebar card is only a few hundred pixels.
|
||||||
'panel-section @container border border-neutral-500/60 bg-neutral-900/100',
|
'panel-section @container border border-neutral-500/60 bg-neutral-900',
|
||||||
clipOverflow ? 'overflow-hidden' : 'overflow-visible',
|
clipOverflow ? 'overflow-hidden' : 'overflow-visible',
|
||||||
fillHeight && 'flex h-full min-h-0 flex-col',
|
fillHeight && 'flex h-full min-h-0 flex-col',
|
||||||
className,
|
className,
|
||||||
@@ -99,7 +99,7 @@ export default function CardFrame({
|
|||||||
// on the shared component gives long cards a consistent title bar
|
// on the shared component gives long cards a consistent title bar
|
||||||
// without changing the layout of existing callers.
|
// without changing the layout of existing callers.
|
||||||
stickyHeader && 'sticky top-0 z-10',
|
stickyHeader && 'sticky top-0 z-10',
|
||||||
// 'flex items-center justify-between gap-0.5 border-b border-neutral-500/50 bg-gradient-to-r from-neutral-800 via-neutral-700 to-neutral-600 px-0.5 py-0.5',
|
// 'flex items-center justify-between gap-0.5 border-b border-neutral-500/50 bg-linear-to-r from-neutral-800 via-neutral-700 to-neutral-600 px-0.5 py-0.5',
|
||||||
headerClassName,
|
headerClassName,
|
||||||
)}
|
)}
|
||||||
style={headerStyle}
|
style={headerStyle}
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { find } from 'linkifyjs';
|
||||||
|
import ReactPlayer from 'react-player';
|
||||||
|
|
||||||
|
function ChatEmbed({ url }) {
|
||||||
|
const [failed, setFailed] = useState(false);
|
||||||
|
if (failed) return null;
|
||||||
|
|
||||||
|
// Only direct image paths are identifiable without fetching page metadata.
|
||||||
|
const isImage = /\.(avif|gif|jpe?g|png|webp|svg)$/i.test(new URL(url).pathname);
|
||||||
|
if (isImage) {
|
||||||
|
return (
|
||||||
|
<a href={url} target="_blank" rel="noopener noreferrer" className="block max-w-full">
|
||||||
|
<img
|
||||||
|
src={url}
|
||||||
|
alt="Shared image"
|
||||||
|
loading="lazy"
|
||||||
|
className="max-h-60 max-w-full rounded-sm object-contain"
|
||||||
|
onError={() => setFailed(true)}
|
||||||
|
/>
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!ReactPlayer.canPlay(url)) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="aspect-video w-full max-w-sm overflow-hidden rounded-sm">
|
||||||
|
<ReactPlayer
|
||||||
|
src={url}
|
||||||
|
controls
|
||||||
|
playing={false}
|
||||||
|
width="100%"
|
||||||
|
height="100%"
|
||||||
|
onError={() => setFailed(true)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ChatEmbeds({ text }) {
|
||||||
|
const urls = [...new Set(find(String(text || ''), 'url')
|
||||||
|
.map((link) => link.href)
|
||||||
|
.filter((url) => /^https?:\/\//i.test(url)))];
|
||||||
|
|
||||||
|
return urls.map((url) => <ChatEmbed key={url} url={url} />);
|
||||||
|
}
|
||||||
@@ -3,8 +3,16 @@
|
|||||||
// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
|
// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { FaDiscord } from 'react-icons/fa';
|
import { FaDiscord } from 'react-icons/fa';
|
||||||
|
import Linkify from 'linkify-react';
|
||||||
import { useSessionSelector } from '../../context/SessionContext.jsx';
|
import { useSessionSelector } from '../../context/SessionContext.jsx';
|
||||||
import RoverLabel from '../RoverLabel/index.jsx';
|
import RoverLabel from '../RoverLabel/index.jsx';
|
||||||
|
import ChatEmbeds from './ChatEmbeds.jsx';
|
||||||
|
|
||||||
|
const LINK_OPTIONS = {
|
||||||
|
target: '_blank',
|
||||||
|
rel: 'noopener noreferrer',
|
||||||
|
className: 'text-sky-300 underline break-all',
|
||||||
|
};
|
||||||
|
|
||||||
function roleColors(role) {
|
function roleColors(role) {
|
||||||
switch (role) {
|
switch (role) {
|
||||||
@@ -37,7 +45,7 @@ function displayName(message) {
|
|||||||
// height, while the matching calc() size keeps the avatar square after adding that
|
// height, while the matching calc() size keeps the avatar square after adding that
|
||||||
// top/bottom coverage.
|
// top/bottom coverage.
|
||||||
const CHAT_ROW_FULL_HEIGHT_AVATAR_CLASS =
|
const CHAT_ROW_FULL_HEIGHT_AVATAR_CLASS =
|
||||||
'my-[-0.125rem] flex h-[calc(1rem+0.25rem)] w-[calc(1rem+0.25rem)] shrink-0 overflow-hidden rounded-none';
|
'-my-0.5 flex h-5 w-5 shrink-0 overflow-hidden rounded-none';
|
||||||
|
|
||||||
function DiscordAvatar({ guildIconUrl, userAvatarUrl, label }) {
|
function DiscordAvatar({ guildIconUrl, userAvatarUrl, label }) {
|
||||||
if (!guildIconUrl && !userAvatarUrl) return null;
|
if (!guildIconUrl && !userAvatarUrl) return null;
|
||||||
@@ -120,15 +128,15 @@ export function ChatIdentity({ message, toolsToggle = null }) {
|
|||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{isBot ? (
|
{isBot ? (
|
||||||
<span className="shrink-0 rounded bg-emerald-900/60 px-1 text-[0.65rem] font-semibold uppercase tracking-wide text-white">
|
<span className="shrink-0 rounded-sm bg-emerald-900/60 px-1 text-[0.65rem] font-semibold uppercase tracking-wide text-white">
|
||||||
bot
|
bot
|
||||||
</span>
|
</span>
|
||||||
) : null}
|
) : null}
|
||||||
{message.roverId && (
|
{(message.roverId || message.operatingModeDisplay) && (
|
||||||
<RoverLabel
|
<RoverLabel
|
||||||
roverId={message.roverId}
|
roverId={message.roverId}
|
||||||
name={message.roverName}
|
name={message.operatingModeDisplay?.name || message.roverName}
|
||||||
color={message.roverColor}
|
color={message.operatingModeDisplay?.color || message.roverColor}
|
||||||
fallback={message.roverId}
|
fallback={message.roverId}
|
||||||
className="shrink-0 text-[0.7rem]"
|
className="shrink-0 text-[0.7rem]"
|
||||||
/>
|
/>
|
||||||
@@ -185,7 +193,7 @@ export default function ChatMessageRow({ message, variant = 'message' }) {
|
|||||||
hasToolCalls ? (
|
hasToolCalls ? (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="shrink-0 rounded border border-slate-600/70 bg-slate-800/60 px-1 py-[1px] text-[0.65rem] text-slate-200 hover:bg-slate-700/70"
|
className="shrink-0 rounded-sm border border-slate-600/70 bg-slate-800/60 px-1 py-px text-[0.65rem] text-slate-200 hover:bg-slate-700/70"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (isSpectator) return;
|
if (isSpectator) return;
|
||||||
setOpen((v) => !v);
|
setOpen((v) => !v);
|
||||||
@@ -198,10 +206,12 @@ export default function ChatMessageRow({ message, variant = 'message' }) {
|
|||||||
<div className={chatRowClass(message, variant)}>
|
<div className={chatRowClass(message, variant)}>
|
||||||
<div className="flex w-full items-start gap-0.5">
|
<div className="flex w-full items-start gap-0.5">
|
||||||
<span
|
<span
|
||||||
className={`min-w-0 flex-1 break-words leading-tight whitespace-pre-wrap ${isBot ? 'text-emerald-100' : 'text-slate-100'}`}
|
className={`min-w-0 flex-1 wrap-break-word leading-tight whitespace-pre-wrap ${isBot ? 'text-emerald-100' : 'text-slate-100'}`}
|
||||||
>
|
>
|
||||||
<ChatIdentity message={message} toolsToggle={toolsToggle} />
|
<ChatIdentity message={message} toolsToggle={toolsToggle} />
|
||||||
{!isOpen && (hasText || isTyping) ? ` ${rowText}` : ''}
|
{!isOpen && (hasText || isTyping) ? (
|
||||||
|
<Linkify options={LINK_OPTIONS}>{` ${rowText}`}</Linkify>
|
||||||
|
) : null}
|
||||||
</span>
|
</span>
|
||||||
{!isTyping ? (
|
{!isTyping ? (
|
||||||
<span className="shrink-0 text-[0.65rem] text-slate-400/60">
|
<span className="shrink-0 text-[0.65rem] text-slate-400/60">
|
||||||
@@ -210,7 +220,7 @@ export default function ChatMessageRow({ message, variant = 'message' }) {
|
|||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
{isOpen && hasToolCalls ? (
|
{isOpen && hasToolCalls ? (
|
||||||
<div className="w-full rounded border border-slate-700/70 bg-slate-900/70 p-0.5 text-[0.68rem] text-slate-200">
|
<div className="w-full rounded-sm border border-slate-700/70 bg-slate-900/70 p-0.5 text-[0.68rem] text-slate-200">
|
||||||
{toolCalls.map((entry, idx) => {
|
{toolCalls.map((entry, idx) => {
|
||||||
const status = String(entry?.status || 'unknown');
|
const status = String(entry?.status || 'unknown');
|
||||||
const statusLabel = status === 'ok' ? 'ok' : status === 'blocked' ? 'blocked' : status === 'error' ? 'error' : 'unknown';
|
const statusLabel = status === 'ok' ? 'ok' : status === 'blocked' ? 'blocked' : status === 'error' ? 'error' : 'unknown';
|
||||||
@@ -225,10 +235,11 @@ export default function ChatMessageRow({ message, variant = 'message' }) {
|
|||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
{isOpen && hasText ? (
|
{isOpen && hasText ? (
|
||||||
<div className={`w-full break-words leading-tight whitespace-pre-wrap ${isBot ? 'text-emerald-100' : 'text-slate-100'}`}>
|
<div className={`w-full wrap-break-word leading-tight whitespace-pre-wrap ${isBot ? 'text-emerald-100' : 'text-slate-100'}`}>
|
||||||
{message.text}
|
<Linkify options={LINK_OPTIONS}>{message.text}</Linkify>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
{!isTyping && hasText ? <ChatEmbeds text={message.text} /> : null}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,33 +51,19 @@ function resolveTtsSettings(settings) {
|
|||||||
|
|
||||||
function useChatComposerSessionState(allowSpectatorInput) {
|
function useChatComposerSessionState(allowSpectatorInput) {
|
||||||
const role = useSessionSelector((state) => state.session?.role || null);
|
const role = useSessionSelector((state) => state.session?.role || null);
|
||||||
const socketId = useSessionSelector((state) => state.session?.socketId || null);
|
const operatingMode = useSessionSelector((state) => state.session?.operatingMode || 'rover');
|
||||||
const currentRoverId = useSessionSelector((state) => state.session?.assignment?.roverId || null);
|
const currentRoverId = useSessionSelector((state) => state.session?.assignment?.roverId || null);
|
||||||
const users = useSessionSelector((state) => state.session?.users ?? []);
|
|
||||||
const roster = useSessionSelector((state) => state.session?.roster ?? []);
|
const roster = useSessionSelector((state) => state.session?.roster ?? []);
|
||||||
const ptz = useSessionSelector((state) => state.session?.ptzCamera || null);
|
const ptz = useSessionSelector((state) => state.session?.ptzCamera || null);
|
||||||
|
|
||||||
const chatTargetId = useMemo(() => {
|
|
||||||
/*
|
|
||||||
PTZ is intentionally not a roster entry, but session users expose the
|
|
||||||
current chat target for each socket. Prefer the self user entry so the TTS
|
|
||||||
control follows PTZ queue/operation state instead of only physical rover
|
|
||||||
assignment state.
|
|
||||||
*/
|
|
||||||
const self = users.find((entry) => entry?.socketId === socketId);
|
|
||||||
if (!self?.roverId && ptz?.id && (ptz?.isOperator || ptz?.queuedPosition)) return ptz.id;
|
|
||||||
return self?.roverId || currentRoverId || null;
|
|
||||||
}, [currentRoverId, ptz?.id, ptz?.isOperator, ptz?.queuedPosition, socketId, users]);
|
|
||||||
|
|
||||||
const rover = useMemo(
|
const rover = useMemo(
|
||||||
() => roster.find((entry) => String(entry.id) === String(chatTargetId)) || null,
|
() => roster.find((entry) => String(entry.id) === String(currentRoverId)) || null,
|
||||||
[chatTargetId, roster],
|
[currentRoverId, roster],
|
||||||
);
|
);
|
||||||
const ptzTtsSupported = Boolean(
|
const ptzTtsSupported = Boolean(
|
||||||
ptz?.id &&
|
operatingMode === 'ptz' &&
|
||||||
String(chatTargetId) === String(ptz.id) &&
|
|
||||||
ptz?.audio?.enabled &&
|
ptz?.audio?.enabled &&
|
||||||
(ptz?.isOperator || ptz?.queuedPosition),
|
(ptz?.turn?.isActive || ptz?.turn?.turnsAhead > 0),
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -159,7 +145,7 @@ function TtsControls({
|
|||||||
: voice;
|
: voice;
|
||||||
saveTtsSettings((current) => ({ ...(current || {}), engine: next, voice: nextVoice }));
|
saveTtsSettings((current) => ({ ...(current || {}), engine: next, voice: nextVoice }));
|
||||||
}}
|
}}
|
||||||
className={`${compactSelectClass} w-[5.5rem] shrink`}
|
className={`${compactSelectClass} w-22 shrink`}
|
||||||
>
|
>
|
||||||
<option value="flite">flite</option>
|
<option value="flite">flite</option>
|
||||||
<option value="espeak">espeak</option>
|
<option value="espeak">espeak</option>
|
||||||
@@ -173,7 +159,7 @@ function TtsControls({
|
|||||||
const next = event.target.value;
|
const next = event.target.value;
|
||||||
saveTtsSettings((current) => ({ ...(current || {}), voice: next }));
|
saveTtsSettings((current) => ({ ...(current || {}), voice: next }));
|
||||||
}}
|
}}
|
||||||
className={`${compactSelectClass} w-[3.25rem] shrink`}
|
className={`${compactSelectClass} w-13 shrink`}
|
||||||
>
|
>
|
||||||
{(engine === 'chromegtts' ? CHROME_TTS_VOICES : FLITE_VOICES).map((v) => (
|
{(engine === 'chromegtts' ? CHROME_TTS_VOICES : FLITE_VOICES).map((v) => (
|
||||||
<option key={v} value={v}>
|
<option key={v} value={v}>
|
||||||
@@ -189,7 +175,7 @@ function TtsControls({
|
|||||||
const next = Number(event.target.value);
|
const next = Number(event.target.value);
|
||||||
saveTtsSettings((current) => ({ ...(current || {}), googlePitch: next }));
|
saveTtsSettings((current) => ({ ...(current || {}), googlePitch: next }));
|
||||||
}}
|
}}
|
||||||
className={`${compactSelectClass} w-[5rem] shrink`}
|
className={`${compactSelectClass} w-20 shrink`}
|
||||||
>
|
>
|
||||||
{GOOGLE_TTS_VALUES.map((value) => (
|
{GOOGLE_TTS_VALUES.map((value) => (
|
||||||
<option key={`pitch-${value}`} value={value}>
|
<option key={`pitch-${value}`} value={value}>
|
||||||
@@ -203,7 +189,7 @@ function TtsControls({
|
|||||||
const next = Number(event.target.value);
|
const next = Number(event.target.value);
|
||||||
saveTtsSettings((current) => ({ ...(current || {}), googleSpeed: next }));
|
saveTtsSettings((current) => ({ ...(current || {}), googleSpeed: next }));
|
||||||
}}
|
}}
|
||||||
className={`${compactSelectClass} w-[5rem] shrink`}
|
className={`${compactSelectClass} w-20 shrink`}
|
||||||
>
|
>
|
||||||
{GOOGLE_TTS_VALUES.map((value) => (
|
{GOOGLE_TTS_VALUES.map((value) => (
|
||||||
<option key={`speed-${value}`} value={value}>
|
<option key={`speed-${value}`} value={value}>
|
||||||
@@ -221,7 +207,7 @@ function TtsControls({
|
|||||||
const next = Number(event.target.value);
|
const next = Number(event.target.value);
|
||||||
saveTtsSettings((current) => ({ ...(current || {}), pitch: next }));
|
saveTtsSettings((current) => ({ ...(current || {}), pitch: next }));
|
||||||
}}
|
}}
|
||||||
className={`${compactSelectClass} w-[4.5rem] shrink`}
|
className={`${compactSelectClass} w-18 shrink`}
|
||||||
>
|
>
|
||||||
{ESPEAK_PITCHES.map((p) => (
|
{ESPEAK_PITCHES.map((p) => (
|
||||||
<option key={p} value={p}>
|
<option key={p} value={p}>
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ function StatusRow({ value, tone = 'neutral' }) {
|
|||||||
|
|
||||||
function KeyPill({ label }) {
|
function KeyPill({ label }) {
|
||||||
if (!label) return null;
|
if (!label) return null;
|
||||||
return <span className="rounded border border-white/40 px-1 text-[0.7rem] text-white">{label}</span>;
|
return <span className="rounded-sm border border-white/40 px-1 text-[0.7rem] text-white">{label}</span>;
|
||||||
}
|
}
|
||||||
|
|
||||||
function ActionPill({ label, tone }) {
|
function ActionPill({ label, tone }) {
|
||||||
@@ -186,7 +186,7 @@ export default function DriveDockAction({
|
|||||||
// tapped repeatedly; attach mobile touch suppression directly to the card so
|
// tapped repeatedly; attach mobile touch suppression directly to the card so
|
||||||
// Safari does not select labels or open callouts during those interactions.
|
// Safari does not select labels or open callouts during those interactions.
|
||||||
const baseCardClasses =
|
const baseCardClasses =
|
||||||
'mobile-touch-control flex w-full flex-col gap-0.5 overflow-hidden rounded-xl border-2 px-0.75 py-0.75 text-slate-100 shadow-md transition hover:-translate-y-0.5 hover:shadow-xl focus-visible:outline-none focus-visible:ring-2 disabled:cursor-not-allowed disabled:opacity-60 select-none no-touch-select';
|
'mobile-touch-control flex w-full flex-col gap-0.5 overflow-hidden rounded-xl border-2 px-0.75 py-0.75 text-slate-100 shadow-md transition hover:-translate-y-0.5 hover:shadow-xl focus-visible:outline-hidden focus-visible:ring-2 disabled:cursor-not-allowed disabled:opacity-60 select-none no-touch-select';
|
||||||
const ctaText = 'text-center';
|
const ctaText = 'text-center';
|
||||||
const ctaLayout = 'items-center justify-between';
|
const ctaLayout = 'items-center justify-between';
|
||||||
const compactLayout = 'items-center justify-center';
|
const compactLayout = 'items-center justify-center';
|
||||||
@@ -352,9 +352,9 @@ function StepList({ steps, tone = 'emerald' }) {
|
|||||||
? 'text-amber-200'
|
? 'text-amber-200'
|
||||||
: 'text-indigo-200';
|
: 'text-indigo-200';
|
||||||
return (
|
return (
|
||||||
<div className={`space-y-0.5 rounded border px-0.5 py-0.35 text-left ${container}`}>
|
<div className={`space-y-0.5 rounded-sm border px-0.5 py-0.35 text-left ${container}`}>
|
||||||
{steps.map((step, idx) => (
|
{steps.map((step, idx) => (
|
||||||
<div key={step} className="text-[0.85rem] leading-snug break-words">
|
<div key={step} className="text-[0.85rem] leading-snug wrap-break-word">
|
||||||
<div className="flex items-start">
|
<div className="flex items-start">
|
||||||
<span className={`mr-0 align-top text-[0.75rem] font-semibold ${numberColor}`}>{idx + 1}.</span>
|
<span className={`mr-0 align-top text-[0.75rem] font-semibold ${numberColor}`}>{idx + 1}.</span>
|
||||||
<span className="align-top">{step}</span>
|
<span className="align-top">{step}</span>
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export default function DriverVideo({ layoutFormat = 'desktop' }) {
|
|||||||
<CardFrame hideHeader className="shrink-0">
|
<CardFrame hideHeader className="shrink-0">
|
||||||
{/* The legacy page keeps its existing muted 4:3 frame while sharing
|
{/* The legacy page keeps its existing muted 4:3 frame while sharing
|
||||||
the removal-message behavior with the current video surface. */}
|
the removal-message behavior with the current video surface. */}
|
||||||
<div className="panel-muted aspect-[4/3]">
|
<div className="panel-muted aspect-4/3">
|
||||||
<EmptyDriverVideoNotice />
|
<EmptyDriverVideoNotice />
|
||||||
</div>
|
</div>
|
||||||
</CardFrame>
|
</CardFrame>
|
||||||
@@ -34,7 +34,7 @@ export default function DriverVideo({ layoutFormat = 'desktop' }) {
|
|||||||
return (
|
return (
|
||||||
<CardFrame hideHeader className="shrink-0">
|
<CardFrame hideHeader className="shrink-0">
|
||||||
<div className="flex flex-col gap-0.5">
|
<div className="flex flex-col gap-0.5">
|
||||||
<div className="relative w-full overflow-hidden bg-black aspect-[4/3]">
|
<div className="relative w-full overflow-hidden bg-black aspect-4/3">
|
||||||
<RoverMediaPlayer roverId={roverId} videoMode={videoMode} />
|
<RoverMediaPlayer roverId={roverId} videoMode={videoMode} />
|
||||||
<TurnsOverlay mobileHud={mobileHud} />
|
<TurnsOverlay mobileHud={mobileHud} />
|
||||||
<RoverDescriptionOverlay
|
<RoverDescriptionOverlay
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export default function DuplicateIdentityOverlay() {
|
|||||||
: 'This driver session is already active in another tab.';
|
: 'This driver session is already active in another tab.';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="pointer-events-auto fixed inset-0 z-[2000] flex items-center justify-center bg-black px-0.5 py-0.5 text-slate-100">
|
<div className="pointer-events-auto fixed inset-0 z-2000 flex items-center justify-center bg-black px-0.5 py-0.5 text-slate-100">
|
||||||
<section className="surface w-full max-w-md space-y-0.5 text-center shadow-2xl">
|
<section className="surface w-full max-w-md space-y-0.5 text-center shadow-2xl">
|
||||||
<div className="space-y-0.5">
|
<div className="space-y-0.5">
|
||||||
<h1 className="text-lg font-semibold text-white">Another driver tab is already open</h1>
|
<h1 className="text-lg font-semibold text-white">Another driver tab is already open</h1>
|
||||||
|
|||||||
@@ -24,13 +24,13 @@ export default function FullscreenPrompt({ visible, mode, onEnterFullscreen, onD
|
|||||||
<p className="text-xs border-t border-b border-slate-700 p-0.5 text-blue-300 text-center">This will only show once just to let you know. There is a fullscreen button in the bottom right for later use.</p>
|
<p className="text-xs border-t border-b border-slate-700 p-0.5 text-blue-300 text-center">This will only show once just to let you know. There is a fullscreen button in the bottom right for later use.</p>
|
||||||
|
|
||||||
<div className="flex justify-end gap-0.5 pt-1 text-sm">
|
<div className="flex justify-end gap-0.5 pt-1 text-sm">
|
||||||
<button type="button" className="rounded border border-slate-600 px-3 py-1 text-slate-200" onClick={onDismiss}>
|
<button type="button" className="rounded-sm border border-slate-600 px-3 py-1 text-slate-200" onClick={onDismiss}>
|
||||||
{isIOSMode ? 'Got it' : 'Not now'}
|
{isIOSMode ? 'Got it' : 'Not now'}
|
||||||
</button>
|
</button>
|
||||||
{!isIOSMode && (
|
{!isIOSMode && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="rounded bg-cyan-500 px-3 py-1 font-semibold text-black hover:bg-cyan-400"
|
className="rounded-sm bg-cyan-500 px-3 py-1 font-semibold text-black hover:bg-cyan-400"
|
||||||
onClick={onEnterFullscreen}
|
onClick={onEnterFullscreen}
|
||||||
>
|
>
|
||||||
Enter fullscreen
|
Enter fullscreen
|
||||||
|
|||||||
@@ -131,12 +131,12 @@ export default function GPIOToggleControl({
|
|||||||
{Icon ? <Icon className="shrink-0 text-base" aria-hidden="true" /> : null}
|
{Icon ? <Icon className="shrink-0 text-base" aria-hidden="true" /> : null}
|
||||||
<span className="text-sm font-semibold">{label}</span>
|
<span className="text-sm font-semibold">{label}</span>
|
||||||
{keyLabel ? (
|
{keyLabel ? (
|
||||||
<span className="rounded bg-slate-800 px-1 py-0.5 text-[0.6rem] font-semibold text-slate-200">
|
<span className="rounded-sm bg-slate-800 px-1 py-0.5 text-[0.6rem] font-semibold text-slate-200">
|
||||||
{keyLabel}
|
{keyLabel}
|
||||||
</span>
|
</span>
|
||||||
) : null}
|
) : null}
|
||||||
</span>
|
</span>
|
||||||
<span className={`rounded px-1 py-0.5 text-[0.7rem] font-semibold ${statusClasses}`}>
|
<span className={`rounded-sm px-1 py-0.5 text-[0.7rem] font-semibold ${statusClasses}`}>
|
||||||
{statusLabel}
|
{statusLabel}
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -48,13 +48,13 @@ function actionDriveMode(actionId) {
|
|||||||
|
|
||||||
function CurveField({ label, value, onChange }) {
|
function CurveField({ label, value, onChange }) {
|
||||||
return (
|
return (
|
||||||
<label className="mx-auto block w-full max-w-lg rounded bg-neutral-800/80 px-1.5 py-1">
|
<label className="mx-auto block w-full max-w-lg rounded-sm bg-neutral-800/80 px-1.5 py-1">
|
||||||
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 text-sm text-white">
|
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 text-sm text-white">
|
||||||
<span className="font-semibold">{label}</span>
|
<span className="font-semibold">{label}</span>
|
||||||
<select
|
<select
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(event) => onChange(event.target.value)}
|
onChange={(event) => onChange(event.target.value)}
|
||||||
className="rounded border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
className="rounded-sm border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
||||||
>
|
>
|
||||||
<option value="linear">Linear</option>
|
<option value="linear">Linear</option>
|
||||||
<option value="expo">Fine center control</option>
|
<option value="expo">Fine center control</option>
|
||||||
@@ -78,7 +78,7 @@ function MappingRow({
|
|||||||
// Mapping rows are constrained to a readable width so the source text and buttons remain
|
// Mapping rows are constrained to a readable width so the source text and buttons remain
|
||||||
// visually connected. Buttons wrap on very narrow panes instead of forcing tiny text.
|
// visually connected. Buttons wrap on very narrow panes instead of forcing tiny text.
|
||||||
return (
|
return (
|
||||||
<div className="mx-auto grid w-full max-w-lg grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 rounded bg-neutral-800/80 px-1.5 py-1 text-sm max-[520px]:grid-cols-1">
|
<div className="mx-auto grid w-full max-w-lg grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 rounded-sm bg-neutral-800/80 px-1.5 py-1 text-sm max-[520px]:grid-cols-1">
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<div className="flex items-center gap-1">
|
<div className="flex items-center gap-1">
|
||||||
<p className="font-semibold leading-snug text-white">{action.label}</p>
|
<p className="font-semibold leading-snug text-white">{action.label}</p>
|
||||||
@@ -471,7 +471,7 @@ export default function GamepadMappingSettings() {
|
|||||||
bodyClassName="space-y-2 p-1 text-sm"
|
bodyClassName="space-y-2 p-1 text-sm"
|
||||||
>
|
>
|
||||||
{captureAction && (
|
{captureAction && (
|
||||||
<div className="mx-auto flex w-full max-w-lg items-center justify-between gap-1 rounded bg-emerald-950/50 px-1.5 py-1 text-sm text-white">
|
<div className="mx-auto flex w-full max-w-lg items-center justify-between gap-1 rounded-sm bg-emerald-950/50 px-1.5 py-1 text-sm text-white">
|
||||||
<span>Release controls, then move or press the input for {captureAction.label}.</span>
|
<span>Release controls, then move or press the input for {captureAction.label}.</span>
|
||||||
<button type="button" onClick={() => setCaptureAction(null)} className="button-dark px-1 py-0.5 text-xs">
|
<button type="button" onClick={() => setCaptureAction(null)} className="button-dark px-1 py-0.5 text-xs">
|
||||||
Cancel
|
Cancel
|
||||||
@@ -482,7 +482,7 @@ export default function GamepadMappingSettings() {
|
|||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<SettingsGroupLabel>Connected controller</SettingsGroupLabel>
|
<SettingsGroupLabel>Connected controller</SettingsGroupLabel>
|
||||||
{hubState.error ? (
|
{hubState.error ? (
|
||||||
<p className="mx-auto w-full max-w-lg rounded border border-red-500/60 bg-red-950/40 px-1.5 py-1 text-sm text-white">
|
<p className="mx-auto w-full max-w-lg rounded-sm border border-red-500/60 bg-red-950/40 px-1.5 py-1 text-sm text-white">
|
||||||
Controller access failed: {hubState.error}
|
Controller access failed: {hubState.error}
|
||||||
</p>
|
</p>
|
||||||
) : hubState.pads.length === 0 ? (
|
) : hubState.pads.length === 0 ? (
|
||||||
@@ -492,11 +492,11 @@ export default function GamepadMappingSettings() {
|
|||||||
: 'No controller detected. Connect it, focus this page, then press a button.'}
|
: 'No controller detected. Connect it, focus this page, then press a button.'}
|
||||||
</p>
|
</p>
|
||||||
) : (
|
) : (
|
||||||
<div className="mx-auto grid w-full max-w-lg grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 rounded bg-neutral-800/80 px-1.5 py-1 text-sm max-[420px]:grid-cols-1">
|
<div className="mx-auto grid w-full max-w-lg grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 rounded-sm bg-neutral-800/80 px-1.5 py-1 text-sm max-[420px]:grid-cols-1">
|
||||||
<select
|
<select
|
||||||
value={activePad?.instanceKey ?? ''}
|
value={activePad?.instanceKey ?? ''}
|
||||||
onChange={(event) => setActiveInstanceKey(event.target.value)}
|
onChange={(event) => setActiveInstanceKey(event.target.value)}
|
||||||
className="min-w-0 rounded border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
className="min-w-0 rounded-sm border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
||||||
>
|
>
|
||||||
{hubState.pads.map((pad) => (
|
{hubState.pads.map((pad) => (
|
||||||
<option key={pad.instanceKey} value={pad.instanceKey}>
|
<option key={pad.instanceKey} value={pad.instanceKey}>
|
||||||
@@ -504,7 +504,7 @@ export default function GamepadMappingSettings() {
|
|||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
<span className="rounded bg-neutral-900 px-1 py-0.5 text-xs text-white">
|
<span className="rounded-sm bg-neutral-900 px-1 py-0.5 text-xs text-white">
|
||||||
{activePad?.mapping ?? 'unknown'}
|
{activePad?.mapping ?? 'unknown'}
|
||||||
</span>
|
</span>
|
||||||
<p className="col-span-full truncate text-xs text-slate-300" title={activePad?.id}>
|
<p className="col-span-full truncate text-xs text-slate-300" title={activePad?.id}>
|
||||||
@@ -519,13 +519,13 @@ export default function GamepadMappingSettings() {
|
|||||||
{/* Calibration controls stay in one stacked column because range inputs become harder to
|
{/* Calibration controls stay in one stacked column because range inputs become harder to
|
||||||
tune when squeezed into multiple narrow columns. */}
|
tune when squeezed into multiple narrow columns. */}
|
||||||
<div className="grid gap-1">
|
<div className="grid gap-1">
|
||||||
<label className="mx-auto block w-full max-w-lg rounded bg-neutral-800/80 px-1.5 py-1">
|
<label className="mx-auto block w-full max-w-lg rounded-sm bg-neutral-800/80 px-1.5 py-1">
|
||||||
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 text-sm text-white">
|
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-1.5 text-sm text-white">
|
||||||
<span className="font-semibold">Button prompts</span>
|
<span className="font-semibold">Button prompts</span>
|
||||||
<select
|
<select
|
||||||
value={activeProfile.promptStyle ?? 'auto'}
|
value={activeProfile.promptStyle ?? 'auto'}
|
||||||
onChange={(event) => updateProfile({ promptStyle: event.target.value })}
|
onChange={(event) => updateProfile({ promptStyle: event.target.value })}
|
||||||
className="rounded border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
className="rounded-sm border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
||||||
>
|
>
|
||||||
<option value="auto">Automatic</option>
|
<option value="auto">Automatic</option>
|
||||||
<option value="xbox">Xbox</option>
|
<option value="xbox">Xbox</option>
|
||||||
@@ -536,7 +536,7 @@ export default function GamepadMappingSettings() {
|
|||||||
</div>
|
</div>
|
||||||
<p className="mt-0.5 text-xs leading-snug text-white">Override this only when the browser reports the controller incorrectly.</p>
|
<p className="mt-0.5 text-xs leading-snug text-white">Override this only when the browser reports the controller incorrectly.</p>
|
||||||
</label>
|
</label>
|
||||||
<label className="mx-auto block w-full max-w-lg rounded bg-neutral-800/80 px-1.5 py-1">
|
<label className="mx-auto block w-full max-w-lg rounded-sm bg-neutral-800/80 px-1.5 py-1">
|
||||||
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-start gap-1.5 text-sm text-white">
|
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-start gap-1.5 text-sm text-white">
|
||||||
<span className="min-w-0 font-semibold text-white">Steering mode</span>
|
<span className="min-w-0 font-semibold text-white">Steering mode</span>
|
||||||
<select
|
<select
|
||||||
@@ -545,7 +545,7 @@ export default function GamepadMappingSettings() {
|
|||||||
updateCalibration({ driveMode: event.target.value });
|
updateCalibration({ driveMode: event.target.value });
|
||||||
setCaptureAction(null);
|
setCaptureAction(null);
|
||||||
}}
|
}}
|
||||||
className="rounded border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
className="rounded-sm border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
||||||
>
|
>
|
||||||
<option value="single">Single stick</option>
|
<option value="single">Single stick</option>
|
||||||
<option value="tank">Tank sticks</option>
|
<option value="tank">Tank sticks</option>
|
||||||
@@ -641,7 +641,7 @@ export default function GamepadMappingSettings() {
|
|||||||
onChange={(value) => updateCalibration({ precisionSpeed: value })}
|
onChange={(value) => updateCalibration({ precisionSpeed: value })}
|
||||||
/>
|
/>
|
||||||
{driveMode === 'single' && (
|
{driveMode === 'single' && (
|
||||||
<label className="mx-auto block w-full max-w-lg rounded bg-neutral-800/80 px-1.5 py-1">
|
<label className="mx-auto block w-full max-w-lg rounded-sm bg-neutral-800/80 px-1.5 py-1">
|
||||||
{/* Camera mode is styled like the sliders so calibration controls read as one group
|
{/* Camera mode is styled like the sliders so calibration controls read as one group
|
||||||
even though this specific setting is a select instead of a range input. */}
|
even though this specific setting is a select instead of a range input. */}
|
||||||
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-start gap-1.5 text-sm text-white">
|
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-start gap-1.5 text-sm text-white">
|
||||||
@@ -649,7 +649,7 @@ export default function GamepadMappingSettings() {
|
|||||||
<select
|
<select
|
||||||
value={activeProfile.calibration?.cameraMode ?? 'velocity'}
|
value={activeProfile.calibration?.cameraMode ?? 'velocity'}
|
||||||
onChange={(event) => updateCalibration({ cameraMode: event.target.value })}
|
onChange={(event) => updateCalibration({ cameraMode: event.target.value })}
|
||||||
className="rounded border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
className="rounded-sm border border-neutral-600 bg-neutral-900 px-1 py-0.5 text-sm text-white"
|
||||||
>
|
>
|
||||||
<option value="absolute">Absolute</option>
|
<option value="absolute">Absolute</option>
|
||||||
<option value="velocity">Velocity</option>
|
<option value="velocity">Velocity</option>
|
||||||
@@ -714,7 +714,7 @@ export default function GamepadMappingSettings() {
|
|||||||
{!activePad ? (
|
{!activePad ? (
|
||||||
null
|
null
|
||||||
) : (
|
) : (
|
||||||
<details className="mx-auto w-full max-w-lg rounded bg-neutral-900/70 px-1.5 py-1 text-xs text-white">
|
<details className="mx-auto w-full max-w-lg rounded-sm bg-neutral-900/70 px-1.5 py-1 text-xs text-white">
|
||||||
<summary className="cursor-pointer text-sm font-semibold text-white">Advanced diagnostics</summary>
|
<summary className="cursor-pointer text-sm font-semibold text-white">Advanced diagnostics</summary>
|
||||||
<div className="mt-1 space-y-1">
|
<div className="mt-1 space-y-1">
|
||||||
<p className="text-white">Raw axes</p>
|
<p className="text-white">Raw axes</p>
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ import { NUMBER_FORMAT } from './constants.js';
|
|||||||
|
|
||||||
export default function SliderField({ label, description, min, max, step, value, onChange }) {
|
export default function SliderField({ label, description, min, max, step, value, onChange }) {
|
||||||
return (
|
return (
|
||||||
<label className="mx-auto block w-full max-w-lg rounded bg-neutral-800/80 px-1.5 py-1">
|
<label className="mx-auto block w-full max-w-lg rounded-sm bg-neutral-800/80 px-1.5 py-1">
|
||||||
{/* The formatted value is kept close to the setting name because calibration usually
|
{/* The formatted value is kept close to the setting name because calibration usually
|
||||||
happens by nudging a slider and watching the number, not by reading the full panel row. */}
|
happens by nudging a slider and watching the number, not by reading the full panel row. */}
|
||||||
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-start gap-1.5 text-sm text-white">
|
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-start gap-1.5 text-sm text-white">
|
||||||
<span className="min-w-0 font-semibold text-white">{label}</span>
|
<span className="min-w-0 font-semibold text-white">{label}</span>
|
||||||
<span className="rounded bg-neutral-900 px-1 py-0.5 font-mono text-xs text-white">
|
<span className="rounded-sm bg-neutral-900 px-1 py-0.5 font-mono text-xs text-white">
|
||||||
{NUMBER_FORMAT.format(value)}
|
{NUMBER_FORMAT.format(value)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user