dbgate-api-premium 6.6.0 → 6.6.2

package/src/utility/DatastoreProxy.js

@@ -61,7 +61,7 @@ class DatastoreProxy {
         this.subprocess = null;
       });
       this.subprocess.on('error', err => {
-        logger.error(extractErrorLogData(err), 'Error in data store subprocess');
+        logger.error(extractErrorLogData(err), 'DBGM-00167 Error in data store subprocess');
         this.subprocess = null;
       });
       this.subprocess.send({ msgtype: 'open', file: this.file });
@@ -77,7 +77,7 @@ class DatastoreProxy {
       try {
         this.subprocess.send({ msgtype: 'read', msgid, offset, limit });
       } catch (err) {
-        logger.error(extractErrorLogData(err), 'Error getting rows');
+        logger.error(extractErrorLogData(err), 'DBGM-00168 Error getting rows');
         this.subprocess = null;
       }
     });
@@ -91,7 +91,7 @@ class DatastoreProxy {
       try {
         this.subprocess.send({ msgtype: 'notify', msgid });
       } catch (err) {
-        logger.error(extractErrorLogData(err), 'Error notifying subprocess');
+        logger.error(extractErrorLogData(err), 'DBGM-00169 Error notifying subprocess');
         this.subprocess = null;
       }
     });

package/src/utility/JsonLinesDatastore.js

@@ -7,7 +7,6 @@ const AsyncLock = require('async-lock');
 const lock = new AsyncLock();
 const stableStringify = require('json-stable-stringify');
 const { evaluateCondition } = require('dbgate-sqltree');
-const requirePluginFunction = require('./requirePluginFunction');
 const esort = require('external-sorting');
 const { jsldir } = require('./directories');
 const LineReader = require('./LineReader');
@@ -23,7 +22,10 @@ class JsonLinesDatastore {
     this.notifyChangedCallback = null;
     this.currentFilter = null;
     this.currentSort = null;
-    this.rowFormatter = requirePluginFunction(formatterFunction);
+    if (formatterFunction) {
+      const requirePluginFunction = require('./requirePluginFunction');
+      this.rowFormatter = requirePluginFunction(formatterFunction);
+    }
     this.sortedFiles = {};
   }
 

package/src/utility/appLogStore.js

