fetch bad :(

This commit is contained in:
Seth Trowbridge 2025-10-31 22:55:47 -04:00
parent 6005e6566e
commit 32ea38177e
5 changed files with 97 additions and 24 deletions

41
app.js
View File

@ -29,7 +29,7 @@ async function LoadHandleFiles()
{ {
try try
{ {
const module = await import("./data/room.js"+"?rand="+Math.random()); const module = await import("./fsx/data/room.js"+"");
/** @type {Record<string, TYPES.GraphParts>} */ /** @type {Record<string, TYPES.GraphParts>} */
const read = module.default(); const read = module.default();
rooms.val = read; rooms.val = read;
@ -39,11 +39,41 @@ async function LoadHandleFiles()
rooms.val = {}; rooms.val = {};
} }
} }
/** @type {Van.State<Record<string, TYPES.GraphParts>>} */ /** @type {Van.State<Record<string, TYPES.GraphParts>>} */
const rooms = van.state({}); const rooms = van.state({});
let handle = await FSHandle.getDirectoryHandle(); let handle = await FSHandle.getDirectoryHandle();
await LoadHandleFiles(); await LoadHandleFiles();
/** @type {(path:string[], part:string, time:number, data:string)=>void} */
async function WRITE(path, part, time, data)
{
const fileHandle = await FSHandle.drilldown(handle, path, true);
if(fileHandle)
{
const file = await fileHandle.getFile();
const text = await file.text();
let json = {};
if(text)
{
json = JSON.parse(text);
}
let partProp = json[part];
if(!partProp)
{
partProp = [];
json[part] = partProp;
}
partProp.push([time, data]);
const writeable = await fileHandle.createWritable();
await writeable.write(JSON.stringify(json, null, 2));
await writeable.close();
}
}
/** @type {Van.State<TYPES.User|false>} */ /** @type {Van.State<TYPES.User|false>} */
const loggedIn = van.state(false); const loggedIn = van.state(false);
@ -65,7 +95,7 @@ function Room(room_id, graphParts)
DOM.div.Plain(user.name), DOM.div.Plain(user.name),
()=>{ ()=>{
return DOM.button.Plain( return DOM.button.Plain(
{onclick(){ {async onclick(){
rerender.val++ rerender.val++
loggedIn.val = user; loggedIn.val = user;
}}, }},
@ -122,10 +152,15 @@ function Room(room_id, graphParts)
DOM.strong(data), DOM.strong(data),
)), )),
Div.Plain( Div.Plain(
loggedIn.val && DOM.button({onclick(){ loggedIn.val ? DOM.button({onclick(){
if(loggedIn.val)
{
data.make(loggedIn.val, "NEW"); data.make(loggedIn.val, "NEW");
rerender.val++ rerender.val++
WRITE(["room", room_id, pass.id, loggedIn.val.id+".json"], part_id, new Date().getTime(), "NEW");
}
}}, "Add work!") }}, "Add work!")
: null
) )
)) ))
} }

View File

