I'm crushing your head!

linuxontheweb · linuxontheweb · commit 3d5db8631f34 · 2025-10-06T13:29:48.000-04:00
diff --git a/apps/Terminal.js b/apps/Terminal.js
@@ -52,6 +52,20 @@ inputs. Also of relevance is the bit @WZZKUDJK that takes the valueOf() of each
 character, which is necessary for password mode chars to return the "real" string rather
 than, e.g. "********".
 » */
+/*10/6/25: Can we put 'IMPORT_COM_LIBS=<...>' into .env? «
+
+The environment logic is in initLibs @SXFHFMG.
+So from there we can look for IMPORT_COM_LIBS, and do auto-loading from there. But just underneath
+that point in initLibs, we have:
+
+if (dev_mode){
+	let rv = await this.ShellMod.util.doImports(ADD_COMS, cwarn);
+}
+
+So this gives us a nice pathway in which to change everything up from an ad-hoc,
+dev-centric workflow to a more systematic one.
+
+»*/
 /*5/6/25: Just put the shell into mods/lang/shell.js.«
 Now need to figure out how to deal with the onreload situation:
 1) In normal REPL mode, we might want to reload the terminal app (this file) or the shell
@@ -2671,29 +2685,31 @@ fmtLinesSync(arr, startx){//«
 }
 //»
 
-async respInit(addMessage){//«
+async initLibs(addMessage){//«
 
 	let init_prompt = `LOTW shell`;
 	if (!Desk.isFake) init_prompt +=`\x20(${this.winid.replace("_","#")})`
 	if (admin_mode){
 		init_prompt+=`\nAdmin mode: true`;
 	}
 	if (addMessage) init_prompt = `${init_prompt}\n${addMessage}`;
+//SXFHFMG
 	let env_file_path = `${this.cur_dir}/.env`; 
 	let env_lines = await env_file_path.toLines();
 	if (env_lines) {
 		let rv = this.ShellMod.util.addToEnv(env_lines, this.env, {if_export: true});
-//		let rv = add_to_env(env_lines, this.env, {if_export: true});
 		if (rv.length){
 			init_prompt+=`\n${env_file_path}:\n`+rv.join("\n");
 		}
+		if (this.env.IMPORT_COM_LIBS) {
+			let add_com_libs = this.env.IMPORT_COM_LIBS.split(",");
+			if (add_com_libs){
+				let rv = await this.ShellMod.util.doImports(add_com_libs, cwarn);
+				if (rv) init_prompt += "\nImported libs: "+rv;
+			}
+		}
 	}
 
-if (dev_mode){
-	let rv = await this.ShellMod.util.doImports(ADD_COMS, cwarn);
-//	let rv = await do_imports(ADD_COMS, cwarn);
-if (rv) init_prompt += "\nImported libs: "+rv;
-}
 	this.response(init_prompt);
 
 }//»
@@ -3725,7 +3741,7 @@ async onappinit(appargs={}){//«
 		this.Win.noKbReload = appargs.noKbReload;
 	}
 	await this.initHistory(termBuffer);
-	await this.respInit(addMessage);
+	await this.initLibs(addMessage);
 	this.didInit = true;
 	this.sleeping = false;
 	this.isFocused = true;
diff --git a/coms/net/fs.js b/coms/net/fs.js
@@ -34,14 +34,14 @@ root: {
 ".read": false,
 ".write": false,
 
-LOTWFS: {
+LOTW_FS: {
 
 	"$ghid": {
-		session_id: {
-			'.validate": "newData.isString() && newData.val().length >= 4"
+		session_ids: { // Register a unique session id  here upon local initialization
+			".validate": "!root.child($ghid).child('session_ids')[newData.val()]"
 		},
-		old_session_ids: {
-			".validate": "!root.child($ghid).child('old_session_ids')[newData.val()]"
+		cur_session_id: {
+			'.validate": "newData.isString() && newData.val().length >= 4"
 		},
 		nodes: {
 			".indexOn" = ["parId", "path"],
@@ -101,6 +101,32 @@ OTHER_NS: {
 }
 
 Also: Let's await on update.
+»*/
+
+/*10/6/25: Persistent session ids«
+
+Let's do persistent 24 bit session ids (4 chars, ~16M  possible). This is instead of
+jumping through all the hoops of constantly changing them. Only upon the first
+usage of the database in a client instance (local database initialization) do
+we need to secure a unique id. We just need to keep a little bit of local
+state, such as an object in e.g. APPDATA_PATH/netfs/sid.
+
+Now we can do these 2 operations in a row, wrapped in a Promise:
+1) get_next_id
+2) increment_next_id
+
+We know that if another session id is set between these 2 steps, then
+increment_next_id won't work, and we won't have any gaps in the ids.
+
+const SESS_ID_BYTE_LEN = 3; // 4 ascii chars long
+const get_sess_id = () => {
+let sess_id = (crypto.getRandomValues(new Uint8Array(SESS_ID_BYTE_LEN))).toBase64()
+		.replace(/\+/g, '-')
+		.replace(/\x2f/g, '_')
+		.replace(/=+$/, '');
+	return sess_id;
+};
+
 »*/
 /*10/5/25: Session ids«
 Let's get a crypto-secure 24bit value as Base64 (4 ascii characters), and call set_session
@@ -274,23 +300,12 @@ coms/fs.js (for file moving, copying, etc).
 const{globals}=LOTW;
 const {fsMod: fs, fbase}=globals;
 const {USERS_TYPE, APPDATA_PATH} = globals.fs;
+const {config: firebaseConfig} = globals.firebase;
 const {Com} = globals.ShellMod.comClasses;
 const{mkdv, mk, isArr,isStr,isEOF,isErr,log,jlog,cwarn,cerr}=LOTW.api.util;
 const{root, mount_tree}=fs;
 const {fs: fsapi}=LOTW.api;
 //const {popup} = globals.popup;
-
-//Firebase«
-const firebaseConfig = {
-	apiKey: "AIzaSyCEEMw3b1_bWj-OxM9oMKlKhkTTWxbIhlI",
-	authDomain: "linuxontheweb.firebaseapp.com",
-	databaseURL: "https://linuxontheweb.firebaseio.com",
-	projectId: "linuxontheweb",
-	storageBucket: "linuxontheweb.firebasestorage.app",
-	messagingSenderId: "668423415088",
-	appId: "1:668423415088:web:979b40c704cab2322ed4f5"
-};
-//»
 //Database
 
 import {initializeApp} from "firebase_app";
@@ -321,7 +336,6 @@ increment,
 enableLogging
 } from "firebase_database";
 
-
 //»
 
 //Var«
@@ -1834,6 +1848,9 @@ export {coms, onkill};
 
 //»
 
+cwarn("Firebase config");
+log(firebaseConfig);
+
 /*«
 goog_but.onclick=async()=>{//«
 	is_active = true;
@@ -1867,3 +1884,14 @@ goog_but.onclick=async()=>{//«
 </button>
 <br><br>
 »*/