@@ -0,0 +1,119 @@
+const fs = require('fs-extra');
+const path = require('path');
+const { logsdir } = require('./directories');
+const { format, addDays, startOfDay } = require('date-fns');
+const LineReader = require('./LineReader');
+const socket = require('./socket');
+const _ = require('lodash');
+
+async function getLogFiles(timeFrom, timeTo) {
+  const dir = logsdir();
+  const files = await fs.readdir(dir);
+  const startPrefix = format(timeFrom, 'yyyy-MM-dd');
+  const endPrefix = format(addDays(timeTo, 1), 'yyyy-MM-dd');
+  const logFiles = files
+    .filter(file => file.endsWith('.ndjson'))
+    .filter(file => file >= startPrefix && file < endPrefix);
+  return logFiles.sort().map(x => path.join(dir, x));
+}
+
+const RECENT_LOG_LIMIT = 1000;
+
+let recentLogs = null;
+const beforeRecentLogs = [];
+
+function adjustRecentLogs() {
+  if (recentLogs.length > RECENT_LOG_LIMIT) {
+    recentLogs.splice(0, recentLogs.length - RECENT_LOG_LIMIT);
+  }
+}
+
+function prepareEntryForExport(entry, lastEntry) {
+  return {
+    date: format(new Date(entry.time), 'yyyy-MM-dd'),
+    time: format(new Date(entry.time), 'HH:mm:ss'),
+    dtime: lastEntry ? entry.time - lastEntry.time : 0,
+    msgcode: entry.msgcode || '',
+    message: entry.msg || '',
+    ..._.omit(entry, ['time', 'msg', 'msgcode']),
+    conid: entry.conid || '',
+    database: entry.database || '',
+    engine: entry.engine || '',
+    ts: entry.time,
+  };
+}
+
+async function copyAppLogsIntoFile(timeFrom, timeTo, fileName, prepareForExport) {
+  const writeStream = fs.createWriteStream(fileName);
+
+  let lastEntry = null;
+  for (const file of await getLogFiles(timeFrom, timeTo)) {
+    const readStream = fs.createReadStream(file);
+    const reader = new LineReader(readStream);
+    do {
+      const line = await reader.readLine();
+      if (line == null) break;
+      try {
+        const logEntry = JSON.parse(line);
+        if (logEntry.time >= timeFrom && logEntry.time <= timeTo) {
+          writeStream.write(
+            JSON.stringify(prepareForExport ? prepareEntryForExport(logEntry, lastEntry) : logEntry) + '\n'
+          );
+          lastEntry = logEntry;
+        }
+      } catch (e) {
+        continue;
+      }
+    } while (true);
+  }
+}
+
+async function initializeRecentLogProvider() {
+  const logs = [];
+  for (const file of await getLogFiles(startOfDay(new Date()), new Date())) {
+    const fileStream = fs.createReadStream(file);
+    const reader = new LineReader(fileStream);
+    do {
+      const line = await reader.readLine();
+      if (line == null) break;
+      try {
+        const logEntry = JSON.parse(line);
+        logs.push(logEntry);
+        if (logs.length > RECENT_LOG_LIMIT) {
+          logs.shift();
+        }
+      } catch (e) {
+        continue;
+      }
+    } while (true);
+  }
+  recentLogs = logs;
+  recentLogs.push(...beforeRecentLogs);
+}
+
+let counter = 0;
+function pushToRecentLogs(msg) {
+  const finalMsg = {
+    ...msg,
+    counter,
+  };
+  counter += 1;
+  if (recentLogs) {
+    recentLogs.push(finalMsg);
+    adjustRecentLogs();
+    socket.emit('applog-event', finalMsg);
+  } else {
+    beforeRecentLogs.push(finalMsg);
+  }
+}
+
+function getRecentAppLogRecords() {
+  return recentLogs ?? beforeRecentLogs;
+}
+
+module.exports = {
+  initializeRecentLogProvider,
+  getRecentAppLogRecords,
+  pushToRecentLogs,
+  copyAppLogsIntoFile,
+};

package/src/utility/auditlog.js

@@ -92,7 +92,7 @@ async function processAuditLogQueue() {
           element.message || null
         );
       } catch (err) {
-        logger.error(extractErrorLogData(err), 'Error processing audit log entry');
+        logger.error(extractErrorLogData(err), 'DBGM-00159 Error processing audit log entry');
       }
     }
 

package/src/utility/authProxy.js

@@ -10,7 +10,7 @@ const processArgs = require('./processArgs');
 const logger = getLogger('authProxy');
 
 const AUTH_PROXY_URL = process.env.LOCAL_AUTH_PROXY
-  ? 'http://localhost:3109'
+  ? 'http://localhost:3110'
   : process.env.DEVWEB || process.env.DEVMODE
   ? 'https://auth-proxy.dbgate.udolni.net'
   : 'https://auth.dbgate.eu';
@@ -120,7 +120,7 @@ function startTokenChecking(sid, callback) {
         callback(resp.data.token);
       }
     } catch (err) {
-      logger.error(extractErrorLogData(err), 'Error checking token');
+      logger.error(extractErrorLogData(err), 'DBGM-00160 Error checking token');
     }
   }, 500);
 }
