pg-cache 3.15.1 → 3.15.3

package/esm/lru.js

@@ -1,3 +1,4 @@
+import { parseEnvNumber } from '12factor-env';
 import { Logger } from '@pgpmjs/logger';
 import { LRUCache } from 'lru-cache';
 const log = new Logger('pg-cache');
@@ -6,12 +7,6 @@ const ONE_DAY = ONE_HOUR_IN_MS * 24;
 const ONE_YEAR = ONE_DAY * 366;
 // Kubernetes sends only SIGTERM on pod shutdown
 const SYS_EVENTS = ['SIGTERM'];
-const parseEnvInt = (val, fallback) => {
-    if (!val)
-        return fallback;
-    const n = parseInt(val, 10);
-    return isNaN(n) ? fallback : n;
-};
 /**
  * Read cache configuration from environment variables.
  *
@@ -21,8 +16,8 @@ const parseEnvInt = (val, fallback) => {
  */
 export function getPgCacheConfig() {
     return {
-        max: parseEnvInt(process.env.PG_CACHE_MAX, 50),
-        ttl: parseEnvInt(process.env.PG_CACHE_TTL_MS, ONE_YEAR),
+        max: parseEnvNumber(process.env.PG_CACHE_MAX) ?? 50,
+        ttl: parseEnvNumber(process.env.PG_CACHE_TTL_MS) ?? ONE_YEAR,
     };
 }
 class ManagedPgPool {

package/esm/pg.js

@@ -1,3 +1,4 @@
+import { parseEnvNumber } from '12factor-env';
 import pg from 'pg';
 import { getPgEnvOptions } from 'pg-env';
 import { Logger } from '@pgpmjs/logger';
@@ -5,12 +6,6 @@ import { getActivePgPoolFactory } from './driver';
 import { pgCache } from './lru';
 const log = new Logger('pg-cache');
 export const buildConnectionString = (user, password, host, port, database) => `postgres://${user}:${password}@${host}:${port}/${database}`;
-const parseEnvInt = (val, fallback) => {
-    if (!val)
-        return fallback;
-    const n = parseInt(val, 10);
-    return isNaN(n) ? fallback : n;
-};
 /**
  * Read per-pool configuration from environment variables.
  *
@@ -21,9 +16,9 @@ const parseEnvInt = (val, fallback) => {
  */
 export function getPgPoolConfig(overrides) {
     return {
-        max: overrides?.max ?? parseEnvInt(process.env.PG_POOL_MAX, 5),
-        idleTimeoutMillis: overrides?.idleTimeoutMillis ?? parseEnvInt(process.env.PG_POOL_IDLE_TIMEOUT_MS, 30000),
-        connectionTimeoutMillis: overrides?.connectionTimeoutMillis ?? parseEnvInt(process.env.PG_POOL_CONNECTION_TIMEOUT_MS, 5000),
+        max: overrides?.max ?? parseEnvNumber(process.env.PG_POOL_MAX) ?? 5,
+        idleTimeoutMillis: overrides?.idleTimeoutMillis ?? parseEnvNumber(process.env.PG_POOL_IDLE_TIMEOUT_MS) ?? 30000,
+        connectionTimeoutMillis: overrides?.connectionTimeoutMillis ?? parseEnvNumber(process.env.PG_POOL_CONNECTION_TIMEOUT_MS) ?? 5000,
         ...(overrides?.allowExitOnIdle !== undefined && { allowExitOnIdle: overrides.allowExitOnIdle }),
     };
 }

package/lru.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.teardownPgPools = exports.close = exports.pgCache = exports.PgPoolCacheManager = void 0;
 exports.getPgCacheConfig = getPgCacheConfig;
+const _12factor_env_1 = require("12factor-env");
 const logger_1 = require("@pgpmjs/logger");
 const lru_cache_1 = require("lru-cache");
 const log = new logger_1.Logger('pg-cache');
@@ -10,12 +11,6 @@ const ONE_DAY = ONE_HOUR_IN_MS * 24;
 const ONE_YEAR = ONE_DAY * 366;
 // Kubernetes sends only SIGTERM on pod shutdown
 const SYS_EVENTS = ['SIGTERM'];
-const parseEnvInt = (val, fallback) => {
-    if (!val)
-        return fallback;
-    const n = parseInt(val, 10);
-    return isNaN(n) ? fallback : n;
-};
 /**
  * Read cache configuration from environment variables.
  *
@@ -25,8 +20,8 @@ const parseEnvInt = (val, fallback) => {
  */
 function getPgCacheConfig() {
     return {
-        max: parseEnvInt(process.env.PG_CACHE_MAX, 50),
-        ttl: parseEnvInt(process.env.PG_CACHE_TTL_MS, ONE_YEAR),
+        max: (0, _12factor_env_1.parseEnvNumber)(process.env.PG_CACHE_MAX) ?? 50,
+        ttl: (0, _12factor_env_1.parseEnvNumber)(process.env.PG_CACHE_TTL_MS) ?? ONE_YEAR,
     };
 }
 class ManagedPgPool {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-cache",
-  "version": "3.15.1",
+  "version": "3.15.3",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL connection pool LRU cache manager",
   "main": "index.js",
@@ -29,11 +29,12 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "12factor-env": "^1.17.1",
     "@pgpmjs/logger": "^2.14.0",
-    "@pgpmjs/types": "^2.35.0",
+    "@pgpmjs/types": "^2.36.0",
     "lru-cache": "^11.2.7",
     "pg": "^8.21.0",
-    "pg-env": "^1.18.0"
+    "pg-env": "^1.18.1"
   },
   "devDependencies": {
     "@types/pg": "^8.20.0",
@@ -48,5 +49,5 @@
     "connection",
     "constructive"
   ],
-  "gitHead": "dd2accb683fe20c7278a0d58fd36a04a3b07ac63"
+  "gitHead": "39db6d576bce7bc1de8123849f237b1695779d88"
 }

