equipped 4.1.22 → 4.2.0

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 (7) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/lib/bull/index.js +2 -2
  3. package/lib/db/mongoose/query.js +3 -1
  4. package/lib/instance/index.js +10 -10
  5. package/lib/structure/baseEntity.d.ts +1 -0
  6. package/lib/structure/baseEntity.js +1 -0
  7. package/package.json +14 -14
package/CHANGELOG.md CHANGED
@@ -2,6 +2,20 @@
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.2.0](https://github.com/kevinand11/equipped/compare/v4.1.23...v4.2.0) (2023-09-06)
6
+
7
+
8
+ ### Features
9
+
10
+ * add type for base entity ([0f54bc8](https://github.com/kevinand11/equipped/commit/0f54bc8fe424d595f37003c27b668e64440b783f))
11
+
12
+ ### [4.1.23](https://github.com/kevinand11/equipped/compare/v4.1.22...v4.1.23) (2023-08-25)
13
+
14
+
15
+ ### Bug Fixes
16
+
17
+ * don't return db error from querying ([6eb6915](https://github.com/kevinand11/equipped/commit/6eb6915a77ff508d36c0c349d053dd012aed2020))
18
+
5
19
  ### [4.1.22](https://github.com/kevinand11/equipped/compare/v4.1.21...v4.1.22) (2023-08-25)
6
20
 
7
21
 
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));
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/structure/baseEntity.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  export declare class BaseEntity {
2
2
  hash: string;
3
3
  ignoreInJSON: string[];
4
+ __type: string;
4
5
  constructor();
5
6
  toJSON(): Record<string, any>;
6
7
  }
package/lib/structure/baseEntity.js CHANGED
@@ -13,6 +13,7 @@ const deleteKeyFromObject = (obj, keys) => {
13
13
  class BaseEntity {
14
14
  constructor() {
15
15
  this.ignoreInJSON = [];
16
+ this.__type = this.constructor.name;
16
17
  this.hash = utils_1.Random.string();
17
18
  }
18
19
  toJSON() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "equipped",
3
- "version": "4.1.22",
3
+ "version": "4.2.0",
4
4
  "private": false,
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -18,28 +18,28 @@
18
18
  "@commitlint/cli": "^17.7.1",
19
19
  "@commitlint/config-conventional": "^17.7.0",
20
20
  "@types/amqplib": "^0.10.1",
21
- "@types/bcryptjs": "^2.4.2",
21
+ "@types/bcryptjs": "^2.4.3",
22
22
  "@types/bull": "^3.15.9",
23
- "@types/cors": "^2.8.13",
23
+ "@types/cors": "^2.8.14",
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.9",
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.6.0",
32
+ "@typescript-eslint/parser": "^6.6.0",
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",
41
41
  "amqplib": "^0.10.3",
42
- "axios": "^1.4.0",
42
+ "axios": "^1.5.0",
43
43
  "bcryptjs": "^2.4.3",
44
44
  "bull": "^4.11.3",
45
45
  "chalk": "^4.1.2",
@@ -49,13 +49,13 @@
49
49
  "dotenv": "^16.3.1",
50
50
  "express": "^4.18.2",
51
51
  "express-fileupload": "^1.4.0",
52
- "express-rate-limit": "^6.9.0",
52
+ "express-rate-limit": "^6.11.0",
53
53
  "express-slow-down": "^1.6.0",
54
54
  "helmet": "^7.0.0",
55
- "jsonwebtoken": "^9.0.1",
55
+ "jsonwebtoken": "^9.0.2",
56
56
  "jwks-rsa": "^3.0.1",
57
57
  "kafkajs": "^2.2.4",
58
- "mongoose": "^7.4.3",
58
+ "mongoose": "^7.5.0",
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"