@@ -157,12 +157,12 @@ async function obtainRefreshedLicense() {
 
   const decoded = jwt.decode(licenseKey?.trim());
   if (!decoded?.end) {
-    logger.info('Invalid license found');
+    logger.info('DBGM-00078 Invalid license found');
     return null;
   }
 
   if (Date.now() > decoded.end * 1000) {
-    logger.info('License expired, trying to obtain fresh license');
+    logger.info('DBGM-00079 License expired, trying to obtain fresh license');
 
     try {
       const respToken = await axios.default.post(

package/src/utility/checkLicense.js

@@ -52,6 +52,12 @@ const licenseTypeById = {
     isForWeb: true,
     isForApp: true,
   },
+  '6c734e30-9b66-417d-91a2-0f9aeb739b32': {
+    name: 'Demo',
+    isPremium: true,
+    isForWeb: true,
+    isForApp: true,
+  },
 };
 
 function getLicenseByDecoded(decoded) {
@@ -105,10 +111,10 @@ async function getAwsMetadata() {
     awsMetadata = { amiId, region };
     awsMetadataLoaded = true;
 
-    logger.info(`Loaded AWS metadata, AMIID=${amiId}, region=${region}`);
+    logger.info(`DBGM-00080 Loaded AWS metadata, AMIID=${amiId}, region=${region}`);
     return { amiId, region };
   } catch (error) {
-    logger.error(extractErrorLogData(error), 'Error getting AWS metadata');
+    logger.error(extractErrorLogData(error), 'DBGM-00081 Error getting AWS metadata');
     awsMetadataLoaded = true;
     return null;
   }
@@ -134,7 +140,7 @@ function checkLicenseKey(licenseKey) {
       (platformInfo.isElectron && !licenseTypeObj.isForApp) ||
       (!platformInfo.isElectron && !licenseTypeObj.isForWeb)
     ) {
-      logger.error(`Incorrect license type, found ${licenseTypeObj?.name ?? 'n/a'}`);
+      logger.error(`DBGM-00161 Incorrect license type, found ${licenseTypeObj?.name ?? 'n/a'}`);
       return {
         status: 'error',
         error: `Incorrect license type, found ${licenseTypeObj?.name ?? 'n/a'}`,
@@ -167,7 +173,7 @@ function checkLicenseKey(licenseKey) {
       }
     } catch (err) {}
 
-    logger.error(extractErrorLogData(err), 'License token is invalid');
+    logger.error(extractErrorLogData(err), 'DBGM-00162 License token is invalid');
     return {
       status: 'error',
       error: err.message ?? 'License token is invalid',

package/src/utility/childProcessChecker.js

@@ -12,7 +12,7 @@ function childProcessChecker() {
       // This will come once parent dies.
       // One way can be to check for error code ERR_IPC_CHANNEL_CLOSED
       //     and call process.exit()
-      logger.error(extractErrorLogData(err), 'parent died');
+      logger.error(extractErrorLogData(err), 'DBGM-00163 parent died');
       process.exit(1);
     }
   }, 1000);

package/src/utility/cloudIntf.js

@@ -77,7 +77,7 @@ function startCloudTokenChecking(sid, callback) {
         callback(resp.data);
       }
     } catch (err) {
-      logger.error(extractErrorLogData(err), 'Error checking cloud token');
+      logger.error(extractErrorLogData(err), 'DBGM-00164 Error checking cloud token');
     }
   }, 500);
 }
@@ -125,7 +125,7 @@ async function getCloudUsedEngines() {
     const resp = await callCloudApiGet('content-engines');
     return resp || [];
   } catch (err) {
-    logger.error(extractErrorLogData(err), 'Error getting cloud content list');
+    logger.error(extractErrorLogData(err), 'DBGM-00165 Error getting cloud content list');
     return [];
   }
 }
@@ -208,7 +208,7 @@ async function updateCloudFiles(isRefresh) {
     lastCheckedTm = _.max(cloudFiles.map(x => parseInt(x.modifiedTm)));
   }
 
