@toxplanet/pegasus-sdk 1.1.17 → 1.1.18

package/lib/connection.js

@@ -24,6 +24,7 @@ class PegasusConnection {
     this.secretsClient = null;
     this.cachedSecret = null;
     this.isConnected = false;
+    this.lastActivityAt = null;
   }
 
   async getSecret() {
@@ -63,7 +64,8 @@ class PegasusConnection {
       min: this.config.postgres.minConnections,
       idleTimeoutMillis: this.config.postgres.idleTimeoutMillis,
       connectionTimeoutMillis: this.config.postgres.connectionTimeoutMillis,
-      allowExitOnIdle: true,
+      keepAlive: true,
+      keepAliveInitialDelayMillis: 10000,
       ssl: this.config.postgres.ssl,
       statement_timeout: this.config.postgres.statementTimeout,
       query_timeout: this.config.postgres.queryTimeout
@@ -76,6 +78,7 @@ class PegasusConnection {
     });
 
     this.pgPool.on('connect', () => {
+      this.lastActivityAt = Date.now();
       logInfo('pegasus-sdk', 'PostgreSQL client connected');
     });
 
@@ -83,6 +86,16 @@ class PegasusConnection {
       logInfo('pegasus-sdk', 'PostgreSQL client removed from pool');
     });
 
