@machinemetrics/mm-erp-sdk 0.1.8-beta.8 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/README.md +2 -1
  2. package/dist/{config-qat9zgOl.js → config-cB7h4yvc.js} +2 -2
  3. package/dist/{config-qat9zgOl.js.map → config-cB7h4yvc.js.map} +1 -1
  4. package/dist/{connector-factory-C2czCs9v.js → connector-factory-CKm74_WZ.js} +2 -2
  5. package/dist/{connector-factory-C2czCs9v.js.map → connector-factory-CKm74_WZ.js.map} +1 -1
  6. package/dist/{hashed-cache-manager-CzyFSt2B.js → hashed-cache-manager-Ds-HksA0.js} +34 -4
  7. package/dist/hashed-cache-manager-Ds-HksA0.js.map +1 -0
  8. package/dist/{index-B9wo8pld.js → index-DTtmv8Iq.js} +16 -5
  9. package/dist/index-DTtmv8Iq.js.map +1 -0
  10. package/dist/index.d.ts +6 -4
  11. package/dist/index.d.ts.map +1 -1
  12. package/dist/{logger-Db8CkwR6.js → logger-CBDNtsMq.js} +62 -11
  13. package/dist/{logger-Db8CkwR6.js.map → logger-CBDNtsMq.js.map} +1 -1
  14. package/dist/mm-erp-sdk.js +256 -17
  15. package/dist/mm-erp-sdk.js.map +1 -1
  16. package/dist/services/data-sync-service/configuration-manager.d.ts +5 -0
  17. package/dist/services/data-sync-service/configuration-manager.d.ts.map +1 -1
  18. package/dist/services/data-sync-service/jobs/clean-up-expired-cache.js +4 -4
  19. package/dist/services/data-sync-service/jobs/from-erp.js +4 -4
  20. package/dist/services/data-sync-service/jobs/retry-failed-labor-tickets.js +3 -3
  21. package/dist/services/data-sync-service/jobs/run-migrations.js +1 -1
  22. package/dist/services/data-sync-service/jobs/to-erp.js +3 -3
  23. package/dist/services/psql-erp-service/configuration.d.ts +8 -0
  24. package/dist/services/psql-erp-service/configuration.d.ts.map +1 -0
  25. package/dist/services/psql-erp-service/index.d.ts +14 -0
  26. package/dist/services/psql-erp-service/index.d.ts.map +1 -0
  27. package/dist/services/psql-erp-service/internal/types/psql-types.d.ts +12 -0
  28. package/dist/services/psql-erp-service/internal/types/psql-types.d.ts.map +1 -0
  29. package/dist/services/psql-erp-service/psql-helpers.d.ts +32 -0
  30. package/dist/services/psql-erp-service/psql-helpers.d.ts.map +1 -0
  31. package/dist/services/psql-erp-service/psql-service.d.ts +50 -0
  32. package/dist/services/psql-erp-service/psql-service.d.ts.map +1 -0
  33. package/dist/services/reporting-service/logger.d.ts.map +1 -1
  34. package/dist/utils/index.d.ts +1 -1
  35. package/dist/utils/index.d.ts.map +1 -1
  36. package/dist/utils/local-data-store/jobs-shared-data.d.ts +15 -1
  37. package/dist/utils/local-data-store/jobs-shared-data.d.ts.map +1 -1
  38. package/dist/utils/time-utils.d.ts +2 -1
  39. package/dist/utils/time-utils.d.ts.map +1 -1
  40. package/dist/utils/timezone.d.ts +6 -3
  41. package/dist/utils/timezone.d.ts.map +1 -1
  42. package/package.json +4 -1
  43. package/src/index.ts +31 -6
  44. package/src/services/data-sync-service/configuration-manager.ts +33 -0
  45. package/src/services/psql-erp-service/configuration.ts +7 -0
  46. package/src/services/psql-erp-service/index.ts +22 -0
  47. package/src/services/psql-erp-service/internal/types/psql-types.ts +13 -0
  48. package/src/services/psql-erp-service/psql-helpers.ts +114 -0
  49. package/src/services/psql-erp-service/psql-service.ts +247 -0
  50. package/src/services/reporting-service/logger.ts +73 -11
  51. package/src/utils/application-initializer.ts +1 -1
  52. package/src/utils/index.ts +4 -1
  53. package/src/utils/local-data-store/jobs-shared-data.ts +24 -1
  54. package/src/utils/time-utils.ts +11 -6
  55. package/src/utils/timezone.ts +9 -6
  56. package/dist/hashed-cache-manager-CzyFSt2B.js.map +0 -1
  57. package/dist/index-B9wo8pld.js.map +0 -1
