Skip to content

ESM bootstrap: load node modules and single boot entrypoint #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
criskb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ESM bootstrap: load node modules and single boot entrypoint #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,6 @@
</div>
</div>

<script src="/src/app.js"></script>
<script type="module" src="/src/app.js"></script>
</body>
</html>
86 changes: 21 additions & 65 deletions public/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,6 @@ const NODE_MODULES = [
"/nodes/z-warp.js"
];

async function loadNodesFromList(){
const failures = [];
for(const modulePath of NODE_MODULES){
try{
const mod = await import(modulePath);
registerNodeModule(mod, modulePath);
}catch(err){
failures.push(modulePath);
console.warn("Failed to load node module", modulePath, err);
}
}
return failures;
}

const toastEl = document.getElementById("toast");
function toast(msg, ms=1400){
toastEl.textContent = msg;
Expand Down Expand Up @@ -214,66 +200,27 @@ const outPill = document.getElementById("outPill");
async function loadNodes(){
if(nodeRegistry.loaded) return NODE_DEFS;
setStatus("Loading nodes…");
let entries = [];
try{
const res = await fetch("/api/nodes");
if(!res.ok) throw new Error(`Node manager: ${res.status} ${res.statusText}`);
const data = await res.json();
entries = Array.isArray(data.nodes) ? data.nodes : [];
}catch(err){
console.warn("Node manager error", err);
toast("Node manager error: " + (err.message || String(err)));
}

const failures = [];
await Promise.all(entries.map(async (entry)=>{
await Promise.all(NODE_MODULES.map(async (modulePath)=>{
try{
const mod = await import(entry.module);
registerNodeModule(mod, entry.module);
const mod = await import(modulePath);
registerNodeModule(mod, modulePath);
}catch(err){
failures.push(entry?.name || entry?.module || "unknown");
console.warn("Failed to load node", entry, err);
failures.push(modulePath);
console.warn("Failed to load node module", modulePath, err);
}
}));

const loadManifest = async (cacheBust = "")=>{
const suffix = cacheBust ? `?t=${cacheBust}` : "";
const manifest = await import(`/nodes/index.js${suffix}`);
if(typeof manifest.registerAllNodes === "function"){
await manifest.registerAllNodes();
return;
}
if(typeof manifest.default === "function"){
await manifest.default();
}
};

try{
await loadManifest("");
if(Object.keys(NODE_DEFS).length === 0){
await loadManifest(Date.now());
}
}catch(err){
console.warn("Fallback node manifest error", err);
if(!entries.length || Object.keys(NODE_DEFS).length === 0){
toast("Fallback node loader failed: " + (err.message || String(err)));
}
}

if(Object.keys(NODE_DEFS).length === 0){
const fallbackFailures = await loadNodesFromList();
if(fallbackFailures.length){
console.warn("Fallback direct module load failures", fallbackFailures);
}
const total = Object.keys(NODE_DEFS).length;
nodeRegistry.loaded = total > 0;
setStatus(total ? `Nodes: ${total}` : "Nodes: 0");
if(!total){
toast("No nodes were loaded. Cannot start the app.", 600000);
throw new Error("Node loader returned zero nodes.");
}

if(failures.length){
toast(`Failed to load ${failures.length} node(s). Check console for details.`);
}

const total = Object.keys(NODE_DEFS).length;
nodeRegistry.loaded = total > 0;
setStatus(total ? `Nodes: ${total}` : "Nodes: 0");
return NODE_DEFS;
}

Expand Down Expand Up @@ -9497,7 +9444,16 @@ function stopGraphGestures(el){
}
}

boot();
async function startApp(){
try{
await loadNodes();
}catch(err){
console.warn(err);
return;
}
boot();
}
startApp();

/* Redraw links on resize, and resize preview */
window.addEventListener("resize", ()=>{
Expand Down