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.
164 lines
4.3 KiB
TypeScript
164 lines
4.3 KiB
TypeScript
import type { UploadBridge } from "./uploadService.types";
|
|
|
|
export class UploadController {
|
|
private cancelled = false;
|
|
private activeFileTransferIds = new Set<string>();
|
|
private activeCompressionIds = new Set<string>();
|
|
private currentTransferId = "";
|
|
private bridge: UploadBridge | null = null;
|
|
private cancelListeners = new Set<() => void>();
|
|
|
|
/**
|
|
* Register a listener fired as soon as cancel() is requested (before async
|
|
* cleanup). Used to abort in-flight local tree scans.
|
|
*/
|
|
addCancelListener(listener: () => void): () => void {
|
|
this.cancelListeners.add(listener);
|
|
return () => {
|
|
this.cancelListeners.delete(listener);
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Cancel all active uploads
|
|
*/
|
|
async cancel(): Promise<void> {
|
|
this.cancelled = true;
|
|
for (const listener of Array.from(this.cancelListeners)) {
|
|
try {
|
|
listener();
|
|
} catch {
|
|
// Ignore listener errors so cancel still drains transfers.
|
|
}
|
|
}
|
|
|
|
// Cancel all active compressed uploads
|
|
const activeCompressionIds = Array.from(this.activeCompressionIds);
|
|
for (const compressionId of activeCompressionIds) {
|
|
try {
|
|
// Import and call cancelCompressedUpload
|
|
const { cancelCompressedUpload } = await import('../infrastructure/services/compressUploadService');
|
|
await cancelCompressedUpload(compressionId);
|
|
} catch {
|
|
// Ignore cancel errors
|
|
}
|
|
}
|
|
|
|
// Cancel all active file uploads
|
|
const activeIds = Array.from(this.activeFileTransferIds);
|
|
for (const transferId of activeIds) {
|
|
try {
|
|
if (this.bridge?.cancelStagedUploadFile) {
|
|
await this.bridge.cancelStagedUploadFile(transferId);
|
|
}
|
|
if (this.bridge?.cancelTransfer) {
|
|
await this.bridge.cancelTransfer(transferId);
|
|
}
|
|
} catch {
|
|
// Ignore cancel errors
|
|
}
|
|
}
|
|
|
|
// Also cancel current one if not in the set
|
|
if (this.currentTransferId && !activeIds.includes(this.currentTransferId)) {
|
|
try {
|
|
if (this.bridge?.cancelTransfer) {
|
|
await this.bridge.cancelTransfer(this.currentTransferId);
|
|
}
|
|
} catch {
|
|
// Ignore cancel errors
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Check if upload was cancelled
|
|
*/
|
|
isCancelled(): boolean {
|
|
return this.cancelled;
|
|
}
|
|
|
|
/**
|
|
* Get all active transfer IDs
|
|
*/
|
|
getActiveTransferIds(): string[] {
|
|
const ids = Array.from(this.activeFileTransferIds);
|
|
if (this.currentTransferId && !ids.includes(this.currentTransferId)) {
|
|
ids.push(this.currentTransferId);
|
|
}
|
|
// Also include compression IDs
|
|
const compressionIds = Array.from(this.activeCompressionIds);
|
|
return [...ids, ...compressionIds];
|
|
}
|
|
|
|
/**
|
|
* Reset controller state for a brand-new upload session.
|
|
* Prefer prepareForEntries when the controller already owns an external drop
|
|
* (scan cancel listeners must stay attached until the drop settles).
|
|
*/
|
|
reset(): void {
|
|
this.cancelled = false;
|
|
this.cancelListeners.clear();
|
|
this.activeFileTransferIds.clear();
|
|
this.activeCompressionIds.clear();
|
|
this.currentTransferId = "";
|
|
}
|
|
|
|
/**
|
|
* Soft prepare for entry upload without clearing cancel latches/listeners.
|
|
* External drop flows attach scan/conflict cancel listeners before entries
|
|
* are ready; a full reset would leave the scanning row uncancelable.
|
|
*/
|
|
prepareForEntries(): void {
|
|
this.activeFileTransferIds.clear();
|
|
this.activeCompressionIds.clear();
|
|
this.currentTransferId = "";
|
|
}
|
|
|
|
/**
|
|
* Set the bridge for cancellation
|
|
*/
|
|
setBridge(bridge: UploadBridge): void {
|
|
this.bridge = bridge;
|
|
}
|
|
|
|
/**
|
|
* Track a file transfer ID
|
|
*/
|
|
addActiveTransfer(id: string): void {
|
|
this.activeFileTransferIds.add(id);
|
|
this.currentTransferId = id;
|
|
}
|
|
|
|
/**
|
|
* Remove a tracked file transfer ID
|
|
*/
|
|
removeActiveTransfer(id: string): void {
|
|
this.activeFileTransferIds.delete(id);
|
|
if (this.currentTransferId === id) {
|
|
this.currentTransferId = "";
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Clear current transfer ID
|
|
*/
|
|
clearCurrentTransfer(): void {
|
|
this.currentTransferId = "";
|
|
}
|
|
|
|
/**
|
|
* Track a compression ID
|
|
*/
|
|
addActiveCompression(id: string): void {
|
|
this.activeCompressionIds.add(id);
|
|
}
|
|
|
|
/**
|
|
* Remove a tracked compression ID
|
|
*/
|
|
removeActiveCompression(id: string): void {
|
|
this.activeCompressionIds.delete(id);
|
|
}
|
|
}
|