@6thbridge/utils 1.1.8 → 1.9.0-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/lib/data/rabbitmq/rabbitmq.script.js +1 -1
- package/lib/data/rabbitmq/rabbitmq.script.js.map +1 -1
- package/lib/data/redis/index.js +50 -5
- package/lib/data/redis/index.js.map +1 -1
- package/lib/data/redis/redis-example.js +1 -1
- package/lib/data/redis/redis-example.js.map +1 -1
- package/lib/database/MongoDBRepository.d.ts +94 -26
- package/lib/database/MongoDBRepository.js +37 -41
- package/lib/database/MongoDBRepository.js.map +1 -1
- package/lib/logger/logger.d.ts +2 -2
- package/lib/middlewares/common.js +1 -1
- package/lib/middlewares/common.js.map +1 -1
- package/lib/monitoring/index.d.ts +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/index.d.ts +1 -0
- package/lib/types/index.js +3 -1
- package/lib/types/index.js.map +1 -1
- package/lib/utils/database.js +11 -11
- package/lib/utils/database.js.map +1 -1
- package/package.json +21 -23
|
@@ -13,7 +13,7 @@ const _1 = require("./");
|
|
|
13
13
|
const helper_1 = require("../../utils/helper");
|
|
14
14
|
function test() {
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
const rabbitMQURL = 'amqp
|
|
16
|
+
const rabbitMQURL = 'amqp://@localhost:5672/local';
|
|
17
17
|
const config = {
|
|
18
18
|
url: rabbitMQURL,
|
|
19
19
|
retryCountBeforeExit: 10,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbitmq.script.js","sourceRoot":"","sources":["../../../src/data/rabbitmq/rabbitmq.script.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,yBAAyD;AACzD,+CAA8C;AAG9C,SAAe,IAAI;;QACf,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"rabbitmq.script.js","sourceRoot":"","sources":["../../../src/data/rabbitmq/rabbitmq.script.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,yBAAyD;AACzD,+CAA8C;AAG9C,SAAe,IAAI;;QACf,MAAM,WAAW,GAAG,8BAA8B,CAAC;QACnD,MAAM,MAAM,GAA0B;YAClC,GAAG,EAAE,WAAW;YAChB,oBAAoB,EAAE,EAAE;YACxB,MAAM,EAAE;gBACJ;oBACI,SAAS,EAAE,gCAAgC;oBAC3C,YAAY,EAAE;wBACV,OAAO,EAAE,IAAI;qBAChB;iBACJ;aACJ;YACD,SAAS,EAAE;gBACP;oBACI,YAAY,EAAE,8BAA8B;oBAC5C,YAAY,EAAE,QAAQ;oBACtB,eAAe,EAAE;wBACb,OAAO,EAAE,IAAI;qBAChB;iBACJ;aACJ;YACD,gBAAgB,EAAE;gBACd;oBACI,SAAS,EAAE,gCAAgC;oBAC3C,YAAY,EAAE,8BAA8B;oBAC5C,OAAO,EAAE,EAAE;iBACd;aACJ;SACJ,CAAA;QACD,MAAM,QAAQ,GAAG,IAAI,iBAAc,EAAE,CAAC;QACtC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEzB,MAAM,mBAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnB,MAAM,WAAW,GAAG,MAAM,iBAAc,CAAC,WAAW,CAAC,gCAAgC,EAAE;YACnF,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,SAAS;SACrB,EAAE;YACC,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QAE1C,MAAM,cAAc,GAAG,MAAM,iBAAc,CAAC,iBAAiB,CAAC,8BAA8B,EAAE,EAAE,EAAE;YAC9F,QAAQ,EAAE,UAAU;YACpB,OAAO,EAAE,SAAS;SACrB,EAAE;YACC,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;QAEhD,MAAM,iBAAc,CAAC,MAAM,CAAC,gCAAgC,EAAE,EAAC,QAAQ,EAAE,CAAC,EAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YAC9F,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAClC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,MAAM,mBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEhC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;CAAA;AAID,IAAI,EAAE,CAAC"}
|
package/lib/data/redis/index.js
CHANGED
|
@@ -9,6 +9,27 @@ const ioredis_1 = __importDefault(require("ioredis"));
|
|
|
9
9
|
const localhost = process.env.REDIS_HOST || '127.0.0.1';
|
|
10
10
|
const port = process.env.REDIS_PORT || 6379;
|
|
11
11
|
const password = process.env.REDIS_PASSWORD || '';
|
|
12
|
+
const redisDefaultUrl = `redis://${password ? ':' + password + '@' : ''}${localhost}:${port}`;
|
|
13
|
+
const splitConnectionUrls = (urls) => {
|
|
14
|
+
return urls
|
|
15
|
+
.split(',')
|
|
16
|
+
.map((item) => item.trim())
|
|
17
|
+
.filter(Boolean);
|
|
18
|
+
};
|
|
19
|
+
const getHostAndPort = (connectionUrl, defaultPort = 6379) => {
|
|
20
|
+
const normalizedUrl = connectionUrl.includes('://') ? connectionUrl : `redis://${connectionUrl}`;
|
|
21
|
+
const parsedUrl = new URL(normalizedUrl);
|
|
22
|
+
const parsedPort = Number(parsedUrl.port || defaultPort);
|
|
23
|
+
return {
|
|
24
|
+
host: parsedUrl.hostname,
|
|
25
|
+
port: Number.isNaN(parsedPort) ? defaultPort : parsedPort
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
const getPasswordFromUrl = (connectionUrl) => {
|
|
29
|
+
const normalizedUrl = connectionUrl.includes('://') ? connectionUrl : `redis://${connectionUrl}`;
|
|
30
|
+
const parsedUrl = new URL(normalizedUrl);
|
|
31
|
+
return parsedUrl.password || undefined;
|
|
32
|
+
};
|
|
12
33
|
class RedisClient {
|
|
13
34
|
/**
|
|
14
35
|
* Get the singleton instance of Redis
|
|
@@ -29,13 +50,37 @@ class RedisClient {
|
|
|
29
50
|
}
|
|
30
51
|
connect(config = {}) {
|
|
31
52
|
this.config = config;
|
|
32
|
-
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
53
|
+
const sentinelUrlsRaw = process.env.REDIS_SENTINEL_URLS;
|
|
54
|
+
const clusterUrlsRaw = process.env.REDIS_CLUSTER_URLS || process.env.REDIS_CLUSTER_URL;
|
|
55
|
+
const standaloneUrl = config.url || process.env.REDIS_URL || redisDefaultUrl;
|
|
56
|
+
const standalonePassword = getPasswordFromUrl(standaloneUrl);
|
|
57
|
+
if (sentinelUrlsRaw) {
|
|
58
|
+
const sentinelUrls = splitConnectionUrls(sentinelUrlsRaw);
|
|
59
|
+
const sentinelPasswordFromUrl = sentinelUrls.length > 0 ? getPasswordFromUrl(sentinelUrls[0]) : undefined;
|
|
60
|
+
const sentinelNodes = sentinelUrls.map((url) => getHostAndPort(url, 26379));
|
|
61
|
+
console.log('Redis connection mode: sentinel', {
|
|
62
|
+
sentinelName: process.env.REDIS_SENTINEL_NAME || 'mymaster',
|
|
63
|
+
sentinelCount: sentinelNodes.length
|
|
64
|
+
});
|
|
65
|
+
this.redis = new ioredis_1.default({
|
|
66
|
+
sentinels: sentinelNodes,
|
|
67
|
+
name: process.env.REDIS_SENTINEL_NAME || 'mymaster',
|
|
68
|
+
password: process.env.REDIS_PASSWORD || standalonePassword || sentinelPasswordFromUrl,
|
|
69
|
+
sentinelPassword: process.env.REDIS_SENTINEL_PASSWORD || sentinelPasswordFromUrl
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
else if (clusterUrlsRaw) {
|
|
73
|
+
const clusterNodes = splitConnectionUrls(clusterUrlsRaw).map(getHostAndPort);
|
|
74
|
+
console.log('Redis connection mode: cluster', {
|
|
75
|
+
nodeCount: clusterNodes.length
|
|
76
|
+
});
|
|
77
|
+
this.redis = new ioredis_1.default.Cluster(clusterNodes);
|
|
36
78
|
}
|
|
37
79
|
else {
|
|
38
|
-
|
|
80
|
+
console.log('Redis connection mode: standalone', {
|
|
81
|
+
url: standaloneUrl
|
|
82
|
+
});
|
|
83
|
+
this.redis = new ioredis_1.default(standaloneUrl);
|
|
39
84
|
}
|
|
40
85
|
this.redis.on('connected', function () {
|
|
41
86
|
console.log('Redis is connected');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/redis/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AACb,8BAAgC;AAEhC,sDAAgD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/redis/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ function redisExample() {
|
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
const redis = new index_1.RedisClient();
|
|
17
17
|
redis.connect({
|
|
18
|
-
url:
|
|
18
|
+
url: 'redis://localhost:6379'
|
|
19
19
|
});
|
|
20
20
|
const setResult = yield index_1.RedisClient.getRedis().set("ping", "pong");
|
|
21
21
|
console.log("setResult: ", setResult);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-example.js","sourceRoot":"","sources":["../../../src/data/redis/redis-example.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAoC;AACpC,+CAA8C;AAG9C,SAAe,YAAY;;QACvB,MAAM,KAAK,GAAG,IAAI,mBAAW,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,CAAC;YACV,GAAG,EAAE,wBAAwB;SAChC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"redis-example.js","sourceRoot":"","sources":["../../../src/data/redis/redis-example.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAoC;AACpC,+CAA8C;AAG9C,SAAe,YAAY;;QACvB,MAAM,KAAK,GAAG,IAAI,mBAAW,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,CAAC;YACV,GAAG,EAAE,wBAAwB;SAChC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,MAAM,mBAAW,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnE,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAEtC,MAAM,SAAS,GAAG,MAAM,mBAAW,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAGtC,MAAM,mBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAEnC,CAAC;CAAA;AAGD,YAAY,EAAE,CAAC"}
|
|
@@ -22,37 +22,105 @@
|
|
|
22
22
|
/// <reference types="mongoose/types/virtuals" />
|
|
23
23
|
/// <reference types="mongoose/types/schematypes" />
|
|
24
24
|
/// <reference types="mongoose/types/inferschematype" />
|
|
25
|
+
/// <reference types="mongoose/types/inferhydrateddoctype" />
|
|
25
26
|
/// <reference types="mongoose/types/inferrawdoctype" />
|
|
26
27
|
/// <reference types="mongoose-paginate-v2" />
|
|
27
|
-
import {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
import { CreateOptions, HydratedDocument, InsertManyOptions, Model, PaginateResult, ProjectionType, QueryFilter, QueryOptions, SortOrder, UpdateQuery, UpdateWithAggregationPipeline, Document } from 'mongoose';
|
|
29
|
+
type RepositoryDocument = Document;
|
|
30
|
+
type SortDefinition = Record<string, SortOrder>;
|
|
31
|
+
type FindOneAndUpdateOptions<TSchema extends RepositoryDocument> = NonNullable<Parameters<Model<TSchema>['findOneAndUpdate']>[2]> & {
|
|
32
|
+
new?: boolean;
|
|
33
|
+
};
|
|
34
|
+
type UpdateOneOptions<TSchema extends RepositoryDocument> = NonNullable<Parameters<Model<TSchema>['updateOne']>[2]>;
|
|
35
|
+
type UpdateManyOptions<TSchema extends RepositoryDocument> = NonNullable<Parameters<Model<TSchema>['updateMany']>[2]>;
|
|
36
|
+
type DeleteManyOptions<TSchema extends RepositoryDocument> = NonNullable<Parameters<Model<TSchema>['deleteMany']>[1]>;
|
|
37
|
+
type CountDocumentsOptions<TSchema extends RepositoryDocument> = NonNullable<Parameters<Model<TSchema>['countDocuments']>[1]>;
|
|
38
|
+
type BulkWritePayload<TSchema extends RepositoryDocument> = Parameters<Model<TSchema>['bulkWrite']>[0];
|
|
39
|
+
type BulkWriteOptions<TSchema extends RepositoryDocument> = Parameters<Model<TSchema>['bulkWrite']>[1];
|
|
40
|
+
export interface FindOptions<TSchema extends RepositoryDocument = RepositoryDocument> extends QueryOptions<TSchema> {
|
|
34
41
|
page?: number;
|
|
35
42
|
limit?: number;
|
|
36
43
|
lean?: boolean;
|
|
37
44
|
}
|
|
38
|
-
export type TypedModel<
|
|
39
|
-
export declare class MongoDBRepository {
|
|
45
|
+
export type TypedModel<TSchema extends RepositoryDocument = RepositoryDocument> = Model<TSchema>;
|
|
46
|
+
export declare class MongoDBRepository<TSchema extends RepositoryDocument = Document> {
|
|
40
47
|
private readonly Model;
|
|
41
|
-
constructor(Model: TypedModel<
|
|
42
|
-
getModel(): TypedModel<
|
|
43
|
-
create(payload:
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
48
|
+
constructor(Model: TypedModel<TSchema>);
|
|
49
|
+
getModel(): TypedModel<TSchema>;
|
|
50
|
+
create(payload: Partial<TSchema>, options?: CreateOptions): Promise<import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
51
|
+
__v: number;
|
|
52
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>>;
|
|
53
|
+
findById(id: string, projection?: ProjectionType<TSchema>, options?: QueryOptions<TSchema>): import("mongoose").Query<import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
54
|
+
__v: number;
|
|
55
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>> | null, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
56
|
+
__v: number;
|
|
57
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "findOne", {}>;
|
|
58
|
+
findOne(condition?: QueryFilter<TSchema>, sort?: SortDefinition, options?: FindOptions<TSchema>): import("mongoose").Query<import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
59
|
+
__v: number;
|
|
60
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>> | null, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
61
|
+
__v: number;
|
|
62
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "findOne", {}> | import("mongoose").Query<(import("mongoose").Require_id<TSchema> extends infer T ? T extends import("mongoose").Require_id<TSchema> ? T extends {
|
|
63
|
+
__v?: infer U | undefined;
|
|
64
|
+
} ? T : T & {
|
|
65
|
+
__v: number;
|
|
66
|
+
} : never : never) | (import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
67
|
+
__v: number;
|
|
68
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>> extends infer T_1 ? T_1 extends import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
69
|
+
__v: number;
|
|
70
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>> ? T_1 extends null ? (T_1 extends infer T_2 ? T_2 extends T_1 ? T_2 extends any[] ? (import("mongoose").Require_id<TSchema> extends infer T_3 ? T_3 extends import("mongoose").Require_id<TSchema> ? T_3 extends {
|
|
71
|
+
__v?: infer U | undefined;
|
|
72
|
+
} ? T_3 : T_3 & {
|
|
73
|
+
__v: number;
|
|
74
|
+
} : never : never)[] : import("mongoose").Require_id<TSchema> extends infer T_4 ? T_4 extends import("mongoose").Require_id<TSchema> ? T_4 extends {
|
|
75
|
+
__v?: infer U | undefined;
|
|
76
|
+
} ? T_4 : T_4 & {
|
|
77
|
+
__v: number;
|
|
78
|
+
} : never : never : never : never) | null : T_1 extends any[] ? (import("mongoose").Require_id<TSchema> extends infer T_5 ? T_5 extends import("mongoose").Require_id<TSchema> ? T_5 extends {
|
|
79
|
+
__v?: infer U | undefined;
|
|
80
|
+
} ? T_5 : T_5 & {
|
|
81
|
+
__v: number;
|
|
82
|
+
} : never : never)[] : import("mongoose").Require_id<TSchema> extends infer T_6 ? T_6 extends import("mongoose").Require_id<TSchema> ? T_6 extends {
|
|
83
|
+
__v?: infer U | undefined;
|
|
84
|
+
} ? T_6 : T_6 & {
|
|
85
|
+
__v: number;
|
|
86
|
+
} : never : never : never : never) | null, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
87
|
+
__v: number;
|
|
88
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "findOne", {}>;
|
|
89
|
+
find(condition?: QueryFilter<TSchema>, sort?: SortDefinition, options?: FindOptions<TSchema>): import("mongoose").Query<import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
90
|
+
__v: number;
|
|
91
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>[], import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
92
|
+
__v: number;
|
|
93
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "find", {}> | import("mongoose").Query<(import("mongoose").Require_id<TSchema> extends infer T ? T extends import("mongoose").Require_id<TSchema> ? T extends {
|
|
94
|
+
__v?: infer U | undefined;
|
|
95
|
+
} ? T : T & {
|
|
96
|
+
__v: number;
|
|
97
|
+
} : never : never)[], import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
98
|
+
__v: number;
|
|
99
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "find", {}>;
|
|
100
|
+
paginate(condition?: QueryFilter<TSchema>, sort?: SortDefinition, options?: FindOptions<TSchema>): Promise<PaginateResult<HydratedDocument<TSchema>>>;
|
|
101
|
+
deleteMany(condition?: QueryFilter<TSchema>, options?: DeleteManyOptions<TSchema>): import("mongoose").Query<import("mongodb").DeleteResult, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
102
|
+
__v: number;
|
|
103
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "deleteMany", {}>;
|
|
104
|
+
insertMany(data?: Array<TSchema>, options?: InsertManyOptions): Promise<import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
105
|
+
__v: number;
|
|
106
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>[]>;
|
|
107
|
+
countDocuments(condition?: QueryFilter<TSchema>, options?: CountDocumentsOptions<TSchema>): import("mongoose").Query<number, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
108
|
+
__v: number;
|
|
109
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "countDocuments", {}>;
|
|
110
|
+
updateOne(query?: QueryFilter<TSchema>, update?: UpdateQuery<TSchema> | UpdateWithAggregationPipeline, options?: UpdateOneOptions<TSchema>): import("mongoose").Query<import("mongoose").UpdateWriteOpResult, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
111
|
+
__v: number;
|
|
112
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "updateOne", {}>;
|
|
113
|
+
updateMany(query?: QueryFilter<TSchema>, update?: UpdateQuery<TSchema> | UpdateWithAggregationPipeline, options?: UpdateManyOptions<TSchema>): import("mongoose").Query<import("mongoose").UpdateWriteOpResult, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
114
|
+
__v: number;
|
|
115
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "updateMany", {}>;
|
|
116
|
+
upsert(query?: QueryFilter<TSchema>, update?: UpdateQuery<TSchema> | UpdateWithAggregationPipeline, options?: UpdateOneOptions<TSchema>): import("mongoose").Query<import("mongoose").UpdateWriteOpResult, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
117
|
+
__v: number;
|
|
118
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "updateOne", {}>;
|
|
119
|
+
findOneAndUpdate(filter: QueryFilter<TSchema>, update: UpdateQuery<TSchema> | UpdateWithAggregationPipeline, options?: FindOneAndUpdateOptions<TSchema>): import("mongoose").Query<import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
120
|
+
__v: number;
|
|
121
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>> | null, import("mongoose").IfAny<TSchema, any, Document<unknown, {}, TSchema, {}, import("mongoose").DefaultSchemaOptions> & import("mongoose").Require_id<TSchema> & {
|
|
122
|
+
__v: number;
|
|
123
|
+
} & import("mongoose").AddDefaultId<TSchema, {}, import("mongoose").DefaultSchemaOptions>>, {}, TSchema, "findOneAndUpdate", {}>;
|
|
124
|
+
bulkWrite(bulkWritePayload: BulkWritePayload<TSchema>, options?: BulkWriteOptions<TSchema>): Promise<import("mongodb").BulkWriteResult>;
|
|
58
125
|
}
|
|
126
|
+
export {};
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
|
+
var t = {};
|
|
4
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
+
t[p] = s[p];
|
|
6
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
+
t[p[i]] = s[p[i]];
|
|
10
|
+
}
|
|
11
|
+
return t;
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MongoDBRepository =
|
|
4
|
-
class MongooseOptions {
|
|
5
|
-
}
|
|
6
|
-
exports.MongooseOptions = MongooseOptions;
|
|
7
|
-
class FindOptions extends MongooseOptions {
|
|
8
|
-
constructor() {
|
|
9
|
-
super(...arguments);
|
|
10
|
-
this.limit = 100;
|
|
11
|
-
this.lean = false;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
exports.FindOptions = FindOptions;
|
|
14
|
+
exports.MongoDBRepository = void 0;
|
|
15
15
|
class MongoDBRepository {
|
|
16
16
|
constructor(Model) {
|
|
17
17
|
this.Model = Model;
|
|
@@ -20,24 +20,26 @@ class MongoDBRepository {
|
|
|
20
20
|
return this.Model;
|
|
21
21
|
}
|
|
22
22
|
create(payload, options) {
|
|
23
|
-
return this.Model.create(payload
|
|
23
|
+
return this.Model.create(payload);
|
|
24
24
|
}
|
|
25
25
|
findById(id, projection, options) {
|
|
26
|
-
return this.Model.
|
|
26
|
+
return this.Model.findById(id, projection, options);
|
|
27
27
|
}
|
|
28
28
|
findOne(condition = {}, sort, options) {
|
|
29
|
-
const
|
|
30
|
-
|
|
29
|
+
const _a = options !== null && options !== void 0 ? options : {}, { lean, page: _page, limit: _limit } = _a, queryOptions = __rest(_a, ["lean", "page", "limit"]);
|
|
30
|
+
const result = this.Model.findOne(condition, undefined, queryOptions).sort(sort);
|
|
31
|
+
if (lean)
|
|
31
32
|
return result.lean();
|
|
32
33
|
return result;
|
|
33
34
|
}
|
|
34
|
-
find(condition, sort, options) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
35
|
+
find(condition = {}, sort, options) {
|
|
36
|
+
const _a = options !== null && options !== void 0 ? options : {}, { lean, page: _page, limit: _limit } = _a, queryOptions = __rest(_a, ["lean", "page", "limit"]);
|
|
37
|
+
const result = this.Model.find(condition, undefined, queryOptions).sort(sort);
|
|
38
|
+
if (lean)
|
|
39
|
+
return result.lean();
|
|
40
|
+
return result;
|
|
39
41
|
}
|
|
40
|
-
paginate(condition, sort, options) {
|
|
42
|
+
paginate(condition = {}, sort, options) {
|
|
41
43
|
return this.Model.paginate(condition, {
|
|
42
44
|
sort,
|
|
43
45
|
page: options === null || options === void 0 ? void 0 : options.page,
|
|
@@ -45,39 +47,33 @@ class MongoDBRepository {
|
|
|
45
47
|
});
|
|
46
48
|
}
|
|
47
49
|
deleteMany(condition = {}, options) {
|
|
48
|
-
|
|
49
|
-
return this.Model.deleteMany(condition).session((_a = options === null || options === void 0 ? void 0 : options.session) !== null && _a !== void 0 ? _a : null);
|
|
50
|
+
return this.Model.deleteMany(condition, options);
|
|
50
51
|
}
|
|
51
52
|
insertMany(data = [], options) {
|
|
52
53
|
if (data.length === 0)
|
|
53
|
-
return [];
|
|
54
|
-
|
|
54
|
+
return Promise.resolve([]);
|
|
55
|
+
if (options)
|
|
56
|
+
return this.Model.insertMany(data, options);
|
|
57
|
+
return this.Model.insertMany(data);
|
|
55
58
|
}
|
|
56
59
|
countDocuments(condition = {}, options) {
|
|
57
|
-
|
|
58
|
-
return this.Model.countDocuments(condition).session((_a = options === null || options === void 0 ? void 0 : options.session) !== null && _a !== void 0 ? _a : null);
|
|
60
|
+
return this.Model.countDocuments(condition, options);
|
|
59
61
|
}
|
|
60
62
|
updateOne(query = {}, update = {}, options) {
|
|
61
|
-
|
|
62
|
-
return this.Model.updateOne(query, update).session((_a = options === null || options === void 0 ? void 0 : options.session) !== null && _a !== void 0 ? _a : null);
|
|
63
|
+
return this.Model.updateOne(query, update, options);
|
|
63
64
|
}
|
|
64
65
|
updateMany(query = {}, update = {}, options) {
|
|
65
|
-
|
|
66
|
-
return this.Model.updateMany(query, update).session((_a = options === null || options === void 0 ? void 0 : options.session) !== null && _a !== void 0 ? _a : null);
|
|
66
|
+
return this.Model.updateMany(query, update, options);
|
|
67
67
|
}
|
|
68
68
|
upsert(query = {}, update = {}, options) {
|
|
69
|
-
|
|
70
|
-
return this.Model.updateOne(query, update, {
|
|
71
|
-
upsert: true,
|
|
72
|
-
setDefaultsOnInsert: true,
|
|
73
|
-
}).session((_a = options === null || options === void 0 ? void 0 : options.session) !== null && _a !== void 0 ? _a : null);
|
|
69
|
+
return this.Model.updateOne(query, update, Object.assign({ upsert: true, setDefaultsOnInsert: true }, options));
|
|
74
70
|
}
|
|
75
71
|
findOneAndUpdate(filter, update, options) {
|
|
76
|
-
|
|
77
|
-
return this.Model.findOneAndUpdate(filter, update, Object.assign({
|
|
72
|
+
const _a = options !== null && options !== void 0 ? options : {}, { new: shouldReturnNew } = _a, queryOptions = __rest(_a, ["new"]);
|
|
73
|
+
return this.Model.findOneAndUpdate(filter, update, Object.assign({ returnDocument: shouldReturnNew === false ? 'before' : 'after' }, queryOptions));
|
|
78
74
|
}
|
|
79
|
-
bulkWrite(bulkWritePayload) {
|
|
80
|
-
return this.Model.bulkWrite(bulkWritePayload);
|
|
75
|
+
bulkWrite(bulkWritePayload, options) {
|
|
76
|
+
return this.Model.bulkWrite(bulkWritePayload, options);
|
|
81
77
|
}
|
|
82
78
|
}
|
|
83
79
|
exports.MongoDBRepository = MongoDBRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MongoDBRepository.js","sourceRoot":"","sources":["../../src/database/MongoDBRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MongoDBRepository.js","sourceRoot":"","sources":["../../src/database/MongoDBRepository.ts"],"names":[],"mappings":"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"}
|
package/lib/logger/logger.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LOG_LEVEL, LoggerInterface } from './index';
|
|
2
|
-
import
|
|
2
|
+
import Rollbar from 'rollbar';
|
|
3
3
|
import { RabbitMQClient } from '../data';
|
|
4
4
|
export declare class LoggerProps {
|
|
5
5
|
service?: string;
|
|
@@ -30,6 +30,6 @@ export declare class Logger implements LoggerInterface {
|
|
|
30
30
|
critical(message: string, meta?: any, trace?: string): string;
|
|
31
31
|
exception(error: Error, meta?: any): string;
|
|
32
32
|
out(...args: any): void;
|
|
33
|
-
logToRollbar(payload: Record<string, any>): string | LogResult;
|
|
33
|
+
logToRollbar(payload: Record<string, any>): string | Rollbar.LogResult;
|
|
34
34
|
}
|
|
35
35
|
export declare const logger: Logger;
|
|
@@ -39,7 +39,7 @@ function unless(middlewareName, paths, middleware) {
|
|
|
39
39
|
const pathsAsRegex = paths.map((path) => (0, path_to_regexp_1.pathToRegexp)(path));
|
|
40
40
|
return function (req, res, next) {
|
|
41
41
|
for (let path of pathsAsRegex) {
|
|
42
|
-
if (path.test(req.path)) {
|
|
42
|
+
if (path.regexp.test(req.path)) {
|
|
43
43
|
logger_1.logger.debug(`unless: skipping middleware "${middlewareName}" for path "${req.path}"`);
|
|
44
44
|
return next();
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/middlewares/common.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAkG;AAElG,mCAAiC;AACjC,sCAAmC;AACnC,mDAA8C;AAE9C,oCAAkC;AAIlC,MAAM,MAAM,GAAkB,gBAAQ,CAAC,gBAAgB,CAAC;IACtD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,qBAAqB;IAC9D,OAAO,EAAE;QACP,MAAM,EAAE,UAAU;KACnB;CACF,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG;IAClC,SAAS,EAAE,WAAW;IACtB,aAAa,EAAE,eAAe;IAC9B,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,SAAgB,eAAe,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAS;IAC3D,eAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAClD,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC;AAHD,0CAGC;AAED,SAAgB,MAAM,CAAC,cAAsB,EAAE,KAAe,EAAE,UAAe;IAC7E,IAAI,CAAC,UAAU;QAAE,OAAO,eAAe,CAAC;IAExC,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,eAAe,CAAC;IAE1C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,6BAAY,EAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,OAAO,UAAU,GAAQ,EAAE,GAAQ,EAAE,IAAS;QAC5C,KAAK,IAAI,IAAI,IAAI,YAAY,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/middlewares/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ type MonitoredAxiosOptions = {
|
|
|
6
6
|
export declare function getMonitoredAxios(options: MonitoredAxiosOptions): AxiosInstance;
|
|
7
7
|
export declare function reportAxiosError(error: any): Promise<void>;
|
|
8
8
|
export declare class Monitoring {
|
|
9
|
-
static rollbar: import("rollbar") | null;
|
|
9
|
+
static rollbar: import("rollbar").default | null;
|
|
10
10
|
static getRollbarInstance: typeof RollbarUtil.getRollbarInstance;
|
|
11
11
|
static getMonitoredAxios(options: MonitoredAxiosOptions): AxiosInstance;
|
|
12
12
|
}
|