dbgate-api 4.4.4 → 4.4.5-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env-portal +11 -1
- package/package.json +8 -8
- package/src/controllers/archive.js +12 -12
- package/src/controllers/config.js +5 -5
- package/src/controllers/connections.js +18 -9
- package/src/controllers/databaseConnections.js +27 -21
- package/src/controllers/files.js +11 -11
- package/src/controllers/jsldata.js +4 -4
- package/src/controllers/metadata.js +4 -4
- package/src/controllers/plugins.js +9 -9
- package/src/controllers/queryHistory.js +2 -2
- package/src/controllers/runners.js +23 -15
- package/src/controllers/serverConnections.js +12 -9
- package/src/controllers/sessions.js +14 -7
- package/src/currentVersion.js +2 -2
- package/src/index.js +1 -1
- package/src/main.js +57 -40
- package/src/nativeModules.js +11 -3
- package/src/nativeModulesContent.js +1 -1
- package/src/proc/databaseConnectionProcess.js +1 -0
- package/src/utility/DatastoreProxy.js +8 -1
- package/src/utility/directories.js +10 -0
- package/src/utility/platformInfo.js +5 -3
- package/src/utility/processArgs.js +8 -6
- package/src/utility/socket.js +20 -10
- package/src/utility/useController.js +26 -9
|
@@ -4,7 +4,7 @@ const express = require('express');
|
|
|
4
4
|
/**
|
|
5
5
|
* @param {string} route
|
|
6
6
|
*/
|
|
7
|
-
module.exports = function useController(app, route, controller) {
|
|
7
|
+
module.exports = function useController(app, electron, route, controller) {
|
|
8
8
|
const router = express.Router();
|
|
9
9
|
|
|
10
10
|
if (controller._init) {
|
|
@@ -23,24 +23,39 @@ module.exports = function useController(app, route, controller) {
|
|
|
23
23
|
const meta = controller[`${key}_meta`];
|
|
24
24
|
if (!meta) continue;
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
const routeAction = `/${_.kebabCase(key)}`;
|
|
27
|
+
|
|
28
|
+
if (electron) {
|
|
29
|
+
if (meta === true) {
|
|
30
|
+
const handler = `${route.substring(1)}-${_.kebabCase(key)}`;
|
|
31
|
+
// console.log('REGISTERING HANDLER', handler);
|
|
32
|
+
electron.ipcMain.handle(handler, async (event, args) => {
|
|
33
|
+
const data = await controller[key](args);
|
|
34
|
+
// console.log('HANDLED API', handler, data);
|
|
35
|
+
return data;
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
let method = 'post';
|
|
27
43
|
let raw = false;
|
|
28
44
|
let rawParams = false;
|
|
29
45
|
|
|
30
|
-
if (_.isString(meta)) {
|
|
31
|
-
|
|
32
|
-
}
|
|
46
|
+
// if (_.isString(meta)) {
|
|
47
|
+
// method = meta;
|
|
48
|
+
// }
|
|
33
49
|
if (_.isPlainObject(meta)) {
|
|
34
50
|
method = meta.method;
|
|
35
51
|
raw = meta.raw;
|
|
36
52
|
rawParams = meta.rawParams;
|
|
37
53
|
}
|
|
38
54
|
|
|
39
|
-
const route = `/${_.kebabCase(key)}`;
|
|
40
55
|
if (raw) {
|
|
41
|
-
router[method](
|
|
56
|
+
router[method](routeAction, controller[key]);
|
|
42
57
|
} else {
|
|
43
|
-
router[method](
|
|
58
|
+
router[method](routeAction, async (req, res) => {
|
|
44
59
|
// if (controller._init && !controller._init_called) {
|
|
45
60
|
// await controller._init();
|
|
46
61
|
// controller._init_called = true;
|
|
@@ -58,5 +73,7 @@ module.exports = function useController(app, route, controller) {
|
|
|
58
73
|
}
|
|
59
74
|
}
|
|
60
75
|
|
|
61
|
-
app
|
|
76
|
+
if (app) {
|
|
77
|
+
app.use(route, router);
|
|
78
|
+
}
|
|
62
79
|
};
|