dbgate-api 4.7.4-alpha.12 → 4.7.4-alpha.16

package/.env

@@ -4,11 +4,12 @@ DEVMODE=1
 # HIDE_APP_EDITOR=1
 
 
-DEVWEB=1
-LOGINS=admin,test
+# DEVWEB=1
+# LOGINS=admin,test
 
-LOGIN_PASSWORD_admin=admin
-LOGIN_PERMISSIONS_admin=*
+# LOGIN_PASSWORD_admin=admin
+# LOGIN_PERMISSIONS_admin=*
 
-LOGIN_PASSWORD_test=test
-LOGIN_PERMISSIONS_test=~*, widgets/database
+# LOGIN_PASSWORD_test=test
+# LOGIN_PERMISSIONS_test=~*, widgets/database
+# WORKSPACE_DIR=/home/jena/dbgate-data-2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "4.7.4-alpha.12",
+  "version": "4.7.4-alpha.16",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -25,9 +25,9 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-query-splitter": "^4.7.4-alpha.12",
-    "dbgate-sqltree": "^4.7.4-alpha.12",
-    "dbgate-tools": "^4.7.4-alpha.12",
+    "dbgate-query-splitter": "^4.7.4-alpha.16",
+    "dbgate-sqltree": "^4.7.4-alpha.16",
+    "dbgate-tools": "^4.7.4-alpha.16",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
     "eslint": "^6.8.0",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^4.7.4-alpha.12",
+    "dbgate-types": "^4.7.4-alpha.16",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '4.7.4-alpha.12',
-  buildTime: '2022-03-24T08:15:55.138Z'
+  version: '4.7.4-alpha.16',
+  buildTime: '2022-03-24T18:01:13.346Z'
 };

package/src/main.js

@@ -88,7 +88,7 @@ function start() {
     app.use(getExpressPath('/'), express.static('/home/dbgate-docker/public'));
 
     const port = process.env.PORT || 3000;
-    console.log('DbGate API listening on port', port);
+    console.log('DbGate API listening on port (docker build)', port);
     server.listen(port);
   } else if (platformInfo.isNpmDist) {
     app.use(getExpressPath('/'), express.static(path.join(__dirname, '../../dbgate-web/public')));
@@ -99,7 +99,7 @@ function start() {
       ),
     }).then(port => {
       server.listen(port, () => {
-        console.log(`DbGate API listening on port ${port}`);
+        console.log(`DbGate API listening on port ${port} (NPM build)`);
       });
     });
   } else if (process.env.DEVWEB) {
@@ -108,7 +108,7 @@ function start() {
     app.use(getExpressPath('/'), express.static(path.join(__dirname, '../../web/public')));
 
     const port = process.env.PORT || 3000;
-    console.log('DbGate API & web listening on port', port);
+    console.log('DbGate API & web listening on port (dev web build)', port);
     server.listen(port);
   } else {
     app.get(getExpressPath('/'), (req, res) => {
@@ -116,7 +116,7 @@ function start() {
     });
 
     const port = process.env.PORT || 3000;
-    console.log('DbGate API listening on port', port);
+    console.log('DbGate API listening on port (dev API build)', port);
     server.listen(port);
   }
 

package/src/utility/directories.js

@@ -3,6 +3,7 @@ const path = require('path');
 const fs = require('fs');
 const cleanDirectory = require('./cleanDirectory');
 const platformInfo = require('./platformInfo');
+const processArgs = require('./processArgs');
 
 const createDirectories = {};
 const ensureDirectory = (dir, clean) => {
@@ -19,8 +20,18 @@ const ensureDirectory = (dir, clean) => {
   }
 };
 
+function datadirCore() {
+  if (process.env.WORKSPACE_DIR) {
+    return process.env.WORKSPACE_DIR;
+  }
+  if (processArgs.workspaceDir) {
+    return processArgs.workspaceDir;
+  }
+  return path.join(os.homedir(), 'dbgate-data');
+}
+
 function datadir() {
-  const dir = path.join(os.homedir(), 'dbgate-data');
+  const dir = datadirCore();
   ensureDirectory(dir);
 
   return dir;
@@ -56,6 +67,9 @@ function packagedPluginsDir() {
     // node_modules
     return global['PLUGINS_DIR'];
   }
+  if (processArgs.pluginsDir) {
+    return processArgs.pluginsDir;
+  }
   if (platformInfo.isElectronBundle) {
     return path.resolve(__dirname, '../../plugins');
 

package/src/utility/processArgs.js

@@ -9,10 +9,18 @@ function getNamedArg(name) {
 const checkParent = process.argv.includes('--checkParent');
 const startProcess = getNamedArg('--start-process');
 const isForkedApi = process.argv.includes('--is-forked-api');
+const pluginsDir = getNamedArg('--plugins-dir');
+const workspaceDir = getNamedArg('--workspace-dir');
 
 function getPassArgs() {
-  if (global['NATIVE_MODULES']) return ['--native-modules', global['NATIVE_MODULES']];
-  return [];
+  const res = [];
+  if (global['NATIVE_MODULES']) {
+    res.push('--native-modules', global['NATIVE_MODULES']);
+  }
+  if (global['PLUGINS_DIR']) {
+    res.push('--plugins-dir', global['PLUGINS_DIR']);
+  }
+  return res;
 }
 
 module.exports = {
@@ -20,4 +28,6 @@ module.exports = {
   startProcess,
   isForkedApi,
   getPassArgs,
+  pluginsDir,
+  workspaceDir,
 };