@machinemetrics/mm-erp-sdk 0.1.6-beta.2 → 0.1.7-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.
- package/dist/{config-WKwu1mMo.js → config-qat9zgOl.js} +2 -2
- package/dist/{config-WKwu1mMo.js.map → config-qat9zgOl.js.map} +1 -1
- package/dist/{connector-factory-DHmMYsRs.js → connector-factory-C2czCs9v.js} +2 -2
- package/dist/{connector-factory-DHmMYsRs.js.map → connector-factory-C2czCs9v.js.map} +1 -1
- package/dist/{hashed-cache-manager-CtDhFqj6.js → hashed-cache-manager-CzyFSt2B.js} +4 -4
- package/dist/{hashed-cache-manager-CtDhFqj6.js.map → hashed-cache-manager-CzyFSt2B.js.map} +1 -1
- package/dist/{index-aci_wdcn.js → index-B9wo8pld.js} +2 -2
- package/dist/{index-aci_wdcn.js.map → index-B9wo8pld.js.map} +1 -1
- package/dist/index.d.ts +5 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/{logger-hqtl8hFM.js → logger-Db8CkwR6.js} +924 -966
- package/dist/logger-Db8CkwR6.js.map +1 -0
- package/dist/mm-erp-sdk.js +234 -8
- 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/psql-erp-service/configuration.d.ts +10 -0
- package/dist/services/psql-erp-service/configuration.d.ts.map +1 -0
- package/dist/services/psql-erp-service/index.d.ts +19 -0
- package/dist/services/psql-erp-service/index.d.ts.map +1 -0
- package/dist/services/psql-erp-service/internal/psql-config.d.ts +28 -0
- package/dist/services/psql-erp-service/internal/psql-config.d.ts.map +1 -0
- package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts +40 -0
- package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts.map +1 -0
- package/dist/services/psql-erp-service/internal/types/psql-types.d.ts +15 -0
- package/dist/services/psql-erp-service/internal/types/psql-types.d.ts.map +1 -0
- package/dist/services/psql-erp-service/psql-helpers.d.ts +32 -0
- package/dist/services/psql-erp-service/psql-helpers.d.ts.map +1 -0
- package/dist/services/psql-erp-service/psql-service.d.ts +36 -0
- package/dist/services/psql-erp-service/psql-service.d.ts.map +1 -0
- package/dist/types/erp-types.d.ts +2 -1
- package/dist/types/erp-types.d.ts.map +1 -1
- package/dist/utils/standard-process-drivers/labor-ticket-erp-synchronizer.d.ts.map +1 -1
- package/package.json +3 -1
- package/src/index.ts +27 -5
- package/src/services/data-sync-service/jobs/to-erp.ts +2 -1
- package/src/services/psql-erp-service/configuration.ts +9 -0
- package/src/services/psql-erp-service/index.ts +28 -0
- package/src/services/psql-erp-service/internal/psql-config.ts +13 -0
- package/src/services/psql-erp-service/internal/psql-labor-ticket-operations.ts +58 -0
- package/src/services/psql-erp-service/internal/types/psql-types.ts +17 -0
- package/src/services/psql-erp-service/psql-helpers.ts +90 -0
- package/src/services/psql-erp-service/psql-service.ts +178 -0
- package/src/types/erp-types.ts +1 -0
- package/src/utils/standard-process-drivers/labor-ticket-erp-synchronizer.ts +1 -2
- package/dist/logger-hqtl8hFM.js.map +0 -1
package/dist/mm-erp-sdk.js
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
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";
|
|
17
18
|
var ERPType = /* @__PURE__ */ ((ERPType2) => {
|
|
18
19
|
ERPType2["INVALID"] = "INVALID";
|
|
19
20
|
ERPType2["D365"] = "D365";
|
|
@@ -22,6 +23,7 @@ var ERPType = /* @__PURE__ */ ((ERPType2) => {
|
|
|
22
23
|
ERPType2["PROSHOP"] = "PROSHOP";
|
|
23
24
|
ERPType2["SYTELINE"] = "SYTELINE";
|
|
24
25
|
ERPType2["TEMPLATE"] = "TEMPLATE";
|
|
26
|
+
ERPType2["GLOBALSHOP"] = "GLOBALSHOP";
|
|
25
27
|
return ERPType2;
|
|
26
28
|
})(ERPType || {});
|
|
27
29
|
var ERPObjType = /* @__PURE__ */ ((ERPObjType2) => {
|
|
@@ -1685,8 +1687,7 @@ class LaborTicketERPSynchronizer {
|
|
|
1685
1687
|
);
|
|
1686
1688
|
const mostRecentUpdate = laborTicketsUpdates.reduce(
|
|
1687
1689
|
(latest, ticket) => {
|
|
1688
|
-
if (!ticket.updatedAt) return latest;
|
|
1689
|
-
if (!latest) return ticket.updatedAt;
|
|
1690
|
+
if (!latest || !ticket.updatedAt) return latest;
|
|
1690
1691
|
return new Date(ticket.updatedAt) > new Date(latest) ? ticket.updatedAt : latest;
|
|
1691
1692
|
},
|
|
1692
1693
|
null
|
|
@@ -3966,6 +3967,224 @@ class SqlServerHelper {
|
|
|
3966
3967
|
logger.info("----------------------------------------");
|
|
3967
3968
|
}
|
|
3968
3969
|
}
|
|
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
|
+
}
|
|
3969
4188
|
export {
|
|
3970
4189
|
ApplicationInitializer,
|
|
3971
4190
|
BatchCacheManager,
|
|
@@ -3993,6 +4212,8 @@ export {
|
|
|
3993
4212
|
MMSendWorkOrder,
|
|
3994
4213
|
MMSendWorkOrderOperation,
|
|
3995
4214
|
OAuthClient,
|
|
4215
|
+
PsqlLaborTicketOperations,
|
|
4216
|
+
PsqlService,
|
|
3996
4217
|
RecordTrackingManager,
|
|
3997
4218
|
RestAPIService,
|
|
3998
4219
|
SqlServerHelper,
|
|
@@ -4002,9 +4223,13 @@ export {
|
|
|
4002
4223
|
addNewFieldFromLookupField,
|
|
4003
4224
|
applyTimezoneOffsetsToFields,
|
|
4004
4225
|
buildLogicalCondition,
|
|
4226
|
+
cleanPsqlCharField,
|
|
4005
4227
|
cleanupNumbers,
|
|
4228
|
+
combinePsqlDateTime,
|
|
4006
4229
|
convertToLocalTime,
|
|
4007
4230
|
formatDateWithTZOffset,
|
|
4231
|
+
formatPsqlDate,
|
|
4232
|
+
formatPsqlTime,
|
|
4008
4233
|
getCachedTimezoneOffset,
|
|
4009
4234
|
g as getErpApiConnectionParams,
|
|
4010
4235
|
getErrorType,
|
|
@@ -4012,6 +4237,7 @@ export {
|
|
|
4012
4237
|
getPayloadWithoutIDField,
|
|
4013
4238
|
a as getSQLServerConfiguration,
|
|
4014
4239
|
getUniqueRows,
|
|
4240
|
+
isPsqlDateEmpty,
|
|
4015
4241
|
config as knexDatabaseConfig,
|
|
4016
4242
|
logger,
|
|
4017
4243
|
removeExtraneousFields,
|