tspace-mysql 1.7.4 → 1.7.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 +3 -3
- package/build/lib/connection/index.d.ts +8 -5
- package/build/lib/connection/index.js +98 -48
- package/build/lib/connection/index.js.map +1 -1
- package/build/lib/core/Builder.js +2 -2
- package/build/lib/core/Builder.js.map +1 -1
- package/build/lib/core/Cache/DBCache.js +1 -1
- package/build/lib/core/Cache/DBCache.js.map +1 -1
- package/build/lib/core/Cache/RedisCache.js +2 -2
- package/build/lib/core/Cache/RedisCache.js.map +1 -1
- package/build/lib/core/DB.js +1 -1
- package/build/lib/core/DB.js.map +1 -1
- package/build/lib/core/Decorator.d.ts +77 -5
- package/build/lib/core/Decorator.js +72 -0
- package/build/lib/core/Decorator.js.map +1 -1
- package/build/lib/core/Handlers/Relation.d.ts +1 -1
- package/build/lib/core/Handlers/Relation.js +79 -76
- package/build/lib/core/Handlers/Relation.js.map +1 -1
- package/build/lib/core/UtilityTypes.d.ts +64 -0
- package/build/lib/options/index.js.map +1 -1
- package/build/lib/tools/index.js.map +1 -0
- package/build/lib/types.d.ts +6 -6
- package/package.json +1 -1
- package/build/lib/core/Tools/index.js.map +0 -1
- /package/build/lib/{core/Tools → tools}/index.d.ts +0 -0
- /package/build/lib/{core/Tools → tools}/index.js +0 -0
package/README.md
CHANGED
|
@@ -1070,6 +1070,7 @@ try {
|
|
|
1070
1070
|
* @commit commit transaction to database
|
|
1071
1071
|
*/
|
|
1072
1072
|
await connection.commit();
|
|
1073
|
+
|
|
1073
1074
|
} catch (err) {
|
|
1074
1075
|
/**
|
|
1075
1076
|
*
|
|
@@ -2269,7 +2270,7 @@ const schema = {
|
|
|
2269
2270
|
|
|
2270
2271
|
|
|
2271
2272
|
// make type in TS
|
|
2272
|
-
type
|
|
2273
|
+
type TS = TSchema<typeof Schema>
|
|
2273
2274
|
|
|
2274
2275
|
// the TSchemaUser will be created like that
|
|
2275
2276
|
/**
|
|
@@ -2285,8 +2286,7 @@ type TSchemaUser = TSchema<typeof Schema>
|
|
|
2285
2286
|
*/
|
|
2286
2287
|
|
|
2287
2288
|
|
|
2288
|
-
class User extends Model
|
|
2289
|
-
<TSchemaUser> // use the schema for this User model
|
|
2289
|
+
class User extends Model<TS> // use the schema for this User model
|
|
2290
2290
|
{
|
|
2291
2291
|
constructor() {
|
|
2292
2292
|
super();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from 'events';
|
|
2
2
|
import { loadOptionsEnvironment } from '../options';
|
|
3
|
-
import { TConnection, TOptions } from '../types';
|
|
3
|
+
import type { TConnection, TOptions } from '../types';
|
|
4
4
|
export declare class PoolConnection extends EventEmitter {
|
|
5
5
|
private OPTIONS;
|
|
6
6
|
/**
|
|
@@ -15,13 +15,15 @@ export declare class PoolConnection extends EventEmitter {
|
|
|
15
15
|
* @property {Function} Connection.query
|
|
16
16
|
* @property {Function} Connection.connection
|
|
17
17
|
*/
|
|
18
|
-
|
|
18
|
+
init(): TConnection;
|
|
19
|
+
private _transaction;
|
|
19
20
|
private _detectEventQuery;
|
|
20
21
|
private _detectQueryType;
|
|
21
22
|
private _defaultOptions;
|
|
22
23
|
private _loadOptions;
|
|
23
24
|
private _convertStringToObject;
|
|
24
25
|
private _covertKeyTypeToCorrectType;
|
|
26
|
+
private _onPoolConnect;
|
|
25
27
|
private _messageConnected;
|
|
26
28
|
private _messageError;
|
|
27
29
|
private _messageSlowQuery;
|
|
@@ -29,9 +31,10 @@ export declare class PoolConnection extends EventEmitter {
|
|
|
29
31
|
/**
|
|
30
32
|
*
|
|
31
33
|
* Connection to database when service is started
|
|
32
|
-
*
|
|
33
|
-
* @
|
|
34
|
-
* @property
|
|
34
|
+
*
|
|
35
|
+
* @returns {Connection} Connection
|
|
36
|
+
* @property {Function} Connection.query
|
|
37
|
+
* @property {Function} Connection.connection
|
|
35
38
|
*/
|
|
36
39
|
declare const pool: TConnection;
|
|
37
40
|
export { loadOptionsEnvironment };
|
|
@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
25
34
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
36
|
};
|
|
@@ -29,8 +38,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
38
|
exports.Pool = exports.loadOptionsEnvironment = exports.PoolConnection = void 0;
|
|
30
39
|
const fs_1 = __importDefault(require("fs"));
|
|
31
40
|
const path_1 = __importDefault(require("path"));
|
|
32
|
-
const mysql2_1 = require("mysql2");
|
|
33
41
|
const events_1 = require("events");
|
|
42
|
+
const mysql2_1 = require("mysql2");
|
|
34
43
|
const options_1 = __importStar(require("../options"));
|
|
35
44
|
Object.defineProperty(exports, "loadOptionsEnvironment", { enumerable: true, get: function () { return options_1.loadOptionsEnvironment; } });
|
|
36
45
|
class PoolConnection extends events_1.EventEmitter {
|
|
@@ -52,41 +61,16 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
52
61
|
* @property {Function} Connection.query
|
|
53
62
|
* @property {Function} Connection.connection
|
|
54
63
|
*/
|
|
55
|
-
|
|
64
|
+
init() {
|
|
56
65
|
const pool = (0, mysql2_1.createPool)(Object.fromEntries(this.OPTIONS));
|
|
57
66
|
/**
|
|
58
67
|
* After the server is listening, verify that the pool has successfully connected to the database.
|
|
59
|
-
* @
|
|
68
|
+
* @param {Pool} pool
|
|
60
69
|
* @returns {void}
|
|
61
70
|
*/
|
|
62
|
-
|
|
63
|
-
pool.getConnection((err, connection) => {
|
|
64
|
-
if (err == null || !err) {
|
|
65
|
-
this.emit('CONNECTION', pool);
|
|
66
|
-
if (options_1.default.CONNECTION_SUCCESS) {
|
|
67
|
-
connection.query(`SHOW VARIABLES LIKE 'version%'`, (err, results) => {
|
|
68
|
-
connection.release();
|
|
69
|
-
if (err)
|
|
70
|
-
return;
|
|
71
|
-
const message = [
|
|
72
|
-
results.find(v => (v === null || v === void 0 ? void 0 : v.Variable_name) === 'version'),
|
|
73
|
-
results.find(v => (v === null || v === void 0 ? void 0 : v.Variable_name) === 'version_comment')
|
|
74
|
-
].map(v => v === null || v === void 0 ? void 0 : v.Value).join(' - ');
|
|
75
|
-
console.log(this._messageConnected.bind(this)(`${message}`));
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
return;
|
|
79
|
-
}
|
|
80
|
-
const message = this._messageError.bind(this);
|
|
81
|
-
process.nextTick(() => {
|
|
82
|
-
console.log(message(err.message == null || err.message === '' ? err.code : err.message));
|
|
83
|
-
if (options_1.default.CONNECTION_ERROR)
|
|
84
|
-
return process.exit();
|
|
85
|
-
});
|
|
86
|
-
});
|
|
87
|
-
}, 1000 * 2.5);
|
|
71
|
+
this._onPoolConnect(pool);
|
|
88
72
|
pool.on('release', (connection) => {
|
|
89
|
-
this.emit('
|
|
73
|
+
this.emit('release', connection);
|
|
90
74
|
});
|
|
91
75
|
return {
|
|
92
76
|
on: (event, data) => {
|
|
@@ -95,6 +79,11 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
95
79
|
query: (sql) => {
|
|
96
80
|
return new Promise((resolve, reject) => {
|
|
97
81
|
const start = Date.now();
|
|
82
|
+
/**
|
|
83
|
+
*
|
|
84
|
+
* The pool does not need to be manually released,
|
|
85
|
+
* because the mysql2 automatically handles the release when a query is successful.
|
|
86
|
+
*/
|
|
98
87
|
pool.query(sql, (err, results) => {
|
|
99
88
|
if (err)
|
|
100
89
|
return reject(err);
|
|
@@ -108,14 +97,17 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
108
97
|
});
|
|
109
98
|
},
|
|
110
99
|
connection: () => {
|
|
100
|
+
const transaction = this._transaction();
|
|
111
101
|
return new Promise((resolve, reject) => {
|
|
112
102
|
pool.getConnection((err, connection) => {
|
|
113
103
|
if (err)
|
|
114
104
|
return reject(err);
|
|
115
|
-
const query = (sql) => {
|
|
105
|
+
const query = (sql, { release = false } = {}) => {
|
|
116
106
|
const start = Date.now();
|
|
117
107
|
return new Promise((resolve, reject) => {
|
|
118
108
|
connection.query(sql, (err, results) => {
|
|
109
|
+
if (release || !transaction.state)
|
|
110
|
+
connection.release();
|
|
119
111
|
if (err)
|
|
120
112
|
return reject(err);
|
|
121
113
|
this._detectEventQuery({ start, sql, results });
|
|
@@ -123,13 +115,23 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
123
115
|
});
|
|
124
116
|
});
|
|
125
117
|
};
|
|
126
|
-
const startTransaction = () =>
|
|
127
|
-
|
|
128
|
-
|
|
118
|
+
const startTransaction = () => __awaiter(this, void 0, void 0, function* () {
|
|
119
|
+
transaction.start();
|
|
120
|
+
yield query('START TRANSACTION');
|
|
121
|
+
return;
|
|
122
|
+
});
|
|
123
|
+
const commit = () => __awaiter(this, void 0, void 0, function* () {
|
|
124
|
+
transaction.close();
|
|
125
|
+
yield query('COMMIT', { release: true });
|
|
126
|
+
return;
|
|
127
|
+
});
|
|
128
|
+
const rollback = () => __awaiter(this, void 0, void 0, function* () {
|
|
129
|
+
transaction.close();
|
|
130
|
+
yield query('ROLLBACK', { release: true });
|
|
131
|
+
return;
|
|
132
|
+
});
|
|
129
133
|
return resolve({
|
|
130
|
-
on: (event, data) =>
|
|
131
|
-
return this.on(event, data);
|
|
132
|
-
},
|
|
134
|
+
on: (event, data) => this.on(event, data),
|
|
133
135
|
query,
|
|
134
136
|
startTransaction,
|
|
135
137
|
commit,
|
|
@@ -140,6 +142,23 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
140
142
|
}
|
|
141
143
|
};
|
|
142
144
|
}
|
|
145
|
+
_transaction() {
|
|
146
|
+
class Transaction {
|
|
147
|
+
constructor() {
|
|
148
|
+
this.on = false;
|
|
149
|
+
}
|
|
150
|
+
state() {
|
|
151
|
+
return this.on;
|
|
152
|
+
}
|
|
153
|
+
start() {
|
|
154
|
+
this.on = true;
|
|
155
|
+
}
|
|
156
|
+
close() {
|
|
157
|
+
this.on = false;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
return new Transaction();
|
|
161
|
+
}
|
|
143
162
|
_detectEventQuery({ start, sql, results }) {
|
|
144
163
|
const duration = Date.now() - start;
|
|
145
164
|
if (duration > 1000 * 10) {
|
|
@@ -148,12 +167,12 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
148
167
|
sql = `${sql.slice(0, maxLength)}.......`;
|
|
149
168
|
}
|
|
150
169
|
console.log(this._messageSlowQuery(duration, sql));
|
|
151
|
-
this.emit('
|
|
170
|
+
this.emit('slowQuery', {
|
|
152
171
|
sql,
|
|
153
172
|
execution: duration
|
|
154
173
|
});
|
|
155
174
|
}
|
|
156
|
-
this.emit('
|
|
175
|
+
this.emit('query', {
|
|
157
176
|
sql,
|
|
158
177
|
execution: duration
|
|
159
178
|
});
|
|
@@ -168,14 +187,14 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
168
187
|
const insertRegex = /^INSERT\b/i;
|
|
169
188
|
const deleteRegex = /^DELETE\b/i;
|
|
170
189
|
if (selectRegex.test(query))
|
|
171
|
-
return '
|
|
190
|
+
return 'select';
|
|
172
191
|
if (updateRegex.test(query))
|
|
173
|
-
return '
|
|
192
|
+
return 'update';
|
|
174
193
|
if (insertRegex.test(query))
|
|
175
|
-
return '
|
|
194
|
+
return 'insert';
|
|
176
195
|
if (deleteRegex.test(query))
|
|
177
|
-
return '
|
|
178
|
-
return '
|
|
196
|
+
return 'delete';
|
|
197
|
+
return '';
|
|
179
198
|
}
|
|
180
199
|
_defaultOptions() {
|
|
181
200
|
return new Map(Object.entries({
|
|
@@ -274,6 +293,36 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
274
293
|
}
|
|
275
294
|
return data;
|
|
276
295
|
}
|
|
296
|
+
_onPoolConnect(pool) {
|
|
297
|
+
const delay = 1000 * 5;
|
|
298
|
+
setTimeout(() => {
|
|
299
|
+
pool.getConnection((err, connection) => {
|
|
300
|
+
if (err) {
|
|
301
|
+
const message = this._messageError.bind(this);
|
|
302
|
+
process.nextTick(() => {
|
|
303
|
+
console.log(message(err.message == null || err.message === '' ? err.code : err.message));
|
|
304
|
+
if (options_1.default.CONNECTION_ERROR)
|
|
305
|
+
return process.exit();
|
|
306
|
+
});
|
|
307
|
+
return;
|
|
308
|
+
}
|
|
309
|
+
this.emit('connected', connection);
|
|
310
|
+
if (options_1.default.CONNECTION_SUCCESS) {
|
|
311
|
+
connection.query(`SHOW VARIABLES LIKE 'version%'`, (err, results) => {
|
|
312
|
+
connection.release();
|
|
313
|
+
if (err)
|
|
314
|
+
return;
|
|
315
|
+
const message = [
|
|
316
|
+
results.find(v => (v === null || v === void 0 ? void 0 : v.Variable_name) === 'version'),
|
|
317
|
+
results.find(v => (v === null || v === void 0 ? void 0 : v.Variable_name) === 'version_comment')
|
|
318
|
+
].map(v => v === null || v === void 0 ? void 0 : v.Value).join(' - ');
|
|
319
|
+
console.log(this._messageConnected.bind(this)(`${message}`));
|
|
320
|
+
});
|
|
321
|
+
}
|
|
322
|
+
});
|
|
323
|
+
}, delay);
|
|
324
|
+
return;
|
|
325
|
+
}
|
|
277
326
|
_messageConnected(message) {
|
|
278
327
|
return `
|
|
279
328
|
\x1b[1m\x1b[32m
|
|
@@ -312,11 +361,12 @@ exports.PoolConnection = PoolConnection;
|
|
|
312
361
|
/**
|
|
313
362
|
*
|
|
314
363
|
* Connection to database when service is started
|
|
315
|
-
*
|
|
316
|
-
* @
|
|
317
|
-
* @property
|
|
364
|
+
*
|
|
365
|
+
* @returns {Connection} Connection
|
|
366
|
+
* @property {Function} Connection.query
|
|
367
|
+
* @property {Function} Connection.connection
|
|
318
368
|
*/
|
|
319
|
-
const pool = new PoolConnection().
|
|
369
|
+
const pool = new PoolConnection().init();
|
|
320
370
|
exports.Pool = pool;
|
|
321
371
|
exports.default = pool;
|
|
322
372
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/connection/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/connection/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2308,7 +2308,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
2308
2308
|
database,
|
|
2309
2309
|
user,
|
|
2310
2310
|
password }, others));
|
|
2311
|
-
this.$pool.set(pool.
|
|
2311
|
+
this.$pool.set(pool.init());
|
|
2312
2312
|
return this;
|
|
2313
2313
|
}
|
|
2314
2314
|
/**
|
|
@@ -2327,7 +2327,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
2327
2327
|
user: String(options.username),
|
|
2328
2328
|
password: String(options.password)
|
|
2329
2329
|
});
|
|
2330
|
-
this.$pool.set(pool.
|
|
2330
|
+
this.$pool.set(pool.init());
|
|
2331
2331
|
return this;
|
|
2332
2332
|
}
|
|
2333
2333
|
/**
|