+/*«
+const firebaseConfig = {
+	apiKey: "AIzaSyCEEMw3b1_bWj-OxM9oMKlKhkTTWxbIhlI",
+	authDomain: "linuxontheweb.firebaseapp.com",
+	databaseURL: "https://linuxontheweb.firebaseio.com",
+	projectId: "linuxontheweb",
+	storageBucket: "linuxontheweb.firebasestorage.app",
+	messagingSenderId: "668423415088",
+	appId: "1:668423415088:web:979b40c704cab2322ed4f5"
+};
+»*/
diff --git a/list.json b/list.json
@@ -1 +1 @@
-["README.md/2181","app",["3d",["index.html/1098"]],"apps",["Audio.js/4093","BinView.js/9814","Folder.js/11255","Help.js/979","MediaPlayer.js/2074","Music.js/4844","Terminal.js/100352","TextEdit.js/5301","WorkMan.js/3808","YourApp.js/418","dev",["GetPoint.js/551","Grok.js/14796","Poker.js/36551","Three.js/5119"],"games",["Arcade.js/12602"],"hw",["MidiCtl.js/3691"],"media",["2Cameras.js/3258","Camera.js/3673","MediaPlayer.js/16115","VideoCutter.js/61912"],"template",["Basic.js/489","Template.js/396","WebAudio.js/2877"],"util",["HTML.js/1428","ImageView.js/2703","Unicoder.js/16896"]],"coms",["audio.js/1766","esprima.js/171872","extra.js/11295","fs.js/28722","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/43978"],"shell.js/175037","template.js/336","test",["dummy.js/21"],"test.js/2026","yt.js/66863","zhold",["mail.js/22724"]],"desk",["index.html/1436"],"index.html/486","login",["index.html/11711"],"mods",["audio",["multi_freq_worklet.js/1502","random_walk_worklet.js/3039"],"games",["GBEmulator.js/9655","NESEmulator.js/222309","binjgb.wasm/87232"],"help",["shell.js/3591"],"hw",["midi.js/2323"],"lang",["shell.js/185316"],"term",["email.js/10406","less.js/19318","log.js/13292","vim.js/162926"],"util",["libwabt.js/1299054","math.js/12125","pretty.js/93856","showdown.js/87205","walt.js/204893","wasm.js/42764","wasmparser.js/34331","webmparser.js/58730"],"workers",["poker.js/37420"]],"node",["server.js/7969","svcs",["imap.js/17772","mount.js/16553","smtp.js/1359","template.js/1831","ws.js/2156","ytdl.js/11982"]],"shell",["index.html/1211"],"sys",["config.js/9501","desk.js/219678","fs.js/72746","terminal.js/4307","three.js/3443","util.js/33015"],"www",["blog.css/181","desk.css/1831","docs",["blog-template.html/291","help.html/9104","what-it-is.html/4370"],"examples",["test.sh/66"],"favicon.ico/15086","lotw256.png/41075","lotw48.png/2966","stuff",["noise.html/1669"]]]
+["README.md/2181","app",["3d",["index.html/1098"]],"apps",["Audio.js/4093","BinView.js/9814","Folder.js/11255","Help.js/979","MediaPlayer.js/2074","Music.js/4844","Terminal.js/100824","TextEdit.js/5301","WorkMan.js/3808","YourApp.js/418","dev",["GetPoint.js/551","Grok.js/14796","Poker.js/36551","Three.js/5119"],"games",["Arcade.js/12602"],"hw",["MidiCtl.js/3691"],"media",["2Cameras.js/3258","Camera.js/3673","MediaPlayer.js/16115","VideoCutter.js/61912"],"template",["Basic.js/489","Template.js/396","WebAudio.js/2877"],"util",["HTML.js/1428","ImageView.js/2703","Unicoder.js/16896"]],"coms",["audio.js/1766","esprima.js/171872","extra.js/11295","fs.js/28722","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/45041"],"shell.js/175037","template.js/336","test",["dummy.js/21"],"test.js/2026","yt.js/66863","zhold",["mail.js/22724"]],"desk",["index.html/1436"],"index.html/486","login",["index.html/11711"],"mods",["audio",["multi_freq_worklet.js/1502","random_walk_worklet.js/3039"],"games",["GBEmulator.js/9655","NESEmulator.js/222309","binjgb.wasm/87232"],"help",["shell.js/3591"],"hw",["midi.js/2323"],"lang",["shell.js/185316"],"term",["email.js/10406","less.js/19318","log.js/13292","vim.js/162926"],"util",["libwabt.js/1299054","math.js/12125","pretty.js/93856","showdown.js/87205","walt.js/204893","wasm.js/42764","wasmparser.js/34331","webmparser.js/58730"],"workers",["poker.js/37420"]],"node",["server.js/7969","svcs",["imap.js/17772","mount.js/16553","smtp.js/1359","template.js/1831","ws.js/2156","ytdl.js/11982"]],"shell",["index.html/1211"],"sys",["config.js/9931","desk.js/219678","fs.js/72746","terminal.js/4307","three.js/3443","util.js/33015"],"www",["blog.css/181","desk.css/1831","docs",["blog-template.html/291","help.html/9104","what-it-is.html/4370"],"examples",["test.sh/66"],"favicon.ico/15086","lotw256.png/41075","lotw48.png/2966","stuff",["noise.html/1669"]]]
diff --git a/sys/config.js b/sys/config.js
@@ -430,6 +430,17 @@ const VIM_MODES={
 	REF_MODE: 12,
 };
 //»
