@toxplanet/pegasus-sdk 1.1.18 → 1.1.19

package/config/environment.dev.js

@@ -1,29 +1,29 @@
-module.exports = {
-  environment: 'dev',
-  region: 'us-east-1',
-  awsAccountId: '292931567094',
-  sourceService: 'pegasus-sdk',
-  secretName: 'arn:aws:secretsmanager:us-east-1:292931567094:secret:rds!cluster-b851c3ce-58cc-41cd-aeae-05cc7f5e031a-ZYSjiI',
-  openSearchEndpoint: 'https://war8lk73nzswquk8dcz1.us-east-1.aoss.amazonaws.com',
-  openSearchIndex: 'chemicals',
-  database: {
-    host: 'cr-chemicals.cluster-cz0iqdg8irhb.us-east-1.rds.amazonaws.com',
-    name: 'chemicals'
-  },
-  postgres: {
-    maxConnections: 2,
-    minConnections: 1,
-    idleTimeoutMillis: 0,
-    connectionTimeoutMillis: 15000,
-    statementTimeout: 30000,
-    queryTimeout: 30000,
-    ssl: {
-      rejectUnauthorized: false
-    }
-  },
-  indexRoutes: {
-    chemicals: ['chemicals*'],
-    documents: ['documents*'],
-    search: [/^(chemicals|substances|search)/]
-  }
-};
+module.exports = {
+  environment: 'dev',
+  region: 'us-east-1',
+  awsAccountId: '292931567094',
+  sourceService: 'pegasus-sdk',
+  secretName: 'arn:aws:secretsmanager:us-east-1:292931567094:secret:rds!cluster-b851c3ce-58cc-41cd-aeae-05cc7f5e031a-ZYSjiI',
+  openSearchEndpoint: 'https://war8lk73nzswquk8dcz1.us-east-1.aoss.amazonaws.com',
+  openSearchIndex: 'chemicals',
+  database: {
+    host: 'cr-chemicals.cluster-cz0iqdg8irhb.us-east-1.rds.amazonaws.com',
+    name: 'chemicals'
+  },
+  postgres: {
+    maxConnections: 2,
+    minConnections: 1,
+    idleTimeoutMillis: 0,
+    connectionTimeoutMillis: 15000,
+    statementTimeout: 30000,
+    queryTimeout: 30000,
+    ssl: {
+      rejectUnauthorized: false
+    }
+  },
+  indexRoutes: {
+    chemicals: ['chemicals*'],
+    documents: ['documents*'],
+    search: [/^(chemicals|substances|search)/]
+  }
+};

package/lib/chemicals.js

@@ -21,8 +21,9 @@ class ChemicalsService {
     this.sqsClient = null;
   }
 
