dbgate-api 4.7.4 → 4.8.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "4.7.4",
+  "version": "4.8.2",
   "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",
-    "dbgate-sqltree": "^4.7.4",
-    "dbgate-tools": "^4.7.4",
+    "dbgate-query-splitter": "^4.8.2",
+    "dbgate-sqltree": "^4.8.2",
+    "dbgate-tools": "^4.8.2",
     "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",
+    "dbgate-types": "^4.8.2",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",

package/src/controllers/databaseConnections.js

@@ -176,8 +176,13 @@ module.exports = {
   },
 
   loadKeys_meta: true,
-  async loadKeys({ conid, database, root }) {
-    return this.loadDataCore('loadKeys', { conid, database, root });
+  async loadKeys({ conid, database, root, filter }) {
+    return this.loadDataCore('loadKeys', { conid, database, root, filter });
+  },
+
+  exportKeys_meta: true,
+  async exportKeys({ conid, database, options }) {
+    return this.loadDataCore('exportKeys', { conid, database, options });
   },
 
   loadKeyInfo_meta: true,

package/src/controllers/serverConnections.js

@@ -142,6 +142,7 @@ module.exports = {
   createDatabase_meta: true,
   async createDatabase({ conid, name }) {
     const opened = await this.ensureOpened(conid);
+    if (opened.connection.isReadOnly) return false;
     opened.subprocess.send({ msgtype: 'createDatabase', name });
     return { status: 'ok' };
   },

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '4.7.4',
-  buildTime: '2022-03-25T17:25:02.499Z'
+  version: '4.8.2',
+  buildTime: '2022-03-31T09:28:35.029Z'
 };

package/src/proc/databaseConnectionProcess.js

@@ -197,8 +197,12 @@ async function handleCollectionData({ msgid, options }) {
   return handleDriverDataCore(msgid, driver => driver.readCollection(systemConnection, options));
 }
 
-async function handleLoadKeys({ msgid, root }) {
-  return handleDriverDataCore(msgid, driver => driver.loadKeys(systemConnection, root));
+async function handleLoadKeys({ msgid, root, filter }) {
+  return handleDriverDataCore(msgid, driver => driver.loadKeys(systemConnection, root, filter));
+}
+
+async function handleExportKeys({ msgid, options }) {
+  return handleDriverDataCore(msgid, driver => driver.exportKeys(systemConnection, options));
 }
 
 async function handleLoadKeyInfo({ msgid, key }) {
@@ -207,6 +211,10 @@ async function handleLoadKeyInfo({ msgid, key }) {
 
 async function handleCallMethod({ msgid, method, args }) {
   return handleDriverDataCore(msgid, driver => {
+    if (storedConnection.isReadOnly) {
+      throw new Error('Connection is read only, cannot call custom methods');
+    }
+
     ensureExecuteCustomScript(driver);
     return driver.callMethod(systemConnection, method, args);
   });
@@ -307,6 +315,7 @@ const messageHandlers = {
   generateDeploySql: handleGenerateDeploySql,
   loadFieldValues: handleLoadFieldValues,
   sqlSelect: handleSqlSelect,
+  exportKeys: handleExportKeys,
   // runCommand: handleRunCommand,
 };
 

package/src/utility/getJslFileName.js

@@ -6,6 +6,10 @@ function getJslFileName(jslid) {
   if (archiveMatch) {
     return path.join(resolveArchiveFolder(archiveMatch[1]), `${archiveMatch[2]}.jsonl`);
   }
+  const fileMatch = jslid.match(/^file:\/\/(.*)$/);
+  if (fileMatch) {
+    return fileMatch[1];
+  }
   return path.join(jsldir(), `${jslid}.jsonl`);
 }