дзеркало
https://github.com/l0ng-ai/openidea.git
синхронізовано 2026-11-09 19:25:54 +02:00
l0ng-ai
5f57ce962e
Pasting or dropping OS files into a remote project tree sent a client-local source path to the server, so nothing was copied. Local-source imports are now carried separately from project copies and uploaded over the session SFTP channel: streamed in bounded chunks, created exclusively, cancellable across all selected paths under one task, with partial files removed on failure. Symlinks and Unix file modes are preserved, and special files are skipped and reported. Project-internal paste keeps working when the OS clipboard is briefly unavailable. Native drop positions were assumed to be physical pixels, which shifted the target far from the pointer on Retina displays and with IDE zoom. A shared helper converts them to CSS coordinates for the project tree, the editor and Markdown drop handling, and the agent composer. Composer image drops are now read on the client in remote windows. Verified on macOS against a live SSH host. Windows and Linux were not run: the Windows conversion is unchanged, the Linux one changed. Copy out from a remote tree to the local machine still needs a download workflow.
78 рядки
3.3 KiB
TypeScript
78 рядки
3.3 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { commands } from "@/platform/ipc";
|
|
import { useRemote } from "@/platform/remote";
|
|
import { invokeLocal } from "@/platform/tauriCore";
|
|
import { useTasks } from "@/workbench/tasks";
|
|
import { beginLocalImport, tauriFs } from "./fs";
|
|
|
|
vi.mock("@/platform/tauriCore", async (original) => ({
|
|
...(await original<typeof import("@/platform/tauriCore")>()),
|
|
invokeLocal: vi.fn(async () => undefined),
|
|
}));
|
|
|
|
beforeEach(() => {
|
|
useTasks.setState({ tasks: [] });
|
|
useRemote.setState({
|
|
session: { sshConfig: "s", root: "/remote", host: "host", commands: ["fs_copy", "cancel_request"] },
|
|
});
|
|
});
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
useRemote.setState({ session: null });
|
|
useTasks.setState({ tasks: [] });
|
|
});
|
|
|
|
describe("client file routing", () => {
|
|
it("uploads OS files locally and cancels the client request rather than a remote one", async () => {
|
|
let finish!: (r: { status: "ok"; data: string[] }) => void;
|
|
const upload = vi.spyOn(commands, "remoteImportLocal").mockReturnValue(
|
|
new Promise((resolve) => {
|
|
finish = resolve;
|
|
}),
|
|
);
|
|
const copy = vi.spyOn(commands, "fsCopy");
|
|
const work = tauriFs.importLocal("/client/a", "/remote/a");
|
|
const task = useTasks.getState().tasks[0]!;
|
|
const request = upload.mock.calls[0]![2];
|
|
task.cancel!();
|
|
expect(invokeLocal).toHaveBeenCalledWith("cancel_request", { id: request });
|
|
finish({ status: "ok", data: [] });
|
|
await work;
|
|
expect(upload).toHaveBeenCalledWith("/client/a", "/remote/a", request);
|
|
expect(copy).not.toHaveBeenCalled();
|
|
expect(useTasks.getState().tasks[0]?.done).toBe(true);
|
|
});
|
|
|
|
it("surfaces a disconnected upload and finishes its task", async () => {
|
|
vi.spyOn(commands, "remoteImportLocal").mockResolvedValue({
|
|
status: "error",
|
|
error: { kind: "unavailable", message: "Remote project is disconnected" },
|
|
});
|
|
await expect(tauriFs.importLocal("/client/a", "/remote/a")).rejects.toThrow("Remote project is disconnected");
|
|
expect(useTasks.getState().tasks[0]?.done).toBe(true);
|
|
});
|
|
|
|
it("shares one task across paths and prevents starting another after Cancel", async () => {
|
|
const upload = vi.spyOn(commands, "remoteImportLocal").mockResolvedValue({ status: "ok", data: [] });
|
|
const batch = beginLocalImport();
|
|
await tauriFs.importLocal("/client/a", "/remote/a", batch);
|
|
await tauriFs.importLocal("/client/b", "/remote/b", batch);
|
|
expect(useTasks.getState().tasks).toHaveLength(1);
|
|
expect(useTasks.getState().tasks[0]?.done).toBe(false);
|
|
useTasks.getState().tasks[0]!.cancel!();
|
|
await expect(tauriFs.importLocal("/client/c", "/remote/c", batch)).rejects.toMatchObject({ kind: "cancelled" });
|
|
expect(upload).toHaveBeenCalledTimes(2);
|
|
batch.finish();
|
|
expect(useTasks.getState().tasks[0]?.done).toBe(true);
|
|
});
|
|
|
|
it("uses project copy for a local destination", async () => {
|
|
useRemote.setState({ session: null });
|
|
const copy = vi.spyOn(commands, "fsCopy").mockResolvedValue({ status: "ok", data: null });
|
|
const upload = vi.spyOn(commands, "remoteImportLocal");
|
|
await tauriFs.importLocal("/client/a", "/project/a");
|
|
expect(copy).toHaveBeenCalledWith("/client/a", "/project/a");
|
|
expect(upload).not.toHaveBeenCalled();
|
|
});
|
|
});
|