@mereb/shared-packages 0.0.10 → 0.0.14

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/config/env.d.ts

@@ -2,9 +2,30 @@ export interface EnvConfigOptions<T extends string> {
     defaults?: Partial<Record<T, string>>;
     required?: T[];
 }
+export type EnvSpec<K extends string = string> = {
+    key: K;
+    type: 'string';
+    fallback?: string;
+} | {
+    key: K;
+    type: 'number';
+    fallback?: number;
+} | {
+    key: K;
+    type: 'boolean';
+    fallback?: boolean;
+};
+type EnvResult<Specs extends EnvSpec[]> = {
+    [S in Specs[number] as S['key']]: S['type'] extends 'string' ? string : S['type'] extends 'number' ? number : boolean;
+};
 export declare function loadEnv(path?: string): void;
+export declare function loadThenGetEnvs<const Specs extends EnvSpec[]>(options: {
+    path?: string;
+    envs: Specs;
+}): EnvResult<Specs>;
 export declare function getEnv<T extends string>(key: T, fallback?: string): string;
 export declare function mustGetEnv<T extends string>(keys: T[]): Record<T, string>;
 export declare function getBooleanEnv(key: string, fallback?: boolean): boolean;
 export declare function getNumberEnv(key: string, fallback?: number): number;
+export {};
 //# sourceMappingURL=env.d.ts.map

package/dist/config/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/config/env.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,MAAM;IAChD,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;CAChB;AAED,wBAAgB,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,QAKpC;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAM1E;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CASzE;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAMpE;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAanE"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/config/env.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,MAAM;IAChD,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;CAChB;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IACzC;IAAE,GAAG,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,GAAG,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,GAAG,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpD,KAAK,SAAS,CAAC,KAAK,SAAS,OAAO,EAAE,IAAI;KACvC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,QAAQ,GACxD,MAAM,GACN,CAAC,CAAC,MAAM,CAAC,SAAS,QAAQ,GACxB,MAAM,GACN,OAAO;CACd,CAAC;AAEF,wBAAgB,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,QAKpC;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,OAAO,EAAE,EAC3D,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,KAAK,CAAA;CAAE,GACtC,SAAS,CAAC,KAAK,CAAC,CAiClB;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAM1E;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CASzE;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAMpE;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAanE"}

package/dist/config/env.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadEnv = loadEnv;
+exports.loadThenGetEnvs = loadThenGetEnvs;
 exports.getEnv = getEnv;
 exports.mustGetEnv = mustGetEnv;
 exports.getBooleanEnv = getBooleanEnv;
@@ -16,6 +17,28 @@ function loadEnv(path) {
         loaded = true;
     }
 }
+function loadThenGetEnvs(options) {
+    loadEnv(options.path);
+    const envs = {};
+    for (const spec of options.envs) {
+        switch (spec.type) {
+            case 'string':
+                envs[spec.key] = getEnv(spec.key, spec.fallback);
+                break;
+            case 'number':
+                envs[spec.key] = getNumberEnv(spec.key, spec.fallback);
+                break;
+            case 'boolean':
+                envs[spec.key] = getBooleanEnv(spec.key, spec.fallback ?? false);
+                break;
+            default: {
+                const _exhaustive = spec;
+                throw new Error(`Unsupported env type ${spec.type}`);
+            }
+        }
+    }
+    return envs;
+}
 function getEnv(key, fallback) {
     const value = process.env[key] ?? fallback;
     if (value === undefined) {
@@ -50,7 +73,7 @@ function getNumberEnv(key, fallback) {
     }
     const numeric = Number(value);
     if (Number.isNaN(numeric)) {
-        throw new Error(`Environment variable ${key} must be a number`);
+        throw new TypeError(`Environment variable ${key} must be a number`);
     }
     return numeric;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mereb/shared-packages",
-  "version": "0.0.10",
+  "version": "0.0.14",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -40,12 +40,14 @@
     "@types/node": "^20.12.7",
     "eslint": "^8.57.0",
     "rimraf": "^5.0.5",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "vitest": "^1.6.0"
   },
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf dist",
     "lint": "eslint \"src/**/*.{ts,tsx}\"",
+    "test": "vitest run",
     "typecheck": "tsc --noEmit",
     "version:bump": "node ./scripts/bump-version.mjs"
   }