dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-25 02:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

SSH reconnect #253

Browse Source
This commit is contained in:
Jan Prochazka
2022-04-03 10:02:32 +02:00
parent 334ab504cf
commit 045f6c6a47
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/api/src/utility/sshTunnel.js
View File

@@ -6,7 +6,6 @@ const lock = new AsyncLock();
const { fork } = require('child_process'); const { fork } = require('child_process');
const processArgs = require('../utility/processArgs'); const processArgs = require('../utility/processArgs');
// const sshConnectionCache = {};
const sshTunnelCache = {}; const sshTunnelCache = {};
const CONNECTION_FIELDS = [ const CONNECTION_FIELDS = [
@@ -21,7 +20,7 @@ const CONNECTION_FIELDS = [
]; ];
const TUNNEL_FIELDS = [...CONNECTION_FIELDS, 'server', 'port']; const TUNNEL_FIELDS = [...CONNECTION_FIELDS, 'server', 'port'];
function callForwardProcess(connection, tunnelConfig) { function callForwardProcess(connection, tunnelConfig, tunnelCacheKey) {
let subprocess = fork(global['API_PACKAGE'] || process.argv[1], [ let subprocess = fork(global['API_PACKAGE'] || process.argv[1], [
'--is-forked-api', '--is-forked-api',
'--start-process', '--start-process',
@@ -39,7 +38,7 @@ function callForwardProcess(connection, tunnelConfig) {
// @ts-ignore // @ts-ignore
const { msgtype, errorMessage } = resp; const { msgtype, errorMessage } = resp;
if (msgtype == 'connected') { if (msgtype == 'connected') {
resolve(resp); resolve(subprocess);
} }
if (msgtype == 'error') { if (msgtype == 'error') {
reject(errorMessage); reject(errorMessage);
@@ -47,6 +46,7 @@ function callForwardProcess(connection, tunnelConfig) {
}); });
subprocess.on('exit', code => { subprocess.on('exit', code => {
console.log('SSH forward process exited'); console.log('SSH forward process exited');
delete sshTunnelCache[tunnelCacheKey];
}); });
}); });
} }
@@ -69,7 +69,7 @@ async function getSshTunnel(connection) {
`Creating SSH tunnel to ${connection.sshHost}-${connection.server}:${connection.port}, using local port ${localPort}` `Creating SSH tunnel to ${connection.sshHost}-${connection.server}:${connection.port}, using local port ${localPort}`
); );
await callForwardProcess(connection, tunnelConfig); const subprocess = await callForwardProcess(connection, tunnelConfig, tunnelCacheKey);
console.log( console.log(
`Created SSH tunnel to ${connection.sshHost}-${connection.server}:${connection.port}, using local port ${localPort}` `Created SSH tunnel to ${connection.sshHost}-${connection.server}:${connection.port}, using local port ${localPort}`
@@ -78,6 +78,7 @@ async function getSshTunnel(connection) {
sshTunnelCache[tunnelCacheKey] = { sshTunnelCache[tunnelCacheKey] = {
state: 'ok', state: 'ok',
localPort, localPort,
subprocess,
}; };
return sshTunnelCache[tunnelCacheKey]; return sshTunnelCache[tunnelCacheKey];
} catch (err) { } catch (err) {