@mereb/shared-packages 0.0.7 → 0.0.11

package/dist/cache/redis.d.ts

@@ -1,6 +1,7 @@
 import { type RedisClientType } from '@redis/client';
 export interface RedisOptions {
     url: string;
+    connectTimeoutMs?: number;
 }
 export declare function getRedisClient(options: RedisOptions): Promise<RedisClientType>;
 export declare function disconnectRedis(): Promise<void>;

package/dist/cache/redis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAOnE,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CASpF;AAED,wBAAsB,eAAe,kBAKpC"}
+{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAQnE,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAiCD,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAepF;AAED,wBAAsB,eAAe,kBAKpC"}

package/dist/cache/redis.js

@@ -8,14 +8,52 @@ exports.disconnectRedis = disconnectRedis;
 const client_1 = require("@redis/client");
 const pino_1 = __importDefault(require("pino"));
 const logger = (0, pino_1.default)({ name: 'redis' });
+const DEFAULT_CONNECT_TIMEOUT_MS = 5_000;
 let client;
+function withTimeout(promise, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            reject(new Error(`Timed out connecting to Redis after ${timeoutMs}ms`));
+        }, timeoutMs);
+        promise
+            .then((value) => {
+            clearTimeout(timer);
+            resolve(value);
+        })
+            .catch((error) => {
+            clearTimeout(timer);
+            reject(error);
+        });
+    });
+}
+async function connectClient(instance, timeoutMs) {
+    try {
+        await withTimeout(instance.connect(), timeoutMs);
+    }
+    catch (error) {
+        try {
+            await instance.disconnect();
+        }
+        catch {
+            // ignore disconnect errors during cleanup
+        }
+        throw error;
+    }
+}
 async function getRedisClient(options) {
     if (!client) {
+        const timeoutMs = options.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
         client = (0, client_1.createClient)({ url: options.url });
         client.on('error', (err) => {
             logger.error({ err }, 'Redis connection error');
         });
-        await client.connect();
+        try {
+            await connectClient(client, timeoutMs);
+        }
+        catch (error) {
+            client = undefined;
+            throw error;
+        }
     }
     return client;
 }

package/dist/observability/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/observability/otel.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOtE,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;CACtC;AAED,wBAAgB,aAAa,CAAC,EAC5B,WAAW,EACX,YAAY,EACZ,gBAAqB,EACtB,EAAE,UAAU,QA0BZ"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/observability/otel.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOtE,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;CACtC;AAED,wBAAgB,aAAa,CAAC,EAC5B,WAAW,EACX,YAAY,EACZ,gBAAqB,EACtB,EAAE,UAAU,QA0BZ"}

package/dist/observability/otel.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initTelemetry = initTelemetry;
 const api_1 = require("@opentelemetry/api");
 const resources_1 = require("@opentelemetry/resources");
-const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
 const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
@@ -15,7 +14,7 @@ function initTelemetry({ serviceName, otlpEndpoint, instrumentations = [] }) {
         return;
     }
     const resource = new resources_1.Resource({
-        [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: serviceName
+        'service.name': serviceName
     });
     const provider = new sdk_trace_node_1.NodeTracerProvider({ resource });
     if (otlpEndpoint) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mereb/shared-packages",
-  "version": "0.0.7",
+  "version": "0.0.11",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [