meshcore
-
+
+
@@ -612,6 +627,9 @@ function boot(){
$("#h-sub").textContent=s.role+" · "+s.fw+" · "+s.board;
var b=$("#h-badge");b.classList.remove("hide");
if(s.mode==="setup"){b.textContent="SETUP";b.classList.add("setup")}else{b.textContent="LAN"}
+ // Only in setup mode: in LAN mode the console is a tab, and the header is
+ // also on screen before login, where no shortcut into it belongs.
+ $("#h-console").classList.toggle("hide",s.mode!=="setup");
return api("/api/presets").catch(function(){return{presets:[]}});
}).then(function(p){
st.presets=p.presets||[];
@@ -623,7 +641,9 @@ function boot(){
});
}
-function show(v){["#v-login","#v-wizard","#v-app"].forEach(function(id){$(id).classList.add("hide")});$(v).classList.remove("hide");updateSaveBar()}
+function show(v){["#v-login","#v-wizard","#v-app"].forEach(function(id){$(id).classList.add("hide")});$(v).classList.remove("hide");
+ document.body.classList.remove("tab-cli"); // re-armed by the tab click when the CLI is the one shown
+ updateSaveBar()}
function showLogin(){show("#v-login")}
/* ---------- login ---------- */
@@ -1066,13 +1086,17 @@ function loadConfigSoft(){ // re-sync accepted values without clobbering chips/r
/* ---------- tabs / app ---------- */
function enterApp(){
show("#v-app");
- // Setup mode authenticates by proximity — there is no admin password yet. The
- // form batch is allowlisted (WebConfigKeys.h) so that is safe there, but the
- // CLI is the entire command surface, `erase` and `set prv.key` included, so
- // it stays behind a real login.
- $('#tabs button[data-t="cli"]').classList.toggle("hide",st.mode==="setup");
loadConfig().catch(function(e){if(e.message!=="auth")toast("Failed to load config")});
}
+// Setup-mode shortcut: straight past the guided steps into the terminal, for
+// operators who already have a config to paste. Setup mode authenticates by
+// proximity to the AP, so this hands the whole command surface to anyone in
+// range — the same trust the wizard already extends, since it can set the admin
+// password and reflash the node's identity too.
+function enterConsole(){
+ enterApp();
+ $('#tabs button[data-t="cli"]').click();
+}
$("#tabs").addEventListener("click",function(ev){
var b=ev.target.closest("button");if(!b)return;
$$("#tabs button").forEach(function(x){x.classList.toggle("on",x===b)});
@@ -1542,7 +1566,7 @@ var CLI_SLOT=[
];
var CLI_TYPES="req,response,txt_msg,ack,advert,grp_txt,grp_data,anon_req,path,trace,multipart,control,raw_custom".split(",");
-var cli={built:0,tbl:[],hist:[],hix:-1,draft:"",sug:[],sel:-1,busy:false,shown:false};
+var cli={built:0,tbl:[],hist:[],hix:-1,draft:"",sug:[],sel:-1,busy:false,shown:false,pwd:false};
// Rebuilt when the slot count changes: `active_slots` decides how many
// mqttN.* keys actually exist on this board.
@@ -1596,6 +1620,13 @@ function cliGap(){var d=cliEcho("gap","");return d}
function cliClear(){$("#term-out").innerHTML="";cliBanner();$("#term-in").focus()}
function cliBanner(){
cliEcho("sys","MeshCore · "+($("#h-sub").textContent||""));
+ if(st.mode==="setup"){
+ // The wizard refuses to finish without an admin password; nothing stops a
+ // console-driven setup from rebooting on the factory one, so say so here
+ // rather than only warning at the point of reboot.
+ cliEcho("sys","Setup mode — paste a prepared config, then finish with "+
+ "\"password