package/pg.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPgPool = exports.defaultPgPoolFactory = exports.buildConnectionString = void 0;
 exports.getPgPoolConfig = getPgPoolConfig;
+const _12factor_env_1 = require("12factor-env");
 const pg_1 = __importDefault(require("pg"));
 const pg_env_1 = require("pg-env");
 const logger_1 = require("@pgpmjs/logger");
@@ -13,12 +14,6 @@ const lru_1 = require("./lru");
 const log = new logger_1.Logger('pg-cache');
 const buildConnectionString = (user, password, host, port, database) => `postgres://${user}:${password}@${host}:${port}/${database}`;
 exports.buildConnectionString = buildConnectionString;
-const parseEnvInt = (val, fallback) => {
-    if (!val)
-        return fallback;
-    const n = parseInt(val, 10);
-    return isNaN(n) ? fallback : n;
-};
 /**
  * Read per-pool configuration from environment variables.
  *
@@ -29,9 +24,9 @@ const parseEnvInt = (val, fallback) => {
  */
 function getPgPoolConfig(overrides) {
     return {
-        max: overrides?.max ?? parseEnvInt(process.env.PG_POOL_MAX, 5),
-        idleTimeoutMillis: overrides?.idleTimeoutMillis ?? parseEnvInt(process.env.PG_POOL_IDLE_TIMEOUT_MS, 30000),
-        connectionTimeoutMillis: overrides?.connectionTimeoutMillis ?? parseEnvInt(process.env.PG_POOL_CONNECTION_TIMEOUT_MS, 5000),
+        max: overrides?.max ?? (0, _12factor_env_1.parseEnvNumber)(process.env.PG_POOL_MAX) ?? 5,
+        idleTimeoutMillis: overrides?.idleTimeoutMillis ?? (0, _12factor_env_1.parseEnvNumber)(process.env.PG_POOL_IDLE_TIMEOUT_MS) ?? 30000,
+        connectionTimeoutMillis: overrides?.connectionTimeoutMillis ?? (0, _12factor_env_1.parseEnvNumber)(process.env.PG_POOL_CONNECTION_TIMEOUT_MS) ?? 5000,
         ...(overrides?.allowExitOnIdle !== undefined && { allowExitOnIdle: overrides.allowExitOnIdle }),
     };
 }