wsp-ms-core 1.0.82 → 1.0.83

package/dist/index.d.mts

@@ -355,7 +355,7 @@ declare class OutboxRecord {
     private _publishedAt;
     private _lastAttempt;
     private readonly _createdAt;
-    protected constructor(eventUuid: UUID, eventType: string, tenantUuid: UUID, aggregateUuid: UUID, aggregateType: string, topic: string, payload: string, status: ProcessStatus, attempts: number, errorMessage: string | undefined, publishedAt: DateTime | undefined, lastAttempt: DateTime | undefined, createdAt: DateTime);
+    protected constructor(eventUuid: UUID, eventType: string, tenantUuid: UUID, aggregateUuid: UUID, aggregateType: string, topic: string, payload: string, status: ProcessStatus, attempts: number, errorMessage: string | undefined, publishedAt: DateTime | undefined, lastAttempt: DateTime | undefined, createdAt?: DateTime);
     get eventUuid(): UUID;
     get tenantUuid(): UUID;
     get aggregateUuid(): UUID;
@@ -434,12 +434,18 @@ declare class BasicUnitOfWorkFactory {
     create(): Promise<BasicUnitOfWork>;
 }
 
+interface EventMessage {
+    topic: string;
+    producer: string;
+    tenant: UUID;
+    message: string;
+}
 interface EventManagerConnection {
     userName: string;
     password: string;
     brokers: string[];
 }
-type RouteCallback = (message: string) => void;
+type RouteCallback = (e: EventMessage) => void;
 interface RoutesCallbackList {
     [key: string]: RouteCallback;
 }
@@ -455,9 +461,9 @@ declare abstract class EventManager {
     protected _onCrash: CallableFunction | null;
     protected _onReconnect: CallableFunction | null;
     protected constructor(connection: EventManagerConnection);
-    protected execRoute(topic: string, message: string): Promise<void>;
+    protected execRoute(topic: string, event: EventMessage): Promise<void>;
     protected execCallback(callback: CallableFunction | null, data: any): Promise<void>;
-    abstract send(topic: string, message: string): void;
+    abstract send(event: EventMessage): void;
     abstract start(): void;
     abstract restart(): void;
     abstract stop(): void;
@@ -537,9 +543,9 @@ declare class ErrorManager {
 declare class EventBusMysqlRepository implements EventBusRepository {
     private readonly connection;
     constructor(connection: DatabaseConnection);
-    private eventToRowValues;
-    create(event: OutboxRecord): Promise<void>;
-    update(event: OutboxRecord): Promise<void>;
+    private recordToRowValues;
+    create(record: OutboxRecord): Promise<void>;
+    update(record: OutboxRecord): Promise<void>;
     listPending(limit: number): Promise<OutboxRecord[]>;
 }
 
@@ -559,7 +565,7 @@ declare class KafkaManager extends EventManager {
     private readonly producer;
     constructor(connection: EventManagerConnection);
     private run;
-    send(topic: string, message: string): Promise<void>;
+    send(e: EventMessage): Promise<void>;
     start(autocommit?: boolean): Promise<void>;
     pause(): Promise<void>;
     restart(): Promise<void>;

package/dist/index.d.ts

@@ -355,7 +355,7 @@ declare class OutboxRecord {
     private _publishedAt;
     private _lastAttempt;
     private readonly _createdAt;
-    protected constructor(eventUuid: UUID, eventType: string, tenantUuid: UUID, aggregateUuid: UUID, aggregateType: string, topic: string, payload: string, status: ProcessStatus, attempts: number, errorMessage: string | undefined, publishedAt: DateTime | undefined, lastAttempt: DateTime | undefined, createdAt: DateTime);
+    protected constructor(eventUuid: UUID, eventType: string, tenantUuid: UUID, aggregateUuid: UUID, aggregateType: string, topic: string, payload: string, status: ProcessStatus, attempts: number, errorMessage: string | undefined, publishedAt: DateTime | undefined, lastAttempt: DateTime | undefined, createdAt?: DateTime);
     get eventUuid(): UUID;
     get tenantUuid(): UUID;
     get aggregateUuid(): UUID;
@@ -434,12 +434,18 @@ declare class BasicUnitOfWorkFactory {
     create(): Promise<BasicUnitOfWork>;
 }
 
+interface EventMessage {
+    topic: string;
+    producer: string;
+    tenant: UUID;
+    message: string;
+}
 interface EventManagerConnection {
     userName: string;
     password: string;
     brokers: string[];
 }
-type RouteCallback = (message: string) => void;
+type RouteCallback = (e: EventMessage) => void;
 interface RoutesCallbackList {
     [key: string]: RouteCallback;
 }
@@ -455,9 +461,9 @@ declare abstract class EventManager {
     protected _onCrash: CallableFunction | null;
     protected _onReconnect: CallableFunction | null;
     protected constructor(connection: EventManagerConnection);
-    protected execRoute(topic: string, message: string): Promise<void>;
+    protected execRoute(topic: string, event: EventMessage): Promise<void>;
     protected execCallback(callback: CallableFunction | null, data: any): Promise<void>;
-    abstract send(topic: string, message: string): void;
+    abstract send(event: EventMessage): void;
     abstract start(): void;
     abstract restart(): void;
     abstract stop(): void;
@@ -537,9 +543,9 @@ declare class ErrorManager {
 declare class EventBusMysqlRepository implements EventBusRepository {
     private readonly connection;
     constructor(connection: DatabaseConnection);
-    private eventToRowValues;
-    create(event: OutboxRecord): Promise<void>;
-    update(event: OutboxRecord): Promise<void>;
+    private recordToRowValues;
+    create(record: OutboxRecord): Promise<void>;
+    update(record: OutboxRecord): Promise<void>;
     listPending(limit: number): Promise<OutboxRecord[]>;
 }
 
@@ -559,7 +565,7 @@ declare class KafkaManager extends EventManager {
     private readonly producer;
     constructor(connection: EventManagerConnection);
     private run;
-    send(topic: string, message: string): Promise<void>;
+    send(e: EventMessage): Promise<void>;
     start(autocommit?: boolean): Promise<void>;
     pause(): Promise<void>;
     restart(): Promise<void>;

package/dist/index.js

@@ -1090,9 +1090,9 @@ var EventManager = class {
     this._onCrash = null;
     this._onReconnect = null;
   }
-  async execRoute(topic, message) {
+  async execRoute(topic, event) {
     if (this._callbackList[topic]) {
-      await this._callbackList[topic](message);
+      await this._callbackList[topic](event);
     }
   }
   async execCallback(callback, data) {
@@ -1148,7 +1148,7 @@ var OutboxRecord = class _OutboxRecord {
     this._errorMessage = errorMessage;
     this._publishedAt = publishedAt;
     this._lastAttempt = lastAttempt;
-    this._createdAt = createdAt;
+    this._createdAt = createdAt ?? DateTime.now();
   }
   get eventUuid() {
     return this._eventUuid;
@@ -1246,25 +1246,25 @@ var EventBusMysqlRepository = class {
   constructor(connection) {
     this.connection = connection;
   }
-  eventToRowValues(e) {
+  recordToRowValues(record) {
     return [
-      e.eventUuid.value,
-      e.eventType,
-      e.tenantUuid.value,
-      e.aggregateUuid.value,
-      e.aggregateType,
-      e.topic,
-      e.payload,
-      e.status.value,
-      e.attempts,
-      e.errorMessage,
-      e.publishedAt?.value,
-      e.lastAttempt?.value,
-      e.createdAt.value
+      record.eventUuid.value,
+      record.eventType,
+      record.tenantUuid.value,
+      record.aggregateUuid.value,
+      record.aggregateType,
+      record.topic,
+      record.payload,
+      record.status.value,
+      record.attempts,
+      record.errorMessage,
+      record.publishedAt?.value,
+      record.lastAttempt?.value,
+      record.createdAt.value
     ];
   }
-  async create(event) {
-    const values = this.eventToRowValues(event);
+  async create(record) {
+    const values = this.recordToRowValues(record);
     await this.connection.query(
       `INSERT INTO events_outbox (event_uuid, event_type, tenant_uuid, aggregate_uuid, aggregate_type, topic, 
                            payload, status, attempts, error_message, published_at, last_attempt, created_at)
@@ -1272,8 +1272,8 @@ var EventBusMysqlRepository = class {
       values
     );
   }
-  async update(event) {
-    const values = [event.status.value, event.attempts, event.errorMessage, event.publishedAt?.value, event.lastAttempt?.value, event.eventUuid.value];
+  async update(record) {
+    const values = [record.status.value, record.attempts, record.errorMessage, record.publishedAt?.value, record.lastAttempt?.value, record.eventUuid.value];
     await this.connection.query(
       `UPDATE events_outbox
              SET status          = ?,
@@ -1287,7 +1287,7 @@ var EventBusMysqlRepository = class {
   }
   async listPending(limit) {
     const result = await this.connection.query(
-      `SELECT * FROM events_outbox WHERE status IN ('PENDING','FAILED') AND published_at IS NULL LIMIT 50`,
+      `SELECT * FROM events_outbox WHERE status IN ('PENDING','FAILED') AND published_at IS NULL LIMIT ${limit}`,
       []
     );
     return result.length > 0 ? result.map((r) => OutboxRecord.reconstitute(r)) : [];
@@ -1484,7 +1484,13 @@ var KafkaManager = class extends EventManager {
         eachMessage: async ({ topic, partition, message, heartbeat }) => {
           try {
             await this.execCallback(this._onMessage, `[New message detected for ${topic}]: ${message.value?.toString()}`);
-            await this.execRoute(topic, String(message.value?.toString()));
+            const json = JSON.parse(String(message.value?.toString()));
+            await this.execRoute(topic, {
+              topic: String(json.topic),
+              producer: String(json.producer),
+              tenant: UUID.create(String(json.tenant)),
+              message: String(json.message)
+            });
             const next = (BigInt(message.offset) + 1n).toString();
             await this.consumer.commitOffsets([{ topic, partition, offset: next }]);
             await heartbeat();
@@ -1500,11 +1506,12 @@ var KafkaManager = class extends EventManager {
       await this.execCallback(this._onError, new InternalError(ErrorManager.APP_ERRORS.PROCESS, error.toString()));
     }
   }
-  async send(topic, message) {
+  async send(e) {
     const evt = {
       date: DateTime.now().value,
-      producer: process.env.NAME && process.env.ENVIRONMENT ? `${process.env.NAME}-${process.env.ENVIRONMENT}` : "unknown",
-      data: message
+      tenant: e.tenant.value,
+      producer: e.producer,
+      data: e.message
     };
     try {
       if (!this.producer) {
@@ -1512,7 +1519,7 @@ var KafkaManager = class extends EventManager {
       }
       await this.producer.connect();
       await this.producer.send({
-        topic,
+        topic: e.topic,
         messages: [{ value: JSON.stringify(evt) }]
       });
       await this.producer.disconnect();
@@ -1640,7 +1647,12 @@ var DefaultMysqlOutboxRunner = class {
     try {
       e.markProcessing();
       await eventBusRepository.update(e);
-      await this.eventManager.send(e.topic, e.payload);
+      await this.eventManager.send({
+        topic: e.topic,
+        producer: process.env.NAME && process.env.ENVIRONMENT ? `${process.env.NAME}-${process.env.ENVIRONMENT}` : "unknown",
+        tenant: e.tenantUuid,
+        message: e.payload
+      });
       e.markProcessed();
     } catch (error) {
       const type = String(error.type);