-  getDb() {
-    if (!this.db) {
+  async getDb() {
+    const reconnected = await this.connection.ensureConnected();
+    if (reconnected || !this.db) {
       this.db = getDrizzle(this.connection.pgPool);
     }
     return this.db;
@@ -142,15 +143,6 @@ class ChemicalsService {
         return { indexed: 0, errors: [], results: [] };
       }
 
-      // Proactively validate the connection before any real query fires.
-      // If idle too long, this reconnects first so the real query never faces
-      // the full connectionTimeoutMillis wait on a stale pool.
-      const reconnected = await this.connection.ensureConnected();
-      if (reconnected) {
-        this.db = null; // force getDb() to bind to the fresh pool
-      }
-
-      const db = this.getDb();
       const results = [];
       const errors = [];
 
@@ -189,8 +181,11 @@ class ChemicalsService {
           err.code === 'ECONNREFUSED' ||
           err.code === 'ETIMEDOUT';
 
-        const attemptUpsert = () =>
-          db.insert(schema.chemicals)
+        // Use this.getDb() on each attempt so a reconnect mid-loop automatically
+        // gets a fresh Drizzle instance bound to the new pool.
+        const attemptUpsert = async () => {
+          const freshDb = await this.getDb();
+          return freshDb.insert(schema.chemicals)
             .values(chemical)
             .onConflictDoUpdate({
               target: schema.chemicals.sourceId,
@@ -207,6 +202,7 @@ class ChemicalsService {
               chemicalId: schema.chemicals.chemicalId,
               sourceId: schema.chemicals.sourceId
             });
+        };
 
         let lastError = null;
         let retryCount = 0;
@@ -226,7 +222,6 @@ class ChemicalsService {
             logInfo('pegasus-sdk', `[bulkIndexFielded] Document ${i} connection error (${firstErr.message}), reconnecting pool and retrying`);
             try {
               await this.connection.reconnect();
-              this.db = null; // force getDb() to bind to the new pool
               const [result] = await attemptUpsert();
               logInfo('pegasus-sdk', `[bulkIndexFielded] Document ${i} indexed successfully after reconnect: ${result?.chemicalId || 'no ID returned'}`);
               this.connection.recordActivity();
@@ -315,7 +310,7 @@ class ChemicalsService {
 
   async createChemical(chemical) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const [result] = await db
         .insert(schema.chemicals)
@@ -342,7 +337,7 @@ class ChemicalsService {
 
   async updateChemical(chemicalId, updates) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const updateData = {};
       if (updates.chemical_name) updateData.chemicalName = updates.chemical_name;
@@ -367,7 +362,7 @@ class ChemicalsService {
 
   async deleteChemical(chemicalId) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const [deleted] = await db
         .delete(schema.chemicals)
@@ -383,7 +378,7 @@ class ChemicalsService {
 
   async deleteBySourceId(sourceId) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const [deleted] = await db
         .delete(schema.chemicals)
@@ -399,7 +394,7 @@ class ChemicalsService {
 
   async deleteCollection(collectionName) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const deleted = await db
         .delete(schema.chemicals)
@@ -415,7 +410,7 @@ class ChemicalsService {
 
   async updateCollectionProperty(collectionName, propertyPath, newValue) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       const pathArray = propertyPath.split('.');
       const valueJson = JSON.stringify(newValue);
 
@@ -437,7 +432,7 @@ class ChemicalsService {
 
   async bulkUpdateProperty(filter, propertyPath, newValue) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       let whereCondition = sql`1=1`;
       
@@ -470,7 +465,7 @@ class ChemicalsService {
 
   async getChemicalById(chemicalId) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const [result] = await db
         .select()
@@ -487,7 +482,7 @@ class ChemicalsService {
 
   async getChemicalBySourceId(sourceId) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const [result] = await db
         .select()
@@ -504,7 +499,7 @@ class ChemicalsService {
 
   async getChemicalsByCAS(casNumber) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const results = await db
         .select()
@@ -524,7 +519,7 @@ class ChemicalsService {
         throw new Error(`Invalid identifier type: ${identifierType}`);
       }
 
-      const db = this.getDb();
+      const db = await this.getDb();
 
       const results = await db
         .select()
@@ -540,7 +535,7 @@ class ChemicalsService {
 
   async countByCollection(collectionName) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const result = await db
         .select({ count: sql`count(*)::int` })
@@ -556,7 +551,7 @@ class ChemicalsService {
 
   async countByIdentifier(identifierValue) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
 
       const searchPattern = `%${escapeLikePattern(identifierValue)}%`;
       const result = await db
@@ -573,7 +568,7 @@ class ChemicalsService {
 
   async countByCAS(casNumber) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const result = await db
         .select({ count: sql`count(*)::int` })
@@ -589,7 +584,7 @@ class ChemicalsService {
 
   async getTotalSynonymCount() {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const result = await db
         .select({ count: sql`sum(array_length(${schema.chemicals.chemicalSynonyms}, 1))::int` })
@@ -604,7 +599,7 @@ class ChemicalsService {
 
   async getSynonymCount(synonymTerm) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const result = await db
         .select({ count: sql`count(*)::int` })
@@ -620,7 +615,7 @@ class ChemicalsService {
 
   async convertIdentifier(fromIdentifier, toIdentifierType) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
 
       const searchPattern = `%${escapeLikePattern(fromIdentifier)}%`;
       const chemicals = await db
@@ -768,7 +763,7 @@ class ChemicalsService {
 
   async countAll() {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       const result = await db
         .select({ count: sql`count(*)::int` })
         .from(schema.chemicals);
@@ -781,7 +776,7 @@ class ChemicalsService {
 
   async findChemicalsWithoutDocuments(collectionName, searchTerm, pageSize = 100) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       let whereConditions = [];
       
@@ -811,7 +806,7 @@ class ChemicalsService {
 
   async countChemicalsWithoutDocuments(collectionName) {
     try {
-      const db = this.getDb();
+      const db = await this.getDb();
       
       const whereClause = collectionName 
         ? arrayContains(schema.chemicals.chemicalCategories, [collectionName])

package/package.json

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