Merge branch 'master' into feature/postgresql-export-bytea

2026-04-18 00:56:02 +00:00 · 2025-11-13 13:44:11 +01:00
parent 0f4f154637 5fd50dcf45
commit a3d9fe76d6
161 changed files with 5638 additions and 1627 deletions
--- a/packages/api/.env
+++ b/packages/api/.env
@@ -2,7 +2,7 @@ DEVMODE=1
 SHELL_SCRIPTING=1
 ALLOW_DBGATE_PRIVATE_CLOUD=1
 DEVWEB=1 
-LOCAL_AUTH_PROXY=1
+# LOCAL_AUTH_PROXY=1
 # LOCAL_AI_GATEWAY=true

 # REDIRECT_TO_DBGATE_CLOUD_LOGIN=1
--- a/packages/api/src/controllers/cloud.js
+++ b/packages/api/src/controllers/cloud.js
@@ -9,6 +9,8 @@ const {
  putCloudContent,
  removeCloudCachedConnection,
  getPromoWidgetData,
+  getPromoWidgetList,
+  getPromoWidgetPreview,
 } = require('../utility/cloudIntf');
 const connections = require('./connections');
 const socket = require('../utility/socket');
@@ -296,6 +298,16 @@ module.exports = {
    return data;
  },

+  promoWidgetList_meta: true,
+  async promoWidgetList() {
+    return getPromoWidgetList();
+  },
+
+  promoWidgetPreview_meta: true,
+  async promoWidgetPreview({ campaign, variant }) {
+    return getPromoWidgetPreview(campaign, variant);
+  },
+
  // chatStream_meta: {
  //   raw: true,
  //   method: 'post',
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -29,7 +29,17 @@ const generateDeploySql = require('../shell/generateDeploySql');
 const { createTwoFilesPatch } = require('diff');
 const diff2htmlPage = require('../utility/diff2htmlPage');
 const processArgs = require('../utility/processArgs');
-const { testConnectionPermission, hasPermission, loadPermissionsFromRequest, loadTablePermissionsFromRequest, getTablePermissionRole, loadDatabasePermissionsFromRequest, getDatabasePermissionRole, getTablePermissionRoleLevelIndex, testDatabaseRolePermission } = require('../utility/hasPermission');
+const {
+  testConnectionPermission,
+  hasPermission,
+  loadPermissionsFromRequest,
+  loadTablePermissionsFromRequest,
+  getTablePermissionRole,
+  loadDatabasePermissionsFromRequest,
+  getDatabasePermissionRole,
+  getTablePermissionRoleLevelIndex,
+  testDatabaseRolePermission,
+} = require('../utility/hasPermission');
 const { MissingCredentialsError } = require('../utility/exceptions');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const crypto = require('crypto');
@@ -100,7 +110,7 @@ module.exports = {
    socket.emitChanged(`database-status-changed`, { conid, database });
  },

-  handle_ping() { },
+  handle_ping() {},

  // session event handlers

