v4's arrangement, which is the one that reads as an editor: a zone head holds what acts on THAT zone, so the app grows a bar of its own for what acts on the app. * The menu bar. Brand, View and Settings, and whether ComfyUI is still on the other end. Only menus with something real in them exist -- an empty File menu is a promise the app does not keep. * The prompt is written in the CONSTRUCTOR, a window. v4 called this the Composer; that name is taken here by the element kit, and two things called Composer in one repo is one thing nobody can search for. It is the longest thing a person writes and the least often read, and a permanent third of the centre column is the room the timeline needs. The host is built at startup and outlives every opening, so a window that opens twice does not throw away what was typed. * The timeline replaces it, and Generate moves into its head with what the run is doing at the far end of the same head. No bar across the bottom: one that spans the window belongs to no region. Four faults found on the way, three of them mine and one much older: * THE OVERLAY ROOT WAS A STACKING CONTEXT. It documents at length that it must never be one -- and then set `position: fixed`, which makes one on its own. So the whole z ladder was measured inside that single element: an open menu at z 500 painted UNDER a button at z 1. Every overlay in the app was one positive z-index away from being buried, and the only reason nobody had seen it is that almost nothing claims a z-index. The root is static and zero-sized now; every layer in it is fixed already. * Generate's hover ran `filter: brightness()`, which lightens the LABEL along with the fill under it -- the one thing that had to stay readable lost contrast in both themes. Only the fill moves now, and which way it moves depends on the theme: dark's accent carries near-black text so it goes lighter, light's carries white so it goes darker. Measured: no gradient stop under 4.1:1, hovered or at rest. * A fixed-height head could not shrink below the width of everything in it, and a head now holds a title, three controls and a status. That min-content became the centre column's, so a 768px window laid out 878px wide and scrolled sideways. It wraps now, as v4's does. * A CSS patch of mine silently did nothing because its anchor text had moved and I had left the assertion off that one replacement. Every patch asserts now.
162 lines
7.1 KiB
JavaScript
162 lines
7.1 KiB
JavaScript
// The two things the page does around a run: start one, and take back over one
|
|
// that was already going.
|
|
|
|
//
|
|
// Kept out of boot.js because boot.js runs on import and needs a document, so
|
|
// nothing in it could be driven by a test -- and both of the faults that lived
|
|
// here were ordering faults in exactly that untested wiring: a button still
|
|
// live during a round trip, and a socket listening before anyone knew which run
|
|
// was ours.
|
|
|
|
/**
|
|
* onGenerate: ask what to queue, then queue it, once at a time.
|
|
*
|
|
* The button only goes dead when the RUN reaches "queued", and reaching it takes
|
|
* a round trip to ask what to queue. For the whole of that round trip the button
|
|
* was live, so two clicks each posted their own /prompt: two jobs burning GPU
|
|
* time, with the UI following one of them.
|
|
*/
|
|
export function createGenerator({ run, transport, check, ready, slots, values, inputs }) {
|
|
let starting = false;
|
|
|
|
return async function onGenerate() {
|
|
// Whatever the page is still working out about runs already in progress
|
|
// finishes first. On a reload during a generation the button is live and
|
|
// the phase still reads "idle" for the length of the queue lookup, so a
|
|
// click in that window queued a SECOND job and orphaned the first -- the
|
|
// adopt that would have found it then refused, because the phase was no
|
|
// longer idle, and the original run's messages were discarded from then on
|
|
// as belonging to nobody.
|
|
if (ready) await ready;
|
|
if (starting || run.state.phase === "queued" || run.state.phase === "running") return false;
|
|
starting = true;
|
|
transport.generate.setDisabled(true);
|
|
try {
|
|
let plan;
|
|
try {
|
|
// The pipeline the user is looking at, or -- before anything has been
|
|
// edited -- none, which asks the server for its own defaults. Sending
|
|
// an empty array instead would be a request to run nothing at all.
|
|
const edited = slots ? slots() : null;
|
|
plan = await check({
|
|
...(edited ? { slots: edited } : {}),
|
|
// What the boxes on the main window hold, addressed by slot. Sent
|
|
// apart from `slots` on purpose: the pipeline window owns the
|
|
// structure and these own one value inside it, so neither has to
|
|
// carry the other's.
|
|
...(inputs ? { inputs: inputs() } : {}),
|
|
// What every panel in the app holds. Sent even when empty: "nothing
|
|
// is set" is an answer, and the server tells the difference between
|
|
// that and a client too old to send any.
|
|
values: values ? values() : {},
|
|
});
|
|
} catch (err) {
|
|
transport.say(`The pipeline could not be read: ${err.message}`);
|
|
return false;
|
|
}
|
|
|
|
// True about the pipeline whatever happens next, so it is said before the
|
|
// run is either started or refused -- and it stays up while the run goes.
|
|
transport.warn((plan.notes || [])[0] || null);
|
|
|
|
if (!plan.queueable || !plan.prompt) {
|
|
// The first reason, whichever kind it is. A refusal and an unfinished
|
|
// pipeline both stop the run, and both belong next to Generate.
|
|
const stopping = [...(plan.refused || []), ...(plan.incomplete || [])];
|
|
transport.say(stopping[0] || "This pipeline is not ready to run.");
|
|
return false;
|
|
}
|
|
|
|
try {
|
|
await run.start(plan.prompt);
|
|
return true;
|
|
} catch {
|
|
return false; // run.state carries the reason
|
|
}
|
|
} finally {
|
|
starting = false;
|
|
// draw() owns the button from here; this only undoes the click-time
|
|
// disable for the paths that never reached a run at all.
|
|
transport.draw(run.state);
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Take back over whatever this tab had running before the page reloaded.
|
|
*
|
|
* Two questions, because a run can be in two places: still in the queue, or
|
|
* already finished. The second is not an edge case -- the socket opens before
|
|
* the queue can answer, and a run ending in that moment leaves the queue before
|
|
* it is asked about, so without this the result is lost and the app says Ready.
|
|
* Only ids this page actually saw on its own socket are asked about, so nothing
|
|
* older than this page load can be resurrected.
|
|
*/
|
|
/**
|
|
* Everything the page does on load, in the order it has to happen.
|
|
*
|
|
* Kept here rather than in boot.js because boot.js runs on import and needs a
|
|
* document, so nothing in it can be driven by a test -- and every fault on this
|
|
* path so far has been an ORDERING fault in exactly that untested wiring. The
|
|
* ordering is the thing under test, so the ordering lives where tests can reach
|
|
* it.
|
|
*/
|
|
export function wire({ run, page, check, id, queuedFor, finishedFor, slots, values, inputs }) {
|
|
// One subscription draws everything a run affects. It lives here rather than
|
|
// beside it in boot.js because subscribe() delivers the CURRENT state at
|
|
// once, and doing that after the button was deliberately disabled handed it
|
|
// straight back -- live-looking, and doing nothing when pressed.
|
|
run.subscribe((state) => {
|
|
page.transport.draw(state);
|
|
// Whether ComfyUI is still there rides on the same state object, so it is
|
|
// drawn by the same subscription: two things watching the connection is two
|
|
// things that can disagree about whether the app is talking to anything.
|
|
if (page.connection) page.connection.draw(state);
|
|
// Results go to the BIN, and the bin decides what is on screen. Pointing
|
|
// the viewer at the newest image from here instead put two things in charge
|
|
// of it: every progress message re-showed the newest result, so clicking an
|
|
// older one in the bin held for as long as it took the next message to
|
|
// arrive.
|
|
if (page.bin) page.bin.absorb(state.images);
|
|
});
|
|
|
|
// The socket opens at load, not at Generate. A generation queued before a
|
|
// reload keeps running on the server, and a page that only listens once it
|
|
// starts one of its own hears nothing about it.
|
|
run.listen();
|
|
|
|
// Not awaited by the caller, but the button waits on it. Until this settles
|
|
// nobody can know whether this page already has a run, and starting another
|
|
// one on the strength of "phase is idle" is starting one on a guess.
|
|
page.transport.hold("Looking for a run already in progress");
|
|
|
|
const ready = reattach(run, id, { queuedFor, finishedFor }).then((adopted) => {
|
|
page.transport.release(run.state);
|
|
return adopted;
|
|
});
|
|
|
|
const generate = createGenerator({ run, transport: page.transport, check, ready, slots, values, inputs });
|
|
return { ready, generate };
|
|
}
|
|
|
|
export async function reattach(run, id, { queuedFor, finishedFor } = {}) {
|
|
try {
|
|
const queued = await queuedFor(id);
|
|
if (queued) {
|
|
if (run.state.phase === "idle") {
|
|
run.adopt(queued.promptId, { running: queued.running });
|
|
return queued.promptId;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
const seen = run.seen();
|
|
if (!seen.length || run.state.phase !== "idle") return null;
|
|
const finished = await finishedFor(id, seen);
|
|
if (finished && run.state.phase === "idle") { run.adopt(finished); return finished; }
|
|
return null;
|
|
} catch {
|
|
return null; // nothing to reattach to
|
|
}
|
|
}
|