@@ -55,32 +55,14 @@ const verifyClient = async (info, callback) => {
55
55
56
56
const wss = new WebSocketServer ( { server, path : '/terminal/ws' , verifyClient : verifyClient } ) ;
57
57
const userSessions = new Map ( ) ;
58
- let inactivityTimer ;
59
- const inactivityTime = 60 * 1000 ;
60
- const inactivityInterval = 10 * 1000 ;
61
58
62
59
wss . on ( 'connection' , ( ws ) => {
63
60
const userId = generateUserId ( ) ;
64
- const userSession = { ws, userId, ptyProcess : null , isActive : false , lastActivityTime : Date . now ( ) } ;
61
+ const userSession = { ws, userId, ptyProcess : null , isActive : false } ;
65
62
userSessions . set ( userId , userSession ) ;
66
63
67
- // ws.on('pong', () => {
68
- // console.log('pong');
69
- // userSession.lastActivityTime = Date.now();
70
- // clearInterval(inactivityTimer);
71
- // inactivityTimer = setInterval(() => {
72
- // const inactiveTime = Date.now() - userSession.lastActivityTime;
73
- // console.log('inactiveTime', inactiveTime);
74
- // if (inactiveTime > inactivityTime) {
75
- // killPtyProcess(userId);
76
- // clearInterval(inactivityTimer);
77
- // }
78
- // }, inactivityInterval);
79
- // });
80
-
81
64
ws . on ( 'message' , ( message ) => {
82
65
handleMessage ( userSession , message ) ;
83
- userSession . lastActivityTime = Date . now ( ) ;
84
66
85
67
} ) ;
86
68
ws . on ( 'error' , ( err ) => handleError ( err , userId ) ) ;
@@ -148,6 +130,7 @@ async function handleCommand(ws, command, userId) {
148
130
cols : 80 ,
149
131
rows : 30 ,
150
132
cwd : process . env . HOME ,
133
+ env : { } ,
151
134
} ;
152
135
153
136
// NOTE: - Initiates a process within the Terminal container
@@ -162,24 +145,13 @@ async function handleCommand(ws, command, userId) {
162
145
163
146
ptyProcess . onData ( ( data ) => {
164
147
ws . send ( data ) ;
165
- // userSession.lastActivityTime = Date.now();
166
- // clearInterval(inactivityTimer);
167
- // inactivityTimer = setInterval(() => {
168
- // const inactiveTime = Date.now() - userSession.lastActivityTime;
169
- // console.log('inactiveTime', inactiveTime);
170
- // if (inactiveTime > inactivityTime) {
171
- // killPtyProcess(userId);
172
- // clearInterval(inactivityTimer);
173
- // }
174
- // }, inactivityInterval);
175
148
} ) ;
176
149
177
150
// when parent closes
178
151
ptyProcess . onExit ( ( { exitCode, signal } ) => {
179
152
console . error ( `Process exited with code ${ exitCode } and signal ${ signal } ` ) ;
180
153
ws . send ( 'pty-exited' ) ;
181
154
userSession . isActive = false ;
182
- // clearInterval(inactivityTimer);
183
155
184
156
} ) ;
185
157
0 commit comments