I'm crushing your head!

Author: linuxontheweb

coms/net/fs.js

@@ -123,14 +123,27 @@ MOST RECENT:
 
 Also: Let's await on update.
 »*/
-/*10/16/25: Put 'status' back into the db.
+
+/*10/17/25: Need to export a try_get_kid sort of function so that path_to_node in sys/fs.js
+can do the same type of path resolution mechanism as for FS_TYPE nodes.
+
+- getUsersNodeByNameAndPar
+
+So now we should be able to resolve multi-path paths (e.g. /users/guyhar123/dir1/dir2/dir3/dir4/file.txt) 
+by querying only for the nodes of the constituent directories in the path (dir1, dir2, dir3, dir4), 
+rather than for their full listings.
+
+We might eventually do a lookup map that associates paths with their node ids.
+
+*/
+/*10/16/25: Put 'status' back into the db.«
 
 Now we should integrate everything from 2 days ago with:
 	- the github login name fetching/storing (use this in the constructor of NetFsDB)
 	- Set the initial status update along with setting everything else (msg: "hi", time: serverTimestamp())
 	- Mount the users directory with the same logic as before (query for most recent status updates)
 
-*/
+»*/
 /*10/15/25: How to discover other user's home directories?«
 
 - Reimplement the (~100 char) status thing, like before?
@@ -699,7 +712,7 @@ await UPDATE(UBASE(), obj);
 return sz;
 
 }//»
-async getDirList(ghid, parId){
+async getDirList(ghid, parId){/*«*/
 let ref = REF(`LOTW/${ghid}/nodes`);
 let c1 = orderByChild('parId');
 let c2 = equalTo(parId);
@@ -715,7 +728,8 @@ return [];
 }
 return snap.val();
 
-}
+}/*»*/
+
 }//»
 
 //Funcs«
@@ -745,11 +759,15 @@ const REF = (path)=> {//«
 //	if (path) return ref(fbase_db, path);
 //	return ref(db);
 };//»
-const GET = async(ref_or_path)=>{//«
-
-if (isStr(ref_or_path)) ref_or_path = ref(fbase_db, ref_or_path);
+const GET = async(arg)=>{//«
+/*arg might be:
+- a string (implicitly means convert it to a ref)
+- a ref
+- a query (which is a reference together with a list of constraints)
+*/
+if (isStr(arg)) arg = ref(fbase_db, arg);
 try {
-	return await get(ref_or_path);
+	return await get(arg);
 }
 catch(e){
 	return e;
@@ -832,10 +850,11 @@ const get_statuses=async(opts={minsAgo: DEF_STATS_MINS_AGO, numRecent: DEF_STATS
 
 	let start_time = new Date().getTime() - (mins_ago * 60000);
 	let c1 = orderByChild('time');
-	let c2 = startAt(start_time);
+//	let c2 = startAt(start_time);
 	let c3 = limitToLast(num_recent_stats);
 	let ref = REF("LOTW/status");
-	let q = query(ref, c1, c2, c3);
+	let q = query(ref, c1, c3);
+//	let q = query(ref, c1, c2, c3);
 	let snap = await GET(q);
 	if (isErr(snap)){
 		return snap;
@@ -883,24 +902,44 @@ let rv = await db.getDirList(ghid, parseInt(parId));
 let keys = Object.keys(rv);
 let names = [];
 let vals = [];
-
+let blobIds = [];
 for (let k of keys){
 	let obj = rv[k];
 	let name = obj.path.split("/")[1];
 	let val;
 	if (obj.type==="d") val = -1;
 	else val = 0;
+	blobIds.push(obj.blobId);
 	names.push(name);
 	vals.push(val);
 }
 return {
 	names: names,
 	vals: vals,
-	ids: keys
+	ids: keys,
+	blobIds
 }; 
 
 };//»
 globals.funcs["netfs.getUserDirList"] = get_user_dir_list;
+
+//const fb_read = async(ghid, parid, name, opts={}) => {
+const fb_read = async(ghid, blobId, opts={}) => {
+//cwarn(`READ(${ghid}): ${parid}/${name}`);
+//log("OPTS", opts);
+//log(`GET: /LOTW/${ghid}/blobs/${blobId}`);
+
+	let rv = await GET(`LOTW/${ghid}/blobs/${blobId}`);
+	if (isErr(rv)) return;
+	let bytes = FROMB64(rv.val().contents);
+	if (opts.forceText) {
+		return new TextDecoder().decode(bytes);
+	}
+	return bytes;
+
+};
+
+globals.funcs["netfs.fbRead"] = fb_read;
 const fb_write = async(path, val, opts={})=> {//«
 //This must be a fullpath
 cwarn(`WRITE(${path})`);
@@ -1109,9 +1148,53 @@ cwarn(`MKDIR: <${parpath}> <${name}>`);
 return await db.createDirNode(parseInt(parId), name);
 
 
-};/*»*/
+};//»
 globals.funcs["netfs.fbMkdir"] = fb_mkdir;
 
+const fb_get_users_node_by_name_and_par = async (name, parnode) => {//«
+// parnode.appData was undefined after mkDir
+//cwarn('PARNODE');
+//log(parnode);
+let ghid = parnode.appData.id;
+let pathname = `${parnode.id}/${name}`;
+log(`GET USER(${ghid}): ${pathname}`);
+let q = query(REF(`/LOTW/${ghid}/nodes`), orderByChild('path'), equalTo(pathname), limitToFirst(1));
+let rv = await GET(q);
+if (isErr(rv)){
+cerr(rv);
+return;
+}
+if (!rv.exists()){
+cwarn("NOT FOUND");
+return;
+}
+let val = rv.val();
+let keys = Object.keys(val);
+if (keys.length !== 1){
+cerr(`HOW MANY KEYS, wanted 1, but got: ${keys.length}! Here is the object:`);
+log(val);
+return;
+}
+let id = keys[0];
+let node = val[id];
+//log();
+//let name = node.path.split("/")[1];
+let typ;
+if (node.type==="d") typ = -1;
+else typ = 0;
+return {
+	blobId: node.blobId,
+	id,
+	name,
+	val: typ
+};
+
+};//»
+globals.funcs["netfs.getUsersNodeByNameAndPar"] = fb_get_users_node_by_name_and_par;
+
+
+
+
 //»
 
 //Commands«

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/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/28820","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/66230"],"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/11784"],"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/9942","desk.js/219761","fs.js/73016","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/28820","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/68363"],"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/11784"],"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/9942","desk.js/219761","fs.js/74143","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"]]]