diff --git a/packages/api/package.json b/packages/api/package.json index f4503014f..b6b8dc6f2 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,7 +1,7 @@ { "name": "dbgate-api", "main": "src/index.js", - "version": "3.9.6-alpha.8", + "version": "3.9.6-alpha.9", "homepage": "https://dbgate.org/", "repository": { "type": "git", @@ -26,8 +26,8 @@ "compare-versions": "^3.6.0", "cors": "^2.8.5", "cross-env": "^6.0.3", - "dbgate-sqltree": "^3.9.6-alpha.8", - "dbgate-tools": "^3.9.6-alpha.8", + "dbgate-sqltree": "^3.9.6-alpha.9", + "dbgate-tools": "^3.9.6-alpha.9", "eslint": "^6.8.0", "express": "^4.17.1", "express-basic-auth": "^1.2.0", @@ -53,7 +53,7 @@ }, "devDependencies": { "@types/lodash": "^4.14.149", - "dbgate-types": "^3.9.6-alpha.8", + "dbgate-types": "^3.9.6-alpha.9", "env-cmd": "^10.1.0", "node-loader": "^1.0.2", "nodemon": "^2.0.2", diff --git a/packages/api/src/index.js b/packages/api/src/index.js index 56df34014..be318b745 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -1,10 +1,5 @@ const shell = require('./shell'); -// require('socket.io-client'); - -// "socket.io-client": "^2.3.0", -// "utf-8-validate": "^5.0.2", -// "uuid": "^3.4.0", -// "uws": "10.148.1" +const main = require('./main'); const argument = process.argv[2]; if (argument && argument.endsWith('Process')) { @@ -13,7 +8,6 @@ if (argument && argument.endsWith('Process')) { const module = proc[argument]; module.start(); } else if (!module['parent'] && !process.argv.includes('--checkParent')) { - const main = require('./main'); main.start(argument); } diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 0ddf3fe4a..b96dbc809 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -83,9 +83,11 @@ function start(argument = null) { // server static files inside docker container app.use(express.static('/home/dbgate-docker/build')); } else { - app.get('/', (req, res) => { - res.send('DbGate API'); - }); + if (argument != 'startNodeWeb') { + app.get('/', (req, res) => { + res.send('DbGate API'); + }); + } } if (argument == '--dynport') { @@ -102,7 +104,6 @@ function start(argument = null) { findFreePort(5000, function (err, port) { server.listen(port, () => { console.log(`DbGate API listening on port ${port}`); - process.send({ msgtype: 'listening', port }); }); }); } else {