@bitblit/ratchet-rdbms 4.0.420-alpha → 4.0.421-alpha

package/lib/mysql/mysql-style-database-access.js

@@ -0,0 +1,57 @@
+import { Logger } from '@bitblit/ratchet-common/logger/logger';
+export class MysqlStyleDatabaseAccess {
+    _connection;
+    _connectionOptions;
+    constructor(_connection, _connectionOptions) {
+        this._connection = _connection;
+        this._connectionOptions = _connectionOptions;
+    }
+    async testConnection(logTestResults) {
+        if (logTestResults) {
+            Logger.info('Running connection test');
+        }
+        const res = await this.query('SELECT UNIX_TIMESTAMP(now())*1000 AS test', {});
+        const rows = res.results;
+        const timestamp = rows.length === 1 ? rows[0].test : null;
+        if (logTestResults) {
+            Logger.info('Test returned : %j', timestamp);
+        }
+        return timestamp;
+    }
+    getRawDatabase() {
+        return this._connection;
+    }
+    getRawDatabaseConfig() {
+        return this._connectionOptions;
+    }
+    testConnectionQueryString() {
+        return 'SELECT UNIX_TIMESTAMP(now())*1000 AS test';
+    }
+    async close() {
+        return Promise.resolve(false);
+    }
+    escape(query) {
+        return this._connection.escape(query);
+    }
+    async preQuery() {
+        this._connection.config.namedPlaceholders = true;
+    }
+    async query(query, fields) {
+        const [rows, outFields] = await this._connection.query(query, fields);
+        const castRows = rows;
+        const castFields = outFields;
+        const rval = {
+            results: castRows,
+            fields: castFields,
+        };
+        return rval;
+    }
+    async modify(query, fields) {
+        const tmp = await this.query(query, fields);
+        return tmp;
+    }
+    async onRequestSuccessOrFailure(type) {
+        this._connection.config.namedPlaceholders = false;
+    }
+}
+//# sourceMappingURL=mysql-style-database-access.js.map

package/lib/mysql/mysql-style-database-access.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mysql-style-database-access.js","sourceRoot":"","sources":["../../src/mysql/mysql-style-database-access.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,MAAM,OAAO,wBAAwB;IAEzB;IACA;IAFV,YACU,WAAuB,EACvB,kBAAqC;QADrC,gBAAW,GAAX,WAAW,CAAY;QACvB,uBAAkB,GAAlB,kBAAkB,CAAmB;IAC5C,CAAC;IAEG,KAAK,CAAC,cAAc,CAAC,cAAwB;QAClD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,GAAG,GAAwB,MAAM,IAAI,CAAC,KAAK,CAAC,2CAA2C,EAAE,EAAE,CAAC,CAAC;QACnG,MAAM,IAAI,GAAG,GAAG,CAAC,OAA6B,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1D,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAEM,yBAAyB;QAC9B,OAAO,2CAA2C,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,KAAU;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC;IACnD,CAAC;IAEM,KAAK,CAAC,KAAK,CAAI,KAAK,EAAE,MAAM;QACjC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEtE,MAAM,QAAQ,GAAoB,IAAuB,CAAC;QAC1D,MAAM,UAAU,GAAkB,SAAS,CAAC;QAE5C,MAAM,IAAI,GAAsB;YAC9B,OAAO,EAAE,QAAa;YACtB,MAAM,EAAE,UAAU;SACnB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,MAA2B;QAC5D,MAAM,GAAG,GAAkC,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC3E,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,IAAyB;QAC9D,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACpD,CAAC;CAYF"}

package/lib/mysql/rds-mysql-style-connection-provider.d.ts

