nuudel-main 1.0.47 → 1.0.49
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.
|
@@ -8,24 +8,23 @@ const mongoose_paginate_v2_1 = __importDefault(require("mongoose-paginate-v2"));
|
|
|
8
8
|
const { DB_URL, DB_DEBUG, DB_USER, DB_PASS, CA_CERT = '' } = process.env;
|
|
9
9
|
mongoose_1.default.plugin(mongoose_paginate_v2_1.default);
|
|
10
10
|
function default_1(onConnect) {
|
|
11
|
-
var _a
|
|
11
|
+
var _a;
|
|
12
12
|
let options = {
|
|
13
13
|
useNewUrlParser: true,
|
|
14
14
|
useUnifiedTopology: true,
|
|
15
15
|
useFindAndModify: false,
|
|
16
|
-
|
|
16
|
+
allowMixed: true,
|
|
17
17
|
};
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
: '';
|
|
21
|
-
if (!!certPath) {
|
|
18
|
+
let protocalSrv = (_a = CA_CERT === null || CA_CERT === void 0 ? void 0 : CA_CERT.toLowerCase()) === null || _a === void 0 ? void 0 : _a.endsWith('.crt');
|
|
19
|
+
if (protocalSrv) {
|
|
22
20
|
options['tls'] = true;
|
|
23
|
-
options['tlsCAFile'] = './keys/' +
|
|
21
|
+
options['tlsCAFile'] = './keys/' + CA_CERT;
|
|
24
22
|
}
|
|
25
23
|
else {
|
|
26
24
|
options['ssl'] = true;
|
|
27
25
|
}
|
|
28
|
-
|
|
26
|
+
protocalSrv = protocalSrv || (DB_URL === null || DB_URL === void 0 ? void 0 : DB_URL.includes('&tls=true'));
|
|
27
|
+
mongoose_1.default.connect(`mongodb${!protocalSrv ? '' : '+srv'}://` +
|
|
29
28
|
DB_USER +
|
|
30
29
|
':' +
|
|
31
30
|
DB_PASS +
|
|
@@ -40,4 +39,4 @@ function default_1(onConnect) {
|
|
|
40
39
|
});
|
|
41
40
|
}
|
|
42
41
|
exports.default = default_1;
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdERCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9saWIvQ29ubmVjdERCLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0RBQWdDO0FBQ2hDLGdGQUFvRDtBQUlwRCxNQUFNLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sR0FBRyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0FBQ3pFLGtCQUFRLENBQUMsTUFBTSxDQUFDLDhCQUFnQixDQUFDLENBQUM7QUFFbEMsbUJBQXlCLFNBQWdDOztJQUN2RCxJQUFJLE9BQU8sR0FBUTtRQUNqQixlQUFlLEVBQUUsSUFBSTtRQUNyQixrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLGdCQUFnQixFQUFFLEtBQUs7UUFDdkIsVUFBVSxFQUFFLElBQUk7S0FDakIsQ0FBQztJQUVGLElBQUksV0FBVyxHQUFZLE1BQUEsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFdBQVcsRUFBRSwwQ0FBRSxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFcEUsSUFBSSxXQUFXLEVBQUU7UUFDZixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ3RCLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxTQUFTLEdBQUcsT0FBTyxDQUFDO0tBQzVDO1NBQU07UUFDTCxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDO0tBSXZCO0lBQ0QsV0FBVyxHQUFHLFdBQVcsS0FBSSxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBLENBQUM7SUFFM0Qsa0JBQVEsQ0FBQyxPQUFPLENBQ2QsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUs7UUFDdkMsT0FBTztRQUNQLEdBQUc7UUFDSCxPQUFPO1FBQ1AsR0FBRztRQUNILE1BQU0sRUFDUixPQUFPLENBQ1IsQ0FBQztJQUNGLElBQUksUUFBUSxFQUFFO1FBQ1osa0JBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO0tBQzdCO0lBQ0Qsa0JBQVEsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUNwQixPQUFPLEVBQ1AsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLG1CQUFtQixDQUFDLENBQ2pELENBQUM7SUFDRixrQkFBUSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRTtRQUNwQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBeENELDRCQXdDQyJ9
|
|
@@ -7,19 +7,18 @@ export default function (onConnect) {
|
|
|
7
7
|
useNewUrlParser: true,
|
|
8
8
|
useUnifiedTopology: true,
|
|
9
9
|
useFindAndModify: false,
|
|
10
|
-
|
|
10
|
+
allowMixed: true,
|
|
11
11
|
};
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
: '';
|
|
15
|
-
if (!!certPath) {
|
|
12
|
+
let protocalSrv = CA_CERT?.toLowerCase()?.endsWith('.crt');
|
|
13
|
+
if (protocalSrv) {
|
|
16
14
|
options['tls'] = true;
|
|
17
|
-
options['tlsCAFile'] = './keys/' +
|
|
15
|
+
options['tlsCAFile'] = './keys/' + CA_CERT;
|
|
18
16
|
}
|
|
19
17
|
else {
|
|
20
18
|
options['ssl'] = true;
|
|
21
19
|
}
|
|
22
|
-
|
|
20
|
+
protocalSrv = protocalSrv || DB_URL?.includes('&tls=true');
|
|
21
|
+
mongoose.connect(`mongodb${!protocalSrv ? '' : '+srv'}://` +
|
|
23
22
|
DB_USER +
|
|
24
23
|
':' +
|
|
25
24
|
DB_PASS +
|
|
@@ -33,4 +32,4 @@ export default function (onConnect) {
|
|
|
33
32
|
onConnect(DB_URL);
|
|
34
33
|
});
|
|
35
34
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdERCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9saWIvQ29ubmVjdERCLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sUUFBUSxNQUFNLFVBQVUsQ0FBQztBQUNoQyxPQUFPLGdCQUFnQixNQUFNLHNCQUFzQixDQUFDO0FBSXBELE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7QUFDekUsUUFBUSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBRWxDLE1BQU0sQ0FBQyxPQUFPLFdBQVcsU0FBZ0M7SUFDdkQsSUFBSSxPQUFPLEdBQVE7UUFDakIsZUFBZSxFQUFFLElBQUk7UUFDckIsa0JBQWtCLEVBQUUsSUFBSTtRQUN4QixnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLFVBQVUsRUFBRSxJQUFJO0tBQ2pCLENBQUM7SUFFRixJQUFJLFdBQVcsR0FBWSxPQUFPLEVBQUUsV0FBVyxFQUFFLEVBQUUsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXBFLElBQUksV0FBVyxFQUFFO1FBQ2YsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQztRQUN0QixPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQztLQUM1QztTQUFNO1FBQ0wsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQztLQUl2QjtJQUNELFdBQVcsR0FBRyxXQUFXLElBQUksTUFBTSxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUUzRCxRQUFRLENBQUMsT0FBTyxDQUNkLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLO1FBQ3ZDLE9BQU87UUFDUCxHQUFHO1FBQ0gsT0FBTztRQUNQLEdBQUc7UUFDSCxNQUFNLEVBQ1IsT0FBTyxDQUNSLENBQUM7SUFDRixJQUFJLFFBQVEsRUFBRTtRQUNaLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO0tBQzdCO0lBQ0QsUUFBUSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQ3BCLE9BQU8sRUFDUCxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsbUJBQW1CLENBQUMsQ0FDakQsQ0FBQztJQUNGLFFBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUU7UUFDcEMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BCLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nuudel-main",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.49",
|
|
4
4
|
"description": "main module for nodejs of nuudel",
|
|
5
5
|
"main": "build/main/index.js",
|
|
6
6
|
"typings": "build/main/index.d.ts",
|
|
@@ -54,8 +54,8 @@
|
|
|
54
54
|
"bcryptjs": "^2.4.3",
|
|
55
55
|
"fastify": "3.23.1",
|
|
56
56
|
"fastify-plugin": "^3.0.0",
|
|
57
|
-
"mongoose": "^5.13.
|
|
58
|
-
"mongoose-paginate-v2": "^1.4.
|
|
57
|
+
"mongoose": "^5.13.15",
|
|
58
|
+
"mongoose-paginate-v2": "^1.4.3",
|
|
59
59
|
"nodemailer": "^6.7.0",
|
|
60
60
|
"oauth": "^0.9.15",
|
|
61
61
|
"sharp": "^0.29.3",
|
|
@@ -64,8 +64,8 @@
|
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"@ava/typescript": "^1.1.1",
|
|
66
66
|
"@istanbuljs/nyc-config-typescript": "^1.0.1",
|
|
67
|
-
"@types/mongodb": "^3.
|
|
68
|
-
"@types/mongoose": "^5.5.
|
|
67
|
+
"@types/mongodb": "^3.6.20",
|
|
68
|
+
"@types/mongoose": "^5.5.43",
|
|
69
69
|
"@types/mongoose-paginate-v2": "^1.0.5",
|
|
70
70
|
"@types/node": "^12.7.5",
|
|
71
71
|
"@types/nodemailer": "^6.4.0",
|
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
"eslint-plugin-import": "^2.22.0",
|
|
85
85
|
"gh-pages": "^3.1.0",
|
|
86
86
|
"graphql": "^15.7.2",
|
|
87
|
-
"next": "^11.1.
|
|
87
|
+
"next": "^11.1.4",
|
|
88
88
|
"npm-run-all": "^4.1.5",
|
|
89
89
|
"nyc": "^15.1.0",
|
|
90
90
|
"open-cli": "^6.0.1",
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
"peerDependencies": {
|
|
98
98
|
"axios": "^0.24.0",
|
|
99
99
|
"graphql": "^15.7.2",
|
|
100
|
-
"next": "^11.1.
|
|
100
|
+
"next": "^11.1.4"
|
|
101
101
|
},
|
|
102
102
|
"files": [
|
|
103
103
|
"build/main",
|