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

command line params refactor

Browse Source
This commit is contained in:
Jan Prochazka
2021-04-17 16:38:10 +02:00
parent 1d264ab559
commit c0c1f9d786
12 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/src/utility/DatastoreProxy.js
View File

@@ -29,7 +29,7 @@ class DatastoreProxy {
async ensureSubprocess() {
if (!this.subprocess) {
this.subprocess = fork(process.argv[1], ['jslDatastoreProcess', ...process.argv.slice(3)]);
this.subprocess = fork(process.argv[1], ['--start-process', 'jslDatastoreProcess', ...process.argv.slice(3)]);
this.subprocess.on('message', message => {
// @ts-ignore

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

@@ -1,15 +1,15 @@
const fs = require('fs');
const os = require('os');
const path = require('path');
const processArgs = require('./processArgs');
const p = process;
const platform = p.env.OS_OVERRIDE ? p.env.OS_OVERRIDE : p.platform;
const platform = process.env.OS_OVERRIDE ? process.env.OS_OVERRIDE : process.platform;
const isWindows = platform === 'win32';
const isMac = platform === 'darwin';
const isLinux = platform === 'linux';
const isDocker = fs.existsSync('/home/dbgate-docker/public');
const isDevMode = p.env.DEVMODE == '1';
const isNpmDist = p.argv[2] == 'startNodeWeb';
const isDevMode = process.env.DEVMODE == '1';
const isNpmDist = !!global['dbgateApiModulePath'];
// function moduleAvailable(name) {
// try {
@@ -20,7 +20,7 @@ const isNpmDist = p.argv[2] == 'startNodeWeb';
// }
// }
const isElectronBundle = p.argv.indexOf('--is-electron-bundle') >= 0;
const isElectronBundle = processArgs.isElectronBundle;
const platformInfo = {
isWindows,
@@ -30,13 +30,13 @@ const platformInfo = {
isElectronBundle,
isDevMode,
isNpmDist,
isSnap: p.env.ELECTRON_SNAP == 'true',
isPortable: isWindows && p.env.PORTABLE_EXECUTABLE_DIR,
isAppImage: p.env.DESKTOPINTEGRATION === 'AppImageLauncher',
sshAuthSock: p.env.SSH_AUTH_SOCK,
isSnap: process.env.ELECTRON_SNAP == 'true',
isPortable: isWindows && process.env.PORTABLE_EXECUTABLE_DIR,
isAppImage: process.env.DESKTOPINTEGRATION === 'AppImageLauncher',
sshAuthSock: process.env.SSH_AUTH_SOCK,
environment: process.env.NODE_ENV,
platform,
runningInWebpack: !!p.env.WEBPACK_DEV_SERVER_URL,
runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL,
defaultKeyFile: path.join(os.homedir(), '.ssh/id_rsa'),
};

21
packages/api/src/utility/processArgs.js Normal file
View File

@@ -0,0 +1,21 @@
function getNamedArg(name) {
const argIndex = process.argv.indexOf(name);
if (argIndex > 0) {
return process.argv[argIndex + 1];
}
return null;
}
const checkParent = process.argv.includes('--checkParent');
const dynport = process.argv.includes('--dynport');
const nativeModules = getNamedArg('--native-modules');
const startProcess = getNamedArg('--start-process');
const isElectronBundle = process.argv.includes('--is-electron-bundle');
module.exports = {
checkParent,
nativeModules,
startProcess,
dynport,
isElectronBundle,
};