@@ -0,0 +1,29 @@
+import { Connection, ConnectionOptions } from 'mysql2/promise';
+import { SshTunnelService } from '../service/ssh-tunnel-service.js';
+import { DatabaseConfigList } from '../model/database-config-list.js';
+import { QueryDefaults } from '../model/query-defaults.js';
+import { ConnectionAndTunnel } from '../model/connection-and-tunnel.js';
+import { DatabaseAccessProvider } from '../model/database-access-provider.js';
+import { DatabaseAccess } from '../model/database-access.js';
+import { MysqlDbConfig } from './model/mysql-db-config.js';
+export declare class RdsMysqlStyleConnectionProvider implements DatabaseAccessProvider {
+    private configPromiseProvider;
+    private additionalConfig;
+    private ssh?;
+    static DEFAULT_CONNECTION_OPTIONS: ConnectionOptions;
+    private connectionCache;
+    private cacheConfigPromise;
+    constructor(configPromiseProvider: () => Promise<DatabaseConfigList<MysqlDbConfig>>, additionalConfig?: ConnectionOptions, ssh?: SshTunnelService);
+    get usingSshTunnel(): boolean;
+    private addShutdownHandlerToProcess;
+    clearDatabaseAccessCache(): Promise<boolean>;
+    getConnectionAndTunnel(name: string): Promise<ConnectionAndTunnel<Connection, MysqlDbConfig>>;
+    getDatabaseAccess(name: string): Promise<DatabaseAccess | undefined>;
+    createNonPooledConnectionAndTunnel(queryDefaults: QueryDefaults, additionalConfig?: ConnectionOptions): Promise<ConnectionAndTunnel<Connection, MysqlDbConfig>>;
+    createNonPooledDatabaseConnection(queryDefaults: QueryDefaults, additionalConfig?: ConnectionOptions): Promise<Connection | undefined>;
+    private getDbConfig;
+    private createConnectionAndTunnel;
+    private configPromise;
+    private createConnectionConfig;
+    static validDbConfig(cfg: MysqlDbConfig): string[];
+}

package/lib/mysql/rds-mysql-style-connection-provider.js

