mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-09-24 15:49:09 +00:00
443202ba4e
* 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.
96 lines
2.9 KiB
TypeScript
96 lines
2.9 KiB
TypeScript
import assert from "node:assert/strict";
|
|
import test from "node:test";
|
|
|
|
import { uploadFoldersCompressed } from "./uploadCompressed";
|
|
import type { DropEntry } from "./sftpFileUtils";
|
|
|
|
test("compressed folder uploads use reconstructed drop-entry paths", async () => {
|
|
const previousWindow = globalThis.window;
|
|
Object.defineProperty(globalThis, "window", {
|
|
configurable: true,
|
|
value: {
|
|
netcatty: {
|
|
checkCompressedUploadSupport: async () => ({
|
|
supported: false,
|
|
localTar: false,
|
|
remoteTar: false,
|
|
}),
|
|
},
|
|
},
|
|
});
|
|
|
|
try {
|
|
const entry: DropEntry = {
|
|
file: { name: "child.txt", size: 1 } as File,
|
|
localPath: "/tmp/example-folder/child.txt",
|
|
relativePath: "example-folder/child.txt",
|
|
isDirectory: false,
|
|
};
|
|
const results = await uploadFoldersCompressed(
|
|
[["example-folder", [entry]]],
|
|
"/remote",
|
|
"sftp-1",
|
|
);
|
|
|
|
assert.deepEqual(results, [{
|
|
fileName: "example-folder",
|
|
success: false,
|
|
error: "Compressed upload not supported - fallback needed",
|
|
}]);
|
|
} finally {
|
|
if (previousWindow === undefined) {
|
|
Reflect.deleteProperty(globalThis, "window");
|
|
} else {
|
|
Object.defineProperty(globalThis, "window", {
|
|
configurable: true,
|
|
value: previousWindow,
|
|
});
|
|
}
|
|
}
|
|
});
|
|
|
|
test("compressed folder totals exclude directory entries", async () => {
|
|
const previousWindow = globalThis.window;
|
|
const started: Array<{ totalBytes: number; folderPath: string }> = [];
|
|
Object.defineProperty(globalThis, "window", {
|
|
configurable: true,
|
|
value: {
|
|
netcatty: {
|
|
checkCompressedUploadSupport: async () => ({
|
|
supported: true,
|
|
localTar: true,
|
|
remoteTar: true,
|
|
}),
|
|
startCompressedUpload: async (options: { totalBytes: number; folderPath: string; compressionId: string }) => {
|
|
started.push({ totalBytes: options.totalBytes, folderPath: options.folderPath });
|
|
return { compressionId: options.compressionId, success: true };
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
try {
|
|
const results = await uploadFoldersCompressed(
|
|
[["docs", [
|
|
{ file: null, localPath: "/tmp/docs", relativePath: "docs", isDirectory: true, size: 4096 },
|
|
{ file: null, localPath: "/tmp/docs/sub", relativePath: "docs/sub", isDirectory: true, size: 4096 },
|
|
{ file: null, localPath: "/tmp/docs/a.txt", relativePath: "docs/a.txt", isDirectory: false, size: 10 },
|
|
]]],
|
|
"/remote",
|
|
"sftp-1",
|
|
);
|
|
|
|
assert.deepEqual(results, [{ fileName: "docs", success: true }]);
|
|
assert.deepEqual(started, [{ totalBytes: 10, folderPath: "/tmp/docs" }]);
|
|
} finally {
|
|
if (previousWindow === undefined) {
|
|
Reflect.deleteProperty(globalThis, "window");
|
|
} else {
|
|
Object.defineProperty(globalThis, "window", {
|
|
configurable: true,
|
|
value: previousWindow,
|
|
});
|
|
}
|
|
}
|
|
});
|