refactored db's and browser

This commit is contained in:
Boki 2025-06-22 08:45:14 -04:00
parent a0a3b26177
commit 89cbfb7848
12 changed files with 111 additions and 39 deletions

View file

@ -1,4 +1,3 @@
import { getLogger } from '@stock-bot/logger';
import { Collection, Db, MongoClient, OptionalUnlessRequiredId } from 'mongodb';
import type { DocumentBase, MongoDBClientConfig, PoolMetrics, ConnectionEvents, DynamicPoolConfig } from './types';
@ -13,16 +12,17 @@ export class MongoDBClient {
private db: Db | null = null;
private readonly config: MongoDBClientConfig;
private defaultDatabase: string;
private readonly logger = getLogger('mongodb-client');
private readonly logger: any;
private isConnected = false;
private readonly metrics: PoolMetrics;
private readonly events?: ConnectionEvents;
private dynamicPoolConfig?: DynamicPoolConfig;
private poolMonitorInterval?: Timer;
constructor(config: MongoDBClientConfig, events?: ConnectionEvents) {
constructor(config: MongoDBClientConfig, logger?: any, events?: ConnectionEvents) {
this.config = config;
this.defaultDatabase = config.database || 'stock';
this.logger = logger || console;
this.events = events;
this.metrics = {
totalConnections: 0,

View file

@ -4,8 +4,8 @@ import type { MongoDBClientConfig, ConnectionEvents } from './types';
/**
* Factory function to create a MongoDB client instance
*/
export function createMongoDBClient(config: MongoDBClientConfig, events?: ConnectionEvents): MongoDBClient {
return new MongoDBClient(config, events);
export function createMongoDBClient(config: MongoDBClientConfig, logger?: any, events?: ConnectionEvents): MongoDBClient {
return new MongoDBClient(config, logger, events);
}
/**
@ -13,9 +13,10 @@ export function createMongoDBClient(config: MongoDBClientConfig, events?: Connec
*/
export async function createAndConnectMongoDBClient(
config: MongoDBClientConfig,
logger?: any,
events?: ConnectionEvents
): Promise<MongoDBClient> {
const client = createMongoDBClient(config, events);
const client = createMongoDBClient(config, logger, events);
await client.connect();
return client;
}

View file

@ -1,5 +1,4 @@
import { Pool, QueryResultRow } from 'pg';
import { getLogger } from '@stock-bot/logger';
import { PostgreSQLHealthMonitor } from './health';
import { PostgreSQLQueryBuilder } from './query-builder';
import { PostgreSQLTransactionManager } from './transactions';
@ -23,7 +22,7 @@ export class PostgreSQLClient {
private pool: Pool | null = null;
private readonly config: PostgreSQLClientConfig;
private readonly options: PostgreSQLConnectionOptions;
private readonly logger: ReturnType<typeof getLogger>;
private readonly logger: any;
private readonly healthMonitor: PostgreSQLHealthMonitor;
private readonly transactionManager: PostgreSQLTransactionManager;
private isConnected = false;
@ -32,7 +31,7 @@ export class PostgreSQLClient {
private dynamicPoolConfig?: DynamicPoolConfig;
private poolMonitorInterval?: NodeJS.Timeout;
constructor(config: PostgreSQLClientConfig, options?: PostgreSQLConnectionOptions, events?: ConnectionEvents) {
constructor(config: PostgreSQLClientConfig, logger?: any, options?: PostgreSQLConnectionOptions, events?: ConnectionEvents) {
this.config = config;
this.options = {
retryAttempts: 3,
@ -42,7 +41,7 @@ export class PostgreSQLClient {
};
this.events = events;
this.logger = getLogger('postgres-client');
this.logger = logger || console;
this.healthMonitor = new PostgreSQLHealthMonitor(this);
this.transactionManager = new PostgreSQLTransactionManager(this);

View file

@ -6,10 +6,11 @@ import type { PostgreSQLClientConfig, PostgreSQLConnectionOptions, ConnectionEve
*/
export function createPostgreSQLClient(
config: PostgreSQLClientConfig,
logger?: any,
options?: PostgreSQLConnectionOptions,
events?: ConnectionEvents
): PostgreSQLClient {
return new PostgreSQLClient(config, options, events);
return new PostgreSQLClient(config, logger, options, events);
}
/**
@ -17,10 +18,11 @@ export function createPostgreSQLClient(
*/
export async function createAndConnectPostgreSQLClient(
config: PostgreSQLClientConfig,
logger?: any,
options?: PostgreSQLConnectionOptions,
events?: ConnectionEvents
): Promise<PostgreSQLClient> {
const client = createPostgreSQLClient(config, options, events);
const client = createPostgreSQLClient(config, logger, options, events);
await client.connect();
return client;
}

View file

@ -1,5 +1,4 @@
import { Pool } from 'pg';
import { getLogger } from '@stock-bot/logger';
import { QuestDBHealthMonitor } from './health';
import { QuestDBInfluxWriter } from './influx-writer';
import { QuestDBQueryBuilder } from './query-builder';
@ -21,14 +20,15 @@ export class QuestDBClient {
private pgPool: Pool | null = null;
private readonly config: QuestDBClientConfig;
private readonly options: QuestDBConnectionOptions;
private readonly logger = getLogger('QuestDBClient');
private readonly logger: any;
private readonly healthMonitor: QuestDBHealthMonitor;
private readonly influxWriter: QuestDBInfluxWriter;
private readonly schemaManager: QuestDBSchemaManager;
private isConnected = false;
constructor(config: QuestDBClientConfig, options?: QuestDBConnectionOptions) {
constructor(config: QuestDBClientConfig, logger?: any, options?: QuestDBConnectionOptions) {
this.config = config;
this.logger = logger || console;
this.options = {
protocol: 'pg',
retryAttempts: 3,

View file

@ -6,9 +6,10 @@ import type { QuestDBClientConfig, QuestDBConnectionOptions } from './types';
*/
export function createQuestDBClient(
config: QuestDBClientConfig,
logger?: any,
options?: QuestDBConnectionOptions
): QuestDBClient {
return new QuestDBClient(config, options);
return new QuestDBClient(config, logger, options);
}
/**
@ -16,9 +17,10 @@ export function createQuestDBClient(
*/
export async function createAndConnectQuestDBClient(
config: QuestDBClientConfig,
logger?: any,
options?: QuestDBConnectionOptions
): Promise<QuestDBClient> {
const client = createQuestDBClient(config, options);
const client = createQuestDBClient(config, logger, options);
await client.connect();
return client;
}