-  logger.info({ tags, lastCheckedTm }, 'Downloading cloud files');
+  logger.info({ tags, lastCheckedTm }, 'DBGM-00082 Downloading cloud files');
 
   const resp = await axios.default.get(
     `${DBGATE_CLOUD_URL}/public-cloud-updates?lastCheckedTm=${lastCheckedTm}&tags=${tags}&isRefresh=${
@@ -223,7 +223,7 @@ async function updateCloudFiles(isRefresh) {
     }
   );
 
-  logger.info(`Downloaded ${resp.data.length} cloud files`);
+  logger.info(`DBGM-00083 Downloaded ${resp.data.length} cloud files`);
 
   const filesByPath = lastCheckedTm == 0 ? {} : _.keyBy(cloudFiles, 'path');
   for (const file of resp.data) {
@@ -269,7 +269,7 @@ async function refreshPublicFiles(isRefresh) {
   try {
     await updateCloudFiles(isRefresh);
   } catch (err) {
-    logger.error(extractErrorLogData(err), 'Error updating cloud files');
+    logger.error(extractErrorLogData(err), 'DBGM-00166 Error updating cloud files');
   }
 }
 

package/src/utility/cloudUpgrade.js

@@ -31,7 +31,7 @@ async function checkCloudUpgrade() {
       semver.gt(version, currentVersion.version) &&
       (!cloudDownloadedVersion || semver.gt(version, cloudDownloadedVersion))
     ) {
-      logger.info(`New version available: ${version}`);
+      logger.info(`DBGM-00084 New version available: ${version}`);
       const zipUrl = json.assets.find(x => x.name == 'cloud-build.zip').browser_download_url;
 
       const writer = fs.createWriteStream(process.env.CLOUD_UPGRADE_FILE);
@@ -50,16 +50,16 @@ async function checkCloudUpgrade() {
       });
       await fsp.writeFile(process.env.CLOUD_UPGRADE_FILE + '.version', version);
 
-      logger.info(`Downloaded new version from ${zipUrl}`);
+      logger.info(`DBGM-00085 Downloaded new version from ${zipUrl}`);
     } else {
       logger.info(
-        `Checked version ${version} is not newer than ${
+        `DBGM-00086 Checked version ${version} is not newer than ${
           cloudDownloadedVersion ?? currentVersion.version
         }, upgrade skippped`
       );
     }
   } catch (err) {
-    logger.error(extractErrorLogData(err), 'Error checking cloud upgrade');
+    logger.error(extractErrorLogData(err), 'DBGM-00087 Error checking cloud upgrade');
   }
 }
 

package/src/utility/connectUtility.js

@@ -132,7 +132,7 @@ async function connectUtility(driver, storedConnection, connectionMode, addition
 
   connection.ssl = await extractConnectionSslParams(connection);
 
-  const conn = await driver.connect({ ...connection, ...additionalOptions });
+  const conn = await driver.connect({ conid: connectionLoaded?._id, ...connection, ...additionalOptions });
   return conn;
 }
 

package/src/utility/directories.js

@@ -14,11 +14,11 @@ const createDirectories = {};
 const ensureDirectory = (dir, clean) => {
   if (!createDirectories[dir]) {
     if (clean && fs.existsSync(dir) && !platformInfo.isForkedApi) {
-      getLogger('directories').info(`Cleaning directory ${dir}`);
+      getLogger('directories').info(`DBGM-00170 Cleaning directory ${dir}`);
       cleanDirectory(dir, _.isNumber(clean) ? clean : null);
     }
     if (!fs.existsSync(dir)) {
-      getLogger('directories').info(`Creating directory ${dir}`);
+      getLogger('directories').info(`DBGM-00171 Creating directory ${dir}`);
       fs.mkdirSync(dir);
     }
     createDirectories[dir] = true;

package/src/utility/extractSingleFileFromZip.js

@@ -42,13 +42,13 @@ function extractSingleFileFromZip(zipPath, fileInZip, outputPath) {
 
             // When the file is finished writing, resolve
             writeStream.on('finish', () => {
-              logger.info(`File "${fileInZip}" extracted to "${outputPath}".`);
+              logger.info(`DBGM-00088 File "${fileInZip}" extracted to "${outputPath}".`);
               resolve(true);
             });
 
             // Handle write errors
             writeStream.on('error', writeErr => {
-              logger.error(extractErrorLogData(writeErr), `Error extracting "${fileInZip}" from "${zipPath}".`);
+              logger.error(extractErrorLogData(writeErr), `DBGM-00089 Error extracting "${fileInZip}" from "${zipPath}".`);
               reject(writeErr);
             });
           });
@@ -67,7 +67,7 @@ function extractSingleFileFromZip(zipPath, fileInZip, outputPath) {
 
       // Handle general errors
       zipFile.on('error', err => {
-        logger.error(extractErrorLogData(err), `ZIP file error in ${zipPath}.`);
+        logger.error(extractErrorLogData(err), `DBGM-00172 ZIP file error in ${zipPath}.`);
         reject(err);
       });
     });