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

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 (56) hide show
  1. package/dist/{config-qat9zgOl.js → config-CV-KosWV.js} +2 -2
  2. package/dist/{config-qat9zgOl.js.map → config-CV-KosWV.js.map} +1 -1
  3. package/dist/{connector-factory-C2czCs9v.js → connector-factory-D8v6aQIt.js} +2 -2
  4. package/dist/{connector-factory-C2czCs9v.js.map → connector-factory-D8v6aQIt.js.map} +1 -1
  5. package/dist/{hashed-cache-manager-CzyFSt2B.js → hashed-cache-manager-B6hTDLxU.js} +4 -4
  6. package/dist/{hashed-cache-manager-CzyFSt2B.js.map → hashed-cache-manager-B6hTDLxU.js.map} +1 -1
  7. package/dist/{index-B9wo8pld.js → index-Bg76oouR.js} +2 -2
  8. package/dist/{index-B9wo8pld.js.map → index-Bg76oouR.js.map} +1 -1
  9. package/dist/index.d.ts +3 -5
  10. package/dist/index.d.ts.map +1 -1
  11. package/dist/{logger-Db8CkwR6.js → logger-SqdNut1H.js} +1040 -934
  12. package/dist/logger-SqdNut1H.js.map +1 -0
  13. package/dist/mm-erp-sdk.js +14 -296
  14. package/dist/mm-erp-sdk.js.map +1 -1
  15. package/dist/services/data-sync-service/data-sync-service.d.ts.map +1 -1
  16. package/dist/services/data-sync-service/jobs/clean-up-expired-cache.js +4 -4
  17. package/dist/services/data-sync-service/jobs/from-erp.d.ts.map +1 -1
  18. package/dist/services/data-sync-service/jobs/from-erp.js +8 -25
  19. package/dist/services/data-sync-service/jobs/from-erp.js.map +1 -1
  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.d.ts.map +1 -1
  23. package/dist/services/data-sync-service/jobs/to-erp.js +7 -24
  24. package/dist/services/data-sync-service/jobs/to-erp.js.map +1 -1
  25. package/dist/services/reporting-service/logger.d.ts.map +1 -1
  26. package/dist/types/erp-types.d.ts +1 -2
  27. package/dist/types/erp-types.d.ts.map +1 -1
  28. package/package.json +1 -3
  29. package/src/index.ts +5 -27
  30. package/src/services/data-sync-service/data-sync-service.ts +3 -38
  31. package/src/services/data-sync-service/jobs/from-erp.ts +6 -35
  32. package/src/services/data-sync-service/jobs/to-erp.ts +5 -35
  33. package/src/services/reporting-service/logger.ts +86 -11
  34. package/src/types/erp-types.ts +0 -1
  35. package/dist/logger-Db8CkwR6.js.map +0 -1
  36. package/dist/services/psql-erp-service/configuration.d.ts +0 -10
  37. package/dist/services/psql-erp-service/configuration.d.ts.map +0 -1
  38. package/dist/services/psql-erp-service/index.d.ts +0 -19
  39. package/dist/services/psql-erp-service/index.d.ts.map +0 -1
  40. package/dist/services/psql-erp-service/internal/psql-config.d.ts +0 -28
  41. package/dist/services/psql-erp-service/internal/psql-config.d.ts.map +0 -1
  42. package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts +0 -40
  43. package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts.map +0 -1
  44. package/dist/services/psql-erp-service/internal/types/psql-types.d.ts +0 -15
  45. package/dist/services/psql-erp-service/internal/types/psql-types.d.ts.map +0 -1
  46. package/dist/services/psql-erp-service/psql-helpers.d.ts +0 -32
  47. package/dist/services/psql-erp-service/psql-helpers.d.ts.map +0 -1
  48. package/dist/services/psql-erp-service/psql-service.d.ts +0 -49
  49. package/dist/services/psql-erp-service/psql-service.d.ts.map +0 -1
  50. package/src/services/psql-erp-service/configuration.ts +0 -9
  51. package/src/services/psql-erp-service/index.ts +0 -28
  52. package/src/services/psql-erp-service/internal/psql-config.ts +0 -13
  53. package/src/services/psql-erp-service/internal/psql-labor-ticket-operations.ts +0 -58
  54. package/src/services/psql-erp-service/internal/types/psql-types.ts +0 -17
  55. package/src/services/psql-erp-service/psql-helpers.ts +0 -90
  56. package/src/services/psql-erp-service/psql-service.ts +0 -215
