From ae69ca9ebd8bfdd103f45cd421ea31a6499925c9 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 19:42:51 +0200 Subject: [PATCH 1/7] explicit start api --- docker/entrypoint.sh | 2 +- packages/api/package.json | 10 +++++----- packages/api/src/index.js | 5 +++-- packages/api/src/utility/processArgs.js | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index afc164e06..140e3acc3 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -8,4 +8,4 @@ then echo "$HOST_IP $HOST_DOMAIN" >> /etc/hosts fi -node bundle.js +node bundle.js --start-api diff --git a/packages/api/package.json b/packages/api/package.json index 3577e95e8..4480fef01 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -52,11 +52,11 @@ "uuid": "^3.4.0" }, "scripts": { - "start": "env-cmd node src/index.js", - "start:portal": "env-cmd -f env/portal/.env node src/index.js", - "start:singledb": "env-cmd -f env/singledb/.env node src/index.js", - "start:filedb": "env-cmd node src/index.js /home/jena/test/chinook/Chinook.db", - "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test", + "start": "env-cmd node src/index.js --start-api", + "start:portal": "env-cmd -f env/portal/.env node src/index.js --start-api", + "start:singledb": "env-cmd -f env/singledb/.env node src/index.js --start-api", + "start:filedb": "env-cmd node src/index.js /home/jena/test/chinook/Chinook.db --start-api", + "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test --start-api", "ts": "tsc", "build": "webpack" }, diff --git a/packages/api/src/index.js b/packages/api/src/index.js index b93feeb98..a8ea46209 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -8,9 +8,10 @@ if (processArgs.startProcess) { const proc = require('./proc'); const module = proc[processArgs.startProcess]; module.start(); -} else if (!processArgs.checkParent && !global['API_PACKAGE']) { - const main = require('./main'); +} +if (processArgs.startApi) { + const main = require('./main'); main.start(); } diff --git a/packages/api/src/utility/processArgs.js b/packages/api/src/utility/processArgs.js index 3b5dc2c5a..f3bc07e56 100644 --- a/packages/api/src/utility/processArgs.js +++ b/packages/api/src/utility/processArgs.js @@ -11,6 +11,7 @@ const startProcess = getNamedArg('--start-process'); const isForkedApi = process.argv.includes('--is-forked-api'); const pluginsDir = getNamedArg('--plugins-dir'); const workspaceDir = getNamedArg('--workspace-dir'); +const startApi = process.argv.includes('--start-api'); function getPassArgs() { const res = []; @@ -30,4 +31,5 @@ module.exports = { getPassArgs, pluginsDir, workspaceDir, + startApi, }; From 2d83fb7dc41071a8bf1034df51a1ba1db16edd13 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 19:45:27 +0200 Subject: [PATCH 2/7] start api => listen api --- docker/entrypoint.sh | 2 +- packages/api/package.json | 10 +++++----- packages/api/src/index.js | 2 +- packages/api/src/utility/processArgs.js | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 140e3acc3..453122c2d 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -8,4 +8,4 @@ then echo "$HOST_IP $HOST_DOMAIN" >> /etc/hosts fi -node bundle.js --start-api +node bundle.js --listen-api diff --git a/packages/api/package.json b/packages/api/package.json index 4480fef01..e084d3497 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -52,11 +52,11 @@ "uuid": "^3.4.0" }, "scripts": { - "start": "env-cmd node src/index.js --start-api", - "start:portal": "env-cmd -f env/portal/.env node src/index.js --start-api", - "start:singledb": "env-cmd -f env/singledb/.env node src/index.js --start-api", - "start:filedb": "env-cmd node src/index.js /home/jena/test/chinook/Chinook.db --start-api", - "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test --start-api", + "start": "env-cmd node src/index.js --listen-api", + "start:portal": "env-cmd -f env/portal/.env node src/index.js --listen-api", + "start:singledb": "env-cmd -f env/singledb/.env node src/index.js --listen-api", + "start:filedb": "env-cmd node src/index.js /home/jena/test/chinook/Chinook.db --listen-api", + "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test --listen-api", "ts": "tsc", "build": "webpack" }, diff --git a/packages/api/src/index.js b/packages/api/src/index.js index a8ea46209..e557a8c60 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -10,7 +10,7 @@ if (processArgs.startProcess) { module.start(); } -if (processArgs.startApi) { +if (processArgs.listenApi) { const main = require('./main'); main.start(); } diff --git a/packages/api/src/utility/processArgs.js b/packages/api/src/utility/processArgs.js index f3bc07e56..d199237bd 100644 --- a/packages/api/src/utility/processArgs.js +++ b/packages/api/src/utility/processArgs.js @@ -11,7 +11,7 @@ const startProcess = getNamedArg('--start-process'); const isForkedApi = process.argv.includes('--is-forked-api'); const pluginsDir = getNamedArg('--plugins-dir'); const workspaceDir = getNamedArg('--workspace-dir'); -const startApi = process.argv.includes('--start-api'); +const listenApi = process.argv.includes('--listen-api'); function getPassArgs() { const res = []; @@ -31,5 +31,5 @@ module.exports = { getPassArgs, pluginsDir, workspaceDir, - startApi, + listenApi, }; From 8abb311623ee676c32a966c3b170789066a5a930 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 19:45:55 +0200 Subject: [PATCH 3/7] v5.0.4-beta.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0cadd2a68..7b9c68c42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "5.0.4-beta.5", + "version": "5.0.4-beta.6", "name": "dbgate-all", "workspaces": [ "packages/*", From 773abc6dff5748f0f6c7ca0e744b9ff825828023 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 19:46:35 +0200 Subject: [PATCH 4/7] v5.0.4-alpha.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b9c68c42..8a40508c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "5.0.4-beta.6", + "version": "5.0.4-alpha.7", "name": "dbgate-all", "workspaces": [ "packages/*", From 53e5f1378c25dbdc90a3a1f508cdbca59e28ff69 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 20:02:48 +0200 Subject: [PATCH 5/7] shell scripts blocked by default only when listen-api --- packages/api/src/utility/platformInfo.js | 4 ++-- packages/api/src/utility/processArgs.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/api/src/utility/platformInfo.js b/packages/api/src/utility/platformInfo.js index 77143ef1a..393edbfaf 100644 --- a/packages/api/src/utility/platformInfo.js +++ b/packages/api/src/utility/platformInfo.js @@ -39,8 +39,8 @@ const platformInfo = { environment: process.env.NODE_ENV, platform, runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL, - allowShellConnection: !!process.env.SHELL_CONNECTION || !!isElectron(), - allowShellScripting: !!process.env.SHELL_SCRIPTING || !!isElectron(), + allowShellConnection: !processArgs.listenApiChild || !!process.env.SHELL_CONNECTION || !!isElectron(), + allowShellScripting: !processArgs.listenApiChild || !!process.env.SHELL_SCRIPTING || !!isElectron(), defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'), }; diff --git a/packages/api/src/utility/processArgs.js b/packages/api/src/utility/processArgs.js index d199237bd..68514c79f 100644 --- a/packages/api/src/utility/processArgs.js +++ b/packages/api/src/utility/processArgs.js @@ -12,6 +12,7 @@ const isForkedApi = process.argv.includes('--is-forked-api'); const pluginsDir = getNamedArg('--plugins-dir'); const workspaceDir = getNamedArg('--workspace-dir'); const listenApi = process.argv.includes('--listen-api'); +const listenApiChild = process.argv.includes('--listen-api-child') || listenApi; function getPassArgs() { const res = []; @@ -21,6 +22,9 @@ function getPassArgs() { if (global['PLUGINS_DIR']) { res.push('--plugins-dir', global['PLUGINS_DIR']); } + if (listenApiChild) { + res.push('listen-api-child'); + } return res; } @@ -32,4 +36,5 @@ module.exports = { pluginsDir, workspaceDir, listenApi, + listenApiChild, }; From aaa72426c3a4a0b30947520c7534e9e799075a65 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 20:02:58 +0200 Subject: [PATCH 6/7] v5.0.4-alpha.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a40508c6..8c2a1fcc7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "5.0.4-alpha.7", + "version": "5.0.4-alpha.8", "name": "dbgate-all", "workspaces": [ "packages/*", From e770ca3eef313c7e5d704ff25d49c6ab87255fb1 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sun, 12 Jun 2022 20:09:35 +0200 Subject: [PATCH 7/7] v5.0.4-beta.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c2a1fcc7..aafe08d24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "5.0.4-alpha.8", + "version": "5.0.4-beta.9", "name": "dbgate-all", "workspaces": [ "packages/*",