dbgate-api 5.2.6 → 5.2.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "5.2.6",
+  "version": "5.2.7",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -27,9 +27,9 @@
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
     "dbgate-query-splitter": "^4.9.3",
-    "dbgate-sqltree": "^5.2.6",
-    "dbgate-tools": "^5.2.6",
-    "dbgate-datalib": "^5.2.6",
+    "dbgate-sqltree": "^5.2.7",
+    "dbgate-tools": "^5.2.7",
+    "dbgate-datalib": "^5.2.7",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -74,7 +74,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^5.2.6",
+    "dbgate-types": "^5.2.7",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",

package/src/controllers/databaseConnections.js

@@ -292,7 +292,17 @@ module.exports = {
     let existing = this.opened.find(x => x.conid == conid && x.database == database);
 
     if (existing) {
-      existing.subprocess.send({ msgtype: 'ping' });
+      try {
+        existing.subprocess.send({ msgtype: 'ping' });
+      } catch (err) {
+        logger.error({ err }, 'Error pinging DB connection');
+        this.close(conid, database);
+
+        return {
+          status: 'error',
+          message: 'Ping failed',
+        };
+      }
     } else {
       // @ts-ignore
       existing = await this.ensureOpened(conid, database);

package/src/controllers/serverConnections.js

@@ -164,7 +164,7 @@ module.exports = {
         try {
           opened.subprocess.send({ msgtype: 'ping' });
         } catch (err) {
-          logger.error({ err }, 'Error calling ping');
+          logger.error({ err }, 'Error pinging server connection');
           this.close(conid);
         }
       })

package/src/controllers/sessions.js

@@ -219,7 +219,16 @@ module.exports = {
     if (!session) {
       throw new Error('Invalid session');
     }
-    session.subprocess.send({ msgtype: 'ping' });
+    try {
+      session.subprocess.send({ msgtype: 'ping' });
+    } catch (err) {
+      logger.error({ err }, 'Error pinging session');
+
+      return {
+        status: 'error',
+        message: 'Ping failed',
+      };
+    }
 
     return { state: 'ok' };
   },

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '5.2.6',
-  buildTime: '2023-06-02T11:09:08.847Z'
+  version: '5.2.7',
+  buildTime: '2023-10-06T12:08:05.938Z'
 };

package/src/utility/platformInfo.js

@@ -39,8 +39,8 @@ const platformInfo = {
   environment: process.env.NODE_ENV,
   platform,
   runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL,
-  allowShellConnection: !processArgs.listenApiChild || !!process.env.SHELL_CONNECTION || !!isElectron(),
-  allowShellScripting: !processArgs.listenApiChild || !!process.env.SHELL_SCRIPTING || !!isElectron(),
+  allowShellConnection: (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_CONNECTION || !!isElectron(),
+  allowShellScripting: (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_SCRIPTING || !!isElectron(),
   defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'),
 };