@storyous/mongodb 1.10.2 → 1.10.4
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/getMongoConfig.js +2 -1
- package/lib/getMongoConfig.ts +1 -0
- package/lib/mongoClient.js +11 -2
- package/lib/mongoClient.ts +15 -2
- package/package.json +4 -5
package/lib/getMongoConfig.js
CHANGED
|
@@ -65,6 +65,7 @@ exports.default = (envPrefix = 'DOCUMENTDB', mongoOptions = {}, documentDbOption
|
|
|
65
65
|
mongoOptions: {
|
|
66
66
|
tlsCAFile: path.resolve(__dirname, 'global-bundle.pem'),
|
|
67
67
|
tls: true,
|
|
68
|
+
authMechanism: 'SCRAM-SHA-1',
|
|
68
69
|
auth: {
|
|
69
70
|
username,
|
|
70
71
|
password,
|
|
@@ -83,4 +84,4 @@ exports.default = (envPrefix = 'DOCUMENTDB', mongoOptions = {}, documentDbOption
|
|
|
83
84
|
}
|
|
84
85
|
throw new Error(`Invalid ${envPrefix}_ENGINE value "${engine}", values "mongodb" or "documentdb" allowed.`);
|
|
85
86
|
};
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0TW9uZ29Db25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJnZXRNb25nb0NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkNBQTZCO0FBTzdCLE1BQU0sTUFBTSxHQUFHLENBQUMsTUFBYyxFQUFFLFFBQWdCLEVBQUUsZUFBNEIsSUFBSSxFQUFVLEVBQUU7SUFDMUYsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sSUFBSSxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBRW5ELElBQUksS0FBSyxLQUFLLFNBQVMsSUFBSSxZQUFZLEtBQUssSUFBSSxFQUFFLENBQUM7UUFDL0MsT0FBTyxZQUFZLENBQUM7SUFDeEIsQ0FBQztJQUVELElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLE1BQU0sSUFBSSxRQUFRLFlBQVksQ0FBQyxDQUFDO0lBQzdFLENBQUM7SUFFRCxPQUFPLEtBQUssQ0FBQztBQUNqQixDQUFDLENBQUM7QUFFRixrQkFBZSxDQUNYLFlBQW9CLFlBQVksRUFDaEMsWUFBWSxHQUFHLEVBQUUsRUFDakIsaUJBQWlCLEdBQUcsRUFBRSxFQUNoQixFQUFFO0lBQ1IsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDekMsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNOLE9BQU87WUFDSCxVQUFVLEVBQUUsR0FBRztZQUNmLFlBQVk7U0FDZixDQUFDO0lBQ04sQ0FBQztJQUNELE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDM0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDMUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUMvQyxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztJQUMzQyxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDL0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDbkQsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFN0MsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQy9DLE1BQU0sWUFBWSxHQUFHLFFBQVEsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUMzRCxNQUFNLFNBQVMsR0FBRyxLQUFLLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFbEQsSUFBSSxNQUFNLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDdkIsT0FBTztZQUNILFVBQVUsRUFBRSxHQUFHLFFBQVEsTUFBTSxRQUFRLElBQUksUUFBUSxJQUFJLFFBQVEsR0FBRyxRQUFRLEdBQUcsWUFBWSxHQUFHLFNBQVMsRUFBRTtZQUNyRyxZQUFZO1NBQ2YsQ0FBQztJQUNOLENBQUM7SUFFRCxJQUFJLE1BQU0sS0FBSyxZQUFZLEVBQUUsQ0FBQztRQUMxQixPQUFPO1lBQ0gsVUFBVSxFQUFFLEdBQUcsUUFBUSxNQUFNLFFBQVEsR0FBRyxRQUFRLEdBQUcsWUFBWSxHQUFHLFNBQVMsRUFBRTtZQUM3RSxZQUFZLEVBQUU7Z0JBQ1YsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLG1CQUFtQixDQUFDO2dCQUN2RCxHQUFHLEVBQUUsSUFBSTtnQkFDVCxhQUFhLEVBQUUsYUFBYTtnQkFDNUIsSUFBSSxFQUFFO29CQUNGLFFBQVE7b0JBQ1IsUUFBUTtpQkFDWDtnQkFDRCxVQUFVLEVBQUUsS0FBSztnQkFDakIsV0FBVyxFQUFFLEtBQUs7Z0JBQ2xCLGdCQUFnQixFQUFFLElBQUk7Z0JBQ3RCLGFBQWEsRUFBRSxJQUFJO2dCQUNuQixlQUFlLEVBQUUsSUFBSTtnQkFDckIsa0JBQWtCLEVBQUUsSUFBSTtnQkFDeEIsVUFBVSxFQUFFLElBQUk7Z0JBQ2hCLHdCQUF3QixFQUFFLElBQUk7Z0JBQzlCLEdBQUcsaUJBQWlCO2FBQ3ZCO1NBQ0osQ0FBQztJQUNOLENBQUM7SUFFRCxNQUFNLElBQUksS0FBSyxDQUFDLFdBQVcsU0FBUyxrQkFBa0IsTUFBTSw4Q0FBOEMsQ0FBQyxDQUFDO0FBQ2hILENBQUMsQ0FBQyJ9
|
package/lib/getMongoConfig.ts
CHANGED
package/lib/mongoClient.js
CHANGED
|
@@ -2,10 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const lodash_1 = require("lodash");
|
|
4
4
|
const mongodb_1 = require("mongodb");
|
|
5
|
+
const LEGACY_MONGO_CLIENT_OPTIONS = [
|
|
6
|
+
'promiseLibrary',
|
|
7
|
+
'useUnifiedTopology',
|
|
8
|
+
'useNewUrlParser',
|
|
9
|
+
'useSsl',
|
|
10
|
+
'sslValidate',
|
|
11
|
+
'bufferMaxEntries',
|
|
12
|
+
];
|
|
13
|
+
const sanitizeMongoClientOptions = (mongoOptions) => (0, lodash_1.omit)(mongoOptions ?? {}, LEGACY_MONGO_CLIENT_OPTIONS);
|
|
5
14
|
const mongoClient = {
|
|
6
15
|
_client: null,
|
|
7
16
|
init(mongodbUrl, mongoOptions) {
|
|
8
|
-
this._client = new mongodb_1.MongoClient(mongodbUrl, (0, lodash_1.defaultsDeep)(mongoOptions));
|
|
17
|
+
this._client = new mongodb_1.MongoClient(mongodbUrl, (0, lodash_1.defaultsDeep)(sanitizeMongoClientOptions(mongoOptions)));
|
|
9
18
|
},
|
|
10
19
|
getClient() {
|
|
11
20
|
if (this._client) {
|
|
@@ -15,4 +24,4 @@ const mongoClient = {
|
|
|
15
24
|
},
|
|
16
25
|
};
|
|
17
26
|
exports.default = mongoClient;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9uZ29DbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJtb25nb0NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1DQUE0QztBQUM1QyxxQ0FBb0U7QUFJcEUsTUFBTSwyQkFBMkIsR0FBRztJQUNoQyxnQkFBZ0I7SUFDaEIsb0JBQW9CO0lBQ3BCLGlCQUFpQjtJQUNqQixRQUFRO0lBQ1IsYUFBYTtJQUNiLGtCQUFrQjtDQUNyQixDQUFDO0FBRUYsTUFBTSwwQkFBMEIsR0FBRyxDQUFDLFlBQWlDLEVBQXNCLEVBQUUsQ0FDekYsSUFBQSxhQUFJLEVBQUMsWUFBWSxJQUFJLEVBQUUsRUFBRSwyQkFBMkIsQ0FDdkQsQ0FBQztBQUVGLE1BQU0sV0FBVyxHQUFHO0lBQ2hCLE9BQU8sRUFBcUIsSUFBSTtJQUVoQyxJQUFJLENBQUUsVUFBa0IsRUFBRSxZQUFpQztRQUN2RCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUkscUJBQVcsQ0FDMUIsVUFBVSxFQUNWLElBQUEscUJBQVksRUFBQywwQkFBMEIsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUN6RCxDQUFDO0lBQ04sQ0FBQztJQUVELFNBQVM7UUFDTCxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNmLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN4QixDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO0lBQy9ELENBQUM7Q0FDSixDQUFDO0FBRUYsa0JBQWUsV0FBVyxDQUFDIn0=
|
package/lib/mongoClient.ts
CHANGED
|
@@ -1,15 +1,28 @@
|
|
|
1
|
-
import { defaultsDeep } from 'lodash';
|
|
1
|
+
import { defaultsDeep, omit } from 'lodash';
|
|
2
2
|
import { MongoClient, MongoClientOptions, ObjectId } from 'mongodb';
|
|
3
3
|
|
|
4
4
|
export type Key = string | number | ObjectId;
|
|
5
5
|
|
|
6
|
+
const LEGACY_MONGO_CLIENT_OPTIONS = [
|
|
7
|
+
'promiseLibrary',
|
|
8
|
+
'useUnifiedTopology',
|
|
9
|
+
'useNewUrlParser',
|
|
10
|
+
'useSsl',
|
|
11
|
+
'sslValidate',
|
|
12
|
+
'bufferMaxEntries',
|
|
13
|
+
];
|
|
14
|
+
|
|
15
|
+
const sanitizeMongoClientOptions = (mongoOptions?: MongoClientOptions): MongoClientOptions => (
|
|
16
|
+
omit(mongoOptions ?? {}, LEGACY_MONGO_CLIENT_OPTIONS) as MongoClientOptions
|
|
17
|
+
);
|
|
18
|
+
|
|
6
19
|
const mongoClient = {
|
|
7
20
|
_client: <MongoClient|null> null,
|
|
8
21
|
|
|
9
22
|
init (mongodbUrl: string, mongoOptions?: MongoClientOptions) {
|
|
10
23
|
this._client = new MongoClient(
|
|
11
24
|
mongodbUrl,
|
|
12
|
-
defaultsDeep(mongoOptions),
|
|
25
|
+
defaultsDeep(sanitizeMongoClientOptions(mongoOptions)),
|
|
13
26
|
);
|
|
14
27
|
},
|
|
15
28
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storyous/mongodb",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://github.com/Storyous/mono-utils#readme",
|
|
6
6
|
"license": "ISC",
|
|
@@ -40,11 +40,10 @@
|
|
|
40
40
|
"winston": "^3.7.2"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@types/sinon": "^10.0.11"
|
|
44
|
-
"mongodb": "^6.8.0"
|
|
43
|
+
"@types/sinon": "^10.0.11"
|
|
45
44
|
},
|
|
46
45
|
"peerDependencies": {
|
|
47
|
-
"mongodb": "^6.8.0"
|
|
46
|
+
"mongodb": "^6.8.0 || ^7.0.0"
|
|
48
47
|
},
|
|
49
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "220b77fcfaca6a768e0db7c628575237a513ae6d"
|
|
50
49
|
}
|