mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-20 15:19:16 +00:00
* chore: 移除死代码并修复架构分层违规 - 删除未使用的 ACP 模块 (infrastructure/ai/acp/) - 删除未使用的 AI 组件 (ExecutionPlan, PermissionDialog) - 将 syncPayload.ts 从 domain 移至 application 层,修复分层违规 - 移除未使用的导出 (useSecurityState, useProviderStatus, GitHubAuthState, getAgentCommandLabel, ImageAttachment, HotkeyActions) - 收窄 Electron bridge module.exports,移除未使用的导出函数 - 将仅内部使用的函数/类型取消导出 (isSupportedLocale, SyncDashboard) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: 二次审查清理 — 移除更多死代码和架构违规 - 移除未使用的 ConversationEmptyState 组件和类型 - 移除未使用的 PromptInputSelect 系列组件 (5 个导出) - 移除 global.d.ts 中残留的 SMBConfig 类型和 cloudSyncSmb* 方法声明 - 移除 useAutoSync.ts 中未使用的 toast 导入 (同时修复 application→components 反向依赖) - 清理因删除而产生的多余 import Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: 消除直接 localStorage 访问,提取 safeSend 共享工具 localStorage 集中化: - 新增 storageKeys 常量: SIDE_PANEL_WIDTH, PF_RECONNECT_CANCEL, DEBUG_HOTKEYS, DEBUG_UPDATE_DEMO - TerminalLayer/SettingsApplicationTab/App.tsx/useUpdateCheck 改用 localStorageAdapter - CloudSyncManager 内部方法改用 localStorageAdapter - portForwardingService 改用 localStorageAdapter + 集中 key safeSend 去重: - 新增 electron/bridges/ipcUtils.cjs 共享模块 - sshBridge/sftpBridge/portForwardingBridge/sshAuthHelper/aiBridge 统一引用 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: 终审清理 — 移除未使用的 require 和废弃类型别名 - 移除 sftpBridge.cjs 中未使用的 require("node:net") - 移除 aiBridge.cjs 中未使用的 require("node:path") - 移除 types.ts 中已废弃的 ChatMessageImage 类型别名 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: 修复 ESLint 错误 — 组件不再直接导入 infrastructure - 新增 useStoredNumber hook,TerminalLayer 通过 hook 访问侧边栏宽度 - SettingsApplicationTab 的 isUpdateDemoMode 改为从 useUpdateCheck hook 传入 - 移除 useCloudSync.ts 中未使用的 CloudSyncManager 导入和 GitHubAuthState 接口 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: 提取 notification port,消除 application 层对 components 的依赖 将 toast 通知抽象为 application/notification.ts 端口, UI 层通过 setNotify 注入实现,useAutoSync 改用 notify 接口。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
239 lines
6.5 KiB
TypeScript
239 lines
6.5 KiB
TypeScript
import { useCallback, useEffect, useRef } from 'react';
|
|
import { KeyBinding, matchesKeyBinding } from '../../domain/models';
|
|
|
|
interface HotkeyActions {
|
|
// Tab management
|
|
switchToTab: (tabIndex: number) => void;
|
|
nextTab: () => void;
|
|
prevTab: () => void;
|
|
closeTab: () => void;
|
|
newTab: () => void;
|
|
|
|
// Navigation
|
|
openHosts: () => void;
|
|
openSftp: () => void;
|
|
quickSwitch: () => void;
|
|
commandPalette: () => void;
|
|
portForwarding: () => void;
|
|
snippets: () => void;
|
|
|
|
// Terminal actions (handled per-terminal)
|
|
copy: () => void;
|
|
paste: () => void;
|
|
selectAll: () => void;
|
|
clearBuffer: () => void;
|
|
searchTerminal: () => void;
|
|
|
|
// Workspace/split actions
|
|
splitHorizontal: () => void;
|
|
splitVertical: () => void;
|
|
moveFocus: (direction: 'up' | 'down' | 'left' | 'right') => void;
|
|
|
|
// App features
|
|
broadcast: () => void;
|
|
openLocal: () => void;
|
|
}
|
|
|
|
// Check if keyboard event matches our app-level shortcuts
|
|
// Returns the matched binding action or null
|
|
export const checkAppShortcut = (
|
|
e: KeyboardEvent,
|
|
keyBindings: KeyBinding[],
|
|
isMac: boolean
|
|
): { action: string; binding: KeyBinding } | null => {
|
|
for (const binding of keyBindings) {
|
|
const keyStr = isMac ? binding.mac : binding.pc;
|
|
if (matchesKeyBinding(e, keyStr, isMac)) {
|
|
return { action: binding.action, binding };
|
|
}
|
|
}
|
|
return null;
|
|
};
|
|
|
|
// Get list of key bindings that should be handled at app level (not by terminal)
|
|
export const getAppLevelActions = (): Set<string> => {
|
|
return new Set([
|
|
'switchToTab',
|
|
'nextTab',
|
|
'prevTab',
|
|
'closeTab',
|
|
'newTab',
|
|
'openHosts',
|
|
'openSftp',
|
|
'quickSwitch',
|
|
'commandPalette',
|
|
'portForwarding',
|
|
'snippets',
|
|
'splitHorizontal',
|
|
'splitVertical',
|
|
'moveFocus',
|
|
'broadcast',
|
|
'openLocal',
|
|
]);
|
|
};
|
|
|
|
// Terminal-level actions that xterm should not intercept
|
|
export const getTerminalPassthroughActions = (): Set<string> => {
|
|
return new Set([
|
|
'copy',
|
|
'paste',
|
|
'selectAll',
|
|
'clearBuffer',
|
|
'searchTerminal',
|
|
]);
|
|
};
|
|
|
|
interface UseGlobalHotkeysOptions {
|
|
hotkeyScheme: 'disabled' | 'mac' | 'pc';
|
|
keyBindings: KeyBinding[];
|
|
actions: Partial<HotkeyActions>;
|
|
orderedTabs: string[];
|
|
sessions: { id: string }[];
|
|
workspaces: { id: string }[];
|
|
isSettingsOpen?: boolean;
|
|
}
|
|
|
|
export const useGlobalHotkeys = ({
|
|
hotkeyScheme,
|
|
keyBindings,
|
|
actions,
|
|
orderedTabs,
|
|
sessions,
|
|
workspaces,
|
|
isSettingsOpen = false,
|
|
}: UseGlobalHotkeysOptions) => {
|
|
const actionsRef = useRef(actions);
|
|
actionsRef.current = actions;
|
|
|
|
const orderedTabsRef = useRef(orderedTabs);
|
|
orderedTabsRef.current = orderedTabs;
|
|
|
|
const sessionsRef = useRef(sessions);
|
|
sessionsRef.current = sessions;
|
|
|
|
const workspacesRef = useRef(workspaces);
|
|
workspacesRef.current = workspaces;
|
|
|
|
const handleGlobalKeyDown = useCallback((e: KeyboardEvent) => {
|
|
if (hotkeyScheme === 'disabled') return;
|
|
if (isSettingsOpen) return; // Don't handle hotkeys when settings is open
|
|
|
|
const isMac = hotkeyScheme === 'mac';
|
|
const appLevelActions = getAppLevelActions();
|
|
|
|
// Check if this is an app-level shortcut
|
|
const matched = checkAppShortcut(e, keyBindings, isMac);
|
|
if (!matched) return;
|
|
|
|
const { action, binding: _binding } = matched;
|
|
|
|
// Only handle app-level actions here
|
|
// Terminal-level actions are handled by the terminal itself
|
|
if (!appLevelActions.has(action)) return;
|
|
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
|
|
const currentActions = actionsRef.current;
|
|
switch (action) {
|
|
case 'switchToTab': {
|
|
const num = parseInt(e.key, 10);
|
|
if (num >= 1 && num <= 9) {
|
|
currentActions.switchToTab?.(num);
|
|
}
|
|
break;
|
|
}
|
|
case 'nextTab':
|
|
currentActions.nextTab?.();
|
|
break;
|
|
case 'prevTab':
|
|
currentActions.prevTab?.();
|
|
break;
|
|
case 'closeTab':
|
|
currentActions.closeTab?.();
|
|
break;
|
|
case 'newTab':
|
|
currentActions.newTab?.();
|
|
break;
|
|
case 'openHosts':
|
|
currentActions.openHosts?.();
|
|
break;
|
|
case 'openSftp':
|
|
currentActions.openSftp?.();
|
|
break;
|
|
case 'openLocal':
|
|
currentActions.openLocal?.();
|
|
break;
|
|
case 'quickSwitch':
|
|
currentActions.quickSwitch?.();
|
|
break;
|
|
case 'commandPalette':
|
|
currentActions.commandPalette?.();
|
|
break;
|
|
case 'portForwarding':
|
|
currentActions.portForwarding?.();
|
|
break;
|
|
case 'snippets':
|
|
currentActions.snippets?.();
|
|
break;
|
|
case 'splitHorizontal':
|
|
currentActions.splitHorizontal?.();
|
|
break;
|
|
case 'splitVertical':
|
|
currentActions.splitVertical?.();
|
|
break;
|
|
case 'moveFocus': {
|
|
// Determine direction from arrow key
|
|
const key = e.key;
|
|
if (key === 'ArrowUp') currentActions.moveFocus?.('up');
|
|
else if (key === 'ArrowDown') currentActions.moveFocus?.('down');
|
|
else if (key === 'ArrowLeft') currentActions.moveFocus?.('left');
|
|
else if (key === 'ArrowRight') currentActions.moveFocus?.('right');
|
|
break;
|
|
}
|
|
case 'broadcast':
|
|
currentActions.broadcast?.();
|
|
break;
|
|
}
|
|
}, [hotkeyScheme, keyBindings, isSettingsOpen]);
|
|
|
|
useEffect(() => {
|
|
// Use capture phase to intercept before xterm
|
|
window.addEventListener('keydown', handleGlobalKeyDown, true);
|
|
return () => window.removeEventListener('keydown', handleGlobalKeyDown, true);
|
|
}, [handleGlobalKeyDown]);
|
|
};
|
|
|
|
// Helper to create key event handler for xterm's attachCustomKeyEventHandler
|
|
// Returns false to let xterm handle the key, true to prevent xterm from handling
|
|
export const createXtermKeyHandler = (
|
|
keyBindings: KeyBinding[],
|
|
isMac: boolean,
|
|
onTerminalAction?: (action: string, e: KeyboardEvent) => void
|
|
) => {
|
|
const appLevelActions = getAppLevelActions();
|
|
const terminalActions = getTerminalPassthroughActions();
|
|
|
|
return (e: KeyboardEvent): boolean => {
|
|
const matched = checkAppShortcut(e, keyBindings, isMac);
|
|
if (!matched) return true; // Let xterm handle it
|
|
|
|
const { action } = matched;
|
|
|
|
// App-level actions: prevent xterm from handling, let global handler take over
|
|
if (appLevelActions.has(action)) {
|
|
return false; // Don't let xterm handle, will bubble to global handler
|
|
}
|
|
|
|
// Terminal-level actions: handle here and prevent default
|
|
if (terminalActions.has(action)) {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
onTerminalAction?.(action, e);
|
|
return false;
|
|
}
|
|
|
|
return true; // Let xterm handle other keys
|
|
};
|
|
};
|