mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-21 23:50:45 +00:00
fix(sftp): refresh batch eligibility on capability updates
This commit is contained in:
1 parent
1b96e27b09
commit
e894c9cbf2
3 files changed
+81
-8
No files matched your search
@@ -215,6 +215,21 @@ function buildBadgeSnapshot(tasks: readonly TransferTask[]): { count: number; ha
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Fields used by grouping, ordering and batch-action eligibility. */
|
||||||
|
function hasTransferListMetadataChange(before: TransferTask | undefined, after: TransferTask | undefined): boolean {
|
||||||
|
if (!before || !after) return before !== after;
|
||||||
|
return before.status !== after.status
|
||||||
|
|| before.parentTaskId !== after.parentTaskId
|
||||||
|
|| before.background !== after.background
|
||||||
|
|| before.startTime !== after.startTime
|
||||||
|
|| before.priority !== after.priority
|
||||||
|
|| before.ownerId !== after.ownerId
|
||||||
|
|| before.resumable !== after.resumable
|
||||||
|
|| before.reconnectRequired !== after.reconnectRequired
|
||||||
|
|| Boolean(before.conflict) !== Boolean(after.conflict)
|
||||||
|
|| (before.status === "failed" && ((before.checkpointBytes ?? 0) > 0) !== ((after.checkpointBytes ?? 0) > 0));
|
||||||
|
}
|
||||||
|
|
||||||
const TERMINAL_OWNER_STATUSES = new Set<TransferTask["status"]>([
|
const TERMINAL_OWNER_STATUSES = new Set<TransferTask["status"]>([
|
||||||
"completed",
|
"completed",
|
||||||
"cancelled",
|
"cancelled",
|
||||||
@@ -1464,8 +1479,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
|
|||||||
};
|
};
|
||||||
tasks = next;
|
tasks = next;
|
||||||
captureObservedTask(next[index]);
|
captureObservedTask(next[index]);
|
||||||
emitProgress(false, existing.status !== next[index].status
|
emitProgress(false, hasTransferListMetadataChange(existing, next[index]));
|
||||||
|| existing.reconnectRequired !== next[index].reconnectRequired);
|
|
||||||
return "ready";
|
return "ready";
|
||||||
},
|
},
|
||||||
observeTaskSettlement(expected, ignoredCompletion, onIdentityConflict) {
|
observeTaskSettlement(expected, ignoredCompletion, onIdentityConflict) {
|
||||||
@@ -1784,7 +1798,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
|
|||||||
if (fingerprintChanged) emit(true);
|
if (fingerprintChanged) emit(true);
|
||||||
else if (directoryCheckpointChanged) emit(true);
|
else if (directoryCheckpointChanged) emit(true);
|
||||||
else if (lifecycleChanged) emit();
|
else if (lifecycleChanged) emit();
|
||||||
else emitProgress(false);
|
else emitProgress(false, hasTransferListMetadataChange(task, nextTask));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
upsertTasks(incoming) {
|
upsertTasks(incoming) {
|
||||||
@@ -2185,6 +2199,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
|
|||||||
let existingIndex = tasks.findIndex((task) => task.id === event.transferId);
|
let existingIndex = tasks.findIndex((task) => task.id === event.transferId);
|
||||||
let existing = tasks[existingIndex];
|
let existing = tasks[existingIndex];
|
||||||
const beforeEvent = existing;
|
const beforeEvent = existing;
|
||||||
|
let parentControlsChanged = false;
|
||||||
const eventParent = event.parentTaskId
|
const eventParent = event.parentTaskId
|
||||||
? tasks.find((task) => task.id === event.parentTaskId)
|
? tasks.find((task) => task.id === event.parentTaskId)
|
||||||
: undefined;
|
: undefined;
|
||||||
@@ -2464,6 +2479,8 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
if (event.resumable === false && existing.parentTaskId) {
|
if (event.resumable === false && existing.parentTaskId) {
|
||||||
|
const parent = tasks.find((task) => task.id === existing.parentTaskId);
|
||||||
|
parentControlsChanged = parent !== undefined && parent.resumable !== false;
|
||||||
tasks = tasks.map((task) => task.id === existing.parentTaskId ? {
|
tasks = tasks.map((task) => task.id === existing.parentTaskId ? {
|
||||||
...task,
|
...task,
|
||||||
resumable: false,
|
resumable: false,
|
||||||
@@ -2521,11 +2538,8 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
|
|||||||
// Progress-only ticks skip prune + coalesce listener paints; lifecycle
|
// Progress-only ticks skip prune + coalesce listener paints; lifecycle
|
||||||
// events still take the full emit path so UI never lags on pause/cancel.
|
// events still take the full emit path so UI never lags on pause/cancel.
|
||||||
const currentTask = tasks[existingIndex];
|
const currentTask = tasks[existingIndex];
|
||||||
const hierarchyOrLifecycleChanged = !beforeEvent
|
const hierarchyOrLifecycleChanged = parentControlsChanged
|
||||||
|| currentTask?.status !== beforeEvent.status
|
|| hasTransferListMetadataChange(beforeEvent, currentTask);
|
||||||
|| currentTask?.parentTaskId !== beforeEvent.parentTaskId
|
|
||||||
|| currentTask?.background !== beforeEvent.background
|
|
||||||
|| currentTask?.reconnectRequired !== beforeEvent.reconnectRequired;
|
|
||||||
if (event.type === "progress" && !persistImmediately) {
|
if (event.type === "progress" && !persistImmediately) {
|
||||||
emitProgress(false, hierarchyOrLifecycleChanged);
|
emitProgress(false, hierarchyOrLifecycleChanged);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -75,6 +75,46 @@ test("expanded folder history bounds mounted files, isolates progress, and reach
|
|||||||
assert.ok(orderReads < 20, `one byte update re-sorted the directory (${orderReads} reads)`);
|
assert.ok(orderReads < 20, `one byte update re-sorted the directory (${orderReads} reads)`);
|
||||||
assert.match(childList()?.textContent ?? "", /500 B/);
|
assert.match(childList()?.textContent ?? "", /500 B/);
|
||||||
|
|
||||||
|
const pauseAll = () => [...env.document.querySelectorAll<HTMLButtonElement>('button')].find((button) => button.textContent?.trim() === "Pause all")!;
|
||||||
|
assert.equal(pauseAll().disabled, false);
|
||||||
|
await runWithAct(async () => {
|
||||||
|
store.ingestBackgroundEvent({ type: "progress", transferId: "child-0", transferred: 600, resumable: false, pauseUnavailableReason: "fixture cannot pause" });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 20));
|
||||||
|
});
|
||||||
|
assert.equal(store.getTask("folder")?.resumable, false, "a child's backend capability also limits its folder");
|
||||||
|
assert.equal(pauseAll().disabled, true, "batch controls must use the current backend capability");
|
||||||
|
await runWithAct(async () => {
|
||||||
|
store.patchTask("folder", { resumable: true });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 20));
|
||||||
|
});
|
||||||
|
assert.equal(pauseAll().disabled, false, "metadata-only patches must refresh eligibility too");
|
||||||
|
await runWithAct(async () => {
|
||||||
|
store.ingestBackgroundEvent({ type: "progress", transferId: "child-0", transferred: 650, resumable: false });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 20));
|
||||||
|
});
|
||||||
|
assert.equal(pauseAll().disabled, true, "a parent-only capability change is reflected even when the child already reported false");
|
||||||
|
await runWithAct(async () => {
|
||||||
|
store.patchTask("folder", { resumable: false });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 20));
|
||||||
|
});
|
||||||
|
assert.equal(pauseAll().disabled, true);
|
||||||
|
orderReads = 0;
|
||||||
|
await runWithAct(async () => {
|
||||||
|
store.ingestBackgroundEvent({ type: "progress", transferId: "child-0", transferred: 700, resumable: false });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 20));
|
||||||
|
});
|
||||||
|
assert.ok(orderReads < 20, "repeated capability metadata on byte ticks does not re-sort the directory");
|
||||||
|
await runWithAct(() => store.publishOwner("failed-control", [{
|
||||||
|
...base, id: "failed-control", status: "failed", isDirectory: false, endTime: Date.now(), resumable: true, checkpointBytes: 0,
|
||||||
|
}]));
|
||||||
|
const resumeAll = () => [...env.document.querySelectorAll<HTMLButtonElement>('button')].find((button) => button.textContent?.trim() === "Resume all")!;
|
||||||
|
assert.equal(resumeAll().disabled, true);
|
||||||
|
await runWithAct(async () => {
|
||||||
|
store.patchTask("failed-control", { checkpointBytes: 20 });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 20));
|
||||||
|
});
|
||||||
|
assert.equal(resumeAll().disabled, false, "a newly available failed-task checkpoint enables the existing resume action");
|
||||||
|
|
||||||
const list = childList()!;
|
const list = childList()!;
|
||||||
list.scrollTop = 24 * childCount - 192;
|
list.scrollTop = 24 * childCount - 192;
|
||||||
await dispatchDomEvent(list, new env.window.Event("scroll"));
|
await dispatchDomEvent(list, new env.window.Event("scroll"));
|
||||||
|
|||||||
@@ -45,3 +45,22 @@ possible large-transfer failures; they do not establish that this exact expanded
|
|||||||
folder-list workload caused the reporter's freeze. This repair is independently
|
folder-list workload caused the reporter's freeze. This repair is independently
|
||||||
reproduced UI work and must not close that issue. Open #3694 and #3696 modify
|
reproduced UI work and must not close that issue. Open #3694 and #3696 modify
|
||||||
file metadata / transfer connection acquisition, not this list behavior.
|
file metadata / transfer connection acquisition, not this list behavior.
|
||||||
|
|
||||||
|
## Control availability follow-up
|
||||||
|
|
||||||
|
Independent review found that the initial stable snapshot did not refresh when
|
||||||
|
progress reported a transfer could no longer pause, including a child's change
|
||||||
|
propagated to its folder. Metadata-only patches and a newly available failed
|
||||||
|
transfer checkpoint could similarly leave batch buttons stale. The list now
|
||||||
|
refreshes its lightweight snapshot only when grouping/order/control eligibility
|
||||||
|
fields change; repeated identical capability metadata on byte ticks keeps the
|
||||||
|
hierarchy stable.
|
||||||
|
|
||||||
|
The actual-component regression first failed with Pause all incorrectly enabled
|
||||||
|
after the backend reported the folder could not pause. It now covers that child /
|
||||||
|
parent update, direct metadata changes, repeated unchanged metadata without a
|
||||||
|
full sort, and Resume all becoming available when a failed task gains a checkpoint.
|
||||||
|
An Electron comparison against initial repair 1b96e27b0 confirmed stale batch
|
||||||
|
buttons before and correct disabled/enabled states afterward. The final 1,000 /
|
||||||
|
5,000 file runs still mounted 12 rows and reached the final file: expand-to-frame
|
||||||
|
12.6 / 12.86 ms, child progress 1.32–15.42 / 1.06–17.90 ms.
|
||||||
Reference in new issue
Block a user