dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

Fix timeout on close.

Browse Source
This commit is contained in:
LukeGus
2024-12-10 21:32:58 -06:00
parent 2061ac5e3b
commit 4d8263a788
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.idea/workspace.xml generated
View File

@@ -4,11 +4,7 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Final updates (I hope for real this time)"> <list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Fix web-socket timeout." />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/backend/server.js" beforeDir="false" afterPath="$PROJECT_DIR$/backend/server.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/frontend/src/App.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/App.jsx" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -137,7 +133,7 @@
<workItem from="1733804654516" duration="339000" /> <workItem from="1733804654516" duration="339000" />
<workItem from="1733805003742" duration="9000" /> <workItem from="1733805003742" duration="9000" />
<workItem from="1733883751079" duration="757000" /> <workItem from="1733883751079" duration="757000" />
<workItem from="1733884522510" duration="2569000" /> <workItem from="1733884522510" duration="2933000" />
</task> </task>
<task id="LOCAL-00001" summary="Nano zoom fix #11"> <task id="LOCAL-00001" summary="Nano zoom fix #11">
<option name="closed" value="true" /> <option name="closed" value="true" />
@@ -403,7 +399,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1733886236040</updated> <updated>1733886236040</updated>
</task> </task>
<option name="localTasksCounter" value="34" /> <task id="LOCAL-00034" summary="Fix web-socket timeout.">
<option name="closed" value="true" />
<created>1733887722496</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1733887722496</updated>
</task>
<option name="localTasksCounter" value="35" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -421,7 +425,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Nano zoom fix #16 (ssh-2-promise)" />
<MESSAGE value="Full return back to old code with minor fixes" /> <MESSAGE value="Full return back to old code with minor fixes" />
<MESSAGE value="Terminal size fix #18 (rows &amp; cols fix)" /> <MESSAGE value="Terminal size fix #18 (rows &amp; cols fix)" />
<MESSAGE value="Test ntfy build notification system" /> <MESSAGE value="Test ntfy build notification system" />
@@ -446,6 +449,7 @@
<MESSAGE value="Final changes to release-1.0" /> <MESSAGE value="Final changes to release-1.0" />
<MESSAGE value="Update name (need to fix logo)" /> <MESSAGE value="Update name (need to fix logo)" />
<MESSAGE value="Final updates (I hope for real this time)" /> <MESSAGE value="Final updates (I hope for real this time)" />
<option name="LAST_COMMIT_MESSAGE" value="Final updates (I hope for real this time)" /> <MESSAGE value="Fix web-socket timeout." />
<option name="LAST_COMMIT_MESSAGE" value="Fix web-socket timeout." />
</component> </component>
</project> </project>

5
backend/server.js
View File

@@ -16,6 +16,7 @@ wss.on('connection', (ws) => {
let stream = null; let stream = null;
let currentCols = 80; let currentCols = 80;
let currentRows = 24; let currentRows = 24;
let interval = null;
const resizeTerminal = (cols, rows) => { const resizeTerminal = (cols, rows) => {
if (stream && stream.setWindow) { if (stream && stream.setWindow) {
@@ -44,7 +45,7 @@ wss.on('connection', (ws) => {
conn.on('ready', () => { conn.on('ready', () => {
console.log('SSH Connection established'); console.log('SSH Connection established');
const interval = setInterval(() => { interval = setInterval(() => {
if (ws.readyState === WebSocket.OPEN) { if (ws.readyState === WebSocket.OPEN) {
ws.ping(); ws.ping();
} else { } else {
@@ -90,7 +91,9 @@ wss.on('connection', (ws) => {
ws.on('close', () => { ws.on('close', () => {
console.log('WebSocket closed'); console.log('WebSocket closed');
if (interval) {
clearInterval(interval); clearInterval(interval);
}
if (conn) { if (conn) {
conn.end(); conn.end();
} }