diff --git a/CHANGELOG.md b/CHANGELOG.md index 8017684f..22824246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.3.5] - 2026-11-19 + +### Added + +- **MongoDB Local & Docker Discovery:** + - Automated local MongoDB socket and wire-protocol discovery (`localhost:27017` / `127.0.0.1:27017`). + - Automated Docker container discovery inspecting running containers (`mongo`, `mongodb`, `percona`, `bitnami`) with mapped host ports. + - One-click connection prefilling via the frontend `useDiscoveredDatabases` hook and discovered connections dashboard card. +- **Tree-Shaken Database Icons:** + - Migrated PostgreSQL, MySQL, MariaDB, SQLite, DuckDB, ClickHouse, and MongoDB iconography to `react-devicons`. + - Dropped external Devicon CDN stylesheet from `index.html`, eliminating render-blocking network dependencies. + +### Changed + +- **Enhanced What's New Dialog:** + - Expanded modal layout to `max-w-4xl` and `max-h-[85vh]` for desktop reading comfort. + - Added comprehensive GitHub Flavored Markdown (GFM) styling for headers, lists, code syntax highlighting, markdown tables, and blockquotes. + - Added localStorage release notes caching with fallback rendering. +- **Welcome View Navigation & Scrolling:** + - Integrated `ScrollArea` into the "Total Tables" sheet to resolve content truncation and ensure fluid vertical scrolling. + +### Fixed + +- **Graceful Offline Database Handling:** + - Added `isOfflineError` classifier across bridge database handlers (`db.listTables`, `db.listSchemas`, `db.getStats`, `db.connect`), returning structured `{ isOffline: true }` responses and logging warnings instead of throwing disruptive `IO_ERROR` exceptions to the webview. + - Refined error classification to require connection-specific indicators, preventing SQL identifiers (e.g. `offline_orders`) or MySQL permission errors from triggering false offline states. + - Added recursive `err.cause` unwrapping for wrapped driver exceptions. +- **Connection Status Lifecycle & Pending State Isolation:** + - Separated initial pending connection checks (`isPending: true`) from confirmed offline results in `WelcomeView`. + - Displayed checking status indicators during cold startup to eliminate false "Offline" flickers. + - Propagated top-level `isOffline` flag through `getDataBaseStats` and `ConnectionSizeItem`, correctly distinguishing genuine zero statistics (`0.00 MB`) from unavailable offline statistics (`Offline`). + ## [1.3.0] - 2026-11-17 ### Added diff --git a/bridge/__tests__/databaseOffline.test.ts b/bridge/__tests__/databaseOffline.test.ts new file mode 100644 index 00000000..82e6983b --- /dev/null +++ b/bridge/__tests__/databaseOffline.test.ts @@ -0,0 +1,203 @@ +import { describe, expect, test, jest } from "@jest/globals"; +import { isOfflineError } from "../src/services/databaseService"; +import { DatabaseHandlers } from "../src/handlers/databaseHandlers"; +import { StatsHandlers } from "../src/handlers/statsHandlers"; + +describe("isOfflineError helper", () => { + test("identifies standard Node network error codes as offline", () => { + expect(isOfflineError({ code: "ENOTFOUND" })).toBe(true); + expect(isOfflineError({ code: "ECONNREFUSED" })).toBe(true); + expect(isOfflineError({ code: "ETIMEDOUT" })).toBe(true); + expect(isOfflineError({ code: "EHOSTUNREACH" })).toBe(true); + expect(isOfflineError({ code: "ENETUNREACH" })).toBe(true); + expect(isOfflineError({ code: "ECONNRESET" })).toBe(true); + expect(isOfflineError({ code: "EAI_AGAIN" })).toBe(true); + expect(isOfflineError({ code: "EPIPE" })).toBe(true); + expect(isOfflineError({ code: "PROTOCOL_CONNECTION_LOST" })).toBe(true); + }); + + test("identifies MongoDB driver network/topology error names as offline", () => { + expect(isOfflineError({ name: "MongoServerSelectionError" })).toBe(true); + expect(isOfflineError({ name: "MongoNetworkError" })).toBe(true); + expect(isOfflineError({ name: "MongoNetworkTimeoutError" })).toBe(true); + expect(isOfflineError({ name: "MongoTopologyClosedError" })).toBe(true); + }); + + test("identifies message text containing offline indicators", () => { + expect( + isOfflineError( + new Error( + "Failed to fetch MySQL database stats: getaddrinfo ENOTFOUND lms-yashh56.d.aivencloud.com", + ), + ), + ).toBe(true); + expect(isOfflineError(new Error("connect ECONNREFUSED 127.0.0.1:3306"))).toBe(true); + expect( + isOfflineError( + new Error("Failed to fetch MySQL database stats: connect ECONNREFUSED 127.0.0.1:3306"), + ), + ).toBe(true); + expect(isOfflineError(new Error("Server selection timed out after 30000 ms"))).toBe(true); + expect(isOfflineError(new Error("Topology is closed"))).toBe(true); + expect(isOfflineError(new Error("Connection terminated unexpectedly"))).toBe(true); + expect(isOfflineError("Database is offline")).toBe(true); + }); + + test("identifies cause error as offline when cause matches", () => { + const errorWithCause = new Error("Wrapper"); + (errorWithCause as any).cause = { code: "ECONNREFUSED" }; + expect(isOfflineError(errorWithCause)).toBe(true); + }); + + test("returns false for non-offline errors", () => { + expect(isOfflineError(null)).toBe(false); + expect(isOfflineError(undefined)).toBe(false); + expect(isOfflineError(new Error("Table 'users' does not exist"))).toBe(false); + expect(isOfflineError(new Error("Table 'offline_orders' does not exist"))).toBe(false); + expect( + isOfflineError( + new Error( + "Failed to fetch MySQL database stats: Access denied for user 'root'@'localhost'", + ), + ), + ).toBe(false); + expect(isOfflineError(new Error("Syntax error in SQL statement"))).toBe(false); + expect( + isOfflineError({ code: "ER_PARSE_ERROR", message: "You have an error in your SQL" }), + ).toBe(false); + }); +}); + +describe("Handlers graceful offline error handling", () => { + const createMockRpc = () => ({ + sendResponse: jest.fn(), + sendError: jest.fn(), + }); + + const createMockLogger = () => ({ + error: jest.fn(), + warn: jest.fn(), + info: jest.fn(), + debug: jest.fn(), + }); + + test("DatabaseHandlers.handleListTables returns empty data with isOffline: true when offline", async () => { + const mockRpc = createMockRpc(); + const mockLogger = createMockLogger(); + const mockDbService = { + withConnection: jest + .fn() + .mockRejectedValue(new Error("getaddrinfo ENOTFOUND remote-cluster.example.com")), + }; + const mockQueryExecutor = {}; + + const handlers = new DatabaseHandlers( + mockRpc as any, + mockLogger as any, + mockDbService as any, + mockQueryExecutor as any, + ); + + await handlers.handleListTables({ id: "offline-db-1" }, 101); + + expect(mockRpc.sendResponse).toHaveBeenCalledWith(101, { + ok: true, + data: [], + isOffline: true, + }); + expect(mockRpc.sendError).not.toHaveBeenCalled(); + expect(mockLogger.error).not.toHaveBeenCalled(); + expect(mockLogger.warn).toHaveBeenCalled(); + }); + + test("DatabaseHandlers.handleListSchemas returns empty data with isOffline: true when offline", async () => { + const mockRpc = createMockRpc(); + const mockLogger = createMockLogger(); + const mockDbService = { + withConnection: jest + .fn() + .mockRejectedValue(new Error("connect ECONNREFUSED 127.0.0.1:5432")), + }; + const mockQueryExecutor = {}; + + const handlers = new DatabaseHandlers( + mockRpc as any, + mockLogger as any, + mockDbService as any, + mockQueryExecutor as any, + ); + + await handlers.handleListSchemas({ id: "offline-db-2" }, 102); + + expect(mockRpc.sendResponse).toHaveBeenCalledWith(102, { + ok: true, + data: [], + isOffline: true, + }); + expect(mockRpc.sendError).not.toHaveBeenCalled(); + expect(mockLogger.error).not.toHaveBeenCalled(); + }); + + test("DatabaseHandlers.handleTestConnection returns disconnected with isOffline: true when offline", async () => { + const mockRpc = createMockRpc(); + const mockLogger = createMockLogger(); + const mockDbService = { + withConnection: jest + .fn() + .mockRejectedValue(new Error("connect ETIMEDOUT 192.168.1.100:3306")), + }; + const mockQueryExecutor = {}; + + const handlers = new DatabaseHandlers( + mockRpc as any, + mockLogger as any, + mockDbService as any, + mockQueryExecutor as any, + ); + + await handlers.handleTestConnection({ id: "offline-db-3" }, 103); + + expect(mockRpc.sendResponse).toHaveBeenCalledWith( + 103, + expect.objectContaining({ + ok: true, + data: expect.objectContaining({ + ok: false, + status: "disconnected", + isOffline: true, + }), + }), + ); + expect(mockLogger.error).not.toHaveBeenCalled(); + expect(mockLogger.warn).toHaveBeenCalled(); + }); + + test("StatsHandlers.handleGetStats returns zeroed stats with isOffline: true when offline", async () => { + const mockRpc = createMockRpc(); + const mockLogger = createMockLogger(); + const mockDbService = { + getDatabaseConnection: jest + .fn() + .mockRejectedValue(new Error("getaddrinfo ENOTFOUND my-cluster.mongodb.net")), + }; + const mockQueryExecutor = {}; + + const handlers = new StatsHandlers( + mockRpc as any, + mockLogger as any, + mockDbService as any, + mockQueryExecutor as any, + ); + + await handlers.handleGetStats({ id: "offline-mongo-1" }, 104); + + expect(mockRpc.sendResponse).toHaveBeenCalledWith(104, { + ok: true, + data: { tables: 0, rows: 0, sizeBytes: 0 }, + isOffline: true, + }); + expect(mockRpc.sendError).not.toHaveBeenCalled(); + expect(mockLogger.error).not.toHaveBeenCalled(); + expect(mockLogger.warn).toHaveBeenCalled(); + }); +}); diff --git a/bridge/__tests__/discoveryService.test.ts b/bridge/__tests__/discoveryService.test.ts index ae078d6f..64538cf4 100644 --- a/bridge/__tests__/discoveryService.test.ts +++ b/bridge/__tests__/discoveryService.test.ts @@ -49,6 +49,16 @@ describe("DiscoveryService", () => { expect(name).toMatch(/^[a-z]+-[a-z]+-3307$/); }); + test("should not add port suffix for default MongoDB port", () => { + const name = service.generateFunName("mongodb", 27017); + expect(name).not.toContain("-27017"); + }); + + test("should add port suffix for non-default MongoDB port", () => { + const name = service.generateFunName("mongodb", 27018); + expect(name).toMatch(/^[a-z]+-[a-z]+-27018$/); + }); + test("should generate different names on multiple calls", () => { // Given the randomness, most calls should produce different names const names = new Set(); @@ -64,7 +74,7 @@ describe("DiscoveryService", () => { // Access private method via prototype for testing const extractCredentials = ( svc: DiscoveryService, - dbType: "postgresql" | "mysql" | "mariadb" | "clickhouse", + dbType: "postgresql" | "mysql" | "mariadb" | "clickhouse" | "mongodb", envVars: Map, ) => { return (svc as any).extractCredentialsFromEnv(dbType, envVars); @@ -230,6 +240,119 @@ describe("DiscoveryService", () => { expect(result.database).toBe("default"); }); }); + + describe("MongoDB", () => { + test("should extract MongoDB credentials from env vars and default root db to admin", () => { + const envVars = new Map([ + ["MONGO_INITDB_ROOT_USERNAME", "mongouser"], + ["MONGO_INITDB_ROOT_PASSWORD", "mongopass"], + ["MONGO_INITDB_DATABASE", "customdb"], + ]); + + const result = extractCredentials(service, "mongodb", envVars); + + expect(result.user).toBe("mongouser"); + expect(result.password).toBe("mongopass"); + expect(result.database).toBe("admin"); + }); + + test("should extract Bitnami MongoDB credentials with root default user", () => { + const envVars = new Map([["MONGODB_ROOT_PASSWORD", "secret"]]); + + const result = extractCredentials(service, "mongodb", envVars); + + expect(result.user).toBe("root"); + expect(result.password).toBe("secret"); + expect(result.database).toBe("admin"); + }); + + test("should extract non-root MongoDB credentials with custom database", () => { + const envVars = new Map([ + ["MONGODB_USERNAME", "appuser"], + ["MONGODB_PASSWORD", "apppass"], + ["MONGODB_DATABASE", "appdb"], + ]); + + const result = extractCredentials(service, "mongodb", envVars); + + expect(result.user).toBe("appuser"); + expect(result.password).toBe("apppass"); + expect(result.database).toBe("appdb"); + }); + + test("should use defaults when MongoDB env vars are missing", () => { + const envVars = new Map(); + + const result = extractCredentials(service, "mongodb", envVars); + + expect(result.user).toBe(""); + expect(result.password).toBe(""); + expect(result.database).toBe("admin"); + }); + }); + }); + + describe("Docker image matching & port mapping (via reflection)", () => { + const matchImageType = (svc: DiscoveryService, image: string) => { + return (svc as any).matchImageType(image); + }; + + const parsePortMapping = (svc: DiscoveryService, ports: string, dbType: any) => { + return (svc as any).parsePortMapping(ports, dbType); + }; + + test("should exclude mongo-express:latest from MongoDB detection", () => { + expect(matchImageType(service, "mongo-express:latest")).toBeNull(); + expect(matchImageType(service, "mongo:latest")).toBe("mongodb"); + expect(matchImageType(service, "bitnami/mongodb:latest")).toBe("mongodb"); + expect(matchImageType(service, "percona-server-mongodb:latest")).toBe("mongodb"); + }); + + test("should accept 127.0.0.1:37017->27017/tcp and exclude 28017 port for MongoDB", () => { + const valid = parsePortMapping(service, "127.0.0.1:37017->27017/tcp", "mongodb"); + expect(valid).toEqual({ hostPort: 37017, containerPort: 27017 }); + + const excluded = parsePortMapping(service, "127.0.0.1:28017->28017/tcp", "mongodb"); + expect(excluded).toBeNull(); + }); + + test("should accept loopback, 0.0.0.0, and IPv6 bindings", () => { + expect(parsePortMapping(service, "0.0.0.0:27017->27017/tcp", "mongodb")).toEqual({ + hostPort: 27017, + containerPort: 27017, + }); + expect(parsePortMapping(service, "[::]:27017->27017/tcp", "mongodb")).toEqual({ + hostPort: 27017, + containerPort: 27017, + }); + expect(parsePortMapping(service, ":::27017->27017/tcp", "mongodb")).toEqual({ + hostPort: 27017, + containerPort: 27017, + }); + }); + + test("should accept [::1] and ::1 IPv6 loopback bindings", () => { + expect(parsePortMapping(service, "[::1]:37017->27017/tcp", "mongodb")).toEqual({ + hostPort: 37017, + containerPort: 27017, + }); + expect(parsePortMapping(service, "::1:37017->27017/tcp", "mongodb")).toEqual({ + hostPort: 37017, + containerPort: 27017, + }); + }); + + test("should parse multiple port mappings and skip excluded MongoDB 28017 port", () => { + const multiPort = parsePortMapping( + service, + "0.0.0.0:28017->28017/tcp, 0.0.0.0:37017->27017/tcp", + "mongodb", + ); + expect(multiPort).toEqual({ hostPort: 37017, containerPort: 27017 }); + + const singleExcluded = parsePortMapping(service, "0.0.0.0:28017->28017/tcp", "mongodb"); + expect(singleExcluded).toBeNull(); + }); }); describe("getDefaultPort (private)", () => { @@ -253,6 +376,10 @@ describe("DiscoveryService", () => { expect(getDefaultPort(service, "clickhouse")).toBe(8123); }); + test("should return 27017 for mongodb", () => { + expect(getDefaultPort(service, "mongodb")).toBe(27017); + }); + test("should return 0 for unknown type", () => { expect(getDefaultPort(service, "unknown")).toBe(0); }); @@ -279,6 +406,10 @@ describe("DiscoveryService", () => { expect(getDefaultUser(service, "clickhouse")).toBe("default"); }); + test("should return empty string for mongodb", () => { + expect(getDefaultUser(service, "mongodb")).toBe(""); + }); + test("should return empty string for unknown type", () => { expect(getDefaultUser(service, "unknown")).toBe(""); }); @@ -305,6 +436,10 @@ describe("DiscoveryService", () => { expect(getDefaultDatabase(service, "clickhouse")).toBe("default"); }); + test("should return admin for mongodb", () => { + expect(getDefaultDatabase(service, "mongodb")).toBe("admin"); + }); + test("should return empty string for unknown type", () => { expect(getDefaultDatabase(service, "unknown")).toBe(""); }); @@ -392,10 +527,21 @@ describe("DiscoveryService", () => { defaultDatabase: "default", }; + const mongoDb: DiscoveredDatabase = { + type: "mongodb", + host: "localhost", + port: 27017, + source: "local", + suggestedName: "mongo-db", + defaultUser: "", + defaultDatabase: "admin", + }; + expect(pgDb.type).toBe("postgresql"); expect(mysqlDb.type).toBe("mysql"); expect(mariaDb.type).toBe("mariadb"); expect(clickhouseDb.type).toBe("clickhouse"); + expect(mongoDb.type).toBe("mongodb"); }); }); @@ -412,7 +558,7 @@ describe("DiscoveryService", () => { for (const db of result) { expect(db.type).toBeDefined(); - expect(["postgresql", "mysql", "mariadb", "clickhouse"]).toContain(db.type); + expect(["postgresql", "mysql", "mariadb", "clickhouse", "mongodb"]).toContain(db.type); expect(db.host).toBeDefined(); expect(typeof db.port).toBe("number"); expect(db.source).toBeDefined(); diff --git a/bridge/package.json b/bridge/package.json index 3e615dfa..65269b80 100644 --- a/bridge/package.json +++ b/bridge/package.json @@ -1,6 +1,6 @@ { "name": "relwave-bridge", - "version": "1.3.0", + "version": "1.3.5", "type": "commonjs", "main": "dist/index.cjs", "scripts": { diff --git a/bridge/src/handlers/databaseHandlers.ts b/bridge/src/handlers/databaseHandlers.ts index c5676bdb..1a2bdd3b 100644 --- a/bridge/src/handlers/databaseHandlers.ts +++ b/bridge/src/handlers/databaseHandlers.ts @@ -1,5 +1,5 @@ import { Rpc } from "../types"; -import { DatabaseService } from "../services/databaseService"; +import { DatabaseService, isOfflineError } from "../services/databaseService"; import { QueryExecutor } from "../services/queryExecutor"; import { ConnectionBuilder } from "../services/connectionBuilder"; import { Logger } from "pino"; @@ -90,6 +90,10 @@ export class DatabaseHandlers { ); this.rpc.sendResponse(id, { ok: true, data: tables }); } catch (e: any) { + if (isOfflineError(e)) { + this.logger?.warn({ e, dbId: params?.id }, "db.listTables skipped: database is offline"); + return this.rpc.sendResponse(id, { ok: true, data: [], isOffline: true }); + } this.logger?.error({ e }, "db.listTables failed"); this.rpc.sendError(id, { code: "IO_ERROR", message: String(e) }); } @@ -109,6 +113,10 @@ export class DatabaseHandlers { ); this.rpc.sendResponse(id, { ok: true, data: schemas }); } catch (e: any) { + if (isOfflineError(e)) { + this.logger?.warn({ e, dbId: params?.id }, "db.listSchemas skipped: database is offline"); + return this.rpc.sendResponse(id, { ok: true, data: [], isOffline: true }); + } this.logger?.error({ e }, "db.listSchemas failed"); this.rpc.sendError(id, { code: "IO_ERROR", message: String(e) }); } @@ -128,6 +136,10 @@ export class DatabaseHandlers { ); this.rpc.sendResponse(id, { ok: true, data: dbSchema }); } catch (e: any) { + if (isOfflineError(e)) { + this.logger?.warn({ e, dbId: params?.id }, "db.getSchema skipped: database is offline"); + return this.rpc.sendResponse(id, { ok: true, data: [], isOffline: true }); + } this.logger?.error({ e }, "db.getSchema failed"); this.rpc.sendError(id, { code: "IO_ERROR", message: String(e) }); } @@ -208,6 +220,14 @@ export class DatabaseHandlers { } this.rpc.sendResponse(id, { ok: true, data: result }); } catch (err: any) { + if (isOfflineError(err)) { + this.logger.warn({ err }, "[Handler] testConnection: database is offline"); + this.rpc.sendResponse(id, { + ok: true, + data: { ok: false, status: "disconnected", message: String(err), isOffline: true }, + }); + return; + } this.logger.error({ err }, "[Handler] testConnection error"); this.rpc.sendResponse(id, { ok: false, message: String(err) }); } finally { diff --git a/bridge/src/handlers/statsHandlers.ts b/bridge/src/handlers/statsHandlers.ts index a08107cd..f1534f50 100644 --- a/bridge/src/handlers/statsHandlers.ts +++ b/bridge/src/handlers/statsHandlers.ts @@ -3,7 +3,7 @@ // ---------------------------- import { Rpc } from "../types"; -import { DatabaseService } from "../services/databaseService"; +import { DatabaseService, isOfflineError } from "../services/databaseService"; import { QueryExecutor } from "../services/queryExecutor"; import { Logger } from "pino"; @@ -38,6 +38,14 @@ export class StatsHandlers { const rawStats = await this.queryExecutor.getStats(conn, dbType); this.rpc.sendResponse(id, { ok: true, data: parseStats(rawStats) }); } catch (e: any) { + if (isOfflineError(e)) { + this.logger.warn({ e, dbId: params?.id }, "db.getStats skipped: database is offline"); + return this.rpc.sendResponse(id, { + ok: true, + data: { tables: 0, rows: 0, sizeBytes: 0 }, + isOffline: true, + }); + } this.logger.error({ e }, "db.getStats failed"); this.rpc.sendError(id, { code: "IO_ERROR", message: String(e) }); } diff --git a/bridge/src/services/databaseService.ts b/bridge/src/services/databaseService.ts index 39768d6f..6a623a75 100644 --- a/bridge/src/services/databaseService.ts +++ b/bridge/src/services/databaseService.ts @@ -19,6 +19,61 @@ import { } from "../connectors/mongo"; import logger from "./logger"; +export function isOfflineError(err: any): boolean { + if (!err) return false; + const code = String(err.code || "").toUpperCase(); + const name = String(err.name || ""); + const msg = String(err.message || err); + + const offlineCodes = new Set([ + "ENOTFOUND", + "ECONNREFUSED", + "ETIMEDOUT", + "EHOSTUNREACH", + "ENETUNREACH", + "ECONNRESET", + "EAI_AGAIN", + "EPIPE", + "PROTOCOL_CONNECTION_LOST", + ]); + + if (offlineCodes.has(code)) return true; + + if ( + name === "MongoServerSelectionError" || + name === "MongoNetworkError" || + name === "MongoNetworkTimeoutError" || + name === "MongoTopologyClosedError" + ) { + return true; + } + + const lowerMsg = msg.toLowerCase(); + if ( + lowerMsg.includes("enotfound") || + lowerMsg.includes("econnrefused") || + lowerMsg.includes("etimedout") || + lowerMsg.includes("ehostunreach") || + lowerMsg.includes("enetunreach") || + lowerMsg.includes("econnreset") || + lowerMsg.includes("eai_again") || + lowerMsg.includes("server selection timed out") || + lowerMsg.includes("topology is closed") || + lowerMsg.includes("connection reset by peer") || + lowerMsg.includes("connection terminated unexpectedly") || + lowerMsg.includes("connect timeout") || + lowerMsg.includes("database is offline") + ) { + return true; + } + + if (err?.cause && typeof err.cause === "object") { + return isOfflineError(err.cause); + } + + return false; +} + export class DatabaseService { private dbGenerations = new Map(); private inFlightConnections = new Map>(); @@ -142,20 +197,7 @@ export class DatabaseService { } isFatalConnectionError(err: any): boolean { - if (!err) return false; - const name = err.name || ""; - const msg = err.message || ""; - return ( - name === "MongoServerSelectionError" || - name === "MongoNetworkError" || - name === "MongoNetworkTimeoutError" || - name === "MongoTopologyClosedError" || - msg.includes("connection reset by peer") || - msg.includes("ECONNRESET") || - msg.includes("ECONNREFUSED") || - msg.includes("ETIMEDOUT") || - msg.includes("Topology is closed") - ); + return isOfflineError(err); } async withConnection( diff --git a/bridge/src/services/discoveryService.ts b/bridge/src/services/discoveryService.ts index 4edf15db..4d44a4cb 100644 --- a/bridge/src/services/discoveryService.ts +++ b/bridge/src/services/discoveryService.ts @@ -17,6 +17,7 @@ const DATABASE_PORTS: Record = { mysql: [3306, 3307, 3308], mariadb: [3306, 3307, 3308], clickhouse: [8123, 8124], + mongodb: [27017, 27018, 27019], }; // Fun adjectives and nouns for generating database names @@ -91,7 +92,7 @@ const NOUNS = [ ]; export interface DiscoveredDatabase { - type: "postgresql" | "mysql" | "mariadb" | "clickhouse"; + type: "postgresql" | "mysql" | "mariadb" | "clickhouse" | "mongodb"; host: string; port: number; source: "local" | "docker"; @@ -127,6 +128,8 @@ export class DiscoveryService { return 3306; case "clickhouse": return 8123; + case "mongodb": + return 27017; default: return 0; } @@ -144,6 +147,8 @@ export class DiscoveryService { return "root"; case "clickhouse": return "default"; + case "mongodb": + return ""; default: return ""; } @@ -161,6 +166,8 @@ export class DiscoveryService { return "mysql"; case "clickhouse": return "default"; + case "mongodb": + return "admin"; default: return ""; } @@ -213,7 +220,8 @@ export class DiscoveryService { scannedPorts.add(key); // Determine the actual type based on the port - let actualType: "postgresql" | "mysql" | "mariadb" | "clickhouse" = dbType as any; + let actualType: "postgresql" | "mysql" | "mariadb" | "clickhouse" | "mongodb" = + dbType as any; if (port >= 5432 && port <= 5434) { actualType = "postgresql"; } else if (port >= 3306 && port <= 3308) { @@ -221,6 +229,8 @@ export class DiscoveryService { actualType = "mysql"; } else if (port === 8123 || port === 8124) { actualType = "clickhouse"; + } else if (port >= 27017 && port <= 27019) { + actualType = "mongodb"; } discovered.push({ @@ -272,7 +282,7 @@ export class DiscoveryService { * Extract database credentials from container environment variables */ private extractCredentialsFromEnv( - dbType: "postgresql" | "mysql" | "mariadb" | "clickhouse", + dbType: "postgresql" | "mysql" | "mariadb" | "clickhouse" | "mongodb", envVars: Map, ): { user: string; password: string; database: string } { if (dbType === "postgresql") { @@ -281,6 +291,37 @@ export class DiscoveryService { password: envVars.get("POSTGRES_PASSWORD") || "", database: envVars.get("POSTGRES_DB") || envVars.get("POSTGRES_USER") || "postgres", }; + } else if (dbType === "mongodb") { + const rootUser = + envVars.get("MONGO_INITDB_ROOT_USERNAME") || + envVars.get("MONGODB_ROOT_USER") || + (envVars.has("MONGODB_ROOT_PASSWORD") ? "root" : ""); + const rootPassword = + envVars.get("MONGO_INITDB_ROOT_PASSWORD") || envVars.get("MONGODB_ROOT_PASSWORD") || ""; + const normalUser = envVars.get("MONGODB_USERNAME") || ""; + const normalPassword = envVars.get("MONGODB_PASSWORD") || ""; + + if (rootUser || rootPassword) { + return { + user: rootUser, + password: rootPassword, + database: "admin", + }; + } else if (normalUser || normalPassword) { + return { + user: normalUser, + password: normalPassword, + database: + envVars.get("MONGODB_DATABASE") || envVars.get("MONGO_INITDB_DATABASE") || "admin", + }; + } else { + return { + user: "", + password: "", + database: + envVars.get("MONGO_INITDB_DATABASE") || envVars.get("MONGODB_DATABASE") || "admin", + }; + } } else if (dbType === "mysql") { // MySQL can use MYSQL_USER or root with MYSQL_ROOT_PASSWORD const user = envVars.get("MYSQL_USER") || "root"; @@ -315,6 +356,54 @@ export class DiscoveryService { } } + /** + * Determine database type from Docker image name + */ + private matchImageType( + image: string, + ): "postgresql" | "mysql" | "mariadb" | "clickhouse" | "mongodb" | null { + const isMongo = + /(?:^|\/)(?:mongo|mongodb|mongodb-community-server|mongodb-enterprise-server|percona-server-mongodb)(?::|$)/i.test( + image, + ) && !image.toLowerCase().includes("mongo-express"); + + if (image.includes("postgres") || image.includes("pg") || image.includes("postgresql")) { + return "postgresql"; + } else if (image.includes("mariadb")) { + return "mariadb"; + } else if (image.includes("mysql")) { + return "mysql"; + } else if (image.includes("clickhouse")) { + return "clickhouse"; + } else if (isMongo) { + return "mongodb"; + } + return null; + } + + /** + * Parse port mapping string and filter out excluded ports + */ + private parsePortMapping( + ports: string, + dbType: "postgresql" | "mysql" | "mariadb" | "clickhouse" | "mongodb", + ): { hostPort: number; containerPort: number } | null { + const mappings = ports.split(","); + for (const mapping of mappings) { + const portMatch = mapping.match( + /(?:127\.0\.0\.1|0\.0\.0\.0|\[::1\]|::1|\[::\]|::):(\d+)->(\d+)/, + ); + if (!portMatch) continue; + const hostPort = parseInt(portMatch[1], 10); + const containerPort = parseInt(portMatch[2], 10); + if (dbType === "mongodb" && containerPort === 28017) { + continue; + } + return { hostPort, containerPort }; + } + return null; + } + /** * Discover databases running in Docker containers */ @@ -332,23 +421,12 @@ export class DiscoveryService { for (const line of lines) { const [containerName, image, ports] = line.split("|"); - // Determine database type from image name - let dbType: "postgresql" | "mysql" | "mariadb" | "clickhouse" | null = null; - if (image.includes("postgres") || image.includes("pg") || image.includes("postgresql")) { - dbType = "postgresql"; - } else if (image.includes("mariadb")) { - dbType = "mariadb"; - } else if (image.includes("mysql")) { - dbType = "mysql"; - } else if (image.includes("clickhouse")) { - dbType = "clickhouse"; - } + const dbType = this.matchImageType(image); if (dbType && ports) { - // Parse port mappings like "0.0.0.0:5432->5432/tcp" - const portMatch = ports.match(/0\.0\.0\.0:(\d+)->(\d+)/); - if (portMatch) { - const hostPort = parseInt(portMatch[1], 10); + const portMapping = this.parsePortMapping(ports, dbType); + if (portMapping) { + const hostPort = portMapping.hostPort; // Get environment variables from the container const envVars = await this.getContainerEnvVars(containerName); diff --git a/index.html b/index.html index fd38402a..0b10f76c 100644 --- a/index.html +++ b/index.html @@ -12,12 +12,6 @@ rel="stylesheet" /> - - RelWave diff --git a/package.json b/package.json index 14c87e5c..c6313ebd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "relwave", "private": true, - "version": "1.3.0", + "version": "1.3.5", "type": "module", "scripts": { "dev": "vite", @@ -65,11 +65,13 @@ "next-themes": "^0.4.6", "radix-ui": "^1.4.3", "react": "^19.1.0", + "react-devicons": "^2.16.2", "react-dom": "^19.1.0", "react-markdown": "^10.1.0", "react-router-dom": "^7.9.6", "reactflow": "^11.11.4", "recharts": "^2.15.4", + "remark-gfm": "^4.0.1", "sonner": "^2.0.7", "styled-components": "^6.1.19", "tailwind-merge": "^3.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 86436e2c..70fc955e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,6 +134,9 @@ importers: react: specifier: ^19.1.0 version: 19.2.3 + react-devicons: + specifier: ^2.16.2 + version: 2.16.2 react-dom: specifier: ^19.1.0 version: 19.2.3(react@19.2.3) @@ -149,6 +152,9 @@ importers: recharts: specifier: ^2.15.4 version: 2.15.4(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + remark-gfm: + specifier: ^4.0.1 + version: 4.0.1(supports-color@8.1.1) sonner: specifier: ^2.0.7 version: 2.0.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3) @@ -2494,6 +2500,10 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} + escape-string-regexp@5.0.0: + resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} + engines: {node: '>=12'} + eslint-config-prettier@10.1.8: resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==} hasBin: true @@ -2882,9 +2892,33 @@ packages: resolution: {integrity: sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==} hasBin: true + markdown-table@3.1.0: + resolution: {integrity: sha512-xpeSCdM+B+6P3ncfgaB7FoDbtJ30xAe6Z18TGT7AgXJsHqCElCICZovQqdRMm7kHgpTyYv36EupqewoFFSB8vw==} + + mdast-util-find-and-replace@3.0.4: + resolution: {integrity: sha512-z4B5c6jrnJ1ltOQemhWYPBSAo6y42Z8Gt2yEgfgNTMcLSU59B8bfj8Z8AnAlJrBGLnqkdAUZ7jdDEqQw3KuipQ==} + mdast-util-from-markdown@2.0.3: resolution: {integrity: sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==} + mdast-util-gfm-autolink-literal@2.1.0: + resolution: {integrity: sha512-Jx6QSK8wDo558Bcf7q+1pe0v81g2PVs09Hlvu9xJHmCFRF3sAPW7vXFVIAwBncs3sde92WbsVqNxwdqViA2XnQ==} + + mdast-util-gfm-footnote@2.1.0: + resolution: {integrity: sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==} + + mdast-util-gfm-strikethrough@2.0.1: + resolution: {integrity: sha512-OuJHqvr455pwu2OaOrir7dbzqs4jlWKOtlu9L6GjcIjjQwNyw02VntQsr/Ek6/A13vgnXfUhBekWRUP1OkNivw==} + + mdast-util-gfm-table@2.0.1: + resolution: {integrity: sha512-fiIjPrAy4kz68/eFbPHhsiWDGHhqUSVoU1XsfLM5DsEPXw7MxgiVVyulUggFRckVWeT1KXQXkg5vm3kv4oMSOA==} + + mdast-util-gfm-task-list-item@2.0.1: + resolution: {integrity: sha512-jXVO1hvB2hs82g1esi7I9nIJDqiijbQLIyH2jDUb5s7jIAZMr/79h0VHSq7XHKTqpLARRm+DDNjduB7S9+6XZA==} + + mdast-util-gfm@3.1.0: + resolution: {integrity: sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==} + mdast-util-mdx-expression@2.0.1: resolution: {integrity: sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==} @@ -2912,6 +2946,27 @@ packages: micromark-core-commonmark@2.0.3: resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==} + micromark-extension-gfm-autolink-literal@2.1.0: + resolution: {integrity: sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==} + + micromark-extension-gfm-footnote@2.1.0: + resolution: {integrity: sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==} + + micromark-extension-gfm-strikethrough@2.1.0: + resolution: {integrity: sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==} + + micromark-extension-gfm-table@2.1.2: + resolution: {integrity: sha512-pRzm4kDTu0MjlmBkxmS9yYhw60nncfcEwu9NNdPFSQEFXS95ZKyIIyTSHu/o3ReBUrLKYEq+7YaXCRn/bPB4MA==} + + micromark-extension-gfm-tagfilter@2.0.0: + resolution: {integrity: sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==} + + micromark-extension-gfm-task-list-item@2.1.0: + resolution: {integrity: sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==} + + micromark-extension-gfm@3.0.0: + resolution: {integrity: sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==} + micromark-factory-destination@2.0.1: resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==} @@ -3151,6 +3206,9 @@ packages: rbush@3.0.1: resolution: {integrity: sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==} + react-devicons@2.16.2: + resolution: {integrity: sha512-oVNx7pRIW5UfvSZGlvUICvBL54DfL/rGJWyf/5qJFCG9Cd4zzul0yYE0cKJASvQDPzjARhOq07No9SoQlURrFA==} + react-dom@19.2.3: resolution: {integrity: sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==} peerDependencies: @@ -3231,6 +3289,10 @@ packages: react: '>=16.6.0' react-dom: '>=16.6.0' + react@18.3.1: + resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} + engines: {node: '>=0.10.0'} + react@19.2.3: resolution: {integrity: sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==} engines: {node: '>=0.10.0'} @@ -3252,12 +3314,18 @@ packages: react: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 + remark-gfm@4.0.1: + resolution: {integrity: sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==} + remark-parse@11.0.0: resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==} remark-rehype@11.1.2: resolution: {integrity: sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==} + remark-stringify@11.0.0: + resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==} + require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} @@ -3447,6 +3515,9 @@ packages: unist-util-visit-parents@6.0.2: resolution: {integrity: sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==} + unist-util-visit-parents@6.1.0: + resolution: {integrity: sha512-vKXxz6O38sKDj1mtx/k2cWvkkFBuYGx6uGrlzBkVeWCRF/F8sdI0j3Wbkz/5rVNRRuVc8UrgRdbCxNhmYXgP3w==} + unist-util-visit@5.1.0: resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==} @@ -5965,6 +6036,8 @@ snapshots: escape-string-regexp@4.0.0: {} + escape-string-regexp@5.0.0: {} + eslint-config-prettier@10.1.8(eslint@9.39.5(jiti@2.6.1)(supports-color@8.1.1)): dependencies: eslint: 9.39.5(jiti@2.6.1)(supports-color@8.1.1) @@ -6303,6 +6376,15 @@ snapshots: punycode.js: 2.3.1 uc.micro: 2.1.0 + markdown-table@3.1.0: {} + + mdast-util-find-and-replace@3.0.4: + dependencies: + '@types/mdast': 4.0.4 + escape-string-regexp: 5.0.0 + unist-util-is: 6.0.1 + unist-util-visit-parents: 6.1.0 + mdast-util-from-markdown@2.0.3(supports-color@8.1.1): dependencies: '@types/mdast': 4.0.4 @@ -6320,6 +6402,65 @@ snapshots: transitivePeerDependencies: - supports-color + mdast-util-gfm-autolink-literal@2.1.0: + dependencies: + '@types/mdast': 4.0.4 + ccount: 2.0.1 + devlop: 1.1.0 + mdast-util-find-and-replace: 3.0.4 + micromark-util-character: 2.1.1 + + mdast-util-gfm-footnote@2.1.0(supports-color@8.1.1): + dependencies: + '@types/mdast': 4.0.4 + devlop: 1.1.0 + mdast-util-from-markdown: 2.0.3(supports-color@8.1.1) + mdast-util-to-markdown: 2.1.2 + micromark-util-normalize-identifier: 2.0.1 + transitivePeerDependencies: + - supports-color + + mdast-util-gfm-strikethrough@2.0.1(supports-color@8.1.1): + dependencies: + '@types/mdast': 4.0.4 + mdast-util-from-markdown: 2.0.3(supports-color@8.1.1) + mdast-util-to-markdown: 2.1.2 + transitivePeerDependencies: + - supports-color + + mdast-util-gfm-table@2.0.1(supports-color@8.1.1): + dependencies: + '@types/mdast': 4.0.4 + devlop: 1.1.0 + markdown-table: 3.1.0 + mdast-util-from-markdown: 2.0.3(supports-color@8.1.1) + mdast-util-to-markdown: 2.1.2 + mdast-util-to-string: 4.0.0 + unist-util-visit: 5.1.0 + transitivePeerDependencies: + - supports-color + + mdast-util-gfm-task-list-item@2.0.1(supports-color@8.1.1): + dependencies: + '@types/mdast': 4.0.4 + devlop: 1.1.0 + mdast-util-from-markdown: 2.0.3(supports-color@8.1.1) + mdast-util-to-markdown: 2.1.2 + transitivePeerDependencies: + - supports-color + + mdast-util-gfm@3.1.0(supports-color@8.1.1): + dependencies: + mdast-util-from-markdown: 2.0.3(supports-color@8.1.1) + mdast-util-gfm-autolink-literal: 2.1.0 + mdast-util-gfm-footnote: 2.1.0(supports-color@8.1.1) + mdast-util-gfm-strikethrough: 2.0.1(supports-color@8.1.1) + mdast-util-gfm-table: 2.0.1(supports-color@8.1.1) + mdast-util-gfm-task-list-item: 2.0.1(supports-color@8.1.1) + mdast-util-to-markdown: 2.1.2 + transitivePeerDependencies: + - supports-color + mdast-util-mdx-expression@2.0.1(supports-color@8.1.1): dependencies: '@types/estree-jsx': 1.0.5 @@ -6413,6 +6554,64 @@ snapshots: micromark-util-symbol: 2.0.1 micromark-util-types: 2.0.2 + micromark-extension-gfm-autolink-literal@2.1.0: + dependencies: + micromark-util-character: 2.1.1 + micromark-util-sanitize-uri: 2.0.1 + micromark-util-symbol: 2.0.1 + micromark-util-types: 2.0.2 + + micromark-extension-gfm-footnote@2.1.0: + dependencies: + devlop: 1.1.0 + micromark-core-commonmark: 2.0.3 + micromark-factory-space: 2.0.1 + micromark-util-character: 2.1.1 + micromark-util-normalize-identifier: 2.0.1 + micromark-util-sanitize-uri: 2.0.1 + micromark-util-symbol: 2.0.1 + micromark-util-types: 2.0.2 + + micromark-extension-gfm-strikethrough@2.1.0: + dependencies: + devlop: 1.1.0 + micromark-util-chunked: 2.0.1 + micromark-util-classify-character: 2.0.1 + micromark-util-resolve-all: 2.0.1 + micromark-util-symbol: 2.0.1 + micromark-util-types: 2.0.2 + + micromark-extension-gfm-table@2.1.2: + dependencies: + devlop: 1.1.0 + micromark-factory-space: 2.0.1 + micromark-util-character: 2.1.1 + micromark-util-symbol: 2.0.1 + micromark-util-types: 2.0.2 + + micromark-extension-gfm-tagfilter@2.0.0: + dependencies: + micromark-util-types: 2.0.2 + + micromark-extension-gfm-task-list-item@2.1.0: + dependencies: + devlop: 1.1.0 + micromark-factory-space: 2.0.1 + micromark-util-character: 2.1.1 + micromark-util-symbol: 2.0.1 + micromark-util-types: 2.0.2 + + micromark-extension-gfm@3.0.0: + dependencies: + micromark-extension-gfm-autolink-literal: 2.1.0 + micromark-extension-gfm-footnote: 2.1.0 + micromark-extension-gfm-strikethrough: 2.1.0 + micromark-extension-gfm-table: 2.1.2 + micromark-extension-gfm-tagfilter: 2.0.0 + micromark-extension-gfm-task-list-item: 2.1.0 + micromark-util-combine-extensions: 2.0.1 + micromark-util-types: 2.0.2 + micromark-factory-destination@2.0.1: dependencies: micromark-util-character: 2.1.1 @@ -6793,6 +6992,10 @@ snapshots: dependencies: quickselect: 2.0.0 + react-devicons@2.16.2: + dependencies: + react: 18.3.1 + react-dom@19.2.3(react@19.2.3): dependencies: react: 19.2.3 @@ -6880,6 +7083,10 @@ snapshots: react: 19.2.3 react-dom: 19.2.3(react@19.2.3) + react@18.3.1: + dependencies: + loose-envify: 1.4.0 + react@19.2.3: {} reactflow@11.11.4(@types/react@19.2.8)(react-dom@19.2.3(react@19.2.3))(react@19.2.3): @@ -6913,6 +7120,17 @@ snapshots: tiny-invariant: 1.3.3 victory-vendor: 36.9.2 + remark-gfm@4.0.1(supports-color@8.1.1): + dependencies: + '@types/mdast': 4.0.4 + mdast-util-gfm: 3.1.0(supports-color@8.1.1) + micromark-extension-gfm: 3.0.0 + remark-parse: 11.0.0(supports-color@8.1.1) + remark-stringify: 11.0.0 + unified: 11.0.5 + transitivePeerDependencies: + - supports-color + remark-parse@11.0.0(supports-color@8.1.1): dependencies: '@types/mdast': 4.0.4 @@ -6930,6 +7148,12 @@ snapshots: unified: 11.0.5 vfile: 6.0.3 + remark-stringify@11.0.0: + dependencies: + '@types/mdast': 4.0.4 + mdast-util-to-markdown: 2.1.2 + unified: 11.0.5 + require-directory@2.1.1: {} resolve-from@4.0.0: {} @@ -7149,6 +7373,11 @@ snapshots: '@types/unist': 3.0.3 unist-util-is: 6.0.1 + unist-util-visit-parents@6.1.0: + dependencies: + '@types/unist': 3.0.3 + unist-util-is: 6.0.1 + unist-util-visit@5.1.0: dependencies: '@types/unist': 3.0.3 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index f5742474..c714798f 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3443,7 +3443,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "relwave" -version = "1.0.0" +version = "1.3.5" dependencies = [ "chrono", "dotenvy", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index a33ef62e..349ee520 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "relwave" -version = "1.3.0" +version = "1.3.5" description = "A powerful, cross-platform desktop application for database management with native Git version control." authors = ["yashh56"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 9a21698e..5983fee3 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "RelWave", - "version": "1.3.0", + "version": "1.3.5", "identifier": "tech.relwave.app", "build": { "beforeDevCommand": "vite", diff --git a/src/components/shared/WhatsNewDialog.tsx b/src/components/shared/WhatsNewDialog.tsx index 0a66752b..f201a222 100644 --- a/src/components/shared/WhatsNewDialog.tsx +++ b/src/components/shared/WhatsNewDialog.tsx @@ -2,6 +2,7 @@ import { useEffect, useState } from "react"; import { getVersion } from "@tauri-apps/api/app"; import { Sparkles, ArrowRight } from "lucide-react"; import ReactMarkdown from "react-markdown"; +import remarkGfm from "remark-gfm"; import { Dialog, DialogContent, @@ -10,6 +11,7 @@ import { DialogTitle, } from "@/components/ui/dialog"; import { Button } from "@/components/ui/button"; +import { cn } from "@/lib/utils"; const GITHUB_REPO = "Relwave/relwave-app"; @@ -119,7 +121,7 @@ export function WhatsNewDialog() { return ( - + {/* Header */}
@@ -148,7 +150,7 @@ export function WhatsNewDialog() { {/* Body */} -
+
{loading ? (
{[80, 60, 90, 50, 70].map((w, i) => ( @@ -161,65 +163,120 @@ export function WhatsNewDialog() {
) : ( ( -

+ h1: ({ className, children, ...props }) => ( +

{children}

), - h2: ({ children }) => ( -

+ h2: ({ className, children, ...props }) => ( +

{children}

), - h3: ({ children }) => ( -

{children}

+ h3: ({ className, children, ...props }) => ( +

+ {children} +

+ ), + ul: ({ children }) => ( +
    {children}
), - ul: ({ children }) =>
    {children}
, ol: ({ children }) => ( -
    {children}
+
    + {children} +
), - li: ({ children }) => ( -
  • - - {children} + li: ({ className, children, ...props }) => ( +
  • + {children}
  • ), p: ({ children }) => ( -

    {children}

    +

    {children}

    ), strong: ({ children }) => ( - {children} + {children} ), - em: ({ children }) => {children}, + em: ({ children }) => {children}, hr: () =>
    , + pre: ({ children }) => ( +
    +                    {children}
    +                  
    + ), code: ({ children, className }) => { const isBlock = !!className; return isBlock ? ( - - {children} - + {children} ) : ( - + {children} ); }, - a: ({ href, children }) => ( - - {children} - - ), + a: ({ href, className, children, ...props }) => { + const isFragment = href?.startsWith("#"); + return ( + + {children} + + ); + }, blockquote: ({ children }) => ( -
    +
    {children}
    ), + table: ({ children }) => ( +
    + {children}
    +
    + ), + thead: ({ children }) => ( + {children} + ), + tbody: ({ children }) => ( + {children} + ), + tr: ({ children }) => ( + {children} + ), + th: ({ children }) => ( + {children} + ), + td: ({ children }) => {children}, }} > {releaseInfo?.body ?? ""} diff --git a/src/features/database/hooks/useDatabaseStats.ts b/src/features/database/hooks/useDatabaseStats.ts index c254cb10..d134be91 100644 --- a/src/features/database/hooks/useDatabaseStats.ts +++ b/src/features/database/hooks/useDatabaseStats.ts @@ -29,7 +29,9 @@ export const useDatabaseStats = (bridgeReady: boolean, hasDatabases: boolean) => queryFn: async () => { const res = await databaseService.testAllConnections(); const statusMap = new Map(); - res.forEach((r) => statusMap.set(r.id, r.result.status)); + res.forEach((r) => + statusMap.set(r.id, r.result.status || (r.result.ok ? "connected" : "disconnected")), + ); updateStatusCache(statusMap); return statusMap; }, diff --git a/src/features/database/hooks/useDiscoveredDatabases.ts b/src/features/database/hooks/useDiscoveredDatabases.ts index 2b0f81b8..4664d845 100644 --- a/src/features/database/hooks/useDiscoveredDatabases.ts +++ b/src/features/database/hooks/useDiscoveredDatabases.ts @@ -12,7 +12,7 @@ interface UseDiscoveredDatabasesReturn { /** * Hook for discovering locally running databases - * Scans localhost ports and Docker containers for PostgreSQL, MySQL, and MariaDB + * Scans localhost ports and Docker containers for PostgreSQL, MySQL, MariaDB, and MongoDB */ export function useDiscoveredDatabases(): UseDiscoveredDatabasesReturn { const [databases, setDatabases] = useState([]); diff --git a/src/features/database/types.ts b/src/features/database/types.ts index 81600942..1cae3c30 100644 --- a/src/features/database/types.ts +++ b/src/features/database/types.ts @@ -194,6 +194,7 @@ export interface DatabaseStats { rows: number; sizeBytes: number; tables: number; + isOffline?: boolean; } export interface MonitoringActiveQuery { diff --git a/src/features/home/components/WelcomeView.tsx b/src/features/home/components/WelcomeView.tsx index 1589963f..d6532aba 100644 --- a/src/features/home/components/WelcomeView.tsx +++ b/src/features/home/components/WelcomeView.tsx @@ -32,24 +32,105 @@ function getDbColors(type: string) { return DB_COLORS[type] || { bg: "bg-primary/10", text: "text-primary" }; } -function ConnectionSizeItem({ db }: { db: DatabaseConnection }) { - const { data: stats, isLoading } = useDbStats(db.id); - const sizeStr = stats?.sizeBytes ? bytesToMBString(stats.sizeBytes) : "—"; +function ConnectionSizeItem({ + db, + isOnline, + isPending, +}: { + db: DatabaseConnection; + isOnline: boolean; + isPending?: boolean; +}) { + const isConfirmedOffline = !isPending && !isOnline; + const { data: stats, isLoading } = useDbStats(db.id, !isConfirmedOffline); + const isOfflineEffective = isConfirmedOffline || stats?.isOffline; + + let sizeStr = "—"; + if (isPending) { + sizeStr = "..."; + } else if (isOfflineEffective) { + sizeStr = "Offline"; + } else if (isLoading) { + sizeStr = "..."; + } else if (typeof stats?.sizeBytes === "number") { + sizeStr = bytesToMBString(stats.sizeBytes); + } + return (
    {db.name}
    - - {isLoading ? "..." : sizeStr} + + {sizeStr}
    ); } -function ConnectionTablesList({ db }: { db: DatabaseConnection }) { - const { data: tables, isLoading } = useTables(db.id); +function ConnectionTablesList({ + db, + isOnline, + isPending, +}: { + db: DatabaseConnection; + isOnline: boolean; + isPending?: boolean; +}) { + const isConfirmedOffline = !isPending && !isOnline; + const { data: tables, isLoading } = useTables(db.id, undefined, !isConfirmedOffline); + const isTableOffline = Boolean((tables as any)?.isOffline); + + if (isPending) { + return ( +
    +
    +
    +
    + +
    +

    {db.name}

    +
    + + Checking + +
    +

    + Checking connection status... +

    +
    + ); + } + + if (isConfirmedOffline || isTableOffline) { + return ( +
    +
    +
    +
    + +
    +

    {db.name}

    +
    + + Offline + +
    +

    + Database is offline. Tables cannot be listed. +

    +
    + ); + } + if (isLoading) return (
    @@ -200,15 +281,27 @@ export function WelcomeView({ - - + + All Tables - + {databases.length === 0 ? (
    No databases connected.
    ) : ( - databases.map((db) => ) + databases.map((db) => { + const dbStatus = status.get(db.id); + const isPending = dbStatus === undefined; + const isOnline = dbStatus === "connected"; + return ( + + ); + }) )}
    @@ -240,7 +333,19 @@ export function WelcomeView({ {databases.length === 0 ? (
    No databases connected.
    ) : ( - databases.map((db) => ) + databases.map((db) => { + const dbStatus = status.get(db.id); + const isPending = dbStatus === undefined; + const isOnline = dbStatus === "connected"; + return ( + + ); + }) )} diff --git a/src/features/project/hooks/useDbQueries.ts b/src/features/project/hooks/useDbQueries.ts index fe4b2786..99c87268 100644 --- a/src/features/project/hooks/useDbQueries.ts +++ b/src/features/project/hooks/useDbQueries.ts @@ -118,11 +118,15 @@ export function useTables(dbId: string | undefined, schema?: string, enabled = t queryKey: queryKeys.tables(dbId!, schema), queryFn: async () => { const result = await databaseService.listTables(dbId!, schema); - return result.map((item: any): TableInfo => ({ + const mapped = result.map((item: any): TableInfo => ({ schema: item.schema || "public", name: item.name || "unknown", type: item.type || "table", })); + if ((result as any)?.isOffline) { + (mapped as any).isOffline = true; + } + return mapped; }, enabled: !!dbId && enabled, staleTime: STALE_TIMES.tables, @@ -208,13 +212,13 @@ export function useMongoSchema( * Fetch database statistics * - Short cache time since stats change frequently */ -export function useDbStats(dbId: string | undefined) { +export function useDbStats(dbId: string | undefined, enabled = true) { return useQuery({ queryKey: queryKeys.stats(dbId!), queryFn: () => databaseService.getDataBaseStats(dbId!), - enabled: !!dbId, + enabled: !!dbId && enabled, staleTime: STALE_TIMES.stats, - refetchInterval: 60 * 1000, // Auto-refresh every minute + refetchInterval: enabled ? 60 * 1000 : false, // Auto-refresh every minute when enabled }); } diff --git a/src/lib/databases.tsx b/src/lib/databases.tsx index de0c369e..d815643a 100644 --- a/src/lib/databases.tsx +++ b/src/lib/databases.tsx @@ -2,6 +2,11 @@ import type { ReactNode } from "react"; import type { DatabaseType } from "@/features/database/types"; import { cn } from "@/lib/utils"; import { Database } from "lucide-react"; +import MongodbOriginal from "react-devicons/mongodb/original"; +import PostgresqlOriginal from "react-devicons/postgresql/original"; +import MysqlOriginal from "react-devicons/mysql/original"; +import MariadbOriginal from "react-devicons/mariadb/original"; +import SqliteOriginal from "react-devicons/sqlite/original"; export type SupportedDatabaseType = DatabaseType | "mariadb"; @@ -71,20 +76,7 @@ export const databases: DatabaseConfig[] = [ { category: "Boolean Flags", types: ["BOOLEAN"] }, { category: "Complex and Arrays", types: ["JSON", "JSONB", "UUID", "BYTEA", "ARRAY"] }, ], - icon: ( - - - - - - - ), + icon: , }, { id: "mysql", @@ -111,14 +103,7 @@ export const databases: DatabaseConfig[] = [ { category: "Boolean Flags", types: ["BOOLEAN", "TINYINT(1)"] }, { category: "Complex and Arrays", types: ["JSON"] }, ], - icon: ( - - - - ), + icon: , }, { id: "mariadb", @@ -145,14 +130,7 @@ export const databases: DatabaseConfig[] = [ { category: "Boolean Flags", types: ["BOOLEAN", "TINYINT(1)"] }, { category: "Complex and Arrays", types: ["JSON"] }, ], - icon: ( - - - - ), + icon: , }, { id: "sqlite", @@ -176,37 +154,7 @@ export const databases: DatabaseConfig[] = [ { category: "Boolean Flags", types: ["BOOLEAN"] }, { category: "Complex and Arrays", types: ["BLOB", "JSON"] }, ], - icon: ( - - - - - - - - - - - - - ), + icon: , }, { id: "duckdb", @@ -321,22 +269,7 @@ export const databases: DatabaseConfig[] = [ ], }, ], - icon: ( - - - - - - ), + icon: , }, ]; @@ -416,7 +349,6 @@ export function getDatabaseIcon(typeOrName?: string | null): ReactNode | null { export function DatabaseLogo({ type, className = "w-5 h-5", - useDevicon = false, }: { type?: string | null; className?: string; @@ -428,10 +360,6 @@ export function DatabaseLogo({ return ; } - if (useDevicon && meta.deviconClass) { - return ; - } - return (