+    // Eagerly verify the connection is actually reachable before declaring
+    // isConnected = true. Without this, new Pool() never opens a socket and
+    // isConnected would be a lie — the first real query would pay the full
+    // TCP+SSL+auth cost while racing the connectionTimeoutMillis.
+    const verifyClient = await this.pgPool.connect();
+    await verifyClient.query('SELECT 1');
+    verifyClient.release();
+    this.lastActivityAt = Date.now();
+    logInfo('pegasus-sdk', 'PostgreSQL connection verified and ready');
+
     if (this.openSearchEndpoint) {
       this.osClient = new Client({
         ...AwsSigv4Signer({
@@ -100,6 +113,79 @@ class PegasusConnection {
     this.isConnected = true;
   }
 
+  async reconnect() {
+    logInfo('pegasus-sdk', 'Reconnecting PostgreSQL pool (stale connection detected)');
+    if (this.pgPool) {
+      try {
+        await this.pgPool.end();
+      } catch (err) {
+        logError('pegasus-sdk', 'PegasusConnection', 'reconnect.end', err);
+      }
+      this.pgPool = null;
+    }
+    this.isConnected = false;
+    this.lastActivityAt = null;
+    await this.connect();
+  }
+
+  /**
+   * Call this after any successful database operation so ensureConnected()
+   * knows the connection was recently healthy and can skip the liveness check.
+   */
+  recordActivity() {
+    this.lastActivityAt = Date.now();
+  }
+
+  /**
+   * Proactively verify the connection is alive before executing a batch of
+   * queries. If the pool has been idle long enough that connections may have
+   * gone stale, a lightweight SELECT 1 is issued first. If that fails, the
+   * pool is rebuilt before the caller's real query fires — avoiding the full
+   * connectionTimeoutMillis wait on the real query.
+   *
+   * @returns {Promise<boolean>} true if a reconnect happened (caller should
+   *   reset any cached Drizzle db instance), false if connection is healthy.
+   */
+  async ensureConnected() {
+    if (!this.pgPool || !this.isConnected) {
+      await this.connect();
+      return true;
+    }
+
+    // If we used this connection recently, trust it's still alive.
+    const FRESH_THRESHOLD_MS = 60_000;
+    const idleSince = Date.now() - (this.lastActivityAt || 0);
+    if (idleSince < FRESH_THRESHOLD_MS) {
+      return false;
+    }
+
+    logInfo('pegasus-sdk', `[ensureConnected] Pool inactive for ${Math.round(idleSince / 1000)}s — running liveness check before query`);
+
+    let client;
+    try {
+      // Use a short race timeout so a dead connection fails fast rather than
+      // waiting the full connectionTimeoutMillis before we know to reconnect.
+      client = await Promise.race([
+        this.pgPool.connect(),
+        new Promise((_, reject) =>
+          setTimeout(() => reject(new Error('liveness check timeout')), 3000)
+        )
+      ]);
+      await client.query('SELECT 1');
+      client.release();
+      this.lastActivityAt = Date.now();
+      logInfo('pegasus-sdk', '[ensureConnected] Liveness check passed');
+      return false;
+    } catch (err) {
+      if (client) {
+        try { client.release(true); } catch (_) {}
+      }
+      logInfo('pegasus-sdk', `[ensureConnected] Liveness check failed (${err.message}) — reconnecting pool proactively`);
+      await this.reconnect();
+      return true;
+    }
+  }
+
   async disconnect() {
     if (!this.isConnected) {
       return;

package/lib/db/schema.js

@@ -1,27 +1,27 @@
-const { pgTable, uuid, text, jsonb, timestamp, index } = require('drizzle-orm/pg-core');
-const { sql } = require('drizzle-orm');
-
-const chemicals = pgTable('chemicals', {
-  chemicalId: uuid('chemical_id').defaultRandom().primaryKey(),
-  sourceId: text('source_id').notNull().unique(),
-  chemicalName: text('chemical_name').notNull(),
-  chemicalMeta: jsonb('chemical_meta'),
-  chemicalIdentifiers: jsonb('chemical_identifiers'),
-  chemicalSynonyms: text('chemical_synonyms').array(),
-  chemicalCategories: text('chemical_categories').array(),
-  createdAt: timestamp('created_at', { withTimezone: true }).notNull(),
-  updatedAt: timestamp('updated_at', { withTimezone: true }).notNull(),
-  importedAt: timestamp('imported_at', { withTimezone: true }).defaultNow()
-}, (table) => {
-  return {
-    nameIdx: index('idx_chemicals_name').on(table.chemicalName),
-    createdAtIdx: index('idx_chemicals_created_at').on(table.createdAt),
-    updatedAtIdx: index('idx_chemicals_updated_at').on(table.updatedAt),
-    identifiersGinIdx: index('idx_chemicals_identifiers_gin').on(table.chemicalIdentifiers),
-    synonymsGinIdx: index('idx_chemicals_synonyms_gin').on(table.chemicalSynonyms)
-  };
-});
-
-module.exports = {
-  chemicals
-};
+const { pgTable, uuid, text, jsonb, timestamp, index } = require('drizzle-orm/pg-core');
+const { sql } = require('drizzle-orm');
+
+const chemicals = pgTable('chemicals', {
+  chemicalId: uuid('chemical_id').defaultRandom().primaryKey(),
+  sourceId: text('source_id').notNull().unique(),
+  chemicalName: text('chemical_name').notNull(),
+  chemicalMeta: jsonb('chemical_meta'),
+  chemicalIdentifiers: jsonb('chemical_identifiers'),
+  chemicalSynonyms: text('chemical_synonyms').array(),
+  chemicalCategories: text('chemical_categories').array(),
+  createdAt: timestamp('created_at', { withTimezone: true }).notNull(),
+  updatedAt: timestamp('updated_at', { withTimezone: true }).notNull(),
+  importedAt: timestamp('imported_at', { withTimezone: true }).defaultNow()
+}, (table) => {
+  return {
+    nameIdx: index('idx_chemicals_name').on(table.chemicalName),
+    createdAtIdx: index('idx_chemicals_created_at').on(table.createdAt),
+    updatedAtIdx: index('idx_chemicals_updated_at').on(table.updatedAt),
+    identifiersGinIdx: index('idx_chemicals_identifiers_gin').on(table.chemicalIdentifiers),
+    synonymsGinIdx: index('idx_chemicals_synonyms_gin').on(table.chemicalSynonyms)
+  };
+});
+
+module.exports = {
+  chemicals
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toxplanet/pegasus-sdk",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "description": "SDK for migrating chemical data to Pegasus PostgreSQL + OpenSearch architecture with Elasticsearch client compatibility",
   "main": "index.js",
   "type": "commonjs",