@mereb/shared-packages 0.0.32 → 0.0.34

package/dist/messaging/kafka.d.ts

@@ -1,6 +1,25 @@
-import { Kafka, type KafkaConfig, type Producer, type Consumer } from 'kafkajs';
+import { type Consumer, Kafka, type KafkaConfig, type Producer } from 'kafkajs';
 export declare function getKafka(config: KafkaConfig): Kafka;
 export declare function getProducer(config: KafkaConfig): Promise<Producer>;
 export declare function createConsumer(config: KafkaConfig, groupId: string): Promise<Consumer>;
+export type KafkaEnvConfigOptions = {
+    /**
+     * Override clientId; defaults to process.env.KAFKA_CLIENT_ID or 'app'
+     */
+    clientId?: string;
+    /**
+     * Environment variable to read brokers from; defaults to KAFKA_BROKERS
+     */
+    brokersEnvVar?: string;
+    /**
+     * Default value when env KAFKA_SSL is not set
+     */
+    sslDefault?: boolean;
+    /**
+     * Default value when env KAFKA_SSL_INSECURE is not set
+     */
+    sslInsecureDefault?: boolean;
+};
+export declare function buildKafkaConfigFromEnv(opts?: KafkaEnvConfigOptions): KafkaConfig | null;
 export declare function disconnectProducer(): Promise<void>;
 //# sourceMappingURL=kafka.d.ts.map

package/dist/messaging/kafka.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kafka.d.ts","sourceRoot":"","sources":["../../src/messaging/kafka.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKhF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,SAK3C;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAMxE;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAK5F;AAED,wBAAsB,kBAAkB,kBAKvC"}
+{"version":3,"file":"kafka.d.ts","sourceRoot":"","sources":["../../src/messaging/kafka.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,QAAQ,EAAE,KAAK,EAAE,KAAK,WAAW,EAAgB,KAAK,QAAQ,EAAC,MAAM,SAAS,CAAC;AAK5F,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,SAG3C;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CASxE;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAK5F;AAED,MAAM,MAAM,qBAAqB,GAAG;IAChC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,wBAAgB,uBAAuB,CACnC,IAAI,GAAE,qBAA0B,GACjC,WAAW,GAAG,IAAI,CA8BpB;AAED,wBAAsB,kBAAkB,kBAKvC"}

package/dist/messaging/kafka.js

@@ -1,15 +1,16 @@
-import { Kafka } from 'kafkajs';
+import { Kafka, Partitioners } from 'kafkajs';
 let kafkaInstance;
 let producerInstance;
 export function getKafka(config) {
-    if (!kafkaInstance) {
-        kafkaInstance = new Kafka(config);
-    }
+    kafkaInstance ??= new Kafka(config);
     return kafkaInstance;
 }
 export async function getProducer(config) {
     if (!producerInstance) {
-        producerInstance = getKafka(config).producer();
+        // Use legacy partitioner to avoid warning and retain old hashing behaviour
+        producerInstance = getKafka(config).producer({
+            createPartitioner: Partitioners.LegacyPartitioner
+        });
         await producerInstance.connect();
     }
     return producerInstance;
@@ -20,6 +21,30 @@ export async function createConsumer(config, groupId) {
     await consumer.connect();
     return consumer;
 }
+export function buildKafkaConfigFromEnv(opts = {}) {
+    const brokersEnv = opts.brokersEnvVar ?? 'KAFKA_BROKERS';
+    const brokersRaw = process.env[brokersEnv] ?? '';
+    const brokers = brokersRaw
+        .split(',')
+        .map((b) => b.trim())
+        .filter(Boolean);
+    if (brokers.length === 0) {
+        return null;
+    }
+    const clientId = opts.clientId ?? process.env.KAFKA_CLIENT_ID ?? 'app';
+    const sslEnabled = (process.env.KAFKA_SSL ?? String(opts.sslDefault ?? false)) === 'true';
+    const sslInsecure = (process.env.KAFKA_SSL_INSECURE ?? String(opts.sslInsecureDefault ?? false)) ===
+        'true';
+    return {
+        clientId,
+        brokers,
+        ssl: sslEnabled
+            ? {
+                rejectUnauthorized: !sslInsecure
+            }
+            : undefined
+    };
+}
 export async function disconnectProducer() {
     if (producerInstance) {
         await producerInstance.disconnect();

package/dist/transports/splunk-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"splunk-transport.d.ts","sourceRoot":"","sources":["../../src/transports/splunk-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,yBAAyB,CAAC;AAG5C,KAAK,sBAAsB,GAAG;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAgCF,wBAA8B,eAAe,CAAC,IAAI,EAAE,sBAAsB,yDAsDzE"}
+{"version":3,"file":"splunk-transport.d.ts","sourceRoot":"","sources":["../../src/transports/splunk-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,yBAAyB,CAAC;AAG5C,KAAK,sBAAsB,GAAG;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AA0CF,wBAA8B,eAAe,CAAC,IAAI,EAAE,sBAAsB,yDAsDzE"}

package/dist/transports/splunk-transport.js

@@ -9,25 +9,31 @@ const warnOnce = () => {
         }
     };
 };
-const normalizeChunk = (chunk) => {
-    if (typeof chunk === 'string')
-        return chunk;
-    const candidate = chunk?.toString?.();
-    return typeof candidate === 'string' ? candidate : null;
-};
 const parsePayload = (chunk, onWarn) => {
-    const line = normalizeChunk(chunk);
-    if (!line) {
-        onWarn('Splunk transport dropped log: non-string chunk');
-        return null;
+    if (chunk != null && typeof chunk === 'object') {
+        return { success: true, payload: chunk }; // already structured JSON from pino
     }
-    try {
-        return JSON.parse(line);
+    if (typeof chunk === 'string') {
+        try {
+            return { success: true, payload: JSON.parse(chunk) };
+        }
+        catch {
+            onWarn('Splunk transport dropped log: JSON parse failed');
+            return { success: false };
+        }
     }
-    catch {
-        onWarn('Splunk transport dropped log: JSON parse failed');
-        return null;
+    const candidate = chunk?.toString?.();
+    if (typeof candidate === 'string') {
+        try {
+            return { success: true, payload: JSON.parse(candidate) };
+        }
+        catch {
+            onWarn('Splunk transport dropped log: JSON parse failed');
+            return { success: false };
+        }
     }
+    onWarn('Splunk transport dropped log: non-string chunk');
+    return { success: false };
 };
 export default async function splunkTransport(opts) {
     const url = opts.url;
@@ -42,8 +48,8 @@ export default async function splunkTransport(opts) {
     return build(async (stream) => {
         const warn = warnOnce();
         for await (const chunk of stream) {
-            const payload = parsePayload(chunk, warn);
-            if (payload == null)
+            const parsed = parsePayload(chunk, warn);
+            if (!parsed.success)
                 continue;
             const controller = AbortSignal.timeout(timeoutMs);
             const requestId = randomUUID();
@@ -55,7 +61,7 @@ export default async function splunkTransport(opts) {
                     'X-Splunk-Request-Channel': requestId
                 },
                 body: JSON.stringify({
-                    event: payload,
+                    event: parsed.payload,
                     index,
                     source,
                     sourcetype

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mereb/shared-packages",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",