@ -11,7 +11,8 @@ export function Room({user, role, part, desk, pass})
for(let userId in user) for(let userId in user)
{ {
const name = user[userId]; const name = user[userId];
UserList[userId] = {name, desk:new Set()};
UserList[userId] = {name, id:userId, desk:new Set()};
} }
// mutate roles // mutate roles
@ -21,7 +22,7 @@ export function Room({user, role, part, desk, pass})
for(let roleId in role) for(let roleId in role)
{ {
const [name, ...userIds] = role[roleId]; const [name, ...userIds] = role[roleId];
RoleList[roleId] = {name, user:userIds.map(uId=>UserList[/**@type{string}*/(uId)])}; RoleList[roleId] = {name, id:roleId, user:userIds.map(uId=>UserList[/**@type{string}*/(uId)])};
} }
// mutate parts // mutate parts
@ -31,7 +32,7 @@ export function Room({user, role, part, desk, pass})
for(let partId in part) for(let partId in part)
{ {
const name = part[partId]; const name = part[partId];
PartList[partId] = /** @type {TYPES.Part} */({name, need:[], make:[], pass:new Map()}); PartList[partId] = /** @type {TYPES.Part} */({name, id:partId, need:[], make:[], pass:new Map()});
} }
// mutate desks // mutate desks
@ -47,6 +48,7 @@ export function Room({user, role, part, desk, pass})
/** @type {TYPES.Desk} */ /** @type {TYPES.Desk} */
const deskObj = { const deskObj = {
name, name,
id:deskId,
mode, mode,
need, need,
time, time,
@ -89,6 +91,7 @@ export function Room({user, role, part, desk, pass})
/** @type {TYPES.Pass} */ /** @type {TYPES.Pass} */
const passObj = { const passObj = {
name: pass[passID][0], name: pass[passID][0],
id:passID,
path:passID, path:passID,
async load(){ async load(){
@ -116,7 +119,7 @@ export function Room({user, role, part, desk, pass})
const [userID, userObject] = userData[i]; const [userID, userObject] = userData[i];
try try
{ {
const resp = await fetch(`./room/${context.Path}/${passID}/${userID}.json`); const resp = await fetch(`./fsx/room/${context.Path}/${passID}/${userID}`);
/** @type {TYPES.UserPassFile} */ /** @type {TYPES.UserPassFile} */
const json = await resp.json(); const json = await resp.json();

View File

@ -1,8 +1,8 @@
export type User = {name:string, desk:Set<Desk>}; export type User = {name:string, id:string, desk:Set<Desk>};
export type Role = {name:string, user:User[]}; export type Role = {name:string, id:string, user:User[]};
export type Desk = {name:string, need:Part[], time:number[], make:Part[], pass:Map<Pass, Flag>, mode:string, role:Role[]}; export type Desk = {name:string, id:string, need:Part[], time:number[], make:Part[], pass:Map<Pass, Flag>, mode:string, role:Role[]};
export type Pass = {name:string, path:string, live:boolean, load:()=>Promise<void>, dump:()=>void}; export type Pass = {name:string, id:string, path:string, live:boolean, load:()=>Promise<void>, dump:()=>void};
export type Part = {name:string, pass:Map<Pass, {time:number, work:Work[], make:(user:User, data:string)=>void}>, need:Desk[], make:Desk[]}; export type Part = {name:string, id:string, pass:Map<Pass, {time:number, work:Work[], make:(user:User, data:string)=>void}>, need:Desk[], make:Desk[]};
export type Work = [time:number, data:string, user:User]; export type Work = [time:number, data:string, user:User];
export type Flag = {need:number[], make:number[]} export type Flag = {need:number[], make:number[]}

View File

@ -4,22 +4,57 @@ self.addEventListener('install', ()=> self.skipWaiting()); // Activate worker im
self.addEventListener('activate', ()=> self.clients.claim()); // Become available to all pages); self.addEventListener('activate', ()=> self.clients.claim()); // Become available to all pages);
self.addEventListener('fetch', (event) =>event.respondWith(Interceptor(event))); self.addEventListener('fetch', (event) =>event.respondWith(Interceptor(event)));
/** @type {(event:{request:Request})=>Promise<Response>} */
async function Interceptor(event) async function Interceptor(event)
{ {
const url = new URL(event.request.url); const url = new URL(event.request.url);
const pathname = url.pathname.substring(1); const pathname = url.pathname.substring(1);
const parts = pathname.split("/"); let parts = pathname.split("/");
if(parts[0] == "data" || parts[0] == "room") if(parts[0] == "fsx")
{ {
console.log("intercept:", pathname) parts = parts.slice(1);
console.log("intercept:", pathname);
if(parts[0] == "room")
{
parts[parts.length-1] = parts[parts.length-1]+".json";
}
const handle = await FSAccess.getDirectoryHandle(); const handle = await FSAccess.getDirectoryHandle();
if(handle) if(handle)
{ {
const file = await FSAccess.drilldown(handle, parts); if(event.request.method == "PUT")
if(file)
{ {
const body = await event.request.text();
console.log("PUT intercept", parts, body);
const fileHandle = await FSAccess.drilldown(handle, parts, true);
if(fileHandle)
{
const writeable = await fileHandle.createWritable();
await writeable.write(body);
await writeable.close();
return new Response("OK", {
headers: {
'Content-Type': 'application/javascript',
'Cache-Control': 'no-cache'
}
});
}
else
{
return new Response("404", {status:404});
}
}
const fileHandle = await FSAccess.drilldown(handle, parts);
if(fileHandle)
{
const file = await fileHandle.getFile();
const content = await file.text(); const content = await file.text();
return new Response(content, { return new Response(content, {
headers: { headers: {
'Content-Type': 'application/javascript', 'Content-Type': 'application/javascript',

View File

@ -35,18 +35,18 @@ export async function getDirectoryHandle() {
}); });
} }
/** @type {(handle:FileSystemDirectoryHandle, parts:string[])=>Promise<File|false>} */ /** @type {(handle:FileSystemDirectoryHandle, parts:string[], create?:boolean)=>Promise<FileSystemFileHandle|false>} */
export async function drilldown(handle, parts) export async function drilldown(handle, parts, create=false)
{ {
try try
{ {
let filePointer = handle; let filePointer = handle;
for(let i=0; i<parts.length-1; i++) for(let i=0; i<parts.length-1; i++)
{ {
filePointer = await filePointer.getDirectoryHandle(parts[i], {create: false}); filePointer = await filePointer.getDirectoryHandle(parts[i], {create});
} }
const leaf = await filePointer.getFileHandle(parts[parts.length-1], {create: false}); const leaf = await filePointer.getFileHandle(parts[parts.length-1], {create});
return await leaf.getFile(); return leaf;
} }
catch(e) catch(e)
{ {