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

package/dist/services/data-sync-service/data-sync-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-sync-service.d.ts","sourceRoot":"","sources":["../../../src/services/data-sync-service/data-sync-service.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,GAAU,eAAe,MAAM,kBA+I7D,CAAC"}
+{"version":3,"file":"data-sync-service.d.ts","sourceRoot":"","sources":["../../../src/services/data-sync-service/data-sync-service.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,GAAU,eAAe,MAAM,kBA0I7D,CAAC"}

package/dist/services/psql-erp-service/psql-service.d.ts

@@ -1,3 +1,4 @@
+import odbc from "odbc";
 import { PsqlConfiguration } from "./configuration";
 import { ERPResponse } from "../../types/erp-types";
 type PagingParams = {
@@ -5,8 +6,10 @@ type PagingParams = {
     offset?: number;
 };
 export declare class PsqlService {
+    private connection;
     private config;
     constructor(config: PsqlConfiguration);
+    dispose(): Promise<void>;
     /**
      * Build PSQL ODBC connection string
      * CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
@@ -14,7 +17,7 @@ export declare class PsqlService {
     private buildConnectionString;
     /**
      * 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)
@@ -22,15 +25,25 @@ export declare class PsqlService {
      * @returns The entities fetched from the database, along with paging information
      */
     executePreparedStatement(query: string, params?: Record<string, string>, paging?: PagingParams): Promise<ERPResponse | undefined>;
+    /**
+     * Opens a connection to PSQL database
+     * Caches the connection so that it can be reused.
+     * On failure to connect, throws
+     */
+    openConnection(): Promise<odbc.Connection>;
     /**
      * 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: any[]): Record<string, string>[];
     /**
      * Handle ODBC errors and provide meaningful messages
      */
     private handleOdbcError;
+    private closeConnection;
 }
 export {};
 //# sourceMappingURL=psql-service.d.ts.map

package/dist/services/psql-erp-service/psql-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"psql-service.d.ts","sourceRoot":"","sources":["../../../src/services/psql-erp-service/psql-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAoB;gBAEtB,MAAM,EAAE,iBAAiB;IASrC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAe7B;;;;;;;;OAQG;IACU,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACnC,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAqEnC;;;OAGG;WACW,kBAAkB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;IAkB5E;;OAEG;IACH,OAAO,CAAC,eAAe;CA4BxB"}
+{"version":3,"file":"psql-service.d.ts","sourceRoot":"","sources":["../../../src/services/psql-erp-service/psql-service.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,MAAM,CAAoB;gBAEtB,MAAM,EAAE,iBAAiB;IAI/B,OAAO;IAIb;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAgB7B;;;;;;;;OAQG;IACU,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACnC,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAsDnC;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;IA4BhD;;;;;;OAMG;WACW,kBAAkB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;IAmB5E;;OAEG;IACH,OAAO,CAAC,eAAe;YA6BT,eAAe;CAa9B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@machinemetrics/mm-erp-sdk",
   "description": "A library for syncing data between MachineMetrics and ERP systems",
-  "version": "0.1.7-beta.1",
+  "version": "0.1.7-beta.3",
   "license": "MIT",
   "author": "machinemetrics",
   "main": "dist/mm-erp-sdk.js",

package/src/services/data-sync-service/data-sync-service.ts

@@ -45,11 +45,6 @@ export const runDataSyncService = async (connectorPath: string) => {
           // Pass through all other environment variables that might be needed
           ...process.env,
         },
-
-        // Add worker options for better isolation and cleanup
-        execArgv: [
-          "--expose-gc", // Allow manual garbage collection
-        ],
       },
 
       jobs: [

package/src/services/psql-erp-service/psql-service.ts

@@ -10,22 +10,23 @@ type PagingParams = {
 };
 
 export class PsqlService {
+  private connection: odbc.Connection | null = null;
   private config: PsqlConfiguration;
 
   constructor(config: PsqlConfiguration) {
     this.config = config;
   }
 
-  // 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)
    */
   private buildConnectionString(): string {
+    // PSQL requires ServerName in format IP.PORT (not IP:PORT)
     const serverName = `${this.config.host}.${this.config.port}`;
 
     return (
@@ -42,7 +43,7 @@ export 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)
@@ -54,14 +55,12 @@ export class PsqlService {
     params: Record<string, string> = {},
     paging?: PagingParams
   ): Promise<ERPResponse | undefined> {
-    let connection: odbc.Connection | null = null;
+    const connection = await this.openConnection();
 
+    let records;
     try {
-      // Create fresh connection for THIS query only
-      const connStr = this.buildConnectionString();
-      logger.debug("Creating fresh PSQL connection for query");
-      connection = await odbc.connect(connStr);
-
+      // For Phase 1 (read-only), we execute queries directly
+      // Phase 2 will add proper parameter binding for INSERT/UPDATE/DELETE
       if (Object.keys(params).length > 0) {
         logger.warn(
           "PsqlService: Query parameters provided but parameter binding not yet implemented. " +
@@ -69,62 +68,85 @@ export class PsqlService {
         );
       }
 
-      const records = await connection.query(query);
-      const allRecords = PsqlService.recordsetToRecords(records);
-      const rowsFetched = allRecords.length;
-
-      // Apply paging if requested
-      const pagedData =
-        paging?.offset !== undefined || paging?.limit !== undefined
-          ? 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)
-              : undefined,
-          previousPage: paging?.offset
-            ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10)))
-            : undefined,
-        },
-      };
+      records = await connection.query(query);
     } catch (error) {
       const errorInfo = error as OdbcErrorResponse;
       logger.error("Error fetching data from PSQL", {
         error: errorInfo.message,
         odbcErrors: errorInfo.odbcErrors,
-        query: query.substring(0, 200), // Log first 200 chars of query
       });
 
       throw this.handleOdbcError(errorInfo);
-    } finally {
-      // CRITICAL: Always close connection, even on error
-      if (connection) {
-        try {
-          await connection.close();
-          logger.debug("PSQL connection closed successfully");
-        } catch (err) {
-          // Don't throw on close errors, just log
-          logger.warn("Error closing PSQL connection (non-fatal)", {
-            error: err,
-          });
-        }
-      }
+    }
+
+    const allRecords = PsqlService.recordsetToRecords(records);
+    const rowsFetched = allRecords.length;
+
+    // Apply paging if requested
+    const pagedData =
+      paging?.offset !== undefined || paging?.limit !== undefined
+        ? 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)
+            : undefined,
+        previousPage: paging?.offset
+          ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10)))
+          : undefined,
+      },
+    };
+  }
+
+  /**
+   * Opens a connection to PSQL database
+   * Caches the connection so that it can be reused.
+   * On failure to connect, throws
+   */
+  async openConnection(): Promise<odbc.Connection> {
+    // If we have a connection, reuse it
+    // Note: ODBC connections don't have a .connected property like SQL Server
+    // We'll keep it simple and reuse if not null
+    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 as OdbcErrorResponse);
     }
   }
 
   /**
    * 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
    */
   public static recordsetToRecords(recordset: any[]): Record<string, string>[] {
     if (!Array.isArray(recordset)) {
@@ -135,6 +157,7 @@ export class PsqlService {
       const transformedRow: Record<string, string> = {};
       Object.keys(row).forEach((key) => {
         const value = row[key];
+        // Convert to string and trim (PSQL CHAR fields have trailing spaces)
         transformedRow[key] =
           value !== null && value !== undefined ? String(value).trim() : "";
       });
@@ -175,4 +198,18 @@ export class PsqlService {
         return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
     }
   }
+
+  private async closeConnection(): Promise<void> {
+    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;
+    }
+  }
 }