@machinemetrics/mm-erp-sdk 0.1.7-beta.2 → 0.1.7-beta.3

package/dist/mm-erp-sdk.js

@@ -3995,14 +3995,14 @@ class SqlServerHelper {
   }
 }
 class PsqlService {
+  connection = null;
   config;
   constructor(config2) {
     this.config = config2;
   }
-  // REMOVED: dispose() method - not needed anymore
-  // REMOVED: connection property - not needed anymore
-  // REMOVED: openConnection() method - not needed anymore
-  // REMOVED: closeConnection() method - not needed anymore
+  async dispose() {
+    await this.closeConnection();
+  }
   /**
    * Build PSQL ODBC connection string
    * CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
@@ -4020,7 +4020,7 @@ class PsqlService {
   }
   /**
    * Execute a query and return the results
-   * Creates a fresh connection for each query to avoid handle corruption
+   * Interface matches SqlServerService for consistency
    *
    * @param query The SQL query to execute
    * @param params Query parameters (currently unused for PSQL read operations)
@@ -4028,58 +4028,73 @@ class PsqlService {
    * @returns The entities fetched from the database, along with paging information
    */
   async executePreparedStatement(query, params = {}, paging) {
-    let connection = null;
+    const connection = await this.openConnection();
+    let records;
     try {
-      const connStr = this.buildConnectionString();
-      logger.debug("Creating fresh PSQL connection for query");
-      connection = await odbc.connect(connStr);
       if (Object.keys(params).length > 0) {
         logger.warn(
           "PsqlService: Query parameters provided but parameter binding not yet implemented. Using direct query execution. This is acceptable for Phase 1 read operations."
         );
       }
-      const records = await connection.query(query);
-      const allRecords = PsqlService.recordsetToRecords(records);
-      const rowsFetched = allRecords.length;
-      const pagedData = paging?.offset !== void 0 || paging?.limit !== void 0 ? allRecords.slice(
-        paging.offset || 0,
-        (paging.offset || 0) + (paging.limit || allRecords.length)
-      ) : allRecords;
-      return {
-        data: pagedData,
-        paging: {
-          count: rowsFetched,
-          limit: paging?.limit || 0,
-          offset: paging?.offset || 0,
-          nextPage: paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched ? String((paging.offset || 0) + paging.limit) : void 0,
-          previousPage: paging?.offset ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10))) : void 0
-        }
-      };
+      records = await connection.query(query);
     } catch (error) {
       const errorInfo = error;
       logger.error("Error fetching data from PSQL", {
         error: errorInfo.message,
-        odbcErrors: errorInfo.odbcErrors,
-        query: query.substring(0, 200)
-        // Log first 200 chars of query
+        odbcErrors: errorInfo.odbcErrors
       });
       throw this.handleOdbcError(errorInfo);
-    } finally {
-      if (connection) {
-        try {
-          await connection.close();
-          logger.debug("PSQL connection closed successfully");
-        } catch (err) {
-          logger.warn("Error closing PSQL connection (non-fatal)", {
-            error: err
-          });
-        }
+    }
+    const allRecords = PsqlService.recordsetToRecords(records);
+    const rowsFetched = allRecords.length;
+    const pagedData = paging?.offset !== void 0 || paging?.limit !== void 0 ? allRecords.slice(
+      paging.offset || 0,
+      (paging.offset || 0) + (paging.limit || allRecords.length)
+    ) : allRecords;
+    return {
+      data: pagedData,
+      paging: {
+        count: rowsFetched,
+        limit: paging?.limit || 0,
+        offset: paging?.offset || 0,
+        nextPage: paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched ? String((paging.offset || 0) + paging.limit) : void 0,
+        previousPage: paging?.offset ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10))) : void 0
       }
+    };
+  }
+  /**
+   * Opens a connection to PSQL database
+   * Caches the connection so that it can be reused.
+   * On failure to connect, throws
+   */
+  async openConnection() {
+    if (this.connection) {
+      logger.debug("Reusing existing PSQL connection");
+      return this.connection;
+    }
+    try {
+      const connStr = this.buildConnectionString();
+      logger.info("Opening new PSQL connection");
+      logger.debug(
+        "Connection string (password hidden):",
+        connStr.replace(/PWD=[^;]+/, "PWD=***")
+      );
+      this.connection = await odbc.connect(connStr);
+      logger.info("Successfully connected to PSQL database");
+      return this.connection;
+    } catch (error) {
+      logger.error("PsqlService>>openConnection>> Connection failed", {
+        error
+      });
+      throw this.handleOdbcError(error);
     }
   }
   /**
    * Transform ODBC result set to array of Record<string, string> instances.
    * IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
+   *
+   * @param recordset Result set from ODBC query
+   * @returns array of Record<string, string> instances
    */
   static recordsetToRecords(recordset) {
     if (!Array.isArray(recordset)) {
@@ -4121,6 +4136,19 @@ class PsqlService {
         return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
     }
   }
+  async closeConnection() {
+    if (this.connection) {
+      logger.info("Closing PSQL connection");
+      try {
+        await this.connection.close();
+      } catch (error) {
+        logger.error("PsqlService::closeConnection: Error closing connection", {
+          error
+        });
+      }
+      this.connection = null;
+    }
+  }
 }
 class PsqlLaborTicketOperations {
   constructor(service) {