misc

app.js

@@ -1,133 +1,36 @@
 import * as FSHandle from "./store-directory-handle.js";
 
 
-const Rooms = {};
+
 async function getFolderHandle(dirHandle) {
   try {
-
+    globalThis.FOLDER = await dirHandle.getDirectoryHandle("room");
-    const roomsFolder = await dirHandle.getDirectoryHandle("room");
+    return true;
-    if(roomsFolder)
-    {
-      for await (const [_, roomFolder] of roomsFolder.entries())
-      {
-        if(roomFolder.kind == "directory")
-        {
-          const roomMetaFile = await roomFolder.getFileHandle("room.js");
-          if(roomMetaFile)
-          {
-            let metaData = {};
-            //try
-            //{
-            //  metaData = await roomMetaFile.getFile().then(d=>d.text()).then(t=>JSON.parse(t));
-            //}
-            //catch (e)
-            //{
-            //  console.warn(`Couldn't parse room meta:  ${roomFolder.name} / ${roomMetaFile.name}`, e);
-            //}
-
-            const roomObj =
-            {
-              meta: metaData,
-              pass: {},
-              live: false,
-              async load()
-              {
-                if(this.live) return;
-                for await (const [_, passFolder] of roomFolder.entries())
-                {
-                  if(passFolder.kind == "directory")
-                  {
-                    const passMeta = await passFolder.getFileHandle("_pass_meta.json");
-                    if(passMeta)
-                    {
-
-                      let metaData = {};
-                      try
-                      {
-                        metaData = await passMeta.getFile().then(d=>d.text()).then(t=>JSON.parse(t));
-                      }
-                      catch (e)
-                      {
-                        console.warn(`Couldn't parse pass meta:  ${roomFolder.name} / ${passFolder.name} / ${passMeta.name}`, e);
-                      }
-
-                      const passObj = [
-                        metaData,
-                        {}
-                      ]
-                      roomObj.pass[passFolder.name] = passObj;
-
-                      for await (const [_, userFile] of passFolder.entries())
-                      {
-                        if(userFile.name.endsWith(".json") && userFile.name != "_pass_meta.json")
-                        {
-                          const userID = userFile.name.substring(0, userFile.name.length-5)
-                          try
-                          {
-                            passObj[1][userID] = await userFile.getFile().then(d=>d.text()).then(t=>JSON.parse(t));
-                          }
-                          catch (e)
-                          {
-                            console.warn(`Couldn't parse user data:  ${roomFolder.name} / ${passFolder.name} / ${userFile.name}`, e);
-                          }
-
-                        }
-                      }
-                    }
-                  }
-                }
-                this.live = true;
-                
-                globalThis.Pass = this.pass;
-                
-                if (navigator.serviceWorker.controller)
-                {
-                  navigator.serviceWorker.controller.postMessage(this.pass);
-                }
-
-
-                //await import(`./room/${roomFolder.name}/room.js`);
-
-              },
-              async dump()
-              {
-                this.live = false;
-                this.pass = {};
-              }
-            };
-
-            Rooms[roomFolder.name] = roomObj;
-
-          }
-
-
-        }
-      }
-    }
-    console.log("Rooms:", Rooms);
-
   } catch (err) {
     console.error("Folder selection cancelled or failed:", err);
+    return false;
   }
 }
 
 const d =(...args)=> document.createElement(...args);
 
 let handle = false;
+let valid = false;
 handle = await FSHandle.getDirectoryHandle();
+console.log("handle:", handle);
 if(handle)
 {
-  await getFolderHandle(handle);
+  valid = await getFolderHandle(handle);
 }
 
 const button = d("button");
-button.innerText = handle ? "change directory" : "select directory";
+button.innerText = valid ? "change directory" : "select directory";
 button.addEventListener("click", async()=>{
   const directory = await globalThis.showDirectoryPicker();
   await FSHandle.setDirectoryHandle(directory);
   await getFolderHandle(directory);
   console.log("about to spoof user filesystem as remote...");
-  const module = await import("./room/room_01/room.js");
+  const module = await import("./data/room.js");
   console.log("module loaded", module);
   button.innerText = "change directory"
 });

data/room.js

@@ -0,0 +1,27 @@
+import {Graph} from "../graph.js";
+import User from "./user.js";
+
+Graph(
+    {
+        room_01:{
+            user:User,
+            role:
+            {
+                dev:["Development", "u1"]
+            },
+            part:
+            {
+                "a nice room": "yep!",
+                p1:"hey",
+                p2:"sup"
+            },
+            desk:
+            {
+                d1:["Desk 01", ["dev"], "all", {p2:3}, "p1"]
+            },
+            pass:{
+                pass_01:["pass 01"]
+            }
+        }
+    }
+);

graph.js

@@ -80,48 +80,92 @@ export default function Builder({user, role, part, desk, pass})
     }
 
 // Apply passes
