dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-19 18:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed nedb dependency, replaced with own impl

Browse Source
This commit is contained in:
Jan Prochazka
2022-01-29 11:53:34 +01:00
parent c89e3adb38
commit 89b3477446
5 changed files with 22 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/api/src/controllers/connections.js
View File

@@ -1,7 +1,6 @@
const path = require('path');
const { fork } = require('child_process');
const _ = require('lodash');
const nedb = require('nedb-promises');
const fs = require('fs-extra');
const { datadir, filesdir } = require('../utility/directories');
@@ -9,6 +8,7 @@ const socket = require('../utility/socket');
const { encryptConnection } = require('../utility/crypting');
const { handleProcessCommunication } = require('../utility/processComm');
const { pickSafeConnectionInfo } = require('../utility/crypting');
const JsonLinesDatabase = require('../utility/JsonLinesDatabase');
const processArgs = require('../utility/processArgs');
@@ -136,7 +136,7 @@ module.exports = {
const dir = datadir();
if (!portalConnections) {
// @ts-ignore
this.datastore = nedb.create(path.join(dir, 'connections.jsonl'));
this.datastore = new JsonLinesDatabase(path.join(dir, 'connections.jsonl'));
}
},
@@ -173,7 +173,7 @@ module.exports = {
let res;
const encrypted = encryptConnection(connection);
if (connection._id) {
res = await this.datastore.update(_.pick(connection, '_id'), encrypted);
res = await this.datastore.update(encrypted);
} else {
res = await this.datastore.insert(encrypted);
}
@@ -188,7 +188,7 @@ module.exports = {
update_meta: true,
async update({ _id, values }) {
if (portalConnections) return;
const res = await this.datastore.update({ _id }, { $set: values });
const res = await this.datastore.patch(_id, values);
socket.emitChanged('connection-list-changed');
return res;
},
@@ -196,14 +196,14 @@ module.exports = {
updateDatabase_meta: true,
async updateDatabase({ conid, database, values }) {
if (portalConnections) return;
const conn = await this.datastore.find({ _id: conid });
let databases = conn[0].databases || [];
const conn = await this.datastore.get(conid);
let databases = (conn && conn.databases) || [];
if (databases.find(x => x.name == database)) {
databases = databases.map(x => (x.name == database ? { ...x, ...values } : x));
} else {
databases = [...databases, { name: database, ...values }];
}
const res = await this.datastore.update({ _id: conid }, { $set: { databases } });
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}`);
@@ -213,7 +213,7 @@ module.exports = {
delete_meta: true,
async delete(connection) {
if (portalConnections) return;
const res = await this.datastore.remove(_.pick(connection, '_id'));
const res = await this.datastore.remove(connection._id);
socket.emitChanged('connection-list-changed');
return res;
},
@@ -221,8 +221,8 @@ module.exports = {
get_meta: true,
async get({ conid }) {
if (portalConnections) return portalConnections.find(x => x._id == conid) || null;
const res = await this.datastore.find({ _id: conid });
return res[0] || null;
const res = await this.datastore.get(conid);
return res || null;
},
newSqliteDatabase_meta: true,