feat: remove win top bar and added ssh tunnel support

Author: JulianFun123

packages/backend/package.json

@@ -40,6 +40,7 @@
     "oracledb": "^6.10.0",
     "pg": "^8.20.0",
     "redis": "^5.11.0",
+    "ssh2": "^1.17.0",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
     "ws": "^8.18.2"

packages/backend/src/adapters/database/sql/mysql-adapter/MySQLAdapter.ts

@@ -1,3 +1,4 @@
+import net from 'node:net'
 import mysql from 'mysql2/promise'
 import { escapeId } from 'mysql2'
 import type { ResultSetHeader, RowDataPacket } from 'mysql2'
@@ -12,6 +13,8 @@ import {
 import { assertIdentifier } from '../shared/identifier.ts'
 import { splitSqlStatements } from '../shared/sql-statements.ts'
 import { normalizeWhereClause } from '../shared/where-clause.ts'
+import type { ResolvedNetworkTransport, TlsConfig } from '../../../../datasources/shared/transport.ts'
+import { createMysqlTlsOptions, getTlsServerName } from '../../../../datasources/shared/transport.ts'
 
 export class MySQLAdapter extends DefaultSQLAdapter {
   private connection!: mysql.Connection
@@ -23,6 +26,8 @@ export class MySQLAdapter extends DefaultSQLAdapter {
       user: string
       password: string
       database: string
+      tls?: TlsConfig
+      transport?: ResolvedNetworkTransport
     },
   ) {
     super()
@@ -81,12 +86,27 @@ export class MySQLAdapter extends DefaultSQLAdapter {
   }
 
   async connect() {
+    const transport = this.options.transport
+    const connectHost = transport?.connectHost ?? this.options.host
+    const connectPort = transport?.connectPort ?? this.options.port
+    const tlsHost = getTlsServerName(this.options.tls, this.options.host)
+    const useCustomStream = Boolean(transport) || tlsHost !== connectHost
+
     this.connection = await mysql.createConnection({
-      host: this.options.host,
-      port: this.options.port,
+      host: useCustomStream ? tlsHost : connectHost,
+      port: useCustomStream ? this.options.port : connectPort,
       user: this.options.user,
       password: this.options.password,
       database: this.options.database,
+      ...(useCustomStream
+        ? {
+            stream: net.connect({
+              host: connectHost,
+              port: connectPort,
+            }),
+          }
+        : {}),
+      ssl: createMysqlTlsOptions(this.options.tls),
       waitForConnections: true,
       connectionLimit: 10,
       queueLimit: 0,

packages/backend/src/adapters/database/sql/postgres-adapter/PostgresAdapter.ts

@@ -10,6 +10,8 @@ import {
 import { assertIdentifier } from '../shared/identifier.ts'
 import { splitSqlStatements } from '../shared/sql-statements.ts'
 import { normalizeWhereClause } from '../shared/where-clause.ts'
+import type { ResolvedNetworkTransport, TlsConfig } from '../../../../datasources/shared/transport.ts'
+import { createNodeTlsOptions } from '../../../../datasources/shared/transport.ts'
 
 export class PostgresAdapter extends DefaultSQLAdapter {
   private client!: Client
@@ -22,6 +24,8 @@ export class PostgresAdapter extends DefaultSQLAdapter {
       password: string
       database: string
       schema?: string
+      tls?: TlsConfig
+      transport?: ResolvedNetworkTransport
     },
   ) {
     super()
@@ -72,12 +76,14 @@ export class PostgresAdapter extends DefaultSQLAdapter {
   }
 
   async connect() {
+    const transport = this.options.transport
     this.client = new Client({
-      host: this.options.host,
-      port: this.options.port,
+      host: transport?.connectHost ?? this.options.host,
+      port: transport?.connectPort ?? this.options.port,
       user: this.options.user,
       password: this.options.password,
       database: this.options.database,
+      ssl: createNodeTlsOptions(this.options.tls, transport?.serverHost ?? this.options.host),
     })
 
     await this.client.connect()

packages/backend/src/app-context.ts

@@ -1,7 +1,9 @@
 import type { AppConfig } from './config/app-config.ts'
+import type { SshTunnelManager } from './datasources/shared/ssh-tunnel-manager.ts'
 import type { MetaStore } from './meta/store.ts'
 
 export type AppContext = {
   config: AppConfig
   metaStore: MetaStore
+  sshTunnelManager: SshTunnelManager
 }

packages/backend/src/datasources/cassandra/adapter.ts

@@ -2,6 +2,8 @@ import { createRequire } from 'node:module'
 import type { Client } from 'cassandra-driver'
 import type * as CassandraNamespace from 'cassandra-driver'
 import type { QueryResult } from '../../adapters/database/sql/default-sql-adapter/DefaultSQLAdapter.ts'
+import type { ResolvedNetworkTransport, TlsConfig } from '../shared/transport.ts'
+import { createNodeTlsOptions } from '../shared/transport.ts'
 import { createSelectResultFromRows, QueryOnlySqlAdapter } from '../shared-sql/query-only-adapter.ts'
 
 type CassandraConfig = {
@@ -10,7 +12,8 @@ type CassandraConfig = {
   user?: string
   password?: string
   database?: string
-  ssl?: boolean
+  tls?: TlsConfig
+  transport?: ResolvedNetworkTransport
 }
 
 type CassandraModule = typeof CassandraNamespace
@@ -29,11 +32,12 @@ export class CassandraSqlAdapter extends QueryOnlySqlAdapter {
 
   async connect() {
     const { Client } = this.loadCassandraModule()
+    const transport = this.config.transport
     this.client = new Client({
-      contactPoints: [this.config.host],
+      contactPoints: [transport?.connectHost ?? this.config.host],
       localDataCenter: 'datacenter1',
       protocolOptions: {
-        port: this.config.port,
+        port: transport?.connectPort ?? this.config.port,
       },
       keyspace: this.config.database,
       credentials:
@@ -43,7 +47,7 @@ export class CassandraSqlAdapter extends QueryOnlySqlAdapter {
               password: this.config.password ?? '',
             }
           : undefined,
-      sslOptions: this.config.ssl ? {} : undefined,
+      sslOptions: createNodeTlsOptions(this.config.tls, transport?.serverHost ?? this.config.host),
     })
 
     await this.client.connect()

packages/backend/src/datasources/cassandra/index.ts

@@ -1,3 +1,5 @@
+import { resolveTcpTransportConfig } from '../shared/runtime.ts'
+import { getTransportSecretFields } from '../shared/transport.ts'
 import { normalizeNetworkSqlConfig } from '../shared-sql/network-config.ts'
 import type { DataSourceModule } from '../shared/module.ts'
 import { CassandraSqlAdapter } from './adapter.ts'
@@ -15,27 +17,26 @@ export const cassandraDataSourceModule = {
       schemaEditor: false,
       resourceBrowser: false,
     },
+    transportSupport: {
+      ssh: true,
+      tls: true,
+    },
   },
-  secretFields: ['password'],
+  secretFields: ['password', ...getTransportSecretFields({ ssh: true, tls: true })],
   normalizeConfig(config) {
     return normalizeNetworkSqlConfig(config, {
       defaultPort: 9042,
       requireUser: false,
       requirePassword: false,
       requireDatabase: false,
-      includeSsl: true,
+      includeTls: true,
+      includeSsh: true,
     })
   },
+  resolveRuntimeConfig(config, context) {
+    return resolveTcpTransportConfig(config as never, context)
+  },
   createSqlAdapter(config) {
-    return new CassandraSqlAdapter(
-      config as {
-        host: string
-        port: number
-        user?: string
-        password?: string
-        database?: string
-        ssl?: boolean
-      },
-    )
+    return new CassandraSqlAdapter(config as never)
   },
 } satisfies DataSourceModule

packages/backend/src/datasources/clickhouse/adapter.ts

@@ -1,4 +1,6 @@
 import { createClient, type ClickHouseClient } from '@clickhouse/client'
+import type http from 'node:http'
+import type https from 'node:https'
 import type {
   QueryResult,
   SQLCreateTableColumnInput,
@@ -7,6 +9,8 @@ import type {
 } from '../../adapters/database/sql/default-sql-adapter/DefaultSQLAdapter.ts'
 import { assertIdentifier } from '../../adapters/database/sql/shared/identifier.ts'
 import { normalizeWhereClause } from '../../adapters/database/sql/shared/where-clause.ts'
+import type { ResolvedNetworkTransport, TlsConfig } from '../shared/transport.ts'
+import { createHttpTransportAgent, destroyHttpTransportAgent, isTlsEnabled } from '../shared/transport.ts'
 import { createSelectResultFromRows, QueryOnlySqlAdapter } from '../shared-sql/query-only-adapter.ts'
 
 type ClickHouseConfig = {
@@ -15,7 +19,8 @@ type ClickHouseConfig = {
   user?: string
   password?: string
   database?: string
-  ssl?: boolean
+  tls?: TlsConfig
+  transport?: ResolvedNetworkTransport
 }
 
 type ClickHouseTableRow = {
@@ -35,6 +40,7 @@ function isSelectLikeStatement(sqlText: string) {
 
 export class ClickHouseSqlAdapter extends QueryOnlySqlAdapter {
   private client!: ClickHouseClient
+  private agent?: http.Agent | https.Agent
 
   constructor(private readonly config: ClickHouseConfig) {
     super()
@@ -63,17 +69,32 @@ export class ClickHouseSqlAdapter extends QueryOnlySqlAdapter {
   }
 
   async connect() {
-    const protocol = this.config.ssl ? 'https' : 'http'
+    const secure = isTlsEnabled(this.config.tls)
+    const transport = this.config.transport ?? {
+      connectHost: this.config.host,
+      connectPort: this.config.port,
+      serverHost: this.config.host,
+      serverPort: this.config.port,
+      tls: this.config.tls,
+    }
+    const protocol = secure ? 'https' : 'http'
+    this.agent = createHttpTransportAgent({
+      secure,
+      transport,
+    })
     this.client = createClient({
       url: `${protocol}://${this.config.host}:${this.config.port}`,
       username: this.config.user,
       password: this.config.password,
       database: this.database,
+      http_agent: this.agent,
     })
   }
 
   async close() {
     await this.client?.close()
+    destroyHttpTransportAgent(this.agent)
+    this.agent = undefined
   }
 
   async getTables() {

packages/backend/src/datasources/clickhouse/index.ts

@@ -1,3 +1,5 @@
+import { resolveTcpTransportConfig } from '../shared/runtime.ts'
+import { getTransportSecretFields } from '../shared/transport.ts'
 import { normalizeNetworkSqlConfig } from '../shared-sql/network-config.ts'
 import type { DataSourceModule } from '../shared/module.ts'
 import { ClickHouseSqlAdapter } from './adapter.ts'
@@ -16,27 +18,26 @@ export const clickHouseDataSourceModule = {
       tableCreate: true,
       resourceBrowser: false,
     },
+    transportSupport: {
+      ssh: true,
+      tls: true,
+    },
   },
-  secretFields: ['password'],
+  secretFields: ['password', ...getTransportSecretFields({ ssh: true, tls: true })],
   normalizeConfig(config) {
     return normalizeNetworkSqlConfig(config, {
       defaultPort: 8123,
       requireUser: false,
       requirePassword: false,
       requireDatabase: false,
-      includeSsl: true,
+      includeTls: true,
+      includeSsh: true,
     })
   },
+  resolveRuntimeConfig(config, context) {
+    return resolveTcpTransportConfig(config as never, context)
+  },
   createSqlAdapter(config) {
-    return new ClickHouseSqlAdapter(
-      config as {
-        host: string
-        port: number
-        user?: string
-        password?: string
-        database?: string
-        ssl?: boolean
-      },
-    )
+    return new ClickHouseSqlAdapter(config as never)
   },
 } satisfies DataSourceModule

packages/backend/src/datasources/cockroachdb/index.ts

@@ -1,4 +1,6 @@
 import { PostgresAdapter } from '../../adapters/database/sql/postgres-adapter/PostgresAdapter.ts'
+import { resolveTcpTransportConfig } from '../shared/runtime.ts'
+import { getTransportSecretFields } from '../shared/transport.ts'
 import { normalizeNetworkSqlConfig } from '../shared-sql/network-config.ts'
 import type { DataSourceModule } from '../shared/module.ts'
 
@@ -16,28 +18,27 @@ export const cockroachDbDataSourceModule = {
       tableCreate: true,
       resourceBrowser: false,
     },
+    transportSupport: {
+      ssh: true,
+      tls: true,
+    },
   },
-  secretFields: ['password'],
+  secretFields: ['password', ...getTransportSecretFields({ ssh: true, tls: true })],
   normalizeConfig(config) {
     return normalizeNetworkSqlConfig(config, {
       defaultPort: 26257,
       requireUser: true,
       requirePassword: true,
       requireDatabase: true,
       includeSchema: true,
-      includeSsl: true,
+      includeTls: true,
+      includeSsh: true,
     })
   },
+  resolveRuntimeConfig(config, context) {
+    return resolveTcpTransportConfig(config as never, context)
+  },
   createSqlAdapter(config) {
-    return new PostgresAdapter(
-      config as {
-        host: string
-        port?: number
-        user: string
-        password: string
-        database: string
-        schema?: string
-      },
-    )
+    return new PostgresAdapter(config as never)
   },
 } satisfies DataSourceModule