equipped 4.1.0 → 4.1.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.1.2](https://github.com/kevinand11/equipped/compare/v4.1.1...v4.1.2) (2023-03-11)
+
+### [4.1.1](https://github.com/kevinand11/equipped/compare/v4.1.0...v4.1.1) (2023-03-10)
+
 ## [4.1.0](https://github.com/kevinand11/equipped/compare/v4.0.2-alpha.3...v4.1.0) (2023-03-07)
 
 

package/lib/db/debezium.js

@@ -4,6 +4,9 @@ exports.DefaultDebeziumSetup = exports.TopicPrefix = void 0;
 exports.TopicPrefix = 'equipped';
 exports.DefaultDebeziumSetup = {
     'topic.prefix': exports.TopicPrefix,
+    'topic.creation.enable': 'false',
+    'topic.creation.default.replication.factor': '1',
+    'topic.creation.default.partitions': '1',
     'key.converter': 'org.apache.kafka.connect.json.JsonConverter',
     'key.converter.schemas.enable': 'false',
     'value.converter': 'org.apache.kafka.connect.json.JsonConverter',

package/lib/db/mongoose/changes.js

@@ -39,7 +39,7 @@ class MongoDbChange extends _instance_1.DbChange {
         const colName = model.collection.name;
         const dbColName = `${dbName}.${colName}`;
         const topic = `${debezium_1.TopicPrefix}.${dbColName}`;
-        (0, retry_1.retry)(async () => {
+        await (0, retry_1.retry)(async () => {
             const { hosts, replicaSet, credentials } = model.collection.conn.getClient().options;
             const started = await this._setup(topic, {
                 'connector.class': 'io.debezium.connector.mongodb.MongoDbConnector',
@@ -53,45 +53,43 @@ class MongoDbChange extends _instance_1.DbChange {
                 'collection.include.list': dbColName
             });
             const TestId = new mongoose_1.default.Types.ObjectId('__equipped__');
+            const hydrate = (data) => model.hydrate({
+                ...data, _id: new mongoose_1.default.Types.ObjectId(data._id['$oid'])
+            }).toObject({ getters: true, virtuals: true });
+            instance_1.Instance.get().eventBus.createSubscriber(topic, async (data) => {
+                const op = data.op;
+                let before = JSON.parse(data.before ?? 'null');
+                let after = JSON.parse(data.after ?? 'null');
+                if (before)
+                    before = hydrate(before);
+                if (after)
+                    after = hydrate(after);
+                if (before?.__id === TestId || after?.__id === TestId)
+                    return;
+                if (op === 'c' && this.callbacks.created && after)
+                    await this.callbacks.created({
+                        before: null,
+                        after: this.mapper(after)
+                    });
+                else if (op === 'u' && this.callbacks.updated && before)
+                    await this.callbacks.updated({
+                        before: this.mapper(before),
+                        after: this.mapper(after),
+                        changes: validations_1.Validation.Differ.from(validations_1.Validation.Differ.diff(before, after))
+                    });
+                else if (op === 'd' && this.callbacks.deleted && before)
+                    await this.callbacks.deleted({
+                        before: this.mapper(before),
+                        after: null
+                    });
+            });
             if (!started) {
                 await model.findByIdAndUpdate(TestId, { $set: { colName } }, { upsert: true });
                 await model.findByIdAndDelete(TestId);
-                throw new Error(`Wait a few minutes for db changes for ${colName} to initialize...`);
+                await instance_1.Instance.get().logger.warn(`Waiting for db changes for ${dbColName} to start...`);
+                throw new Error(`Wait a few minutes for db changes for ${dbColName} to initialize...`);
             }
-            const hydrate = (data) => model.hydrate({
-                ...data, _id: new mongoose_1.default.Types.ObjectId(data._id['$oid'])
-            }).toObject({ getters: true, virtuals: true });
-            if (started)
-                await instance_1.Instance.get().eventBus
-                    .createSubscriber(topic, async (data) => {
-                    const op = data.op;
-                    let before = JSON.parse(data.before ?? 'null');
-                    let after = JSON.parse(data.after ?? 'null');
-                    if (before?.__id === TestId || after?.__id === TestId)
-                        return;
-                    if (before)
-                        before = hydrate(before);
-                    if (after)
-                        after = hydrate(after);
-                    if (op === 'c' && this.callbacks.created && after)
-                        await this.callbacks.created({
-                            before: null,
-                            after: this.mapper(after)
-                        });
-                    else if (op === 'u' && this.callbacks.updated && before)
-                        await this.callbacks.updated({
-                            before: this.mapper(before),
-                            after: this.mapper(after),
-                            changes: validations_1.Validation.Differ.from(validations_1.Validation.Differ.diff(before, after))
-                        });
-                    else if (op === 'd' && this.callbacks.deleted && before)
-                        await this.callbacks.deleted({
-                            before: this.mapper(before),
-                            after: null
-                        });
-                })
-                    .subscribe();
-        }, 10, 60000)
+        }, 5, 60000)
             .catch((err) => (0, exit_1.exit)(err.message));
     }
 }

package/lib/listeners/emitter.d.ts

@@ -13,9 +13,9 @@ export declare class Listener {
     #private;
     constructor(socket: io.Server, callers: SocketCallers);
     start(): Promise<void>;
-    created(channel: string, data: BaseEntity): Promise<void>;
-    updated(channel: string, data: BaseEntity): Promise<void>;
-    deleted(channel: string, data: BaseEntity): Promise<void>;
+    created(channels: string[], data: BaseEntity): Promise<void>;
+    updated(channels: string[], data: BaseEntity): Promise<void>;
+    deleted(channels: string[], data: BaseEntity): Promise<void>;
     set callers(callers: SocketCallers);
     register(channel: string, onJoin?: OnJoinFn): this;
 }

package/lib/listeners/emitter.js

@@ -100,14 +100,14 @@ class Listener {
     async start() {
         await __classPrivateFieldGet(this, _Listener_subscriber, "f").subscribe();
     }
-    async created(channel, data) {
-        await __classPrivateFieldGet(this, _Listener_instances, "m", _Listener_emit).call(this, channel, EmitTypes.created, data);
+    async created(channels, data) {
+        await __classPrivateFieldGet(this, _Listener_instances, "m", _Listener_emit).call(this, channels, EmitTypes.created, data);
     }
-    async updated(channel, data) {
-        await __classPrivateFieldGet(this, _Listener_instances, "m", _Listener_emit).call(this, channel, EmitTypes.updated, data);
+    async updated(channels, data) {
+        await __classPrivateFieldGet(this, _Listener_instances, "m", _Listener_emit).call(this, channels, EmitTypes.updated, data);
     }
-    async deleted(channel, data) {
-        await __classPrivateFieldGet(this, _Listener_instances, "m", _Listener_emit).call(this, channel, EmitTypes.deleted, data);
+    async deleted(channels, data) {
+        await __classPrivateFieldGet(this, _Listener_instances, "m", _Listener_emit).call(this, channels, EmitTypes.deleted, data);
     }
     set callers(callers) {
         __classPrivateFieldSet(this, _Listener_callers, callers, "f");
@@ -134,7 +134,9 @@ _Listener_socket = new WeakMap(), _Listener_callers = new WeakMap(), _Listener_r
         onJoin: __classPrivateFieldGet(this, _Listener_routes, "f")[matchedChannel],
         params: JSON.parse(JSON.stringify(match.params))
     };
-}, _Listener_emit = async function _Listener_emit(channel, type, data) {
-    const emitData = { channel, type, data };
-    __classPrivateFieldGet(this, _Listener_publisher, "f").publish(emitData);
+}, _Listener_emit = async function _Listener_emit(channels, type, data) {
+    await Promise.all(channels.map(async (channel) => {
+        const emitData = { channel, type, data };
+        await __classPrivateFieldGet(this, _Listener_publisher, "f").publish(emitData);
+    }));
 };

package/lib/logger/index.js

@@ -4,9 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _ConsoleLogger_log;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLogger = exports.Logger = void 0;
+const chalk_1 = __importDefault(require("chalk"));
 class Logger {
 }
 exports.Logger = Logger;
@@ -16,16 +20,16 @@ class ConsoleLogger extends Logger {
         _ConsoleLogger_log.set(this, console.log);
     }
     async error(...args) {
-        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:ERROR:', ...args);
+        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.red('ERROR:', ...args));
     }
     async success(...args) {
-        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:SUCCESS:', ...args);
+        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.greenBright('SUCCESS:', ...args));
     }
     async info(...args) {
-        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:INFO:', ...args);
+        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.blueBright('INFO:', ...args));
     }
     async warn(...args) {
-        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, 'LOG:WARN:', ...args);
+        __classPrivateFieldGet(this, _ConsoleLogger_log, "f").call(this, chalk_1.default.yellow('WARNING:', ...args));
     }
 }
 exports.ConsoleLogger = ConsoleLogger;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "4.1.0",
+	"version": "4.1.2",
 	"private": false,
 	"description": "",
 	"main": "lib/index.js",
@@ -42,6 +42,7 @@
 		"axios": "^1.3.4",
 		"bcryptjs": "^2.4.3",
 		"bull": "^4.10.4",
+		"chalk": "^4.1.2",
 		"compression": "^1.7.4",
 		"cookie-parser": "^1.4.6",
 		"cors": "^2.8.5",