@@ -0,0 +1,205 @@
+import maria from 'mysql2/promise';
+import { RequireRatchet } from '@bitblit/ratchet-common/lang/require-ratchet';
+import { Logger } from '@bitblit/ratchet-common/logger/logger';
+import { ErrorRatchet } from '@bitblit/ratchet-common/lang/error-ratchet';
+import { StringRatchet } from '@bitblit/ratchet-common/lang/string-ratchet';
+import getPort from 'get-port';
+import { MysqlStyleDatabaseAccess } from './mysql-style-database-access.js';
+export class RdsMysqlStyleConnectionProvider {
+    configPromiseProvider;
+    additionalConfig;
+    ssh;
+    static DEFAULT_CONNECTION_OPTIONS = { multipleStatements: true };
+    connectionCache = new Map();
+    cacheConfigPromise;
+    constructor(configPromiseProvider, additionalConfig = RdsMysqlStyleConnectionProvider.DEFAULT_CONNECTION_OPTIONS, ssh) {
+        this.configPromiseProvider = configPromiseProvider;
+        this.additionalConfig = additionalConfig;
+        this.ssh = ssh;
+        this.cacheConfigPromise = this.createConnectionConfig();
+        Logger.info('Added shutdown handler to the process (Only once per instantiation)');
+        this.addShutdownHandlerToProcess();
+    }
+    get usingSshTunnel() {
+        return !!this.ssh;
+    }
+    addShutdownHandlerToProcess() {
+        process.on('exit', () => {
+            Logger.info('Process is shutting down, closing connections');
+            this.clearDatabaseAccessCache().catch((err) => {
+                Logger.error('Shutdown connection failed : %s', err);
+            });
+        });
+    }
+    async clearDatabaseAccessCache() {
+        const rval = false;
+        Logger.info('Clearing connection cache for RdsMysqlConnectionProvider');
+        const oldConnections = Array.from(this.connectionCache.values());
+        this.cacheConfigPromise = null;
+        this.connectionCache = new Map();
+        if (oldConnections.length > 0) {
+            for (let i = 0; i < oldConnections.length; i++) {
+                Logger.info('Shutting down old connection %d of %d', i, oldConnections.length);
+                try {
+                    const conn = await oldConnections[i];
+                    Logger.info('Conn %d is %s', i, conn?.config?.label);
+                    if (conn.db) {
+                        Logger.info('Stopping connection to database');
+                        try {
+                            conn.db.destroy();
+                            Logger.info('Database connection closed');
+                        }
+                        catch (err) {
+                            if (ErrorRatchet.asErr(err).message.includes('closed state')) {
+                            }
+                            else {
+                                Logger.error('Something went wrong closing the database connection : %s', err);
+                            }
+                        }
+                    }
+                    if (conn.ssh) {
+                        try {
+                            Logger.info('Stopping ssh tunnel');
+                            await this.ssh.shutdown(conn.ssh);
+                            Logger.info('Ssh tunnel stopped');
+                        }
+                        catch (err) {
+                            Logger.warn('Failed to stop ssh tunnel : %s', err, err);
+                        }
+                    }
+                }
+                catch (err) {
+                    Logger.warn('Shutdown failed : %s ', err, err);
+                }
+            }
+        }
+        Logger.info('Old db and tunnels removed');
+        return rval;
+    }
+    async getConnectionAndTunnel(name) {
+        Logger.silly('getConnectionAndTunnel : %s', name);
+        if (!this.connectionCache.has(name)) {
+            Logger.info('No connectionCache found for %s - creating new one', name);
+            const dbConfig = await this.getDbConfig(name);
+            const connection = this.createConnectionAndTunnel(dbConfig, this.additionalConfig, true);
+            this.connectionCache.set(name, connection);
+            Logger.info('Added connectionCache for %s', name);
+        }
+        return this.connectionCache.get(name);
+    }
+    async getDatabaseAccess(name) {
+        Logger.silly('getConnection : %s', name);
+        const conn = await this.getConnectionAndTunnel(name);
+        const rval = conn?.db ? new MysqlStyleDatabaseAccess(conn.db, this.additionalConfig) : null;
+        return rval;
+    }
+    async createNonPooledConnectionAndTunnel(queryDefaults, additionalConfig = RdsMysqlStyleConnectionProvider.DEFAULT_CONNECTION_OPTIONS) {
+        Logger.info('Creating non-pooled connection for %s', queryDefaults.databaseName);
+        const dbConfig = await this.getDbConfig(queryDefaults.databaseName);
+        const rval = await this.createConnectionAndTunnel(dbConfig, additionalConfig, false);
+        return rval;
+    }
+    async createNonPooledDatabaseConnection(queryDefaults, additionalConfig = RdsMysqlStyleConnectionProvider.DEFAULT_CONNECTION_OPTIONS) {
+        const conTunnel = await this.createNonPooledConnectionAndTunnel(queryDefaults, additionalConfig);
+        return conTunnel?.db;
+    }
+    async getDbConfig(name) {
+        Logger.info('RdsMysqlStyleConnectionProvider:getDbConfig:Initiating promise for %s', name);
+        const cfgs = await this.configPromise();
+        const finder = StringRatchet.trimToEmpty(name).toLowerCase();
+        const dbConfig = cfgs.dbList.find((s) => StringRatchet.trimToEmpty(s.label).toLowerCase() === finder);
+        if (!dbConfig) {
+            throw ErrorRatchet.fErr('Cannot find any connection config named %s (Available are %j)', name, cfgs.dbList.map((d) => d.label));
+        }
+        return dbConfig;
+    }
+    async createConnectionAndTunnel(dbCfg, additionalConfig = RdsMysqlStyleConnectionProvider.DEFAULT_CONNECTION_OPTIONS, clearCacheOnConnectionFailure) {
+        Logger.info('In RdsMysqlStyleConnectionProvider:createConnectionAndTunnel : %s', dbCfg.label);
+        RequireRatchet.notNullOrUndefined(dbCfg, 'dbCfg');
+        let tunnel = null;
+        if (dbCfg.sshTunnelConfig) {
+            const localPort = dbCfg.sshTunnelConfig.forceLocalPort || (await getPort());
+            Logger.debug('SSH tunnel config found, opening tunnel to %s / %s to using local port %s', dbCfg.sshTunnelConfig.host, dbCfg.sshTunnelConfig.port, localPort);
+            tunnel = await this.ssh.createSSHTunnel(dbCfg.sshTunnelConfig, dbCfg.host, dbCfg.port, localPort);
+            Logger.debug('SSH Tunnel open');
+        }
+        else {
+            Logger.debug('No ssh configuration - skipping tunnel');
+        }
+        Logger.debug('Opening connection for RdsMysqlStyleConnectionProvider');
+        let connection;
+        try {
+            const cfgCopy = structuredClone(dbCfg);
+            delete cfgCopy.label;
+            delete cfgCopy.sshTunnelConfig;
+            if (tunnel) {
+                cfgCopy.host = 'localhost';
+                cfgCopy.port = tunnel.localPort;
+            }
+            connection = await maria.createConnection({ ...additionalConfig, ...cfgCopy });
+        }
+        catch (err) {
+            Logger.info('Failed trying to create connection : %s : clearing for retry', err);
+            if (clearCacheOnConnectionFailure) {
+                this.connectionCache = new Map();
+            }
+            return undefined;
+        }
+        connection.on('error', (err) => {
+            Logger.info('An error was detected on the connection : %s : Clearing', err);
+            this.clearDatabaseAccessCache()
+                .then((cleared) => {
+                Logger.info('Connection cleared: %s', cleared);
+            })
+                .catch((err) => Logger.error('Failed to clear RDS connection cache: %j', err));
+        });
+        Logger.info('Added error handler to db, there are now %d error handlers and %d shutdown handlers', connection.rawListeners('error').length, process.rawListeners('exit').length);
+        const rval = {
+            config: dbCfg,
+            db: connection,
+            ssh: tunnel,
+        };
+        return rval;
+    }
+    configPromise() {
+        if (!this.cacheConfigPromise) {
+            this.cacheConfigPromise = this.createConnectionConfig();
+        }
+        return this.cacheConfigPromise;
+    }
+    async createConnectionConfig() {
+        RequireRatchet.notNullOrUndefined(this.configPromiseProvider, 'input');
+        const inputPromise = this.configPromiseProvider();
+        Logger.info('Creating connection config');
+        const cfg = await inputPromise;
+        RequireRatchet.true(cfg.dbList.length > 0, 'input.dbList');
+        cfg.dbList.forEach((db) => {
+            const errors = RdsMysqlStyleConnectionProvider.validDbConfig(db);
+            if (errors?.length) {
+                throw ErrorRatchet.fErr('Errors found in db config : %j', errors);
+            }
+        });
+        return cfg;
+    }
+    static validDbConfig(cfg) {
+        let rval = [];
+        if (!cfg) {
+            rval.push('The config is null');
+        }
+        else {
+            rval.push(StringRatchet.trimToNull(cfg.host) ? null : 'host is required and non-empty');
+            rval.push(StringRatchet.trimToNull(cfg.label) ? null : 'label is required and non-empty');
+            rval.push(StringRatchet.trimToNull(cfg.database) ? null : 'database is required and non-empty');
+            rval.push(StringRatchet.trimToNull(cfg.user) ? null : 'user is required and non-empty');
+            rval.push(StringRatchet.trimToNull(cfg.password) ? null : 'password is required and non-empty');
+            rval.push(cfg.port ? null : 'port is required and non-empty');
+        }
+        if (cfg.sshTunnelConfig) {
+            rval.push(StringRatchet.trimToNull(cfg.sshTunnelConfig.host) ? null : 'If sshTunnelConfig is non-null, host is required and non-empty');
+            rval.push(cfg.sshTunnelConfig.port ? null : 'If sshTunnelConfig is non-null, port is required and non-empty');
+        }
+        rval = rval.filter((s) => !!s);
+        return rval;
+    }
+}
+//# sourceMappingURL=rds-mysql-style-connection-provider.js.map

