mirror of
https://github.com/ION606/web-to-fish.git
synced 2026-05-14 18:36:53 +00:00
added sessions
This commit is contained in:
+123
-156
@@ -1,170 +1,137 @@
|
||||
<!doctype html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Shell</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: monospace;
|
||||
background: #000000;
|
||||
color: #ffffff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Shell</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: monospace;
|
||||
background: #000000;
|
||||
color: #ffffff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.terminal-container {
|
||||
background: #000000;
|
||||
border-radius: 5px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
gap: 1rem;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.terminal-container {
|
||||
background: #000000;
|
||||
border-radius: 5px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
gap: 1rem;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.terminal-header {
|
||||
font-size: 1.5rem;
|
||||
text-transform: uppercase;
|
||||
color: #00ff00;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.terminal-header {
|
||||
font-size: 1.5rem;
|
||||
text-transform: uppercase;
|
||||
color: #00ff00;
|
||||
margin: 0;
|
||||
}
|
||||
.output {
|
||||
flex-grow: 1;
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
background: #000000;
|
||||
border-radius: 5px;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.output {
|
||||
flex-grow: 1;
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
/* border: 1px solid #444; */
|
||||
background: #000000;
|
||||
border-radius: 5px;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
}
|
||||
|
||||
/* For scrollbars */
|
||||
::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
}
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: #555;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: #555;
|
||||
}
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #777;
|
||||
}
|
||||
</style>
|
||||
<link rel="stylesheet" href="node_modules/@xterm/xterm/css/xterm.css" />
|
||||
<script src="node_modules/@xterm/xterm/lib/xterm.js"></script>
|
||||
<script src="node_modules/@xterm/addon-fit/lib/addon-fit.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div class="terminal-container">
|
||||
<div class="output" id="output"></div>
|
||||
</div>
|
||||
<script>
|
||||
const sessionId =
|
||||
sessionStorage.getItem("sessionId") || crypto.randomUUID();
|
||||
sessionStorage.setItem("sessionId", sessionId);
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #777;
|
||||
}
|
||||
</style>
|
||||
function connect() {
|
||||
const protocol =
|
||||
location.protocol === "https:" ? "wss://" : "ws://";
|
||||
const ws = new WebSocket(
|
||||
`${protocol}${location.host}/shell-ws?id=${sessionId}`
|
||||
);
|
||||
|
||||
<link rel="stylesheet" href="node_modules/@xterm/xterm/css/xterm.css" />
|
||||
<script src="node_modules/@xterm/xterm/lib/xterm.js"></script>
|
||||
<script src="node_modules/@xterm/addon-fit/lib/addon-fit.js"></script>
|
||||
</head>
|
||||
term.onData((data) => ws.send(data));
|
||||
|
||||
<body>
|
||||
<div class="terminal-container">
|
||||
<div class="output" id="output"></div>
|
||||
</div>
|
||||
ws.addEventListener("message", (event) => {
|
||||
const data = JSON.parse(event.data);
|
||||
if (data.event) {
|
||||
switch (data.event) {
|
||||
case "exit":
|
||||
term.write(
|
||||
"\r\nConnection closed. Refreshing...\r\n"
|
||||
);
|
||||
setTimeout(
|
||||
() => window.location.reload(),
|
||||
2000
|
||||
);
|
||||
break;
|
||||
default:
|
||||
term.write(
|
||||
`\r\nUnknown event: ${data.event}\r\n`
|
||||
);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
term.write(data.data);
|
||||
}
|
||||
});
|
||||
|
||||
<script>
|
||||
function fitTerminalToScreen(term) {
|
||||
const container = document.querySelector('#output'); // terminal container
|
||||
const charWidth = term._core._renderService.dimensions.actualCellWidth;
|
||||
const charHeight = term._core._renderService.dimensions.actualCellHeight;
|
||||
ws.addEventListener("close", () => {
|
||||
setTimeout(connect, 1000);
|
||||
});
|
||||
}
|
||||
|
||||
console.log(term);
|
||||
if (!charWidth || !charHeight) return;
|
||||
const term = new Terminal({
|
||||
cursorBlink: true,
|
||||
theme: {
|
||||
background: "#000000",
|
||||
foreground: "#ffffff",
|
||||
cursor: "#00ff00",
|
||||
},
|
||||
});
|
||||
const outputContainer = document.querySelector("#output");
|
||||
term.open(outputContainer);
|
||||
|
||||
// Calculate the number of columns and rows
|
||||
const cols = Math.floor(container.offsetWidth / charWidth);
|
||||
const rows = Math.floor(container.offsetHeight / charHeight);
|
||||
const fitAddon = new FitAddon.FitAddon();
|
||||
term.loadAddon(fitAddon);
|
||||
fitAddon.fit();
|
||||
connect();
|
||||
|
||||
console.log('Container height:', container.clientHeight);
|
||||
console.log('Char height:', charHeight);
|
||||
console.log('Rows calculated:', Math.floor(container.clientHeight / charHeight));
|
||||
|
||||
// Resize the terminal
|
||||
term.resize(cols, rows);
|
||||
}
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// create terminal instance
|
||||
const term = new Terminal({
|
||||
// cols: 800,
|
||||
// rows: 24,
|
||||
cursorBlink: true,
|
||||
theme: {
|
||||
background: '#000000',
|
||||
foreground: '#ffffff',
|
||||
cursor: '#00ff00',
|
||||
}
|
||||
});
|
||||
|
||||
// mount terminal
|
||||
const outputContainer = document.querySelector('#output');
|
||||
term.open(outputContainer);
|
||||
|
||||
// create websocket connection
|
||||
const protocol = location.protocol === 'https:' ? 'wss://' : 'ws://';
|
||||
const ws = new WebSocket(`${protocol}${location.host}/shell-ws`);
|
||||
|
||||
// handle terminal input and send to websocket
|
||||
term.onData(data => {
|
||||
ws.send(data);
|
||||
});
|
||||
|
||||
// handle incoming websocket messages and write to terminal
|
||||
ws.addEventListener('message', event => {
|
||||
const data = JSON.parse(event.data);
|
||||
|
||||
if (data.event) {
|
||||
switch (data.event) {
|
||||
case 'exit':
|
||||
term.write('\r\nConnection closed. Refreshing...\r\n');
|
||||
ws.close();
|
||||
setTimeout(() => window.location.reload(), 2000);
|
||||
break;
|
||||
|
||||
default:
|
||||
console.error(`Unknown event: ${data.event}`);
|
||||
term.write(`\r\nUnknown event: ${data.event}\r\n`);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
term.write(data.data);
|
||||
}
|
||||
});
|
||||
|
||||
// handle websocket closure
|
||||
ws.addEventListener('close', event => {
|
||||
term.write(`\r\nConnection closed with code ${event.code}\r\n`);
|
||||
});
|
||||
|
||||
// handle websocket errors
|
||||
ws.addEventListener('error', () => {
|
||||
term.write('\r\nConnection error. Please try again later.\r\n');
|
||||
});
|
||||
|
||||
window.addEventListener('resize', () => {
|
||||
document.querySelector('.xterm-screen').style.width = `${window.innerWidth}px`;
|
||||
document.querySelector('.xterm-screen').style.height = `${window.innerHeight}px`;
|
||||
})
|
||||
|
||||
const fitAddon = new FitAddon.FitAddon();
|
||||
term.loadAddon(fitAddon);
|
||||
fitAddon.fit();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
window.addEventListener("beforeunload", () => {
|
||||
navigator.sendBeacon(`/kill-session?id=${sessionId}`);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -3,53 +3,82 @@ import path from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
import expressWs from 'express-ws';
|
||||
import { spawn } from 'node-pty';
|
||||
import json from './secrets/config.json' with { type: 'json' };
|
||||
// import json from './secrets/config.json' with { type: 'json' };
|
||||
|
||||
const __dirname = path.dirname(fileURLToPath(import.meta.url)),
|
||||
PORT = process.env.PORT || 5164,
|
||||
app = express();
|
||||
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
||||
const PORT = process.env.PORT || 5164;
|
||||
const app = express();
|
||||
|
||||
expressWs(app); // enable websockets for the app
|
||||
|
||||
|
||||
// parse form data
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
app.use(express.json({ extended: true }));
|
||||
app.use('/node_modules', express.static('node_modules'));
|
||||
|
||||
// map of active sessions
|
||||
const sessions = new Map();
|
||||
|
||||
// shell interface
|
||||
app.get('/', (req, res) => {
|
||||
res.sendFile('shell.html', { root: path.join(__dirname, 'HTML') });
|
||||
});
|
||||
|
||||
|
||||
// when a websocket is opened at /shell-ws, spawn a fish shell in a pty
|
||||
// websocket endpoint that spawns/attaches to a fish shell
|
||||
app.ws('/shell-ws', (ws, req) => {
|
||||
// spawn a fish shell using node-pty with a pseudo-terminal
|
||||
const shell = spawn('su', ['-', 'ion606', '-s', '/usr/bin/fish'], {
|
||||
cols: 80,
|
||||
rows: 24,
|
||||
cwd: process.env.HOME,
|
||||
env: process.env
|
||||
const { id } = req.query;
|
||||
if (!id) {
|
||||
ws.close();
|
||||
return;
|
||||
}
|
||||
|
||||
let session = sessions.get(id);
|
||||
if (!session) {
|
||||
const shell = spawn('su', ['-', 'ion606', '-s', '/usr/bin/fish'], {
|
||||
cols: 80,
|
||||
rows: 24,
|
||||
cwd: process.env.HOME,
|
||||
env: process.env
|
||||
});
|
||||
|
||||
session = { shell, clients: new Set() };
|
||||
sessions.set(id, session);
|
||||
|
||||
shell.onData((data) => {
|
||||
for (const client of session.clients) {
|
||||
client.send(JSON.stringify({ data }));
|
||||
}
|
||||
});
|
||||
|
||||
shell.onExit((e) => {
|
||||
for (const client of session.clients) {
|
||||
client.send(JSON.stringify({ event: 'exit', code: e }));
|
||||
}
|
||||
sessions.delete(id);
|
||||
});
|
||||
}
|
||||
|
||||
session.clients.add(ws);
|
||||
ws.on('message', (msg) => session.shell.write(msg));
|
||||
|
||||
ws.on('close', () => {
|
||||
session.clients.delete(ws);
|
||||
});
|
||||
|
||||
// send any data from the shell to the client
|
||||
shell.onData((data) => {
|
||||
ws.send(JSON.stringify({ data }));
|
||||
});
|
||||
|
||||
shell.onExit((e) => ws.send(JSON.stringify({ event: 'exit', code: e })));
|
||||
|
||||
// when the client sends data, write it to the shell's stdin
|
||||
ws.on('message', (msg) => shell.write(msg));
|
||||
|
||||
// when the websocket closes, kill the shell
|
||||
ws.on('close', () => shell.kill());
|
||||
});
|
||||
|
||||
// endpoint used by the client to explicitly close a session
|
||||
app.post('/kill-session', (req, res) => {
|
||||
const { id } = req.query;
|
||||
const session = sessions.get(id);
|
||||
if (session) {
|
||||
session.shell.kill();
|
||||
sessions.delete(id);
|
||||
}
|
||||
res.end();
|
||||
});
|
||||
|
||||
app.get('*', (req, res) => res.end());
|
||||
|
||||
|
||||
app.listen(PORT, '0.0.0.0', () => console.log('server listening on http://localhost:' + PORT));
|
||||
app.listen(PORT, '0.0.0.0', () =>
|
||||
console.log(`server listening on http://localhost:${PORT}`)
|
||||
);
|
||||
Reference in New Issue
Block a user