feat: add file watch

.gitignore

@@ -31,4 +31,7 @@ yarn-error.log*
 app/src/nativeModulesContent.js
 packages/api/src/nativeModulesContent.js
 packages/api/src/packagedPluginsContent.js
-.VSCodeCounter
+.VSCodeCounter
+
+.idea
+.dbgate

packages/api/.env

@@ -1,17 +1,17 @@
 DEVMODE=1
 SHELL_SCRIPTING=1
+DEVWEB=1
+runAsPortal=1
+WORKSPACE_DIR=../../.dbgate
 
 # PERMISSIONS=~widgets/app,~widgets/plugins
 # DISABLE_SHELL=1
 # HIDE_APP_EDITOR=1
 
-
-# DEVWEB=1
 # LOGINS=admin,test
 
 # LOGIN_PASSWORD_admin=admin
 # LOGIN_PERMISSIONS_admin=*
 
 # LOGIN_PASSWORD_test=test
 # LOGIN_PERMISSIONS_test=~*, widgets/database
-# WORKSPACE_DIR=/home/jena/dbgate-data-2

packages/api/src/controllers/config.js

@@ -34,7 +34,7 @@ module.exports = {
     const permissions = login ? login.permissions : process.env.PERMISSIONS;
 
     return {
-      runAsPortal: !!connections.portalConnections,
+      runAsPortal: !!connections.portalConnections || !!process.env.runAsPortal,
       singleDbConnection: connections.singleDbConnection,
       singleConnection: connections.singleConnection,
       // hideAppEditor: !!process.env.HIDE_APP_EDITOR,

packages/api/src/controllers/connections.js

@@ -192,6 +192,7 @@ module.exports = {
     if (!portalConnections) {
       // @ts-ignore
       this.datastore = new JsonLinesDatabase(path.join(dir, 'connections.jsonl'));
+      this.datastore.watch();
     }
   },
 
@@ -273,7 +274,6 @@ module.exports = {
     } else {
       res = await this.datastore.insert(encrypted);
     }
-    socket.emitChanged('connection-list-changed');
     socket.emitChanged('used-apps-changed');
     if (this._closeAll) {
       this._closeAll(connection._id);
@@ -289,15 +289,13 @@ module.exports = {
     if (portalConnections) return;
     testConnectionPermission(_id, req);
     const res = await this.datastore.patch(_id, values);
-    socket.emitChanged('connection-list-changed');
     return res;
   },
 
   batchChangeFolder_meta: true,
   async batchChangeFolder({ folder, newFolder }, req) {
     // const updated = await this.datastore.find(x => x.parent == folder);
     const res = await this.datastore.updateAll(x => (x.parent == folder ? { ...x, parent: newFolder } : x));
-    socket.emitChanged('connection-list-changed');
     return res;
   },
 
@@ -313,7 +311,6 @@ module.exports = {
       databases = [...databases, { name: database, ...values }];
     }
     const res = await this.datastore.patch(conid, { databases });
-    socket.emitChanged('connection-list-changed');
     socket.emitChanged('used-apps-changed');
     // socket.emitChanged(`db-apps-changed-${conid}-${database}`);
     return res;
@@ -324,7 +321,6 @@ module.exports = {
     if (portalConnections) return;
     testConnectionPermission(connection, req);
     const res = await this.datastore.remove(connection._id);
-    socket.emitChanged('connection-list-changed');
     return res;
   },
 

packages/api/src/utility/JsonLinesDatabase.js

@@ -1,6 +1,7 @@
 const AsyncLock = require('async-lock');
 const fs = require('fs-extra');
 const uuidv1 = require('uuid/v1');
+const socket = require('./socket');
 
 const lock = new AsyncLock();
 
@@ -111,6 +112,32 @@ class JsonLinesDatabase {
     return removed;
   }
 
+  watch() {
+    if (!fs.existsSync(this.filename)) {
+      fs.writeFileSync(this.filename, '');
+    }
+
+    fs.watch(this.filename, { persistent: true }, (eventType, filename) => {
+      console.log(`File ${filename} changed, event type is: ${eventType}`);
+      if (eventType === 'change') {
+        this._reload();
+        socket.emitChanged('connection-list-changed');
+      }
+    });
+  }
+
+  async _reload() {
+    try {
+      const text = await fs.promises.readFile(this.filename, { encoding: 'utf-8' });
+      this.data = text
+          .split('\n')
+          .filter(x => x.trim())
+          .map(x => JSON.parse(x));
+    } catch (err) {
+      console.error(`Error reloading file ${this.filename}`, err);
+    }
+  }
+
   //   async _openReader() {
   //     return new Promise((resolve, reject) =>
   //       lineReader.open(this.filename, (err, reader) => {