@machinemetrics/mm-erp-sdk 0.1.8-beta.3 → 0.1.8-beta.4
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.
- package/dist/{config-152LkbTv.js → config-qat9zgOl.js} +2 -2
- package/dist/{config-152LkbTv.js.map → config-qat9zgOl.js.map} +1 -1
- package/dist/{connector-factory-wivcyMhC.js → connector-factory-C2czCs9v.js} +2 -2
- package/dist/{connector-factory-wivcyMhC.js.map → connector-factory-C2czCs9v.js.map} +1 -1
- package/dist/{hashed-cache-manager-BnviJzB7.js → hashed-cache-manager-CzyFSt2B.js} +4 -4
- package/dist/{hashed-cache-manager-BnviJzB7.js.map → hashed-cache-manager-CzyFSt2B.js.map} +1 -1
- package/dist/{index-DNqHWa8F.js → index-B9wo8pld.js} +2 -2
- package/dist/{index-DNqHWa8F.js.map → index-B9wo8pld.js.map} +1 -1
- package/dist/index.d.ts +3 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/{logger-HAWySEbs.js → logger-Db8CkwR6.js} +11 -83
- package/dist/{logger-HAWySEbs.js.map → logger-Db8CkwR6.js.map} +1 -1
- package/dist/mm-erp-sdk.js +24 -234
- package/dist/mm-erp-sdk.js.map +1 -1
- package/dist/services/data-sync-service/jobs/clean-up-expired-cache.js +4 -4
- package/dist/services/data-sync-service/jobs/from-erp.js +4 -4
- package/dist/services/data-sync-service/jobs/retry-failed-labor-tickets.js +3 -3
- package/dist/services/data-sync-service/jobs/run-migrations.js +1 -1
- package/dist/services/data-sync-service/jobs/to-erp.d.ts.map +1 -1
- package/dist/services/data-sync-service/jobs/to-erp.js +3 -3
- package/dist/services/data-sync-service/jobs/to-erp.js.map +1 -1
- package/dist/services/reporting-service/logger.d.ts.map +1 -1
- package/dist/types/erp-types.d.ts +1 -2
- package/dist/types/erp-types.d.ts.map +1 -1
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/timezone.d.ts +7 -0
- package/dist/utils/timezone.d.ts.map +1 -1
- package/package.json +1 -3
- package/src/index.ts +5 -27
- package/src/services/data-sync-service/jobs/to-erp.ts +1 -2
- package/src/services/reporting-service/logger.ts +11 -94
- package/src/types/erp-types.ts +0 -1
- package/src/utils/index.ts +1 -1
- package/src/utils/mm-labor-ticket-helpers.ts +2 -2
- package/src/utils/timezone.ts +28 -0
- package/dist/services/psql-erp-service/configuration.d.ts +0 -10
- package/dist/services/psql-erp-service/configuration.d.ts.map +0 -1
- package/dist/services/psql-erp-service/index.d.ts +0 -19
- package/dist/services/psql-erp-service/index.d.ts.map +0 -1
- package/dist/services/psql-erp-service/internal/psql-config.d.ts +0 -28
- package/dist/services/psql-erp-service/internal/psql-config.d.ts.map +0 -1
- package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts +0 -40
- package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts.map +0 -1
- package/dist/services/psql-erp-service/internal/types/psql-types.d.ts +0 -15
- package/dist/services/psql-erp-service/internal/types/psql-types.d.ts.map +0 -1
- package/dist/services/psql-erp-service/psql-helpers.d.ts +0 -32
- package/dist/services/psql-erp-service/psql-helpers.d.ts.map +0 -1
- package/dist/services/psql-erp-service/psql-service.d.ts +0 -36
- package/dist/services/psql-erp-service/psql-service.d.ts.map +0 -1
- package/src/services/psql-erp-service/configuration.ts +0 -9
- package/src/services/psql-erp-service/index.ts +0 -28
- package/src/services/psql-erp-service/internal/psql-config.ts +0 -13
- package/src/services/psql-erp-service/internal/psql-labor-ticket-operations.ts +0 -58
- package/src/services/psql-erp-service/internal/types/psql-types.ts +0 -17
- package/src/services/psql-erp-service/psql-helpers.ts +0 -90
- package/src/services/psql-erp-service/psql-service.ts +0 -178
package/dist/mm-erp-sdk.js
CHANGED
|
@@ -1,20 +1,19 @@
|
|
|
1
|
-
import { C as CoreConfiguration, H as HashedCacheManager } from "./hashed-cache-manager-
|
|
2
|
-
import { E, g, a } from "./hashed-cache-manager-
|
|
3
|
-
import { l as logger } from "./logger-
|
|
4
|
-
import { g as getCachedMMToken, s as setCachedMMToken, a as setTimezoneOffsetInCache, b as getCachedTimezoneOffset, S as SQLiteCoordinator } from "./index-
|
|
5
|
-
import { c, d } from "./index-
|
|
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";
|
|
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-
|
|
11
|
+
import "./connector-factory-C2czCs9v.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) => {
|
|
@@ -1463,6 +1461,23 @@ const formatDateWithTZOffset = (date, timezoneOffset) => {
|
|
|
1463
1461
|
const minutes = Math.floor(absOffset % 1 * 60).toString().padStart(2, "0");
|
|
1464
1462
|
return `${isoDate}${sign}${hours}:${minutes}`;
|
|
1465
1463
|
};
|
|
1464
|
+
const toISOWithOffset = (date, timezoneOffset) => {
|
|
1465
|
+
const sign = timezoneOffset >= 0 ? "+" : "-";
|
|
1466
|
+
const abs = Math.abs(timezoneOffset);
|
|
1467
|
+
const hours = Math.floor(abs);
|
|
1468
|
+
const minutes = Math.round((abs - hours) * 60);
|
|
1469
|
+
const pad2 = (n) => n.toString().padStart(2, "0");
|
|
1470
|
+
const pad3 = (n) => n.toString().padStart(3, "0");
|
|
1471
|
+
const yyyy = date.getUTCFullYear();
|
|
1472
|
+
const MM = pad2(date.getUTCMonth() + 1);
|
|
1473
|
+
const dd = pad2(date.getUTCDate());
|
|
1474
|
+
const HH = pad2(date.getUTCHours());
|
|
1475
|
+
const mm = pad2(date.getUTCMinutes());
|
|
1476
|
+
const ss = pad2(date.getUTCSeconds());
|
|
1477
|
+
const SSS = pad3(date.getUTCMilliseconds());
|
|
1478
|
+
const off = `${sign}${pad2(hours)}:${pad2(minutes)}`;
|
|
1479
|
+
return `${yyyy}-${MM}-${dd}T${HH}:${mm}:${ss}.${SSS}${off}`;
|
|
1480
|
+
};
|
|
1466
1481
|
function calculateTimeDifferenceInHours(startTime, endTime, timezoneOffset) {
|
|
1467
1482
|
if (!startTime || !endTime) return 0;
|
|
1468
1483
|
const localStartTime = convertToLocalTime(startTime, timezoneOffset);
|
|
@@ -1645,7 +1660,7 @@ function convertLaborTicketToLocalTimezone(laborTicket, timezoneOffset) {
|
|
|
1645
1660
|
];
|
|
1646
1661
|
timeFields.forEach((field) => {
|
|
1647
1662
|
const localTime = convertToLocalTime(laborTicket[field], timezoneOffset);
|
|
1648
|
-
laborTicket[field] = localTime
|
|
1663
|
+
laborTicket[field] = localTime ? toISOWithOffset(localTime, timezoneOffset) : null;
|
|
1649
1664
|
});
|
|
1650
1665
|
return laborTicket;
|
|
1651
1666
|
}
|
|
@@ -3967,224 +3982,6 @@ class SqlServerHelper {
|
|
|
3967
3982
|
logger.info("----------------------------------------");
|
|
3968
3983
|
}
|
|
3969
3984
|
}
|
|
3970
|
-
class PsqlService {
|
|
3971
|
-
config;
|
|
3972
|
-
constructor(config2) {
|
|
3973
|
-
this.config = config2;
|
|
3974
|
-
}
|
|
3975
|
-
// REMOVED: dispose() method - not needed anymore
|
|
3976
|
-
// REMOVED: connection property - not needed anymore
|
|
3977
|
-
// REMOVED: openConnection() method - not needed anymore
|
|
3978
|
-
// REMOVED: closeConnection() method - not needed anymore
|
|
3979
|
-
/**
|
|
3980
|
-
* Build PSQL ODBC connection string
|
|
3981
|
-
* CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
|
|
3982
|
-
*/
|
|
3983
|
-
buildConnectionString() {
|
|
3984
|
-
const serverName = `${this.config.host}.${this.config.port}`;
|
|
3985
|
-
return [
|
|
3986
|
-
"Driver={Pervasive ODBC Interface}",
|
|
3987
|
-
`ServerName=${serverName}`,
|
|
3988
|
-
`DBQ=${this.config.database}`,
|
|
3989
|
-
`UID=${this.config.username}`,
|
|
3990
|
-
`PWD=${this.config.password}`,
|
|
3991
|
-
"AutoDoubleQuote=0"
|
|
3992
|
-
].join(";") + ";";
|
|
3993
|
-
}
|
|
3994
|
-
/**
|
|
3995
|
-
* Execute a query and return the results
|
|
3996
|
-
* Creates a fresh connection for each query to avoid handle corruption
|
|
3997
|
-
*
|
|
3998
|
-
* @param query The SQL query to execute
|
|
3999
|
-
* @param params Query parameters (currently unused for PSQL read operations)
|
|
4000
|
-
* @param paging Optional paging parameters
|
|
4001
|
-
* @returns The entities fetched from the database, along with paging information
|
|
4002
|
-
*/
|
|
4003
|
-
async executePreparedStatement(query, params = {}, paging) {
|
|
4004
|
-
let connection = null;
|
|
4005
|
-
try {
|
|
4006
|
-
const connStr = this.buildConnectionString();
|
|
4007
|
-
logger.debug("Creating fresh PSQL connection for query");
|
|
4008
|
-
connection = await odbc.connect(connStr);
|
|
4009
|
-
if (Object.keys(params).length > 0) {
|
|
4010
|
-
logger.warn(
|
|
4011
|
-
"PsqlService: Query parameters provided but parameter binding not yet implemented. Using direct query execution. This is acceptable for Phase 1 read operations."
|
|
4012
|
-
);
|
|
4013
|
-
}
|
|
4014
|
-
const records = await connection.query(query);
|
|
4015
|
-
const allRecords = PsqlService.recordsetToRecords(records);
|
|
4016
|
-
const rowsFetched = allRecords.length;
|
|
4017
|
-
const pagedData = paging?.offset !== void 0 || paging?.limit !== void 0 ? allRecords.slice(
|
|
4018
|
-
paging.offset || 0,
|
|
4019
|
-
(paging.offset || 0) + (paging.limit || allRecords.length)
|
|
4020
|
-
) : allRecords;
|
|
4021
|
-
return {
|
|
4022
|
-
data: pagedData,
|
|
4023
|
-
paging: {
|
|
4024
|
-
count: rowsFetched,
|
|
4025
|
-
limit: paging?.limit || 0,
|
|
4026
|
-
offset: paging?.offset || 0,
|
|
4027
|
-
nextPage: paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched ? String((paging.offset || 0) + paging.limit) : void 0,
|
|
4028
|
-
previousPage: paging?.offset ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10))) : void 0
|
|
4029
|
-
}
|
|
4030
|
-
};
|
|
4031
|
-
} catch (error) {
|
|
4032
|
-
const errorInfo = error;
|
|
4033
|
-
logger.error("Error fetching data from PSQL", {
|
|
4034
|
-
error: errorInfo.message,
|
|
4035
|
-
odbcErrors: errorInfo.odbcErrors,
|
|
4036
|
-
query: query.substring(0, 200)
|
|
4037
|
-
// Log first 200 chars of query
|
|
4038
|
-
});
|
|
4039
|
-
throw this.handleOdbcError(errorInfo);
|
|
4040
|
-
} finally {
|
|
4041
|
-
if (connection) {
|
|
4042
|
-
try {
|
|
4043
|
-
await connection.close();
|
|
4044
|
-
logger.debug("PSQL connection closed successfully");
|
|
4045
|
-
} catch (err) {
|
|
4046
|
-
logger.warn("Error closing PSQL connection (non-fatal)", {
|
|
4047
|
-
error: err
|
|
4048
|
-
});
|
|
4049
|
-
}
|
|
4050
|
-
}
|
|
4051
|
-
}
|
|
4052
|
-
}
|
|
4053
|
-
/**
|
|
4054
|
-
* Transform ODBC result set to array of Record<string, string> instances.
|
|
4055
|
-
* IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
|
|
4056
|
-
*/
|
|
4057
|
-
static recordsetToRecords(recordset) {
|
|
4058
|
-
if (!Array.isArray(recordset)) {
|
|
4059
|
-
return [];
|
|
4060
|
-
}
|
|
4061
|
-
const data = recordset.map((row) => {
|
|
4062
|
-
const transformedRow = {};
|
|
4063
|
-
Object.keys(row).forEach((key) => {
|
|
4064
|
-
const value = row[key];
|
|
4065
|
-
transformedRow[key] = value !== null && value !== void 0 ? String(value).trim() : "";
|
|
4066
|
-
});
|
|
4067
|
-
return transformedRow;
|
|
4068
|
-
});
|
|
4069
|
-
return data;
|
|
4070
|
-
}
|
|
4071
|
-
/**
|
|
4072
|
-
* Handle ODBC errors and provide meaningful messages
|
|
4073
|
-
*/
|
|
4074
|
-
handleOdbcError(error) {
|
|
4075
|
-
const odbcError = error.odbcErrors?.[0];
|
|
4076
|
-
const errorCode = odbcError?.state;
|
|
4077
|
-
const message = odbcError?.message || error.message;
|
|
4078
|
-
switch (errorCode) {
|
|
4079
|
-
case "08S01":
|
|
4080
|
-
return new Error(
|
|
4081
|
-
`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}`
|
|
4082
|
-
);
|
|
4083
|
-
case "28000":
|
|
4084
|
-
return new Error(
|
|
4085
|
-
`PSQL authentication failed. Check username/password. Original error: ${message}`
|
|
4086
|
-
);
|
|
4087
|
-
case "42000":
|
|
4088
|
-
return new Error(`PSQL SQL syntax error. Original error: ${message}`);
|
|
4089
|
-
case "42S02":
|
|
4090
|
-
return new Error(
|
|
4091
|
-
`PSQL table or view not found. Check table names in query. Original error: ${message}`
|
|
4092
|
-
);
|
|
4093
|
-
default:
|
|
4094
|
-
return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
|
|
4095
|
-
}
|
|
4096
|
-
}
|
|
4097
|
-
}
|
|
4098
|
-
class PsqlLaborTicketOperations {
|
|
4099
|
-
constructor(service) {
|
|
4100
|
-
this.service = service;
|
|
4101
|
-
}
|
|
4102
|
-
/**
|
|
4103
|
-
* Create labor ticket in START_LABOR table
|
|
4104
|
-
*
|
|
4105
|
-
* Phase 2 Implementation Notes:
|
|
4106
|
-
* - Will use prepared statements with parameter binding
|
|
4107
|
-
* - Insert into START_LABOR table
|
|
4108
|
-
* - Return GUID as erpUid
|
|
4109
|
-
*
|
|
4110
|
-
* @param laborTicket Labor ticket from MachineMetrics
|
|
4111
|
-
* @returns Labor ticket and ERP unique ID
|
|
4112
|
-
*/
|
|
4113
|
-
async createLaborTicket(laborTicket) {
|
|
4114
|
-
logger.warn(
|
|
4115
|
-
"PsqlLaborTicketOperations.createLaborTicket not yet implemented (Phase 2)"
|
|
4116
|
-
);
|
|
4117
|
-
throw new Error(
|
|
4118
|
-
"Labor ticket creation not implemented for PSQL. This is a Phase 2 feature."
|
|
4119
|
-
);
|
|
4120
|
-
}
|
|
4121
|
-
/**
|
|
4122
|
-
* Update labor ticket (move from START_LABOR to COMPLETED_LABOR)
|
|
4123
|
-
*
|
|
4124
|
-
* Phase 2 Implementation Notes:
|
|
4125
|
-
* - Insert into COMPLETED_LABOR
|
|
4126
|
-
* - Delete from START_LABOR
|
|
4127
|
-
* - Should be done in a transaction
|
|
4128
|
-
*
|
|
4129
|
-
* @param laborTicket Labor ticket to update
|
|
4130
|
-
* @returns Updated labor ticket
|
|
4131
|
-
*/
|
|
4132
|
-
async updateLaborTicket(laborTicket) {
|
|
4133
|
-
logger.warn(
|
|
4134
|
-
"PsqlLaborTicketOperations.updateLaborTicket not yet implemented (Phase 2)"
|
|
4135
|
-
);
|
|
4136
|
-
throw new Error(
|
|
4137
|
-
"Labor ticket update not implemented for PSQL. This is a Phase 2 feature."
|
|
4138
|
-
);
|
|
4139
|
-
}
|
|
4140
|
-
}
|
|
4141
|
-
function formatPsqlDate(psqlDate) {
|
|
4142
|
-
if (!psqlDate || psqlDate === "000000" || psqlDate.trim() === "") {
|
|
4143
|
-
return null;
|
|
4144
|
-
}
|
|
4145
|
-
try {
|
|
4146
|
-
const year = parseInt(psqlDate.substring(0, 2), 10);
|
|
4147
|
-
const month = parseInt(psqlDate.substring(2, 4), 10);
|
|
4148
|
-
const day = parseInt(psqlDate.substring(4, 6), 10);
|
|
4149
|
-
const fullYear = year + 2e3;
|
|
4150
|
-
if (month < 1 || month > 12 || day < 1 || day > 31) {
|
|
4151
|
-
return null;
|
|
4152
|
-
}
|
|
4153
|
-
const date = new Date(fullYear, month - 1, day);
|
|
4154
|
-
return date.toISOString().split("T")[0];
|
|
4155
|
-
} catch (error) {
|
|
4156
|
-
return null;
|
|
4157
|
-
}
|
|
4158
|
-
}
|
|
4159
|
-
function formatPsqlTime(psqlTime) {
|
|
4160
|
-
if (!psqlTime || psqlTime.trim() === "") {
|
|
4161
|
-
return null;
|
|
4162
|
-
}
|
|
4163
|
-
try {
|
|
4164
|
-
const hours = psqlTime.substring(0, 2);
|
|
4165
|
-
const minutes = psqlTime.substring(2, 4);
|
|
4166
|
-
return `${hours}:${minutes}:00`;
|
|
4167
|
-
} catch (error) {
|
|
4168
|
-
return null;
|
|
4169
|
-
}
|
|
4170
|
-
}
|
|
4171
|
-
function combinePsqlDateTime(psqlDate, psqlTime) {
|
|
4172
|
-
const date = formatPsqlDate(psqlDate);
|
|
4173
|
-
const time = formatPsqlTime(psqlTime);
|
|
4174
|
-
if (!date || !time) {
|
|
4175
|
-
return null;
|
|
4176
|
-
}
|
|
4177
|
-
return `${date}T${time}`;
|
|
4178
|
-
}
|
|
4179
|
-
function isPsqlDateEmpty(psqlDate) {
|
|
4180
|
-
return !psqlDate || psqlDate === "000000" || psqlDate.trim() === "";
|
|
4181
|
-
}
|
|
4182
|
-
function cleanPsqlCharField(value) {
|
|
4183
|
-
if (value === null || value === void 0) {
|
|
4184
|
-
return "";
|
|
4185
|
-
}
|
|
4186
|
-
return String(value).trim();
|
|
4187
|
-
}
|
|
4188
3985
|
export {
|
|
4189
3986
|
ApplicationInitializer,
|
|
4190
3987
|
BatchCacheManager,
|
|
@@ -4212,8 +4009,6 @@ export {
|
|
|
4212
4009
|
MMSendWorkOrder,
|
|
4213
4010
|
MMSendWorkOrderOperation,
|
|
4214
4011
|
OAuthClient,
|
|
4215
|
-
PsqlLaborTicketOperations,
|
|
4216
|
-
PsqlService,
|
|
4217
4012
|
RecordTrackingManager,
|
|
4218
4013
|
RestAPIService,
|
|
4219
4014
|
SqlServerHelper,
|
|
@@ -4223,13 +4018,9 @@ export {
|
|
|
4223
4018
|
addNewFieldFromLookupField,
|
|
4224
4019
|
applyTimezoneOffsetsToFields,
|
|
4225
4020
|
buildLogicalCondition,
|
|
4226
|
-
cleanPsqlCharField,
|
|
4227
4021
|
cleanupNumbers,
|
|
4228
|
-
combinePsqlDateTime,
|
|
4229
4022
|
convertToLocalTime,
|
|
4230
4023
|
formatDateWithTZOffset,
|
|
4231
|
-
formatPsqlDate,
|
|
4232
|
-
formatPsqlTime,
|
|
4233
4024
|
getCachedTimezoneOffset,
|
|
4234
4025
|
g as getErpApiConnectionParams,
|
|
4235
4026
|
getErrorType,
|
|
@@ -4237,7 +4028,6 @@ export {
|
|
|
4237
4028
|
getPayloadWithoutIDField,
|
|
4238
4029
|
a as getSQLServerConfiguration,
|
|
4239
4030
|
getUniqueRows,
|
|
4240
|
-
isPsqlDateEmpty,
|
|
4241
4031
|
config as knexDatabaseConfig,
|
|
4242
4032
|
logger,
|
|
4243
4033
|
removeExtraneousFields,
|