equipped 4.1.0 → 4.1.1

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 (5) hide show
  1. package/CHANGELOG.md +2 -0
  2. package/lib/db/debezium.js +3 -0
  3. package/lib/db/mongoose/changes.js +34 -36
  4. package/lib/logger/index.js +8 -4
  5. package/package.json +2 -1
package/CHANGELOG.md CHANGED
@@ -2,6 +2,8 @@
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.1](https://github.com/kevinand11/equipped/compare/v4.1.0...v4.1.1) (2023-03-10)
6
+
5
7
  ## [4.1.0](https://github.com/kevinand11/equipped/compare/v4.0.2-alpha.3...v4.1.0) (2023-03-07)
6
8
 
7
9
 
package/lib/db/debezium.js CHANGED
@@ -4,6 +4,9 @@ exports.DefaultDebeziumSetup = exports.TopicPrefix = void 0;
4
4
  exports.TopicPrefix = 'equipped';
5
5
  exports.DefaultDebeziumSetup = {
6
6
  'topic.prefix': exports.TopicPrefix,
7
+ 'topic.creation.enable': 'false',
8
+ 'topic.creation.default.replication.factor': '1',
9
+ 'topic.creation.default.partitions': '1',
7
10
  'key.converter': 'org.apache.kafka.connect.json.JsonConverter',
8
11
  'key.converter.schemas.enable': 'false',
9
12
  'value.converter': 'org.apache.kafka.connect.json.JsonConverter',
package/lib/db/mongoose/changes.js CHANGED
@@ -39,7 +39,7 @@ class MongoDbChange extends _instance_1.DbChange {
39
39
  const colName = model.collection.name;
40
40
  const dbColName = `${dbName}.${colName}`;
41
41
  const topic = `${debezium_1.TopicPrefix}.${dbColName}`;
42
- (0, retry_1.retry)(async () => {
42
+ await (0, retry_1.retry)(async () => {
43
43
  const { hosts, replicaSet, credentials } = model.collection.conn.getClient().options;
44
44
  const started = await this._setup(topic, {
45
45
  'connector.class': 'io.debezium.connector.mongodb.MongoDbConnector',
@@ -53,45 +53,43 @@ class MongoDbChange extends _instance_1.DbChange {
53
53
  'collection.include.list': dbColName
54
54
  });
55
55
  const TestId = new mongoose_1.default.Types.ObjectId('__equipped__');
56
+ const hydrate = (data) => model.hydrate({
57
+ ...data, _id: new mongoose_1.default.Types.ObjectId(data._id['$oid'])
58
+ }).toObject({ getters: true, virtuals: true });
59
+ instance_1.Instance.get().eventBus.createSubscriber(topic, async (data) => {
60
+ const op = data.op;
61
+ let before = JSON.parse(data.before ?? 'null');
62
+ let after = JSON.parse(data.after ?? 'null');
63
+ if (before)
64
+ before = hydrate(before);
65
+ if (after)
66
+ after = hydrate(after);
67
+ if (before?.__id === TestId || after?.__id === TestId)
68
+ return;
69
+ if (op === 'c' && this.callbacks.created && after)
70
+ await this.callbacks.created({
71
+ before: null,
72
+ after: this.mapper(after)
73
+ });
74
+ else if (op === 'u' && this.callbacks.updated && before)
75
+ await this.callbacks.updated({
76
+ before: this.mapper(before),
77
+ after: this.mapper(after),
78
+ changes: validations_1.Validation.Differ.from(validations_1.Validation.Differ.diff(before, after))
79
+ });
80
+ else if (op === 'd' && this.callbacks.deleted && before)
81
+ await this.callbacks.deleted({
82
+ before: this.mapper(before),
83
+ after: null
84
+ });
85
+ });
56
86
  if (!started) {
57
87
  await model.findByIdAndUpdate(TestId, { $set: { colName } }, { upsert: true });
58
88
  await model.findByIdAndDelete(TestId);
59
- throw new Error(`Wait a few minutes for db changes for ${colName} to initialize...`);
89
+ await instance_1.Instance.get().logger.warn(`Waiting for db changes for ${dbColName} to start...`);
90
+ throw new Error(`Wait a few minutes for db changes for ${dbColName} to initialize...`);
60
91
  }
61
- const hydrate = (data) => model.hydrate({
62
- ...data, _id: new mongoose_1.default.Types.ObjectId(data._id['$oid'])
63
- }).toObject({ getters: true, virtuals: true });
64
- if (started)
65
- await instance_1.Instance.get().eventBus
66
- .createSubscriber(topic, async (data) => {
67
- const op = data.op;
68
- let before = JSON.parse(data.before ?? 'null');
69
- let after = JSON.parse(data.after ?? 'null');
70
- if (before?.__id === TestId || after?.__id === TestId)
71
- return;
72
- if (before)
73
- before = hydrate(before);
74
- if (after)
75
- after = hydrate(after);
76
- if (op === 'c' && this.callbacks.created && after)
77
- await this.callbacks.created({
78
- before: null,
79
- after: this.mapper(after)
80
- });
81
- else if (op === 'u' && this.callbacks.updated && before)
82
- await this.callbacks.updated({
83
- before: this.mapper(before),
84
- after: this.mapper(after),
85
- changes: validations_1.Validation.Differ.from(validations_1.Validation.Differ.diff(before, after))
86
- });
87
- else if (op === 'd' && this.callbacks.deleted && before)
88
- await this.callbacks.deleted({
89
- before: this.mapper(before),
90
- after: null
91
- });
92
- })
93
- .subscribe();
94
- }, 10, 60000)
92
+ }, 5, 60000)
95
93
  .catch((err) => (0, exit_1.exit)(err.message));
96
94
  }
97
95
  }
package/lib/logger/index.js CHANGED
@@ -4,9 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
4
4
  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
5
5
  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
6
6
  };
7
+ var __importDefault = (this && this.__importDefault) || function (mod) {
8
+ return (mod && mod.__esModule) ? mod : { "default": mod };
9
+ };
7
10
  var _ConsoleLogger_log;
8
11
  Object.defineProperty(exports, "__esModule", { value: true });
9
12
  exports.ConsoleLogger = exports.Logger = void 0;
13
+ const chalk_1 = __importDefault(require("chalk"));
10
14
  class Logger {
11
15
  }
12
16
  exports.Logger = Logger;
@@ -16,16 +20,16 @@ class ConsoleLogger extends Logger {
16
20
  _ConsoleLogger_log.set(this, console.log);
17
21
  }
18
22
  async error(...args) {
19
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:ERROR:', ...args);
23
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.red('ERROR:', ...args));
20
24
  }
21
25
  async success(...args) {
22
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:SUCCESS:', ...args);
26
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.greenBright('SUCCESS:', ...args));
23
27
  }
24
28
  async info(...args) {
25
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:INFO:', ...args);
29
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.blueBright('INFO:', ...args));
26
30
  }
27
31
  async warn(...args) {
28
- __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:WARN:', ...args);
32
+ __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.yellow('WARNING:', ...args));
29
33
  }
30
34
  }
31
35
  exports.ConsoleLogger = ConsoleLogger;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "equipped",
3
- "version": "4.1.0",
3
+ "version": "4.1.1",
4
4
  "private": false,
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -42,6 +42,7 @@
42
42
  "axios": "^1.3.4",
43
43
  "bcryptjs": "^2.4.3",
44
44
  "bull": "^4.10.4",
45
+ "chalk": "^4.1.2",
45
46
  "compression": "^1.7.4",
46
47
  "cookie-parser": "^1.4.6",
47
48
  "cors": "^2.8.5",