nuudel-main 1.0.31 → 1.0.32

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.
Files changed (3) hide show
  1. package/build/main/lib/lib/ConnectDB.js +8 -5
  2. package/build/module/lib/lib/ConnectDB.js +8 -5
  3. package/package.json +1 -1
package/build/main/lib/lib/ConnectDB.js CHANGED
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const mongoose_1 = __importDefault(require("mongoose"));
7
7
  const mongoose_paginate_v2_1 = __importDefault(require("mongoose-paginate-v2"));
8
- const { DB_URL, DB_DEBUG, DB_USER, DB_PASS, CA_CERT_PATH = '' } = process.env;
8
+ const { DB_URL, DB_DEBUG, DB_USER, DB_PASS, CA_CERT_PATH = '', CA_CERT, } = process.env;
9
9
  mongoose_1.default.plugin(mongoose_paginate_v2_1.default);
10
10
  function default_1(onConnect) {
11
11
  let options = {
@@ -14,14 +14,17 @@ function default_1(onConnect) {
14
14
  useFindAndModify: false,
15
15
  ssl: true,
16
16
  };
17
- if (!!CA_CERT_PATH) {
17
+ const certPath = (CA_CERT === null || CA_CERT === void 0 ? void 0 : CA_CERT.toLowerCase().endsWith('.crt'))
18
+ ? CA_CERT
19
+ : CA_CERT_PATH;
20
+ if (!!certPath) {
18
21
  options['tls'] = true;
19
- options['tlsCAFile'] = './keys/' + CA_CERT_PATH;
22
+ options['tlsCAFile'] = './keys/' + certPath;
20
23
  }
21
24
  else {
22
25
  options['ssl'] = true;
23
26
  }
24
- mongoose_1.default.connect(`mongodb${!CA_CERT_PATH ? '' : '+srv'}://` +
27
+ mongoose_1.default.connect(`mongodb${!certPath ? '' : '+srv'}://` +
25
28
  DB_USER +
26
29
  ':' +
27
30
  DB_PASS +
@@ -36,4 +39,4 @@ function default_1(onConnect) {
36
39
  });
37
40
  }
38
41
  exports.default = default_1;
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdERCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9saWIvQ29ubmVjdERCLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0RBQWdDO0FBQ2hDLGdGQUFvRDtBQUlwRCxNQUFNLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFlBQVksR0FBRyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0FBQzlFLGtCQUFRLENBQUMsTUFBTSxDQUFDLDhCQUFnQixDQUFDLENBQUM7QUFFbEMsbUJBQXlCLFNBQWdDO0lBQ3ZELElBQUksT0FBTyxHQUFRO1FBQ2pCLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLGtCQUFrQixFQUFFLElBQUk7UUFDeEIsZ0JBQWdCLEVBQUUsS0FBSztRQUN2QixHQUFHLEVBQUUsSUFBSTtLQUVWLENBQUM7SUFFRixJQUFJLENBQUMsQ0FBQyxZQUFZLEVBQUU7UUFDbEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQztRQUN0QixPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsU0FBUyxHQUFHLFlBQVksQ0FBQztLQUNqRDtTQUFNO1FBQ0wsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQztLQUl2QjtJQUVELGtCQUFRLENBQUMsT0FBTyxDQUNkLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLO1FBQ3hDLE9BQU87UUFDUCxHQUFHO1FBQ0gsT0FBTztRQUNQLEdBQUc7UUFDSCxNQUFNLEVBQ1IsT0FBTyxDQUNSLENBQUM7SUFDRixJQUFJLFFBQVEsRUFBRTtRQUNaLGtCQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztLQUM3QjtJQUNELGtCQUFRLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FDcEIsT0FBTyxFQUNQLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxtQkFBbUIsQ0FBQyxDQUNqRCxDQUFDO0lBQ0Ysa0JBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUU7UUFDcEMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BCLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQXRDRCw0QkFzQ0MifQ==
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdERCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9saWIvQ29ubmVjdERCLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0RBQWdDO0FBQ2hDLGdGQUFvRDtBQUlwRCxNQUFNLEVBQ0osTUFBTSxFQUNOLFFBQVEsRUFDUixPQUFPLEVBQ1AsT0FBTyxFQUNQLFlBQVksR0FBRyxFQUFFLEVBQ2pCLE9BQU8sR0FDUixHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7QUFDaEIsa0JBQVEsQ0FBQyxNQUFNLENBQUMsOEJBQWdCLENBQUMsQ0FBQztBQUVsQyxtQkFBeUIsU0FBZ0M7SUFDdkQsSUFBSSxPQUFPLEdBQVE7UUFDakIsZUFBZSxFQUFFLElBQUk7UUFDckIsa0JBQWtCLEVBQUUsSUFBSTtRQUN4QixnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLEdBQUcsRUFBRSxJQUFJO0tBRVYsQ0FBQztJQUVGLE1BQU0sUUFBUSxHQUFXLENBQUEsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFdBQVcsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDO1FBQzlELENBQUMsQ0FBQyxPQUFPO1FBQ1QsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUVqQixJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUU7UUFDZCxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ3RCLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxTQUFTLEdBQUcsUUFBUSxDQUFDO0tBQzdDO1NBQU07UUFDTCxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDO0tBSXZCO0lBRUQsa0JBQVEsQ0FBQyxPQUFPLENBQ2QsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUs7UUFDcEMsT0FBTztRQUNQLEdBQUc7UUFDSCxPQUFPO1FBQ1AsR0FBRztRQUNILE1BQU0sRUFDUixPQUFPLENBQ1IsQ0FBQztJQUNGLElBQUksUUFBUSxFQUFFO1FBQ1osa0JBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO0tBQzdCO0lBQ0Qsa0JBQVEsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUNwQixPQUFPLEVBQ1AsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLG1CQUFtQixDQUFDLENBQ2pELENBQUM7SUFDRixrQkFBUSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRTtRQUNwQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBMUNELDRCQTBDQyJ9
package/build/module/lib/lib/ConnectDB.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import mongoose from 'mongoose';
2
2
  import mongoosePaginate from 'mongoose-paginate-v2';
3
- const { DB_URL, DB_DEBUG, DB_USER, DB_PASS, CA_CERT_PATH = '' } = process.env;
3
+ const { DB_URL, DB_DEBUG, DB_USER, DB_PASS, CA_CERT_PATH = '', CA_CERT, } = process.env;
4
4
  mongoose.plugin(mongoosePaginate);
5
5
  export default function (onConnect) {
6
6
  let options = {
@@ -9,14 +9,17 @@ export default function (onConnect) {
9
9
  useFindAndModify: false,
10
10
  ssl: true,
11
11
  };
12
- if (!!CA_CERT_PATH) {
12
+ const certPath = CA_CERT?.toLowerCase().endsWith('.crt')
13
+ ? CA_CERT
14
+ : CA_CERT_PATH;
15
+ if (!!certPath) {
13
16
  options['tls'] = true;
14
- options['tlsCAFile'] = './keys/' + CA_CERT_PATH;
17
+ options['tlsCAFile'] = './keys/' + certPath;
15
18
  }
16
19
  else {
17
20
  options['ssl'] = true;
18
21
  }
19
- mongoose.connect(`mongodb${!CA_CERT_PATH ? '' : '+srv'}://` +
22
+ mongoose.connect(`mongodb${!certPath ? '' : '+srv'}://` +
20
23
  DB_USER +
21
24
  ':' +
22
25
  DB_PASS +
@@ -30,4 +33,4 @@ export default function (onConnect) {
30
33
  onConnect(DB_URL);
31
34
  });
32
35
  }
33
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdERCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9saWIvQ29ubmVjdERCLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sUUFBUSxNQUFNLFVBQVUsQ0FBQztBQUNoQyxPQUFPLGdCQUFnQixNQUFNLHNCQUFzQixDQUFDO0FBSXBELE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsWUFBWSxHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7QUFDOUUsUUFBUSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBRWxDLE1BQU0sQ0FBQyxPQUFPLFdBQVcsU0FBZ0M7SUFDdkQsSUFBSSxPQUFPLEdBQVE7UUFDakIsZUFBZSxFQUFFLElBQUk7UUFDckIsa0JBQWtCLEVBQUUsSUFBSTtRQUN4QixnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLEdBQUcsRUFBRSxJQUFJO0tBRVYsQ0FBQztJQUVGLElBQUksQ0FBQyxDQUFDLFlBQVksRUFBRTtRQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ3RCLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxTQUFTLEdBQUcsWUFBWSxDQUFDO0tBQ2pEO1NBQU07UUFDTCxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDO0tBSXZCO0lBRUQsUUFBUSxDQUFDLE9BQU8sQ0FDZCxVQUFVLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSztRQUN4QyxPQUFPO1FBQ1AsR0FBRztRQUNILE9BQU87UUFDUCxHQUFHO1FBQ0gsTUFBTSxFQUNSLE9BQU8sQ0FDUixDQUFDO0lBQ0YsSUFBSSxRQUFRLEVBQUU7UUFDWixRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztLQUM3QjtJQUNELFFBQVEsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUNwQixPQUFPLEVBQ1AsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLG1CQUFtQixDQUFDLENBQ2pELENBQUM7SUFDRixRQUFRLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxFQUFFO1FBQ3BDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNwQixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMifQ==
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ubmVjdERCLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9saWIvQ29ubmVjdERCLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sUUFBUSxNQUFNLFVBQVUsQ0FBQztBQUNoQyxPQUFPLGdCQUFnQixNQUFNLHNCQUFzQixDQUFDO0FBSXBELE1BQU0sRUFDSixNQUFNLEVBQ04sUUFBUSxFQUNSLE9BQU8sRUFDUCxPQUFPLEVBQ1AsWUFBWSxHQUFHLEVBQUUsRUFDakIsT0FBTyxHQUNSLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztBQUNoQixRQUFRLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFFbEMsTUFBTSxDQUFDLE9BQU8sV0FBVyxTQUFnQztJQUN2RCxJQUFJLE9BQU8sR0FBUTtRQUNqQixlQUFlLEVBQUUsSUFBSTtRQUNyQixrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLGdCQUFnQixFQUFFLEtBQUs7UUFDdkIsR0FBRyxFQUFFLElBQUk7S0FFVixDQUFDO0lBRUYsTUFBTSxRQUFRLEdBQVcsT0FBTyxFQUFFLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUM7UUFDOUQsQ0FBQyxDQUFDLE9BQU87UUFDVCxDQUFDLENBQUMsWUFBWSxDQUFDO0lBRWpCLElBQUksQ0FBQyxDQUFDLFFBQVEsRUFBRTtRQUNkLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUM7UUFDdEIsT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLFNBQVMsR0FBRyxRQUFRLENBQUM7S0FDN0M7U0FBTTtRQUNMLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUM7S0FJdkI7SUFFRCxRQUFRLENBQUMsT0FBTyxDQUNkLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLO1FBQ3BDLE9BQU87UUFDUCxHQUFHO1FBQ0gsT0FBTztRQUNQLEdBQUc7UUFDSCxNQUFNLEVBQ1IsT0FBTyxDQUNSLENBQUM7SUFDRixJQUFJLFFBQVEsRUFBRTtRQUNaLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO0tBQzdCO0lBQ0QsUUFBUSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQ3BCLE9BQU8sRUFDUCxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsbUJBQW1CLENBQUMsQ0FDakQsQ0FBQztJQUNGLFFBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUU7UUFDcEMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BCLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nuudel-main",
3
- "version": "1.0.31",
3
+ "version": "1.0.32",
4
4
  "description": "main module for nodejs of nuudel",
5
5
  "main": "build/main/index.js",
6
6
  "typings": "build/main/index.d.ts",