mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-08 04:35:58 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jan Prochazka 2022-06-12 20:20:37 +02:00
commit 02e8bba999
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/entrypoint.sh
View File

@ -8,4 +8,4 @@ then
echo "$HOST_IP $HOST_DOMAIN" >> /etc/hosts
fi
node bundle.js
node bundle.js --listen-api

2
package.json
View File

@ -1,6 +1,6 @@
{
"private": true,
"version": "5.0.4-beta.5",
"version": "5.0.4-beta.9",
"name": "dbgate-all",
"workspaces": [
"packages/*",

10
packages/api/package.json
View File

@ -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 --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"
},

5
packages/api/src/index.js
View File

@ -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.listenApi) {
const main = require('./main');
main.start();
}

4
packages/api/src/utility/platformInfo.js
View File

@ -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'),
};

7
packages/api/src/utility/processArgs.js
View File

@ -11,6 +11,8 @@ const startProcess = getNamedArg('--start-process');
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 = [];
@ -20,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;
}
@ -30,4 +35,6 @@ module.exports = {
getPassArgs,
pluginsDir,
workspaceDir,
listenApi,
listenApiChild,
};