Vito
e29ff4d4b2
* feat(inspect): local adapter seams in the shared inspector and viewer
The inspection loader calls adapter.read when an adapter reads by itself, so a
file chosen in this browser never reaches the API. The full inspector shows the
D66 local provenance (no Path row, no Show in folder, local association line),
and the viewer uses adapter.mediaUrl exactly, so a blob: URL is never given the
_pm_viewer cache-buster and Retry media reuses it. Rooted and recorded-history
adapters keep their api.get paths and cache-busted originals.
* feat(inspect): owned local selection session
createLocalSession owns one chosen File at a time: it classifies the bytes,
creates the blob: URL only for a classified image or video, and reads it
through a real inspection controller with the local adapter. Replacement,
dispose, parent abort and pagehide each release the URL, the handle and the
record once; a released handle (and every copy) is foreign to the adapter, and
every await is fenced by a generation counter so a replaced read never
publishes. Empty, multiple and directory drops keep the previous selection.
Baseline entry for local-session.mjs; branch floors raised for the touched
inspection-state.mjs and local-inspection.mjs.
* feat(inspect): native Inspect a file page
#/inspect is now the concept's "Inspect a file" page instead of the legacy
handoff. One chosen or dropped image or video previews inline, and the one
heading action, "Open file metadata", opens the shared viewer with the full
inspector on a record read entirely in this browser. Nothing is uploaded,
imported or stored; only an explicit Send crosses the host bridge.
- inspect.mjs mounts the concept DOM (surface, file-drop, #local-preview)
under the shell heading, owns one local session and the shared viewer and
prompt sender, and releases media before the session revokes its URL on
replacement, route change, page leave and dispose (D60-D65).
- A file that cannot be read after choosing opens the inspector's
unreadable state when the browser declares a supported type, instead of
the "unsupported" copy; the local adapter maps a browser read failure to
an unreadable record.
- The route is native; Overview keeps its card to the legacy metadata page,
which is unchanged.
- workspace-inspect.spec.mjs covers the chooser and viewer rail against the
Images rail for the same bytes, drop, cancel and reselect, unsupported and
unreadable files, video, URL ownership, mid-read replacement, exact send
and the no-request/no-storage rule.
* test(inspect): concept parity and managed-host send for local files
Compare the native Inspect a file page with the immutable concept's
#metadata at 1600x1100 and 390x844 in both themes (initial, selected,
viewer-open), mapping D60-D66 and pinning the concept's CSS values and
the chooser's displayed file name, with a mutation check. Send a local
PNG (explicitly empty negative) and core-tags.webm to a real Prompt
Manager (+/-) node across Classic and Nodes 2.0 switches and reloads;
a connected input rejects the send unchanged. Document D60-D66, the
legacy-floor dispositions and the commands in TESTING.md.
* fix(inspect): reset a released preview video in the next task
On WebKit (GStreamer) a video replaced while its pipeline was still
starting blocked the page: pause, src removal and load() in one task
never returned, so the next chooser selection hung (CI page workflows
webkit shard 2/2, "URLs and media end with their owning session").
The src is still dropped before the URL is revoked; only the load()
reset moves to the next task. A fresh-page regression replaces the
first video as soon as it shows, fifteen times.
* fix(inspect): never reset a preview video that is still starting
Deferring load() to the next task was not enough: CI on b7db4c3 hung
WebKit one step later in the fresh-page regression. Reset with load()
only a settled video (metadata read, or failed); a starting one is
paused, loses its src before the URL is revoked and is removed, then
left to be collected. The ownership workflow waits for the video to
settle before asserting the reset.
* fix(inspect): final review round for the local Inspect page
- Each inline preview owns its listeners, so a released node is never
pinned; a video released while still starting is reset with load()
once it reports metadata or an error (I1).
- The viewer's video teardown on a just-started local video is guarded
by a 15-page WebKit test; it needed no change (I2).
- The chooser keeps naming the current file after a cancelled picker
and names the dropped file after an accepted drop (I3).
- The unrelated activity-scan.mjs floor raise is reverted (I4).
- The page owns pagehide: the viewer closes and the inline media goes
before the session revokes the URL, and the chooser is cleared (M1,
M2); the session gains clear() and the viewer close().
- The "metadata is available" toast shows only for readable metadata
(M3); a rejected drop is a second, transient alert that never
replaces the selection's status (M4).
- TESTING.md: D62/D63 updates, the WebKit loadstart follow-up and the
pair-node follow-up (M5).
127 lines
8.9 KiB
JavaScript
127 lines
8.9 KiB
JavaScript
import {test,expect} from '../../tools/vendor/node_modules/@playwright/test/index.mjs';
|
|
import {installHostHooks} from './host-fixture.mjs';
|
|
import {sendablePng,localFixture,POSITIVE_LINES} from '../browser/local-inspect-files.mjs';
|
|
|
|
// PR L2 Task 7 of the local-Inspect plan (#249): a file read entirely in the browser by the native Inspect page sends
|
|
// its exact roles into a real Prompt Manager (+/-) node, in Classic and Nodes 2.0, switching both ways and reloading
|
|
// the graph each time. Nothing queues or loads a workflow, and a connected destination input rejects the whole send.
|
|
installHostHooks(test,['PromptManagerPair']);
|
|
|
|
// The PNG's positive spans lines and its negative is a ConditioningZeroOut (explicitly empty); the WebM carries the
|
|
// committed core video's per-key tags.
|
|
const FILES=[
|
|
{file:()=>sendablePng('host-send.png'),positive:POSITIVE_LINES,negative:'',shown:'No negative prompt (explicitly empty)'},
|
|
{file:()=>localFixture('core-tags.webm','video/webm','host-send.webm'),positive:'a red fox in snow, detailed fur',negative:'blurry, lowres',shown:'blurry, lowres'},
|
|
];
|
|
|
|
async function nodeState(page,id) {
|
|
return page.evaluate(async id=>{
|
|
const {app}=await import('/scripts/app.js');const node=app.graph.getNodeById(id);const serialized=node.serialize();
|
|
return {inputs:(await app.graphToPrompt()).output[String(id)].inputs,widgets:Object.fromEntries(node.widgets.map(widget=>[widget.name,widget.value])),
|
|
serialized:Object.fromEntries(node.widgets.map((widget,index)=>[widget.name,serialized.widgets_values[index]])),effects:window.inspectEffects};
|
|
},id);
|
|
}
|
|
|
|
/**
|
|
* Counts every queue or workflow load until `restore` runs; with `reset`, first sets the destination's roles back to
|
|
* known values (the connected-input case sets them itself, before it links the input, as library-sender.spec does).
|
|
*/
|
|
async function watchHost(page,id,reset=true) {
|
|
await page.evaluate(async ({id,reset})=>{
|
|
const {app}=await import('/scripts/app.js');const node=app.graph.getNodeById(id);
|
|
if(reset){node.widgets.find(widget=>widget.name==='text').value='Before positive';node.widgets.find(widget=>widget.name==='negative_text').value='Before negative';}
|
|
window.inspectEffects={queue:0,load:0};window.inspectOriginals={};
|
|
for(const [method,key] of [['queuePrompt','queue'],['loadGraphData','load']]){const original=app[method];window.inspectOriginals[method]=original;app[method]=function(...args){window.inspectEffects[key]++;return original.apply(this,args);};}
|
|
},{id,reset});
|
|
}
|
|
const restore=page=>page.evaluate(async()=>{const {app}=await import('/scripts/app.js');Object.assign(app,window.inspectOriginals);});
|
|
|
|
/** Chooses `file` on the Inspect page and opens the shared viewer on its local record. */
|
|
async function inspect(workspace,{file,positive,shown}) {
|
|
await workspace.locator('#local-file').setInputFiles(file());
|
|
const open=workspace.locator('#workspace-main .heading-actions').getByRole('button',{name:'Open file metadata',exact:true});
|
|
await expect(open).toHaveAttribute('aria-disabled','false');await open.click();
|
|
const rail=workspace.locator('dialog#viewer-dialog[open] #viewer-details');
|
|
await expect(rail.locator('.prompt-section.positive p.prompt-text')).toHaveText(positive);
|
|
await expect(rail.locator('.prompt-section.negative p.prompt-text')).toHaveText(shown);
|
|
return rail;
|
|
}
|
|
|
|
/** The rail's pair send, through to a previewed destination; returns the sender dialog. */
|
|
async function preview(workspace,rail) {
|
|
await rail.getByRole('button',{name:/^Send prompt pair to ComfyUI: /}).click();
|
|
const sender=workspace.getByRole('dialog',{name:'Send to ComfyUI',exact:true});
|
|
const hosts=sender.getByRole('combobox',{name:'ComfyUI window',exact:true});await expect(hosts.locator('option')).toHaveCount(2);await hosts.selectOption({index:1});
|
|
await sender.getByRole('combobox',{name:'Destination node',exact:true}).selectOption({index:1});
|
|
await sender.getByRole('button',{name:'Preview changes',exact:true}).click();
|
|
return sender;
|
|
}
|
|
|
|
async function closeViewer(workspace,sender) {
|
|
await sender.getByRole('button',{name:'Close',exact:true}).click();await expect(sender).toHaveCount(0);
|
|
await workspace.keyboard.press('Escape');await expect(workspace.locator('dialog#viewer-dialog[open]')).toHaveCount(0);
|
|
}
|
|
|
|
test('local file roles send exactly across renderer transitions',async({page,context},testInfo)=>{
|
|
test.setTimeout(180000);
|
|
const id=await page.evaluate(async()=>{
|
|
const {app}=await import('/scripts/app.js');const node=LiteGraph.createNode('PromptManagerPair');app.graph.add(node);
|
|
node.setSize([700,1000]);app.canvas.ds.scale=.8;app.canvas.centerOnNode(node);return node.id;
|
|
});
|
|
const workspace=await context.newPage();const errors=[];workspace.on('pageerror',error=>errors.push(error.message));
|
|
const requests=[];workspace.on('request',request=>{if(request.method()!=='GET')requests.push(`${request.method()} ${request.url()}`);});
|
|
const logged=[];workspace.on('console',message=>logged.push(message.text()));
|
|
try {
|
|
await workspace.goto('/prompt_manager/workspace#/inspect');
|
|
await expect(workspace.locator('#workspace-main h1')).toHaveText('Inspect a file');
|
|
const initial=testInfo.project.metadata.initialRenderer;
|
|
for(const renderer of [initial,!initial,initial]) {
|
|
// The renderer switch reloads the graph, as a workflow reload does.
|
|
await page.evaluate(async renderer=>{const {app}=await import('/scripts/app.js');await app.ui.settings.setSettingValue('Comfy.VueNodes.Enabled',renderer);await app.loadGraphData(app.graph.serialize());app.canvas.centerOnNode(app.graph._nodes[0]);},renderer);
|
|
await expect.poll(()=>page.evaluate(()=>LiteGraph.vueNodesMode)).toBe(renderer);
|
|
for(const entry of FILES) {
|
|
await watchHost(page,id);
|
|
try {
|
|
const rail=await inspect(workspace,entry);
|
|
const sender=await preview(workspace,rail);
|
|
for(const text of ['Before positive','Before negative',...entry.positive.split('\n'),entry.negative||'(empty)'])await expect(sender).toContainText(text);
|
|
await sender.getByRole('button',{name:'Apply to ComfyUI',exact:true}).click();await expect(sender).toContainText('Sent to ComfyUI.');
|
|
const state=await nodeState(page,id);
|
|
expect(state.effects).toEqual({queue:0,load:0});
|
|
for(const field of ['inputs','serialized'])expect(state[field]).toMatchObject({text:entry.positive,negative_text:entry.negative});
|
|
await closeViewer(workspace,sender);
|
|
} finally {await restore(page);}
|
|
}
|
|
}
|
|
// A connected destination input rejects the whole preview: neither role changes, nothing queues or loads.
|
|
const link=await page.evaluate(async id=>{
|
|
const {app}=await import('/scripts/app.js');const {convertToInput}=await import('/extensions/core/widgetInputs.js');
|
|
const node=app.graph.getNodeById(id);const widget=node.widgets.find(item=>item.name==='negative_text');
|
|
if(!node.inputs.some(input=>input.name==='negative_text'))convertToInput(node,widget);
|
|
node.widgets.find(item=>item.name==='text').value='Before positive';widget.value='Before negative';
|
|
const source=LiteGraph.createNode('PrimitiveString');app.graph.add(source);source.widgets.find(item=>item.name==='value').value='Upstream negative';
|
|
source.connect(0,node,node.inputs.findIndex(input=>input.name==='negative_text'));
|
|
return [String(source.id),0];
|
|
},id);
|
|
await watchHost(page,id,false);
|
|
try {
|
|
const before=await nodeState(page,id);
|
|
expect(before.widgets).toMatchObject({text:'Before positive',negative_text:'Before negative'});
|
|
const rail=await inspect(workspace,FILES[1]);
|
|
const sender=await preview(workspace,rail);
|
|
await expect(sender.getByRole('alert')).toContainText(/connected/i);
|
|
await expect(sender.getByRole('button',{name:'Apply to ComfyUI',exact:true})).toBeDisabled();
|
|
const rejected=await nodeState(page,id);
|
|
expect(rejected.effects).toEqual({queue:0,load:0});
|
|
expect(rejected.inputs.negative_text).toEqual(link);
|
|
for(const field of ['widgets','serialized'])expect(rejected[field]).toMatchObject({text:'Before positive',negative_text:'Before negative'});
|
|
await closeViewer(workspace,sender);
|
|
} finally {await restore(page);}
|
|
// The workspace page sent nothing to the server (the only crossing is the host bridge) and logged nothing of
|
|
// the files: no name and no prompt text.
|
|
expect(requests).toEqual([]);
|
|
expect(logged.filter(text=>/host-send|lighthouse|long exposure|red fox|lowres/.test(text))).toEqual([]);
|
|
expect(errors).toEqual([]);
|
|
} finally {await workspace.close();}
|
|
});
|