dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: Remove inactivity timer in terminal-server.js

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-02 21:23:59 +02:00
parent dd3ff38df7
commit 66bb4e0fc1
1 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
docker/coolify-realtime/terminal-server.js
View File

@@ -55,32 +55,14 @@ const verifyClient = async (info, callback) => {
const wss = new WebSocketServer({ server, path: '/terminal/ws', verifyClient: verifyClient }); const wss = new WebSocketServer({ server, path: '/terminal/ws', verifyClient: verifyClient });
const userSessions = new Map(); const userSessions = new Map();
let inactivityTimer;
const inactivityTime = 60 * 1000;
const inactivityInterval = 10 * 1000;
wss.on('connection', (ws) => { wss.on('connection', (ws) => {
const userId = generateUserId(); const userId = generateUserId();
const userSession = { ws, userId, ptyProcess: null, isActive: false, lastActivityTime: Date.now() }; const userSession = { ws, userId, ptyProcess: null, isActive: false };
userSessions.set(userId, userSession); userSessions.set(userId, userSession);
// ws.on('pong', () => {
// console.log('pong');
// userSession.lastActivityTime = Date.now();
// clearInterval(inactivityTimer);
// inactivityTimer = setInterval(() => {
// const inactiveTime = Date.now() - userSession.lastActivityTime;
// console.log('inactiveTime', inactiveTime);
// if (inactiveTime > inactivityTime) {
// killPtyProcess(userId);
// clearInterval(inactivityTimer);
// }
// }, inactivityInterval);
// });
ws.on('message', (message) => { ws.on('message', (message) => {
handleMessage(userSession, message); handleMessage(userSession, message);
userSession.lastActivityTime = Date.now();
}); });
ws.on('error', (err) => handleError(err, userId)); ws.on('error', (err) => handleError(err, userId));
@@ -148,6 +130,7 @@ async function handleCommand(ws, command, userId) {
cols: 80, cols: 80,
rows: 30, rows: 30,
cwd: process.env.HOME, cwd: process.env.HOME,
env: {},
}; };
// NOTE: - Initiates a process within the Terminal container // NOTE: - Initiates a process within the Terminal container
@@ -162,16 +145,6 @@ async function handleCommand(ws, command, userId) {
ptyProcess.onData((data) => { ptyProcess.onData((data) => {
ws.send(data); ws.send(data);
// userSession.lastActivityTime = Date.now();
// clearInterval(inactivityTimer);
// inactivityTimer = setInterval(() => {
// const inactiveTime = Date.now() - userSession.lastActivityTime;
// console.log('inactiveTime', inactiveTime);
// if (inactiveTime > inactivityTime) {
// killPtyProcess(userId);
// clearInterval(inactivityTimer);
// }
// }, inactivityInterval);
}); });
// when parent closes // when parent closes
@@ -179,7 +152,6 @@ async function handleCommand(ws, command, userId) {
console.error(`Process exited with code ${exitCode} and signal ${signal}`); console.error(`Process exited with code ${exitCode} and signal ${signal}`);
ws.send('pty-exited'); ws.send('pty-exited');
userSession.isActive = false; userSession.isActive = false;
// clearInterval(inactivityTimer);
}); });