-    for(let passID in pass)
-    {
-        const [name, users] = pass[passID];
-        /** @type {TYPES.Pass} */
-        const passObj = {name, path:passID};
-        
-        for(let userID in users)
-        {
-            const userPart = users[userID];
-            const user = UserList[userID];
-            for(let partID in userPart)
-            {
-                const part = PartList[partID];
-                const entries = userPart[partID];
-                entries.forEach(([time, data]) => {
-                    /** @type {TYPES.Work} */
-                    const work = [user, time, data];
 
-                    let partPass = part.pass.get(passObj);
+//   for(let passID in pass)
-                    if(!partPass)
+//   {
-                    {
+//       const [name, users] = pass[passID];
-                        partPass = {time:0, work:[]}
+//       /** @type {TYPES.Pass} */
-                        part.pass.set(passObj, partPass);
+//       const passObj = {name, path:passID};
-                    }
+//       
-                    partPass.work.push(work);
+//       for(let userID in users)
-                    if(partPass.time < time)
+//       {
-                    {
+//           const userPart = users[userID];
-                        partPass.time = time;
+//           const user = UserList[userID];
-                    }      
+//           for(let partID in userPart)
-                });
+//           {
-            }
+//               const part = PartList[partID];
-        }
+//               const entries = userPart[partID];
-    }
+//               entries.forEach(([time, data]) => {
+//                   /** @type {TYPES.Work} */
+//                   const work = [user, time, data];
+//
+//                   let partPass = part.pass.get(passObj);
+//                   if(!partPass)
+//                   {
+//                       partPass = {time:0, work:[]}
+//                       part.pass.set(passObj, partPass);
+//                   }
+//                   partPass.work.push(work);
+//                   if(partPass.time < time)
+//                   {
+//                       partPass.time = time;
+//                   }      
+//               });
+//           }
+//       }
+//   }
 
     console.log(user, part, desk);
 }
 
-/** @type {TYPES.GraphLoader} */
+/** @type {TYPES.MassDscription} */
-export function Loader(params)
+export function Graph(params)
-{
+{   
-    params.pass = globalThis.Pass;
+    Object.entries(params).forEach(([roomFolderName, roomData])=>
-    Builder(params);
+    {
+        Object.entries(roomData.pass).forEach(([passFolderName, passData])=>{
+            const RebuiltPass = {
+                async load(){
+
+                    const roomFolder = await globalThis.FOLDER.getDirectoryHandle(roomFolderName);
+                    const passFolder = await roomFolder.getDirectoryHandle(passFolderName);
+
+                    console.log(passFolder);
+
+                    for await (const [_, userFile] of passFolder.entries())
+                    {
+                        if(userFile.name.endsWith(".json"))
+                        {
+                            const userID = userFile.name.substring(0, userFile.name.length-5)
+                            try
+                            {
+                                /** @type {Record<string, Array<[time:number, data:string]>>} */
+                                const loadedData = await userFile.getFile().then(d=>d.text()).then(t=>JSON.parse(t));
+
+                                Object.entries(loadedData).forEach(([partID, payload])=>{
+                                    const part = roomData.part[partID]
+                                    payload = [...payload, roomData.user[userID]]
+                                })
+                            }
+                            catch (e)
+                            {
+                                console.warn(`Couldn't parse user data:  ${roomFolder.name} / ${passFolder.name} / ${userFile.name}`, e);
+                            }
+                        }
+                    }
+                    this.live = true;
+                },
+                dump(){
+                    this.data = {};
+                    this.live = false;
+                },
+                live:false
+            }
+            roomData.pass[passFolderName] = RebuiltPass;
+        })
+    });
+    globalThis.ROOMS = params;
+    console.log(globalThis.ROOMS);
 }
 
 const Scan =(desk)=>

room/room_01/pass_01/u2.json

@@ -0,0 +1,8 @@
+{
+    "p2":
+    [
+        [123, "data"],
+        [456, "more data"],
+        [789, "even more data"]
+    ]
+}

room/room_01/pass_01/u3.json

@@ -0,0 +1,8 @@
+{
+    "p1":
+    [
+        [123, "data"],
+        [456, "more data"],
+        [789, "even more data"]
+    ]
+}

room/room_01/room.js

@@ -1,23 +0,0 @@
-console.log("CUSTOM ROOM IMPORTED", import.meta.resolve("./"))
-                      
-import {Loader} from "../../graph.js";
-import User from "../../data/users.js";
-
-Loader({
-    user:User,
-    role:
-    {
-        dev:["Development", "u1"]
-    },
-    part:
-    {
-        p1:"hey",
-        p2:"sup"
-    },
-    desk:
-    {
-        d1:["Desk 01", ["dev"], "all", {p2:3}, "p1"]
-    }
-});
-
-console.log("Graph loaded !!");

types.ts

@@ -67,4 +67,26 @@ export type Role = {name:string, user:User[]};
 export type Desk = {name:string, need:Part[], time:number[], make:Part[], mode:string, role:Role[]};
 export type Work = [user:User, time:number, data:string];
 export type Pass = {name:string, path:string};
-export type Part = {name:string, pass:Map<Pass, {time:number, work:Work[]}>, need:Desk[], make:Desk[]};
+export type Part = {name:string, pass:Map<Pass, {time:number, work:Work[]}>, need:Desk[], make:Desk[]};
+
+
+type MassRoomMeta = {name:string}
+type MassPassMeta = [name:string]
+export type MassDscription=
+<
+    Users extends Record<string, string>,
+    Roles extends Record<string, [ name:string, ...users:Array<keyof Users>]>,
+    Parts extends Record<string, string>,
+    Desks extends Record<string, [ name:string, roles:Array<keyof Roles>, mode:"all"|"one", need:Partial<Record<keyof Parts, number>>, ...make:Array<keyof Parts>]>,
+>
+(
+    params:Record<string, {
+        meta?:MassRoomMeta,
+        user:Users,
+        role:Roles,
+        part:Parts,
+        desk:Desks,
+        pass:Record<string, MassPassMeta>,
+    }>
+)
+=>void