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

fixed npm dist subprocess problem

Browse Source
This commit is contained in:
Jan Prochazka
2022-03-24 09:00:51 +01:00
parent a3bc1e577a
commit 4c411b048d
7 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/src/controllers/runners.js
View File

@@ -111,7 +111,7 @@ module.exports = {
stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
env: {
...process.env,
DBGATE_API: global['API_PACKAGE'] || global['dbgateApiModulePath'] || process.argv[1],
DBGATE_API: global['API_PACKAGE'] || process.argv[1],
..._.fromPairs(pluginNames.map(name => [`PLUGIN_${_.camelCase(name)}`, getPluginBackendPath(name)])),
},
}

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

@@ -8,7 +8,7 @@ if (processArgs.startProcess) {
const proc = require('./proc');
const module = proc[processArgs.startProcess];
module.start();
} else if (!processArgs.checkParent && !global['API_PACKAGE'] && !global['dbgateApiModulePath']) {
} else if (!processArgs.checkParent && !global['API_PACKAGE']) {
const main = require('./main');
main.start();

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

@@ -54,7 +54,7 @@ function packagedPluginsDir() {
}
if (platformInfo.isNpmDist) {
// node_modules
return global['dbgateApiPackagedPluginsPath'];
return global['PLUGINS_DIR'];
}
if (platformInfo.isElectronBundle) {
return path.resolve(__dirname, '../../plugins');

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

@@ -10,7 +10,7 @@ const isMac = platform === 'darwin';
const isLinux = platform === 'linux';
const isDocker = fs.existsSync('/home/dbgate-docker/public');
const isDevMode = process.env.DEVMODE == '1';
const isNpmDist = !!global['dbgateApiModulePath'];
const isNpmDist = !!global['IS_NPM_DIST'];
const isForkedApi = processArgs.isForkedApi;
// function moduleAvailable(name) {

5
packages/dbgate/bin/dbgate-serve.js
View File

@@ -3,8 +3,9 @@
const path = require('path');
require('dotenv').config();
global.dbgateApiModulePath = path.dirname(path.dirname(require.resolve('dbgate-api')));
global.dbgateApiPackagedPluginsPath = path.dirname(global.dbgateApiModulePath);
global.API_PACKAGE = path.dirname(path.dirname(require.resolve('dbgate-api')));
global.PLUGINS_DIR = path.dirname(global.API_PACKAGE);
global.IS_NPM_DIST = true;
const dbgateApi = require('dbgate-api');