@@ -1,14 +1,14 @@
1
- import { C as CoreConfiguration, H as HashedCacheManager } from "./hashed-cache-manager-CzyFSt2B.js";
2
- import { E, g, a } from "./hashed-cache-manager-CzyFSt2B.js";
3
- import { l as logger } from "./logger-Db8CkwR6.js";
4
- import { g as getCachedMMToken, s as setCachedMMToken, a as setTimezoneOffsetInCache, b as getCachedTimezoneOffset, S as SQLiteCoordinator } from "./index-B9wo8pld.js";
5
- import { c, d } from "./index-B9wo8pld.js";
1
+ import { C as CoreConfiguration, H as HashedCacheManager } from "./hashed-cache-manager-Ds-HksA0.js";
2
+ import { E, g, a } from "./hashed-cache-manager-Ds-HksA0.js";
3
+ import { l as logger } from "./logger-CBDNtsMq.js";
4
+ import { g as getCachedMMToken, s as setCachedMMToken, a as setTimezoneOffsetInCache, b as setTimezoneNameInCache, c as getCachedTimezoneOffset, S as SQLiteCoordinator } from "./index-DTtmv8Iq.js";
5
+ import { f, d, e } from "./index-DTtmv8Iq.js";
6
6
  import axios, { AxiosError } from "axios";
7
7
  import knex from "knex";
8
8
  import { c as config } from "./knexfile-1qKKIORB.js";
9
9
  import fs from "fs";
10
10
  import path from "path";
11
- import "./connector-factory-C2czCs9v.js";
11
+ import "./connector-factory-CKm74_WZ.js";
12
12
  import Bree from "bree";
13
13
  import Graceful from "@ladjs/graceful";
14
14
  import { fileURLToPath } from "url";
