@6thbridge/utils 0.1.16 → 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/lib/actions/charge.action.d.ts +3 -1
- package/lib/actions/charge.action.js +127 -10
- package/lib/actions/charge.action.js.map +1 -1
- package/lib/actions/currency.action.d.ts +1 -0
- package/lib/actions/currency.action.js +38 -23
- package/lib/actions/currency.action.js.map +1 -1
- package/lib/actions/index.d.ts +3 -3
- package/lib/actions/index.js +1 -1
- package/lib/actions/index.js.map +1 -1
- package/lib/actions/phone-number.action.d.ts +2 -2
- package/lib/actions/phone-number.action.js +1 -1
- package/lib/actions/phone-number.action.js.map +1 -1
- package/lib/brokers/index.d.ts +3 -3
- package/lib/brokers/index.js.map +1 -1
- package/lib/brokers/kafka.js +43 -33
- package/lib/brokers/kafka.js.map +1 -1
- package/lib/brokers/kafka.test.js +17 -18
- package/lib/brokers/kafka.test.js.map +1 -1
- package/lib/brokers/rabbitmq.d.ts +2 -2
- package/lib/brokers/rabbitmq.js +35 -37
- package/lib/brokers/rabbitmq.js.map +1 -1
- package/lib/cache/redis.d.ts +1 -1
- package/lib/cache/redis.js +14 -11
- package/lib/cache/redis.js.map +1 -1
- package/lib/database/MongoDBRepository.js +2 -2
- package/lib/database/MongoDBRepository.js.map +1 -1
- package/lib/database/MongoDBTypeRepository.js +2 -2
- package/lib/database/MongoDBTypeRepository.js.map +1 -1
- package/lib/database/index.d.ts +2 -2
- package/lib/database/index.js.map +1 -1
- package/lib/database/query.js +16 -18
- package/lib/database/query.js.map +1 -1
- package/lib/exceptions/custom.exception.js +1 -1
- package/lib/exceptions/custom.exception.js.map +1 -1
- package/lib/helpers/errors.d.ts +1 -1
- package/lib/helpers/errors.js +7 -7
- package/lib/helpers/errors.js.map +1 -1
- package/lib/helpers/index.d.ts +9 -9
- package/lib/helpers/index.js +30 -24
- package/lib/helpers/index.js.map +1 -1
- package/lib/helpers/utils.d.ts +1 -1
- package/lib/helpers/utils.js +3 -4
- package/lib/helpers/utils.js.map +1 -1
- package/lib/index.d.ts +16 -16
- package/lib/index.js +10 -10
- package/lib/index.js.map +1 -1
- package/lib/logger/index.js.map +1 -1
- package/lib/logger/logger-test.js +14 -14
- package/lib/logger/logger-test.js.map +1 -1
- package/lib/logger/logger.d.ts +2 -2
- package/lib/logger/logger.js +17 -18
- package/lib/logger/logger.js.map +1 -1
- package/lib/logger/null-logger.d.ts +1 -1
- package/lib/logger/null-logger.js +11 -22
- package/lib/logger/null-logger.js.map +1 -1
- package/lib/middlewares/common.js +47 -38
- package/lib/middlewares/common.js.map +1 -1
- package/lib/middlewares/express.d.ts +1 -1
- package/lib/middlewares/express.js +17 -17
- package/lib/middlewares/express.js.map +1 -1
- package/lib/middlewares/fastify.js +10 -10
- package/lib/middlewares/fastify.js.map +1 -1
- package/lib/middlewares/index.d.ts +3 -3
- package/lib/middlewares/index.js.map +1 -1
- package/lib/monitoring/index.d.ts +1 -1
- package/lib/monitoring/index.js +3 -3
- package/lib/monitoring/index.js.map +1 -1
- package/lib/responses/express.d.ts +2 -2
- package/lib/responses/express.js +7 -7
- package/lib/responses/express.js.map +1 -1
- package/lib/responses/fastify.js +4 -4
- package/lib/responses/fastify.js.map +1 -1
- package/lib/responses/index.d.ts +2 -2
- package/lib/responses/index.js.map +1 -1
- package/lib/secrets/aws-secret.d.ts +1 -1
- package/lib/secrets/aws-secret.js +4 -4
- package/lib/secrets/aws-secret.js.map +1 -1
- package/lib/secrets/index.js +3 -3
- package/lib/secrets/index.js.map +1 -1
- package/lib/test/actions/charge.action.test.js +116 -14
- package/lib/test/actions/charge.action.test.js.map +1 -1
- package/lib/test/database/test.spec.js +24 -24
- package/lib/test/database/test.spec.js.map +1 -1
- package/lib/test/helpers/PhoneNumber.spec.js +17 -17
- package/lib/test/helpers/PhoneNumber.spec.js.map +1 -1
- package/lib/test/logger/test.spec.js +15 -15
- package/lib/test/logger/test.spec.js.map +1 -1
- package/lib/test/types/context.entity.test.js +9 -9
- package/lib/test/types/context.entity.test.js.map +1 -1
- package/lib/translations/index.js +10 -10
- package/lib/translations/index.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/broker.entity.js.map +1 -1
- package/lib/types/client.entity.js.map +1 -1
- package/lib/types/context.entity.d.ts +3 -3
- package/lib/types/context.entity.js +19 -17
- package/lib/types/context.entity.js.map +1 -1
- package/lib/types/index.d.ts +46 -9
- package/lib/types/index.js +15 -1
- package/lib/types/index.js.map +1 -1
- package/lib/types/user.entity.js.map +1 -1
- package/package.json +1 -1
- package/readme.md +31 -18
package/lib/brokers/kafka.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../src/brokers/kafka.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,
|
|
1
|
+
{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../src/brokers/kafka.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,12 @@ const kafka_1 = require("./kafka");
|
|
|
13
13
|
const kafkajs_1 = require("kafkajs");
|
|
14
14
|
try {
|
|
15
15
|
const kafkaInit = {
|
|
16
|
-
url:
|
|
17
|
-
name:
|
|
16
|
+
url: 'pkc-6ojv2.us-west4.gcp.confluent.cloud:9092',
|
|
17
|
+
name: 'my-app',
|
|
18
18
|
logLevel: kafkajs_1.logLevel.DEBUG,
|
|
19
|
-
saslUsername:
|
|
20
|
-
saslPassword:
|
|
21
|
-
saslMechanism:
|
|
19
|
+
saslUsername: 'RFYODITNTCAMOUHA',
|
|
20
|
+
saslPassword: '+2RHsqskk/7iEQEi93b5J3o8pJbCPQE0/NO73ePDN6IYZdYQI24O4qSOKtRfETqn',
|
|
21
|
+
saslMechanism: 'plain',
|
|
22
22
|
};
|
|
23
23
|
const kafka = new kafka_1.KafkaJS(kafkaInit);
|
|
24
24
|
// async function produce() {
|
|
@@ -63,15 +63,14 @@ try {
|
|
|
63
63
|
function consume() {
|
|
64
64
|
return __awaiter(this, void 0, void 0, function* () {
|
|
65
65
|
try {
|
|
66
|
-
console.log(
|
|
66
|
+
console.log('init kafka');
|
|
67
67
|
yield kafka.init(kafkaInit);
|
|
68
|
-
console.log(
|
|
69
|
-
yield kafka.listen([
|
|
70
|
-
console.log(
|
|
68
|
+
console.log('init kafka listener');
|
|
69
|
+
yield kafka.listen(['request.logs'], 'my-app', (...args) => {
|
|
70
|
+
console.log('Incoming Arg', JSON.stringify(args));
|
|
71
71
|
}, true);
|
|
72
72
|
}
|
|
73
|
-
catch (e) {
|
|
74
|
-
}
|
|
73
|
+
catch (e) { }
|
|
75
74
|
// const consumer = kafka.consumer({groupId: 'my-group-2'})
|
|
76
75
|
// await consumer.connect()
|
|
77
76
|
//
|
|
@@ -94,17 +93,17 @@ try {
|
|
|
94
93
|
function consumeBatch() {
|
|
95
94
|
return __awaiter(this, void 0, void 0, function* () {
|
|
96
95
|
try {
|
|
97
|
-
console.log(
|
|
98
|
-
yield kafka.listenInBatch([
|
|
99
|
-
console.log(
|
|
100
|
-
console.log(
|
|
96
|
+
console.log('init kafka listener');
|
|
97
|
+
yield kafka.listenInBatch(['request.logs'], 'test-my-app', (error, messages, batchPayload) => {
|
|
98
|
+
console.log('Incoming Arg', error, messages.length, batchPayload.batch.topic);
|
|
99
|
+
console.log('Incoming Arg len', batchPayload.batch.messages.length);
|
|
101
100
|
}, {
|
|
102
101
|
fromBeginning: false,
|
|
103
|
-
prefetch: 100
|
|
102
|
+
prefetch: 100,
|
|
104
103
|
});
|
|
105
104
|
}
|
|
106
105
|
catch (e) {
|
|
107
|
-
console.log(
|
|
106
|
+
console.log('Error', e);
|
|
108
107
|
}
|
|
109
108
|
});
|
|
110
109
|
}
|
|
@@ -113,6 +112,6 @@ try {
|
|
|
113
112
|
// consumeBatch();
|
|
114
113
|
}
|
|
115
114
|
catch (e) {
|
|
116
|
-
console.log(
|
|
115
|
+
console.log('e', e);
|
|
117
116
|
}
|
|
118
117
|
//# sourceMappingURL=kafka.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kafka.test.js","sourceRoot":"","sources":["../../src/brokers/kafka.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"kafka.test.js","sourceRoot":"","sources":["../../src/brokers/kafka.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAA6C;AAC7C,qCAAqD;AAErD,IAAI,CAAC;IACH,MAAM,SAAS,GAAc;QAC3B,GAAG,EAAE,6CAA6C;QAClD,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,kBAAQ,CAAC,KAAK;QACxB,YAAY,EAAE,kBAAkB;QAChC,YAAY,EAAE,kEAAkE;QAChF,aAAa,EAAE,OAAO;KACvB,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,eAAO,CAAC,SAAS,CAAC,CAAC;IAErC,6BAA6B;IAC7B,kCAAkC;IAClC,6BAA6B;IAC7B,wBAAwB;IACxB,iCAAiC;IACjC,gCAAgC;IAChC,oBAAoB;IACpB,gBAAgB;IAChB,gDAAgD;IAChD,oCAAoC;IACpC,uCAAuC;IACvC,oCAAoC;IACpC,8CAA8C;IAC9C,sCAAsC;IACtC,uBAAuB;IACvB,4CAA4C;IAC5C,qCAAqC;IACrC,qBAAqB;IACrB,iBAAiB;IACjB,aAAa;IACb,SAAS;IACT,wCAAwC;IACxC,EAAE;IACF,+BAA+B;IAC/B,EAAE;IACF,qCAAqC;IACrC,4CAA4C;IAC5C,qCAAqC;IACrC,0BAA0B;IAC1B,4EAA4E;IAC5E,iBAAiB;IACjB,cAAc;IACd,EAAE;IACF,8BAA8B;IAC9B,EAAE;IACF,QAAQ;IACR,EAAE;IACF,kCAAkC;IAClC,IAAI;IAEJ,SAAe,OAAO;;YACpB,IAAI,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC1B,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBACnC,MAAM,KAAK,CAAC,MAAM,CAChB,CAAC,cAAc,CAAC,EAChB,QAAQ,EACR,CAAC,GAAG,IAAS,EAAE,EAAE;oBACf,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpD,CAAC,EACD,IAAI,CACL,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;YACd,2DAA2D;YAC3D,2BAA2B;YAC3B,EAAE;YACF,yEAAyE;YACzE,EAAE;YACF,uBAAuB;YACvB,4DAA4D;YAC5D,wBAAwB;YACxB,yBAAyB;YACzB,qBAAqB;YACrB,yBAAyB;YACzB,2CAA2C;YAC3C,+CAA+C;YAC/C,wCAAwC;YACxC,aAAa;YACb,SAAS;YACT,KAAK;QACP,CAAC;KAAA;IACD,SAAe,YAAY;;YACzB,IAAI,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBACnC,MAAM,KAAK,CAAC,aAAa,CACvB,CAAC,cAAc,CAAC,EAChB,aAAa,EACb,CAAC,KAAU,EAAE,QAAe,EAAE,YAA8B,EAAE,EAAE;oBAC9D,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC9E,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACtE,CAAC,EACD;oBACE,aAAa,EAAE,KAAK;oBACpB,QAAQ,EAAE,GAAG;iBACd,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;KAAA;IAED,aAAa;IACb,OAAO,EAAE,CAAC;IACV,kBAAkB;AACpB,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BrokerDeadLetterPayloadEntity, BrokerRetryEntity } from
|
|
2
|
-
import { IAmqpConnectionManager } from
|
|
1
|
+
import { BrokerDeadLetterPayloadEntity, BrokerRetryEntity } from '../types';
|
|
2
|
+
import { IAmqpConnectionManager } from 'amqp-connection-manager/dist/types/AmqpConnectionManager';
|
|
3
3
|
export type RabbitMQInit = {
|
|
4
4
|
url?: string;
|
|
5
5
|
heartbeat?: number;
|
package/lib/brokers/rabbitmq.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
'use strict';
|
|
2
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -38,23 +38,23 @@ class RabbitMQ {
|
|
|
38
38
|
options.url = options.url || process.env.RABBITMQ_CLUSTER_URL || process.env.RABBITMQ_URL;
|
|
39
39
|
options.heartbeat = options.heartbeat || 5;
|
|
40
40
|
if (!options.url)
|
|
41
|
-
throw Error(
|
|
41
|
+
throw Error('RabbitMQ URL is required');
|
|
42
42
|
//We are splitting the URL because of clusters
|
|
43
|
-
const urlArray = options.url.split(
|
|
43
|
+
const urlArray = options.url.split(',');
|
|
44
44
|
this.connection = amqp_connection_manager_1.default.connect(urlArray, {
|
|
45
|
-
heartbeatIntervalInSeconds: options.heartbeat
|
|
45
|
+
heartbeatIntervalInSeconds: options.heartbeat,
|
|
46
46
|
});
|
|
47
47
|
return this.connection;
|
|
48
48
|
}
|
|
49
49
|
catch (e) {
|
|
50
|
-
logger_1.logger.exception(e, { tag:
|
|
50
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
51
51
|
if (!this.retryCountBeforeExit) {
|
|
52
|
-
console.log(
|
|
52
|
+
console.log('Exiting....');
|
|
53
53
|
process.exit(1);
|
|
54
54
|
}
|
|
55
55
|
this.retryCountBeforeExit -= 1;
|
|
56
|
-
console.log(
|
|
57
|
-
console.log(
|
|
56
|
+
console.log('retryCountBeforeExit', this.retryCountBeforeExit);
|
|
57
|
+
console.log('Reconnecting RabbitMQ', e);
|
|
58
58
|
return this.init(options);
|
|
59
59
|
}
|
|
60
60
|
});
|
|
@@ -62,19 +62,19 @@ class RabbitMQ {
|
|
|
62
62
|
createChannel(callback) {
|
|
63
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
64
|
if (!this.connection)
|
|
65
|
-
throw Error(
|
|
65
|
+
throw Error('Connection has not been made. Call the init function first');
|
|
66
66
|
try {
|
|
67
67
|
const options = {
|
|
68
68
|
json: true,
|
|
69
69
|
};
|
|
70
|
-
if (typeof callback ==
|
|
70
|
+
if (typeof callback == 'function')
|
|
71
71
|
options.setup = callback;
|
|
72
72
|
this.channel = this.connection.createChannel(options);
|
|
73
73
|
return { data: this.channel };
|
|
74
74
|
}
|
|
75
75
|
catch (e) {
|
|
76
76
|
console.error(e);
|
|
77
|
-
logger_1.logger.exception(e, { tag:
|
|
77
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
78
78
|
return { error: e.message };
|
|
79
79
|
}
|
|
80
80
|
});
|
|
@@ -88,21 +88,21 @@ class RabbitMQ {
|
|
|
88
88
|
createQueue(queueName_1) {
|
|
89
89
|
return __awaiter(this, arguments, void 0, function* (queueName, options = {}) {
|
|
90
90
|
if (!this.connection)
|
|
91
|
-
throw Error(
|
|
91
|
+
throw Error('Connection has not been initialized. Call the init function first');
|
|
92
92
|
try {
|
|
93
93
|
if (!Array.isArray(queueName)) {
|
|
94
94
|
queueName = [queueName];
|
|
95
95
|
}
|
|
96
96
|
for (let name of queueName) {
|
|
97
|
-
if (!name || name.trim() ==
|
|
98
|
-
return { error:
|
|
97
|
+
if (!name || name.trim() == '')
|
|
98
|
+
return { error: 'Queue Name Cannot Be Empty' };
|
|
99
99
|
yield this.channel.assertQueue(name, options);
|
|
100
100
|
}
|
|
101
101
|
return { data: true };
|
|
102
102
|
}
|
|
103
103
|
catch (e) {
|
|
104
104
|
console.error(e);
|
|
105
|
-
logger_1.logger.exception(e, { tag:
|
|
105
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
106
106
|
return { error: e.message };
|
|
107
107
|
}
|
|
108
108
|
});
|
|
@@ -111,12 +111,12 @@ class RabbitMQ {
|
|
|
111
111
|
return __awaiter(this, arguments, void 0, function* (channelName, payload, options = { persistent: true }) {
|
|
112
112
|
try {
|
|
113
113
|
if (!payload)
|
|
114
|
-
throw new Error(
|
|
114
|
+
throw new Error('RabbitMQ: Empty Payload');
|
|
115
115
|
return { data: yield this.channel.sendToQueue(channelName, payload, options) };
|
|
116
116
|
}
|
|
117
117
|
catch (e) {
|
|
118
118
|
console.error(e);
|
|
119
|
-
logger_1.logger.exception(e, { tag:
|
|
119
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
120
120
|
return { error: e.message };
|
|
121
121
|
}
|
|
122
122
|
});
|
|
@@ -129,13 +129,13 @@ class RabbitMQ {
|
|
|
129
129
|
* @return {Promise<{error: *}|{data: ({data}|{error: *})}>}
|
|
130
130
|
*/
|
|
131
131
|
assertExchange(exchangeName_1) {
|
|
132
|
-
return __awaiter(this, arguments, void 0, function* (exchangeName, exchangeType =
|
|
132
|
+
return __awaiter(this, arguments, void 0, function* (exchangeName, exchangeType = 'fanout', option = {}) {
|
|
133
133
|
try {
|
|
134
134
|
return { data: yield this.channel.assertExchange(exchangeName, exchangeType, option) };
|
|
135
135
|
}
|
|
136
136
|
catch (e) {
|
|
137
137
|
console.error(e);
|
|
138
|
-
logger_1.logger.exception(e, { tag:
|
|
138
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
139
139
|
return { error: e.message };
|
|
140
140
|
}
|
|
141
141
|
});
|
|
@@ -149,14 +149,14 @@ class RabbitMQ {
|
|
|
149
149
|
* @return {Promise<{data: *}|{error: *}>}
|
|
150
150
|
*/
|
|
151
151
|
assertQueue(exchangeName_1) {
|
|
152
|
-
return __awaiter(this, arguments, void 0, function* (exchangeName, queueName =
|
|
152
|
+
return __awaiter(this, arguments, void 0, function* (exchangeName, queueName = '', bindKey = '', queueOption = {}) {
|
|
153
153
|
try {
|
|
154
154
|
let queue = yield this.channel.assertQueue(queueName, queueOption);
|
|
155
155
|
return { data: yield this.channel.bindQueue(queue.queue, exchangeName, bindKey) };
|
|
156
156
|
}
|
|
157
157
|
catch (e) {
|
|
158
158
|
console.error(e);
|
|
159
|
-
logger_1.logger.exception(e, { tag:
|
|
159
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
160
160
|
return { error: e.message };
|
|
161
161
|
}
|
|
162
162
|
});
|
|
@@ -169,13 +169,13 @@ class RabbitMQ {
|
|
|
169
169
|
* @return Promise<*>
|
|
170
170
|
*/
|
|
171
171
|
publishToExchange(exchangeName_1) {
|
|
172
|
-
return __awaiter(this, arguments, void 0, function* (exchangeName, routeKey =
|
|
172
|
+
return __awaiter(this, arguments, void 0, function* (exchangeName, routeKey = '', payload) {
|
|
173
173
|
try {
|
|
174
174
|
return { data: yield this.channel.publish(exchangeName, routeKey, payload) };
|
|
175
175
|
}
|
|
176
176
|
catch (e) {
|
|
177
177
|
console.error(e);
|
|
178
|
-
logger_1.logger.exception(e, { tag:
|
|
178
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
179
179
|
return { error: e.message };
|
|
180
180
|
}
|
|
181
181
|
});
|
|
@@ -192,12 +192,12 @@ class RabbitMQ {
|
|
|
192
192
|
return __awaiter(this, arguments, void 0, function* (channelName, options = {}, callback) {
|
|
193
193
|
try {
|
|
194
194
|
options.prefetch = options.prefetch || 1;
|
|
195
|
-
if (typeof callback !=
|
|
196
|
-
throw new Error(
|
|
195
|
+
if (typeof callback != 'function')
|
|
196
|
+
throw new Error('Callback must be a function');
|
|
197
197
|
const channel = yield this.connection.createChannel({
|
|
198
198
|
setup: (channel) => {
|
|
199
199
|
return channel.prefetch(options.prefetch);
|
|
200
|
-
}
|
|
200
|
+
},
|
|
201
201
|
});
|
|
202
202
|
const context = new types_1.ContextEntity();
|
|
203
203
|
context.broker = this;
|
|
@@ -213,12 +213,12 @@ class RabbitMQ {
|
|
|
213
213
|
channel,
|
|
214
214
|
ack: () => {
|
|
215
215
|
channel.ack(payload);
|
|
216
|
-
}
|
|
216
|
+
},
|
|
217
217
|
});
|
|
218
218
|
}, options);
|
|
219
219
|
}
|
|
220
220
|
catch (e) {
|
|
221
|
-
logger_1.logger.exception(e, { tag:
|
|
221
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
222
222
|
callback(e.message);
|
|
223
223
|
}
|
|
224
224
|
});
|
|
@@ -226,25 +226,23 @@ class RabbitMQ {
|
|
|
226
226
|
sendToDeadLetter(deadLetterEntity) {
|
|
227
227
|
return __awaiter(this, void 0, void 0, function* () {
|
|
228
228
|
var _a;
|
|
229
|
-
deadLetterEntity.deadLetterQueue = deadLetterEntity.deadLetterQueue ||
|
|
229
|
+
deadLetterEntity.deadLetterQueue = deadLetterEntity.deadLetterQueue || 'dead.letter';
|
|
230
230
|
yield this.sendToQueue(deadLetterEntity.deadLetterQueue, {
|
|
231
231
|
queue: deadLetterEntity.queueName,
|
|
232
232
|
reason: ((_a = deadLetterEntity.error) === null || _a === void 0 ? void 0 : _a.message) || deadLetterEntity.error,
|
|
233
233
|
payload: deadLetterEntity.payload,
|
|
234
|
-
stack: deadLetterEntity.stack || new Error().stack
|
|
234
|
+
stack: deadLetterEntity.stack || new Error().stack,
|
|
235
235
|
});
|
|
236
236
|
logger_1.logger.out(`================ Pushed to Dead Letter Queue - ${deadLetterEntity.deadLetterQueue}===============`);
|
|
237
237
|
});
|
|
238
238
|
}
|
|
239
|
-
;
|
|
240
239
|
sendToRetry(retryEntity) {
|
|
241
240
|
return __awaiter(this, void 0, void 0, function* () {
|
|
242
|
-
retryEntity.retryQueueName = retryEntity.retryQueueName ||
|
|
241
|
+
retryEntity.retryQueueName = retryEntity.retryQueueName || 'retry';
|
|
243
242
|
yield this.sendToQueue(retryEntity.retryQueueName, retryEntity);
|
|
244
243
|
logger_1.logger.out(`================ Pushed to Retry Queue - ${retryEntity.retryQueueName} ===============`);
|
|
245
244
|
});
|
|
246
245
|
}
|
|
247
|
-
;
|
|
248
246
|
requeueDeadLetter(deadLetterQueueName_1) {
|
|
249
247
|
return __awaiter(this, arguments, void 0, function* (deadLetterQueueName, queueOptions = {}) {
|
|
250
248
|
yield this.listen(deadLetterQueueName, queueOptions, (error, message, args) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -254,9 +252,9 @@ class RabbitMQ {
|
|
|
254
252
|
// return;
|
|
255
253
|
}
|
|
256
254
|
try {
|
|
257
|
-
console.log(
|
|
255
|
+
console.log('================== Listening =====================');
|
|
258
256
|
let { queue, reason, payload } = JSON.parse(message);
|
|
259
|
-
console.log(
|
|
257
|
+
console.log('Queue', queue, reason);
|
|
260
258
|
if (!queue)
|
|
261
259
|
return args.channel.ack(args.raw);
|
|
262
260
|
yield this.sendToQueue(queue, payload, { persistent: true });
|
|
@@ -264,7 +262,7 @@ class RabbitMQ {
|
|
|
264
262
|
}
|
|
265
263
|
catch (e) {
|
|
266
264
|
console.log(e, JSON.stringify(e));
|
|
267
|
-
logger_1.logger.exception(e, { tag:
|
|
265
|
+
logger_1.logger.exception(e, { tag: 'rabbitmq' });
|
|
268
266
|
yield this.sendToQueue(deadLetterQueueName, JSON.parse(message), { persistent: true });
|
|
269
267
|
return args.channel.ack(args.raw);
|
|
270
268
|
}
|
|
@@ -274,7 +272,7 @@ class RabbitMQ {
|
|
|
274
272
|
close() {
|
|
275
273
|
setTimeout(() => {
|
|
276
274
|
if (this.connection) {
|
|
277
|
-
console.log(
|
|
275
|
+
console.log('Closing AMPQ Connection');
|
|
278
276
|
try {
|
|
279
277
|
return this.connection.close();
|
|
280
278
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbitmq.js","sourceRoot":"","sources":["../../src/brokers/rabbitmq.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;AACb,sFAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"rabbitmq.js","sourceRoot":"","sources":["../../src/brokers/rabbitmq.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;AACb,sFAA4D;AAC5D,6CAA0C;AAC1C,oCAA2F;AAW3F,MAAa,QAAQ;IAKnB,YAAY,OAAsB;QAChC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;QAE/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;IAED;;;;;;;OAOG;IACG,IAAI,CAAC,OAAsB;;YAC/B,IAAI,CAAC;gBACH,IAAI,CAAC,OAAO;oBAAE,OAAO,GAAG,EAAE,CAAC;gBAE3B,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;gBAC1F,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;gBAE3C,IAAI,CAAC,OAAO,CAAC,GAAG;oBAAE,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAE1D,8CAA8C;gBAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAExC,IAAI,CAAC,UAAU,GAAG,iCAAqB,CAAC,OAAO,CAAC,QAAQ,EAAE;oBACxD,0BAA0B,EAAE,OAAO,CAAC,SAAS;iBAC9C,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC,UAAU,CAAC;YACzB,CAAC;YAAC,OAAO,CAAc,EAAE,CAAC;gBACxB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC/B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;oBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAED,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;gBAC/D,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;gBACxC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;KAAA;IAEK,aAAa,CAAC,QAAa;;YAC/B,IAAI,CAAC,IAAI,CAAC,UAAU;gBAAE,MAAM,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAEhG,IAAI,CAAC;gBACH,MAAM,OAAO,GAAQ;oBACnB,IAAI,EAAE,IAAI;iBACX,CAAC;gBAEF,IAAI,OAAO,QAAQ,IAAI,UAAU;oBAAE,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC;gBAE5D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAEtD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;KAAA;IAED;;;;;OAKG;IACG,WAAW;6DAAC,SAA4B,EAAE,UAAe,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,UAAU;gBAClB,MAAM,KAAK,CAAC,mEAAmE,CAAC,CAAC;YAEnF,IAAI,CAAC;gBACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC1B,CAAC;gBAED,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;oBAC3B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE;wBAAE,OAAO,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC;oBAE/E,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;KAAA;IAEK,WAAW;6DAAC,WAAmB,EAAE,OAAY,EAAE,OAAO,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YACjF,IAAI,CAAC;gBACH,IAAI,CAAC,OAAO;oBAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAEzD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACjF,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;KAAA;IAED;;;;;;OAMG;IACG,cAAc;6DAAC,YAAoB,EAAE,eAAuB,QAAQ,EAAE,SAAc,EAAE;YAC1F,IAAI,CAAC;gBACH,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,CAAC;YACzF,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;KAAA;IAED;;;;;;;OAOG;IACG,WAAW;6DACf,YAAoB,EACpB,YAAoB,EAAE,EACtB,UAAkB,EAAE,EACpB,cAAmB,EAAE;YAErB,IAAI,CAAC;gBACH,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;gBACnE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;YACpF,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;KAAA;IAED;;;;;;OAMG;IACG,iBAAiB;6DAAC,YAAoB,EAAE,WAAmB,EAAE,EAAE,OAAY;YAC/E,IAAI,CAAC;gBACH,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAC/E,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;KAAA;IAED;;;;;;;OAOG;IACG,MAAM;6DAAC,WAAmB,EAAE,UAAe,EAAE,EAAE,QAAa;YAChE,IAAI,CAAC;gBACH,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;gBAEzC,IAAI,OAAO,QAAQ,IAAI,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBAElF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;oBAClD,KAAK,EAAE,CAAC,OAAY,EAAE,EAAE;wBACtB,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAC5C,CAAC;iBACF,CAAC,CAAC;gBAEH,MAAM,OAAO,GAAG,IAAI,qBAAa,EAAE,CAAC;gBACpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;gBAEtB,OAAO,CAAC,OAAO,CACb,WAAW,EACX,CAAC,OAAY,EAAE,EAAE;oBACf,eAAM,CAAC,GAAG,CAAC;wBACT,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE;wBACnC,KAAK,EAAE,WAAW;wBAClB,KAAK,EAAE,OAAO;qBACf,CAAC,CAAC;oBAEH,OAAO,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;wBAChD,KAAK,EAAE,WAAW;wBAClB,KAAK,EAAE,OAAO;wBACd,OAAO;wBACP,GAAG,EAAE,GAAG,EAAE;4BACR,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;wBACvB,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC,EACD,OAAO,CACR,CAAC;YACJ,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACzC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;KAAA;IAEK,gBAAgB,CAAC,gBAA+C;;;YACpE,gBAAgB,CAAC,eAAe,GAAG,gBAAgB,CAAC,eAAe,IAAI,aAAa,CAAC;YAErF,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,eAAe,EAAE;gBACvD,KAAK,EAAE,gBAAgB,CAAC,SAAS;gBACjC,MAAM,EAAE,CAAA,MAAA,gBAAgB,CAAC,KAAK,0CAAE,OAAO,KAAI,gBAAgB,CAAC,KAAK;gBACjE,OAAO,EAAE,gBAAgB,CAAC,OAAO;gBACjC,KAAK,EAAE,gBAAgB,CAAC,KAAK,IAAI,IAAI,KAAK,EAAE,CAAC,KAAK;aACnD,CAAC,CAAC;YAEH,eAAM,CAAC,GAAG,CACR,kDAAkD,gBAAgB,CAAC,eAAe,iBAAiB,CACpG,CAAC;QACJ,CAAC;KAAA;IAEK,WAAW,CAAC,WAA8B;;YAC9C,WAAW,CAAC,cAAc,GAAG,WAAW,CAAC,cAAc,IAAI,OAAO,CAAC;YAEnE,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YAEhE,eAAM,CAAC,GAAG,CACR,4CAA4C,WAAW,CAAC,cAAc,kBAAkB,CACzF,CAAC;QACJ,CAAC;KAAA;IAEK,iBAAiB;6DAAC,mBAA2B,EAAE,eAAoB,EAAE;YACzE,MAAM,IAAI,CAAC,MAAM,CACf,mBAAmB,EACnB,YAAY,EACZ,CAAO,KAAU,EAAE,OAAY,EAAE,IAAS,EAAE,EAAE;gBAC5C,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,GAAG,CAAC,mCAAmC,mBAAmB,qBAAqB,CAAC,CAAC;oBACzF,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;oBACnB,UAAU;gBACZ,CAAC;gBACD,IAAI,CAAC;oBACH,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;oBAClE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAErD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;oBAEpC,IAAI,CAAC,KAAK;wBAAE,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAE9C,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;oBAE7D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACtC,CAAC;gBAAC,OAAO,CAAc,EAAE,CAAC;oBACxB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClC,eAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;oBACzC,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;oBACvF,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,CAAA,CACF,CAAC;QACJ,CAAC;KAAA;IAED,KAAK;QACH,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBACvC,IAAI,CAAC;oBACH,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACjC,CAAC;gBAAC,OAAO,aAAkB,EAAE,CAAC;oBAC5B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;CACF;AA/RD,4BA+RC"}
|
package/lib/cache/redis.d.ts
CHANGED
package/lib/cache/redis.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
|
|
1
|
+
'use strict';
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Redis = void 0;
|
|
4
4
|
const logger_1 = require("../logger/logger");
|
|
5
|
-
const IORedis = require(
|
|
5
|
+
const IORedis = require('ioredis');
|
|
6
6
|
/**
|
|
7
7
|
*
|
|
8
8
|
* @param {object} config
|
|
@@ -10,16 +10,19 @@ const IORedis = require("ioredis");
|
|
|
10
10
|
* @param {string} config.url
|
|
11
11
|
* @return {Cluster|Redis}
|
|
12
12
|
*/
|
|
13
|
-
const localhost = process.env.REDIS_HOST ||
|
|
13
|
+
const localhost = process.env.REDIS_HOST || '127.0.0.1';
|
|
14
14
|
const port = process.env.REDIS_PORT || 6379;
|
|
15
|
-
const password = process.env.REDIS_PASSWORD ||
|
|
15
|
+
const password = process.env.REDIS_PASSWORD || '';
|
|
16
16
|
class Redis {
|
|
17
17
|
constructor(config = {}) {
|
|
18
18
|
this.config = config;
|
|
19
|
-
let url = config.url ||
|
|
20
|
-
|
|
19
|
+
let url = config.url ||
|
|
20
|
+
process.env.REDIS_CLUSTER_URL ||
|
|
21
|
+
process.env.REDIS_URL ||
|
|
22
|
+
`redis://${password ? ':' + password + '@' : ''}${localhost}:${port}`;
|
|
23
|
+
logger_1.logger.out('URL', url, config);
|
|
21
24
|
//We are splitting the URL because of clusters
|
|
22
|
-
const urls = url === null || url === void 0 ? void 0 : url.split(
|
|
25
|
+
const urls = url === null || url === void 0 ? void 0 : url.split(',');
|
|
23
26
|
if (urls.length === 1) {
|
|
24
27
|
this.redis = new IORedis(url);
|
|
25
28
|
}
|
|
@@ -35,11 +38,11 @@ class Redis {
|
|
|
35
38
|
this.redis.hgetAllAsync = this.redis.hgetall;
|
|
36
39
|
this.redis.hdelAsync = this.redis.hdel;
|
|
37
40
|
this.redis.clear = this.redis.del;
|
|
38
|
-
this.redis.on(
|
|
39
|
-
console.log(
|
|
41
|
+
this.redis.on('connected', function () {
|
|
42
|
+
console.log('Redis is connected');
|
|
40
43
|
});
|
|
41
|
-
this.redis.on(
|
|
42
|
-
console.log(
|
|
44
|
+
this.redis.on('error', function (err) {
|
|
45
|
+
console.log('Redis error.', err);
|
|
43
46
|
console.log(err.message, err, {}, true);
|
|
44
47
|
});
|
|
45
48
|
if (config.keepAlive) {
|
package/lib/cache/redis.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ class MongoDBRepository {
|
|
|
36
36
|
return this.Model.paginate(condition, {
|
|
37
37
|
sort,
|
|
38
38
|
page: options.page,
|
|
39
|
-
limit: options.limit
|
|
39
|
+
limit: options.limit,
|
|
40
40
|
}).lean();
|
|
41
41
|
}
|
|
42
42
|
return this.Model.paginate(condition, {
|
|
@@ -76,7 +76,7 @@ class MongoDBRepository {
|
|
|
76
76
|
upsert(query = {}, update = {}) {
|
|
77
77
|
return this.Model.updateOne(query, update, {
|
|
78
78
|
upsert: true,
|
|
79
|
-
setDefaultsOnInsert: true
|
|
79
|
+
setDefaultsOnInsert: true,
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
findOneAndUpdate(filter, update, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MongoDBRepository.js","sourceRoot":"","sources":["../../src/database/MongoDBRepository.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAW;IAAxB;
|
|
1
|
+
{"version":3,"file":"MongoDBRepository.js","sourceRoot":"","sources":["../../src/database/MongoDBRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ class MongoDBRepository {
|
|
|
36
36
|
return this.Model.paginate(condition, {
|
|
37
37
|
sort,
|
|
38
38
|
page: options.page,
|
|
39
|
-
limit: options.limit
|
|
39
|
+
limit: options.limit,
|
|
40
40
|
}).lean();
|
|
41
41
|
}
|
|
42
42
|
return this.Model.paginate(condition, {
|
|
@@ -76,7 +76,7 @@ class MongoDBRepository {
|
|
|
76
76
|
upsert(query = {}, update = {}) {
|
|
77
77
|
return this.Model.updateOne(query, update, {
|
|
78
78
|
upsert: true,
|
|
79
|
-
setDefaultsOnInsert: true
|
|
79
|
+
setDefaultsOnInsert: true,
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
findOneAndUpdate(filter, update, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MongoDBTypeRepository.js","sourceRoot":"","sources":["../../src/database/MongoDBTypeRepository.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAW;IAAxB;
|
|
1
|
+
{"version":3,"file":"MongoDBTypeRepository.js","sourceRoot":"","sources":["../../src/database/MongoDBTypeRepository.ts"],"names":[],"mappings":"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"}
|
package/lib/database/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { MongoDBRepository } from
|
|
2
|
-
import * as query from
|
|
1
|
+
import { MongoDBRepository } from './MongoDBRepository';
|
|
2
|
+
import * as query from './query';
|
|
3
3
|
import mongoosePaginate from 'mongoose-paginate-v2';
|
|
4
4
|
export { MongoDBRepository, query, mongoosePaginate };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/database/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/database/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAAwD;AAG/C,kGAHA,qCAAiB,OAGA;AAF1B,+CAAiC;AAEL,sBAAK;AADjC,gFAAoD;AACjB,2BAD5B,8BAAgB,CAC4B"}
|