mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-20 15:19:16 +00:00
* fix(#2826): automated Cursor CLI fix * fix(scripts): confirm bulk delete and clear host bindings Scripts side-panel mass-delete skipped confirmation and, when onSnippetsChange was wired, filtered snippets without clearing host login/connect script bindings. Confirm first, always dispatch the shared delete event, and apply deletes via deleteSelectedSnippetsFromVault. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(scripts): harden delete handler against stale vault state Read snippets/hosts from refs in the shared delete listener so rapid confirms cannot resurrect already-removed items, and clear pending bulk delete when the scripts panel hides so the confirm dialog does not resurface after a mid-prompt hide. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(scripts): keep delete refs current within the same tick Update snippetsRef/hostsRef immediately after applying a delete so a same-tick second event cannot rebuild vault state from the pre-delete snapshot and resurrect removed snippets or host bindings. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: address Codex review on PR #2828 * fix(scripts): hoist bulk-delete confirm outside toolbar popover Portalled Dialog focus dismissed the compact Scripts popover and cleared pendingDeleteIds before confirm. Own the confirm in TerminalToolbar and defer via onBulkDeleteRequest when nested in that popover. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: serialize snippet saves with bulk-delete vault lock updateSnippets wrote STORAGE_KEY_SNIPPETS without withVaultImportLock, so a concurrent edit could land between bulk-delete's snapshot read and journal commit and be discarded. Queue ordinary snippet writes on the shared lock and include them in waitForPendingVaultWrites. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: rebase queued snippet saves onto latest vault snapshot Locking updateSnippets alone still wrote a pre-delete full array, so a popup bulk-delete could be resurrected (or a storage-event version bump could cancel the local edit). Rebase under the vault lock and supersede only newer local writers via snippetsWriteOwnerRef. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 * fix: address Codex review on PR #2828 --------- Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
195 lines
6.6 KiB
TypeScript
195 lines
6.6 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import { readFileSync } from "node:fs";
|
|
import React from "react";
|
|
import { renderToStaticMarkup } from "react-dom/server";
|
|
|
|
import { I18nProvider } from "../../application/i18n/I18nProvider.tsx";
|
|
import type { Host } from "../../types.ts";
|
|
import { TerminalToolbar } from "./TerminalToolbar.tsx";
|
|
|
|
const toolbarSource = readFileSync(new URL("./TerminalToolbar.tsx", import.meta.url), "utf8");
|
|
|
|
const sshHost: Host = {
|
|
id: "host-1",
|
|
label: "Host",
|
|
hostname: "example.com",
|
|
username: "root",
|
|
tags: [],
|
|
os: "linux",
|
|
protocol: "ssh",
|
|
};
|
|
|
|
const serialHost: Host = {
|
|
...sshHost,
|
|
id: "serial-1",
|
|
label: "Serial",
|
|
hostname: "/dev/tty.usbserial",
|
|
protocol: "serial",
|
|
};
|
|
|
|
const pluginHost: Host = {
|
|
...sshHost,
|
|
id: "plugin-1",
|
|
label: "Plugin",
|
|
hostname: "com.example.transport.connection",
|
|
protocol: "plugin:com.example.transport.connection",
|
|
};
|
|
|
|
const renderToolbar = (
|
|
host: Host,
|
|
status: "connecting" | "connected" | "disconnected" = "connected",
|
|
props: Partial<React.ComponentProps<typeof TerminalToolbar>> = {},
|
|
) =>
|
|
renderToStaticMarkup(
|
|
React.createElement(
|
|
I18nProvider,
|
|
{ locale: "en" },
|
|
React.createElement(TerminalToolbar, {
|
|
sessionId: 'session-1',
|
|
status,
|
|
host,
|
|
onOpenSFTP: () => {},
|
|
onOpenScripts: () => {},
|
|
onOpenTheme: () => {},
|
|
...props,
|
|
}),
|
|
),
|
|
);
|
|
|
|
test("keeps SFTP visible before the terminal overflow menu for SSH sessions", () => {
|
|
const markup = renderToolbar(sshHost);
|
|
|
|
const sftpIndex = markup.indexOf('aria-label="Open SFTP"');
|
|
const moreIndex = markup.indexOf('aria-label="More actions"');
|
|
|
|
assert.notEqual(sftpIndex, -1);
|
|
assert.notEqual(moreIndex, -1);
|
|
assert.ok(sftpIndex < moreIndex);
|
|
});
|
|
|
|
test("keeps Scripts visible before the terminal overflow menu", () => {
|
|
const markup = renderToolbar(sshHost);
|
|
|
|
const scriptsIndex = markup.indexOf('aria-label="Scripts"');
|
|
const moreIndex = markup.indexOf('aria-label="More actions"');
|
|
|
|
assert.notEqual(scriptsIndex, -1);
|
|
assert.notEqual(moreIndex, -1);
|
|
assert.ok(scriptsIndex < moreIndex);
|
|
assert.equal(markup.match(/Scripts/g)?.length, 1);
|
|
assert.match(markup, /type="button"[^>]*aria-label="Scripts"/);
|
|
});
|
|
|
|
test("shows manual session log button when requested", () => {
|
|
const markup = renderToolbar(sshHost, "connected", {
|
|
showLogButton: true,
|
|
onToggleSessionLog: () => {},
|
|
});
|
|
|
|
const logIndex = markup.indexOf('aria-label="Start session log"');
|
|
const scriptsIndex = markup.indexOf('aria-label="Scripts"');
|
|
|
|
assert.notEqual(logIndex, -1);
|
|
assert.notEqual(scriptsIndex, -1);
|
|
assert.ok(logIndex < scriptsIndex);
|
|
});
|
|
|
|
test("marks manual session log button active while logging", () => {
|
|
const markup = renderToolbar(sshHost, "connected", {
|
|
showLogButton: true,
|
|
onToggleSessionLog: () => {},
|
|
isSessionLogging: true,
|
|
});
|
|
|
|
assert.match(
|
|
markup,
|
|
/aria-label="Stop session log"[^>]*aria-pressed="true"[^>]*style="background-color:var\(--terminal-toolbar-btn-active\)"/,
|
|
);
|
|
});
|
|
|
|
test("hides SFTP for local terminal sessions", () => {
|
|
const markup = renderToolbar({
|
|
...sshHost,
|
|
id: "local-1",
|
|
protocol: "local",
|
|
});
|
|
|
|
assert.equal(markup.includes('aria-label="Open SFTP"'), false);
|
|
});
|
|
|
|
test("hides SSH history for plugin terminal sessions", () => {
|
|
const markup = renderToolbar(pluginHost, "connected", {
|
|
onOpenHistory: () => {},
|
|
});
|
|
|
|
assert.equal(markup.includes('aria-label="Command history"'), false);
|
|
});
|
|
|
|
test("shows YMODEM send only for connected serial sessions", () => {
|
|
const connectedSerial = renderToolbar(serialHost, "connected", {
|
|
onSendYmodem: () => {},
|
|
onReceiveYmodem: () => {},
|
|
});
|
|
const disconnectedSerial = renderToolbar(serialHost, "disconnected", {
|
|
onSendYmodem: () => {},
|
|
onReceiveYmodem: () => {},
|
|
});
|
|
const ssh = renderToolbar(sshHost, "connected", {
|
|
onSendYmodem: () => {},
|
|
onReceiveYmodem: () => {},
|
|
});
|
|
const local = renderToolbar({
|
|
...sshHost,
|
|
id: "local-1",
|
|
protocol: "local",
|
|
}, "connected", {
|
|
onSendYmodem: () => {},
|
|
onReceiveYmodem: () => {},
|
|
});
|
|
|
|
assert.equal(connectedSerial.includes('aria-label="Send with YMODEM"'), true);
|
|
assert.equal(connectedSerial.includes('aria-label="Receive with YMODEM"'), true);
|
|
assert.doesNotMatch(connectedSerial, /aria-label="Send with YMODEM"[^>]*disabled/);
|
|
assert.equal(disconnectedSerial.includes('aria-label="Send with YMODEM - Available after connect"'), true);
|
|
assert.equal(disconnectedSerial.includes('aria-label="Receive with YMODEM - Available after connect"'), true);
|
|
assert.match(disconnectedSerial, /aria-label="Send with YMODEM - Available after connect"[^>]*disabled/);
|
|
assert.match(disconnectedSerial, /aria-label="Receive with YMODEM - Available after connect"[^>]*disabled/);
|
|
assert.equal(ssh.includes('aria-label="Send with YMODEM"'), false);
|
|
assert.equal(ssh.includes('aria-label="Receive with YMODEM"'), false);
|
|
assert.equal(local.includes('aria-label="Send with YMODEM"'), false);
|
|
assert.equal(local.includes('aria-label="Receive with YMODEM"'), false);
|
|
});
|
|
|
|
test("uses the terminal active button color for pressed toolbar actions", () => {
|
|
const markup = renderToolbar(sshHost, "connected", {
|
|
isSearchOpen: true,
|
|
onToggleSearch: () => {},
|
|
});
|
|
|
|
assert.match(
|
|
markup,
|
|
/aria-label="Search terminal"[^>]*style="background-color:var\(--terminal-toolbar-btn-active\)"/,
|
|
);
|
|
});
|
|
|
|
test("compact scripts popover hosts bulk-delete confirm outside the popover", () => {
|
|
// Dialog focus leaves PopoverContent; if confirm stays inside ScriptsSidePanel,
|
|
// the popover closes, isVisible clears pendingDeleteIds, and the prompt dies.
|
|
assert.match(toolbarSource, /onBulkDeleteRequest=\{setPendingScriptDeleteIds\}/);
|
|
assert.match(toolbarSource, /<VaultDeleteConfirmDialog/);
|
|
// Popup vault mutation goes through the prop; the event only clears popover selection.
|
|
assert.match(toolbarSource, /onDeleteSnippets\?\.\(new Set\(ids\)\)/);
|
|
assert.match(toolbarSource, /netcatty:snippets:delete/);
|
|
const scriptsPopoverIdx = toolbarSource.indexOf("open={scriptsPopoverOpen}");
|
|
const popoverEndIdx = toolbarSource.indexOf("</Popover>", scriptsPopoverIdx);
|
|
const dialogIdx = toolbarSource.indexOf("<VaultDeleteConfirmDialog", popoverEndIdx);
|
|
assert.ok(scriptsPopoverIdx >= 0, "scripts popover open binding");
|
|
assert.ok(popoverEndIdx > scriptsPopoverIdx, "scripts popover closes");
|
|
assert.ok(dialogIdx > popoverEndIdx, "confirm dialog is a sibling after the popover");
|
|
assert.equal(
|
|
toolbarSource.includes("document.querySelector('[data-vault-delete-confirm=\"true\"]')"),
|
|
false,
|
|
);
|
|
});
|