@@ -256,23 +266,24 @@ module.exports = {
        auditLogger:
          auditLogSessionGroup && select?.from?.name?.pureName
            ? response => {
-              sendToAuditLog(req, {
-                category: 'dbop',
-                component: 'DatabaseConnectionsController',
-                event: 'sql.select',
-                action: 'select',
-                severity: 'info',
-                conid,
-                database,
-                schemaName: select?.from?.name?.schemaName,
-                pureName: select?.from?.name?.pureName,
-                sumint1: response?.rows?.length,
-                sessionParam: `${conid}::${database}::${select?.from?.name?.schemaName || '0'}::${select?.from?.name?.pureName
+                sendToAuditLog(req, {
+                  category: 'dbop',
+                  component: 'DatabaseConnectionsController',
+                  event: 'sql.select',
+                  action: 'select',
+                  severity: 'info',
+                  conid,
+                  database,
+                  schemaName: select?.from?.name?.schemaName,
+                  pureName: select?.from?.name?.pureName,
+                  sumint1: response?.rows?.length,
+                  sessionParam: `${conid}::${database}::${select?.from?.name?.schemaName || '0'}::${
+                    select?.from?.name?.pureName
                  }`,
-                sessionGroup: auditLogSessionGroup,
-                message: `Loaded table data from ${select?.from?.name?.pureName}`,
-              });
-            }
+                  sessionGroup: auditLogSessionGroup,
+                  message: `Loaded table data from ${select?.from?.name?.pureName}`,
+                });
+              }
            : null,
      }
    );
@@ -335,21 +346,21 @@ module.exports = {
        auditLogger:
          auditLogSessionGroup && options?.pureName
            ? response => {
-              sendToAuditLog(req, {
-                category: 'dbop',
-                component: 'DatabaseConnectionsController',
-                event: 'nosql.collectionData',
-                action: 'select',
-                severity: 'info',
-                conid,
-                database,
-                pureName: options?.pureName,
-                sumint1: response?.result?.rows?.length,
-                sessionParam: `${conid}::${database}::${options?.pureName}`,
-                sessionGroup: auditLogSessionGroup,
-                message: `Loaded collection data ${options?.pureName}`,
-              });
-            }
+                sendToAuditLog(req, {
+                  category: 'dbop',
+                  component: 'DatabaseConnectionsController',
+                  event: 'nosql.collectionData',
+                  action: 'select',
+                  severity: 'info',
+                  conid,
+                  database,
+                  pureName: options?.pureName,
+                  sumint1: response?.result?.rows?.length,
+                  sessionParam: `${conid}::${database}::${options?.pureName}`,
+                  sessionGroup: auditLogSessionGroup,
+                  message: `Loaded collection data ${options?.pureName}`,
+                });
+              }
            : null,
      }
    );
@@ -455,10 +466,18 @@ module.exports = {
      [changeSet.inserts, 'create_update_delete'],
      [changeSet.deletes, 'create_update_delete'],
      [changeSet.updates, 'update_only'],
-    ]
+    ];
    for (const [operations, requiredRole] of fieldsAndRoles) {
      for (const operation of operations) {
-        const role = getTablePermissionRole(conid, database, 'tables', operation.schemaName, operation.pureName, tablePermissions, databasePermissions);
+        const role = getTablePermissionRole(
+          conid,
+          database,
+          'tables',
+          operation.schemaName,
+          operation.pureName,
+          tablePermissions,
+          databasePermissions
+        );
        if (getTablePermissionRoleLevelIndex(role) < getTablePermissionRoleLevelIndex(requiredRole)) {
          throw new Error('DBGM-00262 Permission not granted');
        }
@@ -628,7 +647,15 @@ module.exports = {
      function applyTablePermissionRole(list, objectTypeField) {
        const res = [];
        for (const item of list ?? []) {
-          const tablePermissionRole = getTablePermissionRole(conid, database, objectTypeField, item.schemaName, item.pureName, tablePermissions, databasePermissionRole);
+          const tablePermissionRole = getTablePermissionRole(
+            conid,
+            database,
+            objectTypeField,
+            item.schemaName,
+            item.pureName,
+            tablePermissions,
+            databasePermissionRole
+          );
          if (tablePermissionRole != 'deny') {
            res.push({
              ...item,
@@ -647,7 +674,7 @@ module.exports = {
        functions: applyTablePermissionRole(opened.structure.functions, 'functions'),
        triggers: applyTablePermissionRole(opened.structure.triggers, 'triggers'),
        collections: applyTablePermissionRole(opened.structure.collections, 'collections'),
-      }
+      };
      return res;
    }

@@ -881,17 +908,17 @@ module.exports = {
    return {
      ...(command == 'backup'
        ? driver.backupDatabaseCommand(
-          connection,
-          { outputFile, database, options, selectedTables, skippedTables, argsFormat },
-          // @ts-ignore
-          externalTools
-        )
+            connection,
+            { outputFile, database, options, selectedTables, skippedTables, argsFormat },
+            // @ts-ignore
+            externalTools
+          )
        : driver.restoreDatabaseCommand(
-          connection,
-          { inputFile, database, options, argsFormat },
-          // @ts-ignore
-          externalTools
-        )),
+            connection,
+            { inputFile, database, options, argsFormat },
+            // @ts-ignore
+            externalTools
+          )),
      transformMessage: driver.transformNativeCommandMessage
        ? message => driver.transformNativeCommandMessage(message, command)
        : null,
@@ -990,7 +1017,10 @@ module.exports = {
  async executeSessionQuery({ sesid, conid, database, sql }, req) {
    await testConnectionPermission(conid, req);
    logger.info({ sesid, sql }, 'DBGM-00010 Processing query');
-    sessions.dispatchMessage(sesid, 'Query execution started');
+    sessions.dispatchMessage(sesid, {
+      message: 'Query execution started',
+      sql,
+    });

    const opened = await this.ensureOpened(conid, database);
    opened.subprocess.send({ msgtype: 'executeSessionQuery', sql, sesid });
--- a/packages/api/src/controllers/sessions.js
+++ b/packages/api/src/controllers/sessions.js
@@ -83,6 +83,16 @@ module.exports = {
    socket.emit(`session-recordset-${sesid}`, { jslid, resultIndex });
  },

+  handle_endrecordset(sesid, props) {
+    const { jslid, rowCount, durationMs } = props;
+    this.dispatchMessage(sesid, {
+      message: `Query returned ${rowCount} rows in ${durationMs} ms`,
+      rowCount,
+      durationMs,
+      jslid,
+    });
+  },
+
  handle_stats(sesid, stats) {
    jsldata.notifyChangedStats(stats);
  },
@@ -97,6 +107,12 @@ module.exports = {
    socket.emit(`session-initialize-file-${jslid}`);
  },

+  handle_changedCurrentDatabase(sesid, props) {
+    const { database } = props;
+    this.dispatchMessage(sesid, `Current database changed to ${database}`);
+    socket.emit(`session-changedb-${sesid}`, { database });
+  },
+
  handle_ping() {},

  create_meta: true,
@@ -182,7 +198,10 @@ module.exports = {
    });

    logger.info({ sesid, sql }, 'DBGM-00019 Processing query');
-    this.dispatchMessage(sesid, 'Query execution started');
+    this.dispatchMessage(sesid, {
+      message: 'Query execution started',
+      sql,
+    });
    session.subprocess.send({
      msgtype: 'executeQuery',
      sql,
--- a/packages/api/src/utility/cloudIntf.js
+++ b/packages/api/src/utility/cloudIntf.js
@@ -283,6 +283,7 @@ async function updatePremiumPromoWidget() {
    `${DBGATE_CLOUD_URL}/premium-promo-widget?identifier=${promoWidgetData?.identifier ?? 'empty'}&tags=${tags}`,
    {
      headers: {
+        ...getLicenseHttpHeaders(),
        ...(await getCloudInstanceHeaders()),
        'x-app-version': currentVersion.version,
      },
@@ -308,7 +309,8 @@ async function refreshPublicFiles(isRefresh) {
  } catch (err) {
    logger.error(extractErrorLogData(err), 'DBGM-00166 Error updating cloud files');
  }
-  if (!isProApp()) {
+  const configSettings = await config.get();
+  if (!isProApp() || configSettings?.trialDaysLeft != null) {
    await updatePremiumPromoWidget();
  }
 }
@@ -480,6 +482,16 @@ async function getPromoWidgetData() {
  return promoWidgetData;
 }

+async function getPromoWidgetPreview(campaign, variant) {
+  const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/premium-promo-widget-preview/${campaign}/${variant}`);
+  return resp.data;
+}
+
+async function getPromoWidgetList() {
+  const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/promo-widget-list`);
+  return resp.data;
+}
+
 module.exports = {
  createDbGateIdentitySession,
  startCloudTokenChecking,
@@ -498,4 +510,6 @@ module.exports = {
  readCloudTestTokenHolder,
  getPublicIpInfo,
  getPromoWidgetData,
+  getPromoWidgetPreview,
+  getPromoWidgetList,
 };
--- a/packages/api/src/utility/handleQueryStream.js
+++ b/packages/api/src/utility/handleQueryStream.js
@@ -14,6 +14,7 @@ class QueryStreamTableWriter {
    this.currentChangeIndex = 1;
    this.initializedFile = false;
    this.sesid = sesid;
+    this.started = new Date().getTime();
  }

  initializeFromQuery(structure, resultIndex, chartDefinition, autoDetectCharts = false, options = {}) {
@@ -119,6 +120,13 @@ class QueryStreamTableWriter {
              this.chartProcessor = null;
            }
          }
+          process.send({
+            msgtype: 'endrecordset',
+            jslid: this.jslid,
+            rowCount: this.currentRowCount,
+            sesid: this.sesid,
+            durationMs: new Date().getTime() - this.started,
+          });
          resolve();
        });
      } else {
@@ -149,6 +157,7 @@ class StreamHandler {
    // this.error = this.error.bind(this);
    this.done = this.done.bind(this);
    this.info = this.info.bind(this);
+    this.changedCurrentDatabase = this.changedCurrentDatabase.bind(this);

    // use this for cancelling - not implemented
    // this.stream = null;
@@ -167,6 +176,10 @@ class StreamHandler {
    }
  }

+  changedCurrentDatabase(database) {
+    process.send({ msgtype: 'changedCurrentDatabase', database, sesid: this.sesid });
+  }
+
  recordset(columns, options) {
    if (this.rowsLimitOverflow) {
      return;