package/lib/mysql/rds-mysql-style-connection-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rds-mysql-style-connection-provider.js","sourceRoot":"","sources":["../../src/mysql/rds-mysql-style-connection-provider.ts"],"names":[],"mappings":"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"}

package/lib/query-builder/index.d.ts

@@ -0,0 +1,3 @@
+export * from './query-builder-result.js';
+export * from './query-builder.js';
+export * from './query-util.js';

package/lib/query-builder/index.js

@@ -0,0 +1,4 @@
+export * from './query-builder-result.js';
+export * from './query-builder.js';
+export * from './query-util.js';
+//# sourceMappingURL=index.js.map

package/lib/query-builder/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-builder/index.ts"],"names":[],"mappings":"AAIA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC"}

package/lib/query-builder/query-builder-result.d.ts

@@ -0,0 +1,9 @@
+import { TransactionIsolationLevel } from '../model/transaction-isolation-level.js';
+import { Paginator } from '../model/paginator.js';
+export declare class QueryBuilderResult {
+    query: string;
+    namedParams: Record<string, unknown>;
+    paginator?: Paginator<any>;
+    transactionIsolationLevel: TransactionIsolationLevel;
+    constructor(query: string, namedParams: Record<string, unknown>, paginator: Paginator<any> | undefined, transactionIsolationLevel: TransactionIsolationLevel);
+}

