@omnitron-dev/titan-database 0.1.3 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/database.constants.d.ts +3 -1
- package/dist/database.constants.d.ts.map +1 -1
- package/dist/database.constants.js.map +1 -1
- package/dist/database.decorators.js +3 -3
- package/dist/database.decorators.js.map +1 -1
- package/dist/database.manager.d.ts +9 -5
- package/dist/database.manager.d.ts.map +1 -1
- package/dist/database.manager.js +201 -74
- package/dist/database.manager.js.map +1 -1
- package/dist/database.module.d.ts.map +1 -1
- package/dist/database.module.js +38 -2
- package/dist/database.module.js.map +1 -1
- package/dist/database.types.d.ts +1 -0
- package/dist/database.types.d.ts.map +1 -1
- package/dist/database.types.js.map +1 -1
- package/dist/exports/kysera.d.ts +2 -2
- package/dist/exports/kysera.d.ts.map +1 -1
- package/dist/exports/kysera.js +1 -1
- package/dist/exports/kysera.js.map +1 -1
- package/dist/exports/migration.d.ts +2 -0
- package/dist/exports/migration.d.ts.map +1 -1
- package/dist/exports/migration.js +1 -0
- package/dist/exports/migration.js.map +1 -1
- package/dist/exports/repository.d.ts +2 -1
- package/dist/exports/repository.d.ts.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/migration/cli.d.ts +14 -0
- package/dist/migration/cli.d.ts.map +1 -0
- package/dist/migration/cli.js +150 -0
- package/dist/migration/cli.js.map +1 -0
- package/dist/migration/hardened-runner.d.ts +79 -0
- package/dist/migration/hardened-runner.d.ts.map +1 -0
- package/dist/migration/hardened-runner.js +259 -0
- package/dist/migration/hardened-runner.js.map +1 -0
- package/dist/migration/index.d.ts +5 -0
- package/dist/migration/index.d.ts.map +1 -0
- package/dist/migration/index.js +3 -0
- package/dist/migration/index.js.map +1 -0
- package/dist/repository/transaction-aware.repository.d.ts +1 -2
- package/dist/repository/transaction-aware.repository.d.ts.map +1 -1
- package/dist/repository/transaction-aware.repository.js +5 -4
- package/dist/repository/transaction-aware.repository.js.map +1 -1
- package/dist/transaction/transaction.context.d.ts +1 -3
- package/dist/transaction/transaction.context.d.ts.map +1 -1
- package/dist/transaction/transaction.context.js +6 -4
- package/dist/transaction/transaction.context.js.map +1 -1
- package/dist/uuid-v7.d.ts +2 -2
- package/dist/uuid-v7.d.ts.map +1 -1
- package/dist/uuid-v7.js.map +1 -1
- package/package.json +21 -21
|
@@ -4,7 +4,9 @@ export declare const DATABASE_MODULE_OPTIONS: unique symbol;
|
|
|
4
4
|
export declare const DATABASE_CONNECTION: unique symbol;
|
|
5
5
|
export declare const DATABASE_HEALTH_INDICATOR: unique symbol;
|
|
6
6
|
export declare function getDatabaseConnectionToken(name?: string): string | symbol;
|
|
7
|
-
export declare function getRepositoryToken(target:
|
|
7
|
+
export declare function getRepositoryToken(target: string | {
|
|
8
|
+
name: string;
|
|
9
|
+
}): string;
|
|
8
10
|
export declare const DEFAULT_POOL_CONFIG: {
|
|
9
11
|
min: number;
|
|
10
12
|
max: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.constants.d.ts","sourceRoot":"","sources":["../src/database.constants.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,2BAA2B,YAAY,CAAC;AAMrD,eAAO,MAAM,gBAAgB,eAAuC,CAAC;AACrE,eAAO,MAAM,uBAAuB,eAA8C,CAAC;AACnF,eAAO,MAAM,mBAAmB,eAA0C,CAAC;AAC3E,eAAO,MAAM,yBAAyB,eAAgD,CAAC;AAKvF,wBAAgB,0BAA0B,CAAC,IAAI,GAAE,MAAoC,GAAG,MAAM,GAAG,MAAM,CAEtG;AAKD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"database.constants.d.ts","sourceRoot":"","sources":["../src/database.constants.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,2BAA2B,YAAY,CAAC;AAMrD,eAAO,MAAM,gBAAgB,eAAuC,CAAC;AACrE,eAAO,MAAM,uBAAuB,eAA8C,CAAC;AACnF,eAAO,MAAM,mBAAmB,eAA0C,CAAC;AAC3E,eAAO,MAAM,yBAAyB,eAAgD,CAAC;AAKvF,wBAAgB,0BAA0B,CAAC,IAAI,GAAE,MAAoC,GAAG,MAAM,GAAG,MAAM,CAEtG;AAKD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAG5E;AAMD,eAAO,MAAM,mBAAmB;;;;;CAK/B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC;AAMF,eAAO,MAAM,aAAa;;;;;;;;;;;CAWhB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.constants.js","sourceRoot":"","sources":["../src/database.constants.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,2BAA2B,GAAG,SAAS,CAAC;AAMrD,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;AACrE,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AACnF,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;AAC3E,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;AAKvF,MAAM,UAAU,0BAA0B,CAAC,OAAe,2BAA2B;IACnF,OAAO,IAAI,KAAK,2BAA2B,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,uBAAuB,IAAI,EAAE,CAAC;AACpG,CAAC;AAKD,MAAM,UAAU,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"database.constants.js","sourceRoot":"","sources":["../src/database.constants.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,2BAA2B,GAAG,SAAS,CAAC;AAMrD,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;AACrE,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AACnF,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;AAC3E,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;AAKvF,MAAM,UAAU,0BAA0B,CAAC,OAAe,2BAA2B;IACnF,OAAO,IAAI,KAAK,2BAA2B,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,uBAAuB,IAAI,EAAE,CAAC;AACpG,CAAC;AAKD,MAAM,UAAU,kBAAkB,CAAC,MAAiC;IAClE,MAAM,IAAI,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/D,OAAO,cAAc,IAAI,EAAE,CAAC;AAC9B,CAAC;AAMD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,EAAE;IACP,iBAAiB,EAAE,KAAK;IACxB,oBAAoB,EAAE,KAAK;CAC5B,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;IAClB,QAAQ,EAAE,KAAK;IACf,MAAM,EAAE,IAAI;CACb,CAAC;AAMF,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,UAAU,EAAE,qBAAqB;IACjC,SAAS,EAAE,oBAAoB;IAC/B,WAAW,EAAE,6BAA6B;IAC1C,UAAU,EAAE,4BAA4B;IACxC,KAAK,EAAE,uBAAuB;IAC9B,UAAU,EAAE,qBAAqB;IACjC,SAAS,EAAE,oBAAoB;IAC/B,QAAQ,EAAE,mBAAmB;IAC7B,UAAU,EAAE,qBAAqB;IACjC,UAAU,EAAE,qBAAqB;CACzB,CAAC"}
|
|
@@ -76,7 +76,7 @@ export function Migration(config) {
|
|
|
76
76
|
export function SoftDelete(config) {
|
|
77
77
|
return (target) => {
|
|
78
78
|
const existingConfig = Reflect.getMetadata(METADATA_KEYS.REPOSITORY, target) || {};
|
|
79
|
-
Reflect.defineMetadata(METADATA_KEYS.SOFT_DELETE, config
|
|
79
|
+
Reflect.defineMetadata(METADATA_KEYS.SOFT_DELETE, { column: 'deletedAt', ...config }, target);
|
|
80
80
|
Reflect.defineMetadata('database:has-soft-delete', true, target);
|
|
81
81
|
Reflect.defineMetadata(METADATA_KEYS.REPOSITORY, {
|
|
82
82
|
...existingConfig,
|
|
@@ -88,7 +88,7 @@ export function SoftDelete(config) {
|
|
|
88
88
|
export function Timestamps(config) {
|
|
89
89
|
return (target) => {
|
|
90
90
|
const existingConfig = Reflect.getMetadata(METADATA_KEYS.REPOSITORY, target) || {};
|
|
91
|
-
Reflect.defineMetadata(METADATA_KEYS.TIMESTAMPS, config
|
|
91
|
+
Reflect.defineMetadata(METADATA_KEYS.TIMESTAMPS, { createdAt: 'createdAt', updatedAt: 'updatedAt', ...config }, target);
|
|
92
92
|
Reflect.defineMetadata('database:has-timestamps', true, target);
|
|
93
93
|
Reflect.defineMetadata(METADATA_KEYS.REPOSITORY, {
|
|
94
94
|
...existingConfig,
|
|
@@ -100,7 +100,7 @@ export function Timestamps(config) {
|
|
|
100
100
|
export function Audit(config) {
|
|
101
101
|
return (target) => {
|
|
102
102
|
const existingConfig = Reflect.getMetadata(METADATA_KEYS.REPOSITORY, target) || {};
|
|
103
|
-
Reflect.defineMetadata(METADATA_KEYS.AUDIT, config
|
|
103
|
+
Reflect.defineMetadata(METADATA_KEYS.AUDIT, { table: 'audit_logs', ...config }, target);
|
|
104
104
|
Reflect.defineMetadata('database:has-audit', true, target);
|
|
105
105
|
Reflect.defineMetadata(METADATA_KEYS.REPOSITORY, {
|
|
106
106
|
...existingConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.decorators.js","sourceRoot":"","sources":["../src/database.decorators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"database.decorators.js","sourceRoot":"","sources":["../src/database.decorators.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { Kysely } from 'kysely';
|
|
2
|
-
import { Pool } from 'pg';
|
|
2
|
+
import { Pool, Client as PgClient } from 'pg';
|
|
3
|
+
export declare class ResilientPgClient extends PgClient {
|
|
4
|
+
constructor(config?: ConstructorParameters<typeof PgClient>[0]);
|
|
5
|
+
}
|
|
3
6
|
import * as mysql from 'mysql2';
|
|
4
7
|
import BetterSqlite3 from 'better-sqlite3';
|
|
5
8
|
type Database = BetterSqlite3.Database;
|
|
@@ -16,7 +19,7 @@ export interface PoolMetrics {
|
|
|
16
19
|
releaseCount: number;
|
|
17
20
|
errorCount: number;
|
|
18
21
|
lastError?: Error;
|
|
19
|
-
lastAcquireAt?:
|
|
22
|
+
lastAcquireAt?: number;
|
|
20
23
|
averageAcquireTimeMs: number;
|
|
21
24
|
totalAcquireTimeMs: number;
|
|
22
25
|
poolSize: {
|
|
@@ -25,13 +28,13 @@ export interface PoolMetrics {
|
|
|
25
28
|
};
|
|
26
29
|
}
|
|
27
30
|
export declare class DatabaseManager implements IDatabaseManager {
|
|
31
|
+
private static _bigintParserMode;
|
|
28
32
|
private connections;
|
|
29
33
|
private circuitBreakers;
|
|
30
34
|
private connectionSchemas;
|
|
31
35
|
private eventEmitter;
|
|
32
36
|
logger: ILogger;
|
|
33
37
|
private options;
|
|
34
|
-
private shutdownInProgress;
|
|
35
38
|
private initialized;
|
|
36
39
|
private readonly defaultRetryConfig;
|
|
37
40
|
private healthCheckTimer?;
|
|
@@ -61,7 +64,6 @@ export declare class DatabaseManager implements IDatabaseManager {
|
|
|
61
64
|
private createConnection;
|
|
62
65
|
private createKyselyInstance;
|
|
63
66
|
private parseConnectionConfig;
|
|
64
|
-
private testConnection;
|
|
65
67
|
private validateConnectionHealth;
|
|
66
68
|
private sleep;
|
|
67
69
|
getConnection(name?: string): Promise<Kysely<unknown>>;
|
|
@@ -80,7 +82,6 @@ export declare class DatabaseManager implements IDatabaseManager {
|
|
|
80
82
|
getPoolMetrics(name?: string): PoolMetrics | Map<string, PoolMetrics>;
|
|
81
83
|
private collectPoolMetrics;
|
|
82
84
|
resetPoolMetrics(name?: string): void;
|
|
83
|
-
private registerShutdownHandlers;
|
|
84
85
|
private emitEvent;
|
|
85
86
|
on(event: DatabaseEventType, listener: (event: DatabaseEvent) => void): void;
|
|
86
87
|
off(event: DatabaseEventType, listener: (event: DatabaseEvent) => void): void;
|
|
@@ -91,6 +92,9 @@ export declare class DatabaseManager implements IDatabaseManager {
|
|
|
91
92
|
setSchema(schema: string, name?: string): Promise<void>;
|
|
92
93
|
getSchema(name?: string): string | undefined;
|
|
93
94
|
withSchema<T>(schema: string, fn: (db: Kysely<unknown>) => Promise<T>, name?: string): Promise<T>;
|
|
95
|
+
private resolvePlugins;
|
|
96
|
+
private resolveBuiltInPlugin;
|
|
97
|
+
private applyGlobalPlugins;
|
|
94
98
|
onModuleDestroy(): Promise<void>;
|
|
95
99
|
}
|
|
96
100
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.manager.d.ts","sourceRoot":"","sources":["../src/database.manager.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAsE,MAAM,QAAQ,CAAC;AACpG,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"database.manager.d.ts","sourceRoot":"","sources":["../src/database.manager.ts"],"names":[],"mappings":"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"}
|
package/dist/database.manager.js
CHANGED
|
@@ -7,16 +7,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
+
var DatabaseManager_1;
|
|
10
11
|
import { Kysely, PostgresDialect, MysqlDialect, SqliteDialect, CamelCasePlugin, sql } from 'kysely';
|
|
11
|
-
import { Pool } from 'pg';
|
|
12
|
+
import { Pool, Client as PgClient, types as pgTypes } from 'pg';
|
|
13
|
+
export class ResilientPgClient extends PgClient {
|
|
14
|
+
constructor(config) {
|
|
15
|
+
super(config);
|
|
16
|
+
this.on('error', () => { });
|
|
17
|
+
}
|
|
18
|
+
}
|
|
12
19
|
import * as mysql from 'mysql2';
|
|
13
20
|
import BetterSqlite3 from 'better-sqlite3';
|
|
14
21
|
import { sqliteDateSerializerPlugin } from './plugins/sqlite-date-serializer.plugin.js';
|
|
15
|
-
import { createExecutor, isKyseraExecutor, getPlugins, getRawDb, } from '@kysera/executor';
|
|
22
|
+
import { createExecutor, destroyExecutor, isKyseraExecutor, getPlugins, getRawDb, } from '@kysera/executor';
|
|
16
23
|
import { CircuitBreaker } from '@kysera/infra';
|
|
17
24
|
import { Injectable } from '@omnitron-dev/titan/decorators';
|
|
18
25
|
import { Errors, TitanError, ErrorCode } from '@omnitron-dev/titan/errors';
|
|
19
|
-
import { DATABASE_DEFAULT_CONNECTION, DEFAULT_POOL_CONFIG,
|
|
26
|
+
import { DATABASE_DEFAULT_CONNECTION, DEFAULT_POOL_CONFIG, } from './database.constants.js';
|
|
20
27
|
const ERROR_MESSAGES = {
|
|
21
28
|
CONNECTION_FAILED: (name, error) => `Failed to connect to database "${name}": ${error}`,
|
|
22
29
|
INVALID_DIALECT: (dialect) => `Invalid database dialect: ${dialect}`,
|
|
@@ -34,12 +41,13 @@ const DATABASE_EVENTS = {
|
|
|
34
41
|
};
|
|
35
42
|
import { EventEmitter } from '@omnitron-dev/eventemitter';
|
|
36
43
|
let DatabaseManager = class DatabaseManager {
|
|
44
|
+
static { DatabaseManager_1 = this; }
|
|
45
|
+
static { this._bigintParserMode = null; }
|
|
37
46
|
constructor(options, logger) {
|
|
38
47
|
this.connections = new Map();
|
|
39
48
|
this.circuitBreakers = new Map();
|
|
40
49
|
this.connectionSchemas = new Map();
|
|
41
50
|
this.eventEmitter = new EventEmitter();
|
|
42
|
-
this.shutdownInProgress = false;
|
|
43
51
|
this.initialized = false;
|
|
44
52
|
this.defaultRetryConfig = {
|
|
45
53
|
maxRetries: 5,
|
|
@@ -47,11 +55,11 @@ let DatabaseManager = class DatabaseManager {
|
|
|
47
55
|
maxDelayMs: 16000,
|
|
48
56
|
timeoutMs: 30000,
|
|
49
57
|
};
|
|
50
|
-
this.healthCheckIntervalMs = 30000;
|
|
51
58
|
this.healthCheckFailures = new Map();
|
|
52
59
|
this.maxHealthCheckFailures = 3;
|
|
53
60
|
this.options = options || {};
|
|
54
61
|
this.logger = logger.child({ module: 'DatabaseManager' });
|
|
62
|
+
this.healthCheckIntervalMs = (this.options.kysera?.core?.healthCheck?.interval) ?? 30000;
|
|
55
63
|
}
|
|
56
64
|
async init() {
|
|
57
65
|
if (this.initialized) {
|
|
@@ -63,6 +71,7 @@ let DatabaseManager = class DatabaseManager {
|
|
|
63
71
|
for (const [name, config] of Object.entries(connections)) {
|
|
64
72
|
await this.createConnectionWithRetry(name, config);
|
|
65
73
|
}
|
|
74
|
+
await this.applyGlobalPlugins();
|
|
66
75
|
this.initialized = true;
|
|
67
76
|
if (this.options.defaultSchema) {
|
|
68
77
|
for (const [name, info] of this.connections) {
|
|
@@ -86,8 +95,8 @@ let DatabaseManager = class DatabaseManager {
|
|
|
86
95
|
return;
|
|
87
96
|
}
|
|
88
97
|
this.logger.info({ intervalMs: this.healthCheckIntervalMs }, 'Starting proactive health checks');
|
|
89
|
-
this.healthCheckTimer = setInterval(
|
|
90
|
-
|
|
98
|
+
this.healthCheckTimer = setInterval(() => {
|
|
99
|
+
this.runHealthChecks().catch((err) => this.logger.error({ error: err }, 'Unhandled error in periodic health check'));
|
|
91
100
|
}, this.healthCheckIntervalMs);
|
|
92
101
|
if (this.healthCheckTimer.unref) {
|
|
93
102
|
this.healthCheckTimer.unref();
|
|
@@ -101,14 +110,15 @@ let DatabaseManager = class DatabaseManager {
|
|
|
101
110
|
}
|
|
102
111
|
}
|
|
103
112
|
async runHealthChecks() {
|
|
104
|
-
const
|
|
113
|
+
const promises = [];
|
|
105
114
|
for (const [name, info] of this.connections) {
|
|
106
|
-
if (
|
|
107
|
-
|
|
115
|
+
if (info.connected) {
|
|
116
|
+
promises.push(this.runSingleHealthCheck(name, info));
|
|
108
117
|
}
|
|
109
|
-
healthCheckPromises.push(this.runSingleHealthCheck(name, info));
|
|
110
118
|
}
|
|
111
|
-
|
|
119
|
+
if (promises.length > 0) {
|
|
120
|
+
await Promise.all(promises);
|
|
121
|
+
}
|
|
112
122
|
}
|
|
113
123
|
async runSingleHealthCheck(name, info) {
|
|
114
124
|
try {
|
|
@@ -246,7 +256,6 @@ let DatabaseManager = class DatabaseManager {
|
|
|
246
256
|
pool: undefined,
|
|
247
257
|
connected: false,
|
|
248
258
|
connecting: true,
|
|
249
|
-
retryCount: 0,
|
|
250
259
|
metrics: {
|
|
251
260
|
queryCount: 0,
|
|
252
261
|
errorCount: 0,
|
|
@@ -272,7 +281,6 @@ let DatabaseManager = class DatabaseManager {
|
|
|
272
281
|
const { instance, pool } = await this.createKyselyInstance(config);
|
|
273
282
|
info.instance = instance;
|
|
274
283
|
info.pool = pool;
|
|
275
|
-
await this.testConnection(instance, config.dialect);
|
|
276
284
|
const isHealthy = await this.validateConnectionHealth(instance, config.dialect);
|
|
277
285
|
if (!isHealthy) {
|
|
278
286
|
throw Errors.unavailable('Database', 'Connection health check failed');
|
|
@@ -326,21 +334,49 @@ let DatabaseManager = class DatabaseManager {
|
|
|
326
334
|
if (pgConfig['ssl'] === false) {
|
|
327
335
|
delete pgConfig['ssl'];
|
|
328
336
|
}
|
|
337
|
+
const coerceBigint = config.coerceBigint !== false;
|
|
338
|
+
if (DatabaseManager_1._bigintParserMode === null) {
|
|
339
|
+
if (coerceBigint) {
|
|
340
|
+
pgTypes.setTypeParser(20, (val) => {
|
|
341
|
+
if (val === null)
|
|
342
|
+
return null;
|
|
343
|
+
const n = Number(val);
|
|
344
|
+
if (Number.isSafeInteger(n))
|
|
345
|
+
return n;
|
|
346
|
+
return BigInt(val);
|
|
347
|
+
});
|
|
348
|
+
}
|
|
349
|
+
DatabaseManager_1._bigintParserMode = coerceBigint;
|
|
350
|
+
}
|
|
351
|
+
else if (DatabaseManager_1._bigintParserMode !== coerceBigint) {
|
|
352
|
+
this.logger.warn({ connection: config.name, requested: coerceBigint, active: DatabaseManager_1._bigintParserMode }, 'pg BIGINT parser mode mismatch — pg.types.setTypeParser is process-global; first pool wins');
|
|
353
|
+
}
|
|
329
354
|
const pool = new Pool({
|
|
330
355
|
...pgConfig,
|
|
331
356
|
...DEFAULT_POOL_CONFIG,
|
|
332
357
|
...config.pool,
|
|
358
|
+
Client: ResilientPgClient,
|
|
333
359
|
});
|
|
360
|
+
const connectionName = config.name || DATABASE_DEFAULT_CONNECTION;
|
|
334
361
|
pool.on('error', (err, client) => {
|
|
335
|
-
|
|
336
|
-
|
|
362
|
+
const pgErr = err;
|
|
363
|
+
this.logger.error({
|
|
364
|
+
connection: connectionName,
|
|
365
|
+
code: pgErr.code,
|
|
366
|
+
severity: pgErr.severity,
|
|
367
|
+
routine: pgErr.routine,
|
|
368
|
+
clientPresent: !!client,
|
|
369
|
+
processID: client?.processID,
|
|
370
|
+
err,
|
|
371
|
+
}, 'PostgreSQL pool error');
|
|
372
|
+
const connInfo = this.connections.get(connectionName);
|
|
337
373
|
if (connInfo) {
|
|
338
374
|
connInfo.poolMetrics.errorCount++;
|
|
339
375
|
connInfo.poolMetrics.lastError = err;
|
|
340
376
|
}
|
|
341
377
|
this.emitEvent({
|
|
342
378
|
type: DATABASE_EVENTS.ERROR,
|
|
343
|
-
connection:
|
|
379
|
+
connection: connectionName,
|
|
344
380
|
timestamp: new Date(),
|
|
345
381
|
error: err,
|
|
346
382
|
});
|
|
@@ -360,7 +396,7 @@ let DatabaseManager = class DatabaseManager {
|
|
|
360
396
|
connInfo.poolMetrics.acquireCount++;
|
|
361
397
|
connInfo.poolMetrics.activeConnections++;
|
|
362
398
|
connInfo.poolMetrics.idleConnections = Math.max(0, connInfo.poolMetrics.idleConnections - 1);
|
|
363
|
-
connInfo.poolMetrics.lastAcquireAt =
|
|
399
|
+
connInfo.poolMetrics.lastAcquireAt = Date.now();
|
|
364
400
|
}
|
|
365
401
|
});
|
|
366
402
|
pool.on('release', (_client) => {
|
|
@@ -394,16 +430,22 @@ let DatabaseManager = class DatabaseManager {
|
|
|
394
430
|
if (mysqlConfig['ssl'] === false) {
|
|
395
431
|
delete mysqlConfig['ssl'];
|
|
396
432
|
}
|
|
433
|
+
const connectionLimit = config.pool?.max || DEFAULT_POOL_CONFIG.max;
|
|
434
|
+
const userPool = (config.pool ?? {});
|
|
397
435
|
const mysqlPoolConfig = {
|
|
398
|
-
connectionLimit
|
|
436
|
+
connectionLimit,
|
|
399
437
|
waitForConnections: true,
|
|
400
|
-
queueLimit:
|
|
438
|
+
queueLimit: userPool.queueLimit ?? connectionLimit * 10,
|
|
401
439
|
connectTimeout: DEFAULT_POOL_CONFIG.acquireTimeoutMillis,
|
|
402
440
|
};
|
|
403
441
|
const pool = mysql.createPool({
|
|
404
442
|
...mysqlConfig,
|
|
405
443
|
...mysqlPoolConfig,
|
|
406
444
|
});
|
|
445
|
+
pool.on('connection', (conn) => {
|
|
446
|
+
conn.on('error', () => {
|
|
447
|
+
});
|
|
448
|
+
});
|
|
407
449
|
pool.on('error', (err) => {
|
|
408
450
|
this.logger.error({ error: err }, 'MySQL pool error');
|
|
409
451
|
const connInfo = this.connections.get(config.name || DATABASE_DEFAULT_CONNECTION);
|
|
@@ -433,7 +475,7 @@ let DatabaseManager = class DatabaseManager {
|
|
|
433
475
|
connInfo.poolMetrics.acquireCount++;
|
|
434
476
|
connInfo.poolMetrics.activeConnections++;
|
|
435
477
|
connInfo.poolMetrics.idleConnections = Math.max(0, connInfo.poolMetrics.idleConnections - 1);
|
|
436
|
-
connInfo.poolMetrics.lastAcquireAt =
|
|
478
|
+
connInfo.poolMetrics.lastAcquireAt = Date.now();
|
|
437
479
|
}
|
|
438
480
|
});
|
|
439
481
|
pool.on('release', (_connection) => {
|
|
@@ -528,27 +570,26 @@ let DatabaseManager = class DatabaseManager {
|
|
|
528
570
|
timezone: connConfig.timezone,
|
|
529
571
|
};
|
|
530
572
|
}
|
|
531
|
-
async testConnection(db, dialect) {
|
|
532
|
-
const timeout = this.options.queryTimeout || DEFAULT_TIMEOUTS.query;
|
|
533
|
-
const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(Errors.timeout('database connection test', timeout)), timeout));
|
|
534
|
-
const testQuery = sql `SELECT 1`.execute(db);
|
|
535
|
-
await Promise.race([testQuery, timeoutPromise]);
|
|
536
|
-
}
|
|
537
573
|
async validateConnectionHealth(db, dialect) {
|
|
574
|
+
const timeout = dialect === 'sqlite' ? 10000 : 5000;
|
|
575
|
+
const ac = new AbortController();
|
|
576
|
+
const timer = setTimeout(() => ac.abort(), timeout);
|
|
538
577
|
try {
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
return await Promise.race([healthCheckPromise, timeoutPromise]);
|
|
578
|
+
await Promise.race([
|
|
579
|
+
sql `SELECT 1 AS health_check`.execute(db),
|
|
580
|
+
new Promise((_, reject) => {
|
|
581
|
+
ac.signal.addEventListener('abort', () => reject(new Error('Health check timeout')));
|
|
582
|
+
}),
|
|
583
|
+
]);
|
|
584
|
+
return true;
|
|
547
585
|
}
|
|
548
586
|
catch (error) {
|
|
549
587
|
this.logger.error({ error }, 'Connection health check failed');
|
|
550
588
|
return false;
|
|
551
589
|
}
|
|
590
|
+
finally {
|
|
591
|
+
clearTimeout(timer);
|
|
592
|
+
}
|
|
552
593
|
}
|
|
553
594
|
sleep(ms) {
|
|
554
595
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -564,6 +605,9 @@ let DatabaseManager = class DatabaseManager {
|
|
|
564
605
|
if (!info.connected) {
|
|
565
606
|
throw Errors.unavailable(name, info.lastError?.message || 'Unknown error');
|
|
566
607
|
}
|
|
608
|
+
if (info.executor) {
|
|
609
|
+
return info.executor;
|
|
610
|
+
}
|
|
567
611
|
return info.instance;
|
|
568
612
|
}
|
|
569
613
|
async getExecutor(name = DATABASE_DEFAULT_CONNECTION, plugins) {
|
|
@@ -620,7 +664,6 @@ let DatabaseManager = class DatabaseManager {
|
|
|
620
664
|
throw Errors.notFound('Database connection', name);
|
|
621
665
|
}
|
|
622
666
|
this.logger.info({ name }, 'Attempting to reconnect to database');
|
|
623
|
-
info.retryCount++;
|
|
624
667
|
await this.createConnectionWithRetry(name, info.config);
|
|
625
668
|
}
|
|
626
669
|
async close(name = DATABASE_DEFAULT_CONNECTION) {
|
|
@@ -629,16 +672,11 @@ let DatabaseManager = class DatabaseManager {
|
|
|
629
672
|
return;
|
|
630
673
|
}
|
|
631
674
|
this.connections.delete(name);
|
|
675
|
+
this.healthCheckFailures.delete(name);
|
|
632
676
|
this.logger.info({ name }, 'Closing database connection');
|
|
633
677
|
try {
|
|
634
678
|
if (info.executor && isKyseraExecutor(info.executor)) {
|
|
635
|
-
|
|
636
|
-
const { destroyExecutor } = await import('@kysera/executor');
|
|
637
|
-
await destroyExecutor(info.executor);
|
|
638
|
-
}
|
|
639
|
-
catch {
|
|
640
|
-
this.logger.debug({ name }, 'Skipping executor cleanup - dynamic import unavailable');
|
|
641
|
-
}
|
|
679
|
+
await destroyExecutor(info.executor);
|
|
642
680
|
}
|
|
643
681
|
await info.instance.destroy();
|
|
644
682
|
if (info.pool) {
|
|
@@ -711,22 +749,35 @@ let DatabaseManager = class DatabaseManager {
|
|
|
711
749
|
return metrics;
|
|
712
750
|
}
|
|
713
751
|
collectPoolMetrics(info) {
|
|
714
|
-
const
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
}
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
return
|
|
752
|
+
const m = info.poolMetrics;
|
|
753
|
+
let totalConnections = m.totalConnections;
|
|
754
|
+
let idleConnections = m.idleConnections;
|
|
755
|
+
let activeConnections = m.activeConnections;
|
|
756
|
+
let waitingClients = m.waitingClients;
|
|
757
|
+
if (info.pool && info.config.dialect === 'postgres' && info.pool instanceof Pool) {
|
|
758
|
+
const pgPool = info.pool;
|
|
759
|
+
totalConnections = pgPool.totalCount;
|
|
760
|
+
idleConnections = pgPool.idleCount;
|
|
761
|
+
waitingClients = pgPool.waitingCount;
|
|
762
|
+
activeConnections = pgPool.totalCount - pgPool.idleCount;
|
|
763
|
+
}
|
|
764
|
+
const averageAcquireTimeMs = m.acquireCount > 0 && m.totalAcquireTimeMs > 0
|
|
765
|
+
? m.totalAcquireTimeMs / m.acquireCount
|
|
766
|
+
: m.averageAcquireTimeMs;
|
|
767
|
+
return {
|
|
768
|
+
totalConnections,
|
|
769
|
+
idleConnections,
|
|
770
|
+
activeConnections,
|
|
771
|
+
waitingClients,
|
|
772
|
+
acquireCount: m.acquireCount,
|
|
773
|
+
releaseCount: m.releaseCount,
|
|
774
|
+
errorCount: m.errorCount,
|
|
775
|
+
lastError: m.lastError,
|
|
776
|
+
lastAcquireAt: m.lastAcquireAt,
|
|
777
|
+
averageAcquireTimeMs,
|
|
778
|
+
totalAcquireTimeMs: m.totalAcquireTimeMs,
|
|
779
|
+
poolSize: m.poolSize,
|
|
780
|
+
};
|
|
730
781
|
}
|
|
731
782
|
resetPoolMetrics(name) {
|
|
732
783
|
const resetMetrics = (info) => {
|
|
@@ -750,19 +801,6 @@ let DatabaseManager = class DatabaseManager {
|
|
|
750
801
|
}
|
|
751
802
|
}
|
|
752
803
|
}
|
|
753
|
-
registerShutdownHandlers() {
|
|
754
|
-
const shutdownHandler = async () => {
|
|
755
|
-
if (this.shutdownInProgress)
|
|
756
|
-
return;
|
|
757
|
-
this.shutdownInProgress = true;
|
|
758
|
-
this.logger.info('Database manager shutdown initiated');
|
|
759
|
-
const timeout = this.options.shutdownTimeout || DEFAULT_TIMEOUTS.shutdown;
|
|
760
|
-
const timeoutPromise = new Promise((resolve) => setTimeout(resolve, timeout));
|
|
761
|
-
await Promise.race([this.closeAll(), timeoutPromise]);
|
|
762
|
-
};
|
|
763
|
-
process.on('SIGINT', shutdownHandler);
|
|
764
|
-
process.on('SIGTERM', shutdownHandler);
|
|
765
|
-
}
|
|
766
804
|
emitEvent(event) {
|
|
767
805
|
this.eventEmitter.emit(event.type, event);
|
|
768
806
|
}
|
|
@@ -803,7 +841,7 @@ let DatabaseManager = class DatabaseManager {
|
|
|
803
841
|
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(schema)) {
|
|
804
842
|
throw Errors.badRequest(`Invalid schema name: ${schema}`);
|
|
805
843
|
}
|
|
806
|
-
await sql
|
|
844
|
+
await sql.raw(`SET search_path TO "${schema}", public`).execute(info.instance);
|
|
807
845
|
this.connectionSchemas.set(name, schema);
|
|
808
846
|
this.logger.debug({ connection: name, schema }, 'Schema set for connection');
|
|
809
847
|
}
|
|
@@ -821,11 +859,100 @@ let DatabaseManager = class DatabaseManager {
|
|
|
821
859
|
await this.setSchema(previousSchema ?? 'public', name);
|
|
822
860
|
}
|
|
823
861
|
}
|
|
862
|
+
async resolvePlugins(pluginSpecs) {
|
|
863
|
+
const resolved = [];
|
|
864
|
+
for (const spec of pluginSpecs) {
|
|
865
|
+
if (typeof spec === 'string') {
|
|
866
|
+
const plugin = await this.resolveBuiltInPlugin(spec);
|
|
867
|
+
if (plugin)
|
|
868
|
+
resolved.push(plugin);
|
|
869
|
+
}
|
|
870
|
+
else if ('interceptQuery' in spec || 'name' in spec) {
|
|
871
|
+
resolved.push(spec);
|
|
872
|
+
}
|
|
873
|
+
else if ('plugin' in spec) {
|
|
874
|
+
if (typeof spec.plugin === 'string') {
|
|
875
|
+
const plugin = await this.resolveBuiltInPlugin(spec.plugin, spec.options);
|
|
876
|
+
if (plugin)
|
|
877
|
+
resolved.push(plugin);
|
|
878
|
+
}
|
|
879
|
+
else {
|
|
880
|
+
resolved.push(spec.plugin);
|
|
881
|
+
}
|
|
882
|
+
}
|
|
883
|
+
}
|
|
884
|
+
return resolved;
|
|
885
|
+
}
|
|
886
|
+
async resolveBuiltInPlugin(name, options) {
|
|
887
|
+
switch (name) {
|
|
888
|
+
case 'soft-delete':
|
|
889
|
+
case 'softDelete': {
|
|
890
|
+
const { softDeletePlugin } = await import('@kysera/soft-delete');
|
|
891
|
+
return softDeletePlugin(options);
|
|
892
|
+
}
|
|
893
|
+
case 'timestamps': {
|
|
894
|
+
const { timestampsPlugin } = await import('@kysera/timestamps');
|
|
895
|
+
return timestampsPlugin(options);
|
|
896
|
+
}
|
|
897
|
+
case 'audit': {
|
|
898
|
+
const { auditPlugin } = await import('@kysera/audit');
|
|
899
|
+
return auditPlugin(options);
|
|
900
|
+
}
|
|
901
|
+
default:
|
|
902
|
+
this.logger.warn({ plugin: name }, 'Unknown built-in plugin name, skipping');
|
|
903
|
+
return null;
|
|
904
|
+
}
|
|
905
|
+
}
|
|
906
|
+
async applyGlobalPlugins() {
|
|
907
|
+
const pluginSpecs = this.options.kysera?.plugins;
|
|
908
|
+
if (!pluginSpecs || pluginSpecs.length === 0) {
|
|
909
|
+
const builtIn = this.options.plugins?.builtIn;
|
|
910
|
+
if (!builtIn)
|
|
911
|
+
return;
|
|
912
|
+
const legacyPlugins = [];
|
|
913
|
+
if (builtIn.softDelete) {
|
|
914
|
+
const opts = typeof builtIn.softDelete === 'object' ? builtIn.softDelete : undefined;
|
|
915
|
+
const plugin = await this.resolveBuiltInPlugin('soft-delete', opts);
|
|
916
|
+
if (plugin)
|
|
917
|
+
legacyPlugins.push(plugin);
|
|
918
|
+
}
|
|
919
|
+
if (builtIn.timestamps) {
|
|
920
|
+
const opts = typeof builtIn.timestamps === 'object' ? builtIn.timestamps : undefined;
|
|
921
|
+
const plugin = await this.resolveBuiltInPlugin('timestamps', opts);
|
|
922
|
+
if (plugin)
|
|
923
|
+
legacyPlugins.push(plugin);
|
|
924
|
+
}
|
|
925
|
+
if (builtIn.audit) {
|
|
926
|
+
const opts = typeof builtIn.audit === 'object' ? builtIn.audit : undefined;
|
|
927
|
+
const plugin = await this.resolveBuiltInPlugin('audit', opts);
|
|
928
|
+
if (plugin)
|
|
929
|
+
legacyPlugins.push(plugin);
|
|
930
|
+
}
|
|
931
|
+
if (legacyPlugins.length === 0)
|
|
932
|
+
return;
|
|
933
|
+
this.logger.info({ plugins: legacyPlugins.map((p) => p.name) }, 'Applying legacy builtIn plugins to all connections');
|
|
934
|
+
for (const [name, info] of this.connections) {
|
|
935
|
+
if (info.connected) {
|
|
936
|
+
await this.setConnectionPlugins(name, legacyPlugins);
|
|
937
|
+
}
|
|
938
|
+
}
|
|
939
|
+
return;
|
|
940
|
+
}
|
|
941
|
+
const plugins = await this.resolvePlugins(pluginSpecs);
|
|
942
|
+
if (plugins.length === 0)
|
|
943
|
+
return;
|
|
944
|
+
this.logger.info({ plugins: plugins.map((p) => p.name) }, 'Applying global Kysera plugins to all connections');
|
|
945
|
+
for (const [name, info] of this.connections) {
|
|
946
|
+
if (info.connected) {
|
|
947
|
+
await this.setConnectionPlugins(name, plugins);
|
|
948
|
+
}
|
|
949
|
+
}
|
|
950
|
+
}
|
|
824
951
|
async onModuleDestroy() {
|
|
825
952
|
await this.closeAll();
|
|
826
953
|
}
|
|
827
954
|
};
|
|
828
|
-
DatabaseManager = __decorate([
|
|
955
|
+
DatabaseManager = DatabaseManager_1 = __decorate([
|
|
829
956
|
Injectable(),
|
|
830
957
|
__metadata("design:paramtypes", [Object, Object])
|
|
831
958
|
], DatabaseManager);
|