dbgate-api 4.8.7 → 4.8.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "4.8.7",
+  "version": "4.8.8",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
     "dbgate-query-splitter": "^4.9.0",
-    "dbgate-sqltree": "^4.8.7",
-    "dbgate-tools": "^4.8.7",
+    "dbgate-sqltree": "^4.8.8",
+    "dbgate-tools": "^4.8.8",
     "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.8.7",
+    "dbgate-types": "^4.8.8",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",

package/src/controllers/files.js

@@ -62,6 +62,15 @@ module.exports = {
     return true;
   },
 
+  refresh_meta: true,
+  async refresh({ folders }, req) {
+    for (const folder of folders) {
+      socket.emitChanged(`files-changed-${folder}`);
+      socket.emitChanged(`all-files-changed`);
+    }
+    return true;
+  },
+
   copy_meta: true,
   async copy({ folder, file, newFile }, req) {
     if (!hasPermission(`files/${folder}/write`, req)) return false;
@@ -177,4 +186,24 @@ module.exports = {
     await fs.writeFile(filePath, getDiagramExport(html, css, themeType, themeClassName));
     return true;
   },
+
+  getFileRealPath_meta: true,
+  async getFileRealPath({ folder, file }, req) {
+    if (folder.startsWith('archive:')) {
+      if (!hasPermission(`archive/write`, req)) return false;
+      const dir = resolveArchiveFolder(folder.substring('archive:'.length));
+      return path.join(dir, file);
+    } else if (folder.startsWith('app:')) {
+      if (!hasPermission(`apps/write`, req)) return false;
+      const app = folder.substring('app:'.length);
+      return path.join(appdir(), app, file);
+    } else {
+      if (!hasPermission(`files/${folder}/write`, req)) return false;
+      const dir = path.join(filesdir(), folder);
+      if (!(await fs.exists(dir))) {
+        await fs.mkdir(dir);
+      }
+      return path.join(dir, file);
+    }
+  },
 };

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '4.8.7',
-  buildTime: '2022-04-22T18:29:21.643Z'
+  version: '4.8.8',
+  buildTime: '2022-04-29T15:49:25.137Z'
 };

package/src/main.js

@@ -155,8 +155,8 @@ function useAllControllers(app, electron) {
   useController(app, electron, '/apps', apps);
 }
 
-function initializeElectronSender(electronSender) {
+function setElectronSender(electronSender) {
   socket.setElectronSender(electronSender);
 }
 
-module.exports = { start, useAllControllers, initializeElectronSender, configController: config };
+module.exports = { start, useAllControllers, setElectronSender, configController: config };

package/src/utility/socket.js

@@ -1,6 +1,6 @@
 let sseResponse = null;
 let electronSender = null;
-let init = '';
+let init = [];
 
 module.exports = {
   setSseResponse(value) {
@@ -12,15 +12,25 @@ module.exports = {
   },
   emit(message, data) {
     if (electronSender) {
+      if (init.length > 0) {
+        for (const item of init) {
+          electronSender.send(item.message, item.data == null ? null : item.data);
+        }
+        init = [];
+      }
       electronSender.send(message, data == null ? null : data);
     } else if (sseResponse) {
-      if (init) {
-        sseResponse.write(init);
-        init = '';
+      if (init.length > 0) {
+        for (const item of init) {
+          sseResponse.write(
+            `event: ${item.message}\ndata: ${JSON.stringify(item.data == null ? null : item.data)}\n\n`
+          );
+        }
+        init = [];
       }
       sseResponse.write(`event: ${message}\ndata: ${JSON.stringify(data == null ? null : data)}\n\n`);
     } else {
-      init += sseResponse;
+      init.push([{ message, data }]);
     }
   },
   emitChanged(key) {