package/lib/query-builder/query-builder-result.js

@@ -0,0 +1,13 @@
+export class QueryBuilderResult {
+    query;
+    namedParams;
+    paginator;
+    transactionIsolationLevel;
+    constructor(query, namedParams, paginator, transactionIsolationLevel) {
+        this.query = query;
+        this.namedParams = namedParams;
+        this.paginator = paginator;
+        this.transactionIsolationLevel = transactionIsolationLevel;
+    }
+}
+//# sourceMappingURL=query-builder-result.js.map

package/lib/query-builder/query-builder-result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-builder-result.js","sourceRoot":"","sources":["../../src/query-builder/query-builder-result.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,kBAAkB;IAC7B,KAAK,CAAS;IACd,WAAW,CAA0B;IACrC,SAAS,CAAkB;IAC3B,yBAAyB,CAA4B;IAErD,YACE,KAAa,EACb,WAAoC,EACpC,SAAqC,EACrC,yBAAoD;QAEpD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;IAC7D,CAAC;CACF"}

package/lib/query-builder/query-builder.d.ts

@@ -0,0 +1,52 @@
+import { QueryBuilderResult } from './query-builder-result.js';
+import { TransactionIsolationLevel } from '../model/transaction-isolation-level.js';
+import { QueryTextProvider } from '../model/query-text-provider.js';
+import { Paginator } from '../model/paginator.js';
+export declare class QueryBuilder {
+    static readonly ALLOWED_SQL_CONSTRUCT: RegExp;
+    private readonly queryProvider;
+    private query?;
+    meta: {
+        queryPath?: string;
+    };
+    private sqlConstructs;
+    private namedParams;
+    private conditionals;
+    private debugComment;
+    private paginator?;
+    private debugAnnotateMode;
+    private transactionIsolationLevel;
+    constructor(queryProvider: QueryTextProvider);
+    clone(): QueryBuilder;
+    withTransactionIsolationLevel(level: TransactionIsolationLevel): QueryBuilder;
+    withDebugComment(comment: string): QueryBuilder;
+    appendDebugComment(comment: string): QueryBuilder;
+    withNamedQuery(queryPath: string): QueryBuilder;
+    withBaseQuery(baseQuery: string): void;
+    withSqlConstruct(key: string, value: unknown): QueryBuilder;
+    withSqlConstructs(params: Record<string, unknown>): QueryBuilder;
+    removeParam(key: string): QueryBuilder;
+    paramNames(): string[];
+    withParam(key: string, value: unknown): QueryBuilder;
+    withParams(params: unknown): QueryBuilder;
+    withExpandedParam(keyPrefix: string, values: unknown[], extendIfExists: boolean): QueryBuilder;
+    withConditional(tag: string, state?: boolean): QueryBuilder;
+    withConditionals(params: Record<string, boolean>): QueryBuilder;
+    withPaginator(paginator: Paginator<any>): QueryBuilder;
+    fetchCopyOfParam<T>(paramName: string): T | undefined;
+    fetchCopyOfConditional<T>(conditionalName: string): T | undefined;
+    containsParam(paramName: string): boolean;
+    getDebugComment(): string;
+    containsConditional(conditionalName: string): boolean;
+    build(): QueryBuilderResult;
+    buildUnfiltered(): QueryBuilderResult;
+    protected internalBuild(unfiltered: boolean): QueryBuilderResult;
+    private stripNonAsciiParams;
+    private runQueryChecks;
+    private applyComments;
+    applySqlConstructs(): void;
+    private applyRepeatBlocks;
+    private applyQueryFragments;
+    private applyPagination;
+    private applyConditionalBlocks;
+}