@@ -242,9 +242,9 @@ class AxiosClient {
242
242
  async destroy() {
243
243
  if (this.isDestroyed) return;
244
244
  this.isDestroyed = true;
245
- for (const c2 of this.inFlightControllers) {
245
+ for (const c of this.inFlightControllers) {
246
246
  try {
247
- c2.abort();
247
+ c.abort();
248
248
  } catch {
249
249
  }
250
250
  }
@@ -1425,12 +1425,14 @@ const getTimezoneOffset = async () => {
1425
1425
  if (!userInfo?.company?.timezone) {
1426
1426
  throw new Error("Unable to retrieve company timezone from API");
1427
1427
  }
1428
+ const timezone = userInfo.company.timezone;
1428
1429
  const date = /* @__PURE__ */ new Date();
1429
1430
  const utcDate = new Date(date.toLocaleString("en-US", { timeZone: "UTC" }));
1430
1431
  const tzDate = new Date(
1431
- date.toLocaleString("en-US", { timeZone: userInfo.company.timezone })
1432
+ date.toLocaleString("en-US", { timeZone: timezone })
1432
1433
  );
1433
- return (tzDate.getTime() - utcDate.getTime()) / 36e5;
1434
+ const offset = (tzDate.getTime() - utcDate.getTime()) / 36e5;
1435
+ return { offset, timezone };
1434
1436
  } catch (error) {
1435
1437
  throw new Error(
1436
1438
  `Failed to get timezone offset: ${error instanceof Error ? error.message : "Unknown error"}`
@@ -1517,13 +1519,14 @@ const getTimezoneOffsetAndPersist = async (params = {
1517
1519
  let success = false;
1518
1520
  let retries = 0;
1519
1521
  logger.info(
1520
- "Acquiring the timezone offset from MachineMetrics and storing in cache"
1522
+ "Acquiring the timezone offset and timezone name from MachineMetrics and storing in cache"
1521
1523
  );
1522
1524
  while (!success && retries < params.maxRetries) {
1523
1525
  try {
1524
- const offsetHours = await getTimezoneOffset();
1525
- logger.info(`Timezone offset: ${offsetHours} hours`);
1526
- setTimezoneOffsetInCache(offsetHours);
1526
+ const { offset, timezone } = await getTimezoneOffset();
1527
+ logger.info(`Timezone offset: ${offset} hours, timezone: ${timezone}`);
1528
+ setTimezoneOffsetInCache(offset);
1529
+ setTimezoneNameInCache(timezone);
1527
1530
  success = true;
1528
1531
  } catch (error) {
1529
1532
  logger.error("Error getting timezone offset:", error);
@@ -3439,7 +3442,7 @@ class ApplicationInitializer {
3439
3442
  "\n================================INITIALIZING APPLICATION================================\n"
3440
3443
  );
3441
3444
  const coreConfig = CoreConfiguration.inst();
3442
- logger.info("Core Configuration loaded:", coreConfig);
3445
+ logger.info("Core Configuration loaded:", coreConfig.toSafeLogObject());
3443
3446
  logger.info("Performing database startup checks...");
3444
3447
  await SQLiteCoordinator.performStartupCheck();
3445
3448
  logger.info("Database startup checks completed successfully");
@@ -3972,6 +3975,235 @@ class SqlServerHelper {
3972
3975
  logger.info("----------------------------------------");
3973
3976
  }
3974
3977
  }
3978
+ class PsqlService {
3979
+ config;
3980
+ static odbcModule = null;
3981
+ static odbcLoadError = null;
3982
+ constructor(config2) {
3983
+ this.config = config2;
3984
+ }
3985
+ /**
3986
+ * Dynamically load the ODBC module with lazy initialization and caching
3987
+ * @throws Error with helpful message if ODBC package is not installed
3988
+ */
3989
+ static async getOdbc() {
3990
+ if (this.odbcLoadError) {
3991
+ throw this.odbcLoadError;
3992
+ }
3993
+ if (this.odbcModule) {
3994
+ return this.odbcModule;
3995
+ }
3996
+ try {
3997
+ const odbcImport = await import("odbc");
3998
+ const odbc = odbcImport.default || odbcImport;
3999
+ this.odbcModule = odbc;
4000
+ return this.odbcModule;
4001
+ } catch (error) {
4002
+ const errorMessage = error instanceof Error ? error.message : String(error);
4003
+ this.odbcLoadError = new Error(
4004
+ `ODBC package is required for PSQL service but is not installed or failed to load.
4005
+ Install it with: npm install odbc
4006
+ Also install OS-level dependencies, e.g. on Alpine Linux:
4007
+ apk add --no-cache unixodbc unixodbc-dev python3 make g++
4008
+ For other Linux distributions, install unixodbc and unixodbc-dev packages.
4009
+ Original error: ${errorMessage}`
4010
+ );
4011
+ throw this.odbcLoadError;
4012
+ }
4013
+ }
4014
+ // REMOVED: dispose() method - not needed anymore
4015
+ // REMOVED: connection property - not needed anymore
4016
+ // REMOVED: openConnection() method - not needed anymore
4017
+ // REMOVED: closeConnection() method - not needed anymore
4018
+ /**
4019
+ * Build PSQL ODBC connection string
4020
+ * CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
4021
+ */
4022
+ buildConnectionString() {
4023
+ const serverName = `${this.config.host}.${this.config.port}`;
4024
+ return [
4025
+ "Driver={Pervasive ODBC Interface}",
4026
+ `ServerName=${serverName}`,
4027
+ `DBQ=${this.config.database}`,
4028
+ `UID=${this.config.username}`,
4029
+ `PWD=${this.config.password}`,
4030
+ "AutoDoubleQuote=0"
4031
+ ].join(";") + ";";
4032
+ }
4033
+ /**
4034
+ * Execute a query and return the results
4035
+ * Creates a fresh connection for each query to avoid handle corruption
4036
+ *
4037
+ * SECURITY WARNING: This method executes the provided SQL string as-is.
4038
+ * - Parameter binding is NOT implemented; the `params` argument is currently ignored.
4039
+ * - Never concatenate untrusted/user-supplied input into `query`.
4040
+ * - Doing so can result in SQL injection vulnerabilities and data exposure.
4041
+ * If dynamic values are required, ensure they are strictly validated/escaped
4042
+ * or implement proper parameterized execution before accepting untrusted input.
4043
+ *
4044
+ * @param query The SQL query to execute
4045
+ * @param params Query parameters (currently unused for PSQL read operations)
4046
+ * @param paging Optional paging parameters
4047
+ * @returns The entities fetched from the database, along with paging information
4048
+ */
4049
+ async executePreparedStatement(query, params = {}, paging) {
4050
+ const odbc = await PsqlService.getOdbc();
4051
+ let connection = null;
4052
+ try {
4053
+ const connStr = this.buildConnectionString();
4054
+ logger.debug("Creating fresh PSQL connection for query");
4055
+ connection = await odbc.connect(connStr);
4056
+ if (Object.keys(params).length > 0) {
4057
+ logger.warn(
4058
+ "PsqlService: Query parameters provided but parameter binding not yet implemented. Using direct query execution."
4059
+ );
4060
+ }
4061
+ const records = await connection.query(query);
4062
+ const allRecords = PsqlService.recordsetToRecords(records);
4063
+ const rowsFetched = allRecords.length;
4064
+ const pagedData = paging?.offset !== void 0 || paging?.limit !== void 0 ? allRecords.slice(
4065
+ paging.offset || 0,
4066
+ (paging.offset || 0) + (paging.limit || allRecords.length)
4067
+ ) : allRecords;
4068
+ return {
4069
+ data: pagedData,
4070
+ paging: {
4071
+ count: rowsFetched,
4072
+ limit: paging?.limit || 0,
4073
+ offset: paging?.offset || 0,
4074
+ nextPage: paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched ? String((paging.offset || 0) + paging.limit) : void 0,
4075
+ previousPage: paging?.offset ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10))) : void 0
4076
+ }
4077
+ };
4078
+ } catch (error) {
4079
+ if (error instanceof Error && error.message.includes("ODBC package is required")) {
4080
+ throw error;
4081
+ }
4082
+ const errorInfo = error;
4083
+ logger.error("Error fetching data from PSQL", {
4084
+ error: errorInfo.message,
4085
+ odbcErrors: errorInfo.odbcErrors,
4086
+ query: query.substring(0, 200)
4087
+ // Log first 200 chars of query
4088
+ });
4089
+ throw this.handleOdbcError(errorInfo);
4090
+ } finally {
4091
+ if (connection) {
4092
+ try {
4093
+ await connection.close();
4094
+ logger.debug("PSQL connection closed successfully");
4095
+ } catch (err) {
4096
+ logger.warn("Error closing PSQL connection (non-fatal)", {
4097
+ error: err
4098
+ });
4099
+ }
4100
+ }
4101
+ }
4102
+ }
4103
+ /**
4104
+ * Transform ODBC result set to array of Record<string, string> instances.
4105
+ * IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
4106
+ */
4107
+ static recordsetToRecords(recordset) {
4108
+ if (!Array.isArray(recordset)) {
4109
+ return [];
4110
+ }
4111
+ const data = recordset.map((row) => {
4112
+ const transformedRow = {};
4113
+ Object.keys(row).forEach((key) => {
4114
+ const value = row[key];
4115
+ transformedRow[key] = value !== null && value !== void 0 ? String(value).trim() : "";
4116
+ });
4117
+ return transformedRow;
4118
+ });
4119
+ return data;
4120
+ }
4121
+ /**
4122
+ * Handle ODBC errors and provide meaningful messages
4123
+ */
4124
+ handleOdbcError(error) {
4125
+ const odbcError = error.odbcErrors?.[0];
4126
+ const errorCode = odbcError?.state;
4127
+ const message = odbcError?.message || error.message;
4128
+ switch (errorCode) {
4129
+ case "08S01":
4130
+ return new Error(
4131
+ `PSQL connection failed. Check: 1) PVSW environment variable set to /usr/local/psql/etc/pvsw.ini, 2) Network connectivity to ports 1583/3351, 3) ODBC configuration files in /usr/local/psql/etc/ and /etc/. Original error: ${message}`
4132
+ );
4133
+ case "28000":
4134
+ return new Error(
4135
+ `PSQL authentication failed. Check username/password. Original error: ${message}`
4136
+ );
4137
+ case "42000":
4138
+ return new Error(`PSQL SQL syntax error. Original error: ${message}`);
4139
+ case "42S02":
4140
+ return new Error(
4141
+ `PSQL table or view not found. Check table names in query. Original error: ${message}`
4142
+ );
4143
+ default:
4144
+ return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
4145
+ }
4146
+ }
4147
+ }
4148
+ function formatPsqlDate(psqlDate) {
4149
+ if (!psqlDate || psqlDate.trim().length !== 6 || psqlDate === "000000") {
4150
+ return null;
4151
+ }
4152
+ try {
4153
+ const year = parseInt(psqlDate.substring(0, 2), 10);
4154
+ const month = parseInt(psqlDate.substring(2, 4), 10);
4155
+ const day = parseInt(psqlDate.substring(4, 6), 10);
4156
+ const fullYear = year + 2e3;
4157
+ if (month < 1 || month > 12 || day < 1 || day > 31) {
4158
+ return null;
4159
+ }
4160
+ const date = new Date(fullYear, month - 1, day);
4161
+ if (date.getFullYear() !== fullYear || date.getMonth() !== month - 1 || date.getDate() !== day) {
4162
+ return null;
4163
+ }
4164
+ return date.toISOString().split("T")[0];
4165
+ } catch (error) {
4166
+ return null;
4167
+ }
4168
+ }
4169
+ function formatPsqlTime(psqlTime) {
4170
+ if (!psqlTime) {
4171
+ return null;
4172
+ }
4173
+ const trimmed = psqlTime.trim();
4174
+ if (trimmed.length !== 4) {
4175
+ return null;
4176
+ }
4177
+ try {
4178
+ const hours = parseInt(trimmed.substring(0, 2), 10);
4179
+ const minutes = parseInt(trimmed.substring(2, 4), 10);
4180
+ if (isNaN(hours) || isNaN(minutes) || hours < 0 || hours > 23 || minutes < 0 || minutes > 59) {
4181
+ return null;
4182
+ }
4183
+ const hoursStr = hours.toString().padStart(2, "0");
4184
+ const minutesStr = minutes.toString().padStart(2, "0");
4185
+ return `${hoursStr}:${minutesStr}:00`;
4186
+ } catch (error) {
4187
+ return null;
4188
+ }
4189
+ }
4190
+ function combinePsqlDateTime(psqlDate, psqlTime) {
4191
+ const date = formatPsqlDate(psqlDate);
4192
+ const time = formatPsqlTime(psqlTime);
4193
+ if (!date || !time) {
4194
+ return null;
4195
+ }
4196
+ return `${date}T${time}`;
4197
+ }
4198
+ function isPsqlDateEmpty(psqlDate) {
4199
+ return !psqlDate || psqlDate === "000000" || psqlDate.trim() === "";
4200
+ }
4201
+ function cleanPsqlCharField(value) {
4202
+ if (value === null || value === void 0) {
4203
+ return "";
4204
+ }
4205
+ return String(value).trim();
4206
+ }
3975
4207
  export {
3976
4208
  ApplicationInitializer,
3977
4209
  BatchCacheManager,
@@ -3998,6 +4230,7 @@ export {
3998
4230
  MMSendWorkOrder,
3999
4231
  MMSendWorkOrderOperation,
4000
4232
  OAuthClient,
4233
+ PsqlService,
4001
4234
  RecordTrackingManager,
4002
4235
  RestAPIService,
4003
4236
  SqlServerHelper,
@@ -4007,21 +4240,27 @@ export {
4007
4240
  addNewFieldFromLookupField,
4008
4241
  applyTimezoneOffsetsToFields,
4009
4242
  buildLogicalCondition,
4243
+ cleanPsqlCharField,
4010
4244
  cleanupNumbers,
4245
+ combinePsqlDateTime,
4011
4246
  convertToLocalTime,
4012
4247
  formatDateWithTZOffset,
4248
+ formatPsqlDate,
4249
+ formatPsqlTime,
4250
+ f as getCachedTimezoneName,
4013
4251
  getCachedTimezoneOffset,
4014
4252
  g as getErpApiConnectionParams,
4015
4253
  getErrorType,
4016
- c as getInitialLoadComplete,
4254
+ d as getInitialLoadComplete,
4017
4255
  getPayloadWithoutIDField,
4018
4256
  a as getSQLServerConfiguration,
4019
4257
  getUniqueRows,
4258
+ isPsqlDateEmpty,
4020
4259
  config as knexDatabaseConfig,
4021
4260
  logger,
4022
4261
  removeExtraneousFields,
4023
4262
  runDataSyncService,
4024
- d as setInitialLoadComplete,
4263
+ e as setInitialLoadComplete,
4025
4264
  trimObjectValues
4026
4265
  };
4027
4266
  //# sourceMappingURL=mm-erp-sdk.js.map