9 Commits

8 changed files with 596 additions and 56 deletions
+111 -2
View File
@@ -4,6 +4,7 @@ SSH web client — Flask backend: auth, MariaDB, encrypted identities, WebSocket
from __future__ import annotations from __future__ import annotations
import os import os
import socket
if os.getenv("GEVENT_MONKEY_PATCH", "").lower() in ("1", "true", "yes"): if os.getenv("GEVENT_MONKEY_PATCH", "").lower() in ("1", "true", "yes"):
from gevent import monkey from gevent import monkey
@@ -164,6 +165,13 @@ def init_db():
CONSTRAINT fk_host_tags_tag FOREIGN KEY (tag_id) CONSTRAINT fk_host_tags_tag FOREIGN KEY (tag_id)
REFERENCES ssh_tags(id) ON DELETE CASCADE REFERENCES ssh_tags(id) ON DELETE CASCADE
); );
CREATE TABLE IF NOT EXISTS ssh_snippets (
id INT AUTO_INCREMENT PRIMARY KEY,
label VARCHAR(255) NOT NULL,
command TEXT NOT NULL,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
);
""" """
with db_cursor() as (_, cur): with db_cursor() as (_, cur):
for stmt in ddl.split(";"): for stmt in ddl.split(";"):
@@ -876,7 +884,13 @@ def _connect_with_jump_chain(host_id: int) -> tuple[paramiko.SSHClient, paramiko
raise RuntimeError("failed to build jump chain") raise RuntimeError("failed to build jump chain")
def is_audit_log_enabled() -> bool:
return os.getenv("ENABLE_AUDIT_LOG", "true").lower() in ("1", "true", "yes")
def _insert_connection_audit(host_row: dict[str, Any]) -> int | None: def _insert_connection_audit(host_row: dict[str, Any]) -> int | None:
if not is_audit_log_enabled():
return None
try: try:
with db_cursor() as (_, cur): with db_cursor() as (_, cur):
cur.execute( cur.execute(
@@ -957,9 +971,10 @@ def api_logout():
@app.route("/api/me", methods=["GET"]) @app.route("/api/me", methods=["GET"])
def api_me(): def api_me():
version = app.config.get("VERSION", "unknown") version = app.config.get("VERSION", "unknown")
audit_enabled = is_audit_log_enabled()
if session.get("logged_in"): if session.get("logged_in"):
return jsonify({"logged_in": True, "app_version": version}) return jsonify({"logged_in": True, "app_version": version, "audit_log_enabled": audit_enabled})
return jsonify({"logged_in": False, "app_version": version}) return jsonify({"logged_in": False, "app_version": version, "audit_log_enabled": audit_enabled})
@app.route("/api/identities", methods=["GET"]) @app.route("/api/identities", methods=["GET"])
@@ -1103,6 +1118,80 @@ def delete_identity(iid: int):
return jsonify({"ok": True}) return jsonify({"ok": True})
@app.route("/api/snippets", methods=["GET"])
@require_auth("read:hosts")
def list_snippets():
with db_cursor() as (_, cur):
cur.execute("SELECT id, label, command, created_at, updated_at FROM ssh_snippets ORDER BY label ASC")
rows = cur.fetchall()
return jsonify({"items": rows})
@app.route("/api/snippets", methods=["POST"])
@require_auth("write:hosts")
def create_snippet():
req = request.get_json()
if not req:
return jsonify({"error": "invalid json"}), 400
label = (req.get("label") or "").strip()
command = req.get("command") or ""
if not label or not command:
return jsonify({"error": "label and command required"}), 400
with db_cursor() as (_, cur):
cur.execute(
"INSERT INTO ssh_snippets (label, command) VALUES (%s, %s)",
(label, command),
)
sid = cur.lastrowid
return jsonify({"id": sid}), 201
@app.route("/api/snippets/<int:sid>", methods=["PATCH"])
@require_auth("write:hosts")
def update_snippet(sid: int):
req = request.get_json()
if not req:
return jsonify({"error": "invalid json"}), 400
updates = []
args = []
if "label" in req:
label = (req["label"] or "").strip()
if not label:
return jsonify({"error": "label cannot be empty"}), 400
updates.append("label = %s")
args.append(label)
if "command" in req:
cmd = req["command"] or ""
if not cmd:
return jsonify({"error": "command cannot be empty"}), 400
updates.append("command = %s")
args.append(cmd)
if not updates:
return jsonify({"ok": True})
args.append(sid)
with db_cursor() as (_, cur):
cur.execute(
f"UPDATE ssh_snippets SET {', '.join(updates)} WHERE id = %s",
tuple(args),
)
if cur.rowcount == 0:
return jsonify({"error": "not found"}), 404
return jsonify({"ok": True})
@app.route("/api/snippets/<int:sid>", methods=["DELETE"])
@require_auth("write:hosts")
def delete_snippet(sid: int):
with db_cursor() as (_, cur):
cur.execute("DELETE FROM ssh_snippets WHERE id = %s", (sid,))
if cur.rowcount == 0:
return jsonify({"error": "not found"}), 404
return jsonify({"ok": True})
def _host_select_sql(extra_where: str = "") -> str: def _host_select_sql(extra_where: str = "") -> str:
return f""" return f"""
SELECT h.id, h.folder_id, h.label, h.hostname, h.port, h.identity_id, h.jump_host_id, SELECT h.id, h.folder_id, h.label, h.hostname, h.port, h.identity_id, h.jump_host_id,
@@ -1323,6 +1412,26 @@ def list_hosts():
return jsonify({"items": rows}) return jsonify({"items": rows})
@app.route("/api/hosts/<int:hid>/ping", methods=["GET"])
@require_auth("read:hosts")
def ping_host(hid: int):
with db_cursor() as (_, cur):
cur.execute("SELECT hostname, port FROM ssh_hosts WHERE id = %s", (hid,))
row = cur.fetchone()
if not row:
return jsonify({"error": "not found"}), 404
up = False
try:
with socket.create_connection((row["hostname"], row["port"]), timeout=2.0):
up = True
except Exception:
pass
return jsonify({"up": up})
@app.route("/api/tags", methods=["GET"]) @app.route("/api/tags", methods=["GET"])
@require_auth("read:hosts") @require_auth("read:hosts")
def list_tags(): def list_tags():
+2 -2
View File
@@ -8,12 +8,12 @@
href="https://assets.jdbnet.co.uk/projects/ssh.png" href="https://assets.jdbnet.co.uk/projects/ssh.png"
/> />
<link rel="manifest" href="/manifest.webmanifest" /> <link rel="manifest" href="/manifest.webmanifest" />
<meta name="theme-color" content="#0f1419" /> <meta name="theme-color" content="#0d1117" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="preconnect" href="https://fonts.googleapis.com" /> <link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link <link
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500&family=IBM+Plex+Sans:wght@400;500;600&display=swap" href="https://fonts.googleapis.com/css2?family=DM+Mono:wght@400;500&family=Space+Grotesk:wght@400;500;600;700&display=swap"
rel="stylesheet" rel="stylesheet"
/> />
<title>SSH</title> <title>SSH</title>
+174 -2
View File
@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref } from "vue"; import { onMounted, onUnmounted, ref } from "vue";
import { Folder, Pencil, Trash2 } from "lucide-vue-next"; import { Folder, Pencil, Trash2, Radio, ChevronDown } from "lucide-vue-next";
import { import {
api, api,
type HostRow, type HostRow,
@@ -9,10 +9,12 @@ import {
type ConnectionAuditRow, type ConnectionAuditRow,
type ApiKeyRow, type ApiKeyRow,
type ApiKeyScopeDef, type ApiKeyScopeDef,
type SnippetRow,
} from "@/api"; } from "@/api";
import LoginForm from "@/components/LoginForm.vue"; import LoginForm from "@/components/LoginForm.vue";
import TabContent from "@/components/TabContent.vue"; import TabContent from "@/components/TabContent.vue";
import TagInput from "@/components/TagInput.vue"; import TagInput from "@/components/TagInput.vue";
import SnippetForm from "@/components/SnippetForm.vue";
interface TabItem { interface TabItem {
id: string; id: string;
@@ -23,6 +25,7 @@ interface TabItem {
const loggedIn = ref(false); const loggedIn = ref(false);
const checking = ref(true); const checking = ref(true);
const appVersion = ref("unknown"); const appVersion = ref("unknown");
const auditLogEnabled = ref(true);
const identities = ref<IdentityRow[]>([]); const identities = ref<IdentityRow[]>([]);
const allHosts = ref<HostRow[]>([]); const allHosts = ref<HostRow[]>([]);
const allFolders = ref<FolderRow[]>([]); const allFolders = ref<FolderRow[]>([]);
@@ -37,6 +40,95 @@ const tabs = ref<{ id: string; hostId: number; label: string }[]>([]);
const activePanes = ref<string[]>([]); const activePanes = ref<string[]>([]);
const draggedTabId = ref<string | null>(null); const draggedTabId = ref<string | null>(null);
const broadcastMode = ref(false);
const tabRefs = ref<Record<string, any>>({});
function setTabRef(el: any, id: string) {
if (el) tabRefs.value[id] = el;
else delete tabRefs.value[id];
}
function handleBroadcast(data: string, sourceId: string) {
if (!broadcastMode.value) return;
for (const paneId of activePanes.value) {
if (paneId !== sourceId && tabRefs.value[paneId]) {
tabRefs.value[paneId].sendData(data);
}
}
}
const snippets = ref<SnippetRow[]>([]);
const showSnippetsMenu = ref(false);
const showSnippetForm = ref(false);
const editingSnippet = ref<SnippetRow | null>(null);
const snippetsButtonRef = ref<HTMLElement | null>(null);
const snippetsMenuRef = ref<HTMLElement | null>(null);
function closeSnippetsMenu(e: MouseEvent) {
if (
showSnippetsMenu.value &&
!snippetsButtonRef.value?.contains(e.target as Node) &&
!snippetsMenuRef.value?.contains(e.target as Node)
) {
showSnippetsMenu.value = false;
}
}
onMounted(() => {
document.addEventListener("click", closeSnippetsMenu);
});
onUnmounted(() => {
document.removeEventListener("click", closeSnippetsMenu);
});
async function loadSnippets() {
try {
snippets.value = await api.listSnippets();
} catch (err: any) {
loadErr.value = err.message;
}
}
function runSnippet(command: string) {
showSnippetsMenu.value = false;
const targetPanes = broadcastMode.value ? activePanes.value : [activePanes.value[0]];
for (const paneId of targetPanes) {
if (paneId && tabRefs.value[paneId]) {
tabRefs.value[paneId].sendData(command + "\r");
}
}
}
async function saveSnippet(data: { label: string; command: string }) {
try {
if (editingSnippet.value) {
await api.updateSnippet(editingSnippet.value.id, data);
} else {
await api.createSnippet(data);
}
showSnippetForm.value = false;
await loadSnippets();
} catch (err: any) {
alert(err.message);
}
}
async function deleteSnippet(id: number) {
if (!confirm("Are you sure you want to delete this snippet?")) return;
try {
await api.deleteSnippet(id);
await loadSnippets();
} catch (err: any) {
alert(err.message);
}
}
function openEditSnippet(s?: SnippetRow) {
showSnippetsMenu.value = false;
editingSnippet.value = s || null;
showSnippetForm.value = true;
}
function onTabDragStart(id: string) { function onTabDragStart(id: string) {
draggedTabId.value = id; draggedTabId.value = id;
} }
@@ -239,6 +331,7 @@ async function refreshData() {
allHosts.value = await api.listHosts(); allHosts.value = await api.listHosts();
allFolders.value = await api.listFoldersFlat(); allFolders.value = await api.listFoldersFlat();
allTags.value = await api.listTags(); allTags.value = await api.listTags();
await loadSnippets();
if (!hostForm.value.identity_id && identities.value.length) { if (!hostForm.value.identity_id && identities.value.length) {
hostForm.value.identity_id = identities.value[0].id; hostForm.value.identity_id = identities.value[0].id;
} }
@@ -255,6 +348,9 @@ onMounted(async () => {
if (m.app_version) { if (m.app_version) {
appVersion.value = m.app_version; appVersion.value = m.app_version;
} }
if (m.audit_log_enabled !== undefined) {
auditLogEnabled.value = m.audit_log_enabled;
}
if (loggedIn.value) await refreshData(); if (loggedIn.value) await refreshData();
} catch { } catch {
loggedIn.value = false; loggedIn.value = false;
@@ -744,6 +840,72 @@ async function deleteIdentityRow(id: number) {
</div> </div>
</div> </div>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<button
v-if="activePanes.length > 1"
type="button"
class="hidden rounded-lg px-3 py-1.5 text-xs md:inline-flex border transition-colors"
:class="broadcastMode ? 'border-accent bg-accent/10 text-accent' : 'border-slate-800 text-slate-400 hover:border-slate-700 hover:text-white'"
@click="broadcastMode = !broadcastMode"
title="Broadcast input to all visible terminals"
>
<span class="flex items-center gap-2">
<Radio class="h-3.5 w-3.5" />
Broadcast
</span>
</button>
<div class="relative hidden md:block">
<button
ref="snippetsButtonRef"
type="button"
class="rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white inline-flex items-center gap-1"
@click="showSnippetsMenu = !showSnippetsMenu"
>
Snippets
<ChevronDown class="h-3 w-3" />
</button>
<div
v-if="showSnippetsMenu"
ref="snippetsMenuRef"
class="absolute right-0 top-full mt-2 w-64 rounded-xl border border-slate-700 bg-surface shadow-xl z-50 overflow-hidden"
>
<div class="max-h-64 overflow-y-auto p-1">
<div v-if="snippets.length === 0" class="p-3 text-center text-xs text-slate-500">
No snippets saved.
</div>
<div
v-for="s in snippets"
:key="s.id"
class="flex items-center justify-between group rounded-lg px-2 py-1.5 hover:bg-slate-800"
>
<button
type="button"
class="flex-1 text-left text-sm text-white truncate"
@click="runSnippet(s.command)"
:title="s.command"
>
{{ s.label }}
</button>
<div class="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
<button type="button" class="text-slate-400 hover:text-white p-1" @click="openEditSnippet(s)">
<Pencil class="h-3 w-3" />
</button>
<button type="button" class="text-red-400 hover:text-red-300 p-1" @click="deleteSnippet(s.id)">
<Trash2 class="h-3 w-3" />
</button>
</div>
</div>
</div>
<div class="border-t border-slate-700 p-1">
<button
type="button"
class="w-full rounded-lg px-2 py-1.5 text-left text-xs text-slate-400 hover:bg-slate-800 hover:text-white"
@click="openEditSnippet()"
>
+ Add new snippet...
</button>
</div>
</div>
</div>
<button <button
type="button" type="button"
class="hidden rounded-lg px-3 py-1.5 text-xs md:inline-flex" class="hidden rounded-lg px-3 py-1.5 text-xs md:inline-flex"
@@ -760,6 +922,7 @@ async function deleteIdentityRow(id: number) {
API keys API keys
</button> </button>
<button <button
v-if="auditLogEnabled"
type="button" type="button"
class="hidden rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white md:inline-flex" class="hidden rounded-lg px-3 py-1.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-white md:inline-flex"
@click="openAuditLog" @click="openAuditLog"
@@ -1067,9 +1230,11 @@ async function deleteIdentityRow(id: number) {
class="flex-1 min-w-0 h-full" class="flex-1 min-w-0 h-full"
> >
<TabContent <TabContent
:ref="(el) => setTabRef(el, t.id)"
:host-id="t.hostId" :host-id="t.hostId"
:visible="activePanes.includes(t.id)" :visible="activePanes.includes(t.id)"
:show-sftp="showSftpPanel" :show-sftp="showSftpPanel"
@broadcast-data="(data: string) => handleBroadcast(data, t.id)"
/> />
</div> </div>
@@ -1086,6 +1251,13 @@ async function deleteIdentityRow(id: number) {
</main> </main>
</div> </div>
<SnippetForm
v-if="showSnippetForm"
:snippet="editingSnippet"
@save="saveSnippet"
@cancel="showSnippetForm = false"
/>
<div <div
v-if="showApiKeys" v-if="showApiKeys"
class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4"
+80 -7
View File
@@ -21,7 +21,7 @@ function browseParams(folderId: number | null, q: string): string {
} }
export const api = { export const api = {
async me(): Promise<{ logged_in: boolean; app_version?: string }> { async me(): Promise<{ logged_in: boolean; app_version?: string; audit_log_enabled?: boolean }> {
const res = await fetch("/api/me", { credentials: "include" }); const res = await fetch("/api/me", { credentials: "include" });
return handle(res); return handle(res);
}, },
@@ -65,6 +65,11 @@ export const api = {
return d.items; return d.items;
}, },
async pingHost(id: number): Promise<{ up: boolean }> {
const res = await fetch(`/api/hosts/${id}/ping`, { credentials: "include" });
return handle<{ up: boolean }>(res);
},
async listTags(): Promise<string[]> { async listTags(): Promise<string[]> {
const res = await fetch("/api/tags", { credentials: "include" }); const res = await fetch("/api/tags", { credentials: "include" });
const d = await handle<{ items: string[] }>(res); const d = await handle<{ items: string[] }>(res);
@@ -188,6 +193,43 @@ export const api = {
await handle(res); await handle(res);
}, },
async listSnippets(): Promise<SnippetRow[]> {
const res = await fetch("/api/snippets", { credentials: "include" });
const d = await handle<{ items: SnippetRow[] }>(res);
return d.items;
},
async createSnippet(body: Record<string, unknown>): Promise<{ id: number }> {
const res = await fetch("/api/snippets", {
method: "POST",
credentials: "include",
headers: jsonHeaders,
body: JSON.stringify(body),
});
return handle(res);
},
async updateSnippet(
id: number,
body: Partial<{ label: string; command: string }>,
): Promise<void> {
const res = await fetch(`/api/snippets/${id}`, {
method: "PATCH",
credentials: "include",
headers: jsonHeaders,
body: JSON.stringify(body),
});
await handle(res);
},
async deleteSnippet(id: number): Promise<void> {
const res = await fetch(`/api/snippets/${id}`, {
method: "DELETE",
credentials: "include",
});
await handle(res);
},
async listConnectionAudit(limit = 200, daysBack?: number): Promise<ConnectionAuditRow[]> { async listConnectionAudit(limit = 200, daysBack?: number): Promise<ConnectionAuditRow[]> {
const q = new URLSearchParams({ limit: String(limit) }); const q = new URLSearchParams({ limit: String(limit) });
if (daysBack !== undefined) { if (daysBack !== undefined) {
@@ -281,16 +323,41 @@ export const api = {
await handle(res); await handle(res);
}, },
async sftpUpload(connId: string, path: string, file: File): Promise<void> { async sftpUpload(
connId: string,
path: string,
file: File,
onProgress?: (loaded: number, total: number) => void
): Promise<void> {
const fd = new FormData(); const fd = new FormData();
fd.set("path", path); fd.set("path", path);
fd.set("file", file); fd.set("file", file);
const res = await fetch(`/api/sftp/${connId}/upload`, { return new Promise((resolve, reject) => {
method: "POST", const xhr = new XMLHttpRequest();
credentials: "include", xhr.open("POST", `/api/sftp/${connId}/upload`);
body: fd, xhr.withCredentials = true;
if (onProgress) {
xhr.upload.onprogress = (e) => {
if (e.lengthComputable) {
onProgress(e.loaded, e.total);
}
};
}
xhr.onload = () => {
if (xhr.status === 401) return reject(new Error("unauthorized"));
let data: any = {};
try {
data = JSON.parse(xhr.responseText);
} catch (e) {}
if (xhr.status >= 200 && xhr.status < 300) {
resolve();
} else {
reject(new Error(data.error || xhr.statusText));
}
};
xhr.onerror = () => reject(new Error("Network Error"));
xhr.send(fd);
}); });
await handle(res);
}, },
sftpDownloadUrl(connId: string, path: string): string { sftpDownloadUrl(connId: string, path: string): string {
@@ -327,6 +394,12 @@ export interface IdentityRow {
auth_type: string; auth_type: string;
} }
export interface SnippetRow {
id: number;
label: string;
command: string;
}
export interface SftpEntry { export interface SftpEntry {
filename: string; filename: string;
st_mode: number; st_mode: number;
+20 -2
View File
@@ -11,6 +11,7 @@ const err = ref("");
const busy = ref(false); const busy = ref(false);
const renameTarget = ref<SftpEntry | null>(null); const renameTarget = ref<SftpEntry | null>(null);
const newName = ref(""); const newName = ref("");
const uploadProgress = ref<number | null>(null);
function isDir(m: number): boolean { function isDir(m: number): boolean {
return (m & 0o170000) === 0o040000; return (m & 0o170000) === 0o040000;
@@ -66,11 +67,16 @@ async function onUpload(ev: Event) {
input.value = ""; input.value = "";
if (!file) return; if (!file) return;
err.value = ""; err.value = "";
uploadProgress.value = 0;
try { try {
await api.sftpUpload(props.connId, path.value, file); await api.sftpUpload(props.connId, path.value, file, (loaded, total) => {
uploadProgress.value = Math.round((loaded / total) * 100);
});
await load(); await load();
} catch (e) { } catch (e) {
err.value = e instanceof Error ? e.message : "Upload failed"; err.value = e instanceof Error ? e.message : "Upload failed";
} finally {
uploadProgress.value = null;
} }
} }
@@ -186,7 +192,19 @@ function fmtSize(n: number): string {
</div> </div>
<div class="min-h-0 flex-1 overflow-auto p-2"> <div class="min-h-0 flex-1 overflow-auto p-2">
<p v-if="err" class="mb-2 text-xs text-red-400">{{ err }}</p> <p v-if="err" class="mb-2 text-xs text-red-400">{{ err }}</p>
<p v-if="busy" class="text-xs text-slate-500">Loading</p> <div v-if="uploadProgress !== null" class="mb-2 space-y-1">
<div class="flex justify-between text-[10px] text-slate-400">
<span>Uploading...</span>
<span>{{ uploadProgress }}%</span>
</div>
<div class="h-1.5 w-full overflow-hidden rounded-full bg-slate-800">
<div
class="h-full bg-accent transition-all duration-200"
:style="{ width: uploadProgress + '%' }"
></div>
</div>
</div>
<p v-else-if="busy" class="text-xs text-slate-500">Loading</p>
<ul v-else class="space-y-0.5"> <ul v-else class="space-y-0.5">
<li <li
v-for="e in entries" v-for="e in entries"
+89
View File
@@ -0,0 +1,89 @@
<script setup lang="ts">
import { ref } from "vue";
import type { SnippetRow } from "@/api";
const props = defineProps<{
snippet?: SnippetRow | null;
}>();
const emit = defineEmits<{
(e: "save", data: { label: string; command: string }): void;
(e: "cancel"): void;
}>();
const label = ref(props.snippet?.label || "");
const command = ref(props.snippet?.command || "");
function submit() {
if (!label.value.trim() || !command.value.trim()) return;
emit("save", {
label: label.value.trim(),
command: command.value.trim(),
});
}
</script>
<template>
<div
class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4 backdrop-blur-sm"
>
<div
class="w-full max-w-md rounded-xl border border-slate-700 bg-surface shadow-2xl"
>
<div class="flex items-center justify-between border-b border-slate-800 p-4">
<h2 class="text-lg font-semibold text-white">
{{ snippet ? "Edit snippet" : "Add snippet" }}
</h2>
<button
type="button"
class="text-slate-400 hover:text-white"
@click="emit('cancel')"
>
&times;
</button>
</div>
<form class="space-y-4 p-4" @submit.prevent="submit">
<div>
<label class="mb-1 block text-sm font-medium text-slate-300">
Label
</label>
<input
v-model="label"
type="text"
required
class="w-full rounded-lg border border-slate-700 bg-surface-overlay px-3 py-2 text-sm text-white placeholder:text-slate-500 focus:border-accent focus:outline-none focus:ring-1 focus:ring-accent"
placeholder="e.g. Docker logs"
autocomplete="off"
/>
</div>
<div>
<label class="mb-1 block text-sm font-medium text-slate-300">
Command
</label>
<textarea
v-model="command"
required
rows="3"
class="w-full rounded-lg border border-slate-700 bg-surface-overlay px-3 py-2 text-sm font-mono text-white placeholder:text-slate-500 focus:border-accent focus:outline-none focus:ring-1 focus:ring-accent"
placeholder="docker compose logs -f"
/>
</div>
<div class="flex justify-end gap-2 pt-2">
<button
type="button"
class="rounded-lg px-4 py-2 text-sm font-medium text-slate-300 hover:text-white"
@click="emit('cancel')"
>
Cancel
</button>
<button
type="submit"
class="rounded-lg bg-accent px-4 py-2 text-sm font-medium text-black hover:bg-[#16966b]"
>
Save snippet
</button>
</div>
</form>
</div>
</div>
</template>
+103 -34
View File
@@ -6,6 +6,7 @@ import {
watch, watch,
nextTick, nextTick,
} from "vue"; } from "vue";
import { api } from "@/api";
import { Terminal } from "@xterm/xterm"; import { Terminal } from "@xterm/xterm";
import { FitAddon } from "@xterm/addon-fit"; import { FitAddon } from "@xterm/addon-fit";
import "@xterm/xterm/css/xterm.css"; import "@xterm/xterm/css/xterm.css";
@@ -17,15 +18,29 @@ const props = defineProps<{
showSftp: boolean; showSftp: boolean;
}>(); }>();
const emit = defineEmits<{
(e: 'broadcast-data', data: string): void;
}>();
defineExpose({
sendData: (data: string) => {
if (ws && ws.readyState === WebSocket.OPEN) {
ws.send(new TextEncoder().encode(data));
}
}
});
const termEl = ref<HTMLElement | null>(null); const termEl = ref<HTMLElement | null>(null);
const status = ref("Connecting…"); const status = ref("Connecting…");
const connId = ref<string | null>(null); const connId = ref<string | null>(null);
const serverBackOnline = ref(false);
let ws: WebSocket | null = null; let ws: WebSocket | null = null;
let term: Terminal | null = null; let term: Terminal | null = null;
let fit: FitAddon | null = null; let fit: FitAddon | null = null;
let ro: ResizeObserver | null = null; let ro: ResizeObserver | null = null;
let visibilityHandler: (() => void) | null = null; let visibilityHandler: (() => void) | null = null;
let pingInterval: number | null = null;
function wsUrl(hostId: number): string { function wsUrl(hostId: number): string {
const proto = location.protocol === "https:" ? "wss:" : "ws:"; const proto = location.protocol === "https:" ? "wss:" : "ws:";
@@ -73,39 +88,15 @@ function isControlMessage(raw: string): boolean {
return false; return false;
} }
onMounted(async () => { function connectWs() {
await nextTick(); serverBackOnline.value = false;
if (!termEl.value) return; if (pingInterval) {
clearInterval(pingInterval);
term = new Terminal({ pingInterval = null;
cursorBlink: true, }
fontFamily: "IBM Plex Mono, monospace", if (ws) {
fontSize: 14, ws.close();
theme: { }
background: "#0a0e12",
foreground: "#e2e8f0",
cursor: "#3d9aed",
},
});
fit = new FitAddon();
term.loadAddon(fit);
term.open(termEl.value);
fit.fit();
term.onData((data) => {
if (ws && ws.readyState === WebSocket.OPEN) {
ws.send(new TextEncoder().encode(data));
}
});
term.onResize(({ cols, rows }) => {
if (ws && ws.readyState === WebSocket.OPEN) {
ws.send(JSON.stringify({ type: "resize", cols, rows }));
}
});
ro = new ResizeObserver(() => fitAndResize());
ro.observe(termEl.value);
ws = new WebSocket(wsUrl(props.hostId)); ws = new WebSocket(wsUrl(props.hostId));
ws.binaryType = "arraybuffer"; ws.binaryType = "arraybuffer";
@@ -136,7 +127,69 @@ onMounted(async () => {
} else { } else {
status.value = "Session ended"; status.value = "Session ended";
} }
pingInterval = window.setInterval(async () => {
try {
const { up } = await api.pingHost(props.hostId);
if (up) {
if (pingInterval) {
clearInterval(pingInterval);
pingInterval = null;
}
serverBackOnline.value = true;
}
} catch (err) {
// ignore
}
}, 5000);
}; };
}
function reconnect() {
term?.clear();
term?.focus();
connId.value = null;
status.value = "Connecting…";
connectWs();
}
onMounted(async () => {
await nextTick();
if (!termEl.value) return;
term = new Terminal({
cursorBlink: true,
fontFamily: "DM Mono, ui-monospace, monospace",
fontSize: 14,
theme: {
background: "#0d1117",
foreground: "#e6edf3",
cursor: "#1ebe8a",
selectionBackground: "rgba(30, 190, 138, 0.3)",
},
});
fit = new FitAddon();
term.loadAddon(fit);
term.open(termEl.value);
fit.fit();
term.onData((data) => {
if (ws && ws.readyState === WebSocket.OPEN) {
ws.send(new TextEncoder().encode(data));
}
emit("broadcast-data", data);
});
term.onResize(({ cols, rows }) => {
if (ws && ws.readyState === WebSocket.OPEN) {
ws.send(JSON.stringify({ type: "resize", cols, rows }));
}
});
ro = new ResizeObserver(() => fitAndResize());
ro.observe(termEl.value);
connectWs();
visibilityHandler = () => { visibilityHandler = () => {
if (document.visibilityState === "visible") { if (document.visibilityState === "visible") {
@@ -148,6 +201,10 @@ onMounted(async () => {
}); });
onUnmounted(() => { onUnmounted(() => {
if (pingInterval) {
clearInterval(pingInterval);
pingInterval = null;
}
if (visibilityHandler) { if (visibilityHandler) {
document.removeEventListener("visibilitychange", visibilityHandler); document.removeEventListener("visibilitychange", visibilityHandler);
visibilityHandler = null; visibilityHandler = null;
@@ -183,9 +240,21 @@ watch(
> >
{{ status }} {{ status }}
</div> </div>
<div
v-if="serverBackOnline"
class="absolute bottom-4 right-4 z-20 flex items-center gap-3 rounded bg-slate-800 px-4 py-3 text-sm shadow-lg border border-slate-700"
>
<span class="text-slate-200">Server is back online</span>
<button
@click="reconnect"
class="rounded bg-emerald-600 px-3 py-1.5 font-medium text-white hover:bg-emerald-500 transition-colors"
>
Reconnect
</button>
</div>
<div <div
ref="termEl" ref="termEl"
class="h-full min-h-[320px] rounded-lg border border-slate-800 bg-[#0a0e12] p-1" class="h-full min-h-[320px] rounded-lg border border-slate-800 bg-[#0d1117] p-1"
/> />
</div> </div>
<template v-if="showSftp"> <template v-if="showSftp">
+17 -7
View File
@@ -5,18 +5,28 @@ export default {
extend: { extend: {
colors: { colors: {
surface: { surface: {
DEFAULT: "#0f1419", DEFAULT: "#0d1117",
raised: "#151c24", raised: "#161b22",
overlay: "#1a232e", overlay: "#21262d",
}, },
accent: { accent: {
DEFAULT: "#3d9aed", DEFAULT: "#1ebe8a",
muted: "#2a6fa3", muted: "#16966b",
},
slate: {
200: "#e6edf3",
300: "#c9d1d9",
400: "#8b949e",
500: "#6e7681",
600: "#484f58",
700: "#30363d",
800: "#21262d",
900: "#161b22",
}, },
}, },
fontFamily: { fontFamily: {
sans: ["IBM Plex Sans", "system-ui", "sans-serif"], sans: ["Space Grotesk", "system-ui", "sans-serif"],
mono: ["IBM Plex Mono", "ui-monospace", "monospace"], mono: ["DM Mono", "ui-monospace", "monospace"],
}, },
}, },
}, },