generic solid wrapper

Solid integration POC
2025-08-10 09:19:36 +02:00 · 2025-08-10 09:04:48 +02:00
351 changed files with 3875 additions and 19262 deletions
@@ -6,13 +6,9 @@ name: Electron app BETA
  push:
    tags:
      - v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+
-permissions:
-  id-token: write
-  contents: write
 jobs:
  build:
    runs-on: ${{ matrix.os }}
-    environment: dbgate-app
    strategy:
      fail-fast: false
      matrix:
@@ -57,6 +53,12 @@ jobs:
        run: |

          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: fillPackagedPlugins
        run: |

@@ -64,53 +66,21 @@ jobs:
      - name: Install Snapcraft
        if: matrix.os == 'ubuntu-22.04'
        uses: samuelmeuli/action-snapcraft@v1
-      - name: Publish Windows
-        if: matrix.os == 'windows-2022'
-        run: |
-
-          yarn run build:app
-      - name: Publish MacOS
-        if: matrix.os == 'macos-14'
+      - name: Publish
        run: |

          yarn run build:app
        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }}
          CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }}
          CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
-      - name: Publish Linux
-        if: matrix.os == 'ubuntu-22.04'
-        run: |
-
-          yarn run build:app
-        env:
          SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}}
-      - name: Azure login (OIDC)
-        uses: azure/login@v2
-        if: matrix.os == 'windows-2022'
-        with:
-          client-id: ${{ secrets.AZURE_TC_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TC_TENANT_ID }}
-          allow-no-subscriptions: true
-      - name: Sign Windows artifacts with Azure Trusted Signing
-        uses: azure/trusted-signing-action@v0
-        if: matrix.os == 'windows-2022'
-        with:
-          endpoint: https://wus3.codesigning.azure.net/
-          trusted-signing-account-name: DbGate
-          certificate-profile-name: DbGate-Release
-          files-folder: app/dist
-          files-folder-filter: exe
-          timestamp-rfc3161: http://timestamp.acs.microsoft.com
-          timestamp-digest: SHA256
-      - name: Fix YML hashes
-        if: matrix.os == 'windows-2022'
-        run: |
-
-          yarn run fixYmlHashes
+          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
      - name: Copy artifacts
        run: |
          mkdir artifacts          
@@ -6,13 +6,9 @@ name: Electron app check build
  push:
    tags:
      - check-[0-9]+-[0-9]+-[0-9]+.[0-9]+
-permissions:
-  id-token: write
-  contents: write
 jobs:
  build:
    runs-on: ${{ matrix.os }}
-    environment: dbgate-app
    strategy:
      fail-fast: false
      matrix:
@@ -53,6 +49,12 @@ jobs:
        run: |

          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: fillPackagedPlugins
        run: |

@@ -60,53 +62,21 @@ jobs:
      - name: Install Snapcraft
        if: matrix.os == 'ubuntu-22.04'
        uses: samuelmeuli/action-snapcraft@v1
-      - name: Publish Windows
-        if: matrix.os == 'windows-2022'
-        run: |
-
-          yarn run build:app
-      - name: Publish MacOS
-        if: matrix.os == 'macos-14'
+      - name: Publish
        run: |

          yarn run build:app
        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }}
          CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }}
          CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
-      - name: Publish Linux
-        if: matrix.os == 'ubuntu-22.04'
-        run: |
-
-          yarn run build:app
-        env:
          SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}}
-      - name: Azure login (OIDC)
-        uses: azure/login@v2
-        if: matrix.os == 'windows-2022'
-        with:
-          client-id: ${{ secrets.AZURE_TC_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TC_TENANT_ID }}
-          allow-no-subscriptions: true
-      - name: Sign Windows artifacts with Azure Trusted Signing
-        uses: azure/trusted-signing-action@v0
-        if: matrix.os == 'windows-2022'
-        with:
-          endpoint: https://wus3.codesigning.azure.net/
-          trusted-signing-account-name: DbGate
-          certificate-profile-name: DbGate-Release
-          files-folder: app/dist
-          files-folder-filter: exe
-          timestamp-rfc3161: http://timestamp.acs.microsoft.com
-          timestamp-digest: SHA256
-      - name: Fix YML hashes
-        if: matrix.os == 'windows-2022'
-        run: |
-
-          yarn run fixYmlHashes
+          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
      - name: Copy artifacts
        run: |
          mkdir artifacts          
@@ -6,13 +6,9 @@ name: Electron app PREMIUM BETA
  push:
    tags:
      - v[0-9]+.[0-9]+.[0-9]+-premium-beta.[0-9]+
-permissions:
-  id-token: write
-  contents: write
 jobs:
  build:
    runs-on: ${{ matrix.os }}
-    environment: dbgate-app
    strategy:
      fail-fast: false
      matrix:
@@ -43,7 +39,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
+          ref: 4b28757ade169ac0a1696351519bbaa4bbba5db9
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -85,67 +81,37 @@ jobs:
          cd dbgate-merged

          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+          cd ..
+          cd dbgate-merged
+
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: fillPackagedPlugins
        run: |
          cd ..
          cd dbgate-merged

          yarn fillPackagedPlugins
-      - name: Publish Windows
-        if: matrix.os == 'windows-2022'
-        run: |
-          cd ..
-          cd dbgate-merged
-
-          yarn run build:app
-      - name: Publish MacOS
-        if: matrix.os == 'macos-14'
+      - name: Publish
        run: |
          cd ..
          cd dbgate-merged

          yarn run build:app
        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }}
          CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }}
          CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
-      - name: Publish Linux
-        if: matrix.os == 'ubuntu-22.04'
-        run: |
-          cd ..
-          cd dbgate-merged
-
-          yarn run build:app
-        env:
          SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}}
-      - name: Azure login (OIDC)
-        uses: azure/login@v2
-        if: matrix.os == 'windows-2022'
-        with:
-          client-id: ${{ secrets.AZURE_TC_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TC_TENANT_ID }}
-          allow-no-subscriptions: true
-      - name: Sign Windows artifacts with Azure Trusted Signing
-        uses: azure/trusted-signing-action@v0
-        if: matrix.os == 'windows-2022'
-        with:
-          endpoint: https://wus3.codesigning.azure.net/
-          trusted-signing-account-name: DbGate
-          certificate-profile-name: DbGate-Release
-          files-folder: ../dbgate-merged/app/dist
-          files-folder-filter: exe
-          timestamp-rfc3161: http://timestamp.acs.microsoft.com
-          timestamp-digest: SHA256
-      - name: Fix YML hashes
-        if: matrix.os == 'windows-2022'
-        run: |
-          cd ..
-          cd dbgate-merged
-
-          yarn run fixYmlHashes
+          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
      - name: Copy artifacts
        run: |
          mkdir artifacts          
@@ -6,13 +6,9 @@ name: Electron app PREMIUM
  push:
    tags:
      - v[0-9]+.[0-9]+.[0-9]+
-permissions:
-  id-token: write
-  contents: write
 jobs:
  build:
    runs-on: ${{ matrix.os }}
-    environment: dbgate-app
    strategy:
      fail-fast: false
      matrix:
@@ -43,7 +39,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
+          ref: 4b28757ade169ac0a1696351519bbaa4bbba5db9
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -85,67 +81,37 @@ jobs:
          cd dbgate-merged

          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+          cd ..
+          cd dbgate-merged
+
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: fillPackagedPlugins
        run: |
          cd ..
          cd dbgate-merged

          yarn fillPackagedPlugins
-      - name: Publish Windows
-        if: matrix.os == 'windows-2022'
-        run: |
-          cd ..
-          cd dbgate-merged
-
-          yarn run build:app
-      - name: Publish MacOS
-        if: matrix.os == 'macos-14'
+      - name: Publish
        run: |
          cd ..
          cd dbgate-merged

          yarn run build:app
        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }}
          CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }}
          CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
-      - name: Publish Linux
-        if: matrix.os == 'ubuntu-22.04'
-        run: |
-          cd ..
-          cd dbgate-merged
-
-          yarn run build:app
-        env:
          SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}}
-      - name: Azure login (OIDC)
-        uses: azure/login@v2
-        if: matrix.os == 'windows-2022'
-        with:
-          client-id: ${{ secrets.AZURE_TC_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TC_TENANT_ID }}
-          allow-no-subscriptions: true
-      - name: Sign Windows artifacts with Azure Trusted Signing
-        uses: azure/trusted-signing-action@v0
-        if: matrix.os == 'windows-2022'
-        with:
-          endpoint: https://wus3.codesigning.azure.net/
-          trusted-signing-account-name: DbGate
-          certificate-profile-name: DbGate-Release
-          files-folder: ../dbgate-merged/app/dist
-          files-folder-filter: exe
-          timestamp-rfc3161: http://timestamp.acs.microsoft.com
-          timestamp-digest: SHA256
-      - name: Fix YML hashes
-        if: matrix.os == 'windows-2022'
-        run: |
-          cd ..
-          cd dbgate-merged
-
-          yarn run fixYmlHashes
+          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
      - name: Copy artifacts
        run: |
          mkdir artifacts          
@@ -6,13 +6,9 @@ name: Electron app
  push:
    tags:
      - v[0-9]+.[0-9]+.[0-9]+
-permissions:
-  id-token: write
-  contents: write
 jobs:
  build:
    runs-on: ${{ matrix.os }}
-    environment: dbgate-app
    strategy:
      fail-fast: false
      matrix:
@@ -53,6 +49,12 @@ jobs:
        run: |

          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: fillPackagedPlugins
        run: |

@@ -60,56 +62,24 @@ jobs:
      - name: Install Snapcraft
        if: matrix.os == 'ubuntu-22.04'
        uses: samuelmeuli/action-snapcraft@v1
-      - name: Publish Windows
-        if: matrix.os == 'windows-2022'
-        run: |
-
-          yarn run build:app
-      - name: Publish MacOS
-        if: matrix.os == 'macos-14'
+      - name: Publish
        run: |

          yarn run build:app
        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          WIN_CSC_LINK: ${{ secrets.WINCERT_2025 }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_2025_PASSWORD }}
          CSC_LINK: ${{ secrets.APPLECERT_CERTIFICATE }}
          CSC_KEY_PASSWORD: ${{ secrets.APPLECERT_PASSWORD }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
-      - name: Publish Linux
-        if: matrix.os == 'ubuntu-22.04'
-        run: |
-
-          yarn run build:app
-        env:
          SNAPCRAFT_STORE_CREDENTIALS: ${{secrets.SNAPCRAFT_LOGIN}}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{secrets.APPLE_APP_SPECIFIC_PASSWORD}}
      - name: generatePadFile
        run: |
          yarn generatePadFile
-      - name: Azure login (OIDC)
-        uses: azure/login@v2
-        if: matrix.os == 'windows-2022'
-        with:
-          client-id: ${{ secrets.AZURE_TC_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TC_TENANT_ID }}
-          allow-no-subscriptions: true
-      - name: Sign Windows artifacts with Azure Trusted Signing
-        uses: azure/trusted-signing-action@v0
-        if: matrix.os == 'windows-2022'
-        with:
-          endpoint: https://wus3.codesigning.azure.net/
-          trusted-signing-account-name: DbGate
-          certificate-profile-name: DbGate-Release
-          files-folder: app/dist
-          files-folder-filter: exe
-          timestamp-rfc3161: http://timestamp.acs.microsoft.com
-          timestamp-digest: SHA256
-      - name: Fix YML hashes
-        if: matrix.os == 'windows-2022'
-        run: |
-
-          yarn run fixYmlHashes
      - name: Copy artifacts
        run: |
          mkdir artifacts          
@@ -39,7 +39,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
+          ref: 4b28757ade169ac0a1696351519bbaa4bbba5db9
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -66,6 +66,13 @@ jobs:
          cd ..
          cd dbgate-merged
          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+          cd ..
+          cd dbgate-merged
+            yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: Prepare packer build
        run: |
          cd ..
@@ -44,7 +44,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
+          ref: 4b28757ade169ac0a1696351519bbaa4bbba5db9
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -76,6 +76,14 @@ jobs:
          cd dbgate-merged

          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+          cd ..
+          cd dbgate-merged
+
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: Prepare docker image
        run: |
          cd ..
@@ -65,6 +65,12 @@ jobs:
        run: |

          yarn setCurrentVersion
+      - name: printSecrets
+        run: |
+
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: Prepare docker image
        run: |

@@ -7,9 +7,6 @@ name: NPM packages PREMIUM
    tags:
      - v[0-9]+.[0-9]+.[0-9]+
      - v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+
-permissions:
-  id-token: write
-  contents: write
 jobs:
  build:
    runs-on: ${{ matrix.os }}
@@ -35,7 +32,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
+          ref: 4b28757ade169ac0a1696351519bbaa4bbba5db9
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -52,8 +49,13 @@ jobs:
          cd ..
          cd dbgate-merged
          node adjustNpmPackageJsonPremium
-      - name: Update npm
-        run: npm install -g npm@latest
+      - name: Configure NPM token
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          cd ..
+          cd dbgate-merged
+          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
      - name: Remove dbmodel - should be not published
        run: |
          cd ..
@@ -69,35 +71,35 @@ jobs:
          cd ..
          cd dbgate-merged
          yarn setCurrentVersion
-      - name: Compute npm dist-tag
+      - name: printSecrets
        run: |
-          if [[ "${GITHUB_REF_NAME}" =~ -alpha\. ]]; then
-            echo "NPM_TAG=alpha" >> $GITHUB_ENV
-          else
-            echo "NPM_TAG=latest" >> $GITHUB_ENV
-          fi
+          cd ..
+          cd dbgate-merged
+            yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: Publish dbgate-api-premium
        run: |
          cd ..
          cd dbgate-merged/packages/api
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-web-premium
        run: |
          cd ..
          cd dbgate-merged/packages/web
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-serve-premium
        run: |
          cd ..
          cd dbgate-merged/packages/serve
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-cosmosdb
        run: |
          cd ..
          cd dbgate-merged/plugins/dbgate-plugin-cosmosdb
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-firestore
        run: |
          cd ..
          cd dbgate-merged/plugins/dbgate-plugin-firestore
-          npm publish --tag "$NPM_TAG"
+          npm publish
@@ -7,9 +7,6 @@ name: NPM packages
    tags:
      - v[0-9]+.[0-9]+.[0-9]+
      - v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+
-permissions:
-  id-token: write
-  contents: write
 jobs:
  build:
    runs-on: ${{ matrix.os }}
@@ -29,107 +26,108 @@ jobs:
        uses: actions/setup-node@v1
        with:
          node-version: 22.x
-      - name: Update npm
-        run: npm install -g npm@latest
+      - name: Configure NPM token
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
      - name: yarn install
        run: |
          yarn install
      - name: setCurrentVersion
        run: |
          yarn setCurrentVersion
-      - name: Compute npm dist-tag
+      - name: printSecrets
        run: |
-          if [[ "${GITHUB_REF_NAME}" =~ -alpha\. ]]; then
-            echo "NPM_TAG=alpha" >> $GITHUB_ENV
-          else
-            echo "NPM_TAG=latest" >> $GITHUB_ENV
-          fi
+          yarn printSecrets
+        env:
+          GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
      - name: Publish types
        working-directory: packages/types
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish tools
        working-directory: packages/tools
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish sqltree
        working-directory: packages/sqltree
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
                    
      - name: Publish api
        working-directory: packages/api
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish datalib
        working-directory: packages/datalib
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish filterparser
        working-directory: packages/filterparser
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish web
        working-directory: packages/web
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-serve
        working-directory: packages/serve
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbmodel
        working-directory: packages/dbmodel
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-csv
        working-directory: plugins/dbgate-plugin-csv
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-xml
        working-directory: plugins/dbgate-plugin-xml
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-excel
        working-directory: plugins/dbgate-plugin-excel
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-mssql
        working-directory: plugins/dbgate-plugin-mssql
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-mysql
        working-directory: plugins/dbgate-plugin-mysql
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-mongo
        working-directory: plugins/dbgate-plugin-mongo
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-postgres
        working-directory: plugins/dbgate-plugin-postgres
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-sqlite
        working-directory: plugins/dbgate-plugin-sqlite
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-redis
        working-directory: plugins/dbgate-plugin-redis
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-oracle
        working-directory: plugins/dbgate-plugin-oracle
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-clickhouse
        working-directory: plugins/dbgate-plugin-clickhouse
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-dbf
        working-directory: plugins/dbgate-plugin-dbf
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
      - name: Publish dbgate-plugin-cassandra
        working-directory: plugins/dbgate-plugin-cassandra
        run: |
-          npm publish --tag "$NPM_TAG"
+          npm publish
@@ -26,7 +26,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
+          ref: 4b28757ade169ac0a1696351519bbaa4bbba5db9
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -83,7 +83,7 @@ jobs:
        ports:
          - '15002:1433'
      clickhouse-integr:
-        image: bitnamilegacy/clickhouse:24.8.4
+        image: bitnami/clickhouse:24.8.4
        env:
          CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db
        ports:
@@ -8,90 +8,6 @@ Builds:
 - linux - application for linux
 - win - application for Windows

-## 6.7.0
- ADDED: Added localization support, now you can use DbGate in multiple languages (French, Spanish, German, Czech, Slovak, Simplified Chinese) #347 #705 #939 #1079
- CHANGED: Solved many issues with binary fields, huge performance improvements in binary fields processing
- FIXED: Export to CSV produces empty file #1247
- CHANGED: Upgraded electron to version 38 #1243
- FIXED: PostgreSQL export to SQL and XML doesn't include bytea field contents #1228
- FIXED: Export CSV broken #1080
- FIXED: Inconsistent handling of hex-like strings #680
- FIXED: Export mongodb binary cell as binary file #292
- CHANGED: SSL is used automatically for connections to Azure databases
- ADDED: New export formats CSV for Excel, TSV
- FIXED: Horizontal scrolling on macOS trackpad/Magic Mouse #1250
-
-## 6.6.12
- FIXED: Cannot paste license key on Mac (special commands like copy/paste were disabled on license screen)
-
-## 6.6.11
- FIXED: Fixed theming on application startup
- CHANGED: Improved licensing page
-
-## 6.6.10
- FIXED: License from environment variable is not refreshed #1245
- FIXED: connection closing / reconnecting #1237
- ADDED: retain history across multiple queries #1236
- ADDED: load CSVs to temp tables #1235
- FIXED: Not possible to scroll the data view horizontally by pressing shift and scroll mouse middle button on Mac #453
- FIXED: Expired trial workflow (Premium)
- ADDED: Column name collision resolving #1234 (MySQL)
- 
-## 6.6.8
- CHANGED: Windows executable now uses Azure trusted signing certificate
- CHANGED: NPM packages now use GitHub OIDC provenance signing for better security
- CHANGED: Some features moved to Premium edition (master/detail views, FK lookups, column expansion, split view, advanced export/import, data archives, grouping, macros)
-
-## 6.6.6
- ADDED: Allow disable/re-enable filter #1174
- ADDED: Close right side tabs #1219
- ADDED: Ability disable execute current line in query editor #1209
- ADDED: Support for Redis Cluster #1204 (Premium)
-
-## 6.6.5
- ADDED: SQL AI assistant - powered by database chat, could help you to write SQL queries (Premium)
- ADDED: Explain SQL error (powered by AI) (Premium)
- ADDED: Database chat (and SQL AI Assistant) now supports showing charts (Premium)
- FIXED: Fxied editing new files and roles (Team Premium)
- FIXED: Connection to standalone database could be now pinned
- FIXED: Cannot open up large JSON file #1215
-
-## 6.6.4
- ADDED: AI Database chat now supports much more LLM models. (Premium)
- ADDED: Possibility to use your own API key with OPENAI-compatible providers (OpenRouter, Antropic...)
- ADDED: Possibility to use self-hosted own LLM (eg. Llama)
- ADDED: Team files - save SQL files and define shared charts, assign roles and users to these objects (Team Premium)
- FIXED: BUG: does no longer work with Cockroach DB #1202
- FIXED: DbGate Web UI Connections do not display 'Databases' #1199
- CHANGED: Redesign fof applications. Applications are now storted in single JSON file
- ADDED: Application editor (Premium)
- ADDED: Posibility to filter only tables with rows
- FIXED: Fixed several issues with large Firebird databases
- CHANGED: Community edition now supports shared folders in read-only mode
-
-## 6.6.3
- FIXED: Error “db.getCollection(…).renameCollection is not a function” when renaming collection in dbGate #1198
- FIXED: Can't list databases from Azure SQL SERVER #1197
- ADDED: Save zoom level in electron apps
-
-## 6.6.2
- ADDED: List of processes, ability to kill process (Server summary) #1178
- ADDED: Database and table permissions (Team Premium edition)
- ADDED: Redis search box - Scan all #1191
- FIXED: Optimalized loading SQL server with descriptions #1187
- CHANGED: Allow a much greater page size #1185
- FIXED: Optimalized loading SQL server with descriptions #1187
- FIXED: Executing queries for SQLite crash #1195
-
-## 6.6.1
- ADDED: Support for Mongo shell (Premium) - #1114
- FIXED: Support for BLOB in Oracle #1181
- ADDED: Connect to named SQL Server instance #340
- ADDED: Support for SQL Server descriptions #1137
- ADDED: Application log viewer
- FIXED: Selecting default database in connection dialog
- CHANGED: Improved logging system, added related database and connection to logs metadata
-
 ## 6.6.0
 - ADDED: Database chat - AI powered chatbot, which knows your database (Premium)
 - ADDED: Firestore support (Premium)
