feat: implement the forwarder termination logic
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
import { auth } from "@/lib/auth";
|
||||
import { headers } from "next/headers"
|
||||
import { NextRequest } from "next/server";
|
||||
|
||||
export async function PATCH(req: NextRequest, context: { params: Promise<{ node: string[] }> }) {
|
||||
const { node } = await context.params;
|
||||
const requestHeaders = await headers();
|
||||
const result = await auth.api.getToken({ headers: requestHeaders }).catch(() => null);
|
||||
if (!result || typeof result !== "object" || !("token" in result)) {
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
const { token } = result as { token: string };
|
||||
if (!token) {
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
const data = await fetch(`${process.env.API_URL}/api/session/${node.join("/")}`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
authorization: `Bearer ${token}`,
|
||||
},
|
||||
cache: "no-store",
|
||||
body: await req.text(),
|
||||
})
|
||||
|
||||
return data;
|
||||
}
|
||||
60
app/api/session/[...params]/route.ts
Normal file
60
app/api/session/[...params]/route.ts
Normal file
@@ -0,0 +1,60 @@
|
||||
import { auth } from "@/lib/auth";
|
||||
import { headers } from "next/headers"
|
||||
import { NextRequest } from "next/server";
|
||||
|
||||
export async function PATCH(req: NextRequest, context: { params: Promise<{ params: string[] }> }) {
|
||||
const { params } = await context.params;
|
||||
const requestHeaders = await headers();
|
||||
const result = await auth.api.getToken({ headers: requestHeaders }).catch(() => null);
|
||||
if (!result || typeof result !== "object" || !("token" in result)) {
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
const { token } = result as { token: string };
|
||||
if (!token) {
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
const data = await fetch(`${process.env.API_URL}/api/session/${params.join("/")}`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
authorization: `Bearer ${token}`,
|
||||
},
|
||||
cache: "no-store",
|
||||
body: await req.text(),
|
||||
})
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
export async function DELETE(req: NextRequest, context: { params: Promise<{ params: string[] }> }) {
|
||||
const { params } = await context.params;
|
||||
if (!params || params.length < 3) {
|
||||
return new Response("Bad Request", { status: 400 });
|
||||
}
|
||||
const node = params[0]
|
||||
const tunnelType = params[1]
|
||||
const slug = params[2]
|
||||
|
||||
const requestHeaders = await headers();
|
||||
const result = await auth.api.getToken({ headers: requestHeaders }).catch(() => null);
|
||||
if (!result || typeof result !== "object" || !("token" in result)) {
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
const { token } = result as { token: string };
|
||||
if (!token) {
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
const data = await fetch(`${process.env.API_URL}/api/session/${node}/${tunnelType}/${slug}`, {
|
||||
method: "DELETE",
|
||||
headers: {
|
||||
authorization: `Bearer ${token}`,
|
||||
},
|
||||
cache: "no-store",
|
||||
body: await req.text(),
|
||||
})
|
||||
|
||||
return data;
|
||||
}
|
||||
@@ -12,6 +12,8 @@ const defaultConfig: TunnelConfigType = {
|
||||
localPort: 8000,
|
||||
}
|
||||
|
||||
const STOP_CONFIRMATION_TEXT = "YEAH SURE BUDDY"
|
||||
|
||||
const formatStartedAgo = (timestamp?: ApiTimestamp): string | undefined => {
|
||||
if (!timestamp) return undefined
|
||||
const startedMs = timestamp.seconds * 1000 + Math.floor(timestamp.nanos / 1_000_000)
|
||||
@@ -32,6 +34,7 @@ const toActiveConnection = (session: ApiSession): ActiveConnection => {
|
||||
return {
|
||||
id: session.slug || `${session.node}-${session.started_at?.seconds ?? Date.now()}`,
|
||||
name: session.slug || session.node || "Unknown tunnel",
|
||||
slug: session.slug,
|
||||
status: session.active ? "connected" : "error",
|
||||
protocol: (session.forwarding_type || "http").toLowerCase(),
|
||||
serverLabel: session.node || "Unknown node",
|
||||
@@ -68,6 +71,7 @@ type ActiveConnectionStatus = "connected" | "pending" | "error"
|
||||
type ActiveConnection = {
|
||||
id: string
|
||||
name: string
|
||||
slug?: string
|
||||
status: ActiveConnectionStatus
|
||||
protocol: string
|
||||
serverLabel: string
|
||||
@@ -89,6 +93,16 @@ export default function DashboardClient({ initialActiveConnections }: DashboardC
|
||||
const { data: cachedSession } = authClient.useSession()
|
||||
const [session, setSession] = useState<SessionResponse["data"] | null>(cachedSession ?? null)
|
||||
const [openActionId, setOpenActionId] = useState<string | null>(null)
|
||||
const [stopModal, setStopModal] = useState<{
|
||||
connectionId: string
|
||||
node?: string
|
||||
slug?: string
|
||||
protocol?: string
|
||||
name: string
|
||||
} | null>(null)
|
||||
const [stopModalInput, setStopModalInput] = useState("")
|
||||
const [stopSaving, setStopSaving] = useState(false)
|
||||
const [stopError, setStopError] = useState<string | null>(null)
|
||||
const [slugModal, setSlugModal] = useState<{
|
||||
connectionId: string
|
||||
currentSlug: string
|
||||
@@ -108,10 +122,68 @@ export default function DashboardClient({ initialActiveConnections }: DashboardC
|
||||
}
|
||||
}, [cachedSession, session])
|
||||
|
||||
const stopConnection = (id: string) => {
|
||||
setActiveConnections((prev) => prev.filter((conn) => conn.id !== id))
|
||||
const openStopModal = (connection: ActiveConnection) => {
|
||||
setStopModal({
|
||||
connectionId: connection.id,
|
||||
node: connection.node || connection.serverLabel,
|
||||
slug: connection.slug || connection.name,
|
||||
protocol: connection.protocol,
|
||||
name: connection.name,
|
||||
})
|
||||
setStopModalInput("")
|
||||
setStopError(null)
|
||||
setOpenActionId(null)
|
||||
}
|
||||
|
||||
const closeStopModal = () => {
|
||||
setStopModal(null)
|
||||
setStopModalInput("")
|
||||
setStopSaving(false)
|
||||
setStopError(null)
|
||||
}
|
||||
|
||||
const stopConnection = async () => {
|
||||
if (!stopModal) return
|
||||
|
||||
if (stopModalInput.trim() !== STOP_CONFIRMATION_TEXT) {
|
||||
setStopError("Please type the confirmation phrase exactly.")
|
||||
return
|
||||
}
|
||||
|
||||
const node = stopModal.node
|
||||
const tunnelType = stopModal.protocol?.toLowerCase()
|
||||
const slug = stopModal.slug
|
||||
|
||||
if (!node || !tunnelType || !slug) {
|
||||
setStopError("Missing connection details; cannot stop.")
|
||||
return
|
||||
}
|
||||
|
||||
setStopSaving(true)
|
||||
setStopError(null)
|
||||
setStatusMessage(null)
|
||||
|
||||
try {
|
||||
const endpoint = `/api/session/${encodeURIComponent(node)}/${encodeURIComponent(tunnelType)}/${encodeURIComponent(slug)}`
|
||||
const response = await fetch(endpoint, {
|
||||
method: "DELETE",
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
const message = await response.text()
|
||||
setStopError(message || "Failed to stop connection.")
|
||||
return
|
||||
}
|
||||
|
||||
setActiveConnections((prev) => prev.filter((conn) => conn.id !== stopModal.connectionId))
|
||||
setStatusMessage("Connection stopped")
|
||||
setOpenActionId((current) => (current === id ? null : current))
|
||||
closeStopModal()
|
||||
} catch (error) {
|
||||
console.error("Failed to stop connection", error)
|
||||
setStopError("Failed to stop connection.")
|
||||
} finally {
|
||||
setStopSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
const openChangeSlugModal = (connection: ActiveConnection) => {
|
||||
@@ -185,20 +257,21 @@ export default function DashboardClient({ initialActiveConnections }: DashboardC
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (slugModal) {
|
||||
if (slugModal || stopModal) {
|
||||
const previousOverflow = document.body.style.overflow
|
||||
document.body.style.overflow = "hidden"
|
||||
return () => {
|
||||
document.body.style.overflow = previousOverflow
|
||||
}
|
||||
}
|
||||
}, [slugModal])
|
||||
}, [slugModal, stopModal])
|
||||
|
||||
useEffect(() => {
|
||||
const closeOnEscape = (event: KeyboardEvent) => {
|
||||
if (event.key === "Escape") {
|
||||
setOpenActionId(null)
|
||||
setSlugModal(null)
|
||||
setStopModal(null)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -206,6 +279,73 @@ export default function DashboardClient({ initialActiveConnections }: DashboardC
|
||||
return () => window.removeEventListener("keydown", closeOnEscape)
|
||||
}, [])
|
||||
|
||||
const stopModalContent = !stopModal
|
||||
? null
|
||||
: (
|
||||
<div className="fixed inset-0 z-30 flex items-center justify-center bg-black/60 px-4">
|
||||
<div className="w-full max-w-md rounded-lg border border-gray-800 bg-gray-900 p-6 shadow-xl">
|
||||
<div className="flex items-start justify-between gap-4 mb-6">
|
||||
<div className="flex items-start gap-3">
|
||||
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full bg-red-500/10 ring-1 ring-red-500/20">
|
||||
<svg className="h-5 w-5 text-red-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
|
||||
</svg>
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="text-lg font-semibold text-white">Stop connection</h3>
|
||||
<p className="mt-1 text-sm text-gray-400 leading-relaxed">
|
||||
Type <span className="font-mono text-xs text-red-300 bg-red-950/50 px-1.5 py-0.5 rounded">{STOP_CONFIRMATION_TEXT}</span> to stop <span className="font-medium text-gray-300">{stopModal.slug || stopModal.name}</span> on {stopModal.node || "this node"}.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
onClick={closeStopModal}
|
||||
className="flex h-8 w-8 items-center justify-center rounded-lg text-gray-400 transition-colors hover:bg-gray-800 hover:text-gray-200"
|
||||
aria-label="Close modal"
|
||||
>
|
||||
<svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="mt-4 space-y-4">
|
||||
<label className="block text-sm text-gray-300">
|
||||
Confirmation phrase
|
||||
<input
|
||||
type="text"
|
||||
value={stopModalInput}
|
||||
onChange={(e) => {
|
||||
setStopModalInput(e.target.value)
|
||||
if (stopError) setStopError(null)
|
||||
}}
|
||||
placeholder={STOP_CONFIRMATION_TEXT}
|
||||
className="mt-2 w-full rounded-md border border-gray-700 bg-gray-800 px-3 py-2 text-white focus:border-emerald-500 focus:outline-none"
|
||||
/>
|
||||
</label>
|
||||
{stopError && <p className="text-sm text-red-400">{stopError}</p>}
|
||||
<div className="flex items-center justify-end gap-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={closeStopModal}
|
||||
className="rounded-md px-4 py-2 text-sm font-medium bg-gray-700 text-gray-200 border border-gray-700 hover:bg-gray-600 hover:border-gray-500"
|
||||
disabled={stopSaving}
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={stopConnection}
|
||||
disabled={stopModalInput.trim() !== STOP_CONFIRMATION_TEXT || stopSaving}
|
||||
className={`rounded-md px-4 py-2 text-sm font-medium text-white${stopModalInput.trim() === STOP_CONFIRMATION_TEXT && !stopSaving ? 'bg-red-600 hover:bg-red-700 border border-gray-500' : 'bg-red-900 hover:text-white-300 cursor-not-allowed border border-gray-700'}`}>
|
||||
{stopSaving ? "Stopping..." : "Confirm stop"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
const slugModalContent = !slugModal
|
||||
? null
|
||||
: (
|
||||
@@ -318,8 +458,7 @@ export default function DashboardClient({ initialActiveConnections }: DashboardC
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-white font-medium">{connection.name}</span>
|
||||
<span
|
||||
className={`rounded-full px-2 py-0.5 text-xs font-semibold ${
|
||||
connection.status === "connected"
|
||||
className={`rounded-full px-2 py-0.5 text-xs font-semibold ${connection.status === "connected"
|
||||
? "bg-emerald-900/60 text-emerald-300 border border-emerald-700"
|
||||
: connection.status === "pending"
|
||||
? "bg-yellow-900/60 text-yellow-300 border border-yellow-700"
|
||||
@@ -366,7 +505,7 @@ export default function DashboardClient({ initialActiveConnections }: DashboardC
|
||||
<div className="absolute right-0 top-12 z-10 w-44 rounded-md border border-gray-700 bg-gray-800 shadow-lg">
|
||||
<button
|
||||
className="w-full px-3 py-2 text-left text-sm text-gray-200 hover:bg-gray-700"
|
||||
onClick={() => stopConnection(connection.id)}
|
||||
onClick={() => openStopModal(connection)}
|
||||
>
|
||||
Stop connection
|
||||
</button>
|
||||
@@ -410,6 +549,7 @@ export default function DashboardClient({ initialActiveConnections }: DashboardC
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
{stopModalContent}
|
||||
{slugModalContent}
|
||||
</>
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user