@arikajs/database 0.0.3 → 0.0.5
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/README.md +392 -25
- package/dist/Connections/MongoDBConnection.d.ts +81 -0
- package/dist/Connections/MongoDBConnection.d.ts.map +1 -0
- package/dist/Connections/MongoDBConnection.js +203 -0
- package/dist/Connections/MongoDBConnection.js.map +1 -0
- package/dist/Connections/MySQLConnection.d.ts +1 -0
- package/dist/Connections/MySQLConnection.d.ts.map +1 -1
- package/dist/Connections/MySQLConnection.js +47 -10
- package/dist/Connections/MySQLConnection.js.map +1 -1
- package/dist/Connections/PostgreSQLConnection.d.ts +1 -0
- package/dist/Connections/PostgreSQLConnection.d.ts.map +1 -1
- package/dist/Connections/PostgreSQLConnection.js +43 -9
- package/dist/Connections/PostgreSQLConnection.js.map +1 -1
- package/dist/Connections/SQLiteConnection.d.ts +1 -0
- package/dist/Connections/SQLiteConnection.d.ts.map +1 -1
- package/dist/Connections/SQLiteConnection.js +38 -7
- package/dist/Connections/SQLiteConnection.js.map +1 -1
- package/dist/Contracts/Database.d.ts +71 -4
- package/dist/Contracts/Database.d.ts.map +1 -1
- package/dist/Contracts/Schema.d.ts +4 -0
- package/dist/Contracts/Schema.d.ts.map +1 -1
- package/dist/Database.d.ts +30 -3
- package/dist/Database.d.ts.map +1 -1
- package/dist/Database.js +39 -1
- package/dist/Database.js.map +1 -1
- package/dist/DatabaseManager.d.ts +17 -3
- package/dist/DatabaseManager.d.ts.map +1 -1
- package/dist/DatabaseManager.js +27 -11
- package/dist/DatabaseManager.js.map +1 -1
- package/dist/Migrations/Migrator.d.ts.map +1 -1
- package/dist/Migrations/Migrator.js +35 -3
- package/dist/Migrations/Migrator.js.map +1 -1
- package/dist/Model/GlobalScope.d.ts +44 -0
- package/dist/Model/GlobalScope.d.ts.map +1 -0
- package/dist/Model/GlobalScope.js +64 -0
- package/dist/Model/GlobalScope.js.map +1 -0
- package/dist/Model/Model.d.ts +168 -4
- package/dist/Model/Model.d.ts.map +1 -1
- package/dist/Model/Model.js +476 -16
- package/dist/Model/Model.js.map +1 -1
- package/dist/Model/Observer.d.ts +39 -0
- package/dist/Model/Observer.d.ts.map +1 -0
- package/dist/Model/Observer.js +48 -0
- package/dist/Model/Observer.js.map +1 -0
- package/dist/Model/Relations.d.ts +201 -10
- package/dist/Model/Relations.d.ts.map +1 -1
- package/dist/Model/Relations.js +472 -27
- package/dist/Model/Relations.js.map +1 -1
- package/dist/Query/Expression.d.ts +16 -0
- package/dist/Query/Expression.d.ts.map +1 -0
- package/dist/Query/Expression.js +25 -0
- package/dist/Query/Expression.js.map +1 -0
- package/dist/Query/QueryBuilder.d.ts +64 -6
- package/dist/Query/QueryBuilder.d.ts.map +1 -1
- package/dist/Query/QueryBuilder.js +234 -15
- package/dist/Query/QueryBuilder.js.map +1 -1
- package/dist/Query/QueryLogger.d.ts +55 -0
- package/dist/Query/QueryLogger.d.ts.map +1 -0
- package/dist/Query/QueryLogger.js +82 -0
- package/dist/Query/QueryLogger.js.map +1 -0
- package/dist/Schema/Grammars/Grammar.d.ts +5 -0
- package/dist/Schema/Grammars/Grammar.d.ts.map +1 -1
- package/dist/Schema/Grammars/Grammar.js.map +1 -1
- package/dist/Schema/Grammars/MySQLGrammar.d.ts +1 -0
- package/dist/Schema/Grammars/MySQLGrammar.d.ts.map +1 -1
- package/dist/Schema/Grammars/MySQLGrammar.js +42 -0
- package/dist/Schema/Grammars/MySQLGrammar.js.map +1 -1
- package/dist/Schema/Grammars/PostgreSQLGrammar.d.ts +1 -0
- package/dist/Schema/Grammars/PostgreSQLGrammar.d.ts.map +1 -1
- package/dist/Schema/Grammars/PostgreSQLGrammar.js +46 -0
- package/dist/Schema/Grammars/PostgreSQLGrammar.js.map +1 -1
- package/dist/Schema/Grammars/SQLiteGrammar.d.ts +1 -0
- package/dist/Schema/Grammars/SQLiteGrammar.d.ts.map +1 -1
- package/dist/Schema/Grammars/SQLiteGrammar.js +31 -0
- package/dist/Schema/Grammars/SQLiteGrammar.js.map +1 -1
- package/dist/Schema/Schema.d.ts +6 -0
- package/dist/Schema/Schema.d.ts.map +1 -1
- package/dist/Schema/Schema.js +10 -0
- package/dist/Schema/Schema.js.map +1 -1
- package/dist/Schema/SchemaBuilder.d.ts +4 -0
- package/dist/Schema/SchemaBuilder.d.ts.map +1 -1
- package/dist/Schema/SchemaBuilder.js +15 -0
- package/dist/Schema/SchemaBuilder.js.map +1 -1
- package/dist/Transactions/TransactionManager.d.ts +28 -0
- package/dist/Transactions/TransactionManager.d.ts.map +1 -0
- package/dist/Transactions/TransactionManager.js +68 -0
- package/dist/Transactions/TransactionManager.js.map +1 -0
- package/dist/index.d.ts +11 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +21 -1
- package/dist/index.js.map +1 -1
- package/package.json +10 -6
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MongoDBConnection = void 0;
|
|
4
|
+
const mongodb_1 = require("mongodb");
|
|
5
|
+
/**
|
|
6
|
+
* MongoDB database connection
|
|
7
|
+
*
|
|
8
|
+
* Supports:
|
|
9
|
+
* - Single-host standalone
|
|
10
|
+
* - Replica sets with read/write splitting via ReadPreference
|
|
11
|
+
* - ACID transactions via Client Sessions (requires a replica set)
|
|
12
|
+
* - Connection pooling via the native MongoClient built-in pool
|
|
13
|
+
*/
|
|
14
|
+
class MongoDBConnection {
|
|
15
|
+
constructor(config) {
|
|
16
|
+
this.writeClient = null;
|
|
17
|
+
this.readClient = null;
|
|
18
|
+
this.writeDb = null;
|
|
19
|
+
this.readDb = null;
|
|
20
|
+
this.session = null;
|
|
21
|
+
this.inTransaction = false;
|
|
22
|
+
this.config = config;
|
|
23
|
+
}
|
|
24
|
+
// ─── URI Helpers ───────────────────────────────────────────────────────────
|
|
25
|
+
/**
|
|
26
|
+
* Build a MongoDB connection URI from a config object
|
|
27
|
+
*/
|
|
28
|
+
buildUri(cfg) {
|
|
29
|
+
const host = cfg.host || '127.0.0.1';
|
|
30
|
+
const port = cfg.port || 27017;
|
|
31
|
+
const creds = (cfg.username && cfg.password)
|
|
32
|
+
? `${encodeURIComponent(cfg.username)}:${encodeURIComponent(cfg.password)}@`
|
|
33
|
+
: '';
|
|
34
|
+
return `mongodb://${creds}${host}:${port}/${cfg.database}`;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Build a replica-set URI from an array of read-replica host configs
|
|
38
|
+
*/
|
|
39
|
+
buildReplicaSetUri(readHosts) {
|
|
40
|
+
const creds = (this.config.username && this.config.password)
|
|
41
|
+
? `${encodeURIComponent(this.config.username)}:${encodeURIComponent(this.config.password)}@`
|
|
42
|
+
: '';
|
|
43
|
+
const hostList = readHosts
|
|
44
|
+
.map(h => `${h.host || '127.0.0.1'}:${h.port || 27017}`)
|
|
45
|
+
.join(',');
|
|
46
|
+
return `mongodb://${creds}${hostList}/${this.config.database}`;
|
|
47
|
+
}
|
|
48
|
+
// ─── Connection Management ─────────────────────────────────────────────────
|
|
49
|
+
/**
|
|
50
|
+
* Lazily establish both the write (primary) and read (secondary) connections
|
|
51
|
+
*/
|
|
52
|
+
async ensureConnected() {
|
|
53
|
+
// --- Write / Primary pool ---
|
|
54
|
+
if (!this.writeClient) {
|
|
55
|
+
const writeCfg = this.config.write
|
|
56
|
+
? { ...this.config, ...this.config.write }
|
|
57
|
+
: this.config;
|
|
58
|
+
this.writeClient = new mongodb_1.MongoClient(this.buildUri(writeCfg), {
|
|
59
|
+
maxPoolSize: writeCfg.pool?.max ?? 10,
|
|
60
|
+
minPoolSize: writeCfg.pool?.min ?? 0,
|
|
61
|
+
readPreference: mongodb_1.ReadPreference.PRIMARY,
|
|
62
|
+
});
|
|
63
|
+
await this.writeClient.connect();
|
|
64
|
+
this.writeDb = this.writeClient.db(this.config.database);
|
|
65
|
+
}
|
|
66
|
+
// --- Read / Secondary pool ---
|
|
67
|
+
if (!this.readClient) {
|
|
68
|
+
if (this.config.read) {
|
|
69
|
+
// One or many read replicas → build a replica-set URI
|
|
70
|
+
const readHosts = Array.isArray(this.config.read)
|
|
71
|
+
? this.config.read
|
|
72
|
+
: [this.config.read];
|
|
73
|
+
const uri = this.buildReplicaSetUri(readHosts);
|
|
74
|
+
this.readClient = new mongodb_1.MongoClient(uri, {
|
|
75
|
+
maxPoolSize: this.config.pool?.max ?? 10,
|
|
76
|
+
readPreference: mongodb_1.ReadPreference.SECONDARY_PREFERRED,
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
// No dedicated read host — reuse same server with secondaryPreferred preference
|
|
81
|
+
this.readClient = new mongodb_1.MongoClient(this.buildUri(this.config), {
|
|
82
|
+
maxPoolSize: this.config.pool?.max ?? 10,
|
|
83
|
+
readPreference: mongodb_1.ReadPreference.SECONDARY_PREFERRED,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
await this.readClient.connect();
|
|
87
|
+
this.readDb = this.readClient.db(this.config.database);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
// ─── Connection Interface ──────────────────────────────────────────────────
|
|
91
|
+
/**
|
|
92
|
+
* Raw SQL is not supported in MongoDB.
|
|
93
|
+
* Use getDatabase() / getCollection() for native MongoDB operations.
|
|
94
|
+
*/
|
|
95
|
+
async query(_sql, _bindings = []) {
|
|
96
|
+
throw new Error('Raw SQL queries are not supported in MongoDB. ' +
|
|
97
|
+
'Use MongoDBConnection.getDatabase() or .getCollection() for native operations.');
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Get the Db instance routed to the correct pool.
|
|
101
|
+
* - Read operations → secondary preferred (read replica)
|
|
102
|
+
* - Write operations → primary
|
|
103
|
+
* - During a transaction → always primary
|
|
104
|
+
*/
|
|
105
|
+
async getDatabase(forWrite = false) {
|
|
106
|
+
await this.ensureConnected();
|
|
107
|
+
if (this.inTransaction)
|
|
108
|
+
return this.writeDb;
|
|
109
|
+
return forWrite ? this.writeDb : this.readDb;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Convenience: get a collection automatically routed to the right pool
|
|
113
|
+
*/
|
|
114
|
+
async getCollection(name, forWrite = false) {
|
|
115
|
+
const db = await this.getDatabase(forWrite);
|
|
116
|
+
return db.collection(name);
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Get the underlying write MongoClient instance
|
|
120
|
+
*/
|
|
121
|
+
async getClient() {
|
|
122
|
+
await this.ensureConnected();
|
|
123
|
+
return this.writeClient;
|
|
124
|
+
}
|
|
125
|
+
// ─── Transactions (replica set required) ──────────────────────────────────
|
|
126
|
+
/**
|
|
127
|
+
* Begin a MongoDB ACID transaction.
|
|
128
|
+
* Requires a replica set — will throw on a standalone server.
|
|
129
|
+
*/
|
|
130
|
+
async beginTransaction() {
|
|
131
|
+
await this.ensureConnected();
|
|
132
|
+
if (this.inTransaction) {
|
|
133
|
+
throw new Error('A MongoDB transaction is already in progress.');
|
|
134
|
+
}
|
|
135
|
+
this.session = this.writeClient.startSession();
|
|
136
|
+
this.session.startTransaction();
|
|
137
|
+
this.inTransaction = true;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Commit the active transaction
|
|
141
|
+
*/
|
|
142
|
+
async commit() {
|
|
143
|
+
if (!this.session || !this.inTransaction) {
|
|
144
|
+
throw new Error('No active MongoDB transaction to commit.');
|
|
145
|
+
}
|
|
146
|
+
await this.session.commitTransaction();
|
|
147
|
+
this.session.endSession();
|
|
148
|
+
this.session = null;
|
|
149
|
+
this.inTransaction = false;
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* Rollback (abort) the active transaction
|
|
153
|
+
*/
|
|
154
|
+
async rollback() {
|
|
155
|
+
if (!this.session || !this.inTransaction) {
|
|
156
|
+
throw new Error('No active MongoDB transaction to rollback.');
|
|
157
|
+
}
|
|
158
|
+
await this.session.abortTransaction();
|
|
159
|
+
this.session.endSession();
|
|
160
|
+
this.session = null;
|
|
161
|
+
this.inTransaction = false;
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Get the active ClientSession — pass this to collection operations
|
|
165
|
+
* when running queries inside a transaction.
|
|
166
|
+
*/
|
|
167
|
+
getSession() {
|
|
168
|
+
return this.session;
|
|
169
|
+
}
|
|
170
|
+
// ─── Lifecycle ─────────────────────────────────────────────────────────────
|
|
171
|
+
/**
|
|
172
|
+
* Close both read and write connections
|
|
173
|
+
*/
|
|
174
|
+
async close() {
|
|
175
|
+
if (this.session) {
|
|
176
|
+
await this.session.endSession();
|
|
177
|
+
this.session = null;
|
|
178
|
+
}
|
|
179
|
+
if (this.writeClient) {
|
|
180
|
+
await this.writeClient.close();
|
|
181
|
+
this.writeClient = null;
|
|
182
|
+
this.writeDb = null;
|
|
183
|
+
}
|
|
184
|
+
// Only close readClient if it's a separate instance
|
|
185
|
+
if (this.readClient) {
|
|
186
|
+
await this.readClient.close();
|
|
187
|
+
this.readClient = null;
|
|
188
|
+
this.readDb = null;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
/**
|
|
192
|
+
* Returns the write Db instance as the generic driver handle
|
|
193
|
+
*/
|
|
194
|
+
getDriver() {
|
|
195
|
+
return this.writeDb;
|
|
196
|
+
}
|
|
197
|
+
getSchemaGrammar() {
|
|
198
|
+
throw new Error('Schema builder is not supported for MongoDB. ' +
|
|
199
|
+
'Use MongoDB Atlas schema validation or native Mongoose schemas instead.');
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
exports.MongoDBConnection = MongoDBConnection;
|
|
203
|
+
//# sourceMappingURL=MongoDBConnection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MongoDBConnection.js","sourceRoot":"","sources":["../../src/Connections/MongoDBConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MySQLConnection.d.ts","sourceRoot":"","sources":["../../src/Connections/MySQLConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,qBAAa,eAAgB,YAAW,UAAU;IAC9C,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,qBAAqB,CAAC,CAAuB;gBAEzC,MAAM,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"MySQLConnection.d.ts","sourceRoot":"","sources":["../../src/Connections/MySQLConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,qBAAa,eAAgB,YAAW,UAAU;IAC9C,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,SAAS,CAAC,CAAa;IAC/B,OAAO,CAAC,qBAAqB,CAAC,CAAuB;gBAEzC,MAAM,EAAE,gBAAgB;IA6CpC;;OAEG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAa5D;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAS7B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAS/B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B;;OAEG;IACH,SAAS,IAAI,KAAK,CAAC,IAAI;IAIvB;;OAEG;IACH,gBAAgB;CAInB"}
|
|
@@ -10,24 +10,57 @@ const promise_1 = __importDefault(require("mysql2/promise"));
|
|
|
10
10
|
*/
|
|
11
11
|
class MySQLConnection {
|
|
12
12
|
constructor(config) {
|
|
13
|
+
// Build Read Pool
|
|
14
|
+
let readConfig = config;
|
|
15
|
+
// Pick one host randomly if read is an array pool
|
|
16
|
+
if (config.read) {
|
|
17
|
+
if (Array.isArray(config.read)) {
|
|
18
|
+
const randomRead = config.read[Math.floor(Math.random() * config.read.length)];
|
|
19
|
+
readConfig = { ...config, ...randomRead };
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
readConfig = { ...config, ...config.read };
|
|
23
|
+
}
|
|
24
|
+
}
|
|
13
25
|
this.pool = promise_1.default.createPool({
|
|
14
|
-
host:
|
|
15
|
-
port:
|
|
16
|
-
user:
|
|
17
|
-
password:
|
|
18
|
-
database:
|
|
19
|
-
charset:
|
|
20
|
-
timezone:
|
|
26
|
+
host: readConfig.host,
|
|
27
|
+
port: readConfig.port,
|
|
28
|
+
user: readConfig.username,
|
|
29
|
+
password: readConfig.password,
|
|
30
|
+
database: readConfig.database,
|
|
31
|
+
charset: readConfig.charset || 'utf8mb4',
|
|
32
|
+
timezone: readConfig.timezone || '+00:00',
|
|
21
33
|
waitForConnections: true,
|
|
22
|
-
connectionLimit:
|
|
34
|
+
connectionLimit: readConfig.pool?.max || 10,
|
|
23
35
|
queueLimit: 0,
|
|
24
36
|
});
|
|
37
|
+
// Build Write Pool (if explicitly specified)
|
|
38
|
+
if (config.write) {
|
|
39
|
+
const writeConfig = { ...config, ...config.write };
|
|
40
|
+
this.writePool = promise_1.default.createPool({
|
|
41
|
+
host: writeConfig.host,
|
|
42
|
+
port: writeConfig.port,
|
|
43
|
+
user: writeConfig.username,
|
|
44
|
+
password: writeConfig.password,
|
|
45
|
+
database: writeConfig.database,
|
|
46
|
+
charset: writeConfig.charset || 'utf8mb4',
|
|
47
|
+
timezone: writeConfig.timezone || '+00:00',
|
|
48
|
+
waitForConnections: true,
|
|
49
|
+
connectionLimit: writeConfig.pool?.max || 10,
|
|
50
|
+
queueLimit: 0,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
25
53
|
}
|
|
26
54
|
/**
|
|
27
55
|
* Execute a raw SQL query
|
|
28
56
|
*/
|
|
29
57
|
async query(sql, bindings = []) {
|
|
30
|
-
|
|
58
|
+
let connection = this.transactionConnection;
|
|
59
|
+
if (!connection) {
|
|
60
|
+
// Determine operation type (read vs write) to load balance pools
|
|
61
|
+
const isWriteOperation = /^\s*(?:insert|update|delete|create|alter|drop|truncate|replace)/i.test(sql);
|
|
62
|
+
connection = (isWriteOperation && this.writePool) ? this.writePool : this.pool;
|
|
63
|
+
}
|
|
31
64
|
const [rows] = await connection.execute(sql, bindings);
|
|
32
65
|
return rows;
|
|
33
66
|
}
|
|
@@ -38,7 +71,8 @@ class MySQLConnection {
|
|
|
38
71
|
if (this.transactionConnection) {
|
|
39
72
|
throw new Error('Transaction already started');
|
|
40
73
|
}
|
|
41
|
-
this.
|
|
74
|
+
const masterPool = this.writePool || this.pool;
|
|
75
|
+
this.transactionConnection = await masterPool.getConnection();
|
|
42
76
|
await this.transactionConnection.beginTransaction();
|
|
43
77
|
}
|
|
44
78
|
/**
|
|
@@ -71,6 +105,9 @@ class MySQLConnection {
|
|
|
71
105
|
this.transactionConnection.release();
|
|
72
106
|
this.transactionConnection = undefined;
|
|
73
107
|
}
|
|
108
|
+
if (this.writePool) {
|
|
109
|
+
await this.writePool.end();
|
|
110
|
+
}
|
|
74
111
|
await this.pool.end();
|
|
75
112
|
}
|
|
76
113
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MySQLConnection.js","sourceRoot":"","sources":["../../src/Connections/MySQLConnection.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAmC;AAGnC;;GAEG;AACH,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"MySQLConnection.js","sourceRoot":"","sources":["../../src/Connections/MySQLConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreSQLConnection.d.ts","sourceRoot":"","sources":["../../src/Connections/PostgreSQLConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,qBAAa,oBAAqB,YAAW,UAAU;IACnD,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,iBAAiB,CAAC,CAAa;gBAE3B,MAAM,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"PostgreSQLConnection.d.ts","sourceRoot":"","sources":["../../src/Connections/PostgreSQLConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,qBAAa,oBAAqB,YAAW,UAAU;IACnD,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,SAAS,CAAC,CAAO;IACzB,OAAO,CAAC,iBAAiB,CAAC,CAAa;gBAE3B,MAAM,EAAE,gBAAgB;IAuCpC;;OAEG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAa5D;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAS7B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAS/B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B;;OAEG;IACH,SAAS,IAAI,IAAI;IAIjB;;OAEG;IACH,gBAAgB;CAInB"}
|
|
@@ -7,21 +7,51 @@ const pg_1 = require("pg");
|
|
|
7
7
|
*/
|
|
8
8
|
class PostgreSQLConnection {
|
|
9
9
|
constructor(config) {
|
|
10
|
+
// Build Read Pool
|
|
11
|
+
let readConfig = config;
|
|
12
|
+
// Pick one host randomly if read is an array pool
|
|
13
|
+
if (config.read) {
|
|
14
|
+
if (Array.isArray(config.read)) {
|
|
15
|
+
const randomRead = config.read[Math.floor(Math.random() * config.read.length)];
|
|
16
|
+
readConfig = { ...config, ...randomRead };
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
readConfig = { ...config, ...config.read };
|
|
20
|
+
}
|
|
21
|
+
}
|
|
10
22
|
this.pool = new pg_1.Pool({
|
|
11
|
-
host:
|
|
12
|
-
port:
|
|
13
|
-
user:
|
|
14
|
-
password:
|
|
15
|
-
database:
|
|
16
|
-
min:
|
|
17
|
-
max:
|
|
23
|
+
host: readConfig.host,
|
|
24
|
+
port: readConfig.port,
|
|
25
|
+
user: readConfig.username,
|
|
26
|
+
password: readConfig.password,
|
|
27
|
+
database: readConfig.database,
|
|
28
|
+
min: readConfig.pool?.min || 0,
|
|
29
|
+
max: readConfig.pool?.max || 10,
|
|
18
30
|
});
|
|
31
|
+
// Build Write Pool (if explicitly specified)
|
|
32
|
+
if (config.write) {
|
|
33
|
+
const writeConfig = { ...config, ...config.write };
|
|
34
|
+
this.writePool = new pg_1.Pool({
|
|
35
|
+
host: writeConfig.host,
|
|
36
|
+
port: writeConfig.port,
|
|
37
|
+
user: writeConfig.username,
|
|
38
|
+
password: writeConfig.password,
|
|
39
|
+
database: writeConfig.database,
|
|
40
|
+
min: writeConfig.pool?.min || 0,
|
|
41
|
+
max: writeConfig.pool?.max || 10,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
19
44
|
}
|
|
20
45
|
/**
|
|
21
46
|
* Execute a raw SQL query
|
|
22
47
|
*/
|
|
23
48
|
async query(sql, bindings = []) {
|
|
24
|
-
|
|
49
|
+
let client = this.transactionClient;
|
|
50
|
+
if (!client) {
|
|
51
|
+
// Determine operation type (read vs write) to load balance pools
|
|
52
|
+
const isWriteOperation = /^\s*(?:insert|update|delete|create|alter|drop|truncate|replace)/i.test(sql);
|
|
53
|
+
client = (isWriteOperation && this.writePool) ? this.writePool : this.pool;
|
|
54
|
+
}
|
|
25
55
|
const result = await client.query(sql, bindings);
|
|
26
56
|
return result.rows;
|
|
27
57
|
}
|
|
@@ -32,7 +62,8 @@ class PostgreSQLConnection {
|
|
|
32
62
|
if (this.transactionClient) {
|
|
33
63
|
throw new Error('Transaction already started');
|
|
34
64
|
}
|
|
35
|
-
this.
|
|
65
|
+
const masterPool = this.writePool || this.pool;
|
|
66
|
+
this.transactionClient = await masterPool.connect();
|
|
36
67
|
await this.transactionClient.query('BEGIN');
|
|
37
68
|
}
|
|
38
69
|
/**
|
|
@@ -65,6 +96,9 @@ class PostgreSQLConnection {
|
|
|
65
96
|
this.transactionClient.release();
|
|
66
97
|
this.transactionClient = undefined;
|
|
67
98
|
}
|
|
99
|
+
if (this.writePool) {
|
|
100
|
+
await this.writePool.end();
|
|
101
|
+
}
|
|
68
102
|
await this.pool.end();
|
|
69
103
|
}
|
|
70
104
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreSQLConnection.js","sourceRoot":"","sources":["../../src/Connections/PostgreSQLConnection.ts"],"names":[],"mappings":";;;AAAA,2BAAsC;AAGtC;;GAEG;AACH,MAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"PostgreSQLConnection.js","sourceRoot":"","sources":["../../src/Connections/PostgreSQLConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLiteConnection.d.ts","sourceRoot":"","sources":["../../src/Connections/SQLiteConnection.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,qBAAa,gBAAiB,YAAW,UAAU;IAC/C,OAAO,CAAC,EAAE,CAAkC;IAC5C,OAAO,CAAC,MAAM,CAAmB;gBAErB,MAAM,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"SQLiteConnection.d.ts","sourceRoot":"","sources":["../../src/Connections/SQLiteConnection.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,qBAAa,gBAAiB,YAAW,UAAU;IAC/C,OAAO,CAAC,EAAE,CAAkC;IAC5C,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,MAAM,CAAmB;gBAErB,MAAM,EAAE,gBAAgB;IAKpC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB9B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC;;OAEG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IA8B9D;;OAEG;IACG,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAYpC;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,QAAQ;IAO9B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;OAEG;IACH,gBAAgB;CAInB"}
|
|
@@ -11,16 +11,34 @@ const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
|
|
|
11
11
|
class SQLiteConnection {
|
|
12
12
|
constructor(config) {
|
|
13
13
|
this.db = null;
|
|
14
|
+
this.writeDb = null;
|
|
14
15
|
this.config = config;
|
|
16
|
+
this.connect();
|
|
15
17
|
}
|
|
16
18
|
/**
|
|
17
19
|
* Connect to the database
|
|
18
20
|
*/
|
|
19
21
|
async connect() {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
let readConfig = this.config;
|
|
23
|
+
if (this.config.read) {
|
|
24
|
+
if (Array.isArray(this.config.read)) {
|
|
25
|
+
const randomRead = this.config.read[Math.floor(Math.random() * this.config.read.length)];
|
|
26
|
+
readConfig = { ...this.config, ...randomRead };
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
readConfig = { ...this.config, ...this.config.read };
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
if (!this.db) {
|
|
33
|
+
const dbPath = readConfig.database || ':memory:';
|
|
34
|
+
// If config has explicit read/write split, open read DB read-only
|
|
35
|
+
const isReadOnly = !!(this.config.read && this.config.write);
|
|
36
|
+
this.db = new better_sqlite3_1.default(dbPath, { readonly: isReadOnly });
|
|
37
|
+
}
|
|
38
|
+
if (this.config.write && !this.writeDb) {
|
|
39
|
+
const writeConfig = { ...this.config, ...this.config.write };
|
|
40
|
+
this.writeDb = new better_sqlite3_1.default(writeConfig.database || ':memory:');
|
|
22
41
|
}
|
|
23
|
-
this.db = new better_sqlite3_1.default(this.config.database || ':memory:');
|
|
24
42
|
}
|
|
25
43
|
/**
|
|
26
44
|
* Disconnect from the database
|
|
@@ -30,6 +48,10 @@ class SQLiteConnection {
|
|
|
30
48
|
this.db.close();
|
|
31
49
|
this.db = null;
|
|
32
50
|
}
|
|
51
|
+
if (this.writeDb) {
|
|
52
|
+
this.writeDb.close();
|
|
53
|
+
this.writeDb = null;
|
|
54
|
+
}
|
|
33
55
|
}
|
|
34
56
|
/**
|
|
35
57
|
* Execute a query
|
|
@@ -38,14 +60,23 @@ class SQLiteConnection {
|
|
|
38
60
|
if (!this.db) {
|
|
39
61
|
await this.connect();
|
|
40
62
|
}
|
|
63
|
+
const preparedBindings = bindings.map(b => {
|
|
64
|
+
if (b instanceof Date)
|
|
65
|
+
return b.toISOString();
|
|
66
|
+
if (typeof b === 'boolean')
|
|
67
|
+
return b ? 1 : 0;
|
|
68
|
+
return b;
|
|
69
|
+
});
|
|
70
|
+
const isWriteOperation = /^\s*(?:insert|update|delete|create|alter|drop|truncate|replace)/i.test(sql);
|
|
71
|
+
const connection = (isWriteOperation && this.writeDb) ? this.writeDb : this.db;
|
|
41
72
|
try {
|
|
42
|
-
const stmt =
|
|
73
|
+
const stmt = connection.prepare(sql);
|
|
43
74
|
// Check if it's a SELECT query
|
|
44
|
-
if (sql.trim().toLowerCase().startsWith('select')) {
|
|
45
|
-
return stmt.all(...
|
|
75
|
+
if (!isWriteOperation && sql.trim().toLowerCase().startsWith('select')) {
|
|
76
|
+
return stmt.all(...preparedBindings);
|
|
46
77
|
}
|
|
47
78
|
// For INSERT, UPDATE, DELETE
|
|
48
|
-
const info = stmt.run(...
|
|
79
|
+
const info = stmt.run(...preparedBindings);
|
|
49
80
|
return [{ affectedRows: info.changes, insertId: info.lastInsertRowid }];
|
|
50
81
|
}
|
|
51
82
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLiteConnection.js","sourceRoot":"","sources":["../../src/Connections/SQLiteConnection.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAsC;AAGtC;;GAEG;AACH,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"SQLiteConnection.js","sourceRoot":"","sources":["../../src/Connections/SQLiteConnection.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAsC;AAGtC;;GAEG;AACH,MAAa,gBAAgB;IAKzB,YAAY,MAAwB;QAJ5B,OAAE,GAA6B,IAAI,CAAC;QACpC,YAAO,GAA6B,IAAI,CAAC;QAI7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACT,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzF,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACJ,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACzD,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC;YACjD,kEAAkE;YAClE,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7D,IAAI,CAAC,EAAE,GAAG,IAAI,wBAAQ,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACrC,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC7D,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAQ,CAAC,WAAW,CAAC,QAAQ,IAAI,UAAU,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACZ,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACV,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACxB,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAC,GAAW,EAAE,WAAkB,EAAE;QACzC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,CAAC;QAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACtC,IAAI,CAAC,YAAY,IAAI;gBAAE,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9C,IAAI,OAAO,CAAC,KAAK,SAAS;gBAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,kEAAkE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtG,MAAM,UAAU,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAG,CAAC;QAEhF,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAErC,+BAA+B;YAC/B,IAAI,CAAC,gBAAgB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;YACzC,CAAC;YAED,6BAA6B;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;YAC3C,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,GAAG,CAAC,GAAW;QACjB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,CAAC;QAED,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,EAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;IACL,CAAC;IAED;;OAEG;IACH,SAAS;QACL,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB;QAClB,MAAM,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACV,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,gBAAgB;QACZ,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAC;QACtE,OAAO,IAAI,aAAa,EAAE,CAAC;IAC/B,CAAC;CACJ;AAjJD,4CAiJC"}
|