Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6015f8669b | ||
|
|
703ebdd557 | ||
|
|
d462381cce | ||
|
|
10dc3f9cbe | ||
|
|
cf1c10495b | ||
|
|
0b923051c6 |
BIN
docs/screenshots/stats-and-status-bars.png
Normal file
BIN
docs/screenshots/stats-and-status-bars.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@ -14,3 +14,4 @@ pub mod updater;
|
|||||||
pub mod tools_commands_r2;
|
pub mod tools_commands_r2;
|
||||||
pub mod workspace_commands;
|
pub mod workspace_commands;
|
||||||
pub mod docker_commands;
|
pub mod docker_commands;
|
||||||
|
pub mod window_commands;
|
||||||
|
|||||||
40
src-tauri/src/commands/window_commands.rs
Normal file
40
src-tauri/src/commands/window_commands.rs
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
use tauri::AppHandle;
|
||||||
|
use tauri::WebviewWindowBuilder;
|
||||||
|
|
||||||
|
/// Open a child window from the Rust side using WebviewWindowBuilder.
|
||||||
|
///
|
||||||
|
/// The `url` parameter supports hash fragments (e.g. "index.html#/tool/ping?sessionId=abc").
|
||||||
|
/// WebviewUrl::App takes a PathBuf and cannot handle hash/query — so we load plain
|
||||||
|
/// index.html and set the hash via JS after the window is created.
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn open_child_window(
|
||||||
|
app_handle: AppHandle,
|
||||||
|
label: String,
|
||||||
|
title: String,
|
||||||
|
url: String,
|
||||||
|
width: f64,
|
||||||
|
height: f64,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
// Split "index.html#/tool/ping?sessionId=abc" into path and fragment
|
||||||
|
let (path, hash) = match url.split_once('#') {
|
||||||
|
Some((p, h)) => (p.to_string(), Some(format!("#{}", h))),
|
||||||
|
None => (url.clone(), None),
|
||||||
|
};
|
||||||
|
|
||||||
|
let webview_url = tauri::WebviewUrl::App(path.into());
|
||||||
|
let window = WebviewWindowBuilder::new(&app_handle, &label, webview_url)
|
||||||
|
.title(&title)
|
||||||
|
.inner_size(width, height)
|
||||||
|
.resizable(true)
|
||||||
|
.center()
|
||||||
|
.build()
|
||||||
|
.map_err(|e| format!("Failed to create window '{}': {}", label, e))?;
|
||||||
|
|
||||||
|
// Set the hash fragment after the window loads — this triggers App.vue's
|
||||||
|
// onMounted hash detection to render the correct tool/detached component.
|
||||||
|
if let Some(hash) = hash {
|
||||||
|
let _ = window.eval(&format!("window.location.hash = '{}';", hash));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@ -234,6 +234,7 @@ pub fn run() {
|
|||||||
commands::updater::check_for_updates,
|
commands::updater::check_for_updates,
|
||||||
commands::workspace_commands::save_workspace, commands::workspace_commands::load_workspace,
|
commands::workspace_commands::save_workspace, commands::workspace_commands::load_workspace,
|
||||||
commands::docker_commands::docker_list_containers, commands::docker_commands::docker_list_images, commands::docker_commands::docker_list_volumes, commands::docker_commands::docker_action,
|
commands::docker_commands::docker_list_containers, commands::docker_commands::docker_list_images, commands::docker_commands::docker_list_volumes, commands::docker_commands::docker_action,
|
||||||
|
commands::window_commands::open_child_window,
|
||||||
])
|
])
|
||||||
.run(tauri::generate_context!())
|
.run(tauri::generate_context!())
|
||||||
.expect("error while running tauri application");
|
.expect("error while running tauri application");
|
||||||
|
|||||||
29
src/App.vue
29
src/App.vue
@ -2,15 +2,12 @@
|
|||||||
import { ref, onMounted, onErrorCaptured, defineAsyncComponent } from "vue";
|
import { ref, onMounted, onErrorCaptured, defineAsyncComponent } from "vue";
|
||||||
import { useAppStore } from "@/stores/app.store";
|
import { useAppStore } from "@/stores/app.store";
|
||||||
import UnlockLayout from "@/layouts/UnlockLayout.vue";
|
import UnlockLayout from "@/layouts/UnlockLayout.vue";
|
||||||
|
import ToolWindow from "@/components/tools/ToolWindow.vue";
|
||||||
|
|
||||||
const MainLayout = defineAsyncComponent({
|
const MainLayout = defineAsyncComponent({
|
||||||
loader: () => import("@/layouts/MainLayout.vue"),
|
loader: () => import("@/layouts/MainLayout.vue"),
|
||||||
onError(error) { console.error("[App] MainLayout load failed:", error); },
|
onError(error) { console.error("[App] MainLayout load failed:", error); },
|
||||||
});
|
});
|
||||||
const ToolWindow = defineAsyncComponent({
|
|
||||||
loader: () => import("@/components/tools/ToolWindow.vue"),
|
|
||||||
onError(error) { console.error("[App] ToolWindow load failed:", error); },
|
|
||||||
});
|
|
||||||
const DetachedSession = defineAsyncComponent({
|
const DetachedSession = defineAsyncComponent({
|
||||||
loader: () => import("@/components/session/DetachedSession.vue"),
|
loader: () => import("@/components/session/DetachedSession.vue"),
|
||||||
onError(error) { console.error("[App] DetachedSession load failed:", error); },
|
onError(error) { console.error("[App] DetachedSession load failed:", error); },
|
||||||
@ -19,7 +16,6 @@ const DetachedSession = defineAsyncComponent({
|
|||||||
const app = useAppStore();
|
const app = useAppStore();
|
||||||
const appError = ref<string | null>(null);
|
const appError = ref<string | null>(null);
|
||||||
|
|
||||||
// Tool window mode — detected from URL hash: #/tool/network-scanner?sessionId=abc
|
|
||||||
const isToolMode = ref(false);
|
const isToolMode = ref(false);
|
||||||
const isDetachedMode = ref(false);
|
const isDetachedMode = ref(false);
|
||||||
const toolName = ref("");
|
const toolName = ref("");
|
||||||
@ -31,32 +27,39 @@ onErrorCaptured((err) => {
|
|||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
onMounted(async () => {
|
/** Parse hash and set mode flags. Called on mount and on hashchange. */
|
||||||
const hash = window.location.hash;
|
function applyHash(hash: string): void {
|
||||||
if (hash.startsWith("#/tool/")) {
|
if (hash.startsWith("#/tool/")) {
|
||||||
isToolMode.value = true;
|
isToolMode.value = true;
|
||||||
const rest = hash.substring(7); // after "#/tool/"
|
const rest = hash.substring(7);
|
||||||
const [name, query] = rest.split("?");
|
const [name, query] = rest.split("?");
|
||||||
toolName.value = name;
|
toolName.value = name;
|
||||||
toolSessionId.value = new URLSearchParams(query || "").get("sessionId") || "";
|
toolSessionId.value = new URLSearchParams(query || "").get("sessionId") || "";
|
||||||
} else if (hash.startsWith("#/detached-session")) {
|
} else if (hash.startsWith("#/detached-session")) {
|
||||||
isDetachedMode.value = true;
|
isDetachedMode.value = true;
|
||||||
} else {
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
// Check hash at load time (present if JS-side WebviewWindow set it in the URL)
|
||||||
|
applyHash(window.location.hash);
|
||||||
|
|
||||||
|
// Also listen for hash changes (Rust-side window sets hash via eval after load)
|
||||||
|
window.addEventListener("hashchange", () => applyHash(window.location.hash));
|
||||||
|
|
||||||
|
// Only init vault for the main app window (no hash)
|
||||||
|
if (!isToolMode.value && !isDetachedMode.value) {
|
||||||
await app.checkVaultState();
|
await app.checkVaultState();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<!-- Error display for debugging -->
|
|
||||||
<div v-if="appError" class="fixed inset-0 z-50 flex items-center justify-center bg-[#0d1117] text-red-400 p-8 text-sm font-mono whitespace-pre-wrap">
|
<div v-if="appError" class="fixed inset-0 z-50 flex items-center justify-center bg-[#0d1117] text-red-400 p-8 text-sm font-mono whitespace-pre-wrap">
|
||||||
{{ appError }}
|
{{ appError }}
|
||||||
</div>
|
</div>
|
||||||
<!-- Detached session window mode -->
|
|
||||||
<DetachedSession v-else-if="isDetachedMode" />
|
<DetachedSession v-else-if="isDetachedMode" />
|
||||||
<!-- Tool popup window mode -->
|
|
||||||
<ToolWindow v-else-if="isToolMode" :tool="toolName" :session-id="toolSessionId" />
|
<ToolWindow v-else-if="isToolMode" :tool="toolName" :session-id="toolSessionId" />
|
||||||
<!-- Normal app mode -->
|
|
||||||
<div v-else class="app-root">
|
<div v-else class="app-root">
|
||||||
<UnlockLayout v-if="!app.isUnlocked" />
|
<UnlockLayout v-if="!app.isUnlocked" />
|
||||||
<MainLayout v-else />
|
<MainLayout v-else />
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
.terminal-container {
|
.terminal-container {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
min-height: 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background: var(--wraith-bg-primary);
|
background: var(--wraith-bg-primary);
|
||||||
|
|||||||
@ -204,15 +204,21 @@ onBeforeUnmount(() => {
|
|||||||
if (resizeTimeout) { clearTimeout(resizeTimeout); resizeTimeout = null; }
|
if (resizeTimeout) { clearTimeout(resizeTimeout); resizeTimeout = null; }
|
||||||
});
|
});
|
||||||
|
|
||||||
// Focus canvas, re-check dimensions, and force full frame on tab switch
|
// Focus canvas, re-check dimensions, and force full frame on tab switch.
|
||||||
|
// Uses 300ms delay to let the flex layout fully settle (copilot panel toggle, etc.)
|
||||||
watch(
|
watch(
|
||||||
() => props.isActive,
|
() => props.isActive,
|
||||||
(active) => {
|
(active) => {
|
||||||
if (!active || !canvasRef.value) return;
|
if (!active || !canvasRef.value) return;
|
||||||
|
|
||||||
// Wait for layout to settle after tab becomes visible
|
// Immediate focus so keyboard works right away
|
||||||
requestAnimationFrame(() => {
|
if (keyboardGrabbed.value) canvasRef.value.focus();
|
||||||
requestAnimationFrame(() => {
|
|
||||||
|
// Immediate force refresh to show SOMETHING while we check dimensions
|
||||||
|
invoke("rdp_force_refresh", { sessionId: props.sessionId }).catch(() => {});
|
||||||
|
|
||||||
|
// Delayed dimension check — layout needs time to settle
|
||||||
|
setTimeout(() => {
|
||||||
const wrapper = canvasWrapper.value;
|
const wrapper = canvasWrapper.value;
|
||||||
const canvas = canvasRef.value;
|
const canvas = canvasRef.value;
|
||||||
if (!wrapper || !canvas) return;
|
if (!wrapper || !canvas) return;
|
||||||
@ -221,27 +227,22 @@ watch(
|
|||||||
const newW = Math.round(cw) & ~1;
|
const newW = Math.round(cw) & ~1;
|
||||||
const newH = Math.round(ch);
|
const newH = Math.round(ch);
|
||||||
|
|
||||||
// If container size differs from canvas resolution, resize the RDP session
|
|
||||||
if (newW >= 200 && newH >= 200 && (newW !== canvas.width || newH !== canvas.height)) {
|
if (newW >= 200 && newH >= 200 && (newW !== canvas.width || newH !== canvas.height)) {
|
||||||
invoke("rdp_resize", {
|
invoke("rdp_resize", {
|
||||||
sessionId: props.sessionId,
|
sessionId: props.sessionId,
|
||||||
width: newW,
|
width: newW,
|
||||||
height: newH,
|
height: newH,
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
|
if (canvas) {
|
||||||
canvas.width = newW;
|
canvas.width = newW;
|
||||||
canvas.height = newH;
|
canvas.height = newH;
|
||||||
|
}
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
invoke("rdp_force_refresh", { sessionId: props.sessionId }).catch(() => {});
|
invoke("rdp_force_refresh", { sessionId: props.sessionId }).catch(() => {});
|
||||||
}, 200);
|
}, 500);
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
} else {
|
|
||||||
// Same size — just refresh the frame
|
|
||||||
invoke("rdp_force_refresh", { sessionId: props.sessionId }).catch(() => {});
|
|
||||||
}
|
}
|
||||||
|
}, 300);
|
||||||
if (keyboardGrabbed.value) canvas.focus();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -133,17 +133,14 @@ async function detachTab(): Promise<void> {
|
|||||||
session.active = false;
|
session.active = false;
|
||||||
|
|
||||||
// Open a new Tauri window for this session
|
// Open a new Tauri window for this session
|
||||||
const { WebviewWindow } = await import("@tauri-apps/api/webviewWindow");
|
try {
|
||||||
const label = `detached-${session.id.substring(0, 8)}-${Date.now()}`;
|
await invoke("open_child_window", {
|
||||||
const wv = new WebviewWindow(label, {
|
label: `detached-${session.id.substring(0, 8)}-${Date.now()}`,
|
||||||
title: `${session.name} — Wraith`,
|
title: `${session.name} — Wraith`,
|
||||||
width: 900,
|
|
||||||
height: 600,
|
|
||||||
resizable: true,
|
|
||||||
center: true,
|
|
||||||
url: `index.html#/detached-session?sessionId=${session.id}&name=${encodeURIComponent(session.name)}&protocol=${session.protocol}`,
|
url: `index.html#/detached-session?sessionId=${session.id}&name=${encodeURIComponent(session.name)}&protocol=${session.protocol}`,
|
||||||
|
width: 900, height: 600,
|
||||||
});
|
});
|
||||||
wv.once("tauri://error", (e) => { console.error("Detach window error:", e); });
|
} catch (err) { console.error("Detach window error:", err); }
|
||||||
}
|
}
|
||||||
|
|
||||||
function closeMenuTab(): void {
|
function closeMenuTab(): void {
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
v-if="stats"
|
v-if="stats"
|
||||||
class="flex items-center gap-4 px-3 h-6 bg-[var(--wraith-bg-tertiary)] border-t border-[var(--wraith-border)] text-[10px] font-mono shrink-0 select-none"
|
class="flex items-center gap-4 px-6 h-[48px] bg-[var(--wraith-bg-tertiary)] border-t border-[var(--wraith-border)] text-base font-mono shrink-0 select-none"
|
||||||
>
|
>
|
||||||
<!-- CPU -->
|
<!-- CPU -->
|
||||||
<span class="flex items-center gap-1">
|
<span class="flex items-center gap-1">
|
||||||
|
|||||||
@ -367,17 +367,14 @@ function closeHelpMenuDeferred(): void {
|
|||||||
|
|
||||||
async function handleHelpAction(page: string): Promise<void> {
|
async function handleHelpAction(page: string): Promise<void> {
|
||||||
showHelpMenu.value = false;
|
showHelpMenu.value = false;
|
||||||
const { WebviewWindow } = await import("@tauri-apps/api/webviewWindow");
|
try {
|
||||||
const label = `help-${page}-${Date.now()}`;
|
await invoke("open_child_window", {
|
||||||
const wv = new WebviewWindow(label, {
|
label: `help-${page}-${Date.now()}`,
|
||||||
title: `Wraith — Help`,
|
title: "Wraith — Help",
|
||||||
width: 750,
|
|
||||||
height: 600,
|
|
||||||
resizable: true,
|
|
||||||
center: true,
|
|
||||||
url: `index.html#/tool/help?page=${page}`,
|
url: `index.html#/tool/help?page=${page}`,
|
||||||
|
width: 750, height: 600,
|
||||||
});
|
});
|
||||||
wv.once("tauri://error", (e) => { console.error("Help window error:", e); alert("Window error: " + JSON.stringify(e.payload)); });
|
} catch (err) { console.error("Help window error:", err); alert("Window error: " + String(err)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleToolAction(tool: string): Promise<void> {
|
async function handleToolAction(tool: string): Promise<void> {
|
||||||
@ -391,8 +388,6 @@ async function handleToolAction(tool: string): Promise<void> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { WebviewWindow } = await import("@tauri-apps/api/webviewWindow");
|
|
||||||
|
|
||||||
const toolConfig: Record<string, { title: string; width: number; height: number }> = {
|
const toolConfig: Record<string, { title: string; width: number; height: number }> = {
|
||||||
"network-scanner": { title: "Network Scanner", width: 800, height: 600 },
|
"network-scanner": { title: "Network Scanner", width: 800, height: 600 },
|
||||||
"port-scanner": { title: "Port Scanner", width: 700, height: 500 },
|
"port-scanner": { title: "Port Scanner", width: 700, height: 500 },
|
||||||
@ -413,17 +408,14 @@ async function handleToolAction(tool: string): Promise<void> {
|
|||||||
|
|
||||||
const sessionId = activeSessionId.value || "";
|
const sessionId = activeSessionId.value || "";
|
||||||
|
|
||||||
// Open tool in a new Tauri window
|
try {
|
||||||
const label = `tool-${tool}-${Date.now()}`;
|
await invoke("open_child_window", {
|
||||||
const wv = new WebviewWindow(label, {
|
label: `tool-${tool}-${Date.now()}`,
|
||||||
title: `Wraith — ${config.title}`,
|
title: `Wraith — ${config.title}`,
|
||||||
width: config.width,
|
|
||||||
height: config.height,
|
|
||||||
resizable: true,
|
|
||||||
center: true,
|
|
||||||
url: `index.html#/tool/${tool}?sessionId=${sessionId}`,
|
url: `index.html#/tool/${tool}?sessionId=${sessionId}`,
|
||||||
|
width: config.width, height: config.height,
|
||||||
});
|
});
|
||||||
wv.once("tauri://error", (e) => { console.error("Tool window error:", e); alert("Window error: " + JSON.stringify(e.payload)); });
|
} catch (err) { console.error("Tool window error:", err); alert("Tool window error: " + String(err)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleFileMenuAction(action: string): Promise<void> {
|
async function handleFileMenuAction(action: string): Promise<void> {
|
||||||
@ -443,20 +435,14 @@ function handleThemeSelect(theme: ThemeDefinition): void {
|
|||||||
async function handleOpenFile(entry: FileEntry): Promise<void> {
|
async function handleOpenFile(entry: FileEntry): Promise<void> {
|
||||||
if (!activeSessionId.value) return;
|
if (!activeSessionId.value) return;
|
||||||
try {
|
try {
|
||||||
const { WebviewWindow } = await import("@tauri-apps/api/webviewWindow");
|
|
||||||
const fileName = entry.path.split("/").pop() || entry.path;
|
const fileName = entry.path.split("/").pop() || entry.path;
|
||||||
const label = `editor-${Date.now()}`;
|
|
||||||
const sessionId = activeSessionId.value;
|
const sessionId = activeSessionId.value;
|
||||||
|
await invoke("open_child_window", {
|
||||||
const wv = new WebviewWindow(label, {
|
label: `editor-${Date.now()}`,
|
||||||
title: `${fileName} — Wraith Editor`,
|
title: `${fileName} — Wraith Editor`,
|
||||||
width: 800,
|
|
||||||
height: 600,
|
|
||||||
resizable: true,
|
|
||||||
center: true,
|
|
||||||
url: `index.html#/tool/editor?sessionId=${sessionId}&path=${encodeURIComponent(entry.path)}`,
|
url: `index.html#/tool/editor?sessionId=${sessionId}&path=${encodeURIComponent(entry.path)}`,
|
||||||
|
width: 800, height: 600,
|
||||||
});
|
});
|
||||||
wv.once("tauri://error", (e) => { console.error("Editor window error:", e); alert("Window error: " + JSON.stringify(e.payload)); });
|
|
||||||
} catch (err) { console.error("Failed to open editor:", err); }
|
} catch (err) { console.error("Failed to open editor:", err); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user