@aitickets123654/common-kafka 1.0.29 → 1.0.31

package/build/events/base-listener.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Listener = void 0;
+const registry_1 = require("./config/registry");
 class Listener {
     constructor(consumer) {
         this.consumer = consumer;
@@ -15,13 +16,11 @@ class Listener {
         await this.consumer.run({
             eachBatchAutoResolve: false, // Отключаем автокоммиты — всё контролируем вручную
             eachBatch: async ({ batch, resolveOffset, heartbeat, commitOffsetsIfNecessary, uncommittedOffsets, }) => {
-                var _a;
                 const { topic, partition } = batch;
                 let lastProcessedOffset = null; // запоминаем, до какого оффсета дошли
                 try {
                     for (const message of batch.messages) {
-                        const offset = message.offset;
-                        const value = (_a = message.value) === null || _a === void 0 ? void 0 : _a.toString();
+                        const { offset, value } = message;
                         // Пустое сообщение — пропускаем и фиксируем
                         if (!value) {
                             resolveOffset(offset);
@@ -30,10 +29,10 @@ class Listener {
                         }
                         let data;
                         try {
-                            data = JSON.parse(value);
+                            data = await registry_1.registry.decode(value);
                         }
                         catch (err) {
-                            console.error(`Невалидный JSON ${topic}/${partition}@${offset}`, err);
+                            console.error(`Avro decode failed for ${topic}/${partition}@${offset}`, err);
                             resolveOffset(offset); // не мешает прогрессу
                             lastProcessedOffset = offset;
                             continue;
@@ -47,7 +46,7 @@ class Listener {
                             await heartbeat();
                         }
                         catch (err) {
-                            console.warn(`Ошибка при обработке ${topic}/${partition}@${offset}:`, err);
+                            console.warn(`Error processing ${topic}/${partition}@${offset}:`, err);
                             // Откатываемся на оффсет с ошибкой
                             // Kafka при следующем цикле снова отдаст это сообщение
                             this.consumer.seek({ topic, partition, offset });
@@ -68,7 +67,7 @@ class Listener {
                         }
                     }
                     catch (commitErr) {
-                        console.error(`commitOffsetsIfNecessary не сработал (${topic}/${partition})`, commitErr);
+                        console.error(`commitOffsetsIfNecessary failed (${topic}/${partition})`, commitErr);
                     }
                 }
             },

package/build/events/base-publisher.js

@@ -1,45 +1,24 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Publisher = void 0;
+const registry_1 = require("./config/registry");
+const schema_ids_json_1 = __importDefault(require("./config/schema-ids.json"));
 class Publisher {
-    // protected admin: Admin;
-    constructor(producer /*, admin: Admin*/) {
+    constructor(producer) {
         this.producer = producer;
-        // this.admin = admin;
     }
-    // private async ensureTopicExists(): Promise<void> {
-    //   try {
-    //     const topics = await this.admin.listTopics();
-    //     if (!topics.includes(this.topic)) {
-    //       await this.admin.createTopics({
-    //         topics: [
-    //           {
-    //             topic: this.topic,
-    //             numPartitions: 2,
-    //             replicationFactor: 1,
-    //           },
-    //         ],
-    //         waitForLeaders: true,
-    //         validateOnly: false,
-    //         timeout: 5000,
-    //       });
-    //       // console.log(`Topic '${this.topic}' created`);
-    //     } else {
-    //       // console.log(`Topic '${this.topic}' already exists`);
-    //     }
-    //   } catch (err) {
-    //     console.error(`Failed to ensure topic '${this.topic}':`, err);
-    //     throw err;
-    //   }
-    // }
     async publish(data) {
-        // await this.ensureTopicExists();
         try {
+            const schemaId = schema_ids_json_1.default[`${this.topic}-value`];
+            const encoded = await registry_1.registry.encode(schemaId, data);
             await this.producer.send({
                 topic: this.topic,
-                messages: [{ value: JSON.stringify(data) }],
+                messages: [{ value: encoded }],
             });
-            // console.log(`Event published to topic '${this.topic}'`, `\ndata: ${JSON.stringify(data, null, 2)}`);
+            console.log(`Event published to topic '${this.topic}'`);
         }
         catch (err) {
             console.error('Failed to publish event:', err);

package/build/events/config/registry.d.ts

@@ -0,0 +1,2 @@
+import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
+export declare const registry: SchemaRegistry;

package/build/events/config/registry.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registry = void 0;
+const confluent_schema_registry_1 = require("@kafkajs/confluent-schema-registry");
+exports.registry = new confluent_schema_registry_1.SchemaRegistry({
+    host: process.env.SCHEMA_REGISTRY_URL || 'http://schema-registry:8081',
+});

package/build/events/config/schema-ids.json

@@ -0,0 +1,8 @@
+{
+    "tickets.ticket.updated.v1-value": 1,
+    "tickets.ticket.created.v1-value": 2,
+    "payments.payment.created.v1-value": 3,
+    "orders.order.created.v1-value": 4,
+    "orders.order.cancelled.v1-value": 5,
+    "expiration.expiration.complete.v1-value": 6
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aitickets123654/common-kafka",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -20,6 +20,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
+    "@kafkajs/confluent-schema-registry": "^3.9.0",
     "@types/cookie-session": "^2.0.49",
     "@types/express": "^4.17.3",
     "@types/jsonwebtoken": "^9.0.9",

package/build/events/types/order-status.d.ts

@@ -1 +0,0 @@
-export type OrderStatus = 'created' | 'cancelled' | 'awaiting_payment' | 'complete';

package/build/events/types/order-status.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });