dbgate-api 4.4.3 → 4.5.1

package/src/utility/platformInfo.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const processArgs = require('./processArgs');
+const isElectron = require('is-electron');
 
 const platform = process.env.OS_OVERRIDE ? process.env.OS_OVERRIDE : process.platform;
 const isWindows = platform === 'win32';
@@ -10,6 +11,7 @@ const isLinux = platform === 'linux';
 const isDocker = fs.existsSync('/home/dbgate-docker/public');
 const isDevMode = process.env.DEVMODE == '1';
 const isNpmDist = !!global['dbgateApiModulePath'];
+const isForkedApi = processArgs.isForkedApi;
 
 // function moduleAvailable(name) {
 //   try {
@@ -20,14 +22,14 @@ const isNpmDist = !!global['dbgateApiModulePath'];
 //   }
 // }
 
-const isElectronBundle = processArgs.isElectronBundle;
-
 const platformInfo = {
   isWindows,
   isMac,
   isLinux,
   isDocker,
-  isElectronBundle,
+  isElectronBundle: isElectron() && !isDevMode,
+  isForkedApi,
+  isElectron: isElectron(),
   isDevMode,
   isNpmDist,
   isSnap: process.env.ELECTRON_SNAP == 'true',

package/src/utility/processArgs.js

@@ -7,15 +7,17 @@ function getNamedArg(name) {
 }
 
 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');
+const isForkedApi = process.argv.includes('--is-forked-api');
+
+function getPassArgs() {
+  if (global['NATIVE_MODULES']) return ['--native-modules', global['NATIVE_MODULES']];
+  return [];
+}
 
 module.exports = {
   checkParent,
-  nativeModules,
   startProcess,
-  dynport,
-  isElectronBundle,
+  isForkedApi,
+  getPassArgs,
 };

package/src/utility/requireEngineDriver.js

@@ -1,5 +1,6 @@
 const _ = require('lodash');
 const requirePlugin = require('../shell/requirePlugin');
+const { pickSafeConnectionInfo } = require('./crypting');
 
 /** @returns {import('dbgate-types').EngineDriver} */
 function requireEngineDriver(connection) {
@@ -10,14 +11,14 @@ function requireEngineDriver(connection) {
     engine = connection.engine;
   }
   if (!engine) {
-    throw new Error('Could not get driver from connection');
+    throw new Error(`Could not get driver from connection ${JSON.stringify(pickSafeConnectionInfo(connection))}`);
   }
   if (engine.includes('@')) {
     const [shortName, packageName] = engine.split('@');
     const plugin = requirePlugin(packageName);
     return plugin.drivers.find(x => x.engine == engine);
   }
-  throw new Error(`Could not found engine driver ${engine}`);
+  throw new Error(`Could not find engine driver ${engine}`);
 }
 
 module.exports = requireEngineDriver;

package/src/utility/socket.js

@@ -1,19 +1,29 @@
-let socket = null;
+let sseResponse = null;
+let electronSender = null;
+let init = '';
 
 module.exports = {
-  set(value) {
-    socket = value;
+  setSseResponse(value) {
+    sseResponse = value;
   },
-  get() {
-    return socket;
+  setElectronSender(value) {
+    electronSender = value;
   },
   emit(message, data) {
-    // console.log('EMIT:', message, data);
-    socket.emit(message, data);
+    if (electronSender) {
+      electronSender.send(message, data == null ? null : data);
+    } else if (sseResponse) {
+      if (init) {
+        sseResponse.write(init);
+        init = '';
+      }
+      sseResponse.write(`event: ${message}\ndata: ${JSON.stringify(data == null ? null : data)}\n\n`);
+    } else {
+      init += sseResponse;
+    }
   },
   emitChanged(key) {
-    // console.log('EMIT_CHANGED:', key);
-    socket.emit('clean-cache', key);
-    socket.emit(key);
+    this.emit('clean-cache', key);
+    this.emit(key);
   },
 };

package/src/utility/useController.js

@@ -4,7 +4,7 @@ const express = require('express');
 /**
  * @param {string} route
  */
-module.exports = function useController(app, route, controller) {
+module.exports = function useController(app, electron, route, controller) {
   const router = express.Router();
 
   if (controller._init) {
@@ -23,24 +23,39 @@ module.exports = function useController(app, route, controller) {
     const meta = controller[`${key}_meta`];
     if (!meta) continue;
 
-    let method = 'get';
+    const routeAction = `/${_.kebabCase(key)}`;
+
+    if (electron) {
+      if (meta === true) {
+        const handler = `${route.substring(1)}-${_.kebabCase(key)}`;
+        // console.log('REGISTERING HANDLER', handler);
+        electron.ipcMain.handle(handler, async (event, args) => {
+          const data = await controller[key](args);
+          // console.log('HANDLED API', handler, data);
+          return data;
+        });
+      }
+
+      continue;
+    }
+
+    let method = 'post';
     let raw = false;
     let rawParams = false;
 
-    if (_.isString(meta)) {
-      method = meta;
-    }
+    // if (_.isString(meta)) {
+    //   method = meta;
+    // }
     if (_.isPlainObject(meta)) {
       method = meta.method;
       raw = meta.raw;
       rawParams = meta.rawParams;
     }
 
-    const route = `/${_.kebabCase(key)}`;
     if (raw) {
-      router[method](route, controller[key]);
+      router[method](routeAction, controller[key]);
     } else {
-      router[method](route, async (req, res) => {
+      router[method](routeAction, async (req, res) => {
         // if (controller._init && !controller._init_called) {
         //   await controller._init();
         //   controller._init_called = true;
@@ -58,5 +73,7 @@ module.exports = function useController(app, route, controller) {
     }
   }
 
-  app.use(route, router);
+  if (app) {
+    app.use(route, router);
+  }
 };