mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 12:01:13 +00:00
* fix(sftp): instant folder-drop scan UI and drop full-tree pre-scan Restore interleaved folder transfers as the only non-compressed path, remove the folder pre-scan setting, and make local folder drops show a scanning task with live discovered counts via native listLocalTree (with cancel + progress). UI shows "done · found" instead of a fake grand-total percentage while discovery is still growing. * fix(sftp): make folder scan cancellation bridge-safe * fix(sftp): preserve path-only terminal drops * fix(terminal): accept native folder drop paths * fix(sftp): keep scan task cancellable during setup * fix(sftp): preserve scan failure state during setup errors * fix(sftp): keep folder scan task across retries * fix(sftp): cancel scan task immediately * fix(sftp): keep cancellation active through session setup * fix(sftp): settle failed drop upload retry * fix(sftp): preserve cancellation in final scan cleanup * fix(sftp): harden folder scan cancellation and conflicts * fix(sftp): finish Codex follow-ups on folder scan cancel UX - Abort sibling listLocalTree walks when one multi-root scan fails - Prefer ERR_*_CANCELLED over matching "cancel" in error text - Clear scanning phase on settle; only label live rows as Scanning - Omit directory metadata sizes from drop entries used for totals * fix(sftp): stream folder discovery into concurrent uploads Local path-backed folder drops now edge-scan and edge-transfer: listLocalTree streams entry batches while upload workers consume them, so the first files start before a 100k-file walk finishes. Cancel aborts the walk, clears the queue, and stops creating child tasks. Compressed uploads still materialize fully then pack. * fix(sftp): harden progressive folder UX, retry, and size-based uploads Align the SFTP panel with transfer-center progress, keep nested tree batches until tree-end, honor pause during progressive enqueue, add low-cost retry for external drag-drop files, and drop whole-file upload digests for industry size-based resume (download live-log prefix checks unchanged). * fix(sftp): address multi-agent review on progressive upload and retry Gate progressive drops to path-backed folders only, prefer pool sessions on drag-drop retry with in-flight and cancel guards, soft-check upload mtime without fail-open contentVerifiedSeparately, skip multi-root pause HOL, and fail closed when the local tree stream misses tree-end. * fix(sftp): finish multi-root pause HOL and parent rollup guards Race-wait on all latched parents so resuming a non-head folder can proceed, and only roll progressive parents to completed after terminal failed status. * fix(sftp): address Codex progressive conflict and hang findings Add root-level conflict preflight to progressive folder uploads, wake all backpressure waiters, preserve cancel listeners across uploadEntriesDirect, and surface empty-directory mkdir failures.
187 lines
6.5 KiB
TypeScript
187 lines
6.5 KiB
TypeScript
import assert from "node:assert/strict";
|
|
import test from "node:test";
|
|
|
|
import type { TransferTask } from "../../../domain/models";
|
|
import {
|
|
isExternalDragDropFileUpload,
|
|
retryExternalDragDropFileUpload,
|
|
} from "./externalDragDropRetry";
|
|
|
|
const baseTask = (overrides: Partial<TransferTask> = {}): TransferTask => ({
|
|
id: "child-1",
|
|
fileName: "a.txt",
|
|
sourcePath: "/tmp/docs/a.txt",
|
|
targetPath: "/remote/docs/a.txt",
|
|
sourceConnectionId: "external",
|
|
targetConnectionId: "conn-1",
|
|
targetHostId: "host-1",
|
|
direction: "upload",
|
|
status: "failed",
|
|
totalBytes: 12,
|
|
transferredBytes: 0,
|
|
speed: 0,
|
|
startTime: 1,
|
|
isDirectory: false,
|
|
origin: "drag-drop",
|
|
parentTaskId: "folder-1",
|
|
error: "Network error",
|
|
...overrides,
|
|
});
|
|
|
|
test("detects progressive drag-drop file children as retryable", () => {
|
|
assert.equal(isExternalDragDropFileUpload(baseTask()), true);
|
|
assert.equal(isExternalDragDropFileUpload(baseTask({ isDirectory: true })), false);
|
|
assert.equal(isExternalDragDropFileUpload(baseTask({ origin: "manual" })), false);
|
|
assert.equal(isExternalDragDropFileUpload(baseTask({ sourceConnectionId: "local" })), false);
|
|
assert.equal(isExternalDragDropFileUpload(baseTask({ status: "completed" })), false);
|
|
assert.equal(isExternalDragDropFileUpload(baseTask({ retryable: false })), false);
|
|
});
|
|
|
|
test("retry reuses the same transfer id and starts a stream upload", async () => {
|
|
const patches: Array<{ id: string; updates: Partial<TransferTask> }> = [];
|
|
const streams: Array<Record<string, unknown>> = [];
|
|
|
|
// No pool acquire → falls back to browse sftp id.
|
|
const result = await retryExternalDragDropFileUpload(baseTask(), {
|
|
getBrowseSftpId: () => "sftp-live",
|
|
startStreamTransfer: async (options) => {
|
|
streams.push(options as unknown as Record<string, unknown>);
|
|
return { transferId: options.transferId };
|
|
},
|
|
onPatch: (taskId, updates) => patches.push({ id: taskId, updates }),
|
|
});
|
|
|
|
assert.equal(result.success, true);
|
|
assert.equal(streams.length, 1);
|
|
assert.equal(streams[0].transferId, "child-1");
|
|
assert.equal(streams[0].sourcePath, "/tmp/docs/a.txt");
|
|
assert.equal(streams[0].targetPath, "/remote/docs/a.txt");
|
|
assert.equal(streams[0].targetSftpId, "sftp-live");
|
|
assert.equal(patches[0].updates.status, "transferring");
|
|
assert.equal(patches.at(-1)?.updates.status, "completed");
|
|
});
|
|
|
|
test("retry prefers a dedicated pool session over the browse sftp id", async () => {
|
|
let released = false;
|
|
let acquired = false;
|
|
const result = await retryExternalDragDropFileUpload(baseTask(), {
|
|
getBrowseSftpId: () => "sftp-live",
|
|
acquireTransferSession: async () => {
|
|
acquired = true;
|
|
return {
|
|
sftpId: "sftp-pool",
|
|
poolKey: "host-1",
|
|
release: () => { released = true; },
|
|
discard: () => {},
|
|
};
|
|
},
|
|
startStreamTransfer: async (options) => {
|
|
assert.equal(options.targetSftpId, "sftp-pool");
|
|
return {};
|
|
},
|
|
onPatch: () => {},
|
|
});
|
|
|
|
assert.equal(result.success, true);
|
|
assert.equal(acquired, true);
|
|
assert.equal(released, true);
|
|
});
|
|
|
|
test("retry falls back to browse when pool acquire is unavailable", async () => {
|
|
const result = await retryExternalDragDropFileUpload(baseTask(), {
|
|
getBrowseSftpId: () => "sftp-live",
|
|
startStreamTransfer: async (options) => {
|
|
assert.equal(options.targetSftpId, "sftp-live");
|
|
return {};
|
|
},
|
|
onPatch: () => {},
|
|
});
|
|
assert.equal(result.success, true);
|
|
});
|
|
|
|
test("retry rolls parent to completed when all siblings succeed", async () => {
|
|
const patches: Array<{ id: string; updates: Partial<TransferTask> }> = [];
|
|
const result = await retryExternalDragDropFileUpload(baseTask(), {
|
|
getBrowseSftpId: () => "sftp-live",
|
|
startStreamTransfer: async () => ({}),
|
|
getTask: (id) => (
|
|
id === "folder-1"
|
|
? baseTask({
|
|
id: "folder-1",
|
|
isDirectory: true,
|
|
status: "failed",
|
|
sourcePath: "/tmp/docs",
|
|
targetPath: "/remote/docs",
|
|
error: "1 of 2 files failed",
|
|
totalBytes: 2,
|
|
transferredBytes: 1,
|
|
parentTaskId: undefined,
|
|
})
|
|
: undefined
|
|
),
|
|
getChildTasks: () => [
|
|
baseTask({ id: "child-1", status: "transferring" }),
|
|
baseTask({ id: "child-2", status: "completed", sourcePath: "/tmp/docs/b.txt" }),
|
|
],
|
|
onPatch: (taskId, updates) => patches.push({ id: taskId, updates }),
|
|
});
|
|
assert.equal(result.success, true);
|
|
const parentPatch = patches.find((p) => p.id === "folder-1");
|
|
assert.ok(parentPatch);
|
|
assert.equal(parentPatch?.updates.status, "completed");
|
|
});
|
|
|
|
test("retry does not rollup a still-transferring progressive parent", async () => {
|
|
const patches: Array<{ id: string; updates: Partial<TransferTask> }> = [];
|
|
await retryExternalDragDropFileUpload(baseTask(), {
|
|
getBrowseSftpId: () => "sftp-live",
|
|
startStreamTransfer: async () => ({}),
|
|
getTask: (id) => (
|
|
id === "folder-1"
|
|
? baseTask({
|
|
id: "folder-1",
|
|
isDirectory: true,
|
|
status: "transferring",
|
|
sourcePath: "/tmp/docs",
|
|
parentTaskId: undefined,
|
|
})
|
|
: undefined
|
|
),
|
|
getChildTasks: () => [
|
|
baseTask({ id: "child-1", status: "transferring" }),
|
|
baseTask({ id: "child-2", status: "completed", sourcePath: "/tmp/docs/b.txt" }),
|
|
],
|
|
onPatch: (taskId, updates) => patches.push({ id: taskId, updates }),
|
|
});
|
|
assert.equal(patches.some((p) => p.id === "folder-1"), false);
|
|
});
|
|
|
|
test("retry fails clearly when no sftp session can be opened", async () => {
|
|
const patches: Array<Partial<TransferTask>> = [];
|
|
const result = await retryExternalDragDropFileUpload(baseTask(), {
|
|
getBrowseSftpId: () => undefined,
|
|
startStreamTransfer: async () => {
|
|
throw new Error("should not start");
|
|
},
|
|
onPatch: (_id, updates) => patches.push(updates),
|
|
});
|
|
|
|
assert.equal(result.success, false);
|
|
assert.match(result.error || "", /No SFTP session/);
|
|
assert.equal(patches.at(-1)?.status, "failed");
|
|
});
|
|
|
|
test("stream error keeps the row failed with the backend message", async () => {
|
|
const patches: Array<Partial<TransferTask>> = [];
|
|
const result = await retryExternalDragDropFileUpload(baseTask(), {
|
|
getBrowseSftpId: () => "sftp-live",
|
|
startStreamTransfer: async () => ({ error: "Permission denied" }),
|
|
onPatch: (_id, updates) => patches.push(updates),
|
|
});
|
|
|
|
assert.equal(result.success, false);
|
|
assert.equal(result.error, "Permission denied");
|
|
assert.equal(patches.at(-1)?.status, "failed");
|
|
assert.equal(patches.at(-1)?.error, "Permission denied");
|
|
});
|