@puca/puca-core 8.2.3 → 8.3.1
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/core/services/auth.service.js +2 -1
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.js +59 -23
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +17 -25
- package/dist/core/services/crud-base-testable.service.js +4 -4
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.d.ts +4 -2
- package/dist/core/services/crud-base.controller.js +32 -82
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-base.service.d.ts +1 -4
- package/dist/core/services/crud-base.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.d.ts +12 -4
- package/dist/core/services/crud-front-base.service.js +81 -1
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/eval.service.js +1 -0
- package/dist/core/services/eval.service.js.map +1 -1
- package/dist/core/services/index.d.ts +4 -0
- package/dist/core/services/index.js +10 -4
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +5 -8
- package/dist/core/services/install.service.js +20 -323
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/job/job.service.d.ts +2 -4
- package/dist/core/services/job/job.service.js +3 -10
- package/dist/core/services/job/job.service.js.map +1 -1
- package/dist/core/services/job-executor/job-executor.service.d.ts +2 -2
- package/dist/core/services/job-executor/job-executor.service.js +4 -4
- package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +3 -2
- package/dist/core/services/life-cycle.service.js +5 -3
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/migration.service.d.ts +17 -8
- package/dist/core/services/migration.service.js +110 -87
- package/dist/core/services/migration.service.js.map +1 -1
- package/dist/core/services/module-especification.service.d.ts +9 -0
- package/dist/core/services/module-especification.service.js +32 -0
- package/dist/core/services/module-especification.service.js.map +1 -0
- package/dist/core/services/notification.service.js.map +1 -1
- package/dist/core/services/report.service.d.ts +26 -71
- package/dist/core/services/report.service.js +67 -213
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/single-instance-ensure.service.js +1 -1
- package/dist/core/services/single-instance-ensure.service.js.map +1 -1
- package/dist/core/services/source/source.service.js +1 -0
- package/dist/core/services/source/source.service.js.map +1 -1
- package/dist/core/services/table-permission.service.d.ts +14 -0
- package/dist/core/services/table-permission.service.js +299 -0
- package/dist/core/services/table-permission.service.js.map +1 -0
- package/dist/core/services/user-config.service.js +1 -1
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +3 -1
- package/dist/models/field-dictionary.d.ts +6 -2
- package/dist/models/puca-row-status.d.ts +0 -0
- package/dist/models/puca-row-status.js +1 -0
- package/dist/models/puca-row-status.js.map +1 -0
- package/dist/orm/cases/bo/ddl.service.d.ts +1 -1
- package/dist/orm/cases/bo/ddl.service.js +15 -9
- package/dist/orm/cases/bo/ddl.service.js.map +1 -1
- package/dist/orm/cases/bo/interfaces.d.ts +15 -2
- package/dist/orm/cases/bo/interfaces.js.map +1 -1
- package/dist/orm/cases/bo/sql.service.d.ts +5 -14
- package/dist/orm/cases/bo/sql.service.js +11 -11
- package/dist/orm/cases/bo/sql.service.js.map +1 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +0 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.js +11 -15
- package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
- package/dist/orm/services/index.d.ts +1 -1
- package/dist/orm/services/index.js +1 -1
- package/dist/orm/services/index.js.map +1 -1
- package/dist/orm/services/repository-factory.d.ts +1 -1
- package/dist/orm/services/repository.d.ts +18 -19
- package/dist/orm/services/repository.js +33 -23
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql/helpers.d.ts +2 -0
- package/dist/orm/services/sql/helpers.js +48 -0
- package/dist/orm/services/sql/helpers.js.map +1 -0
- package/dist/orm/services/sql/interfaces.d.ts +11 -0
- package/dist/orm/services/sql/interfaces.js +3 -0
- package/dist/orm/services/sql/interfaces.js.map +1 -0
- package/dist/orm/services/sql/sql-layer.service.d.ts +52 -0
- package/dist/orm/services/sql/sql-layer.service.js +446 -0
- package/dist/orm/services/sql/sql-layer.service.js.map +1 -0
- package/dist/orm/services/sql/sql-security-layer.service.d.ts +17 -0
- package/dist/orm/services/sql/sql-security-layer.service.js +165 -0
- package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -0
- package/dist/orm/services/sql/sql-status-layer.service.d.ts +0 -0
- package/dist/orm/services/sql/sql-status-layer.service.js +1 -0
- package/dist/orm/services/sql/sql-status-layer.service.js.map +1 -0
- package/dist/orm/services/sql/sql.service.d.ts +14 -0
- package/dist/orm/services/sql/sql.service.js +42 -0
- package/dist/orm/services/sql/sql.service.js.map +1 -0
- package/dist/orm/services/transaction.d.ts +5 -0
- package/dist/orm/services/transaction.js +55 -20
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -2
- package/dist/orm/services/sql.service.d.ts +0 -32
- package/dist/orm/services/sql.service.js +0 -464
- package/dist/orm/services/sql.service.js.map +0 -1
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SqlSecurityLayerService = void 0;
|
|
4
|
+
const _ = require("lodash");
|
|
5
|
+
const logger_1 = require("../../../core/services/logger");
|
|
6
|
+
const sql_layer_service_1 = require("./sql-layer.service");
|
|
7
|
+
var PermissionSystemStatus;
|
|
8
|
+
(function (PermissionSystemStatus) {
|
|
9
|
+
PermissionSystemStatus["Off"] = "off";
|
|
10
|
+
PermissionSystemStatus["On"] = "on";
|
|
11
|
+
})(PermissionSystemStatus || (PermissionSystemStatus = {}));
|
|
12
|
+
class SqlSecurityLayerService {
|
|
13
|
+
constructor(repositoryFactoryFunc) {
|
|
14
|
+
this.repositoryFactoryFunc = repositoryFactoryFunc;
|
|
15
|
+
this.logger = new logger_1.Logger('SqlSecurityLayerService');
|
|
16
|
+
this.tableDictionary = new Map();
|
|
17
|
+
this.permissionSystemStatus = PermissionSystemStatus.Off;
|
|
18
|
+
this.getSimpleTableDictionary = ({ tableName }) => {
|
|
19
|
+
const td = this.tableDictionary.get(tableName);
|
|
20
|
+
if (!td) {
|
|
21
|
+
throw new Error(`table ${tableName} not found `);
|
|
22
|
+
}
|
|
23
|
+
return {
|
|
24
|
+
name: td.name,
|
|
25
|
+
rules: td.rules
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
this.sqlLayerService = new sql_layer_service_1.SqlLayerService('security', this.getSimpleTableDictionary);
|
|
29
|
+
}
|
|
30
|
+
async loadPermissionSystem() {
|
|
31
|
+
const fields = ['puca_pid', 'name', 'rules'];
|
|
32
|
+
const repository = this.repositoryFactoryFunc().getInstance({
|
|
33
|
+
tableName: 'table_dictionary',
|
|
34
|
+
transaction: null
|
|
35
|
+
});
|
|
36
|
+
const cacheRepository = this.repositoryFactoryFunc().getCacheInstance({
|
|
37
|
+
tableName: 'table_dictionary'
|
|
38
|
+
});
|
|
39
|
+
const { data: tableDictionary } = await repository.findAll({
|
|
40
|
+
fields,
|
|
41
|
+
user: null,
|
|
42
|
+
});
|
|
43
|
+
tableDictionary.forEach(td => this.tableDictionary.set(td.name, td));
|
|
44
|
+
cacheRepository.onChange(({ puca_pid, row }) => {
|
|
45
|
+
if (!row) {
|
|
46
|
+
const td = Array.from(this.tableDictionary.values()).find(td => td.puca_pid === puca_pid);
|
|
47
|
+
this.tableDictionary.delete(td.name);
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const td = this.tableDictionary.get(row.name);
|
|
51
|
+
if (td) {
|
|
52
|
+
Object.entries(row || {})
|
|
53
|
+
.filter(([k]) => fields.includes(k))
|
|
54
|
+
.forEach(([k, v]) => {
|
|
55
|
+
td[k] = v;
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
this.tableDictionary.set(row.name, _.pick(row, fields));
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
this.permissionSystemStatus = PermissionSystemStatus.On;
|
|
63
|
+
}
|
|
64
|
+
async prepare() {
|
|
65
|
+
await this.loadPermissionSystem();
|
|
66
|
+
}
|
|
67
|
+
select(select) {
|
|
68
|
+
if (this.permissionSystemStatus === PermissionSystemStatus.Off) {
|
|
69
|
+
return select;
|
|
70
|
+
}
|
|
71
|
+
if (select.user) {
|
|
72
|
+
if (select.user.username === 'puca-user') {
|
|
73
|
+
return select;
|
|
74
|
+
}
|
|
75
|
+
return this.sqlLayerService.select(select).select;
|
|
76
|
+
}
|
|
77
|
+
const tableName = (typeof select.from === 'string' ? select.from : select.from.table);
|
|
78
|
+
try {
|
|
79
|
+
if (_.get(this.getSimpleTableDictionary({
|
|
80
|
+
tableName,
|
|
81
|
+
statement: select,
|
|
82
|
+
statementType: 'select'
|
|
83
|
+
}).rules, 'select')) {
|
|
84
|
+
throw new Error('Permission denied to read on ' + tableName);
|
|
85
|
+
}
|
|
86
|
+
const s = this.sqlLayerService.select(select);
|
|
87
|
+
if (!_.isEmpty(s.tables)) {
|
|
88
|
+
throw new Error('Permission denied to read on ' + s.tables.map(t => t.name).reduce((a, b) => `${a}, ${b}`));
|
|
89
|
+
}
|
|
90
|
+
return s.select;
|
|
91
|
+
}
|
|
92
|
+
catch (e) {
|
|
93
|
+
this.logger.error(e.message || e, select, _.get(select.user, 'username'));
|
|
94
|
+
throw e;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
insert(insert) {
|
|
98
|
+
if (this.permissionSystemStatus === PermissionSystemStatus.Off) {
|
|
99
|
+
return insert;
|
|
100
|
+
}
|
|
101
|
+
if (insert.user) {
|
|
102
|
+
if (insert.user.username === 'puca-user') {
|
|
103
|
+
return insert;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
if (_.get(this.getSimpleTableDictionary({
|
|
108
|
+
tableName: insert.tableName,
|
|
109
|
+
statement: insert,
|
|
110
|
+
statementType: 'insert'
|
|
111
|
+
}).rules, 'insert')) {
|
|
112
|
+
const msg = 'Permission denied to write on ' + insert.tableName;
|
|
113
|
+
this.logger.warn(msg);
|
|
114
|
+
throw new Error(msg);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
return this.sqlLayerService.insert(insert);
|
|
118
|
+
}
|
|
119
|
+
update(update) {
|
|
120
|
+
if (this.permissionSystemStatus === PermissionSystemStatus.Off) {
|
|
121
|
+
return update;
|
|
122
|
+
}
|
|
123
|
+
if (update.user) {
|
|
124
|
+
if (update.user.username === 'puca-user') {
|
|
125
|
+
return update;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
if (_.get(this.getSimpleTableDictionary({
|
|
130
|
+
tableName: update.tableName,
|
|
131
|
+
statement: update,
|
|
132
|
+
statementType: 'update'
|
|
133
|
+
}).rules, 'update')) {
|
|
134
|
+
const msg = 'Permission denied to write on ' + update.tableName;
|
|
135
|
+
this.logger.warn(msg);
|
|
136
|
+
throw new Error(msg);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return this.sqlLayerService.update(update);
|
|
140
|
+
}
|
|
141
|
+
delete(d) {
|
|
142
|
+
if (this.permissionSystemStatus === PermissionSystemStatus.Off) {
|
|
143
|
+
return d;
|
|
144
|
+
}
|
|
145
|
+
if (d.user) {
|
|
146
|
+
if (d.user.username === 'puca-user') {
|
|
147
|
+
return d;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
if (!_.get(this.getSimpleTableDictionary({
|
|
152
|
+
tableName: d.tableName,
|
|
153
|
+
statement: d,
|
|
154
|
+
statementType: 'delete'
|
|
155
|
+
}).rules, 'delete')) {
|
|
156
|
+
const msg = 'Permission denied to write on ' + d.tableName;
|
|
157
|
+
this.logger.warn(msg);
|
|
158
|
+
throw new Error(msg);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
return this.sqlLayerService.delete(d);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
exports.SqlSecurityLayerService = SqlSecurityLayerService;
|
|
165
|
+
//# sourceMappingURL=sql-security-layer.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sql-security-layer.service.js","sourceRoot":"","sources":["../../../../src/orm/services/sql/sql-security-layer.service.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=sql-status-layer.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sql-status-layer.service.js","sourceRoot":"","sources":["../../../../src/orm/services/sql/sql-status-layer.service.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { SqlCommand } from '../../cases/bo/interfaces';
|
|
2
|
+
import { CSqlService } from '../../cases/bo/sql.service';
|
|
3
|
+
import { RepositoryFactory } from '../repository-factory';
|
|
4
|
+
import { Select, Delete, Update, Insert } from './interfaces';
|
|
5
|
+
export declare class SqlService {
|
|
6
|
+
private readonly cSqlService;
|
|
7
|
+
private readonly sqlSecurityLayerService;
|
|
8
|
+
constructor(cSqlService: CSqlService, repositoryFactoryFunc: () => RepositoryFactory);
|
|
9
|
+
prepare(): Promise<void>;
|
|
10
|
+
select(select: Select): SqlCommand;
|
|
11
|
+
insert(insert: Insert): SqlCommand[];
|
|
12
|
+
update(update: Update): SqlCommand[];
|
|
13
|
+
delete(d: Delete): SqlCommand[];
|
|
14
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SqlService = void 0;
|
|
4
|
+
const sql_security_layer_service_1 = require("./sql-security-layer.service");
|
|
5
|
+
class SqlService {
|
|
6
|
+
constructor(cSqlService, repositoryFactoryFunc) {
|
|
7
|
+
this.cSqlService = cSqlService;
|
|
8
|
+
this.sqlSecurityLayerService = new sql_security_layer_service_1.SqlSecurityLayerService(repositoryFactoryFunc);
|
|
9
|
+
}
|
|
10
|
+
async prepare() {
|
|
11
|
+
await this.sqlSecurityLayerService.prepare();
|
|
12
|
+
}
|
|
13
|
+
select(select) {
|
|
14
|
+
return this.cSqlService.select([
|
|
15
|
+
(s) => this.sqlSecurityLayerService.select(s),
|
|
16
|
+
].filter(s => s)
|
|
17
|
+
.reduce((s, select) => {
|
|
18
|
+
return select(s);
|
|
19
|
+
}, select));
|
|
20
|
+
}
|
|
21
|
+
insert(insert) {
|
|
22
|
+
return this.cSqlService.insert([
|
|
23
|
+
(s) => this.sqlSecurityLayerService.insert(s),
|
|
24
|
+
].filter(s => s)
|
|
25
|
+
.reduce((s, insert) => {
|
|
26
|
+
return insert(s);
|
|
27
|
+
}, insert));
|
|
28
|
+
}
|
|
29
|
+
update(update) {
|
|
30
|
+
return this.cSqlService.update(this.sqlSecurityLayerService.update(update));
|
|
31
|
+
}
|
|
32
|
+
delete(d) {
|
|
33
|
+
return this.cSqlService.delete([
|
|
34
|
+
(s) => this.sqlSecurityLayerService.delete(s),
|
|
35
|
+
].filter(d => d)
|
|
36
|
+
.reduce((d, funcDelete) => {
|
|
37
|
+
return funcDelete(d);
|
|
38
|
+
}, d));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.SqlService = SqlService;
|
|
42
|
+
//# sourceMappingURL=sql.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/services/sql/sql.service.ts"],"names":[],"mappings":";;;AAQA,6EAAuE;AAEvE,MAAa,UAAU;IAGrB,YACmB,WAAwB,EACzC,qBAA8C;QAD7B,gBAAW,GAAX,WAAW,CAAa;QAEzC,IAAI,CAAC,uBAAuB,GAAG,IAAI,oDAAuB,CAAC,qBAAqB,CAAC,CAAA;IAEnF,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;SAE9C,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACb,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACpB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACf,CAAC;IACD,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;SAE9C,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACb,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACpB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACf,CAAC;IACD,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7E,CAAC;IACD,MAAM,CAAC,CAAS;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;SAE9C,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACb,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE;YACxB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAA;QACtB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACV,CAAC;CACF;AA5CD,gCA4CC"}
|
|
@@ -9,8 +9,12 @@ export declare enum TransactionStatus {
|
|
|
9
9
|
export declare class Transaction {
|
|
10
10
|
private readonly database;
|
|
11
11
|
private readonly opt;
|
|
12
|
+
private static readonly logger;
|
|
13
|
+
private tooLongTransaction;
|
|
12
14
|
private readonly id;
|
|
13
15
|
private status;
|
|
16
|
+
private readonly onCommit;
|
|
17
|
+
private setStatus;
|
|
14
18
|
constructor(database: Database, opt: {
|
|
15
19
|
pseudoTransaction: boolean;
|
|
16
20
|
});
|
|
@@ -20,6 +24,7 @@ export declare class Transaction {
|
|
|
20
24
|
serialExec(sqlCommandList: SqlCommand[]): Promise<QueryResult[]>;
|
|
21
25
|
getID(): string;
|
|
22
26
|
getStatus(): TransactionStatus;
|
|
27
|
+
afterCommit(hander: () => Promise<void>): void;
|
|
23
28
|
}
|
|
24
29
|
export declare class TransactionFactory {
|
|
25
30
|
private readonly databaseManagerService;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TransactionFactory = exports.Transaction = exports.TransactionStatus = void 0;
|
|
4
|
+
const logger_1 = require("../../core/services/logger");
|
|
4
5
|
const plugins_1 = require("../../plugins");
|
|
5
6
|
var TransactionStatus;
|
|
6
7
|
(function (TransactionStatus) {
|
|
@@ -14,42 +15,72 @@ class Transaction {
|
|
|
14
15
|
this.opt = opt;
|
|
15
16
|
this.id = plugins_1.uuidService.v4();
|
|
16
17
|
this.status = TransactionStatus.New;
|
|
18
|
+
this.onCommit = [];
|
|
17
19
|
}
|
|
18
|
-
|
|
19
|
-
if (this.
|
|
20
|
+
setStatus(status) {
|
|
21
|
+
if (this.status === status) {
|
|
20
22
|
return;
|
|
21
23
|
}
|
|
22
|
-
if (this.
|
|
23
|
-
|
|
24
|
+
if (!this.opt.pseudoTransaction) {
|
|
25
|
+
if (status === TransactionStatus.Done) {
|
|
26
|
+
clearInterval(this.tooLongTransaction);
|
|
27
|
+
}
|
|
28
|
+
else if (status === TransactionStatus.Started) {
|
|
29
|
+
this.tooLongTransaction = setInterval(() => {
|
|
30
|
+
Transaction.logger.warn('transaction is too long');
|
|
31
|
+
}, 15000);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
throw new Error('setStatus: invalid transaction status');
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
this.status = status;
|
|
38
|
+
}
|
|
39
|
+
async commit() {
|
|
40
|
+
if (!this.opt.pseudoTransaction && this.status !== TransactionStatus.Started) {
|
|
41
|
+
throw new Error('commit: invalid transaction status');
|
|
42
|
+
}
|
|
43
|
+
try {
|
|
44
|
+
await this.database.commit({ transaction: this });
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
this.setStatus(TransactionStatus.Done);
|
|
24
48
|
}
|
|
25
|
-
|
|
26
|
-
this.status = TransactionStatus.Done;
|
|
49
|
+
this.onCommit.forEach(h => h());
|
|
27
50
|
}
|
|
28
51
|
async rollback() {
|
|
29
|
-
|
|
30
|
-
|
|
52
|
+
try {
|
|
53
|
+
if (!this.opt.pseudoTransaction && this.status === TransactionStatus.Started) {
|
|
54
|
+
await this.database.rollback({ transaction: this });
|
|
55
|
+
}
|
|
31
56
|
}
|
|
32
|
-
|
|
33
|
-
|
|
57
|
+
finally {
|
|
58
|
+
this.setStatus(TransactionStatus.Done);
|
|
34
59
|
}
|
|
35
|
-
await this.database.rollback({ transaction: this });
|
|
36
|
-
this.status = TransactionStatus.Done;
|
|
37
60
|
}
|
|
38
61
|
async exec(sqlCommand) {
|
|
39
|
-
if (this.status === TransactionStatus.Done) {
|
|
62
|
+
if (!this.opt.pseudoTransaction && this.status === TransactionStatus.Done) {
|
|
40
63
|
throw new Error('transaction aready done, please create another');
|
|
41
64
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
65
|
+
try {
|
|
66
|
+
const r = await this.database.exec(sqlCommand, { transaction: this.opt.pseudoTransaction ? null : this });
|
|
67
|
+
return r;
|
|
68
|
+
}
|
|
69
|
+
finally {
|
|
70
|
+
this.setStatus(TransactionStatus.Started);
|
|
71
|
+
}
|
|
45
72
|
}
|
|
46
73
|
async serialExec(sqlCommandList) {
|
|
47
|
-
if (this.status === TransactionStatus.Done) {
|
|
74
|
+
if (!this.opt.pseudoTransaction && this.status === TransactionStatus.Done) {
|
|
48
75
|
throw new Error('transaction aready done, please create another');
|
|
49
76
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
77
|
+
try {
|
|
78
|
+
const r = await this.database.serialExec(sqlCommandList, { transaction: this.opt.pseudoTransaction ? null : this });
|
|
79
|
+
return r;
|
|
80
|
+
}
|
|
81
|
+
finally {
|
|
82
|
+
this.setStatus(TransactionStatus.Started);
|
|
83
|
+
}
|
|
53
84
|
}
|
|
54
85
|
getID() {
|
|
55
86
|
return this.id;
|
|
@@ -57,8 +88,12 @@ class Transaction {
|
|
|
57
88
|
getStatus() {
|
|
58
89
|
return this.status;
|
|
59
90
|
}
|
|
91
|
+
afterCommit(hander) {
|
|
92
|
+
this.onCommit.push(hander);
|
|
93
|
+
}
|
|
60
94
|
}
|
|
61
95
|
exports.Transaction = Transaction;
|
|
96
|
+
Transaction.logger = new logger_1.Logger('Transaction');
|
|
62
97
|
class TransactionFactory {
|
|
63
98
|
constructor(databaseManagerService) {
|
|
64
99
|
this.databaseManagerService = databaseManagerService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAK5C,IAAY,iBAEX;AAFD,WAAY,iBAAiB;IAC3B,gCAAW,CAAA;IAAE,wCAAmB,CAAA;IAAE,kCAAa,CAAA;AACjD,CAAC,EAFW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAE5B;AACD,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":"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"}
|