@@ -15,10 +15,13 @@ But there are also many advanced features like schema compare, visual query desi
 DbGate is licensed under GPL-3.0 license and is free to use for any purpose.

 * Try it online - [demo.dbgate.org](https://demo.dbgate.org) - online demo application
-* **Download** application for Windows, Linux or Mac from [dbgate.io](https://www.dbgate.io/download/)
-* Looking for DbGate Community? **Download** from [dbgate.io](https://www.dbgate.io/download-community/)
+* **Download** application for Windows, Linux or Mac from [dbgate.io](https://dbgate.io/download/)
+* Looking for DbGate Community? **Download** from [dbgate.org](https://dbgate.org/download/)
 * Run web version as [NPM package](https://www.npmjs.com/package/dbgate-serve) or as [docker image](https://hub.docker.com/r/dbgate/dbgate)
 * Use nodeJs [scripting interface](https://docs.dbgate.io/scripting) ([API documentation](https://docs.dbgate.io/apidoc))
+* [Recommend DbGate](https://testimonial.to/dbgate) | [Rate on G2](https://www.g2.com/products/dbgate/reviews)
+* [Give us feedback](https://dbgate.org/feedback) - it will help us to decide, how to improve DbGate in future
+* We [offer 2-year PREMIUM license](https://dbgate.org/review/) for any honest review on these platforms (time-limited offer)

 ## Supported databases
 * MySQL
@@ -89,7 +92,8 @@ DbGate is licensed under GPL-3.0 license and is free to use for any purpose.
 Any contributions are welcome. If you want to contribute without coding, consider following:

 * Tell your friends about DbGate or share on social networks - when more people will use DbGate, it will grow to be better
-* Purchase a [DbGate Premium](https://www.dbgate.io/purchase/premium/) license
+* Purchase a [DbGate Premium](https://dbgate.io/purchase/premium/) liocense
+* Write review on [Product Hunt](https://www.producthunt.com/products/dbgate) or [G2](https://www.g2.com/products/dbgate/reviews) - we offer [2-year PREMIUM license](https://dbgate.org/review/) for reviewers (time limited offer)
 * Create issue, if you find problem in app, or you have idea to new feature. If issue already exists, you could leave comment on it, to prioritise most wanted issues
 * Create some tutorial video on [youtube](https://www.youtube.com/playlist?list=PLCo7KjCVXhr0RfUSjM9wJMsp_ShL1q61A)
 * Become a backer on [GitHub sponsors](https://github.com/sponsors/dbgate) or [Open collective](https://opencollective.com/dbgate)
@@ -117,7 +117,7 @@
  "scripts": {
    "start": "cross-env ELECTRON_START_URL=http://localhost:5001 DEVMODE=1 electron .",
    "start:local": "cross-env electron .",
-    "dist": "electron-builder --publish never",
+    "dist": "electron-builder",
    "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist",
    "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist",
    "postinstall": "yarn rebuild && patch-package",
@@ -128,7 +128,7 @@
  "devDependencies": {
    "copyfiles": "^2.2.0",
    "cross-env": "^6.0.3",
-    "electron": "38.6.0",
+    "electron": "30.0.2",
    "electron-builder": "25.1.8"
  }
 }
@@ -31,16 +31,6 @@ let mainModule;
 let appUpdateStatus = '';
 let settingsJson = {};

-function getTranslated(key) {
-  if (typeof key === 'string' && global.TRANSLATION_DATA?.[key]) {
-    return global.TRANSLATION_DATA?.[key];
-  }
-  if (typeof key?._transKey === 'string') {
-    return global.TRANSLATION_DATA?.[key._transKey] ?? key._transOptions?.defaultMessage;
-  }
-  return key;
-}
-
 process.on('uncaughtException', function (error) {
  console.error('uncaughtException', error);
 });
@@ -73,7 +63,6 @@ try {
 let mainWindow;
 let mainMenu;
 let runCommandOnLoad = null;
-let mainWindowMenuSet = false;

 log.transports.file.level = 'debug';
 autoUpdater.logger = log;
@@ -96,22 +85,17 @@ function formatKeyText(keyText) {
  return keyText.replace('CtrlOrCommand+', 'Ctrl+');
 }

-function commandItem(item, disableAll = false) {
+function commandItem(item) {
  const id = item.command;
  const command = commands[id];
  if (item.skipInApp) {
    return { skip: true };
  }
-  if (!command) {
-    return { skip: true };
-  }
  return {
    id,
-    label: command
-      ? getTranslated(command.menuName) || getTranslated(command.toolbarName) || getTranslated(command.name)
-      : id,
+    label: command ? command.menuName || command.toolbarName || command.name : id,
    accelerator: formatKeyText(command ? command.keyText : undefined),
-    enabled: command ? command.enabled && (!disableAll || command.systemCommand) : false,
+    enabled: command ? command.enabled : false,
    click() {
      if (mainWindow) {
        mainWindow.webContents.send('run-command', id);
@@ -123,14 +107,14 @@ function commandItem(item, disableAll = false) {
  };
 }

-function buildMenu(disableAll = false) {
+function buildMenu() {
  let template = _cloneDeepWith(mainMenuDefinition({ editMenu: true, isMac: isMac() }), item => {
    if (item.divider) {
      return { type: 'separator' };
    }

    if (item.command) {
-      return commandItem(item, disableAll);
+      return commandItem(item);
    }
  });

@@ -145,7 +129,7 @@ function buildMenu(disableAll = false) {
      {
        label: 'DbGate',
        submenu: [
-          commandItem({ command: 'about.show' }, disableAll),
+          commandItem({ command: 'about.show' }),
          { role: 'services' },
          { role: 'hide' },
          { role: 'hideOthers' },
@@ -161,28 +145,22 @@ function buildMenu(disableAll = false) {
 }

 ipcMain.on('update-commands', async (event, arg) => {
-  const parsed = JSON.parse(arg);
-  commands = parsed.commands;
-  const isModalOpened = parsed.isModalOpened;
-  const dbgatePage = parsed.dbgatePage;
+  commands = JSON.parse(arg);
  for (const key of Object.keys(commands)) {
    const menu = mainMenu.getMenuItemById(key);
    if (!menu) continue;
    const command = commands[key];

    // rebuild menu
-    if (global.TRANSLATION_DATA && (menu.label != command.text || menu.accelerator != command.keyText)) {
-      mainMenu = buildMenu(isModalOpened || !!dbgatePage);
+    if (menu.label != command.text || menu.accelerator != command.keyText) {
+      mainMenu = buildMenu();

      Menu.setApplicationMenu(mainMenu);
-      if (!mainWindowMenuSet) {
-        mainWindow.setMenu(mainMenu);
-        mainWindowMenuSet = true;
-      }
+      // mainWindow.setMenu(mainMenu);
      return;
    }

-    menu.enabled = command.enabled && !isModalOpened && !dbgatePage;
+    menu.enabled = command.enabled;
  }
 });
 ipcMain.on('quit-app', async (event, arg) => {
@@ -234,10 +212,6 @@ ipcMain.on('app-started', async (event, arg) => {
      autoUpdater.checkForUpdates();
    }
  }
-
-  if (initialConfig['winZoomLevel'] != null) {
-    mainWindow.webContents.zoomLevel = initialConfig['winZoomLevel'];
-  }
 });
 ipcMain.on('window-action', async (event, arg) => {
  if (!mainWindow) {
@@ -325,12 +299,6 @@ ipcMain.on('check-for-updates', async (event, url) => {
  autoUpdater.autoDownload = false;
  autoUpdater.checkForUpdates();
 });
-ipcMain.on('translation-data', async (event, arg) => {
-  global.TRANSLATION_DATA = JSON.parse(arg);
-  mainMenu = buildMenu();
-  Menu.setApplicationMenu(mainMenu);
-  mainWindow.setMenu(mainMenu);
-});

 function fillMissingSettings(value) {
  const res = {
@@ -407,8 +375,8 @@ function createWindow() {
    mainWindow.setFullScreen(true);
  }

-  // mainMenu = buildMenu();
-  // mainWindow.setMenu(mainMenu);
+  mainMenu = buildMenu();
+  mainWindow.setMenu(mainMenu);

  function loadMainWindow() {
    const startUrl =
@@ -426,7 +394,6 @@ function createWindow() {
            JSON.stringify({
              winBounds: mainWindow.getBounds(),
              winIsMaximized: mainWindow.isMaximized(),
-              winZoomLevel: mainWindow.webContents.zoomLevel,
            }),
            'utf-8'
          );
@@ -1,10 +1,6 @@
-function _t(key, { defaultMessage, currentTranslations } = {}) {
-  return (currentTranslations || global.TRANSLATION_DATA)?.[key] || defaultMessage;
-}
-
-module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
+module.exports = ({ editMenu, isMac }) => [
  {
-    label: _t('menu.file', { defaultMessage: 'File', currentTranslations }),
+    label: 'File',
    submenu: [
      { command: 'new.connection', hideDisabled: true },
      { command: 'new.sqliteDatabase', hideDisabled: true },
@@ -14,7 +10,6 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
      { command: 'new.queryDesign', hideDisabled: true },
      { command: 'new.diagram', hideDisabled: true },
      { command: 'new.perspective', hideDisabled: true },
-      { command: 'new.application', hideDisabled: true },
      { command: 'new.shell', hideDisabled: true },
      { command: 'new.jsonl', hideDisabled: true },
      { command: 'new.modelTransform', hideDisabled: true },
@@ -32,7 +27,7 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
  },
  editMenu
    ? {
-        label: _t('menu.edit', { defaultMessage: 'Edit', currentTranslations }),
+        label: 'Edit',
        submenu: [
          { command: 'edit.undo' },
          { command: 'edit.redo' },
@@ -57,7 +52,7 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
  //   ],
  // },
  {
-    label: _t('menu.view', { defaultMessage: 'View', currentTranslations }),
+    label: 'View',
    submenu: [
      { command: 'app.reload', hideDisabled: true },
      { command: 'app.toggleDevTools', hideDisabled: true },
@@ -79,7 +74,7 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
    ],
  },
  {
-    label: _t('menu.tools', { defaultMessage: 'Tools', currentTranslations }),
+    label: 'Tools',
    submenu: [
      { command: 'database.search', hideDisabled: true },
      { command: 'commandPalette.show', hideDisabled: true },
@@ -91,6 +86,7 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
      { divider: true },
      { command: 'folder.showLogs', hideDisabled: true },
      { command: 'folder.showData', hideDisabled: true },
+      { command: 'new.gist', hideDisabled: true },
      { command: 'app.resetSettings', hideDisabled: true },
      { divider: true },
      { command: 'app.exportConnections', hideDisabled: true },
@@ -106,19 +102,19 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
      ]
    : []),
  {
-    label: _t('menu.help', { defaultMessage: 'Help', currentTranslations }),
+    label: 'Help',
    submenu: [
      { command: 'app.openDocs', hideDisabled: true },
      { command: 'app.openWeb', hideDisabled: true },
      { command: 'app.openIssue', hideDisabled: true },
      { command: 'app.openSponsoring', hideDisabled: true },
-      // { command: 'app.giveFeedback', hideDisabled: true },
+      { command: 'app.giveFeedback', hideDisabled: true },
      { divider: true },
      { command: 'settings.commands', hideDisabled: true },
      { command: 'tabs.changelog', hideDisabled: true },
      { command: 'about.show', hideDisabled: true },
      { divider: true },
-      { command: 'app.checkForUpdates', hideDisabled: true },
+      { command: 'file.checkForUpdates', hideDisabled: true },
    ],
  },
 ];
@@ -16,9 +16,9 @@
    ajv-keywords "^3.4.1"

 "@electron/asar@^3.2.7":
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.4.1.tgz#4e9196a4b54fba18c56cd8d5cac67c5bdc588065"
-  integrity sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==
+  version "3.2.17"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.17.tgz#91d28087aad80d1a1c8cc4e667c6476edf50f949"
+  integrity sha512-OcWImUI686w8LkghQj9R2ynZ2ME693Ek6L1SiaAgqGKzBaTIZw3fHDqN82Rcl+EU1Gm9EgkJ5KLIY/q5DCRbbA==
  dependencies:
    commander "^5.0.0"
    glob "^7.1.6"
@@ -98,18 +98,6 @@
  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==

-"@isaacs/balanced-match@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
-  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
-
-"@isaacs/brace-expansion@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
-  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
-  dependencies:
-    "@isaacs/balanced-match" "^4.0.1"
-
 "@isaacs/cliui@^8.0.2":
  version "8.0.2"
  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -214,23 +202,16 @@
    "@types/node" "*"

 "@types/ms@*":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
-  integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
+  version "0.7.34"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
+  integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==

-"@types/node@*":
-  version "24.10.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.0.tgz#6b79086b0dfc54e775a34ba8114dcc4e0221f31f"
-  integrity sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==
+"@types/node@*", "@types/node@^20.9.0":
+  version "20.12.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.10.tgz#8f0c3f12b0f075eee1fe20c1afb417e9765bef76"
+  integrity sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==
  dependencies:
-    undici-types "~7.16.0"
-
-"@types/node@^22.7.7":
-  version "22.19.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.0.tgz#849606ef3920850583a4e7ee0930987c35ad80be"
-  integrity sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA==
-  dependencies:
-    undici-types "~6.21.0"
+    undici-types "~5.26.4"

 "@types/plist@^3.0.1":
  version "3.0.5"
@@ -248,9 +229,9 @@
    "@types/node" "*"

 "@types/verror@^1.10.3":
-  version "1.10.11"
-  resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.11.tgz#d3d6b418978c8aa202d41e5bb3483227b6ecc1bb"
-  integrity sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==
+  version "1.10.10"
+  resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.10.tgz#d5a4b56abac169bfbc8b23d291363a682e6fa087"
+  integrity sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==

 "@types/yauzl@^2.9.1":
  version "2.10.3"
@@ -260,9 +241,9 @@
    "@types/node" "*"

 "@xmldom/xmldom@^0.8.8":
-  version "0.8.11"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608"
-  integrity sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==

 "@yarnpkg/lockfile@^1.1.0":
  version "1.1.0"
@@ -282,14 +263,14 @@ agent-base@6, agent-base@^6.0.2:
    debug "4"

 agent-base@^7.1.0, agent-base@^7.1.2:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
-  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1"
+  integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==

 agentkeepalive@^4.2.1:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a"
-  integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
+  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
  dependencies:
    humanize-ms "^1.2.1"

@@ -322,9 +303,9 @@ ansi-regex@^5.0.1:
  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==

 ansi-regex@^6.0.1:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
-  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
+  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==

 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
  version "4.3.0"
@@ -334,9 +315,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
    color-convert "^2.0.1"

 ansi-styles@^6.1.0:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
-  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==

 app-builder-bin@5.0.0-alpha.10:
  version "5.0.0-alpha.10"
@@ -382,9 +363,9 @@ app-builder-lib@25.1.8:
    temp-file "^3.4.0"

 "aproba@^1.0.3 || ^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.1.0.tgz#75500a190313d95c64e871e7e4284c6ac219f0b1"
-  integrity sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==

 are-we-there-yet@^3.0.0:
  version "3.0.1"
@@ -414,10 +395,10 @@ async-exit-hook@^2.0.1:
  resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
  integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==

-async@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
-  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
+async@^3.2.3:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==

 asynckit@^0.4.0:
  version "0.4.0"
@@ -466,33 +447,33 @@ boolean@^3.0.1:
  integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==

 brace-expansion@^1.1.7:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
-  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
  dependencies:
    balanced-match "^1.0.0"
    concat-map "0.0.1"

 brace-expansion@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
-  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
  dependencies:
    balanced-match "^1.0.0"

-braces@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
  dependencies:
-    fill-range "^7.1.1"
+    fill-range "^7.0.1"

 buffer-crc32@~0.2.3:
  version "0.2.13"
  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==

-buffer-equal-constant-time@^1.0.1:
+buffer-equal-constant-time@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
@@ -518,10 +499,10 @@ builder-util-runtime@9.2.10:
    debug "^4.3.4"
    sax "^1.2.4"

-builder-util-runtime@9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz#0daedde0f6d381f2a00a50a407b166fe7dca1a67"
-  integrity sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==
+builder-util-runtime@9.2.5:
+  version "9.2.5"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz#0afdffa0adb5c84c14926c7dd2cf3c6e96e9be83"
+  integrity sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==
  dependencies:
    debug "^4.3.4"
    sax "^1.2.4"
@@ -590,15 +571,7 @@ cacheable-request@^7.0.2:
    normalize-url "^6.0.1"
    responselike "^2.0.0"

-call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -771,9 +744,9 @@ cross-env@^6.0.3:
    cross-spawn "^7.0.0"

 cross-spawn@^6.0.5:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
-  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
  dependencies:
    nice-try "^1.0.4"
    path-key "^2.0.1"
@@ -781,19 +754,26 @@ cross-spawn@^6.0.5:
    shebang-command "^1.2.0"
    which "^1.2.9"

-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
  dependencies:
    path-key "^3.1.0"
    shebang-command "^2.0.0"
    which "^2.0.1"

-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
-  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@^4.3.3:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
  dependencies:
    ms "^2.1.3"

@@ -845,9 +825,9 @@ delegates@^1.0.0:
  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==

 detect-libc@^2.0.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
-  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
+  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==

 detect-node@^2.0.4:
  version "2.1.0"
@@ -898,18 +878,9 @@ dotenv-expand@^11.0.6:
    dotenv "^16.4.5"

 dotenv@^16.4.5:
-  version "16.6.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.6.1.tgz#773f0e69527a8315c7285d5ee73c4459d20a8020"
-  integrity sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==
-
-dunder-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    es-errors "^1.3.0"
-    gopd "^1.2.0"
+  version "16.4.7"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
+  integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==

 eastasianwidth@^0.2.0:
  version "0.2.0"
@@ -965,11 +936,11 @@ electron-publish@25.1.7:
    mime "^2.5.2"

 electron-updater@^6.3.4:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.6.2.tgz#3e65e044f1a99b00d61e200e24de8e709c69ce99"
-  integrity sha512-Cr4GDOkbAUqRHP5/oeOmH/L2Bn6+FQPxVLZtPbcmKZC63a1F3uu5EefYOssgZXG3u/zBlubbJ5PJdITdMVggbw==
+  version "6.3.4"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.4.tgz#3934bc89875bb524c2cbbd11041114e97c0c2496"
+  integrity sha512-uZUo7p1Y53G4tl6Cgw07X1yF8Jlz6zhaL7CQJDZ1fVVkOaBfE2cWtx80avwDVi8jHp+I/FWawrMgTAeCCNIfAg==
  dependencies:
-    builder-util-runtime "9.3.1"
+    builder-util-runtime "9.2.5"
    fs-extra "^10.1.0"
    js-yaml "^4.1.0"
    lazy-val "^1.0.5"
@@ -978,13 +949,13 @@ electron-updater@^6.3.4:
    semver "^7.6.3"
    tiny-typed-emitter "^2.1.0"

-electron@38.6.0:
-  version "38.6.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-38.6.0.tgz#c862bff41d42776e307bf5cc92503dda23612339"
-  integrity sha512-68OFNxJlrEStA+t8k5atzf4frJddvRR1N1oalr49Ll8YZ0+0nEsDhw4UNhTCoZKTjSYcxFF/4rt+sco+OlnB3g==
+electron@30.0.2:
+  version "30.0.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.2.tgz#95ba019216bf8be9f3097580123e33ea37497733"
+  integrity sha512-zv7T+GG89J/hyWVkQsLH4Y/rVEfqJG5M/wOBIGNaDdqd8UV9/YZPdS7CuFeaIj0H9LhCt95xkIQNpYB/3svOkQ==
  dependencies:
    "@electron/get" "^2.0.0"
-    "@types/node" "^22.7.7"
+    "@types/node" "^20.9.0"
    extract-zip "^2.0.1"

 emoji-regex@^8.0.0:
@@ -1005,9 +976,9 @@ encoding@^0.1.13:
    iconv-lite "^0.6.2"

 end-of-stream@^1.1.0:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
-  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
  dependencies:
    once "^1.4.0"

@@ -1021,42 +992,27 @@ err-code@^2.0.2:
  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==

-es-define-property@^1.0.0, es-define-property@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"

 es-errors@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==

-es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
-  dependencies:
-    es-errors "^1.3.0"
-
-es-set-tostringtag@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
-  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
-  dependencies:
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
-    has-tostringtag "^1.0.2"
-    hasown "^2.0.2"
-
 es6-error@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==

 escalade@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==

 escape-string-regexp@^4.0.0:
  version "4.0.0"
@@ -1064,9 +1020,9 @@ escape-string-regexp@^4.0.0:
  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==

 exponential-backoff@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.3.tgz#51cf92c1c0493c766053f9d3abee4434c244d2f6"
-  integrity sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==

 extract-zip@^2.0.1:
  version "2.0.1"
@@ -1108,10 +1064,10 @@ filelist@^1.0.4:
  dependencies:
    minimatch "^5.0.1"

-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
  dependencies:
    to-regex-range "^5.0.1"

@@ -1123,22 +1079,20 @@ find-yarn-workspace-root@^2.0.0:
    micromatch "^4.0.2"

 foreground-child@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
-  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
+  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
  dependencies:
-    cross-spawn "^7.0.6"
+    cross-spawn "^7.0.0"
    signal-exit "^4.0.1"

 form-data@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
-  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
  dependencies:
    asynckit "^0.4.0"
    combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.2"
    mime-types "^2.1.12"

 fs-extra@^10.0.0, fs-extra@^10.1.0:
@@ -1151,9 +1105,9 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
    universalify "^2.0.0"

 fs-extra@^11.1.1:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.2.tgz#c838aeddc6f4a8c74dd15f85e11fe5511bfe02a4"
-  integrity sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
  dependencies:
    graceful-fs "^4.2.0"
    jsonfile "^6.0.1"
@@ -1214,29 +1168,16 @@ get-caller-file@^2.0.5:
  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==

-get-intrinsic@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    es-define-property "^1.0.1"
    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
    function-bind "^1.1.2"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    math-intrinsics "^1.1.0"
-
-get-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-object-atoms "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"

 get-stream@^5.1.0:
  version "5.2.0"
@@ -1300,10 +1241,12 @@ globalthis@^1.0.1:
    define-properties "^1.2.1"
    gopd "^1.0.1"

-gopd@^1.0.1, gopd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"

 got@^11.7.0, got@^11.8.5:
  version "11.8.6"
@@ -1339,24 +1282,22 @@ has-property-descriptors@^1.0.0:
  dependencies:
    es-define-property "^1.0.0"

-has-symbols@^1.0.3, has-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+has-proto@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==

-has-tostringtag@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
-  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
-  dependencies:
-    has-symbols "^1.0.3"
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==

 has-unicode@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==

-hasown@^2.0.2:
+hasown@^2.0.0:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -1371,9 +1312,9 @@ hosted-git-info@^4.1.0:
    lru-cache "^6.0.0"

 http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
-  integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==

 http-proxy-agent@^5.0.0:
  version "5.0.0"
@@ -1471,10 +1412,13 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1,
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

-ip-address@^10.0.1:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4"
-  integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==
+ip-address@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
+  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
+  dependencies:
+    jsbn "1.1.0"
+    sprintf-js "^1.1.3"

 is-ci@^2.0.0:
  version "2.0.0"
@@ -1543,9 +1487,9 @@ isbinaryfile@^4.0.8:
  integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==

 isbinaryfile@^5.0.0:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.6.tgz#01eac28867aeffaebaee7eaf21d1dd3a67d7c0c7"
-  integrity sha512-I+NmIfBHUl+r2wcDd6JwE9yWje/PIVY/R5/CmV8dXLZd5K+L9X2klAOwfAHNnondLXkbHyTAleQAWonpTJBTtw==
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.4.tgz#2a2edefa76cafa66613fe4c1ea52f7f031017bdf"
+  integrity sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==

 isexe@^2.0.0:
  version "2.0.0"
@@ -1562,13 +1506,14 @@ jackspeak@^3.1.2:
    "@pkgjs/parseargs" "^0.11.0"

 jake@^10.8.5:
-  version "10.9.4"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.4.tgz#d626da108c63d5cfb00ab5c25fadc7e0084af8e6"
-  integrity sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b"
+  integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==
  dependencies:
-    async "^3.2.6"
+    async "^3.2.3"
+    chalk "^4.0.2"
    filelist "^1.0.4"
-    picocolors "^1.1.1"
+    minimatch "^3.1.2"

 js-yaml@^4.1.0:
  version "4.1.0"
@@ -1577,6 +1522,11 @@ js-yaml@^4.1.0:
  dependencies:
    argparse "^2.0.1"

+jsbn@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
+
 json-buffer@3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -1605,9 +1555,9 @@ jsonfile@^4.0.0:
    graceful-fs "^4.1.6"

 jsonfile@^6.0.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62"
-  integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
  dependencies:
    universalify "^2.0.0"
  optionalDependencies:
@@ -1630,11 +1580,11 @@ jsonwebtoken@^9.0.2:
    semver "^7.5.4"

 jwa@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
-  integrity sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
  dependencies:
-    buffer-equal-constant-time "^1.0.1"
+    buffer-equal-constant-time "1.0.1"
    ecdsa-sig-formatter "1.0.11"
    safe-buffer "^5.0.1"

@@ -1779,17 +1729,12 @@ matcher@^3.0.0:
  dependencies:
    escape-string-regexp "^4.0.0"

-math-intrinsics@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-
 micromatch@^4.0.2:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
  dependencies:
-    braces "^3.0.3"
+    braces "^3.0.2"
    picomatch "^2.3.1"

 mime-db@1.52.0:
@@ -1825,13 +1770,13 @@ mimic-response@^3.1.0:
  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==

 minimatch@^10.0.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
-  integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
+  integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==
  dependencies:
-    "@isaacs/brace-expansion" "^5.0.0"
+    brace-expansion "^2.0.1"

-minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1:
+minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -1926,6 +1871,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
  version "2.1.3"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -1942,9 +1892,9 @@ nice-try@^1.0.4:
  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==

 node-abi@^3.45.0:
-  version "3.80.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.80.0.tgz#d7390951f27caa129cceeec01e1c20fc9f07581c"
-  integrity sha512-LyPuZJcI9HVwzXK1GPxWNzrr+vr8Hp/3UqlmWxxh8p54U1ZbclOqbSog9lWHaCX+dBaiGi6n/hIX+mKu74GmPA==
+  version "3.71.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.71.0.tgz#52d84bbcd8575efb71468fbaa1f9a49b2c242038"
+  integrity sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==
  dependencies:
    semver "^7.3.5"

@@ -1954,9 +1904,9 @@ node-addon-api@^1.6.3:
  integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==

 node-api-version@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.1.tgz#19bad54f6d65628cbee4e607a325e4488ace2de9"
-  integrity sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d"
+  integrity sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==
  dependencies:
    semver "^7.3.5"

@@ -2131,11 +2081,6 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

-picocolors@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-
 picomatch@^2.3.1:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -2174,9 +2119,9 @@ promise-retry@^2.0.1:
    retry "^0.12.0"

 pump@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d"
-  integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
  dependencies:
    end-of-stream "^1.1.0"
    once "^1.3.1"
@@ -2316,9 +2261,9 @@ sanitize-filename@^1.6.3:
    truncate-utf8-bytes "^1.0.0"

 sax@^1.2.4:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.3.tgz#fcebae3b756cdc8428321805f4b70f16ec0ab5db"
-  integrity sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
+  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==

 semver-compare@^1.0.0:
  version "1.0.0"
@@ -2335,10 +2280,15 @@ semver@^6.2.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

-semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3:
-  version "7.7.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
-  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
+semver@^7.3.2:
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.1.tgz#60bfe090bf907a25aa8119a72b9f90ef7ca281b2"
+  integrity sha512-f/vbBsu+fOiYt+lmwZV0rVwJScl46HppnOA1ZvIuBWKOTlllpyJ3bfVax76/OrhCH38dyxoDIA8K7uB963IYgA==
+
+semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

 serialize-error@^7.0.1:
  version "7.0.1"
@@ -2422,11 +2372,11 @@ socks-proxy-agent@^7.0.0:
    socks "^2.6.2"

 socks@^2.6.2:
-  version "2.8.7"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.7.tgz#e2fb1d9a603add75050a2067db8c381a0b5669ea"
-  integrity sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
+  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
  dependencies:
-    ip-address "^10.0.1"
+    ip-address "^9.0.5"
    smart-buffer "^4.2.0"

 source-map-support@^0.5.19:
@@ -2442,7 +2392,7 @@ source-map@^0.6.0:
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

-sprintf-js@^1.1.2:
+sprintf-js@^1.1.2, sprintf-js@^1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
@@ -2504,9 +2454,9 @@ string_decoder@~1.1.1:
    ansi-regex "^5.0.1"

 strip-ansi@^7.0.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
-  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
  dependencies:
    ansi-regex "^6.0.1"

@@ -2572,9 +2522,9 @@ tmp@^0.0.33:
    os-tmpdir "~1.0.2"

 tmp@^0.2.0:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8"
-  integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==

 to-regex-range@^5.0.1:
  version "5.0.1"
@@ -2596,19 +2546,14 @@ type-fest@^0.13.1:
  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==

 typescript@^5.4.3:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
-  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==

-undici-types@~6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
-  integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
-
-undici-types@~7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
-  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

 unique-filename@^2.0.0:
  version "2.0.1"
@@ -2647,9 +2592,9 @@ uri-js@^4.2.2:
    punycode "^2.1.0"

 utf8-byte-length@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz#f9f63910d15536ee2b2d5dd4665389715eac5c1e"
-  integrity sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
+  integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==

 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  version "1.0.2"
@@ -1,110 +0,0 @@
-import fs from 'node:fs/promises';
-import { createHash } from 'node:crypto';
-import path from 'node:path';
-import process from 'node:process';
-import { fileURLToPath } from 'node:url';
-import YAML from 'yaml';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-async function sha512Base64(filePath) {
-  const buf = await fs.readFile(filePath);
-  const h = createHash('sha512');
-  h.update(buf);
-  return h.digest('base64');
-}
-
-async function fileSize(filePath) {
-  const st = await fs.stat(filePath);
-  return st.size;
-}
-
-async function fixOneYaml(ymlPath, distDir) {
-  let raw;
-  try {
-    raw = await fs.readFile(ymlPath, 'utf8');
-  } catch (e) {
-    console.error(`✗ Cannot read ${ymlPath}:`, e.message);
-    return;
-  }
-
-  let doc;
-  try {
-    doc = YAML.parse(raw);
-  } catch (e) {
-    console.error(`✗ Cannot parse YAML ${ymlPath}:`, e.message);
-    return;
-  }
-
-  if (!doc || !Array.isArray(doc.files)) {
-    console.warn(`! ${path.basename(ymlPath)} has no 'files' array — skipped.`);
-    return;
-  }
-
-  let changed = false;
-
-  // Update each files[i].sha512 and files[i].size based on files[i].url
-  for (const entry of doc.files) {
-    if (!entry?.url) continue;
-
-    const target = path.resolve(distDir, entry.url);
-    try {
-      const [hash, size] = await Promise.all([sha512Base64(target), fileSize(target)]);
-      if (entry.sha512 !== hash || entry.size !== size) {
-        console.log(`• ${path.basename(ymlPath)}: refresh ${entry.url}`);
-        entry.sha512 = hash;
-        entry.size = size;
-        changed = true;
-      }
-    } catch (e) {
-      console.warn(
-        `! Missing or unreadable file for ${entry.url} (referenced by ${path.basename(ymlPath)}): ${e.message}`
-      );
-    }
-  }
-
-  // Update top-level sha512 for the primary "path" file if present
-  if (doc.path) {
-    const primary = path.resolve(distDir, doc.path);
-    try {
-      const hash = await sha512Base64(primary);
-      if (doc.sha512 !== hash) {
-        console.log(`• ${path.basename(ymlPath)}: refresh top-level sha512 for path=${doc.path}`);
-        doc.sha512 = hash;
-        changed = true;
-      }
-    } catch (e) {
-      console.warn(`! Primary 'path' file not found for ${path.basename(ymlPath)}: ${doc.path} (${e.message})`);
-    }
-  }
-
-  if (changed) {
-    const out = YAML.stringify(doc);
-    await fs.writeFile(ymlPath, out, 'utf8');
-    console.log(`✓ Updated ${path.basename(ymlPath)}`);
-  } else {
-    console.log(`= No changes for ${path.basename(ymlPath)}`);
-  }
-}
-
-async function main() {
-  const distDir = path.resolve(process.argv[2] ?? path.join(__dirname, '..', 'app', 'dist'));
-  const entries = await fs.readdir(distDir);
-  const ymls = entries.filter(f => f.toLowerCase().endsWith('.yml'));
-
-  if (ymls.length === 0) {
-    console.warn(`No .yml files found in ${distDir}`);
-    return;
-  }
-
-  console.log(`Scanning ${distDir}`);
-  for (const y of ymls) {
-    await fixOneYaml(path.join(distDir, y), distDir);
-  }
-}
-
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});
@@ -6,7 +6,7 @@ const { getFiles } = require('./helpers');

 const readFilePromise = promisify(fs.readFile);

-const translationRegex = /_t\(\s*['"]([^'"]+)['"]\s*,\s*\{\s*defaultMessage\s*:\s*(?:'([^'\\]*(?:\\.[^'\\]*)*)'|"([^"\\]*(?:\\.[^"\\]*)*)"|\`([^`\\]*(?:\\.[^`\\]*)*(?:\{[^}]*\}[^`\\]*(?:\\.[^`\\]*)*)*)\`)(?:\s*,\s*[^}]*)*\s*\}/g;
+const translationRegex = /_t\(\s*['"]([^'"]+)['"]\s*,\s*\{\s*defaultMessage\s*:\s*['"]([^'"]+)['"]\s*\}/g;

 /**
 * @param {string} file
@@ -20,8 +20,7 @@ async function extractTranslationsFromFile(file) {
  let match;

  while ((match = translationRegex.exec(content)) !== null) {
-    const [_, key, singleQuotedText, doubleQuotedText, templateLiteral] = match;
-    const defaultText = singleQuotedText || doubleQuotedText || templateLiteral;
+    const [_, key, defaultText] = match;
    translations[key] = defaultText;
  }

@@ -160,31 +160,4 @@ program
    }
  });

-program
-  .command('sort')
-  .description('Sort translation files by keys')
-  .action(() => {
-    try {
-      const languages = getAllNonDefaultLanguages();
-      for (const language of languages) {
-        const filePath = `./translations/${language}.json`;
-        const content = fs.readFileSync(filePath, 'utf-8');
-        const translations = JSON.parse(content);
-        const sortedTranslations = {};
-        Object.keys(translations)
-          .sort()
-          .forEach(key => {
-            // @ts-ignore
-            sortedTranslations[key] = translations[key];
-          });
-        fs.writeFileSync(filePath, JSON.stringify(sortedTranslations, null, 2), 'utf-8');
-        console.log(`Sorted translations for language: ${language}`);
-      }
-    } catch (error) {
-      console.error(error);
-      console.error('Error during sort:', error.message);
-      process.exit(1);
-    }
-  });
-
 module.exports = { program };
@@ -4,7 +4,6 @@ const volatilePackages = [
  '@clickhouse/client',
  'bson', // this package is already bundled and is used in mongodb
  'mongodb',
-  'mongodb-old',
  'mongodb-client-encryption',
  'tedious',
  'msnodesqlv8',
@@ -119,17 +119,4 @@ describe('Add connection', () => {
    cy.contains('Export connections').click();
    cy.themeshot('export-connections');
  });
-
-  it('configure LLM provider', () => {
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Settings').click();
-    cy.contains('AI').click();
-    cy.testid('AiSupportedProvidersInfo_add_OpenRouter').click();
-    cy.testid('AiProviderCard_apikey_OpenRouter').clear().type('xxx');
-    cy.testid('AiProviderCard_testButton_OpenRouter').click();
-    cy.testid('AiProviderCard_statusValid_OpenRouter').should('exist');
-    cy.testid('AiProviderCard_editButton_OpenRouter').click();
-    cy.wait(1000);
-    cy.themeshot('llm-providers-settings');
-  });
 });
@@ -277,14 +277,6 @@ describe('Data browser data', () => {
    cy.testid('CommandPalette_main').themeshot('command-palette', { padding: 50 });
  });

-  it('About window', () => {
-    cy.contains('Connections');
-    cy.testid('WidgetIconPanel_menu').click();
-    cy.contains('Help').click();
-    cy.contains('About').click();
-    cy.testid('ModalBase_window').themeshot('about-window', { padding: 50 });
-  });
-
  it('Show map', () => {
    cy.contains('Postgres-connection').click();
    cy.contains('PgGeoData').click();
@@ -389,6 +381,27 @@ describe('Data browser data', () => {
    cy.themeshot('compare-database-settings');
  });

+  it('Database chat', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_databaseChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('find most popular artist');
+    cy.get('body').realPress('{enter}');
+    cy.testid('DatabaseChatTab_executeAllQueries', { timeout: 20000 }).click();
+    cy.wait(20000);
+    // cy.contains('Iron Maiden');
+    cy.themeshot('database-chat');
+
+    // cy.testid('DatabaseChatTab_promptInput').click();
+    // cy.get('body').realType('I need top 10 songs with the biggest income');
+    // cy.get('body').realPress('{enter}');
+    // cy.contains('Hot Girl', { timeout: 20000 });
+    // cy.wait(1000);
+    // cy.themeshot('database-chat');
+  });
+
  it('Modify data', () => {
    // TODO FIX: delete references cascade not working
    cy.contains('MySql-connection').click();
@@ -109,99 +109,4 @@ describe('Charts', () => {
    cy.contains('Compare database');
    cy.themeshot('new-object-window');
  });
-
-  it('Database chat - charts', () => {
-    cy.contains('MySql-connection').click();
-    cy.contains('MyChinook').click();
-    cy.testid('TabsPanel_buttonNewObject').click();
-    cy.testid('NewObjectModal_databaseChat').click();
-    cy.wait(1000);
-    cy.get('body').realType('show me chart of most popular genres');
-    cy.get('body').realPress('{enter}');
-    cy.testid('DatabaseChatTab_executeAllQueries', { timeout: 30000 }).click();
-    cy.testid('chart-canvas', { timeout: 30000 }).should($c =>
-      expect($c[0].toDataURL()).to.match(/^data:image\/png;base64/)
-    );
-    cy.themeshot('database-chat-chart');
-  });
-
-  it('Database chat', () => {
-    cy.contains('MySql-connection').click();
-    cy.contains('MyChinook').click();
-    cy.testid('TabsPanel_buttonNewObject').click();
-    cy.testid('NewObjectModal_databaseChat').click();
-    cy.wait(1000);
-    cy.get('body').realType('find most popular artist');
-    cy.get('body').realPress('{enter}');
-    cy.testid('DatabaseChatTab_executeAllQueries', { timeout: 30000 }).click();
-    cy.wait(30000);
-    // cy.contains('Iron Maiden');
-    cy.themeshot('database-chat');
-
-    // cy.testid('DatabaseChatTab_promptInput').click();
-    // cy.get('body').realType('I need top 10 songs with the biggest income');
-    // cy.get('body').realPress('{enter}');
-    // cy.contains('Hot Girl', { timeout: 20000 });
-    // cy.wait(1000);
-    // cy.themeshot('database-chat');
-  });
-
-  it('Explain query error', () => {
-    cy.contains('MySql-connection').click();
-    cy.contains('MyChinook').click();
-    cy.testid('TabsPanel_buttonNewObject').click();
-    cy.testid('NewObjectModal_query').click();
-    cy.wait(1000);
-    cy.get('body').realType('select * from Invoice2');
-    cy.contains('Execute').click();
-    cy.testid('MessageViewRow-explainErrorButton-1').click();
-    cy.testid('ChatCodeRenderer_useSqlButton', { timeout: 30000 });
-    cy.themeshot('explain-query-error');
-  });
-
-  it('Switch language', () => {
-    cy.contains('MySql-connection').click();
-    cy.contains('MyChinook').click();
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Settings').click();
-
-    cy.testid('SettingsModal_languageSelect').select('Deutsch');
-    cy.testid('ConfirmModal_okButton').click();
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Einstellungen').click();
-    cy.contains('Lokalisierung');
-    cy.themeshot('switch-language-de');
-
-    cy.testid('SettingsModal_languageSelect').select('Français');
-    cy.testid('ConfirmModal_okButton').click();
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Paramètres').click();
-    cy.contains('Localisation');
-    cy.themeshot('switch-language-fr');
-
-    cy.testid('SettingsModal_languageSelect').select('Español');
-    cy.testid('ConfirmModal_okButton').click();
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Configuración').click();
-    cy.contains('Localización');
-    cy.themeshot('switch-language-es');
-
-    cy.testid('SettingsModal_languageSelect').select('Čeština');
-    cy.testid('ConfirmModal_okButton').click();
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Nastavení').click();
-    cy.contains('Lokalizace');
-    cy.themeshot('switch-language-cs');
-
-    cy.testid('SettingsModal_languageSelect').select('中文');
-    cy.testid('ConfirmModal_okButton').click();
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('设置').click();
-    cy.contains('本地化');
-    cy.themeshot('switch-language-zh');
-
-    cy.testid('SettingsModal_languageSelect').select('English');
-    cy.testid('ConfirmModal_okButton').click();
-    cy.testid('WidgetIconPanel_settings');
-  });
 });
@@ -21,17 +21,14 @@ describe('Team edition tests', () => {
    cy.testid('AdminMenuWidget_itemConnections').click();
    cy.contains('New connection').click();
    cy.testid('ConnectionDriverFields_connectionType').select('PostgreSQL');
-    cy.contains('not granted').should('not.exist');
    cy.themeshot('connection-administration');

    cy.testid('AdminMenuWidget_itemRoles').click();
    cy.contains('logged-user').click();
-    cy.contains('not granted').should('not.exist');
    cy.themeshot('role-administration');

    cy.testid('AdminMenuWidget_itemUsers').click();
    cy.contains('New user').click();
-    cy.contains('not granted').should('not.exist');
    cy.themeshot('user-administration');

    cy.testid('AdminMenuWidget_itemAuthentication').click();
@@ -39,7 +36,6 @@ describe('Team edition tests', () => {
    cy.contains('Use database login').click();
    cy.contains('Add authentication').click();
    cy.contains('OAuth 2.0').click();
-    cy.contains('not granted').should('not.exist');
    cy.themeshot('authentication-administration');
  });

@@ -123,29 +119,4 @@ describe('Team edition tests', () => {
    cy.contains('Exporting query').click();
    cy.themeshot('auditlog');
  });
-
-  it('Edit database permissions', () => {
-    cy.testid('LoginPage_linkAdmin').click();
-    cy.testid('LoginPage_password').type('adminpwd');
-    cy.testid('LoginPage_submitLogin').click();
-
-    cy.testid('AdminMenuWidget_itemRoles').click();
-    cy.testid('AdminRolesTab_table').contains('superadmin').click();
-    cy.testid('AdminRolesTab_databases').click();
-
-    cy.testid('AdminDatabasesPermissionsGrid_addButton').click();
-    cy.testid('AdminDatabasesPermissionsGrid_addButton').click();
-    cy.testid('AdminDatabasesPermissionsGrid_addButton').click();
-    
-    cy.testid('AdminListOrRegexEditor_1_regexInput').type('^Chinook[\\d]*$');
-    cy.testid('AdminListOrRegexEditor_2_listSwitch').click();
-    cy.testid('AdminListOrRegexEditor_2_listInput').type('Nortwind\nSales');
-    cy.testid('AdminDatabasesPermissionsGrid_roleSelect_0').select('-2');
-    cy.testid('AdminDatabasesPermissionsGrid_roleSelect_1').select('-3');
-    cy.testid('AdminDatabasesPermissionsGrid_roleSelect_2').select('-4');
-
-    cy.contains('not granted').should('not.exist');
-
-    cy.themeshot('database-permissions');
-  });
 });
@@ -118,31 +118,6 @@ describe('Alter table', () => {
    })
  );

-  test.each(engines.filter(i => i.supportTableComments).map(engine => [engine.label, engine]))(
-    'Add comment to table - %s',
-    testWrapper(async (conn, driver, engine) => {
-      await testTableDiff(engine, conn, driver, tbl => {
-        tbl.objectComment = 'Added table comment';
-      });
-    })
-  );
-
-  test.each(engines.filter(i => i.supportColumnComments).map(engine => [engine.label, engine]))(
-    'Add comment to column - %s',
-    testWrapper(async (conn, driver, engine) => {
-      await testTableDiff(engine, conn, driver, tbl => {
-        tbl.columns.push({
-          columnName: 'added',
-          columnComment: 'Added column comment',
-          dataType: 'int',
-          pairingId: crypto.randomUUID(),
-          notNull: false,
-          autoIncrement: false,
-        });
-      });
-    })
-  );
-
  test.each(
    createEnginesColumnsSource(engines.filter(x => !x.skipDropColumn)).filter(
      ([_label, col, engine]) => !engine.skipPkDrop || !col.endsWith('_pk')
@@ -49,32 +49,6 @@ class StreamHandler {
  }
 }

-class BinaryTestStreamHandler {
-  constructor(resolve, reject, expectedValue) {
-    this.resolve = resolve;
-    this.reject = reject;
-    this.expectedValue = expectedValue;
-    this.rowsReceived = [];
-  }
-  row(row) {
-    try {
-      this.rowsReceived.push(row);
-      if (this.expectedValue) {
-        expect(row).toEqual(this.expectedValue);
-      }
-    } catch (error) {
-      this.reject(error);
-      return;
-    }
-  }
-  recordset(columns) {}
-  done(result) {
-    this.resolve(this.rowsReceived);
-  }
-  info(msg) {}
-}
-
-
 function executeStreamItem(driver, conn, sql) {
  return new Promise(resolve => {
    const handler = new StreamHandler(resolve);
@@ -249,51 +223,4 @@ describe('Query', () => {
      expect(row[keys[0]] == 1).toBeTruthy();
    })
  );
-
-  test.each(engines.filter(x => x.binaryDataType).map(engine => [engine.label, engine]))(
-    'Binary - %s',
-    testWrapper(async (dbhan, driver, engine) => {
-      await runCommandOnDriver(dbhan, driver, dmp =>
-        dmp.createTable({
-          pureName: 't1',
-          columns: [
-            { columnName: 'id', dataType: 'int', notNull: true, autoIncrement: true },
-            { columnName: 'val', dataType: engine.binaryDataType },
-          ],
-          primaryKey: {
-            columns: [{ columnName: 'id' }],
-          },
-        })
-      );
-      const structure = await driver.analyseFull(dbhan);
-      const table = structure.tables.find(x => x.pureName == 't1');
-
-      const dmp = driver.createDumper();
-      dmp.putCmd("INSERT INTO ~t1 (~val) VALUES (%v)", {
-        $binary: { base64: 'iVBORw0KWgo=' },
-      });
-      await driver.query(dbhan, dmp.s, {discardResult: true});
-      
-      const dmp2 = driver.createDumper();
-      dmp2.put('SELECT ~val FROM ~t1');
-      const res = await driver.query(dbhan, dmp2.s);
-      
-      const row = res.rows[0];
-      const keys = Object.keys(row);
-      expect(keys.length).toEqual(1);
-      expect(row[keys[0]]).toEqual({$binary: {base64: 'iVBORw0KWgo='}});
-
-      const res2 = await driver.readQuery(dbhan, dmp2.s);
-      const rows = await Array.fromAsync(res2);
-      const rowsVal = rows.filter(r => r.val != null);
-
-      expect(rowsVal.length).toEqual(1);
-      expect(rowsVal[0].val).toEqual({$binary: {base64: 'iVBORw0KWgo='}});
-
-      const res3 = await new Promise((resolve, reject) => {
-        const handler = new BinaryTestStreamHandler(resolve, reject, {val: {$binary: {base64: 'iVBORw0KWgo='}}});
-        driver.stream(dbhan, dmp2.s, handler);
-      });
-    })
-  );
 });
@@ -64,40 +64,6 @@ describe('Table create', () => {
    })
  );

-  test.each(
-    engines.filter(i => i.supportTableComments || i.supportColumnComments).map(engine => [engine.label, engine])
-  )(
-    'Simple table with comment - %s',
-    testWrapper(async (conn, driver, engine) => {
-      await testTableCreate(engine, conn, driver, {
-        ...(engine.supportTableComments && {
-          schemaName: 'dbo',
-          objectComment: 'table comment',
-        }),
-        ...(engine.defaultSchemaName && {
-          schemaName: engine.defaultSchemaName,
-        }),
-        columns: [
-          {
-            columnName: 'col1',
-            dataType: 'int',
-            pureName: 'tested',
-            ...(engine.skipNullability ? {} : { notNull: true }),
-            ...(engine.supportColumnComments && {
-              columnComment: 'column comment',
-            }),
-            ...(engine.defaultSchemaName && {
-              schemaName: engine.defaultSchemaName,
-            }),
-          },
-        ],
-        primaryKey: {
-          columns: [{ columnName: 'col1' }],
-        },
-      });
-    })
-  );
-
  test.each(engines.filter(x => !x.skipIndexes).map(engine => [engine.label, engine]))(
    'Table with index - %s',
    testWrapper(async (conn, driver, engine) => {
@@ -44,7 +44,6 @@ const mysqlEngine = {
  supportRenameSqlObject: false,
  dbSnapshotBySeconds: true,
  dumpFile: 'data/chinook-mysql.sql',
-  binaryDataType: 'blob',
  dumpChecks: [
    {
      sql: 'select count(*) as res from genre',
@@ -217,7 +216,6 @@ const postgreSqlEngine = {
  supportSchemas: true,
  supportRenameSqlObject: true,
  defaultSchemaName: 'public',
-  binaryDataType: 'bytea',
  dumpFile: 'data/chinook-postgre.sql',
  dumpChecks: [
    {
@@ -445,10 +443,7 @@ const sqlServerEngine = {
  supportSchemas: true,
  supportRenameSqlObject: true,
  defaultSchemaName: 'dbo',
-  supportTableComments: true,
-  supportColumnComments: true,
  // skipSeparateSchemas: true,
-  binaryDataType: 'varbinary(100)',
  triggers: [
    {
      testName: 'triggers before each row',
@@ -509,7 +504,6 @@ const sqliteEngine = {
      },
    },
  ],
-  binaryDataType: 'blob',
 };

 const libsqlFileEngine = {
@@ -623,7 +617,6 @@ const oracleEngine = {
      },
    },
  ],
-  binaryDataType: 'blob',
 };

 /** @type {import('dbgate-types').TestEngineInfo} */
@@ -757,18 +750,18 @@ const enginesOnCi = [
 const enginesOnLocal = [
  // all engines, which would be run on local test
  // cassandraEngine,
-  //mysqlEngine,
+  // mysqlEngine,
  // mariaDbEngine,
-  //postgreSqlEngine,
-  //sqlServerEngine,
-  sqliteEngine,
+  // postgreSqlEngine,
+  // sqlServerEngine,
+  // sqliteEngine,
  // cockroachDbEngine,
  // clickhouseEngine,
  // libsqlFileEngine,
  // libsqlWsEngine,
-  //oracleEngine,
+  // oracleEngine,
  // duckdbEngine,
-  //firebirdEngine,
+  firebirdEngine,
 ];

 /** @type {import('dbgate-types').TestEngineInfo[] & Record<string, import('dbgate-types').TestEngineInfo>} */
@@ -1,6 +1,6 @@
 {
  "private": true,
-  "version": "6.7.1-premium-beta.3",
+  "version": "6.6.1-premium-beta.15",
  "name": "dbgate-all",
  "workspaces": [
    "packages/*",
@@ -52,7 +52,6 @@
    "generatePadFile": "node generatePadFile",
    "fillPackagedPlugins": "node fillPackagedPlugins",
    "resetPackagedPlugins": "node resetPackagedPlugins",
-    "fixYmlHashes": "cd common && yarn init -y && yarn add yaml -W && cd .. && node common/fixYmlHashes.js app/dist",
    "prettier": "prettier --write packages/api/src && prettier --write packages/datalib/src && prettier --write packages/filterparser/src && prettier --write packages/sqltree/src && prettier --write packages/tools/src && prettier --write packages/types && prettier --write packages/web/src && prettier --write app/src",
    "copy:docker:build": "copyfiles packages/api/dist/* docker -f && copyfiles packages/web/public/* docker -u 2 && copyfiles \"packages/web/public/**/*\" docker -u 2 && copyfiles \"plugins/dist/**/*\" docker/plugins -u 2",
    "copy:packer:build": "copyfiles packages/api/dist/* packer/build -f && copyfiles packages/web/public/* packer/build -u 2 && copyfiles \"packages/web/public/**/*\" packer/build -u 2 && copyfiles \"plugins/dist/**/*\" packer/build/plugins -u 2 && copyfiles packer/install-packages.sh packer/build -f && yarn install:drivers:packer",
@@ -74,7 +73,6 @@
    "translations:add-missing": "node common/translations-cli/index.js add-missing",
    "translations:remove-unused": "node common/translations-cli/index.js remove-unused",
    "translations:check": "node common/translations-cli/index.js check",
-    "translations:sort": "node common/translations-cli/index.js sort",
    "errors": "node common/assign-dbgm-codes.mjs  ."
  },
  "dependencies": {
@@ -2,7 +2,6 @@ DEVMODE=1
 SHELL_SCRIPTING=1
 ALLOW_DBGATE_PRIVATE_CLOUD=1
 DEVWEB=1 
-# LOCAL_AUTH_PROXY=1
 # LOCAL_AI_GATEWAY=true

 # REDIRECT_TO_DBGATE_CLOUD_LOGIN=1
@@ -31,7 +31,7 @@
    "cors": "^2.8.5",
    "cross-env": "^6.0.3",
    "dbgate-datalib": "^6.0.0-alpha.1",
-    "dbgate-query-splitter": "^4.11.9",
+    "dbgate-query-splitter": "^4.11.5",
    "dbgate-sqltree": "^6.0.0-alpha.1",
    "dbgate-tools": "^6.0.0-alpha.1",
    "debug": "^4.3.4",
@@ -10,13 +10,7 @@ function getTokenSecret() {
  return tokenSecret;
 }

-function getStaticTokenSecret() {
-  // TODO static not fixed
-  return '14813c43-a91b-4ad1-9dcd-a81bd7dbb05f';
-}
-
 module.exports = {
  getTokenLifetime,
  getTokenSecret,
-  getStaticTokenSecret,
 };
@@ -10,7 +10,6 @@ const logger = getLogger('authProvider');

 class AuthProviderBase {
  amoid = 'none';
-  skipInList = false;

  async login(login, password, options = undefined, req = undefined) {
    return {
@@ -37,28 +36,12 @@ class AuthProviderBase {
    return !!req?.user || !!req?.auth;
  }

-  async getCurrentPermissions(req) {
+  getCurrentPermissions(req) {
    const login = this.getCurrentLogin(req);
    const permissions = process.env[`LOGIN_PERMISSIONS_${login}`];
    return permissions || process.env.PERMISSIONS;
  }

-  async checkCurrentConnectionPermission(req, conid) {
-    return true;
-  }
-
-  async getCurrentDatabasePermissions(req) {
-    return [];
-  }
-
-  async getCurrentTablePermissions(req) {
-    return [];
-  }
-
-  async getCurrentFilePermissions(req) {
-    return [];
-  }
-
  getLoginPageConnections() {
    return null;
  }
@@ -1,99 +1,233 @@
 const fs = require('fs-extra');
 const _ = require('lodash');
 const path = require('path');
-const { appdir, filesdir } = require('../utility/directories');
+const { appdir } = require('../utility/directories');
 const socket = require('../utility/socket');
 const connections = require('./connections');
-const {
-  loadPermissionsFromRequest,
-  loadFilePermissionsFromRequest,
-  hasPermission,
-  getFilePermissionRole,
-} = require('../utility/hasPermission');

 module.exports = {
-  getAllApps_meta: true,
-  async getAllApps({}, req) {
-    const dir = path.join(filesdir(), 'apps');
+  folders_meta: true,
+  async folders() {
+    const folders = await fs.readdir(appdir());
+    return [
+      ...folders.map(name => ({
+        name,
+      })),
+    ];
+  },
+
+  createFolder_meta: true,
+  async createFolder({ folder }) {
+    const name = await this.getNewAppFolder({ name: folder });
+    await fs.mkdir(path.join(appdir(), name));
+    socket.emitChanged('app-folders-changed');
+    this.emitChangedDbApp(folder);
+    return name;
+  },
+
+  files_meta: true,
+  async files({ folder }) {
+    if (!folder) return [];
+    const dir = path.join(appdir(), folder);
    if (!(await fs.exists(dir))) return [];
-    const res = [];
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    const filePermissions = await loadFilePermissionsFromRequest(req);
+    const files = await fs.readdir(dir);

-    for (const file of await fs.readdir(dir)) {
-      if (!hasPermission(`all-disk-files`, loadedPermissions)) {
-        const role = getFilePermissionRole('apps', file, filePermissions);
-        if (role == 'deny') continue;
+    function fileType(ext, type) {
+      return files
+        .filter(name => name.endsWith(ext))
+        .map(name => ({
+          name: name.slice(0, -ext.length),
+          label: path.parse(name.slice(0, -ext.length)).base,
+          type,
+        }));
+    }
+
+    return [
+      ...fileType('.command.sql', 'command.sql'),
+      ...fileType('.query.sql', 'query.sql'),
+      ...fileType('.config.json', 'config.json'),
+    ];
+  },
+
+  async emitChangedDbApp(folder) {
+    const used = await this.getUsedAppFolders();
+    if (used.includes(folder)) {
+      socket.emitChanged('used-apps-changed');
+    }
+  },
+
+  refreshFiles_meta: true,
+  async refreshFiles({ folder }) {
+    socket.emitChanged('app-files-changed', { app: folder });
+  },
+
+  refreshFolders_meta: true,
+  async refreshFolders() {
+    socket.emitChanged(`app-folders-changed`);
+  },
+
+  deleteFile_meta: true,
+  async deleteFile({ folder, file, fileType }) {
+    await fs.unlink(path.join(appdir(), folder, `${file}.${fileType}`));
+    socket.emitChanged('app-files-changed', { app: folder });
+    this.emitChangedDbApp(folder);
+  },
+
+  renameFile_meta: true,
+  async renameFile({ folder, file, newFile, fileType }) {
+    await fs.rename(
+      path.join(path.join(appdir(), folder), `${file}.${fileType}`),
+      path.join(path.join(appdir(), folder), `${newFile}.${fileType}`)
+    );
+    socket.emitChanged('app-files-changed', { app: folder });
+    this.emitChangedDbApp(folder);
+  },
+
+  renameFolder_meta: true,
+  async renameFolder({ folder, newFolder }) {
+    const uniqueName = await this.getNewAppFolder({ name: newFolder });
+    await fs.rename(path.join(appdir(), folder), path.join(appdir(), uniqueName));
+    socket.emitChanged(`app-folders-changed`);
+  },
+
+  deleteFolder_meta: true,
+  async deleteFolder({ folder }) {
+    if (!folder) throw new Error('Missing folder parameter');
+    await fs.rmdir(path.join(appdir(), folder), { recursive: true });
+    socket.emitChanged(`app-folders-changed`);
+    socket.emitChanged('app-files-changed', { app: folder });
+    socket.emitChanged('used-apps-changed');
+  },
+
+  async getNewAppFolder({ name }) {
+    if (!(await fs.exists(path.join(appdir(), name)))) return name;
+    let index = 2;
+    while (await fs.exists(path.join(appdir(), `${name}${index}`))) {
+      index += 1;
+    }
+    return `${name}${index}`;
+  },
+
+  getUsedAppFolders_meta: true,
+  async getUsedAppFolders() {
+    const list = await connections.list();
+    const apps = [];
+
+    for (const connection of list) {
+      for (const db of connection.databases || []) {
+        for (const key of _.keys(db || {})) {
+          if (key.startsWith('useApp:') && db[key]) {
+            apps.push(key.substring('useApp:'.length));
+          }
+        }
      }
-      const content = await fs.readFile(path.join(dir, file), { encoding: 'utf-8' });
-      const appJson = JSON.parse(content);
-      // const app = {
-      //   appid: file,
-      //   name: appJson.applicationName,
-      //   usageRules: appJson.usageRules || [],
-      //   icon: appJson.applicationIcon || 'img app',
-      //   color: appJson.applicationColor,
-      //   queries: Object.values(appJson.files || {})
-      //     .filter(x => x.type == 'query')
-      //     .map(x => ({
-      //       name: x.label,
-      //       sql: x.sql,
-      //     })),
-      //   commands: Object.values(appJson.files || {})
-      //     .filter(x => x.type == 'command')
-      //     .map(x => ({
-      //       name: x.label,
-      //       sql: x.sql,
-      //     })),
-      //   virtualReferences: appJson.virtualReferences,
-      //   dictionaryDescriptions: appJson.dictionaryDescriptions,
-      // };
-      const app = {
-        ...appJson,
-        appid: file,
-      };
+    }

-      res.push(app);
+    return _.intersection(_.uniq(apps), await fs.readdir(appdir()));
+  },
+
+  getUsedApps_meta: true,
+  async getUsedApps() {
+    const apps = await this.getUsedAppFolders();
+    const res = [];
+
+    for (const folder of apps) {
+      res.push(await this.loadApp({ folder }));
    }
    return res;
  },

-  createAppFromDb_meta: true,
-  async createAppFromDb({ appName, server, database }, req) {
-    const appdir = path.join(filesdir(), 'apps');
-    if (!fs.existsSync(appdir)) {
-      await fs.mkdir(appdir);
-    }
-    const appId = _.kebabCase(appName);
-    let suffix = undefined;
-    while (fs.existsSync(path.join(appdir, `${appId}${suffix || ''}`))) {
-      if (!suffix) suffix = 2;
-      else suffix++;
-    }
-    const finalAppId = `${appId}${suffix || ''}`;
+  // getAppsForDb_meta: true,
+  // async getAppsForDb({ conid, database }) {
+  //   const connection = await connections.get({ conid });
+  //   if (!connection) return [];
+  //   const db = (connection.databases || []).find(x => x.name == database);
+  //   const apps = [];
+  //   const res = [];
+  //   if (db) {
+  //     for (const key of _.keys(db || {})) {
+  //       if (key.startsWith('useApp:') && db[key]) {
+  //         apps.push(key.substring('useApp:'.length));
+  //       }
+  //     }
+  //   }
+  //   for (const folder of apps) {
+  //     res.push(await this.loadApp({ folder }));
+  //   }
+  //   return res;
+  // },

-    const appJson = {
-      applicationName: appName,
-      usageRules: [
-        {
-          serverHostsList: server,
-          databaseNamesList: database,
-        },
-      ],
+  loadApp_meta: true,
+  async loadApp({ folder }) {
+    const res = {
+      queries: [],
+      commands: [],
+      name: folder,
    };
+    const dir = path.join(appdir(), folder);
+    if (await fs.exists(dir)) {
+      const files = await fs.readdir(dir);

-    await fs.writeFile(path.join(appdir, `${finalAppId}`), JSON.stringify(appJson, undefined, 2));
+      async function processType(ext, field) {
+        for (const file of files) {
+          if (file.endsWith(ext)) {
+            res[field].push({
+              name: file.slice(0, -ext.length),
+              sql: await fs.readFile(path.join(dir, file), { encoding: 'utf-8' }),
+            });
+          }
+        }
+      }

-    socket.emitChanged(`files-changed`, { folder: 'apps' });
+      await processType('.command.sql', 'commands');
+      await processType('.query.sql', 'queries');
+    }

-    return finalAppId;
+    try {
+      res.virtualReferences = JSON.parse(
+        await fs.readFile(path.join(dir, 'virtual-references.config.json'), { encoding: 'utf-8' })
+      );
+    } catch (err) {
+      res.virtualReferences = [];
+    }
+    try {
+      res.dictionaryDescriptions = JSON.parse(
+        await fs.readFile(path.join(dir, 'dictionary-descriptions.config.json'), { encoding: 'utf-8' })
+      );
+    } catch (err) {
+      res.dictionaryDescriptions = [];
+    }
+
+    return res;
+  },
+
+  async saveConfigFile(appFolder, filename, filterFunc, newItem) {
+    const file = path.join(appdir(), appFolder, filename);
+
+    let json;
+    try {
+      json = JSON.parse(await fs.readFile(file, { encoding: 'utf-8' }));
+    } catch (err) {
+      json = [];
+    }
+
+    if (filterFunc) {
+      json = json.filter(filterFunc);
+    }
+
+    json = [...json, newItem];
+
+    await fs.writeFile(file, JSON.stringify(json, undefined, 2));
+
+    socket.emitChanged('app-files-changed', { app: appFolder });
+    socket.emitChanged('used-apps-changed');
  },

  saveVirtualReference_meta: true,
-  async saveVirtualReference({ appid, schemaName, pureName, refSchemaName, refTableName, columns }) {
-    await this.saveConfigItem(
-      appid,
-      'virtualReferences',
+  async saveVirtualReference({ appFolder, schemaName, pureName, refSchemaName, refTableName, columns }) {
+    await this.saveConfigFile(
+      appFolder,
+      'virtual-references.config.json',
      columns.length == 1
        ? x =>
            !(
@@ -111,17 +245,14 @@ module.exports = {
        columns,
      }
    );
-
-    socket.emitChanged(`files-changed`, { folder: 'apps' });
-
    return true;
  },

  saveDictionaryDescription_meta: true,
-  async saveDictionaryDescription({ appid, pureName, schemaName, expression, columns, delimiter }) {
-    await this.saveConfigItem(
-      appid,
-      'dictionaryDescriptions',
+  async saveDictionaryDescription({ appFolder, pureName, schemaName, expression, columns, delimiter }) {
+    await this.saveConfigFile(
+      appFolder,
+      'dictionary-descriptions.config.json',
      x => !(x.schemaName == schemaName && x.pureName == pureName),
      {
        schemaName,
@@ -132,271 +263,18 @@ module.exports = {
      }
    );

-    socket.emitChanged(`files-changed`, { folder: 'apps' });
-
    return true;
  },

-  async saveConfigItem(appid, fieldName, filterFunc, newItem) {
-    const file = path.join(filesdir(), 'apps', appid);
-
-    const appJson = JSON.parse(await fs.readFile(file, { encoding: 'utf-8' }));
-    let json = appJson[fieldName] || [];
-
-    if (filterFunc) {
-      json = json.filter(filterFunc);
+  createConfigFile_meta: true,
+  async createConfigFile({ appFolder, fileName, content }) {
+    const file = path.join(appdir(), appFolder, fileName);
+    if (!(await fs.exists(file))) {
+      await fs.writeFile(file, JSON.stringify(content, undefined, 2));
+      socket.emitChanged('app-files-changed', { app: appFolder });
+      socket.emitChanged('used-apps-changed');
+      return true;
    }
-
-    json = [...json, newItem];
-
-    await fs.writeFile(
-      file,
-      JSON.stringify(
-        {
-          ...appJson,
-          [fieldName]: json,
-        },
-        undefined,
-        2
-      )
-    );
-
-    socket.emitChanged('files-changed', { folder: 'apps' });
+    return false;
  },
-
-  // folders_meta: true,
-  // async folders() {
-  //   const folders = await fs.readdir(appdir());
-  //   return [
-  //     ...folders.map(name => ({
-  //       name,
-  //     })),
-  //   ];
-  // },
-
-  // createFolder_meta: true,
-  // async createFolder({ folder }) {
-  //   const name = await this.getNewAppFolder({ name: folder });
-  //   await fs.mkdir(path.join(appdir(), name));
-  //   socket.emitChanged('app-folders-changed');
-  //   this.emitChangedDbApp(folder);
-  //   return name;
-  // },
-
-  // files_meta: true,
-  // async files({ folder }) {
-  //   if (!folder) return [];
-  //   const dir = path.join(appdir(), folder);
-  //   if (!(await fs.exists(dir))) return [];
-  //   const files = await fs.readdir(dir);
-
-  //   function fileType(ext, type) {
-  //     return files
-  //       .filter(name => name.endsWith(ext))
-  //       .map(name => ({
-  //         name: name.slice(0, -ext.length),
-  //         label: path.parse(name.slice(0, -ext.length)).base,
-  //         type,
-  //       }));
-  //   }
-
-  //   return [
-  //     ...fileType('.command.sql', 'command.sql'),
-  //     ...fileType('.query.sql', 'query.sql'),
-  //     ...fileType('.config.json', 'config.json'),
-  //   ];
-  // },
-
-  // async emitChangedDbApp(folder) {
-  //   const used = await this.getUsedAppFolders();
-  //   if (used.includes(folder)) {
-  //     socket.emitChanged('used-apps-changed');
-  //   }
-  // },
-
-  // refreshFiles_meta: true,
-  // async refreshFiles({ folder }) {
-  //   socket.emitChanged('app-files-changed', { app: folder });
-  // },
-
-  // refreshFolders_meta: true,
-  // async refreshFolders() {
-  //   socket.emitChanged(`app-folders-changed`);
-  // },
-
-  // deleteFile_meta: true,
-  // async deleteFile({ folder, file, fileType }) {
-  //   await fs.unlink(path.join(appdir(), folder, `${file}.${fileType}`));
-  //   socket.emitChanged('app-files-changed', { app: folder });
-  //   this.emitChangedDbApp(folder);
-  // },
-
-  // renameFile_meta: true,
-  // async renameFile({ folder, file, newFile, fileType }) {
-  //   await fs.rename(
-  //     path.join(path.join(appdir(), folder), `${file}.${fileType}`),
-  //     path.join(path.join(appdir(), folder), `${newFile}.${fileType}`)
-  //   );
-  //   socket.emitChanged('app-files-changed', { app: folder });
-  //   this.emitChangedDbApp(folder);
-  // },
-
-  // renameFolder_meta: true,
-  // async renameFolder({ folder, newFolder }) {
-  //   const uniqueName = await this.getNewAppFolder({ name: newFolder });
-  //   await fs.rename(path.join(appdir(), folder), path.join(appdir(), uniqueName));
-  //   socket.emitChanged(`app-folders-changed`);
-  // },
-
-  // deleteFolder_meta: true,
-  // async deleteFolder({ folder }) {
-  //   if (!folder) throw new Error('Missing folder parameter');
-  //   await fs.rmdir(path.join(appdir(), folder), { recursive: true });
-  //   socket.emitChanged(`app-folders-changed`);
-  //   socket.emitChanged('app-files-changed', { app: folder });
-  //   socket.emitChanged('used-apps-changed');
-  // },
-
-  // async getNewAppFolder({ name }) {
-  //   if (!(await fs.exists(path.join(appdir(), name)))) return name;
-  //   let index = 2;
-  //   while (await fs.exists(path.join(appdir(), `${name}${index}`))) {
-  //     index += 1;
-  //   }
-  //   return `${name}${index}`;
-  // },
-
-  // getUsedAppFolders_meta: true,
-  // async getUsedAppFolders() {
-  //   const list = await connections.list();
-  //   const apps = [];
-
-  //   for (const connection of list) {
-  //     for (const db of connection.databases || []) {
-  //       for (const key of _.keys(db || {})) {
-  //         if (key.startsWith('useApp:') && db[key]) {
-  //           apps.push(key.substring('useApp:'.length));
-  //         }
-  //       }
-  //     }
-  //   }
-
-  //   return _.intersection(_.uniq(apps), await fs.readdir(appdir()));
-  // },
-
-  // // getAppsForDb_meta: true,
-  // // async getAppsForDb({ conid, database }) {
-  // //   const connection = await connections.get({ conid });
-  // //   if (!connection) return [];
-  // //   const db = (connection.databases || []).find(x => x.name == database);
-  // //   const apps = [];
-  // //   const res = [];
-  // //   if (db) {
-  // //     for (const key of _.keys(db || {})) {
-  // //       if (key.startsWith('useApp:') && db[key]) {
-  // //         apps.push(key.substring('useApp:'.length));
-  // //       }
-  // //     }
-  // //   }
-  // //   for (const folder of apps) {
-  // //     res.push(await this.loadApp({ folder }));
-  // //   }
-  // //   return res;
-  // // },
-
-  // loadApp_meta: true,
-  // async loadApp({ folder }) {
-  //   const res = {
-  //     queries: [],
-  //     commands: [],
-  //     name: folder,
-  //   };
-  //   const dir = path.join(appdir(), folder);
-  //   if (await fs.exists(dir)) {
-  //     const files = await fs.readdir(dir);
-
-  //     async function processType(ext, field) {
-  //       for (const file of files) {
-  //         if (file.endsWith(ext)) {
-  //           res[field].push({
-  //             name: file.slice(0, -ext.length),
-  //             sql: await fs.readFile(path.join(dir, file), { encoding: 'utf-8' }),
-  //           });
-  //         }
-  //       }
-  //     }
-
-  //     await processType('.command.sql', 'commands');
-  //     await processType('.query.sql', 'queries');
-  //   }
-
-  //   try {
-  //     res.virtualReferences = JSON.parse(
-  //       await fs.readFile(path.join(dir, 'virtual-references.config.json'), { encoding: 'utf-8' })
-  //     );
-  //   } catch (err) {
-  //     res.virtualReferences = [];
-  //   }
-  //   try {
-  //     res.dictionaryDescriptions = JSON.parse(
-  //       await fs.readFile(path.join(dir, 'dictionary-descriptions.config.json'), { encoding: 'utf-8' })
-  //     );
-  //   } catch (err) {
-  //     res.dictionaryDescriptions = [];
-  //   }
-
-  //   return res;
-  // },
-
-  // async saveConfigFile(appFolder, filename, filterFunc, newItem) {
-  //   const file = path.join(appdir(), appFolder, filename);
-
-  //   let json;
-  //   try {
-  //     json = JSON.parse(await fs.readFile(file, { encoding: 'utf-8' }));
-  //   } catch (err) {
-  //     json = [];
-  //   }
-
-  //   if (filterFunc) {
-  //     json = json.filter(filterFunc);
-  //   }
-
-  //   json = [...json, newItem];
-
-  //   await fs.writeFile(file, JSON.stringify(json, undefined, 2));
-
-  //   socket.emitChanged('app-files-changed', { app: appFolder });
-  //   socket.emitChanged('used-apps-changed');
-  // },
-
-  // saveDictionaryDescription_meta: true,
-  // async saveDictionaryDescription({ appFolder, pureName, schemaName, expression, columns, delimiter }) {
-  //   await this.saveConfigFile(
-  //     appFolder,
-  //     'dictionary-descriptions.config.json',
-  //     x => !(x.schemaName == schemaName && x.pureName == pureName),
-  //     {
-  //       schemaName,
-  //       pureName,
-  //       expression,
-  //       columns,
-  //       delimiter,
-  //     }
-  //   );
-
-  //   return true;
-  // },
-
-  // createConfigFile_meta: true,
-  // async createConfigFile({ appFolder, fileName, content }) {
-  //   const file = path.join(appdir(), appFolder, fileName);
-  //   if (!(await fs.exists(file))) {
-  //     await fs.writeFile(file, JSON.stringify(content, undefined, 2));
-  //     socket.emitChanged('app-files-changed', { app: appFolder });
-  //     socket.emitChanged('used-apps-changed');
-  //     return true;
-  //   }
-  //   return false;
-  // },
 };
@@ -51,7 +51,6 @@ function authMiddleware(req, res, next) {
    '/auth/oauth-token',
    '/auth/login',
    '/auth/redirect',
-    '/redirect',
    '/stream',
    '/storage/get-connections-for-login-page',
    '/storage/set-admin-password',
@@ -140,9 +139,9 @@ module.exports = {
        const accessToken = jwt.sign(
          {
            login: 'superadmin',
+            permissions: await storage.loadSuperadminPermissions(),
            roleId: -3,
            licenseUid,
-            amoid: 'superadmin',
          },
          getTokenSecret(),
          {
@@ -174,9 +173,7 @@ module.exports = {
  getProviders_meta: true,
  getProviders() {
    return {
-      providers: getAuthProviders()
-        .filter(x => !x.skipInList)
-        .map(x => x.toJson()),
+      providers: getAuthProviders().map(x => x.toJson()),
      default: getDefaultAuthProvider()?.amoid,
    };
  },
@@ -8,9 +8,6 @@ const {
  getCloudContent,
  putCloudContent,
  removeCloudCachedConnection,
-  getPromoWidgetData,
-  getPromoWidgetList,
-  getPromoWidgetPreview,
 } = require('../utility/cloudIntf');
 const connections = require('./connections');
 const socket = require('../utility/socket');
@@ -35,8 +32,8 @@ module.exports = {
  },

  refreshPublicFiles_meta: true,
-  async refreshPublicFiles({ isRefresh }, req) {
-    await refreshPublicFiles(isRefresh, req?.headers?.['x-ui-language']);
+  async refreshPublicFiles({ isRefresh }) {
+    await refreshPublicFiles(isRefresh);
    return {
      status: 'ok',
    };
@@ -286,28 +283,6 @@ module.exports = {
    return getAiGatewayServer();
  },

-  premiumPromoWidget_meta: true,
-  async premiumPromoWidget() {
-    const data = await getPromoWidgetData();
-    if (data?.state != 'data') {
-      return null;
-    }
-    if (data.validTo && new Date().getTime() > new Date(data.validTo).getTime()) {
-      return null;
-    }
-    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',
@@ -3,7 +3,7 @@ const os = require('os');
 const path = require('path');
 const axios = require('axios');
 const { datadir, getLogsFilePath } = require('../utility/directories');
-const { hasPermission, loadPermissionsFromRequest } = require('../utility/hasPermission');
+const { hasPermission } = require('../utility/hasPermission');
 const socket = require('../utility/socket');
 const _ = require('lodash');
 const AsyncLock = require('async-lock');
@@ -46,7 +46,7 @@ module.exports = {
  async get(_params, req) {
    const authProvider = getAuthProviderFromReq(req);
    const login = authProvider.getCurrentLogin(req);
-    const permissions = await authProvider.getCurrentPermissions(req);
+    const permissions = authProvider.getCurrentPermissions(req);
    const isUserLoggedIn = authProvider.isUserLoggedIn(req);

    const singleConid = authProvider.getSingleConnectionId(req);
@@ -280,8 +280,7 @@ module.exports = {

  updateSettings_meta: true,
  async updateSettings(values, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`settings/change`, loadedPermissions)) return false;
+    if (!hasPermission(`settings/change`, req)) return false;
    cachedSettingsValue = null;

    const res = await lock.acquire('settings', async () => {
@@ -393,8 +392,7 @@ module.exports = {

  exportConnectionsAndSettings_meta: true,
  async exportConnectionsAndSettings(_params, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`admin/config`, loadedPermissions)) {
+    if (!hasPermission(`admin/config`, req)) {
      throw new Error('Permission denied: admin/config');
    }

@@ -418,8 +416,7 @@ module.exports = {

  importConnectionsAndSettings_meta: true,
  async importConnectionsAndSettings({ db }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`admin/config`, loadedPermissions)) {
+    if (!hasPermission(`admin/config`, req)) {
      throw new Error('Permission denied: admin/config');
    }

@@ -14,11 +14,7 @@ const JsonLinesDatabase = require('../utility/JsonLinesDatabase');
 const processArgs = require('../utility/processArgs');
 const { safeJsonParse, getLogger, extractErrorLogData } = require('dbgate-tools');
 const platformInfo = require('../utility/platformInfo');
-const {
-  connectionHasPermission,
-  testConnectionPermission,
-  loadPermissionsFromRequest,
-} = require('../utility/hasPermission');
+const { connectionHasPermission, testConnectionPermission } = require('../utility/hasPermission');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const { getAuthProviderById } = require('../auth/authProvider');
@@ -120,10 +116,7 @@ function getPortalCollections() {
      }
    }

-    logger.info(
-      { connections: connections.map(pickSafeConnectionInfo) },
-      'DBGM-00005 Using connections from ENV variables'
-    );
+    logger.info({ connections: connections.map(pickSafeConnectionInfo) }, 'DBGM-00005 Using connections from ENV variables');
    const noengine = connections.filter(x => !x.engine);
    if (noengine.length > 0) {
      logger.warn(
@@ -234,7 +227,6 @@ module.exports = {
  list_meta: true,
  async list(_params, req) {
    const storage = require('./storage');
-    const loadedPermissions = await loadPermissionsFromRequest(req);

    const storageConnections = await storage.connections(req);
    if (storageConnections) {
@@ -242,9 +234,9 @@ module.exports = {
    }
    if (portalConnections) {
      if (platformInfo.allowShellConnection) return portalConnections;
-      return portalConnections.map(maskConnection).filter(x => connectionHasPermission(x, loadedPermissions));
+      return portalConnections.map(maskConnection).filter(x => connectionHasPermission(x, req));
    }
-    return (await this.datastore.find()).filter(x => connectionHasPermission(x, loadedPermissions));
+    return (await this.datastore.find()).filter(x => connectionHasPermission(x, req));
  },

  async getUsedEngines() {
@@ -383,7 +375,7 @@ module.exports = {
  update_meta: true,
  async update({ _id, values }, req) {
    if (portalConnections) return;
-    await testConnectionPermission(_id, req);
+    testConnectionPermission(_id, req);
    const res = await this.datastore.patch(_id, values);
    socket.emitChanged('connection-list-changed');
    return res;
@@ -400,7 +392,7 @@ module.exports = {
  updateDatabase_meta: true,
  async updateDatabase({ conid, database, values }, req) {
    if (portalConnections) return;
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const conn = await this.datastore.get(conid);
    let databases = (conn && conn.databases) || [];
    if (databases.find(x => x.name == database)) {
@@ -418,7 +410,7 @@ module.exports = {
  delete_meta: true,
  async delete(connection, req) {
    if (portalConnections) return;
-    await testConnectionPermission(connection, req);
+    testConnectionPermission(connection, req);
    const res = await this.datastore.remove(connection._id);
    socket.emitChanged('connection-list-changed');
    return res;
@@ -460,7 +452,7 @@ module.exports = {
        _id: '__model',
      };
    }
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.getCore({ conid, mask: true });
  },

@@ -509,11 +501,7 @@ module.exports = {
      state,
      client: 'web',
    });
-    if (authResp?.url) {
-      res.redirect(authResp.url);
-      return;
-    }
-    res.json({ error: 'No URL returned from auth provider' });
+    res.redirect(authResp.url);
  },

  dbloginApp_meta: true,
@@ -29,17 +29,7 @@ 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 } = require('../utility/hasPermission');
 const { MissingCredentialsError } = require('../utility/exceptions');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const crypto = require('crypto');
@@ -245,7 +235,7 @@ module.exports = {

  queryData_meta: true,
  async queryData({ conid, database, sql }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    logger.info({ conid, database, sql }, 'DBGM-00007 Processing query');
    const opened = await this.ensureOpened(conid, database);
    // if (opened && opened.status && opened.status.name == 'error') {
@@ -257,7 +247,7 @@ module.exports = {

  sqlSelect_meta: true,
  async sqlSelect({ conid, database, select, auditLogSessionGroup }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid, database);
    const res = await this.sendRequest(
      opened,
@@ -292,9 +282,7 @@ module.exports = {

  runScript_meta: true,
  async runScript({ conid, database, sql, useTransaction, logMessage }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    await testConnectionPermission(conid, req, loadedPermissions);
-    await testDatabaseRolePermission(conid, database, 'run_script', req);
+    testConnectionPermission(conid, req);
    logger.info({ conid, database, sql }, 'DBGM-00008 Processing script');
    const opened = await this.ensureOpened(conid, database);
    sendToAuditLog(req, {
@@ -315,7 +303,7 @@ module.exports = {

  runOperation_meta: true,
  async runOperation({ conid, database, operation, useTransaction }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    logger.info({ conid, database, operation }, 'DBGM-00009 Processing operation');

    sendToAuditLog(req, {
@@ -337,7 +325,7 @@ module.exports = {

  collectionData_meta: true,
  async collectionData({ conid, database, options, auditLogSessionGroup }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid, database);
    const res = await this.sendRequest(
      opened,
@@ -368,7 +356,7 @@ module.exports = {
  },

  async loadDataCore(msgtype, { conid, database, ...args }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid, database);
    const res = await this.sendRequest(opened, { msgtype, ...args });
    if (res.errorMessage) {
@@ -383,7 +371,7 @@ module.exports = {

  schemaList_meta: true,
  async schemaList({ conid, database }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('schemaList', { conid, database });
  },

@@ -395,43 +383,43 @@ module.exports = {

  loadKeys_meta: true,
  async loadKeys({ conid, database, root, filter, limit }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('loadKeys', { conid, database, root, filter, limit });
  },

  scanKeys_meta: true,
  async scanKeys({ conid, database, root, pattern, cursor, count }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('scanKeys', { conid, database, root, pattern, cursor, count });
  },

  exportKeys_meta: true,
  async exportKeys({ conid, database, options }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('exportKeys', { conid, database, options });
  },

  loadKeyInfo_meta: true,
  async loadKeyInfo({ conid, database, key }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('loadKeyInfo', { conid, database, key });
  },

  loadKeyTableRange_meta: true,
  async loadKeyTableRange({ conid, database, key, cursor, count }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('loadKeyTableRange', { conid, database, key, cursor, count });
  },

  loadFieldValues_meta: true,
  async loadFieldValues({ conid, database, schemaName, pureName, field, search, dataType }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('loadFieldValues', { conid, database, schemaName, pureName, field, search, dataType });
  },

  callMethod_meta: true,
  async callMethod({ conid, database, method, args }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    return this.loadDataCore('callMethod', { conid, database, method, args });

    // const opened = await this.ensureOpened(conid, database);
@@ -444,8 +432,7 @@ module.exports = {

  updateCollection_meta: true,
  async updateCollection({ conid, database, changeSet }, req) {
-    await testConnectionPermission(conid, req);
-
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid, database);
    const res = await this.sendRequest(opened, { msgtype: 'updateCollection', changeSet });
    if (res.errorMessage) {
@@ -456,44 +443,6 @@ module.exports = {
    return res.result || null;
  },

-  saveTableData_meta: true,
-  async saveTableData({ conid, database, changeSet }, req) {
-    await testConnectionPermission(conid, req);
-
-    const databasePermissions = await loadDatabasePermissionsFromRequest(req);
-    const tablePermissions = await loadTablePermissionsFromRequest(req);
-    const fieldsAndRoles = [
-      [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
-        );
-        if (getTablePermissionRoleLevelIndex(role) < getTablePermissionRoleLevelIndex(requiredRole)) {
-          throw new Error('DBGM-00262 Permission not granted');
-        }
-      }
-    }
-
-    const opened = await this.ensureOpened(conid, database);
-    const res = await this.sendRequest(opened, { msgtype: 'saveTableData', changeSet });
-    if (res.errorMessage) {
-      return {
-        errorMessage: res.errorMessage,
-      };
-    }
-    return res.result || null;
-  },
-
  status_meta: true,
  async status({ conid, database }, req) {
    if (!conid) {
@@ -502,7 +451,7 @@ module.exports = {
        message: 'No connection',
      };
    }
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const existing = this.opened.find(x => x.conid == conid && x.database == database);
    if (existing) {
      return {
@@ -525,7 +474,7 @@ module.exports = {

  ping_meta: true,
  async ping({ conid, database }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    let existing = this.opened.find(x => x.conid == conid && x.database == database);

    if (existing) {
@@ -553,7 +502,7 @@ module.exports = {

  refresh_meta: true,
  async refresh({ conid, database, keepOpen }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    if (!keepOpen) this.close(conid, database);

    await this.ensureOpened(conid, database);
@@ -567,7 +516,7 @@ module.exports = {
      return { status: 'ok' };
    }

-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const conn = await this.ensureOpened(conid, database);
    conn.subprocess.send({ msgtype: 'syncModel', isFullRefresh });
    return { status: 'ok' };
@@ -604,7 +553,7 @@ module.exports = {

  disconnect_meta: true,
  async disconnect({ conid, database }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    await this.close(conid, database, true);
    return { status: 'ok' };
  },
@@ -614,9 +563,8 @@ module.exports = {
    if (!conid || !database) {
      return {};
    }
-    const loadedPermissions = await loadPermissionsFromRequest(req);

-    await testConnectionPermission(conid, req, loadedPermissions);
+    testConnectionPermission(conid, req);
    if (conid == '__model') {
      const model = await importDbModel(database);
      const trans = await loadModelTransform(modelTransFile);
@@ -638,46 +586,6 @@ module.exports = {
      message: `Loaded database structure for ${database}`,
    });

-    if (process.env.STORAGE_DATABASE && !hasPermission(`all-tables`, loadedPermissions)) {
-      // filter databases by permissions
-      const tablePermissions = await loadTablePermissionsFromRequest(req);
-      const databasePermissions = await loadDatabasePermissionsFromRequest(req);
-      const databasePermissionRole = getDatabasePermissionRole(conid, database, databasePermissions);
-
-      function applyTablePermissionRole(list, objectTypeField) {
-        const res = [];
-        for (const item of list ?? []) {
-          const tablePermissionRole = getTablePermissionRole(
-            conid,
-            database,
-            objectTypeField,
-            item.schemaName,
-            item.pureName,
-            tablePermissions,
-            databasePermissionRole
-          );
-          if (tablePermissionRole != 'deny') {
-            res.push({
-              ...item,
-              tablePermissionRole,
-            });
-          }
-        }
-        return res;
-      }
-
-      const res = {
-        ...opened.structure,
-        tables: applyTablePermissionRole(opened.structure.tables, 'tables'),
-        views: applyTablePermissionRole(opened.structure.views, 'views'),
-        procedures: applyTablePermissionRole(opened.structure.procedures, 'procedures'),
-        functions: applyTablePermissionRole(opened.structure.functions, 'functions'),
-        triggers: applyTablePermissionRole(opened.structure.triggers, 'triggers'),
-        collections: applyTablePermissionRole(opened.structure.collections, 'collections'),
-      };
-      return res;
-    }
-
    return opened.structure;
    // const existing = this.opened.find((x) => x.conid == conid && x.database == database);
    // if (existing) return existing.status;
@@ -692,7 +600,7 @@ module.exports = {
    if (!conid) {
      return null;
    }
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    if (!conid) return null;
    const opened = await this.ensureOpened(conid, database);
    return opened.serverVersion || null;
@@ -700,7 +608,7 @@ module.exports = {

  sqlPreview_meta: true,
  async sqlPreview({ conid, database, objects, options }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    // wait for structure
    await this.structure({ conid, database });

@@ -711,7 +619,7 @@ module.exports = {

  exportModel_meta: true,
  async exportModel({ conid, database, outputFolder, schema }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);

    const realFolder = outputFolder.startsWith('archive:')
      ? resolveArchiveFolder(outputFolder.substring('archive:'.length))
@@ -729,7 +637,7 @@ module.exports = {

  exportModelSql_meta: true,
  async exportModelSql({ conid, database, outputFolder, outputFile, schema }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);

    const connection = await connections.getCore({ conid });
    const driver = requireEngineDriver(connection);
@@ -743,7 +651,7 @@ module.exports = {

  generateDeploySql_meta: true,
  async generateDeploySql({ conid, database, archiveFolder }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid, database);
    const res = await this.sendRequest(opened, {
      msgtype: 'generateDeploySql',
@@ -1015,12 +923,9 @@ module.exports = {

  executeSessionQuery_meta: true,
  async executeSessionQuery({ sesid, conid, database, sql }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    logger.info({ sesid, sql }, 'DBGM-00010 Processing query');
-    sessions.dispatchMessage(sesid, {
-      message: 'Query execution started',
-      sql,
-    });
+    sessions.dispatchMessage(sesid, 'Query execution started');

    const opened = await this.ensureOpened(conid, database);
    opened.subprocess.send({ msgtype: 'executeSessionQuery', sql, sesid });
@@ -1030,7 +935,7 @@ module.exports = {

  evalJsonScript_meta: true,
  async evalJsonScript({ conid, database, script, runid }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid, database);

    opened.subprocess.send({ msgtype: 'evalJsonScript', script, runid });
@@ -3,12 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const { filesdir, archivedir, resolveArchiveFolder, uploadsdir, appdir, jsldir } = require('../utility/directories');
 const getChartExport = require('../utility/getChartExport');
-const {
-  hasPermission,
-  loadPermissionsFromRequest,
-  loadFilePermissionsFromRequest,
-  getFilePermissionRole,
-} = require('../utility/hasPermission');
+const { hasPermission } = require('../utility/hasPermission');
 const socket = require('../utility/socket');
 const scheduler = require('./scheduler');
 const getDiagramExport = require('../utility/getDiagramExport');
@@ -36,8 +31,7 @@ function deserialize(format, text) {
 module.exports = {
  list_meta: true,
  async list({ folder }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`files/${folder}/read`, loadedPermissions)) return [];
+    if (!hasPermission(`files/${folder}/read`, req)) return [];
    const dir = path.join(filesdir(), folder);
    if (!(await fs.exists(dir))) return [];
    const files = (await fs.readdir(dir)).map(file => ({ folder, file }));
@@ -46,11 +40,10 @@ module.exports = {

  listAll_meta: true,
  async listAll(_params, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
    const folders = await fs.readdir(filesdir());
    const res = [];
    for (const folder of folders) {
-      if (!hasPermission(`files/${folder}/read`, loadedPermissions)) continue;
+      if (!hasPermission(`files/${folder}/read`, req)) continue;
      const dir = path.join(filesdir(), folder);
      const files = (await fs.readdir(dir)).map(file => ({ folder, file }));
      res.push(...files);
@@ -60,8 +53,7 @@ module.exports = {

  delete_meta: true,
  async delete({ folder, file }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`files/${folder}/write`, loadedPermissions)) return false;
+    if (!hasPermission(`files/${folder}/write`, req)) return false;
    if (!checkSecureFilePathsWithoutDirectory(folder, file)) {
      return false;
    }
@@ -73,8 +65,7 @@ module.exports = {

  rename_meta: true,
  async rename({ folder, file, newFile }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`files/${folder}/write`, loadedPermissions)) return false;
+    if (!hasPermission(`files/${folder}/write`, req)) return false;
    if (!checkSecureFilePathsWithoutDirectory(folder, file, newFile)) {
      return false;
    }
@@ -95,11 +86,10 @@ module.exports = {

  copy_meta: true,
  async copy({ folder, file, newFile }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
    if (!checkSecureFilePathsWithoutDirectory(folder, file, newFile)) {
      return false;
    }
-    if (!hasPermission(`files/${folder}/write`, loadedPermissions)) return false;
+    if (!hasPermission(`files/${folder}/write`, req)) return false;
    await fs.copyFile(path.join(filesdir(), folder, file), path.join(filesdir(), folder, newFile));
    socket.emitChanged(`files-changed`, { folder });
    socket.emitChanged(`all-files-changed`);
@@ -123,8 +113,7 @@ module.exports = {
      });
      return deserialize(format, text);
    } else {
-      const loadedPermissions = await loadPermissionsFromRequest(req);
-      if (!hasPermission(`files/${folder}/read`, loadedPermissions)) return null;
+      if (!hasPermission(`files/${folder}/read`, req)) return null;
      const text = await fs.readFile(path.join(filesdir(), folder, file), { encoding: 'utf-8' });
      return deserialize(format, text);
    }
@@ -142,19 +131,18 @@ module.exports = {

  save_meta: true,
  async save({ folder, file, data, format }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
    if (!checkSecureFilePathsWithoutDirectory(folder, file)) {
      return false;
    }

    if (folder.startsWith('archive:')) {
-      if (!hasPermission(`archive/write`, loadedPermissions)) return false;
+      if (!hasPermission(`archive/write`, req)) return false;
      const dir = resolveArchiveFolder(folder.substring('archive:'.length));
      await fs.writeFile(path.join(dir, file), serialize(format, data));
      socket.emitChanged(`archive-files-changed`, { folder: folder.substring('archive:'.length) });
      return true;
    } else if (folder.startsWith('app:')) {
-      if (!hasPermission(`apps/write`, loadedPermissions)) return false;
+      if (!hasPermission(`apps/write`, req)) return false;
      const app = folder.substring('app:'.length);
      await fs.writeFile(path.join(appdir(), app, file), serialize(format, data));
      socket.emitChanged(`app-files-changed`, { app });
@@ -162,7 +150,7 @@ module.exports = {
      apps.emitChangedDbApp(folder);
      return true;
    } else {
-      if (!hasPermission(`files/${folder}/write`, loadedPermissions)) return false;
+      if (!hasPermission(`files/${folder}/write`, req)) return false;
      const dir = path.join(filesdir(), folder);
      if (!(await fs.exists(dir))) {
        await fs.mkdir(dir);
@@ -189,8 +177,7 @@ module.exports = {

  favorites_meta: true,
  async favorites(_params, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`files/favorites/read`, loadedPermissions)) return [];
+    if (!hasPermission(`files/favorites/read`, req)) return [];
    const dir = path.join(filesdir(), 'favorites');
    if (!(await fs.exists(dir))) return [];
    const files = await fs.readdir(dir);
@@ -247,17 +234,16 @@ module.exports = {

  getFileRealPath_meta: true,
  async getFileRealPath({ folder, file }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
    if (folder.startsWith('archive:')) {
-      if (!hasPermission(`archive/write`, loadedPermissions)) return false;
+      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`, loadedPermissions)) return false;
+      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`, loadedPermissions)) return false;
+      if (!hasPermission(`files/${folder}/write`, req)) return false;
      const dir = path.join(filesdir(), folder);
      if (!(await fs.exists(dir))) {
        await fs.mkdir(dir);
@@ -311,8 +297,7 @@ module.exports = {

  exportFile_meta: true,
  async exportFile({ folder, file, filePath }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`files/${folder}/read`, loadedPermissions)) return false;
+    if (!hasPermission(`files/${folder}/read`, req)) return false;
    await fs.copyFile(path.join(filesdir(), folder, file), filePath);
    return true;
  },
@@ -7,7 +7,7 @@ const socket = require('../utility/socket');
 const compareVersions = require('compare-versions');
 const requirePlugin = require('../shell/requirePlugin');
 const downloadPackage = require('../utility/downloadPackage');
-const { hasPermission, loadPermissionsFromRequest } = require('../utility/hasPermission');
+const { hasPermission } = require('../utility/hasPermission');
 const _ = require('lodash');
 const packagedPluginsContent = require('../packagedPluginsContent');

@@ -118,8 +118,7 @@ module.exports = {

  install_meta: true,
  async install({ packageName }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`plugins/install`, loadedPermissions)) return;
+    if (!hasPermission(`plugins/install`, req)) return;
    const dir = path.join(pluginsdir(), packageName);
    // @ts-ignore
    if (!(await fs.exists(dir))) {
@@ -133,8 +132,7 @@ module.exports = {

  uninstall_meta: true,
  async uninstall({ packageName }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`plugins/install`, loadedPermissions)) return;
+    if (!hasPermission(`plugins/install`, req)) return;
    const dir = path.join(pluginsdir(), packageName);
    await fs.rmdir(dir, { recursive: true });
    socket.emitChanged(`installed-plugins-changed`);
@@ -145,8 +143,7 @@ module.exports = {

  upgrade_meta: true,
  async upgrade({ packageName }, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission(`plugins/install`, loadedPermissions)) return;
+    if (!hasPermission(`plugins/install`, req)) return;
    const dir = path.join(pluginsdir(), packageName);
    // @ts-ignore
    if (await fs.exists(dir)) {
@@ -21,7 +21,6 @@ const processArgs = require('../utility/processArgs');
 const platformInfo = require('../utility/platformInfo');
 const { checkSecureDirectories, checkSecureDirectoriesInScript } = require('../utility/security');
 const { sendToAuditLog, logJsonRunnerScript } = require('../utility/auditlog');
-const { testStandardPermission } = require('../utility/hasPermission');
 const logger = getLogger('runners');

 function extractPlugins(script) {
@@ -289,8 +288,6 @@ module.exports = {
      return this.startCore(runid, scriptTemplate(js, false));
    }

-    await testStandardPermission('run-shell-script', req);
-
    if (!platformInfo.allowShellScripting) {
      sendToAuditLog(req, {
        category: 'shell',
@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const cron = require('node-cron');
 const runners = require('./runners');
-const { hasPermission, loadPermissionsFromRequest } = require('../utility/hasPermission');
+const { hasPermission } = require('../utility/hasPermission');
 const { getLogger } = require('dbgate-tools');

 const logger = getLogger('scheduler');
@@ -30,8 +30,7 @@ module.exports = {
  },

  async reload(_params, req) {
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-    if (!hasPermission('files/shell/read', loadedPermissions)) return;
+    if (!hasPermission('files/shell/read', req)) return;
    const shellDir = path.join(filesdir(), 'shell');
    await this.unload();
    if (!(await fs.exists(shellDir))) return;
@@ -8,13 +8,7 @@ const { handleProcessCommunication } = require('../utility/processComm');
 const lock = new AsyncLock();
 const config = require('./config');
 const processArgs = require('../utility/processArgs');
-const {
-  testConnectionPermission,
-  loadPermissionsFromRequest,
-  hasPermission,
-  loadDatabasePermissionsFromRequest,
-  getDatabasePermissionRole,
-} = require('../utility/hasPermission');
+const { testConnectionPermission } = require('../utility/hasPermission');
 const { MissingCredentialsError } = require('../utility/exceptions');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const { getLogger, extractErrorLogData } = require('dbgate-tools');
@@ -141,7 +135,7 @@ module.exports = {

  disconnect_meta: true,
  async disconnect({ conid }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    await this.close(conid, true);
    return { status: 'ok' };
  },
@@ -150,9 +144,7 @@ module.exports = {
  async listDatabases({ conid }, req) {
    if (!conid) return [];
    if (conid == '__model') return [];
-    const loadedPermissions = await loadPermissionsFromRequest(req);
-
-    await testConnectionPermission(conid, req, loadedPermissions);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid);
    sendToAuditLog(req, {
      category: 'serverop',
@@ -165,29 +157,12 @@ module.exports = {
      sessionGroup: 'listDatabases',
      message: `Loaded databases for connection`,
    });
-
-    if (process.env.STORAGE_DATABASE && !hasPermission(`all-databases`, loadedPermissions)) {
-      // filter databases by permissions
-      const databasePermissions = await loadDatabasePermissionsFromRequest(req);
-      const res = [];
-      for (const db of opened?.databases ?? []) {
-        const databasePermissionRole = getDatabasePermissionRole(db.id, db.name, databasePermissions);
-        if (databasePermissionRole != 'deny') {
-          res.push({
-            ...db,
-            databasePermissionRole,
-          });
-        }
-      }
-      return res;
-    }
-
    return opened?.databases ?? [];
  },

  version_meta: true,
  async version({ conid }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid);
    return opened?.version ?? null;
  },
@@ -209,11 +184,11 @@ module.exports = {
          return Promise.resolve();
        }
        this.lastPinged[conid] = new Date().getTime();
+        const opened = await this.ensureOpened(conid);
+        if (!opened) {
+          return Promise.resolve();
+        }
        try {
-          const opened = await this.ensureOpened(conid);
-          if (!opened) {
-            return Promise.resolve();
-          }
          opened.subprocess.send({ msgtype: 'ping' });
        } catch (err) {
          logger.error(extractErrorLogData(err), 'DBGM-00121 Error pinging server connection');
@@ -227,7 +202,7 @@ module.exports = {

  refresh_meta: true,
  async refresh({ conid, keepOpen }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    if (!keepOpen) this.close(conid);

    await this.ensureOpened(conid);
@@ -235,7 +210,7 @@ module.exports = {
  },

  async sendDatabaseOp({ conid, msgtype, name }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid);
    if (!opened) {
      return null;
@@ -277,7 +252,7 @@ module.exports = {
  },

  async loadDataCore(msgtype, { conid, ...args }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid);
    if (!opened) {
      return null;
@@ -295,43 +270,13 @@ module.exports = {

  serverSummary_meta: true,
  async serverSummary({ conid }, req) {
-    await testConnectionPermission(conid, req);
-    logger.info({ conid }, 'DBGM-00260 Processing server summary');
+    testConnectionPermission(conid, req);
    return this.loadDataCore('serverSummary', { conid });
  },

-  listDatabaseProcesses_meta: true,
-  async listDatabaseProcesses(ctx, req) {
-    const { conid } = ctx;
-    // logger.info({ conid }, 'DBGM-00261 Listing processes of database server');
-    testConnectionPermission(conid, req);
-
-    const opened = await this.ensureOpened(conid);
-    if (!opened) {
-      return null;
-    }
-    if (opened.connection.isReadOnly) return false;
-
-    return this.sendRequest(opened, { msgtype: 'listDatabaseProcesses' });
-  },
-
-  killDatabaseProcess_meta: true,
-  async killDatabaseProcess(ctx, req) {
-    const { conid, pid } = ctx;
-    testConnectionPermission(conid, req);
-
-    const opened = await this.ensureOpened(conid);
-    if (!opened) {
-      return null;
-    }
-    if (opened.connection.isReadOnly) return false;
-
-    return this.sendRequest(opened, { msgtype: 'killDatabaseProcess', pid });
-  },
-
  summaryCommand_meta: true,
  async summaryCommand({ conid, command, row }, req) {
-    await testConnectionPermission(conid, req);
+    testConnectionPermission(conid, req);
    const opened = await this.ensureOpened(conid);
    if (!opened) {
      return null;
@@ -8,13 +8,10 @@ const path = require('path');
 const { handleProcessCommunication } = require('../utility/processComm');
 const processArgs = require('../utility/processArgs');
 const { appdir } = require('../utility/directories');
-const { getLogger, extractErrorLogData, removeSqlFrontMatter } = require('dbgate-tools');
+const { getLogger, extractErrorLogData } = require('dbgate-tools');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const config = require('./config');
 const { sendToAuditLog } = require('../utility/auditlog');
-const { testStandardPermission, testDatabaseRolePermission } = require('../utility/hasPermission');
-const { getStaticTokenSecret } = require('../auth/authCommon');
-const jwt = require('jsonwebtoken');

 const logger = getLogger('sessions');

@@ -83,16 +80,6 @@ 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);
  },
@@ -107,12 +94,6 @@ 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,
@@ -167,23 +148,10 @@ module.exports = {

  executeQuery_meta: true,
  async executeQuery({ sesid, sql, autoCommit, autoDetectCharts, limitRows, frontMatter }, req) {
-    let useTokenIsOk = false;
-    if (frontMatter?.useToken) {
-      const decoded = jwt.verify(frontMatter.useToken, getStaticTokenSecret());
-      if (decoded?.['contentHash'] == crypto.createHash('md5').update(removeSqlFrontMatter(sql)).digest('hex')) {
-        useTokenIsOk = true;
-      }
-    }
-    if (!useTokenIsOk) {
-      await testStandardPermission('dbops/query', req);
-    }
    const session = this.opened.find(x => x.sesid == sesid);
    if (!session) {
      throw new Error('Invalid session');
    }
-    if (!useTokenIsOk) {
-      await testDatabaseRolePermission(session.conid, session.database, 'run_script', req);
-    }

    sendToAuditLog(req, {
      category: 'dbop',
@@ -198,10 +166,7 @@ module.exports = {
    });

    logger.info({ sesid, sql }, 'DBGM-00019 Processing query');
-    this.dispatchMessage(sesid, {
-      message: 'Query execution started',
-      sql,
-    });
+    this.dispatchMessage(sesid, 'Query execution started');
    session.subprocess.send({
      msgtype: 'executeQuery',
      sql,
@@ -13,6 +13,10 @@ module.exports = {
    return null;
  },

+  async loadSuperadminPermissions() {
+    return [];
+  },
+
  getConnectionsForLoginPage_meta: true,
  async getConnectionsForLoginPage() {
    return null;
@@ -1,6 +0,0 @@
-module.exports = {
-  list_meta: true,
-  async list(req) {
-    return [];
-  },
-};
@@ -1,8 +1,19 @@
 const crypto = require('crypto');
 const path = require('path');
-const { uploadsdir } = require('../utility/directories');
-const { getLogger } = require('dbgate-tools');
+const { uploadsdir, getLogsFilePath, filesdir } = require('../utility/directories');
+const { getLogger, extractErrorLogData } = require('dbgate-tools');
 const logger = getLogger('uploads');
+const axios = require('axios');
+const os = require('os');
+const fs = require('fs/promises');
+const { read } = require('./queryHistory');
+const platformInfo = require('../utility/platformInfo');
+const _ = require('lodash');
+const serverConnections = require('./serverConnections');
+const config = require('./config');
+const gistSecret = require('../gistSecret');
+const currentVersion = require('../currentVersion');
+const socket = require('../utility/socket');

 module.exports = {
  upload_meta: {
@@ -40,70 +51,88 @@ module.exports = {
    res.sendFile(path.join(uploadsdir(), req.query.file));
  },

-//   uploadErrorToGist_meta: true,
-//   async uploadErrorToGist() {
-//     const logs = await fs.readFile(getLogsFilePath(), { encoding: 'utf-8' });
-//     const connections = await serverConnections.getOpenedConnectionReport();
-//     try {
-//       const response = await axios.default.post(
-//         'https://api.github.com/gists',
-//         {
-//           description: `DbGate ${currentVersion.version} error report`,
-//           public: false,
-//           files: {
-//             'logs.jsonl': {
-//               content: logs,
-//             },
-//             'os.json': {
-//               content: JSON.stringify(
-//                 {
-//                   release: os.release(),
-//                   arch: os.arch(),
-//                   machine: os.machine(),
-//                   platform: os.platform(),
-//                   type: os.type(),
-//                 },
-//                 null,
-//                 2
-//               ),
-//             },
-//             'platform.json': {
-//               content: JSON.stringify(
-//                 _.omit(
-//                   {
-//                     ...platformInfo,
-//                   },
-//                   ['defaultKeyfile', 'sshAuthSock']
-//                 ),
-//                 null,
-//                 2
-//               ),
-//             },
-//             'connections.json': {
-//               content: JSON.stringify(connections, null, 2),
-//             },
-//             'version.json': {
-//               content: JSON.stringify(currentVersion, null, 2),
-//             },
-//           },
-//         },
-//         {
-//           headers: {
-//             Authorization: `token ${await this.getGistToken()}`,
-//             'Content-Type': 'application/json',
-//             Accept: 'application/vnd.github.v3+json',
-//           },
-//         }
-//       );
+  async getGistToken() {
+    const settings = await config.getSettings();

-//       return response.data;
-//     } catch (err) {
-//       logger.error(extractErrorLogData(err), 'DBGM-00148 Error uploading gist');
+    return settings['other.gistCreateToken'] || gistSecret;
+  },

-//       return {
-//         apiErrorMessage: err.message,
-//       };
-//       // console.error('Error creating gist:', error.response ? error.response.data : error.message);
-//     }
-//   },
+  uploadErrorToGist_meta: true,
+  async uploadErrorToGist() {
+    const logs = await fs.readFile(getLogsFilePath(), { encoding: 'utf-8' });
+    const connections = await serverConnections.getOpenedConnectionReport();
+    try {
+      const response = await axios.default.post(
+        'https://api.github.com/gists',
+        {
+          description: `DbGate ${currentVersion.version} error report`,
+          public: false,
+          files: {
+            'logs.jsonl': {
+              content: logs,
+            },
+            'os.json': {
+              content: JSON.stringify(
+                {
+                  release: os.release(),
+                  arch: os.arch(),
+                  machine: os.machine(),
+                  platform: os.platform(),
+                  type: os.type(),
+                },
+                null,
+                2
+              ),
+            },
+            'platform.json': {
+              content: JSON.stringify(
+                _.omit(
+                  {
+                    ...platformInfo,
+                  },
+                  ['defaultKeyfile', 'sshAuthSock']
+                ),
+                null,
+                2
+              ),
+            },
+            'connections.json': {
+              content: JSON.stringify(connections, null, 2),
+            },
+            'version.json': {
+              content: JSON.stringify(currentVersion, null, 2),
+            },
+          },
+        },
+        {
+          headers: {
+            Authorization: `token ${await this.getGistToken()}`,
+            'Content-Type': 'application/json',
+            Accept: 'application/vnd.github.v3+json',
+          },
+        }
+      );
+
+      return response.data;
+    } catch (err) {
+      logger.error(extractErrorLogData(err), 'DBGM-00148 Error uploading gist');
+
+      return {
+        apiErrorMessage: err.message,
+      };
+      // console.error('Error creating gist:', error.response ? error.response.data : error.message);
+    }
+  },
+
+  deleteGist_meta: true,
+  async deleteGist({ url }) {
+    const response = await axios.default.delete(url, {
+      headers: {
+        Authorization: `token ${await this.getGistToken()}`,
+        'Content-Type': 'application/json',
+        Accept: 'application/vnd.github.v3+json',
+      },
+    });
+    return true;
+  },
 };
@@ -0,0 +1 @@
+module.exports = process.env.GIST_UPLOAD_SECRET;
@@ -5,7 +5,6 @@ const moment = require('moment');
 const path = require('path');
 const { logsdir, setLogsFilePath, getLogsFilePath } = require('./utility/directories');
 const currentVersion = require('./currentVersion');
-const _ = require('lodash');

 const logger = getLogger('apiIndex');

@@ -69,7 +68,7 @@ function configureLogger() {
            }
            const additionals = {};
            const finalMsg =
-              _.isString(msg.msg) && msg.msg.match(/^DBGM-\d\d\d\d\d/)
+              msg.msg && msg.msg.match(/^DBGM-\d\d\d\d\d/)
                ? {
                    ...msg,
                    msg: msg.msg.substring(10).trimStart(),
@@ -29,8 +29,6 @@ const files = require('./controllers/files');
 const scheduler = require('./controllers/scheduler');
 const queryHistory = require('./controllers/queryHistory');
 const cloud = require('./controllers/cloud');
-const teamFiles = require('./controllers/teamFiles');
-
 const onFinished = require('on-finished');
 const processArgs = require('./utility/processArgs');

@@ -266,7 +264,6 @@ function useAllControllers(app, electron) {
  useController(app, electron, '/apps', apps);
  useController(app, electron, '/auth', auth);
  useController(app, electron, '/cloud', cloud);
-  useController(app, electron, '/team-files', teamFiles);
 }

 function setElectronSender(electronSender) {
@@ -17,14 +17,13 @@ const requireEngineDriver = require('../utility/requireEngineDriver');
 const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const generateDeploySql = require('../shell/generateDeploySql');
-const { dumpSqlSelect, scriptToSql } = require('dbgate-sqltree');
+const { dumpSqlSelect } = require('dbgate-sqltree');
 const { allowExecuteCustomScript, handleQueryStream } = require('../utility/handleQueryStream');
 const dbgateApi = require('../shell');
 const requirePlugin = require('../shell/requirePlugin');
 const path = require('path');
 const { rundir } = require('../utility/directories');
 const fs = require('fs-extra');
-const { changeSetToSql } = require('dbgate-datalib');

 const logger = getLogger('dbconnProcess');

@@ -349,25 +348,6 @@ async function handleUpdateCollection({ msgid, changeSet }) {
  }
 }

-async function handleSaveTableData({ msgid, changeSet }) {
-  await waitStructure();
-  try {
-    const driver = requireEngineDriver(storedConnection);
-    const script = driver.createSaveChangeSetScript(changeSet, analysedStructure, () =>
-      changeSetToSql(changeSet, analysedStructure, driver.dialect)
-    );
-    const sql = scriptToSql(driver, script);
-    await driver.script(dbhan, sql, { useTransaction: true });
-    process.send({ msgtype: 'response', msgid });
-  } catch (err) {
-    process.send({
-      msgtype: 'response',
-      msgid,
-      errorMessage: extractErrorMessage(err, 'Error executing SQL script'),
-    });
-  }
-}
-
 async function handleSqlPreview({ msgid, objects, options }) {
  await waitStructure();
  const driver = requireEngineDriver(storedConnection);
@@ -484,7 +464,6 @@ const messageHandlers = {
  runScript: handleRunScript,
  runOperation: handleRunOperation,
  updateCollection: handleUpdateCollection,
-  saveTableData: handleSaveTableData,
  collectionData: handleCollectionData,
  loadKeys: handleLoadKeys,
  scanKeys: handleScanKeys,
@@ -146,30 +146,6 @@ async function handleServerSummary({ msgid }) {
  return handleDriverDataCore(msgid, driver => driver.serverSummary(dbhan));
 }

-async function handleKillDatabaseProcess({ msgid, pid }) {
-  await waitConnected();
-  const driver = requireEngineDriver(storedConnection);
-
-  try {
-    const result = await driver.killProcess(dbhan, Number(pid));
-    process.send({ msgtype: 'response', msgid, result });
-  } catch (err) {
-    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
-  }
-}
-
-async function handleListDatabaseProcesses({ msgid }) {
-  await waitConnected();
-  const driver = requireEngineDriver(storedConnection);
-
-  try {
-    const result = await driver.listProcesses(dbhan);
-    process.send({ msgtype: 'response', msgid, result });
-  } catch (err) {
-    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
-  }
-}
-
 async function handleSummaryCommand({ msgid, command, row }) {
  return handleDriverDataCore(msgid, driver => driver.summaryCommand(dbhan, command, row));
 }
@@ -178,8 +154,6 @@ const messageHandlers = {
  connect: handleConnect,
  ping: handlePing,
  serverSummary: handleServerSummary,
-  killDatabaseProcess: handleKillDatabaseProcess,
-  listDatabaseProcesses: handleListDatabaseProcesses,
  summaryCommand: handleSummaryCommand,
  createDatabase: props => handleDatabaseOp('createDatabase', props),
  dropDatabase: props => handleDatabaseOp('dropDatabase', props),
@@ -13,12 +13,11 @@ const socket = require('./socket');
 const config = require('../controllers/config');
 const simpleEncryptor = require('simple-encryptor');
 const currentVersion = require('../currentVersion');
+const { getPublicIpInfo } = require('./hardwareFingerprint');

 const logger = getLogger('cloudIntf');

 let cloudFiles = null;
-let promoWidgetData = null;
-let promoWidgetDataLoaded = false;

 const DBGATE_IDENTITY_URL = process.env.LOCAL_DBGATE_IDENTITY
  ? 'http://localhost:3103'
@@ -193,7 +192,7 @@ async function getCloudSigninHeaders(holder = null) {
  return null;
 }

-async function updateCloudFiles(isRefresh, language) {
+async function updateCloudFiles(isRefresh) {
  let lastCloudFilesTags;
  try {
    lastCloudFilesTags = await fs.readFile(path.join(datadir(), 'cloud-files-tags.txt'), 'utf-8');
@@ -201,6 +200,8 @@ async function updateCloudFiles(isRefresh, language) {
    lastCloudFilesTags = '';
  }

+  const ipInfo = await getPublicIpInfo();
+
  const tags = (await collectCloudFilesSearchTags()).join(',');
  let lastCheckedTm = 0;
  if (tags == lastCloudFilesTags && cloudFiles.length > 0) {
@@ -212,13 +213,12 @@ async function updateCloudFiles(isRefresh, language) {
  const resp = await axios.default.get(
    `${DBGATE_CLOUD_URL}/public-cloud-updates?lastCheckedTm=${lastCheckedTm}&tags=${tags}&isRefresh=${
      isRefresh ? 1 : 0
-    }`,
+    }&country=${ipInfo?.country || ''}`,
    {
      headers: {
        ...getLicenseHttpHeaders(),
        ...(await getCloudInstanceHeaders()),
        'x-app-version': currentVersion.version,
-        'x-app-language': language || 'en',
      },
    }
  );
@@ -262,62 +262,15 @@ async function getPublicFileData(path) {
  return resp.data;
 }

-async function ensurePromoWidgetDataLoaded() {
-  if (promoWidgetDataLoaded) {
-    return;
-  }
-  try {
-    const fileContent = await fs.readFile(path.join(datadir(), 'promo-widget.json'), 'utf-8');
-    promoWidgetData = JSON.parse(fileContent);
-  } catch (err) {
-    promoWidgetData = null;
-  }
-  promoWidgetDataLoaded = true;
-}
-
-async function updatePremiumPromoWidget(language) {
-  await ensurePromoWidgetDataLoaded();
-
-  const tags = (await collectCloudFilesSearchTags()).join(',');
-
-  const resp = await axios.default.get(
-    `${DBGATE_CLOUD_URL}/premium-promo-widget?identifier=${promoWidgetData?.identifier ?? 'empty'}&tags=${tags}`,
-    {
-      headers: {
-        ...getLicenseHttpHeaders(),
-        ...(await getCloudInstanceHeaders()),
-        'x-app-version': currentVersion.version,
-        'x-app-language': language || 'en',
-      },
-    }
-  );
-
-  if (!resp.data || resp.data?.state == 'unchanged') {
-    return;
-  }
-
-  promoWidgetData = resp.data;
-  await fs.writeFile(path.join(datadir(), 'promo-widget.json'), JSON.stringify(promoWidgetData, null, 2));
-
-  socket.emitChanged(`promo-widget-changed`);
-}
-
-async function refreshPublicFiles(isRefresh, uiLanguage) {
-  const language = platformInfo.isElectron
-    ? (await config.getCachedSettings())?.['localization.language'] || 'en'
-    : uiLanguage;
+async function refreshPublicFiles(isRefresh) {
  if (!cloudFiles) {
    await loadCloudFiles();
  }
  try {
-    await updateCloudFiles(isRefresh, language);
+    await updateCloudFiles(isRefresh);
  } catch (err) {
    logger.error(extractErrorLogData(err), 'DBGM-00166 Error updating cloud files');
  }
-  const configSettings = await config.get();
-  if (!isProApp() || configSettings?.trialDaysLeft != null) {
-    await updatePremiumPromoWidget(language);
-  }
 }

 async function callCloudApiGet(endpoint, signinHolder = null, additionalHeaders = {}) {
@@ -470,33 +423,6 @@ function removeCloudCachedConnection(folid, cntid) {
  delete cloudConnectionCache[cacheKey];
 }

-async function getPublicIpInfo() {
-  try {
-    const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/ipinfo`);
-    if (!resp.data?.ip) {
-      return { ip: 'unknown-ip' };
-    }
-    return resp.data;
-  } catch (err) {
-    return { ip: 'unknown-ip' };
-  }
-}
-
-async function getPromoWidgetData() {
-  await ensurePromoWidgetDataLoaded();
-  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,
@@ -513,8 +439,4 @@ module.exports = {
  removeCloudCachedConnection,
  readCloudTokenHolder,
  readCloudTestTokenHolder,
-  getPublicIpInfo,
-  getPromoWidgetData,
-  getPromoWidgetPreview,
-  getPromoWidgetList,
 };
@@ -53,7 +53,7 @@ const getChartExport = (title, config, imageFile, plugins) => {
    </div>

    <div class="footer">
-        Exported from <a href='https://www.dbgate.io/' target='_blank'>DbGate</a>, powered by <a href='https://www.chartjs.org/' target='_blank'>Chart.js</a>
+        Exported from <a href='https://dbgate.io/' target='_blank'>DbGate</a>, powered by <a href='https://www.chartjs.org/' target='_blank'>Chart.js</a>
    </div>
 </body>

@@ -18,7 +18,7 @@ const getMapExport = (geoJson) => {
    leaflet
      .tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
        maxZoom: 19,
-        attribution: '<a href="https://www.dbgate.io" title="Exported from DbGate">DbGate</a> | © OpenStreetMap',
+        attribution: '<a href="https://dbgate.io" title="Exported from DbGate">DbGate</a> | © OpenStreetMap',
      })
      .addTo(map);
      
@@ -14,10 +14,9 @@ class QueryStreamTableWriter {
    this.currentChangeIndex = 1;
    this.initializedFile = false;
    this.sesid = sesid;
-    this.started = new Date().getTime();
  }

-  initializeFromQuery(structure, resultIndex, chartDefinition, autoDetectCharts = false, options = {}) {
+  initializeFromQuery(structure, resultIndex, chartDefinition, autoDetectCharts = false) {
    this.jslid = crypto.randomUUID();
    this.currentFile = path.join(jsldir(), `${this.jslid}.jsonl`);
    fs.writeFileSync(
@@ -25,7 +24,6 @@ class QueryStreamTableWriter {
      JSON.stringify({
        ...structure,
        __isStreamHeader: true,
-        ...options
      }) + '\n'
    );
    this.currentStream = fs.createWriteStream(this.currentFile, { flags: 'a' });
@@ -120,13 +118,6 @@ 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 {
@@ -157,7 +148,6 @@ 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;
@@ -176,11 +166,7 @@ class StreamHandler {
    }
  }

-  changedCurrentDatabase(database) {
-    process.send({ msgtype: 'changedCurrentDatabase', database, sesid: this.sesid });
-  }
-
-  recordset(columns, options) {
+  recordset(columns) {
    if (this.rowsLimitOverflow) {
      return;
    }
@@ -190,8 +176,7 @@ class StreamHandler {
      Array.isArray(columns) ? { columns } : columns,
      this.queryStreamInfoHolder.resultIndex,
      this.frontMatter?.[`chart-${this.queryStreamInfoHolder.resultIndex + 1}`],
-      this.autoDetectCharts,
-      options
+      this.autoDetectCharts
    );
    this.queryStreamInfoHolder.resultIndex += 1;
    this.rowCounter = 0;
@@ -3,6 +3,18 @@ const os = require('os');
 const crypto = require('crypto');
 const platformInfo = require('./platformInfo');

+async function getPublicIpInfo() {
+  try {
+    const resp = await axios.default.get('https://ipinfo.io/json');
+    if (!resp.data?.ip) {
+      return { ip: 'unknown-ip' };
+    }
+    return resp.data;
+  } catch (err) {
+    return { ip: 'unknown-ip' };
+  }
+}
+
 function getMacAddress() {
  try {
    const interfaces = os.networkInterfaces();
@@ -20,7 +32,6 @@ function getMacAddress() {
 }

 async function getHardwareFingerprint() {
-  const { getPublicIpInfo } = require('./cloudIntf');
  const publicIpInfo = await getPublicIpInfo();
  const macAddress = getMacAddress();
  const platform = os.platform();
@@ -31,6 +42,8 @@ async function getHardwareFingerprint() {
  return {
    publicIp: publicIpInfo.ip,
    country: publicIpInfo.country,
+    region: publicIpInfo.region,
+    city: publicIpInfo.city,
    macAddress,
    platform,
    release,
@@ -55,7 +68,9 @@ async function getPublicHardwareFingerprint() {
    hash,
    payload: {
      platform: fingerprint.platform,
+      city: fingerprint.city,
      country: fingerprint.country,
+      region: fingerprint.region,
      isDocker: platformInfo.isDocker,
      isAwsUbuntuLayout: platformInfo.isAwsUbuntuLayout,
      isAzureUbuntuLayout: platformInfo.isAzureUbuntuLayout,
@@ -72,4 +87,5 @@ module.exports = {
  getHardwareFingerprint,
  getHardwareFingerprintHash,
  getPublicHardwareFingerprint,
+  getPublicIpInfo,
 };
@@ -1,350 +1,96 @@
-const { compilePermissions, testPermission, getPermissionsCacheKey } = require('dbgate-tools');
+const { compilePermissions, testPermission } = require('dbgate-tools');
 const _ = require('lodash');
 const { getAuthProviderFromReq } = require('../auth/authProvider');

 const cachedPermissions = {};

-async function loadPermissionsFromRequest(req) {
-  const authProvider = getAuthProviderFromReq(req);
+function hasPermission(tested, req) {
  if (!req) {
-    return null;
-  }
-
-  const loadedPermissions = await authProvider.getCurrentPermissions(req);
-  return loadedPermissions;
-}
-
-function hasPermission(tested, loadedPermissions) {
-  if (!loadedPermissions) {
-    // not available, allow all
+    // request object not available, allow all
    return true;
  }

-  const permissionsKey = getPermissionsCacheKey(loadedPermissions);
-  if (!cachedPermissions[permissionsKey]) {
-    cachedPermissions[permissionsKey] = compilePermissions(loadedPermissions);
+  const permissions = getAuthProviderFromReq(req).getCurrentPermissions(req);
+
+  if (!cachedPermissions[permissions]) {
+    cachedPermissions[permissions] = compilePermissions(permissions);
  }

-  return testPermission(tested, cachedPermissions[permissionsKey]);
+  return testPermission(tested, cachedPermissions[permissions]);
+
+  // const { user } = (req && req.auth) || {};
+  // const { login } = (process.env.OAUTH_PERMISSIONS && req && req.user) || {};
+  // const key = user || login || '';
+  // const logins = getLogins();
+
+  // if (!userPermissions[key]) {
+  //   if (logins) {
+  //     const login = logins.find(x => x.login == user);
+  //     userPermissions[key] = compilePermissions(login ? login.permissions : null);
+  //   } else {
+  //     userPermissions[key] = compilePermissions(process.env.PERMISSIONS);
+  //   }
+  // }
+  // return testPermission(tested, userPermissions[key]);
 }

-function connectionHasPermission(connection, loadedPermissions) {
+// let loginsCache = null;
+// let loginsLoaded = false;
+
+// function getLogins() {
+//   if (loginsLoaded) {
+//     return loginsCache;
+//   }
+
+//   const res = [];
+//   if (process.env.LOGIN && process.env.PASSWORD) {
+//     res.push({
+//       login: process.env.LOGIN,
+//       password: process.env.PASSWORD,
+//       permissions: process.env.PERMISSIONS,
+//     });
+//   }
+//   if (process.env.LOGINS) {
+//     const logins = _.compact(process.env.LOGINS.split(',').map(x => x.trim()));
+//     for (const login of logins) {
+//       const password = process.env[`LOGIN_PASSWORD_${login}`];
+//       const permissions = process.env[`LOGIN_PERMISSIONS_${login}`];
+//       if (password) {
+//         res.push({
+//           login,
+//           password,
+//           permissions,
+//         });
+//       }
+//     }
+//   } else if (process.env.OAUTH_PERMISSIONS) {
+//     const login_permission_keys = Object.keys(process.env).filter(key => _.startsWith(key, 'LOGIN_PERMISSIONS_'));
+//     for (const permissions_key of login_permission_keys) {
+//       const login = permissions_key.replace('LOGIN_PERMISSIONS_', '');
+//       const permissions = process.env[permissions_key];
+//       userPermissions[login] = compilePermissions(permissions);
+//     }
+//   }
+
+//   loginsCache = res.length > 0 ? res : null;
+//   loginsLoaded = true;
+//   return loginsCache;
+// }
+
+function connectionHasPermission(connection, req) {
  if (!connection) {
    return true;
  }
  if (_.isString(connection)) {
-    return hasPermission(`connections/${connection}`, loadedPermissions);
+    return hasPermission(`connections/${connection}`, req);
  } else {
-    return hasPermission(`connections/${connection._id}`, loadedPermissions);
+    return hasPermission(`connections/${connection._id}`, req);
  }
 }

-async function testConnectionPermission(connection, req, loadedPermissions) {
-  if (!loadedPermissions) {
-    loadedPermissions = await loadPermissionsFromRequest(req);
-  }
-  if (process.env.STORAGE_DATABASE) {
-    if (hasPermission(`all-connections`, loadedPermissions)) {
-      return;
-    }
-    const conid = _.isString(connection) ? connection : connection?._id;
-    if (hasPermission('internal-storage', loadedPermissions) && conid == '__storage') {
-      return;
-    }
-    const authProvider = getAuthProviderFromReq(req);
-    if (!req) {
-      return;
-    }
-    if (!(await authProvider.checkCurrentConnectionPermission(req, conid))) {
-      throw new Error('DBGM-00263 Connection permission not granted');
-    }
-  } else {
-    if (!connectionHasPermission(connection, loadedPermissions)) {
-      throw new Error('DBGM-00264 Connection permission not granted');
-    }
-  }
-}
-
-async function loadDatabasePermissionsFromRequest(req) {
-  const authProvider = getAuthProviderFromReq(req);
-  if (!req) {
-    return null;
-  }
-
-  const databasePermissions = await authProvider.getCurrentDatabasePermissions(req);
-  return databasePermissions;
-}
-
-async function loadTablePermissionsFromRequest(req) {
-  const authProvider = getAuthProviderFromReq(req);
-  if (!req) {
-    return null;
-  }
-
-  const tablePermissions = await authProvider.getCurrentTablePermissions(req);
-  return tablePermissions;
-}
-
-async function loadFilePermissionsFromRequest(req) {
-  const authProvider = getAuthProviderFromReq(req);
-  if (!req) {
-    return null;
-  }
-
-  const filePermissions = await authProvider.getCurrentFilePermissions(req);
-  return filePermissions;
-}
-
-function matchDatabasePermissionRow(conid, database, permissionRow) {
-  if (permissionRow.connection_id) {
-    if (conid != permissionRow.connection_id) {
-      return false;
-    }
-  }
-  if (permissionRow.database_names_list) {
-    const items = permissionRow.database_names_list.split('\n');
-    if (!items.find(item => item.trim()?.toLowerCase() === database?.toLowerCase())) {
-      return false;
-    }
-  }
-  if (permissionRow.database_names_regex) {
-    const regex = new RegExp(permissionRow.database_names_regex, 'i');
-    if (!regex.test(database)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function matchTablePermissionRow(objectTypeField, schemaName, pureName, permissionRow) {
-  if (permissionRow.table_names_list) {
-    const items = permissionRow.table_names_list.split('\n');
-    if (!items.find(item => item.trim()?.toLowerCase() === pureName?.toLowerCase())) {
-      return false;
-    }
-  }
-  if (permissionRow.table_names_regex) {
-    const regex = new RegExp(permissionRow.table_names_regex, 'i');
-    if (!regex.test(pureName)) {
-      return false;
-    }
-  }
-  if (permissionRow.schema_names_list) {
-    const items = permissionRow.schema_names_list.split('\n');
-    if (!items.find(item => item.trim()?.toLowerCase() === schemaName?.toLowerCase())) {
-      return false;
-    }
-  }
-  if (permissionRow.schema_names_regex) {
-    const regex = new RegExp(permissionRow.schema_names_regex, 'i');
-    if (!regex.test(schemaName)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-function matchFilePermissionRow(folder, file, permissionRow) {
-  if (permissionRow.folder_name) {
-    if (folder != permissionRow.folder_name) {
-      return false;
-    }
-  }
-  if (permissionRow.file_names_list) {
-    const items = permissionRow.file_names_list.split('\n');
-    if (!items.find(item => item.trim()?.toLowerCase() === file?.toLowerCase())) {
-      return false;
-    }
-  }
-  if (permissionRow.file_names_regex) {
-    const regex = new RegExp(permissionRow.file_names_regex, 'i');
-    if (!regex.test(file)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-const DATABASE_ROLE_ID_NAMES = {
-  '-1': 'view',
-  '-2': 'read_content',
-  '-3': 'write_data',
-  '-4': 'run_script',
-  '-5': 'deny',
-};
-
-const FILE_ROLE_ID_NAMES = {
-  '-1': 'allow',
-  '-2': 'deny',
-};
-
-function getDatabaseRoleLevelIndex(roleName) {
-  if (!roleName) {
-    return 6;
-  }
-  if (roleName == 'run_script') {
-    return 5;
-  }
-  if (roleName == 'write_data') {
-    return 4;
-  }
-  if (roleName == 'read_content') {
-    return 3;
-  }
-  if (roleName == 'view') {
-    return 2;
-  }
-  if (roleName == 'deny') {
-    return 1;
-  }
-  return 6;
-}
-
-function getTablePermissionRoleLevelIndex(roleName) {
-  if (!roleName) {
-    return 6;
-  }
-  if (roleName == 'run_script') {
-    return 5;
-  }
-  if (roleName == 'create_update_delete') {
-    return 4;
-  }
-  if (roleName == 'update_only') {
-    return 3;
-  }
-  if (roleName == 'read') {
-    return 2;
-  }
-  if (roleName == 'deny') {
-    return 1;
-  }
-  return 6;
-}
-
-function getDatabasePermissionRole(conid, database, loadedDatabasePermissions) {
-  let res = 'deny';
-  for (const permissionRow of loadedDatabasePermissions) {
-    if (!matchDatabasePermissionRow(conid, database, permissionRow)) {
-      continue;
-    }
-    res = DATABASE_ROLE_ID_NAMES[permissionRow.database_permission_role_id];
-  }
-  return res;
-}
-
-function getFilePermissionRole(folder, file, loadedFilePermissions) {
-  let res = 'deny';
-  for (const permissionRow of loadedFilePermissions) {
-    if (!matchFilePermissionRow(folder, file, permissionRow)) {
-      continue;
-    }
-    res = FILE_ROLE_ID_NAMES[permissionRow.file_permission_role_id];
-  }
-  return res;
-}
-
-const TABLE_ROLE_ID_NAMES = {
-  '-1': 'read',
-  '-2': 'update_only',
-  '-3': 'create_update_delete',
-  '-4': 'run_script',
-  '-5': 'deny',
-};
-
-const TABLE_SCOPE_ID_NAMES = {
-  '-1': 'all_objects',
-  '-2': 'tables',
-  '-3': 'views',
-  '-4': 'tables_views_collections',
-  '-5': 'procedures',
-  '-6': 'functions',
-  '-7': 'triggers',
-  '-8': 'sql_objects',
-  '-9': 'collections',
-};
-
-function getTablePermissionRole(
-  conid,
-  database,
-  objectTypeField,
-  schemaName,
-  pureName,
-  loadedTablePermissions,
-  databasePermissionRole
-) {
-  let res =
-    databasePermissionRole == 'read_content'
-      ? 'read'
-      : databasePermissionRole == 'write_data'
-      ? 'create_update_delete'
-      : databasePermissionRole == 'run_script'
-      ? 'run_script'
-      : 'deny';
-  for (const permissionRow of loadedTablePermissions) {
-    if (!matchDatabasePermissionRow(conid, database, permissionRow)) {
-      continue;
-    }
-    if (!matchTablePermissionRow(objectTypeField, schemaName, pureName, permissionRow)) {
-      continue;
-    }
-    const scope = TABLE_SCOPE_ID_NAMES[permissionRow.table_permission_scope_id];
-    switch (scope) {
-      case 'tables':
-        if (objectTypeField != 'tables') continue;
-        break;
-      case 'views':
-        if (objectTypeField != 'views') continue;
-        break;
-      case 'tables_views_collections':
-        if (objectTypeField != 'tables' && objectTypeField != 'views' && objectTypeField != 'collections') continue;
-        break;
-      case 'procedures':
-        if (objectTypeField != 'procedures') continue;
-        break;
-      case 'functions':
-        if (objectTypeField != 'functions') continue;
-        break;
-      case 'triggers':
-        if (objectTypeField != 'triggers') continue;
-        break;
-      case 'sql_objects':
-        if (objectTypeField != 'procedures' && objectTypeField != 'functions' && objectTypeField != 'triggers')
-          continue;
-        break;
-      case 'collections':
-        if (objectTypeField != 'collections') continue;
-        break;
-    }
-    res = TABLE_ROLE_ID_NAMES[permissionRow.table_permission_role_id];
-  }
-  return res;
-}
-
-async function testStandardPermission(permission, req, loadedPermissions) {
-  if (!loadedPermissions) {
-    loadedPermissions = await loadPermissionsFromRequest(req);
-  }
-  if (!hasPermission(permission, loadedPermissions)) {
-    throw new Error(`DBGM-00265 Permission ${permission} not granted`);
-  }
-}
-
-async function testDatabaseRolePermission(conid, database, requiredRole, req) {
-  if (!process.env.STORAGE_DATABASE) {
-    return;
-  }
-  const loadedPermissions = await loadPermissionsFromRequest(req);
-  if (hasPermission(`all-databases`, loadedPermissions)) {
-    return;
-  }
-  const databasePermissions = await loadDatabasePermissionsFromRequest(req);
-  const role = getDatabasePermissionRole(conid, database, databasePermissions);
-  const requiredIndex = getDatabaseRoleLevelIndex(requiredRole);
-  const roleIndex = getDatabaseRoleLevelIndex(role);
-  if (roleIndex < requiredIndex) {
-    throw new Error(`DBGM-00266 Permission ${requiredRole} not granted`);
+function testConnectionPermission(connection, req) {
+  if (!connectionHasPermission(connection, req)) {
+    throw new Error('Connection permission not granted');
  }
 }

@@ -352,14 +98,4 @@ module.exports = {
  hasPermission,
  connectionHasPermission,
  testConnectionPermission,
-  loadPermissionsFromRequest,
-  loadDatabasePermissionsFromRequest,
-  loadTablePermissionsFromRequest,
-  loadFilePermissionsFromRequest,
-  getDatabasePermissionRole,
-  getTablePermissionRole,
-  getFilePermissionRole,
-  testStandardPermission,
-  testDatabaseRolePermission,
-  getTablePermissionRoleLevelIndex,
 };
@@ -3,10 +3,6 @@
  "name": "dbgate-datalib",
  "main": "lib/index.js",
  "typings": "lib/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dbgate/dbgate.git"
-  },
  "scripts": {
    "build": "tsc",
    "test": "jest",
@@ -31,8 +31,6 @@ export interface GridConfig extends GridConfigColumns {
  formFilterColumns: string[];
  multiColumnFilter?: string;
  searchInColumns?: string;
-  disabledFilterColumns: string[];
-  disabledMultiColumnFilter?: boolean;
 }

 export interface GridCache {
@@ -50,7 +48,6 @@ export function createGridConfig(): GridConfig {
    focusedColumns: null,
    grouping: {},
    formFilterColumns: [],
-    disabledFilterColumns: [],
  };
 }

@@ -13,7 +13,7 @@ import type {
  FilterBehaviour,
 } from 'dbgate-types';
 import { parseFilter } from 'dbgate-filterparser';
-import { filterName, shortenIdentifier } from 'dbgate-tools';
+import { filterName } from 'dbgate-tools';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
 import { Expression, Select, treeToSql, dumpSqlSelect, Condition, CompoudCondition } from 'dbgate-sqltree';
 import { isTypeLogical, standardFilterBehaviours, detectSqlFilterBehaviour, stringFilterBehaviour } from 'dbgate-tools';
@@ -24,7 +24,6 @@ export interface DisplayColumn {
  columnName: string;
  headerText: string;
  uniqueName: string;
-  uniqueNameShorten?: string;
  uniquePath: string[];
  notNull?: boolean;
  autoIncrement?: boolean;
@@ -233,7 +232,6 @@ export abstract class GridDisplay {
      if (!filter) continue;
      const column = displayedColumnInfo[uniqueName];
      if (!column) continue;
-      if (this.isFilterDisabled(uniqueName)) continue;
      try {
        const condition = parseFilter(
          filter,
@@ -260,7 +258,7 @@ export abstract class GridDisplay {
      }
    }

-    if (this.baseTableOrView && this.config.multiColumnFilter && !this.isMultiColumnFilterDisabled()) {
+    if (this.baseTableOrView && this.config.multiColumnFilter) {
      const orCondition: CompoudCondition = {
        conditionType: 'or',
        conditions: [],
@@ -417,7 +415,6 @@ export abstract class GridDisplay {
        [uniqueName]: value,
      },
      formViewRecordNumber: 0,
-      disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName),
    }));
    this.reload();
  }
@@ -427,7 +424,6 @@ export abstract class GridDisplay {
      ...cfg,
      multiColumnFilter: value,
      formViewRecordNumber: 0,
-      disabledMultiColumnFilter: false,
    }));
    this.reload();
  }
@@ -451,7 +447,6 @@ export abstract class GridDisplay {
      ...cfg,
      filters: _.omit(cfg.filters, [uniqueName]),
      formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName),
-      disabledFilterColumns: (cfg.disabledFilterColumns).filter(x => x != uniqueName),
    }));
    this.reload();
  }
@@ -467,37 +462,6 @@ export abstract class GridDisplay {
    this.reload();
  }

-  toggleFilterEnabled(uniqueName) {
-    if (this.isFilterDisabled(uniqueName)) {
-      this.setConfig(cfg => ({
-        ...cfg,
-        disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName),
-      }));
-    } else {
-      this.setConfig(cfg => ({
-        ...cfg,
-        disabledFilterColumns: [...cfg.disabledFilterColumns, uniqueName],
-      }));
-    }
-    this.reload();
-  }
-
-  isFilterDisabled(uniqueName: string) {
-    return this.config.disabledFilterColumns.includes(uniqueName);
-  }
-
-  toggleMultiColumnFilterEnabled() {
-    this.setConfig(cfg => ({
-      ...cfg,
-      disabledMultiColumnFilter: !cfg.disabledMultiColumnFilter,
-    }));
-    this.reload();
-  }
-
-  isMultiColumnFilterDisabled() {
-    return this.config.disabledMultiColumnFilter;
-  }
-
  setSort(uniqueName, order) {
    this.setConfig(cfg => ({
      ...cfg,
@@ -642,9 +606,7 @@ export abstract class GridDisplay {
    }
    return {
      exprType: 'column',
-      ...(!this.dialect.omitTableAliases && {
-        alias: alias ?? col.columnName,
-      }),
+      ...(!this.dialect.omitTableAliases && { alias: alias || col.columnName }),
      source,
      ...col,
    };
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { filterName, isTableColumnUnique, shortenIdentifier } from 'dbgate-tools';
+import { filterName, isTableColumnUnique } from 'dbgate-tools';
 import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay';
 import type {
  TableInfo,
@@ -39,8 +39,7 @@ export class TableGridDisplay extends GridDisplay {
    public getDictionaryDescription: DictionaryDescriptionFunc = null,
    isReadOnly = false,
    public isRawMode = false,
-    public currentSettings = null,
-    public areReferencesAllowed = true
+    public currentSettings = null
  ) {
    super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion, currentSettings);

@@ -94,7 +93,7 @@ export class TableGridDisplay extends GridDisplay {
    );
  }

-  getDisplayColumns(table: TableInfo, parentPath: string[]): DisplayColumn[] {
+  getDisplayColumns(table: TableInfo, parentPath: string[]) {
    return (
      table?.columns
        ?.map(col => this.getDisplayColumn(table, col, parentPath))
@@ -102,12 +101,11 @@ export class TableGridDisplay extends GridDisplay {
          ...col,
          isChecked: this.isColumnChecked(col),
          hintColumnNames:
-            this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)?.columns?.map(columnName =>
-              shortenIdentifier(`hint_${col.uniqueName}_${columnName}`, this.driver?.dialect?.maxIdentifierLength)
+            this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)?.columns?.map(
+              columnName => `hint_${col.uniqueName}_${columnName}`
            ) || null,
          hintColumnDelimiter: this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)
            ?.delimiter,
-          uniqueNameShorten: shortenIdentifier(col.uniqueName, this.driver?.dialect?.maxIdentifierLength),
          isExpandable: !!col.foreignKey,
        })) || []
    );
@@ -118,7 +116,7 @@ export class TableGridDisplay extends GridDisplay {
      if (this.isExpandedColumn(column.uniqueName)) {
        const table = this.getFkTarget(column);
        if (table) {
-          const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength);
+          const childAlias = `${column.uniqueName}_ref`;
          const subcolumns = this.getDisplayColumns(table, column.uniquePath);

          this.addReferenceToSelect(select, parentAlias, column);
@@ -131,7 +129,7 @@ export class TableGridDisplay extends GridDisplay {
  }

  addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn) {
-    const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength);
+    const childAlias = `${column.uniqueName}_ref`;
    if ((select.from.relations || []).find(x => x.alias == childAlias)) return;
    const table = this.getFkTarget(column);
    if (table && table.primaryKey) {
@@ -193,24 +191,15 @@ export class TableGridDisplay extends GridDisplay {
          const hintDescription = this.getDictionaryDescription(table);
          if (hintDescription) {
            const parentUniqueName = column.uniquePath.slice(0, -1).join('.');
-            this.addReferenceToSelect(
-              select,
-              parentUniqueName
-                ? shortenIdentifier(`${parentUniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength)
-                : 'basetbl',
-              column
-            );
-            const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength);
+            this.addReferenceToSelect(select, parentUniqueName ? `${parentUniqueName}_ref` : 'basetbl', column);
+            const childAlias = `${column.uniqueName}_ref`;
            select.columns.push(
              ...hintDescription.columns.map(
                columnName =>
                  ({
                    exprType: 'column',
                    columnName,
-                    alias: shortenIdentifier(
-                      `hint_${column.uniqueName}_${columnName}`,
-                      this.driver?.dialect?.maxIdentifierLength
-                    ),
+                    alias: `hint_${column.uniqueName}_${columnName}`,
                    source: { alias: childAlias },
                  } as ColumnRefExpression)
              )
@@ -241,7 +230,7 @@ export class TableGridDisplay extends GridDisplay {
  }

  getFkTarget(column: DisplayColumn) {
-    const { foreignKey, isForeignKeyUnique } = column;
+    const { uniqueName, foreignKey, isForeignKeyUnique } = column;
    if (!isForeignKeyUnique) return null;
    const pureName = foreignKey.refTableName;
    const schemaName = foreignKey.refSchemaName;
@@ -249,7 +238,6 @@ export class TableGridDisplay extends GridDisplay {
  }

  processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options) {
-    if (!this.areReferencesAllowed) return;
    this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo);
    if (!options.isExport && this.displayOptions.showHintColumns) {
      this.addHintsToSelect(select);
@@ -310,12 +298,7 @@ export class TableGridDisplay extends GridDisplay {
    for (const column of columns) {
      if (this.addAllExpandedColumnsToSelected || this.config.addedColumns.includes(column.uniqueName)) {
        select.columns.push(
-          this.createColumnExpression(
-            column,
-            { name: column, alias: parentAlias },
-            column.uniqueNameShorten ?? column.uniqueName,
-            'view'
-          )
+          this.createColumnExpression(column, { name: column, alias: parentAlias }, column.uniqueName, 'view')
        );
        displayedColumnInfo[column.uniqueName] = {
          ...column,
@@ -4,7 +4,6 @@ export type ChartXTransformFunction =
  | 'date:minute'
  | 'date:hour'
  | 'date:day'
-  | 'date:week'
  | 'date:month'
  | 'date:year';
 export type ChartYAggregateFunction = 'sum' | 'first' | 'last' | 'min' | 'max' | 'count' | 'avg';
@@ -71,7 +70,6 @@ export interface ChartDateParsed {
  minute?: number;
  second?: number;
  fraction?: string;
-  week?: number;
 }

 export interface ChartAvailableColumn {
@@ -9,7 +9,7 @@ import {
  ChartYFieldDefinition,
  ProcessedChart,
 } from './chartDefinitions';
-import { addMinutes, addHours, addDays, addMonths, addWeeks, addYears, getWeek } from 'date-fns';
+import { addMinutes, addHours, addDays, addMonths, addYears } from 'date-fns';

 export function getChartDebugPrint(chart: ProcessedChart) {
  let res = '';
@@ -29,7 +29,6 @@ export function tryParseChartDate(dateInput: any): ChartDateParsed | null {
    return {
      year: dateInput.getFullYear(),
      month: dateInput.getMonth() + 1,
-      week: getWeek(dateInput),
      day: dateInput.getDate(),
      hour: dateInput.getHours(),
      minute: dateInput.getMinutes(),
@@ -43,21 +42,15 @@ export function tryParseChartDate(dateInput: any): ChartDateParsed | null {
    /^(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(Z|[+-]\d{2}:\d{2})?)?$/
  );
  const monthMatch = dateInput.match(/^(\d{4})-(\d{2})$/);
-  const weekMatch = dateInput.match(/^(\d{4})\@(\d{2})$/);
  // const yearMatch = dateInput.match(/^(\d{4})$/);

  if (dateMatch) {
-    const [_notUsed, yearStr, monthStr, dayStr, hour, minute, second, fraction] = dateMatch;
-
-    const year = parseInt(yearStr, 10);
-    const month = parseInt(monthStr, 10);
-    const day = parseInt(dayStr, 10);
+    const [_notUsed, year, month, day, hour, minute, second, fraction] = dateMatch;

    return {
-      year,
-      month,
-      week: getWeek(new Date(year, month - 1, day)),
-      day,
+      year: parseInt(year, 10),
+      month: parseInt(month, 10),
+      day: parseInt(day, 10),
      hour: parseInt(hour, 10) || 0,
      minute: parseInt(minute, 10) || 0,
      second: parseInt(second, 10) || 0,
@@ -78,19 +71,6 @@ export function tryParseChartDate(dateInput: any): ChartDateParsed | null {
    };
  }

-  if (weekMatch) {
-    const [_notUsed, year, week] = weekMatch;
-    return {
-      year: parseInt(year, 10),
-      week: parseInt(week, 10),
-      day: 1,
-      hour: 0,
-      minute: 0,
-      second: 0,
-      fraction: undefined,
-    };
-  }
-
  // if (yearMatch) {
  //   const [_notUsed, year] = yearMatch;
  //   return {
@@ -117,8 +97,6 @@ export function stringifyChartDate(value: ChartDateParsed, transform: ChartXTran
      return `${value.year}`;
    case 'date:month':
      return `${value.year}-${pad2Digits(value.month)}`;
-    case 'date:week':
-      return `${value.year}@${pad2Digits(getWeek(new Date(value.year, (value.month ?? 1) - 1, value.day ?? 1)))}`;
    case 'date:day':
      return `${value.year}-${pad2Digits(value.month)}-${pad2Digits(value.day)}`;
    case 'date:hour':
@@ -148,9 +126,6 @@ export function incrementChartDate(value: ChartDateParsed, transform: ChartXTran
    case 'date:month':
      newDateRepresentation = addMonths(dateRepresentation, 1);
      break;
-    case 'date:week':
-      newDateRepresentation = addWeeks(dateRepresentation, 1);
-      break;
    case 'date:day':
      newDateRepresentation = addDays(dateRepresentation, 1);
      break;
@@ -169,11 +144,6 @@ export function incrementChartDate(value: ChartDateParsed, transform: ChartXTran
        year: newDateRepresentation.getFullYear(),
        month: newDateRepresentation.getMonth() + 1,
      };
-    case 'date:week':
-      return {
-        year: newDateRepresentation.getFullYear(),
-        week: getWeek(newDateRepresentation),
-      };
    case 'date:day':
      return {
        year: newDateRepresentation.getFullYear(),
@@ -205,8 +175,6 @@ export function runTransformFunction(value: string, transformFunction: ChartXTra
      return dateParsed ? `${dateParsed.year}` : null;
    case 'date:month':
      return dateParsed ? `${dateParsed.year}-${pad2Digits(dateParsed.month)}` : null;
-    case 'date:week':
-      return dateParsed ? `${dateParsed.year}@${pad2Digits(dateParsed.week)}` : null;
    case 'date:day':
      return dateParsed ? `${dateParsed.year}-${pad2Digits(dateParsed.month)}-${pad2Digits(dateParsed.day)}` : null;
    case 'date:hour':
@@ -243,14 +211,6 @@ export function computeChartBucketKey(
          month: dateParsed.month,
        },
      ];
-    case 'date:week':
-      return [
-        dateParsed ? `${dateParsed.year}@${pad2Digits(dateParsed.week)}` : null,
-        {
-          year: dateParsed.year,
-          week: dateParsed.week,
-        },
-      ];
    case 'date:day':
      return [
        dateParsed ? `${dateParsed.year}-${pad2Digits(dateParsed.month)}-${pad2Digits(dateParsed.day)}` : null,
@@ -305,8 +265,6 @@ export function computeDateBucketDistance(
      return end.year - begin.year;
    case 'date:month':
      return (end.year - begin.year) * 12 + (end.month - begin.month);
-    case 'date:week':
-      return (end.year - begin.year) * 52 + (end.week - begin.week);
    case 'date:day':
      return (
        (end.year - begin.year) * 365 +
@@ -344,8 +302,6 @@ export function compareChartDatesParsed(
      return a.year - b.year;
    case 'date:month':
      return a.year === b.year ? a.month - b.month : a.year - b.year;
-    case 'date:week':
-      return a.year === b.year ? a.week - b.week : a.year - b.year;
    case 'date:day':
      return a.year === b.year && a.month === b.month
        ? a.day - b.day
@@ -400,8 +356,6 @@ function getParentDateBucketKey(
      return null; // no parent for year
    case 'date:month':
      return bucketKey.slice(0, 4);
-    case 'date:week':
-      return bucketKey.slice(0, 4);
    case 'date:day':
      return bucketKey.slice(0, 7);
    case 'date:hour':
@@ -417,8 +371,6 @@ function getParentDateBucketTransform(transform: ChartXTransformFunction): Chart
      return null; // no parent for year
    case 'date:month':
      return 'date:year';
-    case 'date:week':
-      return 'date:year';
    case 'date:day':
      return 'date:month';
    case 'date:hour':
@@ -436,8 +388,6 @@ function getParentKeyParsed(date: ChartDateParsed, transform: ChartXTransformFun
      return null; // no parent for year
    case 'date:month':
      return { year: date.year };
-    case 'date:week':
-      return { year: date.week };
    case 'date:day':
      return { year: date.year, month: date.month };
    case 'date:hour':
@@ -3,10 +3,6 @@
  "name": "dbgate-filterparser",
  "main": "lib/index.js",
  "typings": "lib/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dbgate/dbgate.git"
-  },
  "scripts": {
    "build": "tsc",
    "start": "tsc --watch",
@@ -1,4 +1,4 @@
-import { arrayToHexString, base64ToHex, evalFilterBehaviour, isTypeDateTime } from 'dbgate-tools';
+import { arrayToHexString, evalFilterBehaviour, isTypeDateTime } from 'dbgate-tools';
 import { format, toDate } from 'date-fns';
 import _isString from 'lodash/isString';
 import _cloneDeepWith from 'lodash/cloneDeepWith';
@@ -24,9 +24,7 @@ export function getFilterValueExpression(value, dataType?) {
  if (value.type == 'Buffer' && Array.isArray(value.data)) {
    return '0x' + arrayToHexString(value.data);
  }
-  if (value?.$binary?.base64) {
-    return base64ToHex(value.$binary.base64);
-  }
+
  return `="${value}"`;
 }

@@ -2,7 +2,7 @@ import P from 'parsimmon';
 import moment from 'moment';
 import { Condition } from 'dbgate-sqltree';
 import { interpretEscapes, token, word, whitespace } from './common';
-import { hexToBase64, parseNumberSafe } from 'dbgate-tools';
+import { hexStringToArray, parseNumberSafe } from 'dbgate-tools';
 import { FilterBehaviour, TransformType } from 'dbgate-types';

 const binaryCondition =
@@ -385,7 +385,10 @@ const createParser = (filterBehaviour: FilterBehaviour) => {

    hexstring: () =>
      token(P.regexp(/0x(([0-9a-fA-F][0-9a-fA-F])+)/, 1))
-        .map(x => ({ $binary: { base64: hexToBase64(x) } }))
+        .map(x => ({
+          type: 'Buffer',
+          data: hexStringToArray(x),
+        }))
        .desc('hex string'),

    noQuotedString: () => P.regexp(/[^\s^,^'^"]+/).desc('string unquoted'),
@@ -32,8 +32,7 @@
    "typescript": "^4.4.3"
  },
  "dependencies": {
-    "blueimp-md5": "^2.19.0",
-    "dbgate-query-splitter": "^4.11.9",
+    "dbgate-query-splitter": "^4.11.5",
    "dbgate-sqltree": "^6.0.0-alpha.1",
    "debug": "^4.3.4",
    "json-stable-stringify": "^1.0.1",
@@ -49,8 +49,6 @@ export class DatabaseAnalyser<TClient = any> {
  singleObjectId: string = null;
  dialect: SqlDialect;
  logger: Logger;
-  startedTm = Date.now();
-  analyseIdentifier = Math.random().toString().substring(2);

  constructor(public dbhan: DatabaseHandle<TClient>, public driver: EngineDriver, version) {
    this.dialect = (driver?.dialectByVersion && driver?.dialectByVersion(version)) || driver?.dialect;
@@ -80,24 +78,14 @@ export class DatabaseAnalyser<TClient = any> {
  }

  getLogDbInfo() {
-    return {
-      ...this.driver.getLogDbInfo(this.dbhan),
-      analyserTime: Date.now() - this.startedTm,
-      analyseIdentifier: this.analyseIdentifier,
-    };
+    return this.driver.getLogDbInfo(this.dbhan);
  }

  async fullAnalysis() {
    logger.debug(this.getLogDbInfo(), 'DBGM-00126 Performing full analysis');
-    try {
-      const res = this.addEngineField(await this._runAnalysis());
-      logger.debug(this.getLogDbInfo(), 'DBGM-00271 Full analysis finished successfully');
-      return res;
-    } catch (err) {
-      logger.error(extractErrorLogData(err, this.getLogDbInfo()), 'DBGM-00272 Error during full analysis');
-      throw err;
-    }
+    const res = this.addEngineField(await this._runAnalysis());
    // console.log('FULL ANALYSIS', res);
+    return res;
  }

  async singleObjectAnalysis(name, typeField) {
@@ -118,40 +106,31 @@ export class DatabaseAnalyser<TClient = any> {
    logger.info(this.getLogDbInfo(), 'DBGM-00127 Performing incremental analysis');
    this.structure = structure;

-    try {
-      const modifications = await this.getModifications();
-      if (modifications == null) {
-        // modifications not implemented, perform full analysis
-        this.structure = null;
-        return this.addEngineField(await this._runAnalysis());
-      }
-      const structureModifications = modifications.filter(x => x.action != 'setTableRowCounts');
-      const setTableRowCounts = modifications.find(x => x.action == 'setTableRowCounts');
-
-      let structureWithRowCounts = null;
-      if (setTableRowCounts) {
-        const newStructure = mergeTableRowCounts(structure, setTableRowCounts.rowCounts);
-        if (areDifferentRowCounts(structure, newStructure)) {
-          structureWithRowCounts = newStructure;
-        }
-      }
-
-      if (structureModifications.length == 0) {
-        logger.debug(this.getLogDbInfo(), 'DBGM-00267 No changes in database structure detected');
-        return structureWithRowCounts ? this.addEngineField(structureWithRowCounts) : null;
-      }
-
-      this.modifications = structureModifications;
-      if (structureWithRowCounts) this.structure = structureWithRowCounts;
-      logger.info(
-        { ...this.getLogDbInfo(), modifications: this.modifications },
-        'DBGM-00128 DB modifications detected'
-      );
-      return this.addEngineField(this.mergeAnalyseResult(await this._runAnalysis()));
-    } catch (err) {
-      logger.error(extractErrorLogData(err, this.getLogDbInfo()), 'DBGM-00273 Error during incremental analysis');
-      throw err;
+    const modifications = await this.getModifications();
+    if (modifications == null) {
+      // modifications not implemented, perform full analysis
+      this.structure = null;
+      return this.addEngineField(await this._runAnalysis());
    }
+    const structureModifications = modifications.filter(x => x.action != 'setTableRowCounts');
+    const setTableRowCounts = modifications.find(x => x.action == 'setTableRowCounts');
+
+    let structureWithRowCounts = null;
+    if (setTableRowCounts) {
+      const newStructure = mergeTableRowCounts(structure, setTableRowCounts.rowCounts);
+      if (areDifferentRowCounts(structure, newStructure)) {
+        structureWithRowCounts = newStructure;
+      }
+    }
+
+    if (structureModifications.length == 0) {
+      return structureWithRowCounts ? this.addEngineField(structureWithRowCounts) : null;
+    }
+
+    this.modifications = structureModifications;
+    if (structureWithRowCounts) this.structure = structureWithRowCounts;
+    logger.info({ ...this.getLogDbInfo(), modifications: this.modifications }, 'DBGM-00128 DB modifications detected');
+    return this.addEngineField(this.mergeAnalyseResult(await this._runAnalysis()));
  }

  mergeAnalyseResult(newlyAnalysed) {
@@ -78,14 +78,6 @@ export class SqlDumper implements AlterProcessor {
    else if (_isNumber(value)) this.putRaw(value.toString());
    else if (_isDate(value)) this.putStringValue(new Date(value).toISOString());
    else if (value?.type == 'Buffer' && _isArray(value?.data)) this.putByteArrayValue(value?.data);
-    else if (value?.$binary?.base64) {
-      const binary = atob(value.$binary.base64);
-      const bytes = new Array(binary.length);
-      for (let i = 0; i < binary.length; i++) {
-        bytes[i] = binary.charCodeAt(i);
-      }
-      this.putByteArrayValue(bytes);
-    }
    else if (value?.$bigint) this.putRaw(value?.$bigint);
    else if (_isPlainObject(value) || _isArray(value)) this.putStringValue(JSON.stringify(value));
    else this.put('^null');
@@ -292,16 +292,6 @@ export class AlterPlan {
    }
  }

-  _hasOnlyCommentChange(op: AlterOperation): boolean {
-    if (op.operationType === 'changeColumn') {
-      return _.isEqual(
-        _.omit(op.oldObject, ['columnComment', 'ordinal']),
-        _.omit(op.newObject, ['columnComment', 'ordinal'])
-      );
-    }
-    return false;
-  }
-
  _getDependendColumnConstraints(column: ColumnInfo, dependencyDefinition) {
    const table = this.wholeOldDb.tables.find(x => x.pureName == column.pureName && x.schemaName == column.schemaName);
    if (!table) return [];
@@ -347,42 +337,31 @@ export class AlterPlan {
      ]) {
        if (op.operationType == testedOperationType) {
          const constraints = this._getDependendColumnConstraints(testedObject as ColumnInfo, testedDependencies);
-          const ignoreContraints = this.dialect.safeCommentChanges && this._hasOnlyCommentChange(op);

          // if (constraints.length > 0 && this.opts.noDropConstraint) {
          //   return [];
          // }

-          const res: AlterOperation[] = [];
+          const res: AlterOperation[] = [
+            ...constraints.map(oldObject => {
+              const opRes: AlterOperation = {
+                operationType: 'dropConstraint',
+                oldObject,
+                isRecreate: true,
+              };
+              return opRes;
+            }),
+            op,
+            ..._.reverse([...constraints]).map(newObject => {
+              const opRes: AlterOperation = {
+                operationType: 'createConstraint',
+                newObject,
+              };
+              return opRes;
+            }),
+          ];

-          if (!ignoreContraints) {
-            res.push(
-              ...constraints.map(oldObject => {
-                const opRes: AlterOperation = {
-                  operationType: 'dropConstraint',
-                  oldObject,
-                  isRecreate: true,
-                };
-                return opRes;
-              })
-            );
-          }
-
-          res.push(op);
-
-          if (!ignoreContraints) {
-            res.push(
-              ..._.reverse([...constraints]).map(newObject => {
-                const opRes: AlterOperation = {
-                  operationType: 'createConstraint',
-                  newObject,
-                };
-                return opRes;
-              })
-            );
-          }
-
-          if (!ignoreContraints && constraints.length > 0) {
+          if (constraints.length > 0) {
            this.recreates.constraints += 1;
          }
          return res;
@@ -60,4 +60,4 @@ export function chooseTopTables(tables: TableInfo[], count: number, tableFilter:

 export const DIAGRAM_ZOOMS = [0.1, 0.15, 0.2, 0.3, 0.4, 0.5, 0.6, 0.8, 1, 1.25, 1.5, 1.75, 2];

-export const DIAGRAM_DEFAULT_WATERMARK = 'Powered by [dbgate.io](https://www.dbgate.io)';
+export const DIAGRAM_DEFAULT_WATERMARK = 'Powered by [dbgate.io](https://dbgate.io)';
@@ -59,7 +59,6 @@ export interface DbDiffOptions {

  ignoreForeignKeyActions?: boolean;
  ignoreDataTypes?: boolean;
-  ignoreComments?: boolean;
 }

 export function generateTablePairingId(table: TableInfo): TableInfo {
@@ -323,14 +322,11 @@ export function testEqualColumns(
    );
    return false;
  }
-
-  if (!opts.ignoreComments) {
-    if ((a.columnComment || '') != (b.columnComment || '')) {
-      console.debug(
-        `Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different comment: ${a.columnComment}, ${b.columnComment}`
-      );
-      return false;
-    }
+  if ((a.columnComment || '') != (b.columnComment || '')) {
+    console.debug(
+      `Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different comment: ${a.columnComment}, ${b.columnComment}`
+    );
+    return false;
  }

  if (!testEqualTypes(a, b, opts)) {
@@ -47,7 +47,6 @@ export const mongoFilterBehaviour: FilterBehaviour = {
  allowStringToken: true,
  allowNumberDualTesting: true,
  allowObjectIdTesting: true,
-  allowHexString: true,
 };

 export const evalFilterBehaviour: FilterBehaviour = {
@@ -1,5 +1,4 @@
 import _cloneDeep from 'lodash/cloneDeep';
-import _uniq from 'lodash/uniq';
 import _isString from 'lodash/isString';
 import type {
  ColumnInfo,
@@ -76,27 +75,9 @@ export function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo | s
  return (table.foreignKeys || []).find(fk => fk.columns.find(col => col.columnName == column.columnName));
 }

-export function getConflictingColumnNames(columns: ColumnInfo[]): Set<string> {
-  const conflictingNames = new Set(
-    _uniq(columns.map(x => x.columnName).filter((item, index, arr) => arr.indexOf(item) !== index))
-  );
-  return conflictingNames;
-}
-
 export function makeUniqueColumnNames(res: ColumnInfo[]) {
  const usedNames = new Set();
-  const conflictingNames = getConflictingColumnNames(res);
  for (let i = 0; i < res.length; i++) {
-    if (
-      conflictingNames.has(res[i].columnName) &&
-      res[i].pureName &&
-      !usedNames.has(`${res[i].pureName}_${res[i].columnName}`)
-    ) {
-      res[i].columnName = `${res[i].pureName}_${res[i].columnName}`;
-      usedNames.add(res[i].columnName);
-      continue;
-    }
-
    if (usedNames.has(res[i].columnName)) {
      let suffix = 2;
      while (usedNames.has(`${res[i].columnName}${suffix}`)) suffix++;
@@ -130,20 +111,3 @@ export function fillConstraintNames(table: TableInfo, dialect: SqlDialect) {
  }
  return res;
 }
-
-export const DATA_FOLDER_NAMES = [
-  { name: 'sql', label: 'SQL scripts' },
-  { name: 'shell', label: 'Shell scripts' },
-  { name: 'markdown', label: 'Markdown files' },
-  { name: 'charts', label: 'Charts' },
-  { name: 'query', label: 'Query designs' },
-  { name: 'sqlite', label: 'SQLite files' },
-  { name: 'duckdb', label: 'DuckDB files' },
-  { name: 'diagrams', label: 'Diagrams' },
-  { name: 'perspectives', label: 'Perspectives' },
-  { name: 'impexp', label: 'Import/Export jobs' },
-  { name: 'modtrans', label: 'Model transforms' },
-  { name: 'datadeploy', label: 'Data deploy jobs' },
-  { name: 'dbcompare', label: 'Database compare jobs' },
-  { name: 'apps', label: 'Applications' },
-];
@@ -9,7 +9,6 @@ import _isEmpty from 'lodash/isEmpty';
 import _omitBy from 'lodash/omitBy';
 import { DataEditorTypesBehaviour } from 'dbgate-types';
 import isPlainObject from 'lodash/isPlainObject';
-import md5 from 'blueimp-md5';

 export const MAX_GRID_TEXT_LENGTH = 1000; // maximum length of text in grid cell, longer text is truncated

@@ -43,19 +42,6 @@ export function hexStringToArray(inputString) {
  return res;
 }

-export function base64ToHex(base64String) {
-  const binaryString = atob(base64String);
-  const hexString = Array.from(binaryString, c =>
-    c.charCodeAt(0).toString(16).padStart(2, '0')
-  ).join('');
-  return '0x' + hexString.toUpperCase();
-};
-
-export function hexToBase64(hexString) {
-  const binaryString = hexString.match(/.{1,2}/g).map(byte => String.fromCharCode(parseInt(byte, 16))).join('');
-  return btoa(binaryString);
-}
-
 export function parseCellValue(value, editorTypes?: DataEditorTypesBehaviour) {
  if (!_isString(value)) return value;

@@ -67,10 +53,9 @@ export function parseCellValue(value, editorTypes?: DataEditorTypesBehaviour) {
    const mHex = value.match(/^0x([0-9a-fA-F][0-9a-fA-F])+$/);
    if (mHex) {
      return {
-        $binary: {
-          base64: hexToBase64(value.substring(2))
-        }
-      }
+        type: 'Buffer',
+        data: hexStringToArray(value.substring(2)),
+      };
    }
  }

@@ -244,19 +229,11 @@ export function stringifyCellValue(
  if (value === true) return { value: 'true', gridStyle: 'valueCellStyle' };
  if (value === false) return { value: 'false', gridStyle: 'valueCellStyle' };

-  if (value?.$binary?.base64) {
-    return {
-      value: base64ToHex(value.$binary.base64),
-      gridStyle: 'valueCellStyle',
-    };
-  }
-
  if (editorTypes?.parseHexAsBuffer) {
-    // if (value?.type == 'Buffer' && _isArray(value.data)) {
-    //   return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
-    // }
+    if (value?.type == 'Buffer' && _isArray(value.data)) {
+      return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
+    }
  }
-  
  if (editorTypes?.parseObjectIdAsDollar) {
    if (value?.$oid) {
      switch (intent) {
@@ -409,9 +386,6 @@ export function safeJsonParse(json, defaultValue?, logError = false) {
  if (_isArray(json) || _isPlainObject(json)) {
    return json;
  }
-  if (!json) {
-    return defaultValue;
-  }
  try {
    return JSON.parse(json);
  } catch (err) {
@@ -504,9 +478,6 @@ export function getAsImageSrc(obj) {
  if (obj?.type == 'Buffer' && _isArray(obj?.data)) {
    return `data:image/png;base64, ${arrayBufferToBase64(obj?.data)}`;
  }
-  if (obj?.$binary?.base64) {
-    return `data:image/png;base64, ${obj.$binary.base64}`;
-  }

  if (_isString(obj) && (obj.startsWith('http://') || obj.startsWith('https://'))) {
    return obj;
@@ -763,12 +734,3 @@ export function setSqlFrontMatter(text: string, data: { [key: string]: any }, ya
  const frontMatterContent = `-- >>>\n${yamlContentMapped}\n-- <<<\n`;
  return frontMatterContent + (textClean || '');
 }
-
-export function shortenIdentifier(s: string, maxLength?: number) {
-  if (!maxLength || maxLength < 10) return s;
-  if (s.length <= maxLength) return s;
-  const hash = md5(s).substring(0, 8);
-  const partLength = Math.floor((maxLength - 9) / 2);
-  const restLength = maxLength - 10 - partLength;
-  return s.substring(0, partLength) + '_' + hash + '_' + s.substring(s.length - restLength);
-}
@@ -57,12 +57,6 @@ export function compilePermissions(permissions: string[] | string): CompiledPerm
  return res;
 }

-export function getPermissionsCacheKey(permissions: string[] | string) {
-  if (!permissions) return null;
-  if (_isString(permissions)) return permissions;
-  return permissions.join('|');
-}
-
 export function testPermission(tested: string, permissions: CompiledPermissions) {
  let allow = true;

@@ -109,25 +103,9 @@ export function getPredefinedPermissions(predefinedRoleName: string) {
    case 'superadmin':
      return ['*', '~widgets/*', 'widgets/admin', 'widgets/database', '~all-connections'];
    case 'logged-user':
-      return [
-        '*',
-        '~widgets/admin',
-        '~admin/*',
-        '~internal-storage',
-        '~all-connections',
-        '~run-shell-script',
-        '~all-team-files/*',
-      ];
+      return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections'];
    case 'anonymous-user':
-      return [
-        '*',
-        '~widgets/admin',
-        '~admin/*',
-        '~internal-storage',
-        '~all-connections',
-        '~run-shell-script',
-        '~all-team-files/*',
-      ];
+      return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections'];
    default:
      return null;
  }
@@ -1,12 +1,12 @@
-// interface ApplicationCommand {
-//   name: string;
-//   sql: string;
-// }
+interface ApplicationCommand {
+  name: string;
+  sql: string;
+}

-// interface ApplicationQuery {
-//   name: string;
-//   sql: string;
-// }
+interface ApplicationQuery {
+  name: string;
+  sql: string;
+}

 interface VirtualReferenceDefinition {
  pureName: string;
@@ -27,31 +27,11 @@ interface DictionaryDescriptionDefinition {
  delimiter: string;
 }

-interface ApplicationUsageRule {
-  conditionGroup?: string;
-  serverHostsRegex?: string;
-  serverHostsList?: string[];
-  databaseNamesRegex?: string;
-  databaseNamesList?: string[];
-  tableNamesRegex?: string;
-  tableNamesList?: string[];
-  columnNamesRegex?: string;
-  columnNamesList?: string[];
-}
-
 export interface ApplicationDefinition {
-  appid: string;
-  applicationName: string;
-  applicationIcon?: string;
-  applicationColor?: string;
-  usageRules?: ApplicationUsageRule[];
-  files?: {
-    [key: string]: {
-      label: string;
-      sql: string;
-      type: 'query' | 'command';
-    };
-  };
-  virtualReferences?: VirtualReferenceDefinition[];
-  dictionaryDescriptions?: DictionaryDescriptionDefinition[];
+  name: string;
+
+  queries: ApplicationQuery[];
+  commands: ApplicationCommand[];
+  virtualReferences: VirtualReferenceDefinition[];
+  dictionaryDescriptions: DictionaryDescriptionDefinition[];
 }
@@ -22,7 +22,7 @@ export interface ColumnsConstraintInfo extends ConstraintInfo {
  columns: ColumnReference[];
 }

-export interface PrimaryKeyInfo extends ColumnsConstraintInfo { }
+export interface PrimaryKeyInfo extends ColumnsConstraintInfo {}

 export interface ForeignKeyInfo extends ColumnsConstraintInfo {
  refSchemaName?: string;
@@ -39,7 +39,7 @@ export interface IndexInfo extends ColumnsConstraintInfo {
  filterDefinition?: string;
 }

-export interface UniqueInfo extends ColumnsConstraintInfo { }
+export interface UniqueInfo extends ColumnsConstraintInfo {}

 export interface CheckInfo extends ConstraintInfo {
  definition: string;
@@ -77,7 +77,6 @@ export interface DatabaseObjectInfo extends NamedObjectInfo {
  hashCode?: string;
  objectTypeField?: string;
  objectComment?: string;
-  tablePermissionRole?: 'read' | 'update_only' | 'create_update_delete' | 'deny';
 }

 export interface SqlObjectInfo extends DatabaseObjectInfo {
@@ -135,7 +134,7 @@ export interface CallableObjectInfo extends SqlObjectInfo {
  parameters?: ParameterInfo[];
 }

-export interface ProcedureInfo extends CallableObjectInfo { }
+export interface ProcedureInfo extends CallableObjectInfo {}

 export interface FunctionInfo extends CallableObjectInfo {
  returnType?: string;
@@ -146,17 +145,17 @@ export interface TriggerInfo extends SqlObjectInfo {
  functionName?: string;
  tableName?: string;
  triggerTiming?:
-  | 'BEFORE'
-  | 'AFTER'
-  | 'INSTEAD OF'
-  | 'BEFORE EACH ROW'
-  | 'INSTEAD OF'
-  | 'AFTER EACH ROW'
-  | 'AFTER STATEMENT'
-  | 'BEFORE STATEMENT'
-  | 'AFTER EVENT'
-  | 'BEFORE EVENT'
-  | null;
+    | 'BEFORE'
+    | 'AFTER'
+    | 'INSTEAD OF'
+    | 'BEFORE EACH ROW'
+    | 'INSTEAD OF'
+    | 'AFTER EACH ROW'
+    | 'AFTER STATEMENT'
+    | 'BEFORE STATEMENT'
+    | 'AFTER EVENT'
+    | 'BEFORE EVENT'
+    | null;
  triggerLevel?: 'ROW' | 'STATEMENT';
  eventType?: 'INSERT' | 'UPDATE' | 'DELETE' | 'TRUNCATE';
 }
@@ -22,7 +22,6 @@ export interface SqlDialect {
  requireStandaloneSelectForScopeIdentity?: boolean;
  allowMultipleValuesInsert?: boolean;
  useServerDatabaseFile?: boolean;
-  maxIdentifierLength?: number;

  dropColumnDependencies?: string[];
  changeColumnDependencies?: string[];
@@ -75,14 +74,6 @@ export interface SqlDialect {

  predefinedDataTypes: string[];

-  columnProperties?: {
-    columnName?: boolean;
-    isSparse?: true;
-    isPersisted?: true;
-  };
-
-  safeCommentChanges?: boolean;
-
  // create sql-tree expression
  createColumnViewExpression(
    columnName: string,
@@ -21,7 +21,6 @@ export interface StreamOptions {
  error?: (error) => void;
  done?: (result) => void;
  info?: (info) => void;
-  changedCurrentDatabase?: (database: string) => void;
 }

 export type CollectionOperationInfo =
@@ -100,46 +99,19 @@ export interface SupportedDbKeyType {
  showItemList?: boolean;
 }

-export type DatabaseProcess = {
-  processId: number;
-  connectionId: number;
-  client: string;
-  operation?: string;
-  namespace?: string;
-  command?: any;
-  runningTime: number;
-  state?: any;
-  waitingFor?: boolean;
-  locks?: any;
-  progress?: any;
-};
-
-export type DatabaseVariable = {
-  variable: string;
-  value: any;
-};
-
 export interface SqlBackupDumper {
  run();
 }

-export interface ServerSummaryDatabases {
-  rows: any[];
-  columns: SummaryDatabaseColumn[];
-}
-
-export type SummaryDatabaseColumn = {
-  header: string;
+export interface SummaryColumn {
  fieldName: string;
-  type: 'data' | 'fileSize';
-  filterable?: boolean;
-  sortable?: boolean;
-};
-
+  header: string;
+  dataType: 'string' | 'number' | 'bytes';
+}
+export interface ServerSummaryDatabase {}
 export interface ServerSummary {
-  processes: DatabaseProcess[];
-  variables: DatabaseVariable[];
-  databases: ServerSummaryDatabases;
+  columns: SummaryColumn[];
+  databases: ServerSummaryDatabase[];
 }

 export type CollectionAggregateFunction = 'count' | 'sum' | 'avg' | 'min' | 'max';
@@ -189,12 +161,12 @@ export interface FilterBehaviourProvider {
  getFilterBehaviour(dataType: string, standardFilterBehaviours: { [id: string]: FilterBehaviour }): FilterBehaviour;
 }

-export interface DatabaseHandle<TClient = any, TDataBase = any> {
+export interface DatabaseHandle<TClient = any> {
  client: TClient;
  database?: string;
  conid?: string;
  feedback?: (message: any) => void;
-  getDatabase?: () => TDataBase;
+  getDatabase?: () => any;
  connectionType?: string;
  treeKeySeparator?: string;
 }
@@ -224,7 +196,7 @@ export interface RestoreDatabaseSettings extends BackupRestoreSettingsBase {
  inputFile: string;
 }

-export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBehaviourProvider {
+export interface EngineDriver<TClient = any> extends FilterBehaviourProvider {
  engine: string;
  title: string;
  defaultPort?: number;
@@ -270,88 +242,61 @@ export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBeha
  defaultSocketPath?: string;
  authTypeLabel?: string;
  importExportArgs?: any[];
-  connect({
-    server,
-    port,
-    user,
-    password,
-    database,
-    connectionDefinition,
-  }): Promise<DatabaseHandle<TClient, TDataBase>>;
-  close(dbhan: DatabaseHandle<TClient, TDataBase>): Promise<any>;
-  query(dbhan: DatabaseHandle<TClient, TDataBase>, sql: string, options?: QueryOptions): Promise<QueryResult>;
-  stream(dbhan: DatabaseHandle<TClient, TDataBase>, sql: string, options: StreamOptions);
-  readQuery(dbhan: DatabaseHandle<TClient, TDataBase>, sql: string, structure?: TableInfo): Promise<StreamResult>;
-  readJsonQuery(dbhan: DatabaseHandle<TClient, TDataBase>, query: any, structure?: TableInfo): Promise<StreamResult>;
+  connect({ server, port, user, password, database, connectionDefinition }): Promise<DatabaseHandle<TClient>>;
+  close(dbhan: DatabaseHandle<TClient>): Promise<any>;
+  query(dbhan: DatabaseHandle<TClient>, sql: string, options?: QueryOptions): Promise<QueryResult>;
+  stream(dbhan: DatabaseHandle<TClient>, sql: string, options: StreamOptions);
+  readQuery(dbhan: DatabaseHandle<TClient>, sql: string, structure?: TableInfo): Promise<StreamResult>;
+  readJsonQuery(dbhan: DatabaseHandle<TClient>, query: any, structure?: TableInfo): Promise<StreamResult>;
  // eg. PostgreSQL COPY FROM stdin
-  writeQueryFromStream(dbhan: DatabaseHandle<TClient, TDataBase>, sql: string): Promise<StreamResult>;
-  writeTable(
-    dbhan: DatabaseHandle<TClient, TDataBase>,
-    name: NamedObjectInfo,
-    options: WriteTableOptions
-  ): Promise<StreamResult>;
+  writeQueryFromStream(dbhan: DatabaseHandle<TClient>, sql: string): Promise<StreamResult>;
+  writeTable(dbhan: DatabaseHandle<TClient>, name: NamedObjectInfo, options: WriteTableOptions): Promise<StreamResult>;
  analyseSingleObject(
-    dbhan: DatabaseHandle<TClient, TDataBase>,
+    dbhan: DatabaseHandle<TClient>,
    name: NamedObjectInfo,
    objectTypeField: keyof DatabaseInfo
  ): Promise<TableInfo | ViewInfo | ProcedureInfo | FunctionInfo | TriggerInfo>;
-  analyseSingleTable(dbhan: DatabaseHandle<TClient, TDataBase>, name: NamedObjectInfo): Promise<TableInfo>;
-  getVersion(dbhan: DatabaseHandle<TClient, TDataBase>): Promise<{ version: string; versionText?: string }>;
-  listDatabases(dbhan: DatabaseHandle<TClient, TDataBase>): Promise<
+  analyseSingleTable(dbhan: DatabaseHandle<TClient>, name: NamedObjectInfo): Promise<TableInfo>;
+  getVersion(dbhan: DatabaseHandle<TClient>): Promise<{ version: string; versionText?: string }>;
+  listDatabases(dbhan: DatabaseHandle<TClient>): Promise<
    {
      name: string;
-      sizeOnDisk?: number;
-      empty?: boolean;
    }[]
  >;
-  loadKeys(dbhan: DatabaseHandle<TClient, TDataBase>, root: string, filter?: string): Promise;
-  scanKeys(
-    dbhan: DatabaseHandle<TClient, TDataBase>,
-    root: string,
-    pattern: string,
-    cursor: string,
-    count: number
-  ): Promise;
-  exportKeys(dbhan: DatabaseHandle<TClient, TDataBase>, options: {}): Promise;
-  loadKeyInfo(dbhan: DatabaseHandle<TClient, TDataBase>, key): Promise;
-  loadKeyTableRange(dbhan: DatabaseHandle<TClient, TDataBase>, key, cursor, count): Promise;
+  loadKeys(dbhan: DatabaseHandle<TClient>, root: string, filter?: string): Promise;
+  scanKeys(dbhan: DatabaseHandle<TClient>, root: string, pattern: string, cursor: string, count: number): Promise;
+  exportKeys(dbhan: DatabaseHandle<TClient>, options: {}): Promise;
+  loadKeyInfo(dbhan: DatabaseHandle<TClient>, key): Promise;
+  loadKeyTableRange(dbhan: DatabaseHandle<TClient>, key, cursor, count): Promise;
  loadFieldValues(
-    dbhan: DatabaseHandle<TClient, TDataBase>,
+    dbhan: DatabaseHandle<TClient>,
    name: NamedObjectInfo,
    field: string,
    search: string,
    dataType: string
  ): Promise;
-  analyseFull(dbhan: DatabaseHandle<TClient, TDataBase>, serverVersion): Promise<DatabaseInfo>;
-  analyseIncremental(
-    dbhan: DatabaseHandle<TClient, TDataBase>,
-    structure: DatabaseInfo,
-    serverVersion
-  ): Promise<DatabaseInfo>;
+  analyseFull(dbhan: DatabaseHandle<TClient>, serverVersion): Promise<DatabaseInfo>;
+  analyseIncremental(dbhan: DatabaseHandle<TClient>, structure: DatabaseInfo, serverVersion): Promise<DatabaseInfo>;
  dialect: SqlDialect;
  dialectByVersion(version): SqlDialect;
  createDumper(options = null): SqlDumper;
-  createBackupDumper(dbhan: DatabaseHandle<TClient, TDataBase>, options): Promise<SqlBackupDumper>;
+  createBackupDumper(dbhan: DatabaseHandle<TClient>, options): Promise<SqlBackupDumper>;
  getAuthTypes(): EngineAuthType[];
-  readCollection(dbhan: DatabaseHandle<TClient, TDataBase>, options: ReadCollectionOptions): Promise<any>;
-  updateCollection(dbhan: DatabaseHandle<TClient, TDataBase>, changeSet: any): Promise<any>;
+  readCollection(dbhan: DatabaseHandle<TClient>, options: ReadCollectionOptions): Promise<any>;
+  updateCollection(dbhan: DatabaseHandle<TClient>, changeSet: any): Promise<any>;
  getCollectionUpdateScript(changeSet: any, collectionInfo: CollectionInfo): string;
-  createDatabase(dbhan: DatabaseHandle<TClient, TDataBase>, name: string): Promise;
-  dropDatabase(dbhan: DatabaseHandle<TClient, TDataBase>, name: string): Promise;
+  createDatabase(dbhan: DatabaseHandle<TClient>, name: string): Promise;
+  dropDatabase(dbhan: DatabaseHandle<TClient>, name: string): Promise;
  getQuerySplitterOptions(usage: 'stream' | 'script' | 'editor' | 'import'): any;
-  script(dbhan: DatabaseHandle<TClient, TDataBase>, sql: string, options?: RunScriptOptions): Promise;
-  operation(
-    dbhan: DatabaseHandle<TClient, TDataBase>,
-    operation: CollectionOperationInfo,
-    options?: RunScriptOptions
-  ): Promise;
+  script(dbhan: DatabaseHandle<TClient>, sql: string, options?: RunScriptOptions): Promise;
+  operation(dbhan: DatabaseHandle<TClient>, operation: CollectionOperationInfo, options?: RunScriptOptions): Promise;
  getNewObjectTemplates(): NewObjectTemplate[];
  // direct call of dbhan.client method, only some methods could be supported, on only some drivers
-  callMethod(dbhan: DatabaseHandle<TClient, TDataBase>, method, args);
-  serverSummary(dbhan: DatabaseHandle<TClient, TDataBase>): Promise<ServerSummary>;
-  summaryCommand(dbhan: DatabaseHandle<TClient, TDataBase>, command, row): Promise<void>;
-  startProfiler(dbhan: DatabaseHandle<TClient, TDataBase>, options): Promise<any>;
-  stopProfiler(dbhan: DatabaseHandle<TClient, TDataBase>, profiler): Promise<void>;
+  callMethod(dbhan: DatabaseHandle<TClient>, method, args);
+  serverSummary(dbhan: DatabaseHandle<TClient>): Promise<ServerSummary>;
+  summaryCommand(dbhan: DatabaseHandle<TClient>, command, row): Promise<void>;
+  startProfiler(dbhan: DatabaseHandle<TClient>, options): Promise<any>;
+  stopProfiler(dbhan: DatabaseHandle<TClient>, profiler): Promise<void>;
  getRedirectAuthUrl(connection, options): Promise<{ url: string; sid: string }>;
  getAuthTokenFromCode(connection, options): Promise<string>;
  getAccessTokenFromAuth(connection, req): Promise<string | null>;
@@ -368,10 +313,7 @@ export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBeha
  adaptTableInfo(table: TableInfo): TableInfo;
  // simple data type adapter
  adaptDataType(dataType: string): string;
-  listSchemas(dbhan: DatabaseHandle<TClient, TDataBase>): Promise<SchemaInfo[] | null>;
-  listProcesses(dbhan: DatabaseHandle<TClient, TDataBase>): Promise<DatabaseProcess[] | null>;
-  listVariables(dbhan: DatabaseHandle<TClient, TDataBase>): Promise<DatabaseVariable[] | null>;
-  killProcess(dbhan: DatabaseHandle<TClient, TDataBase>, pid: number): Promise<any>;
+  listSchemas(dbhan: DatabaseHandle<TClient>): Promise<SchemaInfo[] | null>;
  backupDatabaseCommand(
    connection: any,
    settings: BackupDatabaseSettings,
@@ -395,7 +337,7 @@ export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBeha
  analyserClass?: any;
  dumperClass?: any;
  singleConnectionOnly?: boolean;
-  getLogDbInfo(dbhan: DatabaseHandle<TClient, TDataBase>): {
+  getLogDbInfo(dbhan: DatabaseHandle<TClient>): {
    database?: string;
    engine: string;
    conid?: string;
@@ -56,9 +56,6 @@ export type TestEngineInfo = {

  useTextTypeForStrings?: boolean;

-  supportTableComments?: boolean;
-  supportColumnComments?: boolean;
-
  supportRenameSqlObject?: boolean;
  supportSchemas?: boolean;

@@ -96,6 +93,4 @@ export type TestEngineInfo = {
  }>;

  objects?: Array<TestObjectInfo>;
-
-  binaryDataType?: string;
 };
@@ -26,23 +26,12 @@

    <script lang="javascript">
      window.dbgate_page = '{{page}}';
-
-      if (localStorage.getItem('currentThemeType') == 'dark') {
-        document.documentElement.style.setProperty('--theme-background', '#111');
-        document.documentElement.style.setProperty('--theme-foreground', '#e3e3e3');
-      } else {
-        document.documentElement.style.setProperty('--theme-background', '#fff');
-        document.documentElement.style.setProperty('--theme-foreground', '#262626');
-      }
    </script>

+
    <script defer src="build/bundle.js"></script>

    <style>
-      body {
-        background-color: var(--theme-background);
-      }
-
      .lds-ellipsis {
        display: inline-block;
        position: relative;
@@ -55,7 +44,7 @@
        width: 13px;
        height: 13px;
        border-radius: 50%;
-        background: var(--theme-foreground);
+        background: #000;
        animation-timing-function: cubic-bezier(0, 1, 1, 0);
      }
      .lds-ellipsis div:nth-child(1) {
@@ -9,10 +9,6 @@
    "build:index": "node build-index.js",
    "prepublishOnly": "yarn build"
  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dbgate/dbgate.git"
-  },
  "files": [
    "public"
  ],
@@ -20,6 +16,7 @@
    "@ant-design/colors": "^5.0.0",
    "@energiency/chartjs-plugin-piechart-outlabels": "^1.3.4",
    "@mdi/font": "^7.1.96",
+    "@rollup/plugin-babel": "^6.0.4",
    "@rollup/plugin-commonjs": "^20.0.0",
    "@rollup/plugin-json": "^6.1.0",
    "@rollup/plugin-node-resolve": "^13.0.5",
@@ -32,7 +29,7 @@
    "chartjs-plugin-datalabels": "^2.2.0",
    "cross-env": "^7.0.3",
    "dbgate-datalib": "^6.0.0-alpha.1",
-    "dbgate-query-splitter": "^4.11.9",
+    "dbgate-query-splitter": "^4.11.5",
    "dbgate-sqltree": "^6.0.0-alpha.1",
    "dbgate-tools": "^6.0.0-alpha.1",
    "dbgate-types": "^6.0.0-alpha.1",
@@ -64,10 +61,9 @@
    "uuid": "^3.4.0"
  },
  "dependencies": {
-    "@langchain/core": "^0.3.72",
-    "@langchain/langgraph": "^0.4.9",
-    "@langchain/openai": "^0.6.9",
+    "@babel/preset-typescript": "^7.27.1",
    "@messageformat/core": "^3.4.0",
+    "babel-preset-solid": "^1.9.8",
    "chartjs-plugin-zoom": "^1.2.0",
    "date-fns": "^4.1.0",
    "debug": "^4.3.4",
@@ -77,8 +73,8 @@
    "interval-operations": "^1.0.7",
    "leaflet": "^1.8.0",
    "openai": "^5.10.1",
+    "solid-js": "^1.9.8",
    "wellknown": "^0.5.0",
-    "xml-formatter": "^3.6.4",
-    "zod": "^4.1.5"
+    "xml-formatter": "^3.6.4"
  }
 }
@@ -30,20 +30,3 @@
 .color-icon-inv-red {
  color: var(--theme-icon-inv-red);
 }
-
-.premium-background-gradient {
-  background: linear-gradient(135deg, #1686c8, #8a25b1);
-}
-
-.premium-gradient {
-  background: linear-gradient(135deg, #1686c8, #8a25b1);
-  color: white;
-}
-
-.web-color-primary {
-  background:  #1686c8;
-}
-
-.web-color-secondary {
-  background:  #8a25b1;
-}
@@ -9,6 +9,7 @@ import typescript from '@rollup/plugin-typescript';
 import replace from '@rollup/plugin-replace';
 import css from 'rollup-plugin-css-only';
 import json from '@rollup/plugin-json';
+import babel from '@rollup/plugin-babel';

 const production = !process.env.ROLLUP_WATCH;

@@ -33,11 +34,13 @@ function serve() {
  };
 }

+const BABEL_EXTENSIONS = ['.js', '.ts', '.tsx'];
+
 export default [
  {
    input: 'src/query/QueryParserWorker.js',
    output: {
-      sourcemap: !production,
+      sourcemap: true,
      format: 'iife',
      file: 'public/build/query-parser-worker.js',
    },
@@ -56,7 +59,7 @@ export default [
  {
    input: 'src/main.ts',
    output: {
-      sourcemap: !production,
+      sourcemap: true,
      format: 'iife',
      name: 'app',
      file: 'public/build/bundle.js',
@@ -122,6 +125,16 @@ export default [
        sourceMap: !production,
        inlineSources: !production,
      }),
+      babel({
+        // +++
+        extensions: BABEL_EXTENSIONS,
+        babelHelpers: 'bundled',
+        presets: [
+          ['solid', { generate: 'dom', hydratable: false }], // Solid JSX transform
+          '@babel/preset-typescript',
+        ],
+        exclude: /node_modules/,
+      }),
      json(),

      // In dev mode, call `npm run start` once
@@ -20,14 +20,14 @@
    installNewVolatileConnectionListener,
    refreshPublicCloudFiles,
  } from './utility/api';
-  import { getAllApps, getConfig, getSettings } from './utility/metadataLoaders';
+  import { getConfig, getSettings, getUsedApps } from './utility/metadataLoaders';
  import AppTitleProvider from './utility/AppTitleProvider.svelte';
  import getElectron from './utility/getElectron';
  import AppStartInfo from './widgets/AppStartInfo.svelte';
  import SettingsListener from './utility/SettingsListener.svelte';
  import { handleAuthOnStartup } from './clientAuth';
  import { initializeAppUpdates } from './utility/appUpdate';
-  import { _t, getCurrentTranslations, saveSelectedLanguageToCache } from './translations';
+  import { _t } from './translations';
  import { installCloudListeners } from './utility/cloudListeners';

  export let isAdminPage = false;
@@ -49,7 +49,7 @@

      const connections = await apiCall('connections/list');
      const settings = await getSettings();
-      const apps = await getAllApps();
+      const apps = await getUsedApps();
      const loadedApiValue = !!(settings && connections && config && apps);

      if (loadedApiValue) {
@@ -61,13 +61,6 @@
        initializeAppUpdates();
        installCloudListeners();
        refreshPublicCloudFiles();
-        saveSelectedLanguageToCache();
-
-        const electron = getElectron();
-        if (electron) {
-          electron.send('translation-data', JSON.stringify(getCurrentTranslations()));
-          global.TRANSLATION_DATA = getCurrentTranslations();
-        }
      }

      loadedApi = loadedApiValue;
@@ -14,7 +14,6 @@
  import ErrorInfo from './elements/ErrorInfo.svelte';
  import { isOneOfPage } from './utility/pageDefs';
  import { openWebLink } from './utility/simpleTools';
-  import FontIcon from './icons/FontIcon.svelte';

  const config = useConfig();
  const values = writable({ amoid: null, databaseServer: null });
@@ -23,15 +22,17 @@
  $: trialDaysLeft = $config?.trialDaysLeft;

  let errorMessage = '';
+  let expiredMessageSet = false;

-  let isInsertingLicense = false;
-
-  $: trialButtonAvailable = !isExpired && trialDaysLeft == null;
+  $: if (isExpired && !expiredMessageSet) {
+    errorMessage = 'Your license is expired';
+    expiredMessageSet = true;
+  }

  // $: console.log('CONFIG', $config);

  $: {
-    if ($config?.isLicenseValid && trialDaysLeft == null) {
+    if ($config?.isLicenseValid) {
      internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
    }
  }
@@ -40,124 +41,83 @@
 <FormProviderCore {values}>
  <SpecialPageLayout>
    {#if getElectron() || ($config?.storageDatabase && hasPermission('admin/license'))}
-      <div class="heading">Thank you for using DbGate!</div>
+      <div class="heading">License</div>
+      <FormTextAreaField label="Enter your license key" name="licenseKey" rows={5} />

-      {#if isExpired}
-        <div class="infotext"><FontIcon icon="img warn" /> Your license has expired. Please insert new license.</div>
-      {:else if trialDaysLeft > 0}
-        <div class="infotext">
-          <FontIcon icon="img warn" /> Your trial period will expire in {trialDaysLeft} day{trialDaysLeft != 1
-            ? 's'
-            : ''}.
-        </div>
-      {:else}
-        <div class="infotext">
-          <FontIcon icon="img info" /> Proceed by selecting a licensing option or providing your license key.
-        </div>
-      {/if}
+      <div class="submit">
+        <FormSubmit
+          value="Save license"
+          on:click={async e => {
+            sessionStorage.setItem('continueTrialConfirmed', '1');
+            const { licenseKey } = e.detail;
+            const resp = await apiCall('config/save-license-key', { licenseKey, tryToRenew: true });
+            if (resp?.status == 'ok') {
+              internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
+            } else {
+              errorMessage = resp?.errorMessage || 'Error saving license key';
+            }
+          }}
+        />
+      </div>

-      {#if isInsertingLicense}
-        <FormTextAreaField label="Enter your license key" name="licenseKey" rows={5} />
-
-        <div class="submit">
-          <div class="flex flex1">
-            <div class="col-6 flex">
-              <FormSubmit
-                value="Save license"
-                on:click={async e => {
-                  sessionStorage.setItem('continueTrialConfirmed', '1');
-                  const { licenseKey } = e.detail;
-                  const resp = await apiCall('config/save-license-key', { licenseKey, tryToRenew: true });
-                  if (resp?.status == 'ok') {
-                    internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
-                  } else {
-                    errorMessage = resp?.errorMessage || 'Error saving license key';
-                  }
-                }}
-              />
-            </div>
-            <div class="col-6 flex">
-              <FormStyledButton
-                value="Cancel"
-                on:click={() => {
-                  isInsertingLicense = false;
-                  errorMessage = '';
-                }}
-              />
-            </div>
-          </div>
-        </div>
-      {/if}
-
-      {#if !isInsertingLicense}
+      {#if !isExpired && trialDaysLeft == null}
        <div class="submit">
          <FormStyledButton
-            value="Insert license key"
-            on:click={() => {
-              isInsertingLicense = true;
-            }}
-          />
-        </div>
-
-        {#if trialButtonAvailable}
-          <div class="submit">
-            <FormStyledButton
-              value="Start 30-day trial"
-              on:click={async e => {
-                errorMessage = '';
-                const license = await apiCall('config/start-trial');
-                if (license?.status == 'ok') {
-                  sessionStorage.setItem('continueTrialConfirmed', '1');
-                  internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
-                } else {
-                  errorMessage = license?.errorMessage || 'Error starting trial';
-                }
-              }}
-            />
-          </div>
-        {/if}
-
-        {#if trialDaysLeft > 0}
-          <div class="submit">
-            <FormStyledButton
-              value={`Continue trial (${trialDaysLeft} days left)`}
-              on:click={async e => {
+            value="Start 30-day trial"
+            on:click={async e => {
+              errorMessage = '';
+              const license = await apiCall('config/start-trial');
+              if (license?.status == 'ok') {
                sessionStorage.setItem('continueTrialConfirmed', '1');
                internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
-              }}
-            />
-          </div>
-        {/if}
-
-        <div class="submit">
-          <FormStyledButton
-            value="Purchase DbGate Premium"
-            on:click={async e => {
-              // openWebLink(
-              //   `https://auth.dbgate.eu/create-checkout-session-simple?source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
-              // );
-
-              // openWebLink(
-              //   `https://auth-proxy.dbgate.udolni.net/redirect-to-purchase?product=${getElectron() ? 'premium' : 'teram-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
-              // );
-
-              openWebLink(
-                `https://auth.dbgate.eu/redirect-to-purchase?product=${getElectron() ? 'premium' : 'team-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
-              );
+              } else {
+                errorMessage = license?.errorMessage || 'Error starting trial';
+              }
            }}
          />
        </div>
+      {/if}

-        {#if getElectron()}
-          <div class="submit">
-            <FormStyledButton
-              value="Exit"
-              on:click={e => {
-                getElectron().send('quit-app');
-              }}
-            />
-          </div>
-        {/if}
+      {#if trialDaysLeft > 0}
+        <div class="submit">
+          <FormStyledButton
+            value={`Continue trial (${trialDaysLeft} days left)`}
+            on:click={async e => {
+              sessionStorage.setItem('continueTrialConfirmed', '1');
+              internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
+            }}
+          />
+        </div>
+      {/if}
+
+      <div class="submit">
+        <FormStyledButton
+          value="Purchase DbGate Premium"
+          on:click={async e => {
+            // openWebLink(
+            //   `https://auth.dbgate.eu/create-checkout-session-simple?source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
+            // );
+
+            // openWebLink(
+            //   `https://auth-proxy.dbgate.udolni.net/redirect-to-purchase?product=${getElectron() ? 'premium' : 'teram-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
+            // );
+
+            openWebLink(
+              `https://auth.dbgate.eu/redirect-to-purchase?product=${getElectron() ? 'premium' : 'team-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
+            );
+          }}
+        />
+      </div>
+
+      {#if getElectron()}
+        <div class="submit">
+          <FormStyledButton
+            value="Exit"
+            on:click={e => {
+              getElectron().send('quit-app');
+            }}
+          />
+        </div>
      {/if}

      {#if errorMessage}
@@ -165,8 +125,8 @@
      {/if}

      <div class="purchase-info">
-        For more info about DbGate licensing, you could visit <Link href="https://dbgate.io/">dbgate.io</Link> web or contact
-        us at <Link href="mailto:sales@dbgate.io">sales@dbgate.io</Link>
+        For more info about DbGate licensing, you could visit <Link href="https://dbgate.eu/">dbgate.eu</Link> web or contact
+        us at <Link href="mailto:sales@dbgate.eu">sales@dbgate.eu</Link>
      </div>
    {:else}
      <ErrorInfo message="License for DbGate is not valid. Please contact administrator." />
@@ -181,10 +141,6 @@
    font-size: xx-large;
  }

-  .infotext {
-    margin: 1em;
-  }
-
  .submit {
    margin: var(--dim-large-form-margin);
    display: flex;
@@ -16,7 +16,7 @@
  <div class="heading">Configuration error</div>
  {#if $config?.checkedLicense?.status == 'error'}
    <ErrorInfo
-      message={`Invalid license. Please contact sales@dbgate.io for more details. ${$config?.checkedLicense?.error || ''}`}
+      message={`Invalid license. Please contact sales@dbgate.eu for more details. ${$config?.checkedLicense?.error}`}
    />
  {:else if $config?.configurationError}
    <ErrorInfo message={$config?.configurationError} />
@@ -1,35 +0,0 @@
-<script lang='ts'>
-  import PermissionCheckBox from './PermissionCheckBox.svelte';
-  import { getFormContext } from '../forms/FormProviderCore.svelte';
-
-  const { values } = getFormContext();
-
-  export let onSetPermission;
-  export let label;
-  export let folder;
-</script>
-
-<PermissionCheckBox
-  {label}
-  permission={`files/${folder}/*`}
-  permissions={$values.permissions}
-  basePermissions={$values.basePermissions}
-  {onSetPermission}
-/>
-
-<div class="ml-4">
-  <PermissionCheckBox
-    label="Read"
-    permission={`files/${folder}/read`}
-    permissions={$values.permissions}
-    basePermissions={$values.basePermissions}
-    {onSetPermission}
-  />
-  <PermissionCheckBox
-    label="Write"
-    permission={`files/${folder}/write`}
-    permissions={$values.permissions}
-    basePermissions={$values.basePermissions}
-    {onSetPermission}
-  />
-</div>
@@ -1 +0,0 @@
-This component is only for Premium edition
@@ -36,7 +36,6 @@
  export let filter = null;
  export let disableHover = false;
  export let divProps = {};
-  export let additionalIcons = null;

  $: isChecked =
    checkedObjectsStore && $checkedObjectsStore.find(x => module?.extractKey(data) == module?.extractKey(x));
@@ -161,11 +160,6 @@
      />
    </span>
  {/if}
-  {#if additionalIcons}
-    {#each additionalIcons as ic}
-      <FontIcon icon={ic.icon} title={ic.title} colorClass={ic.colorClass} />
-    {/each}
-  {/if}
  {#if extInfo}
    <span class="ext-info">
      <TokenizedFilteredText text={extInfo} {filter} />
@@ -8,7 +8,6 @@
  import Link from '../elements/Link.svelte';
  import { focusedConnectionOrDatabase } from '../stores';
  import { tick } from 'svelte';
-  import { _tval } from '../translations';

  export let list;
  export let module;
@@ -39,19 +38,8 @@

  $: matcher = module.createMatcher && module.createMatcher(filter, passProps?.searchSettings);

-  $: listTranslated = (list || []).map(data => ({
-    ...data,
-    group: data?.group && _tval(data.group),
-    title: data?.title && _tval(data.title),
-    description: data?.description && _tval(data.description),
-    args: (data?.args || []).map(x => ({
-      ...x,
-      label: x?.label && _tval(x.label),
-    })),
-  }));
-
  $: dataLabeled = _.compact(
-    (listTranslated || []).map(data => {
+    (list || []).map(data => {
      const matchResult = matcher ? matcher(data) : true;

      let isMatched = true;
@@ -114,8 +102,7 @@

  $: groups = groupFunc ? extendGroups(_.groupBy(dataLabeled, 'group'), emptyGroupNames) : null;

-  $: listLimited =
-    isExpandedBySearch && !expandLimited ? filtered.slice(0, filter.trim().length < 3 ? 1 : 3) : listTranslated;
+  $: listLimited = isExpandedBySearch && !expandLimited ? filtered.slice(0, filter.trim().length < 3 ? 1 : 3) : list;
  $: isListLimited = isExpandedBySearch && listLimited.length < filtered.length;
  $: listMissingItems = isListLimited ? filtered.slice(listLimited.length) : [];

@@ -167,7 +167,7 @@ await dbgateApi.deployDb(${JSON.stringify(
      isProApp() && { text: 'Data deployer', onClick: handleOpenDataDeployTab },
      $currentDatabase && [
        { text: 'Generate deploy DB SQL', onClick: handleGenerateDeploySql },
-        hasPermission(`run-shell-script`) && { text: 'Shell: Deploy DB', onClick: handleGenerateDeployScript },
+        { text: 'Shell: Deploy DB', onClick: handleGenerateDeployScript },
      ],
      data.name != 'default' &&
        isProApp() &&
@@ -122,7 +122,6 @@
    getOpenedTabs,
    openedConnections,
    openedSingleDatabaseConnections,
-    pinnedDatabases,
  } from '../stores';
  import { filterName, filterNameCompoud } from 'dbgate-tools';
  import { showModal } from '../modals/modalTools';
@@ -131,7 +130,7 @@
  import openNewTab from '../utility/openNewTab';
  import { getDatabaseMenuItems } from './DatabaseAppObject.svelte';
  import getElectron from '../utility/getElectron';
-  import { getDatabaseList, useAllApps } from '../utility/metadataLoaders';
+  import { getDatabaseList, useUsedApps } from '../utility/metadataLoaders';
  import { getLocalStorage } from '../utility/storageCache';
  import { apiCall, removeVolatileMapping } from '../utility/api';
  import { closeMultipleTabs } from '../tabpanel/TabsPanel.svelte';
@@ -153,8 +152,6 @@
  let engineStatusIcon = null;
  let engineStatusTitle = null;

-  $: isPinned = data.singleDatabase && !!$pinnedDatabases.find(x => x?.connection?._id == data?._id);
-
  const electron = getElectron();

  const handleConnect = (disableExpand = false) => {
@@ -279,7 +276,7 @@
      showModal(InputTextModal, {
        header: _t('connection.createDatabase', { defaultMessage: 'Create database' }),
        value: 'newdb',
-        label: _t('connection.database', { defaultMessage: 'Database name' }),
+        label: _t('connection.databaseName', { defaultMessage: 'Database name' }),
        onConfirm: name =>
          apiCall('server-connections/create-database', {
            conid: data._id,
@@ -385,8 +382,7 @@
          $extensions,
          $currentDatabase,
          $apps,
-          $openedSingleDatabaseConnections,
-          data.databasePermissionRole
+          $openedSingleDatabaseConnections
        ),
      ],

@@ -430,7 +426,7 @@
    }
  }

-  $: apps = useAllApps();
+  $: apps = useUsedApps();
 </script>

 <AppObjectCore
@@ -458,19 +454,6 @@
      .find(x => x.isNewQuery)
      .onClick();
  }}
-  onPin={!isPinned && data.singleDatabase
-    ? () =>
-        pinnedDatabases.update(list => [
-          ...list,
-          {
-            name: data.defaultDatabase,
-            connection: data,
-          },
-        ])
-    : null}
-  onUnpin={isPinned && data.singleDatabase
-    ? () => pinnedDatabases.update(list => list.filter(x => x?.connection?._id != data?._id))
-    : null}
  isChoosed={data._id == $focusedConnectionOrDatabase?.conid &&
    (data.singleDatabase
      ? $focusedConnectionOrDatabase?.database == data.defaultDatabase
@@ -46,8 +46,7 @@
    $extensions,
    $currentDatabase,
    $apps,
-    $openedSingleDatabaseConnections,
-    databasePermissionRole
+    $openedSingleDatabaseConnections
  ) {
    const apps = filterAppsForDatabase(connection, name, $apps);
    const handleNewQuery = () => {
@@ -405,36 +404,19 @@ await dbgateApi.executeQuery(${JSON.stringify(
      });
    };

-    const handleCreateNewApp = () => {
-      showModal(InputTextModal, {
-        header: 'New application',
-        label: 'Application name',
-        value: _.startCase(name),
-        onConfirm: async appName => {
-          const newAppId = await apiCall('apps/create-app-from-db', {
-            appName,
-            server: connection?.server,
-            database: name,
-          });
-          openApplicationEditor(newAppId);
-        },
-      });
-    };
-
    const driver = findEngineDriver(connection, getExtensions());

-    const commands = _.flatten((apps || []).map(x => Object.values(x.files || {}).filter(x => x.type == 'command')));
+    const commands = _.flatten((apps || []).map(x => x.commands || []));

    const isSqlOrDoc =
      driver?.databaseEngineTypes?.includes('sql') || driver?.databaseEngineTypes?.includes('document');

    return [
-      hasPermission(`dbops/query`) &&
-        isAllowedDatabaseRunScript(databasePermissionRole) && {
-          onClick: handleNewQuery,
-          text: _t('database.newQuery', { defaultMessage: 'New query' }),
-          isNewQuery: true,
-        },
+      hasPermission(`dbops/query`) && {
+        onClick: handleNewQuery,
+        text: _t('database.newQuery', { defaultMessage: 'New query' }),
+        isNewQuery: true,
+      },
      hasPermission(`dbops/model/edit`) &&
        !connection.isReadOnly &&
        driver?.databaseEngineTypes?.includes('sql') && {
@@ -446,7 +428,8 @@ await dbgateApi.executeQuery(${JSON.stringify(
        driver?.databaseEngineTypes?.includes('document') && {
          onClick: handleNewCollection,
          text: _t('database.newCollection', {
-            defaultMessage: 'New collection/container'
+            defaultMessage: 'New {collectionLabel}',
+            values: { collectionLabel: driver?.collectionSingularLabel ?? 'collection/container' },
          }),
        },
      hasPermission(`dbops/query`) &&
@@ -467,14 +450,12 @@ await dbgateApi.executeQuery(${JSON.stringify(

      { divider: true },
      isSqlOrDoc &&
-        isProApp() &&
        !connection.isReadOnly &&
        hasPermission(`dbops/import`) && {
          onClick: handleImport,
          text: _t('database.import', { defaultMessage: 'Import' }),
        },
      isSqlOrDoc &&
-        isProApp() &&
        hasPermission(`dbops/export`) && {
          onClick: handleExport,
          text: _t('database.export', { defaultMessage: 'Export' }),
@@ -564,13 +545,12 @@ await dbgateApi.executeQuery(${JSON.stringify(
      { divider: true },

      driver?.databaseEngineTypes?.includes('sql') &&
-        hasPermission(`run-shell-script`) &&
        hasPermission(`dbops/dropdb`) && {
          onClick: handleGenerateDropAllObjectsScript,
          text: _t('database.shellDropAllObjects', { defaultMessage: 'Shell: Drop all objects' }),
        },

-      hasPermission(`run-shell-script`) && {
+      {
        onClick: handleGenerateRunScript,
        text: _t('database.shellRunScript', { defaultMessage: 'Shell: Run script' }),
      },
@@ -581,26 +561,11 @@ await dbgateApi.executeQuery(${JSON.stringify(
          text: _t('database.dataDeployer', { defaultMessage: 'Data deployer' }),
        },

-      isProApp() &&
-        hasPermission(`files/apps/write`) && {
-          onClick: handleCreateNewApp,
-          text: _t('database.createNewApplication', { defaultMessage: 'Create new application' }),
-        },
-
-      isProApp() &&
-        apps?.length > 0 && {
-          text: _t('database.editApplications', { defaultMessage: 'Edit application' }),
-          submenu: apps.map((app: any) => ({
-            text: app.applicationName,
-            onClick: () => openApplicationEditor(app.appid),
-          })),
-        },
-
      { divider: true },

      commands.length > 0 && [
        commands.map((cmd: any) => ({
-          text: cmd.label,
+          text: cmd.name,
          onClick: () => {
            showModal(ConfirmSqlModal, {
              sql: cmd.sql,
@@ -650,17 +615,17 @@ await dbgateApi.executeQuery(${JSON.stringify(
    getConnectionLabel,
  } from 'dbgate-tools';
  import InputTextModal from '../modals/InputTextModal.svelte';
-  import { getDatabaseInfo, useAllApps, useDatabaseInfoPeek } from '../utility/metadataLoaders';
+  import { getDatabaseInfo, useUsedApps } from '../utility/metadataLoaders';
  import { openJsonDocument } from '../tabs/JsonTab.svelte';
  import { apiCall } from '../utility/api';
  import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
  import ConfirmSqlModal, { runOperationOnDatabase, saveScriptToDatabase } from '../modals/ConfirmSqlModal.svelte';
-  import { filterAppsForDatabase, openApplicationEditor } from '../utility/appTools';
+  import { filterAppsForDatabase } from '../utility/appTools';
  import newQuery from '../query/newQuery';
  import ConfirmModal from '../modals/ConfirmModal.svelte';
  import { closeMultipleTabs } from '../tabpanel/TabsPanel.svelte';
  import NewCollectionModal from '../modals/NewCollectionModal.svelte';
-  import hasPermission, { isAllowedDatabaseRunScript } from '../utility/hasPermission';
+  import hasPermission from '../utility/hasPermission';
  import { openImportExportTab } from '../utility/importExportTools';
  import newTable from '../tableeditor/newTable';
  import { loadSchemaList, switchCurrentDatabase } from '../utility/common';
@@ -671,7 +636,6 @@ await dbgateApi.executeQuery(${JSON.stringify(
  import { getNumberIcon } from '../icons/FontIcon.svelte';
  import { getDatabaseClickActionSetting } from '../settings/settingsTools';
  import { _t } from '../translations';
-  import { tick } from 'svelte';

  export let data;
  export let passProps;
@@ -683,19 +647,13 @@ await dbgateApi.executeQuery(${JSON.stringify(
      $extensions,
      $currentDatabase,
      $apps,
-      $openedSingleDatabaseConnections,
-      data.databasePermissionRole
+      $openedSingleDatabaseConnections
    );
  }

  $: isPinned = !!$pinnedDatabases.find(x => x?.name == data.name && x?.connection?._id == data.connection?._id);
-  $: apps = useAllApps();
+  $: apps = useUsedApps();
  $: isLoadingSchemas = $loadingSchemaLists[`${data?.connection?._id}::${data?.name}`];
-  $: dbInfo = useDatabaseInfoPeek({ conid: data?.connection?._id, database: data?.name });
-
-  $: appsForDb = filterAppsForDatabase(data?.connection, data?.name, $apps, $dbInfo);
-
-  // $: console.log('AppsForDB:', data?.name, appsForDb);
 </script>

 <AppObjectCore
@@ -718,13 +676,6 @@ await dbgateApi.executeQuery(${JSON.stringify(
      switchCurrentDatabase(data);
    }
  }}
-  additionalIcons={appsForDb?.length > 0
-    ? appsForDb.map(ic => ({
-        icon: ic.applicationIcon || 'img app',
-        title: ic.applicationName,
-        colorClass: ic.applicationColor ? `color-icon-${ic.applicationColor}` : undefined,
-      }))
-    : null}
  on:mousedown={() => {
    $focusedConnectionOrDatabase = { conid: data.connection?._id, database: data.name, connection: data.connection };
  }}
@@ -746,9 +697,6 @@ await dbgateApi.executeQuery(${JSON.stringify(
          ).length
        )
      : ''}
-  statusIconBefore={data.databasePermissionRole == 'read_content' || data.databasePermissionRole == 'view'
-    ? 'icon lock'
-    : null}
  menu={createMenu}
  showPinnedInsteadOfUnpin={passProps?.showPinnedInsteadOfUnpin}
  onPin={isPinned ? null : () => pinnedDatabases.update(list => [...list, data])}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jan Prochazka	6ac3ee85af	generic solid wrapper	2025-08-10 09:19:36 +02:00
Jan Prochazka	5e26c0600e	Solid integration POC	2025-08-10 09:04:48 +02:00
				`@@ -0,0 +1 @@`
				`module.exports = process.env.GIST_UPLOAD_SECRET;`