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

fixed problem with SSE #323

Browse Source
This commit is contained in:
Jan Prochazka
2022-07-21 07:49:55 +02:00
parent 153cba3779
commit df33b43e90
4 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/api/package.json
View File

@@ -46,6 +46,7 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"ncp": "^2.0.0", "ncp": "^2.0.0",
"node-cron": "^2.0.3", "node-cron": "^2.0.3",
"on-finished": "^2.4.1",
"portfinder": "^1.0.28", "portfinder": "^1.0.28",
"simple-encryptor": "^4.0.0", "simple-encryptor": "^4.0.0",
"ssh2": "^1.11.0", "ssh2": "^1.11.0",

6
packages/api/src/main.js
View File

@@ -25,6 +25,7 @@ const plugins = require('./controllers/plugins');
const files = require('./controllers/files'); const files = require('./controllers/files');
const scheduler = require('./controllers/scheduler'); const scheduler = require('./controllers/scheduler');
const queryHistory = require('./controllers/queryHistory'); const queryHistory = require('./controllers/queryHistory');
const onFinished = require('on-finished');
const { rundir } = require('./utility/directories'); const { rundir } = require('./utility/directories');
const platformInfo = require('./utility/platformInfo'); const platformInfo = require('./utility/platformInfo');
@@ -63,7 +64,10 @@ function start() {
// Tell the client to retry every 10 seconds if connectivity is lost // Tell the client to retry every 10 seconds if connectivity is lost
res.write('retry: 10000\n\n'); res.write('retry: 10000\n\n');
socket.setSseResponse(res); socket.addSseResponse(res);
onFinished(req, () => {
socket.removeSseResponse(res);
});
}); });
app.use(bodyParser.json({ limit: '50mb' })); app.use(bodyParser.json({ limit: '50mb' }));

39
packages/api/src/utility/socket.js
View File

@@ -1,36 +1,33 @@
let sseResponse = null; const _ = require('lodash');
const sseResponses = [];
let electronSender = null; let electronSender = null;
let init = []; let pingConfigured = false;
module.exports = { module.exports = {
setSseResponse(value) { ensurePing() {
sseResponse = value; if (!pingConfigured) {
setInterval(() => this.emit('ping'), 29 * 1000); setInterval(() => this.emit('ping'), 29 * 1000);
pingConfigured = true;
}
},
addSseResponse(value) {
sseResponses.push(value);
this.ensurePing();
},
removeSseResponse(value) {
_.remove(sseResponses, x => x == value);
}, },
setElectronSender(value) { setElectronSender(value) {
electronSender = value; electronSender = value;
this.ensurePing();
}, },
emit(message, data) { emit(message, data) {
if (electronSender) { if (electronSender) {
if (init.length > 0) {
for (const item of init) {
electronSender.send(item.message, item.data == null ? null : item.data);
}
init = [];
}
electronSender.send(message, data == null ? null : data); electronSender.send(message, data == null ? null : data);
} else if (sseResponse) {
if (init.length > 0) {
for (const item of init) {
sseResponse.write(
`event: ${item.message}\ndata: ${JSON.stringify(item.data == null ? null : item.data)}\n\n`
);
} }
init = []; for (const res of sseResponses) {
} res.write(`event: ${message}\ndata: ${JSON.stringify(data == null ? null : data)}\n\n`);
sseResponse.write(`event: ${message}\ndata: ${JSON.stringify(data == null ? null : data)}\n\n`);
} else {
init.push([{ message, data }]);
} }
}, },
emitChanged(key) { emitChanged(key) {

7
yarn.lock
View File

@@ -8257,6 +8257,13 @@ object.pick@^1.3.0:
dependencies: dependencies:
isobject "^3.0.1" isobject "^3.0.1"
on-finished@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
dependencies:
ee-first "1.1.1"
on-finished@~2.3.0: on-finished@~2.3.0:
version "2.3.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"