+//Firebase«
+const FIREBASE_CONFIG = {
+    apiKey: "AIzaSyCEEMw3b1_bWj-OxM9oMKlKhkTTWxbIhlI",
+    authDomain: "linuxontheweb.firebaseapp.com",
+    databaseURL: "https://linuxontheweb.firebaseio.com",
+    projectId: "linuxontheweb",
+    storageBucket: "linuxontheweb.firebasestorage.app",
+    messagingSenderId: "668423415088",
+    appId: "1:668423415088:web:979b40c704cab2322ed4f5"
+};
+//»
 export const globals = {//«
 	workers:{
 //		faust: new Worker("/wasm/faust.js"),
@@ -473,6 +484,9 @@ css:{
 	},
 	BEWARE_RED,
 },
+firebase: {
+	config: FIREBASE_CONFIG
+},
 fs: {
 	FS_PREF,
 	FS_TYPE,

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-["README.md/2181","app",["3d",["index.html/1098"]],"apps",["Audio.js/4093","BinView.js/9814","Folder.js/11255","Help.js/979","MediaPlayer.js/2074","Music.js/4844","Terminal.js/100352","TextEdit.js/5301","WorkMan.js/3808","YourApp.js/418","dev",["GetPoint.js/551","Grok.js/14796","Poker.js/36551","Three.js/5119"],"games",["Arcade.js/12602"],"hw",["MidiCtl.js/3691"],"media",["2Cameras.js/3258","Camera.js/3673","MediaPlayer.js/16115","VideoCutter.js/61912"],"template",["Basic.js/489","Template.js/396","WebAudio.js/2877"],"util",["HTML.js/1428","ImageView.js/2703","Unicoder.js/16896"]],"coms",["audio.js/1766","esprima.js/171872","extra.js/11295","fs.js/28722","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/43978"],"shell.js/175037","template.js/336","test",["dummy.js/21"],"test.js/2026","yt.js/66863","zhold",["mail.js/22724"]],"desk",["index.html/1436"],"index.html/486","login",["index.html/11711"],"mods",["audio",["multi_freq_worklet.js/1502","random_walk_worklet.js/3039"],"games",["GBEmulator.js/9655","NESEmulator.js/222309","binjgb.wasm/87232"],"help",["shell.js/3591"],"hw",["midi.js/2323"],"lang",["shell.js/185316"],"term",["email.js/10406","less.js/19318","log.js/13292","vim.js/162926"],"util",["libwabt.js/1299054","math.js/12125","pretty.js/93856","showdown.js/87205","walt.js/204893","wasm.js/42764","wasmparser.js/34331","webmparser.js/58730"],"workers",["poker.js/37420"]],"node",["server.js/7969","svcs",["imap.js/17772","mount.js/16553","smtp.js/1359","template.js/1831","ws.js/2156","ytdl.js/11982"]],"shell",["index.html/1211"],"sys",["config.js/9501","desk.js/219678","fs.js/72746","terminal.js/4307","three.js/3443","util.js/33015"],"www",["blog.css/181","desk.css/1831","docs",["blog-template.html/291","help.html/9104","what-it-is.html/4370"],"examples",["test.sh/66"],"favicon.ico/15086","lotw256.png/41075","lotw48.png/2966","stuff",["noise.html/1669"]]]
	`1`	+["README.md/2181","app",["3d",["index.html/1098"]],"apps",["Audio.js/4093","BinView.js/9814","Folder.js/11255","Help.js/979","MediaPlayer.js/2074","Music.js/4844","Terminal.js/100824","TextEdit.js/5301","WorkMan.js/3808","YourApp.js/418","dev",["GetPoint.js/551","Grok.js/14796","Poker.js/36551","Three.js/5119"],"games",["Arcade.js/12602"],"hw",["MidiCtl.js/3691"],"media",["2Cameras.js/3258","Camera.js/3673","MediaPlayer.js/16115","VideoCutter.js/61912"],"template",["Basic.js/489","Template.js/396","WebAudio.js/2877"],"util",["HTML.js/1428","ImageView.js/2703","Unicoder.js/16896"]],"coms",["audio.js/1766","esprima.js/171872","extra.js/11295","fs.js/28722","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/45041"],"shell.js/175037","template.js/336","test",["dummy.js/21"],"test.js/2026","yt.js/66863","zhold",["mail.js/22724"]],"desk",["index.html/1436"],"index.html/486","login",["index.html/11711"],"mods",["audio",["multi_freq_worklet.js/1502","random_walk_worklet.js/3039"],"games",["GBEmulator.js/9655","NESEmulator.js/222309","binjgb.wasm/87232"],"help",["shell.js/3591"],"hw",["midi.js/2323"],"lang",["shell.js/185316"],"term",["email.js/10406","less.js/19318","log.js/13292","vim.js/162926"],"util",["libwabt.js/1299054","math.js/12125","pretty.js/93856","showdown.js/87205","walt.js/204893","wasm.js/42764","wasmparser.js/34331","webmparser.js/58730"],"workers",["poker.js/37420"]],"node",["server.js/7969","svcs",["imap.js/17772","mount.js/16553","smtp.js/1359","template.js/1831","ws.js/2156","ytdl.js/11982"]],"shell",["index.html/1211"],"sys",["config.js/9931","desk.js/219678","fs.js/72746","terminal.js/4307","three.js/3443","util.js/33015"],"www",["blog.css/181","desk.css/1831","docs",["blog-template.html/291","help.html/9104","what-it-is.html/4370"],"examples",["test.sh/66"],"favicon.ico/15086","lotw256.png/41075","lotw48.png/2966","stuff",["noise.html/1669"]]]