equipped 4.1.21 → 4.1.23

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 (6) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/lib/bull/index.js +2 -2
  3. package/lib/db/mongoose/query.js +8 -8
  4. package/lib/instance/index.js +10 -10
  5. package/lib/logger/index.js +4 -4
  6. package/package.json +9 -9
package/CHANGELOG.md CHANGED
@@ -2,6 +2,21 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
+ ### [4.1.23](https://github.com/kevinand11/equipped/compare/v4.1.22...v4.1.23) (2023-08-25)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * don't return db error from querying ([6eb6915](https://github.com/kevinand11/equipped/commit/6eb6915a77ff508d36c0c349d053dd012aed2020))
11
+
12
+ ### [4.1.22](https://github.com/kevinand11/equipped/compare/v4.1.21...v4.1.22) (2023-08-25)
13
+
14
+
15
+ ### Bug Fixes
16
+
17
+ * don't return db error from querying ([49642bd](https://github.com/kevinand11/equipped/commit/49642bdd9791753586bcee017c9bdea46c520907))
18
+ * remove space in logger ([12eddb8](https://github.com/kevinand11/equipped/commit/12eddb855f71bfe8ad335889bb5df2047e1cf6c8))
19
+
5
20
  ### [4.1.21](https://github.com/kevinand11/equipped/compare/v4.1.20...v4.1.21) (2023-08-16)
6
21
 
7
22
 
package/lib/bull/index.js CHANGED
@@ -33,7 +33,7 @@ class BullJob {
33
33
  }
34
34
  async addDelayedJob(data, delayInMs) {
35
35
  const job = await __classPrivateFieldGet(this, _BullJob_queue, "f").add(JobNames.DelayedJob, data, {
36
- jobId: __classPrivateFieldGet(BullJob, _a, "m", _BullJob_getNewId).call(BullJob),
36
+ jobId: __classPrivateFieldGet(_a, _a, "m", _BullJob_getNewId).call(_a),
37
37
  delay: delayInMs,
38
38
  removeOnComplete: true,
39
39
  backoff: 1000,
@@ -43,7 +43,7 @@ class BullJob {
43
43
  }
44
44
  async addCronLikeJob(data, cron, tz) {
45
45
  const job = await __classPrivateFieldGet(this, _BullJob_queue, "f").add(JobNames.CronLikeJob, data, {
46
- jobId: __classPrivateFieldGet(BullJob, _a, "m", _BullJob_getNewId).call(BullJob),
46
+ jobId: __classPrivateFieldGet(_a, _a, "m", _BullJob_getNewId).call(_a),
47
47
  repeat: { cron, ...(tz ? { tz } : {}) },
48
48
  removeOnComplete: true,
49
49
  backoff: 1000,
package/lib/db/mongoose/query.js CHANGED
@@ -30,7 +30,9 @@ const parseMongodbQueryParams = async (model, params) => {
30
30
  const limit = Number(params.limit) <= settings.paginationDefaultLimit ? Number(params.limit) : settings.paginationDefaultLimit;
31
31
  let page = Number.isNaN(Number(params.page)) ? 0 : Number(params.page);
32
32
  page = page < 1 ? 1 : page;
33
- const total = await model.countDocuments(totalClause);
33
+ const total = await model.countDocuments(totalClause).catch(() => {
34
+ throw new Error('Error querying database');
35
+ });
34
36
  let builtQuery = model.find(totalClause).lean({ virtuals: true, getters: true, defaults: true });
35
37
  if (sort.length)
36
38
  builtQuery = builtQuery.sort(Object.fromEntries(sort));
@@ -39,18 +41,16 @@ const parseMongodbQueryParams = async (model, params) => {
39
41
  if (page)
40
42
  builtQuery = builtQuery.skip((page - 1) * limit);
41
43
  }
42
- const results = await builtQuery;
44
+ const results = await builtQuery.catch(() => {
45
+ throw new Error('Error querying database');
46
+ });
43
47
  const start = 1;
44
48
  const last = Math.ceil(total / limit) || 1;
45
49
  const next = page >= last ? null : page + 1;
46
50
  const previous = page <= start ? null : page - 1;
47
51
  return {
48
- pages: {
49
- start, last, next, previous, current: page
50
- },
51
- docs: {
52
- limit, total, count: results.length
53
- },
52
+ pages: { start, last, next, previous, current: page },
53
+ docs: { limit, total, count: results.length },
54
54
  results: results
55
55
  };
56
56
  };
package/lib/instance/index.js CHANGED
@@ -56,8 +56,8 @@ class Instance {
56
56
  return __classPrivateFieldGet(this, _Instance_settings, "f");
57
57
  }
58
58
  static initialize(settings) {
59
- __classPrivateFieldSet(Instance, _a, true, "f", _Instance_initialized);
60
- const instanceSettings = Instance.get().settings;
59
+ __classPrivateFieldSet(_a, _a, true, "f", _Instance_initialized);
60
+ const instanceSettings = _a.get().settings;
61
61
  Object.entries(settings).forEach(([key, value]) => {
62
62
  instanceSettings[key] = value;
63
63
  });
@@ -65,21 +65,21 @@ class Instance {
65
65
  static get() {
66
66
  if (!__classPrivateFieldGet(this, _a, "f", _Instance_initialized))
67
67
  return (0, exit_1.exit)('Has not been initialized. Make sure initialize is called before you get an instance');
68
- if (!__classPrivateFieldGet(Instance, _a, "f", _Instance_instance))
69
- __classPrivateFieldSet(Instance, _a, new Instance(), "f", _Instance_instance);
70
- return __classPrivateFieldGet(Instance, _a, "f", _Instance_instance);
68
+ if (!__classPrivateFieldGet(_a, _a, "f", _Instance_instance))
69
+ __classPrivateFieldSet(_a, _a, new _a(), "f", _Instance_instance);
70
+ return __classPrivateFieldGet(_a, _a, "f", _Instance_instance);
71
71
  }
72
72
  async startConnections() {
73
73
  try {
74
- await Instance.get().cache.start();
75
- await Instance.get().listener.start();
76
- await Promise.all(Object.values(Instance.get().dbs).map(async (db) => {
74
+ await _a.get().cache.start();
75
+ await _a.get().listener.start();
76
+ await Promise.all(Object.values(_a.get().dbs).map(async (db) => {
77
77
  await db.start();
78
78
  await db.startAllDbChanges();
79
79
  (0, exit_1.addWaitBeforeExit)(db.close);
80
80
  }));
81
- await Instance.get().eventBus.startSubscribers();
82
- (0, exit_1.addWaitBeforeExit)(Instance.get().cache.close);
81
+ await _a.get().eventBus.startSubscribers();
82
+ (0, exit_1.addWaitBeforeExit)(_a.get().cache.close);
83
83
  }
84
84
  catch (error) {
85
85
  (0, exit_1.exit)(`'Error starting connections: ${error}`);
package/lib/logger/index.js CHANGED
@@ -21,16 +21,16 @@ class ConsoleLogger extends Logger {
21
21
  _ConsoleLogger_log.set(this, console.log);
22
22
  }
23
23
  async error(...args) {
24
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.red(`[ERROR] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)} `, ...args));
24
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.red(`[ERROR] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)}`, ...args));
25
25
  }
26
26
  async success(...args) {
27
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.greenBright(`[SUCCESS] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)} `, ...args));
27
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.greenBright(`[SUCCESS] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)}`, ...args));
28
28
  }
29
29
  async info(...args) {
30
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.blueBright(`[INFO] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)} `, ...args));
30
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.blueBright(`[INFO] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)}`, ...args));
31
31
  }
32
32
  async warn(...args) {
33
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.yellow(`[WARNING] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)} `, ...args));
33
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.yellow(`[WARNING] ${__classPrivateFieldGet(this, _ConsoleLogger_instances, "m", _ConsoleLogger_getTime).call(this)}`, ...args));
34
34
  }
35
35
  }
36
36
  exports.ConsoleLogger = ConsoleLogger;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "equipped",
3
- "version": "4.1.21",
3
+ "version": "4.1.23",
4
4
  "private": false,
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -24,17 +24,17 @@
24
24
  "@types/express": "^4.17.17",
25
25
  "@types/express-fileupload": "^1.4.1",
26
26
  "@types/jsonwebtoken": "^9.0.2",
27
- "@types/morgan": "^1.9.4",
28
- "@types/node": "^20.5.0",
27
+ "@types/morgan": "^1.9.5",
28
+ "@types/node": "^20.5.6",
29
29
  "@types/pug": "^2.0.6",
30
30
  "@types/supertest": "^2.0.12",
31
- "@typescript-eslint/eslint-plugin": "^6.4.0",
32
- "@typescript-eslint/parser": "^6.4.0",
33
- "eslint": "^8.47.0",
31
+ "@typescript-eslint/eslint-plugin": "^6.4.1",
32
+ "@typescript-eslint/parser": "^6.4.1",
33
+ "eslint": "^8.48.0",
34
34
  "eslint-plugin-promise": "^6.1.1",
35
35
  "husky": "^8.0.3",
36
36
  "standard-version": "^9.5.0",
37
- "typescript": "^5.1.6"
37
+ "typescript": "^5.2.2"
38
38
  },
39
39
  "dependencies": {
40
40
  "amqp-connection-manager": "^4.1.14",
@@ -55,7 +55,7 @@
55
55
  "jsonwebtoken": "^9.0.1",
56
56
  "jwks-rsa": "^3.0.1",
57
57
  "kafkajs": "^2.2.4",
58
- "mongoose": "^7.4.3",
58
+ "mongoose": "^7.4.5",
59
59
  "mongoose-lean-defaults": "^2.2.1",
60
60
  "mongoose-lean-getters": "^1.1.0",
61
61
  "mongoose-lean-virtuals": "^0.9.1",
@@ -63,7 +63,7 @@
63
63
  "music-metadata": "^7.0.0",
64
64
  "path-to-regexp": "^6.2.1",
65
65
  "pug": "^3.0.2",
66
- "redis": "^4.6.7",
66
+ "redis": "^4.6.8",
67
67
  "socket.io": "4.7.2",
68
68
  "supertest": "^6.3.3",
69
69
  "valleyed": "4.2.1"