@puca/puca-core 11.0.4 → 11.1.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/core/services/index.js +2 -5
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/mq/mq.service.d.ts +5 -1
- package/dist/core/services/mq/mq.service.js +54 -38
- package/dist/core/services/mq/mq.service.js.map +1 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +1 -0
- package/dist/orm/services/cache-repository/cache-repository-redis.js +9 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
- package/dist/orm/services/transaction.d.ts +5 -0
- package/dist/orm/services/transaction.js +61 -4
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -1
- package/dist/core/services/source/javascript/v1/application.service.d.ts +0 -24
- package/dist/core/services/source/javascript/v1/application.service.js +0 -142
- package/dist/core/services/source/javascript/v1/application.service.js.map +0 -1
- package/javascriptV1/javascriptV1.js +0 -83
|
@@ -13,8 +13,7 @@ const user_config_service_1 = require("./user-config.service");
|
|
|
13
13
|
const web_socket_service_1 = require("./web-socket.service");
|
|
14
14
|
const auth_service_1 = require("./auth.service");
|
|
15
15
|
const storage_service_1 = require("./storage/storage.service");
|
|
16
|
-
const application_service_1 = require("./source/
|
|
17
|
-
const application_service_2 = require("./source/gcloud-run-cloud/v1/application.service");
|
|
16
|
+
const application_service_1 = require("./source/gcloud-run-cloud/v1/application.service");
|
|
18
17
|
const source_service_1 = require("./source/source.service");
|
|
19
18
|
const comunication_http_service_1 = require("./comunication/comunication-http.service");
|
|
20
19
|
const report_service_1 = require("./report.service");
|
|
@@ -49,10 +48,8 @@ exports.authService = new auth_service_1.AuthService(essential_1.configService,
|
|
|
49
48
|
exports.userConfigService = new user_config_service_1.UserConfigService(essential_1.moduleConfigService, services_1.repositoryFactory, essential_1.configService, exports.evalServiceFactory);
|
|
50
49
|
exports.comunicationHttpService = new comunication_http_service_1.ComunicationServiceHttp(essential_1.configService);
|
|
51
50
|
exports.comunicationService = new comunication_service_1.ComunicationService(exports.comunicationHttpService, essential_1.moduleConfigService, essential_1.configService, plugins_1.uuidService, essential_1.envConfigService);
|
|
52
|
-
const
|
|
53
|
-
const applicationGcloudRunCloudV1Service = new application_service_2.GcloudKnativeV1(exports.comunicationService);
|
|
51
|
+
const applicationGcloudRunCloudV1Service = new application_service_1.GcloudKnativeV1(exports.comunicationService);
|
|
54
52
|
exports.sourceService = new source_service_1.SourceService(services_1.repositoryFactory, [
|
|
55
|
-
applicationJavascriptV1Service,
|
|
56
53
|
applicationGcloudRunCloudV1Service
|
|
57
54
|
]);
|
|
58
55
|
exports.migrationService = new migration_service_1.MigrationService(services_1.transactionFactory, services_1.repositoryFactory, essential_1.moduleConfigService, services_1.redisManagerService, essential_1.envConfigService, plugins_1.fileSystemService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,+CAAqG;AACrG,iDAAyJ;AACzJ,2DAAuD;AACvD,8EAA0E;AAC1E,6DAAwD;AACxD,qEAAiE;AACjE,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,18 +2,22 @@ import { Options } from 'amqplib';
|
|
|
2
2
|
import { ConfigService } from '../../../essential/config.service';
|
|
3
3
|
export interface ConsumeOptions extends Options.Consume {
|
|
4
4
|
delayBeforeRetry?: number;
|
|
5
|
+
maxSimultaneousMessages?: number;
|
|
5
6
|
}
|
|
6
7
|
export declare class MqService {
|
|
7
8
|
private readonly configService;
|
|
9
|
+
private closing;
|
|
8
10
|
private static readonly DEAD_LETTER_QUEUE;
|
|
9
11
|
private static readonly RETRY_EXCHANGE;
|
|
10
12
|
private readonly logger;
|
|
13
|
+
private mainChannel;
|
|
14
|
+
private readonly queues;
|
|
11
15
|
private connection;
|
|
12
|
-
private channel;
|
|
13
16
|
constructor(configService: ConfigService);
|
|
14
17
|
private connect;
|
|
15
18
|
init(): Promise<void>;
|
|
16
19
|
shutdown(): Promise<void>;
|
|
20
|
+
private reconnectConsumers;
|
|
17
21
|
private computeExpBackoff;
|
|
18
22
|
assertQueue(queue: string, options?: Options.AssertQueue): Promise<import("amqplib").Replies.AssertQueue>;
|
|
19
23
|
assertExchange(exchange: string, type?: string, options?: Options.AssertExchange): Promise<import("amqplib").Replies.AssertExchange>;
|
|
@@ -6,7 +6,9 @@ const logger_1 = require("../logger");
|
|
|
6
6
|
class MqService {
|
|
7
7
|
constructor(configService) {
|
|
8
8
|
this.configService = configService;
|
|
9
|
+
this.closing = false;
|
|
9
10
|
this.logger = new logger_1.Logger('MqService');
|
|
11
|
+
this.queues = {};
|
|
10
12
|
}
|
|
11
13
|
async connect(t = 0) {
|
|
12
14
|
const { rabbitMq } = await this.configService.getSecret();
|
|
@@ -14,6 +16,9 @@ class MqService {
|
|
|
14
16
|
this.logger.warn('rabbitMq not defined');
|
|
15
17
|
return;
|
|
16
18
|
}
|
|
19
|
+
if (!(rabbitMq === null || rabbitMq === void 0 ? void 0 : rabbitMq.hostname)) {
|
|
20
|
+
throw new Error('rabbitMq.hostname not defined');
|
|
21
|
+
}
|
|
17
22
|
const { hostname, port, username, password, vhost } = rabbitMq;
|
|
18
23
|
try {
|
|
19
24
|
this.connection = await amqplib_1.connect({
|
|
@@ -32,80 +37,91 @@ class MqService {
|
|
|
32
37
|
process.exit(1);
|
|
33
38
|
return;
|
|
34
39
|
}
|
|
35
|
-
this.
|
|
36
|
-
|
|
40
|
+
this.logger.log('Connected to RabbitMQ');
|
|
41
|
+
this.connection.on('close', async () => {
|
|
42
|
+
if (this.closing) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
this.logger.warn('Connection to RabbitMQ closed, reconnecting...');
|
|
46
|
+
process.exit(1);
|
|
47
|
+
});
|
|
48
|
+
this.connection.on('error', (error) => {
|
|
49
|
+
this.logger.error('Connection to RabbitMQ error', error);
|
|
50
|
+
});
|
|
51
|
+
const mainChannel = await this.connection.createChannel();
|
|
52
|
+
await mainChannel.assertQueue(MqService.DEAD_LETTER_QUEUE, {
|
|
37
53
|
durable: true
|
|
38
54
|
});
|
|
39
|
-
await
|
|
55
|
+
await mainChannel.assertExchange(MqService.RETRY_EXCHANGE, 'x-delayed-message', {
|
|
40
56
|
durable: true,
|
|
41
57
|
arguments: {
|
|
42
58
|
'x-delayed-type': 'direct'
|
|
43
59
|
}
|
|
44
60
|
});
|
|
61
|
+
this.mainChannel = mainChannel;
|
|
62
|
+
await this.reconnectConsumers();
|
|
45
63
|
}
|
|
46
64
|
async init() {
|
|
47
65
|
await this.connect();
|
|
48
66
|
}
|
|
49
67
|
async shutdown() {
|
|
50
|
-
|
|
51
|
-
|
|
68
|
+
this.closing = true;
|
|
69
|
+
await this.mainChannel.close();
|
|
70
|
+
for (const { channel } of Object.values(this.queues)) {
|
|
71
|
+
await channel.close();
|
|
52
72
|
}
|
|
53
|
-
await this.channel.close();
|
|
54
73
|
await this.connection.close();
|
|
55
74
|
}
|
|
75
|
+
async reconnectConsumers() {
|
|
76
|
+
}
|
|
56
77
|
computeExpBackoff(delay, retryCount) {
|
|
57
78
|
const base = 2;
|
|
58
79
|
const delayTime = Math.pow(base, retryCount) * delay;
|
|
59
80
|
return delayTime;
|
|
60
81
|
}
|
|
61
82
|
async assertQueue(queue, options) {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
66
|
-
const queueCreated = await this.channel.assertQueue(queue, Object.assign({ durable: true }, options));
|
|
67
|
-
await this.channel.bindQueue(queue, MqService.RETRY_EXCHANGE, queue);
|
|
83
|
+
const mainChannel = this.mainChannel;
|
|
84
|
+
const queueCreated = await mainChannel.assertQueue(queue, Object.assign({ durable: true }, options));
|
|
85
|
+
await mainChannel.bindQueue(queue, MqService.RETRY_EXCHANGE, queue);
|
|
68
86
|
return queueCreated;
|
|
69
87
|
}
|
|
70
88
|
async assertExchange(exchange, type = 'fanout', options) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
|
-
return await this.channel.assertExchange(exchange, type, Object.assign({ durable: true }, options));
|
|
89
|
+
const mainChannel = this.mainChannel;
|
|
90
|
+
return await mainChannel.assertExchange(exchange, type, Object.assign({ durable: true }, options));
|
|
76
91
|
}
|
|
77
92
|
async bindQueue(queue, exchange, pattern, args) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
return await this.channel.bindQueue(queue, exchange, pattern, args);
|
|
93
|
+
const mainChannel = this.mainChannel;
|
|
94
|
+
return await mainChannel.bindQueue(queue, exchange, pattern, args);
|
|
83
95
|
}
|
|
84
96
|
async publish(exchange, routingKey, content, options) {
|
|
85
|
-
if (!this.
|
|
97
|
+
if (!this.connection) {
|
|
86
98
|
this.logger.warn('channel not initialized');
|
|
87
99
|
return;
|
|
88
100
|
}
|
|
89
|
-
|
|
101
|
+
const mainChannel = this.mainChannel;
|
|
102
|
+
return await mainChannel.publish(exchange, routingKey, Buffer.from(JSON.stringify(content)), options);
|
|
90
103
|
}
|
|
91
104
|
async sendToQueue(queue, content, options) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
return;
|
|
95
|
-
}
|
|
96
|
-
return await this.channel.sendToQueue(queue, Buffer.from(JSON.stringify(content)), options);
|
|
105
|
+
const mainChannel = this.mainChannel;
|
|
106
|
+
return await mainChannel.sendToQueue(queue, Buffer.from(JSON.stringify(content)), options);
|
|
97
107
|
}
|
|
98
108
|
async consume(queue, onMessage, options) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
109
|
+
const channel = (options.maxSimultaneousMessages ? await this.connection.createChannel() : this.mainChannel);
|
|
110
|
+
if (options.maxSimultaneousMessages) {
|
|
111
|
+
await channel.prefetch(options.maxSimultaneousMessages);
|
|
102
112
|
}
|
|
103
|
-
|
|
113
|
+
this.queues[queue] = {
|
|
114
|
+
channel,
|
|
115
|
+
queue,
|
|
116
|
+
onMessage,
|
|
117
|
+
options
|
|
118
|
+
};
|
|
119
|
+
await channel.consume(queue, async (msg) => {
|
|
104
120
|
if (msg) {
|
|
105
121
|
try {
|
|
106
122
|
const msgT = JSON.parse(msg.content.toString());
|
|
107
123
|
await onMessage(msgT);
|
|
108
|
-
|
|
124
|
+
channel.ack(msg);
|
|
109
125
|
}
|
|
110
126
|
catch (error) {
|
|
111
127
|
const retryCount = msg.properties.headers['retry-count'] || 0;
|
|
@@ -120,8 +136,8 @@ class MqService {
|
|
|
120
136
|
'max-retry-count': maxRetryCount,
|
|
121
137
|
'first-try': firstTry
|
|
122
138
|
};
|
|
123
|
-
|
|
124
|
-
|
|
139
|
+
channel.publish(MqService.RETRY_EXCHANGE, queue, msg.content, { headers });
|
|
140
|
+
channel.ack(msg);
|
|
125
141
|
}
|
|
126
142
|
else if (retryCount >= maxRetryCount) {
|
|
127
143
|
this.logger.warn(`Mensagem falhou após ${maxRetryCount} tentativas. Descartando mensagem...`);
|
|
@@ -132,8 +148,8 @@ class MqService {
|
|
|
132
148
|
max_retry_count: maxRetryCount,
|
|
133
149
|
first_try: firstTry,
|
|
134
150
|
};
|
|
135
|
-
|
|
136
|
-
|
|
151
|
+
channel.sendToQueue(MqService.DEAD_LETTER_QUEUE, Buffer.from(JSON.stringify(deadContent)));
|
|
152
|
+
channel.ack(msg);
|
|
137
153
|
}
|
|
138
154
|
}
|
|
139
155
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAE/D,sCAAmC;AASnC,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export declare class CacheRepositoryRedis<T extends {
|
|
|
14
14
|
private readonly events;
|
|
15
15
|
private readonly topicChange;
|
|
16
16
|
private readonly intervals;
|
|
17
|
+
private readonly queue;
|
|
17
18
|
private subscribe;
|
|
18
19
|
constructor(database: Database, redisClient: RedisClient, table: string, version: number);
|
|
19
20
|
private subscribeOnChange;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CacheRepositoryRedis = void 0;
|
|
4
|
+
const queue_1 = require("queue");
|
|
4
5
|
const logger_1 = require("../../../core/services/logger");
|
|
5
6
|
const rxjs_1 = require("rxjs");
|
|
6
7
|
const plugins_1 = require("../../../plugins");
|
|
@@ -13,6 +14,10 @@ class CacheRepositoryRedis {
|
|
|
13
14
|
this.logger = new logger_1.Logger('CacheRepositoryRedis');
|
|
14
15
|
this.events = [];
|
|
15
16
|
this.intervals = [];
|
|
17
|
+
this.queue = new queue_1.default({
|
|
18
|
+
concurrency: 1,
|
|
19
|
+
autostart: true
|
|
20
|
+
});
|
|
16
21
|
this.topicChange = `${this.table}.change`;
|
|
17
22
|
this.subscribeOnChange();
|
|
18
23
|
}
|
|
@@ -32,7 +37,7 @@ class CacheRepositoryRedis {
|
|
|
32
37
|
}
|
|
33
38
|
const pucaPid = isUUid ? data : JSON.parse(data).puca_pid;
|
|
34
39
|
this.logger.debug(this.topicChange, this.table, pucaPid);
|
|
35
|
-
|
|
40
|
+
const event = async () => {
|
|
36
41
|
const rows = await this.database.exec({
|
|
37
42
|
sql: `select * from ${this.table} where puca_pid = $1`,
|
|
38
43
|
args: [pucaPid],
|
|
@@ -43,6 +48,9 @@ class CacheRepositoryRedis {
|
|
|
43
48
|
row: rows[0],
|
|
44
49
|
version: 1
|
|
45
50
|
});
|
|
51
|
+
};
|
|
52
|
+
setTimeout(() => {
|
|
53
|
+
this.queue.push(event);
|
|
46
54
|
}, 1000);
|
|
47
55
|
}
|
|
48
56
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-repository-redis.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository-redis.ts"],"names":[],"mappings":";;;AAEA,0DAAuD;AAEvD,+BAAiC;AAEjC,8CAA+C;AAI/C,MAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"cache-repository-redis.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository-redis.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export declare class Transaction {
|
|
|
13
13
|
private readonly auditService;
|
|
14
14
|
private readonly name;
|
|
15
15
|
private readonly logger;
|
|
16
|
+
private readonly queue;
|
|
16
17
|
private readonly id;
|
|
17
18
|
private readonly afteCommitEvents;
|
|
18
19
|
private readonly afterRollbackEvents;
|
|
@@ -23,6 +24,10 @@ export declare class Transaction {
|
|
|
23
24
|
pseudoTransaction: boolean;
|
|
24
25
|
}, auditService: AuditService, name: string);
|
|
25
26
|
private setStatus;
|
|
27
|
+
private _commit;
|
|
28
|
+
private _rollback;
|
|
29
|
+
private _exec;
|
|
30
|
+
private _serialExec;
|
|
26
31
|
commit(): Promise<void>;
|
|
27
32
|
rollback(): Promise<void>;
|
|
28
33
|
exec<T>(sqlCommand: SqlCommand): Promise<T[]>;
|
|
@@ -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 queue_1 = require("queue");
|
|
4
5
|
const logger_1 = require("../../core/services/logger");
|
|
5
6
|
const plugins_1 = require("../../plugins");
|
|
6
7
|
var TransactionStatus;
|
|
@@ -16,6 +17,10 @@ class Transaction {
|
|
|
16
17
|
this.auditService = auditService;
|
|
17
18
|
this.name = name;
|
|
18
19
|
this.logger = new logger_1.Logger(Transaction.name);
|
|
20
|
+
this.queue = new queue_1.default({
|
|
21
|
+
autostart: true,
|
|
22
|
+
concurrency: 1,
|
|
23
|
+
});
|
|
19
24
|
this.id = plugins_1.uuidService.v4();
|
|
20
25
|
this.afteCommitEvents = [];
|
|
21
26
|
this.afterRollbackEvents = [];
|
|
@@ -31,7 +36,7 @@ class Transaction {
|
|
|
31
36
|
this.afterStatusChangeEvents.forEach(h => h(status));
|
|
32
37
|
this.status = status;
|
|
33
38
|
}
|
|
34
|
-
async
|
|
39
|
+
async _commit() {
|
|
35
40
|
try {
|
|
36
41
|
if (!this.opt.pseudoTransaction) {
|
|
37
42
|
this.logger.debug(`commit transaction ${this.name}`);
|
|
@@ -43,7 +48,7 @@ class Transaction {
|
|
|
43
48
|
}
|
|
44
49
|
this.afteCommitEvents.forEach(h => h());
|
|
45
50
|
}
|
|
46
|
-
async
|
|
51
|
+
async _rollback() {
|
|
47
52
|
try {
|
|
48
53
|
if (!this.opt.pseudoTransaction) {
|
|
49
54
|
this.logger.debug(`rollback transaction ${this.name}`);
|
|
@@ -56,7 +61,7 @@ class Transaction {
|
|
|
56
61
|
this.setStatus(TransactionStatus.Done);
|
|
57
62
|
}
|
|
58
63
|
}
|
|
59
|
-
async
|
|
64
|
+
async _exec(sqlCommand) {
|
|
60
65
|
if (!this.opt.pseudoTransaction) {
|
|
61
66
|
this.logger.debug(`exec transaction ${this.name}`);
|
|
62
67
|
if (this.status === TransactionStatus.Done) {
|
|
@@ -71,7 +76,7 @@ class Transaction {
|
|
|
71
76
|
this.setStatus(TransactionStatus.Started);
|
|
72
77
|
}
|
|
73
78
|
}
|
|
74
|
-
async
|
|
79
|
+
async _serialExec(sqlCommandList) {
|
|
75
80
|
if (!this.opt.pseudoTransaction) {
|
|
76
81
|
this.logger.debug(`serialExec transaction ${this.name}`);
|
|
77
82
|
if (this.status === TransactionStatus.Done) {
|
|
@@ -86,6 +91,58 @@ class Transaction {
|
|
|
86
91
|
this.setStatus(TransactionStatus.Started);
|
|
87
92
|
}
|
|
88
93
|
}
|
|
94
|
+
async commit() {
|
|
95
|
+
return new Promise((resolve, reject) => {
|
|
96
|
+
this.queue.push(async () => {
|
|
97
|
+
try {
|
|
98
|
+
await this._commit();
|
|
99
|
+
resolve();
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
reject(e);
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
async rollback() {
|
|
108
|
+
return new Promise((resolve, reject) => {
|
|
109
|
+
this.queue.push(async () => {
|
|
110
|
+
try {
|
|
111
|
+
await this._rollback();
|
|
112
|
+
resolve();
|
|
113
|
+
}
|
|
114
|
+
catch (e) {
|
|
115
|
+
reject(e);
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
async exec(sqlCommand) {
|
|
121
|
+
return new Promise((resolve, reject) => {
|
|
122
|
+
this.queue.push(async () => {
|
|
123
|
+
try {
|
|
124
|
+
const r = await this._exec(sqlCommand);
|
|
125
|
+
resolve(r);
|
|
126
|
+
}
|
|
127
|
+
catch (e) {
|
|
128
|
+
reject(e);
|
|
129
|
+
}
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
async serialExec(sqlCommandList) {
|
|
134
|
+
return new Promise((resolve, reject) => {
|
|
135
|
+
this.queue.push(async () => {
|
|
136
|
+
try {
|
|
137
|
+
const r = await this._serialExec(sqlCommandList);
|
|
138
|
+
resolve(r);
|
|
139
|
+
}
|
|
140
|
+
catch (e) {
|
|
141
|
+
reject(e);
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
}
|
|
89
146
|
getID() {
|
|
90
147
|
return this.id;
|
|
91
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAEpD,2CAA4C;AAM5C,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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"}
|