Skip to content

Commit

Permalink
Code sync
Browse files Browse the repository at this point in the history
  • Loading branch information
zxdong262 committed Jul 22, 2024
1 parent 33f559e commit f8e1757
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 24 deletions.
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electerm-web",
"version": "2.39.76",
"version": "2.39.88",
"description": "Running electerm in as web app",
"main": "src/app/app.js",
"type": "module",
Expand Down Expand Up @@ -47,7 +47,7 @@
"preferGlobal": true,
"devDependencies": {
"@ant-design/icons": "5.2.6",
"@electerm/electerm-react": "^1.39.76",
"@electerm/electerm-react": "^1.39.88",
"@electerm/electerm-resource": "1.3.7",
"@electerm/strip-ansi": "^1.0.0",
"@novnc/novnc": "^1.4.0",
Expand Down Expand Up @@ -93,7 +93,7 @@
"zmodem-ts": "^1.0.4"
},
"dependencies": {
"@electerm/electerm-locales": "1.2.25",
"@electerm/electerm-locales": "1.2.26",
"@electerm/electerm-themes": "^1.0.1",
"@yetzt/nedb": "1.8.0",
"axios": "0.26.0",
Expand Down
13 changes: 8 additions & 5 deletions src/app/server/ssh-tunnel.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export function dynamicForward ({
sshTunnelLocalHost = '127.0.0.1'
}) {
return new Promise((resolve, reject) => {
socks.createServer((info, accept, deny) => {
const dproxyServer = socks.createServer((info, accept, deny) => {
conn.forwardOut(
info.srcAddr,
info.srcPort,
Expand All @@ -87,14 +87,17 @@ export function dynamicForward ({
}
const clientSocket = accept(true)
if (clientSocket) {
stream.pipe(clientSocket).pipe(stream).on('close', () => {
conn.end()
})
stream.pipe(clientSocket).pipe(stream)
}
})
}).listen(sshTunnelLocalPort, sshTunnelLocalHost, () => {
})
dproxyServer.listen(sshTunnelLocalPort, sshTunnelLocalHost, () => {
log.log(`SOCKS server listening on ${sshTunnelLocalHost}:${sshTunnelLocalPort}`)
resolve(1)
}).useAuth(socks.auth.None())
// close socks proxy when ssh connection is closed.
conn.on('close', () => {
dproxyServer && dproxyServer.close()
})
})
}

0 comments on commit f8e1757

Please sign in to comment.