@@ -1,20 +1,19 @@
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-B6hTDLxU.js";
2
+ import { E, g, a } from "./hashed-cache-manager-B6hTDLxU.js";
3
+ import { l as logger } from "./logger-SqdNut1H.js";
4
+ import { g as getCachedMMToken, s as setCachedMMToken, a as setTimezoneOffsetInCache, b as getCachedTimezoneOffset, S as SQLiteCoordinator } from "./index-Bg76oouR.js";
5
+ import { c, d } from "./index-Bg76oouR.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-D8v6aQIt.js";
12
12
  import Bree from "bree";
13
13
  import Graceful from "@ladjs/graceful";
14
14
  import { fileURLToPath } from "url";
15
15
  import sql from "mssql";
16
16
  import { z } from "zod";
17
- import odbc from "odbc";
18
17
  var ERPType = /* @__PURE__ */ ((ERPType2) => {
19
18
  ERPType2["INVALID"] = "INVALID";
20
19
  ERPType2["D365"] = "D365";
@@ -23,7 +22,6 @@ var ERPType = /* @__PURE__ */ ((ERPType2) => {
23
22
  ERPType2["PROSHOP"] = "PROSHOP";
24
23
  ERPType2["SYTELINE"] = "SYTELINE";
25
24
  ERPType2["TEMPLATE"] = "TEMPLATE";
26
- ERPType2["GLOBALSHOP"] = "GLOBALSHOP";
27
25
  return ERPType2;
28
26
  })(ERPType || {});
29
27
  var ERPObjType = /* @__PURE__ */ ((ERPObjType2) => {
@@ -3607,8 +3605,6 @@ const runDataSyncService = async (connectorPath) => {
3607
3605
  const bree = new Bree({
3608
3606
  root: jobsPath,
3609
3607
  logger,
3610
- // Enable worker metadata for debugging
3611
- outputWorkerMetadata: true,
3612
3608
  worker: {
3613
3609
  env: {
3614
3610
  CONNECTOR_PATH: connectorPath,
@@ -3632,25 +3628,20 @@ const runDataSyncService = async (connectorPath) => {
3632
3628
  {
3633
3629
  name: "from-erp",
3634
3630
  timeout: "10s",
3635
- interval: config2.fromErpInterval,
3636
- // Ensure worker terminates completely after execution
3637
- closeWorkerAfterMs: 1e3
3631
+ interval: config2.fromErpInterval
3638
3632
  },
3639
3633
  {
3640
3634
  name: "to-erp",
3641
3635
  //timeout: '3s', // Use timeout during development to see the job in action quickly
3642
- interval: config2.toErpInterval,
3643
- closeWorkerAfterMs: 1e3
3636
+ interval: config2.toErpInterval
3644
3637
  },
3645
3638
  {
3646
3639
  name: "retry-failed-labor-tickets",
3647
- interval: config2.retryLaborTicketsInterval,
3648
- closeWorkerAfterMs: 1e3
3640
+ interval: config2.retryLaborTicketsInterval
3649
3641
  },
3650
3642
  {
3651
3643
  name: "clean-up-expired-cache",
3652
- interval: config2.cacheExpirationCheckInterval,
3653
- closeWorkerAfterMs: 1e3
3644
+ interval: config2.cacheExpirationCheckInterval
3654
3645
  }
3655
3646
  ]
3656
3647
  });
@@ -3660,34 +3651,14 @@ const runDataSyncService = async (connectorPath) => {
3660
3651
  const jobsConfig = bree.config.jobs.map((job) => ({
3661
3652
  name: job.name,
3662
3653
  interval: job.interval,
3663
- timeout: job.timeout,
3664
- closeWorkerAfterMs: job.closeWorkerAfterMs
3654
+ timeout: job.timeout
3665
3655
  }));
3666
3656
  logger.info("JOBS CONFIGURATION:", { jobs: jobsConfig });
3667
3657
  const graceful = new Graceful({ brees: [bree] });
3668
3658
  graceful.listen();
3669
- bree.on("worker created", (name) => {
3670
- logger.debug(`Worker created for job: ${name}`);
3671
- });
3672
- bree.on("worker online", (name) => {
3673
- logger.debug(`Worker online for job: ${name}`);
3674
- });
3675
- bree.on("worker message", (name, message) => {
3676
- logger.debug(`Worker message from ${name}:`, message);
3677
- });
3678
- bree.on("worker deleted", (name) => {
3679
- logger.debug(`Worker deleted for job: ${name}`);
3680
- });
3681
- bree.on("worker exit", (name, code, signal) => {
3682
- if (code !== 0) {
3683
- logger.error(
3684
- `Worker ${name} exited with code ${code}, signal ${signal}`
3685
- );
3686
- } else {
3687
- logger.debug(`Worker ${name} exited successfully`);
3688
- }
3689
- });
3690
- await bree.start();
3659
+ (async () => {
3660
+ await bree.start();
3661
+ })();
3691
3662
  bree.on("jobStarted", (job) => {
3692
3663
  console.log("Job " + job.name + " started");
3693
3664
  });
@@ -3994,252 +3965,6 @@ class SqlServerHelper {
3994
3965
  logger.info("----------------------------------------");
3995
3966
  }
3996
3967
  }
3997
- class PsqlService {
3998
- connection = null;
3999
- config;
4000
- constructor(config2) {
4001
- this.config = config2;
4002
- }
4003
- async dispose() {
4004
- await this.closeConnection();
4005
- }
4006
- /**
4007
- * Build PSQL ODBC connection string
4008
- * CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
4009
- */
4010
- buildConnectionString() {
4011
- const serverName = `${this.config.host}.${this.config.port}`;
4012
- return [
4013
- "Driver={Pervasive ODBC Interface}",
4014
- `ServerName=${serverName}`,
4015
- `DBQ=${this.config.database}`,
4016
- `UID=${this.config.username}`,
4017
- `PWD=${this.config.password}`,
4018
- "AutoDoubleQuote=0"
4019
- ].join(";") + ";";
4020
- }
4021
- /**
4022
- * Execute a query and return the results
4023
- * Interface matches SqlServerService for consistency
4024
- *
4025
- * @param query The SQL query to execute
4026
- * @param params Query parameters (currently unused for PSQL read operations)
4027
- * @param paging Optional paging parameters
4028
- * @returns The entities fetched from the database, along with paging information
4029
- */
4030
- async executePreparedStatement(query, params = {}, paging) {
4031
- const connection = await this.openConnection();
4032
- let records;
4033
- try {
4034
- if (Object.keys(params).length > 0) {
4035
- logger.warn(
4036
- "PsqlService: Query parameters provided but parameter binding not yet implemented. Using direct query execution. This is acceptable for Phase 1 read operations."
4037
- );
4038
- }
4039
- records = await connection.query(query);
4040
- } catch (error) {
4041
- const errorInfo = error;
4042
- logger.error("Error fetching data from PSQL", {
4043
- error: errorInfo.message,
4044
- odbcErrors: errorInfo.odbcErrors
4045
- });
4046
- throw this.handleOdbcError(errorInfo);
4047
- }
4048
- const allRecords = PsqlService.recordsetToRecords(records);
4049
- const rowsFetched = allRecords.length;
4050
- const pagedData = paging?.offset !== void 0 || paging?.limit !== void 0 ? allRecords.slice(
4051
- paging.offset || 0,
4052
- (paging.offset || 0) + (paging.limit || allRecords.length)
4053
- ) : allRecords;
4054
- return {
4055
- data: pagedData,
4056
- paging: {
4057
- count: rowsFetched,
4058
- limit: paging?.limit || 0,
4059
- offset: paging?.offset || 0,
4060
- nextPage: paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched ? String((paging.offset || 0) + paging.limit) : void 0,
4061
- previousPage: paging?.offset ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10))) : void 0
4062
- }
4063
- };
4064
- }
4065
- /**
4066
- * Opens a connection to PSQL database
4067
- * Caches the connection so that it can be reused.
4068
- * On failure to connect, throws
4069
- */
4070
- async openConnection() {
4071
- if (this.connection) {
4072
- logger.debug("Reusing existing PSQL connection");
4073
- return this.connection;
4074
- }
4075
- try {
4076
- const connStr = this.buildConnectionString();
4077
- logger.info("Opening new PSQL connection");
4078
- logger.debug(
4079
- "Connection string (password hidden):",
4080
- connStr.replace(/PWD=[^;]+/, "PWD=***")
4081
- );
4082
- this.connection = await odbc.connect(connStr);
4083
- logger.info("Successfully connected to PSQL database");
4084
- return this.connection;
4085
- } catch (error) {
4086
- logger.error("PsqlService>>openConnection>> Connection failed", {
4087
- error
4088
- });
4089
- throw this.handleOdbcError(error);
4090
- }
4091
- }
4092
- /**
4093
- * Transform ODBC result set to array of Record<string, string> instances.
4094
- * IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
4095
- *
4096
- * @param recordset Result set from ODBC query
4097
- * @returns array of Record<string, string> instances
4098
- */
4099
- static recordsetToRecords(recordset) {
4100
- if (!Array.isArray(recordset)) {
4101
- return [];
4102
- }
4103
- const data = recordset.map((row) => {
4104
- const transformedRow = {};
4105
- Object.keys(row).forEach((key) => {
4106
- const value = row[key];
4107
- transformedRow[key] = value !== null && value !== void 0 ? String(value).trim() : "";
4108
- });
4109
- return transformedRow;
4110
- });
4111
- return data;
4112
- }
4113
- /**
4114
- * Handle ODBC errors and provide meaningful messages
4115
- */
4116
- handleOdbcError(error) {
4117
- const odbcError = error.odbcErrors?.[0];
4118
- const errorCode = odbcError?.state;
4119
- const message = odbcError?.message || error.message;
4120
- switch (errorCode) {
4121
- case "08S01":
4122
- return new Error(
4123
- `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}`
4124
- );
4125
- case "28000":
4126
- return new Error(
4127
- `PSQL authentication failed. Check username/password. Original error: ${message}`
4128
- );
4129
- case "42000":
4130
- return new Error(`PSQL SQL syntax error. Original error: ${message}`);
4131
- case "42S02":
4132
- return new Error(
4133
- `PSQL table or view not found. Check table names in query. Original error: ${message}`
4134
- );
4135
- default:
4136
- return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
4137
- }
4138
- }
4139
- async closeConnection() {
4140
- if (this.connection) {
4141
- logger.info("Closing PSQL connection");
4142
- try {
4143
- await this.connection.close();
4144
- } catch (error) {
4145
- logger.error("PsqlService::closeConnection: Error closing connection", {
4146
- error
4147
- });
4148
- }
4149
- this.connection = null;
4150
- }
4151
- }
4152
- }
4153
- class PsqlLaborTicketOperations {
4154
- constructor(service) {
4155
- this.service = service;
4156
- }
4157
- /**
4158
- * Create labor ticket in START_LABOR table
4159
- *
4160
- * Phase 2 Implementation Notes:
4161
- * - Will use prepared statements with parameter binding
4162
- * - Insert into START_LABOR table
4163
- * - Return GUID as erpUid
4164
- *
4165
- * @param laborTicket Labor ticket from MachineMetrics
4166
- * @returns Labor ticket and ERP unique ID
4167
- */
4168
- async createLaborTicket(laborTicket) {
4169
- logger.warn(
4170
- "PsqlLaborTicketOperations.createLaborTicket not yet implemented (Phase 2)"
4171
- );
4172
- throw new Error(
4173
- "Labor ticket creation not implemented for PSQL. This is a Phase 2 feature."
4174
- );
4175
- }
4176
- /**
4177
- * Update labor ticket (move from START_LABOR to COMPLETED_LABOR)
4178
- *
4179
- * Phase 2 Implementation Notes:
4180
- * - Insert into COMPLETED_LABOR
4181
- * - Delete from START_LABOR
4182
- * - Should be done in a transaction
4183
- *
4184
- * @param laborTicket Labor ticket to update
4185
- * @returns Updated labor ticket
4186
- */
4187
- async updateLaborTicket(laborTicket) {
4188
- logger.warn(
4189
- "PsqlLaborTicketOperations.updateLaborTicket not yet implemented (Phase 2)"
4190
- );
4191
- throw new Error(
4192
- "Labor ticket update not implemented for PSQL. This is a Phase 2 feature."
4193
- );
4194
- }
4195
- }
4196
- function formatPsqlDate(psqlDate) {
4197
- if (!psqlDate || psqlDate === "000000" || psqlDate.trim() === "") {
4198
- return null;
4199
- }
4200
- try {
4201
- const year = parseInt(psqlDate.substring(0, 2), 10);
4202
- const month = parseInt(psqlDate.substring(2, 4), 10);
4203
- const day = parseInt(psqlDate.substring(4, 6), 10);
4204
- const fullYear = year + 2e3;
4205
- if (month < 1 || month > 12 || day < 1 || day > 31) {
4206
- return null;
4207
- }
4208
- const date = new Date(fullYear, month - 1, day);
4209
- return date.toISOString().split("T")[0];
4210
- } catch (error) {
4211
- return null;
4212
- }
4213
- }
4214
- function formatPsqlTime(psqlTime) {
4215
- if (!psqlTime || psqlTime.trim() === "") {
4216
- return null;
4217
- }
4218
- try {
4219
- const hours = psqlTime.substring(0, 2);
4220
- const minutes = psqlTime.substring(2, 4);
4221
- return `${hours}:${minutes}:00`;
4222
- } catch (error) {
4223
- return null;
4224
- }
4225
- }
4226
- function combinePsqlDateTime(psqlDate, psqlTime) {
4227
- const date = formatPsqlDate(psqlDate);
4228
- const time = formatPsqlTime(psqlTime);
4229
- if (!date || !time) {
4230
- return null;
4231
- }
4232
- return `${date}T${time}`;
4233
- }
4234
- function isPsqlDateEmpty(psqlDate) {
4235
- return !psqlDate || psqlDate === "000000" || psqlDate.trim() === "";
4236
- }
4237
- function cleanPsqlCharField(value) {
4238
- if (value === null || value === void 0) {
4239
- return "";
4240
- }
4241
- return String(value).trim();
4242
- }
4243
3968
  export {
4244
3969
  ApplicationInitializer,
4245
3970
  BatchCacheManager,
@@ -4267,8 +3992,6 @@ export {
4267
3992
  MMSendWorkOrder,
4268
3993
  MMSendWorkOrderOperation,
4269
3994
  OAuthClient,
4270
- PsqlLaborTicketOperations,
4271
- PsqlService,
4272
3995
  RecordTrackingManager,
4273
3996
  RestAPIService,
4274
3997
  SqlServerHelper,
@@ -4278,13 +4001,9 @@ export {
4278
4001
  addNewFieldFromLookupField,
4279
4002
  applyTimezoneOffsetsToFields,
4280
4003
  buildLogicalCondition,
4281
- cleanPsqlCharField,
4282
4004
  cleanupNumbers,
4283
- combinePsqlDateTime,
4284
4005
  convertToLocalTime,
4285
4006
  formatDateWithTZOffset,
4286
- formatPsqlDate,
4287
- formatPsqlTime,
4288
4007
  getCachedTimezoneOffset,
4289
4008
  g as getErpApiConnectionParams,
4290
4009
  getErrorType,
@@ -4292,7 +4011,6 @@ export {
4292
4011
  getPayloadWithoutIDField,
4293
4012
  a as getSQLServerConfiguration,
4294
4013
  getUniqueRows,
4295
- isPsqlDateEmpty,
4296
4014
  config as knexDatabaseConfig,
4297
4015
  logger,
4298
4016
  removeExtraneousFields,