@machinemetrics/mm-erp-sdk 0.1.8-beta.6 → 0.1.8-beta.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.
- package/README.md +2 -8
- 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 +4 -6
- 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 +6 -200
- 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/mm-api-service/mm-api-service.d.ts +4 -4
- package/dist/services/mm-api-service/mm-api-service.d.ts.map +1 -1
- package/dist/services/mm-api-service/types/checkpoint.d.ts +1 -2
- package/dist/services/mm-api-service/types/checkpoint.d.ts.map +1 -1
- package/dist/services/reporting-service/logger.d.ts.map +1 -1
- package/dist/types/erp-connector.d.ts +4 -2
- package/dist/types/erp-connector.d.ts.map +1 -1
- package/dist/types/erp-types.d.ts +0 -10
- package/dist/types/erp-types.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/utils/standard-process-drivers/labor-ticket-erp-synchronizer.d.ts +2 -3
- package/dist/utils/standard-process-drivers/labor-ticket-erp-synchronizer.d.ts.map +1 -1
- package/dist/utils/standard-process-drivers/standard-process-drivers.d.ts +3 -3
- package/dist/utils/standard-process-drivers/standard-process-drivers.d.ts.map +1 -1
- package/package.json +1 -2
- package/src/index.ts +6 -27
- package/src/services/data-sync-service/jobs/to-erp.ts +1 -2
- package/src/services/mm-api-service/mm-api-service.ts +4 -4
- package/src/services/mm-api-service/types/checkpoint.ts +1 -3
- package/src/services/reporting-service/logger.ts +11 -94
- package/src/types/erp-connector.ts +5 -2
- package/src/types/erp-types.ts +0 -12
- package/src/types/index.ts +0 -1
- package/src/utils/standard-process-drivers/labor-ticket-erp-synchronizer.ts +2 -3
- package/src/utils/standard-process-drivers/standard-process-drivers.ts +3 -3
- 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 -14
- package/dist/services/psql-erp-service/index.d.ts.map +0 -1
- package/dist/services/psql-erp-service/internal/types/psql-types.d.ts +0 -12
- 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 -22
- package/src/services/psql-erp-service/internal/types/psql-types.ts +0 -13
- 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,31 +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
|
-
var ERPType = /* @__PURE__ */ ((ERPType2) => {
|
|
19
|
-
ERPType2["INVALID"] = "INVALID";
|
|
20
|
-
ERPType2["D365"] = "D365";
|
|
21
|
-
ERPType2["JOB_BOSS"] = "JOB_BOSS";
|
|
22
|
-
ERPType2["PROFITKEY"] = "PROFITKEY";
|
|
23
|
-
ERPType2["PROSHOP"] = "PROSHOP";
|
|
24
|
-
ERPType2["SYTELINE"] = "SYTELINE";
|
|
25
|
-
ERPType2["TEMPLATE"] = "TEMPLATE";
|
|
26
|
-
ERPType2["GLOBALSHOP"] = "GLOBALSHOP";
|
|
27
|
-
return ERPType2;
|
|
28
|
-
})(ERPType || {});
|
|
29
17
|
var ERPObjType = /* @__PURE__ */ ((ERPObjType2) => {
|
|
30
18
|
ERPObjType2[ERPObjType2["RESOURCES"] = 0] = "RESOURCES";
|
|
31
19
|
ERPObjType2[ERPObjType2["PARTS"] = 1] = "PARTS";
|
|
@@ -3984,187 +3972,11 @@ class SqlServerHelper {
|
|
|
3984
3972
|
logger.info("----------------------------------------");
|
|
3985
3973
|
}
|
|
3986
3974
|
}
|
|
3987
|
-
class PsqlService {
|
|
3988
|
-
config;
|
|
3989
|
-
constructor(config2) {
|
|
3990
|
-
this.config = config2;
|
|
3991
|
-
}
|
|
3992
|
-
// REMOVED: dispose() method - not needed anymore
|
|
3993
|
-
// REMOVED: connection property - not needed anymore
|
|
3994
|
-
// REMOVED: openConnection() method - not needed anymore
|
|
3995
|
-
// REMOVED: closeConnection() method - not needed anymore
|
|
3996
|
-
/**
|
|
3997
|
-
* Build PSQL ODBC connection string
|
|
3998
|
-
* CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
|
|
3999
|
-
*/
|
|
4000
|
-
buildConnectionString() {
|
|
4001
|
-
const serverName = `${this.config.host}.${this.config.port}`;
|
|
4002
|
-
return [
|
|
4003
|
-
"Driver={Pervasive ODBC Interface}",
|
|
4004
|
-
`ServerName=${serverName}`,
|
|
4005
|
-
`DBQ=${this.config.database}`,
|
|
4006
|
-
`UID=${this.config.username}`,
|
|
4007
|
-
`PWD=${this.config.password}`,
|
|
4008
|
-
"AutoDoubleQuote=0"
|
|
4009
|
-
].join(";") + ";";
|
|
4010
|
-
}
|
|
4011
|
-
/**
|
|
4012
|
-
* Execute a query and return the results
|
|
4013
|
-
* Creates a fresh connection for each query to avoid handle corruption
|
|
4014
|
-
*
|
|
4015
|
-
* @param query The SQL query to execute
|
|
4016
|
-
* @param params Query parameters (currently unused for PSQL read operations)
|
|
4017
|
-
* @param paging Optional paging parameters
|
|
4018
|
-
* @returns The entities fetched from the database, along with paging information
|
|
4019
|
-
*/
|
|
4020
|
-
async executePreparedStatement(query, params = {}, paging) {
|
|
4021
|
-
let connection = null;
|
|
4022
|
-
try {
|
|
4023
|
-
const connStr = this.buildConnectionString();
|
|
4024
|
-
logger.debug("Creating fresh PSQL connection for query");
|
|
4025
|
-
connection = await odbc.connect(connStr);
|
|
4026
|
-
if (Object.keys(params).length > 0) {
|
|
4027
|
-
logger.warn(
|
|
4028
|
-
"PsqlService: Query parameters provided but parameter binding not yet implemented. Using direct query execution."
|
|
4029
|
-
);
|
|
4030
|
-
}
|
|
4031
|
-
const records = await connection.query(query);
|
|
4032
|
-
const allRecords = PsqlService.recordsetToRecords(records);
|
|
4033
|
-
const rowsFetched = allRecords.length;
|
|
4034
|
-
const pagedData = paging?.offset !== void 0 || paging?.limit !== void 0 ? allRecords.slice(
|
|
4035
|
-
paging.offset || 0,
|
|
4036
|
-
(paging.offset || 0) + (paging.limit || allRecords.length)
|
|
4037
|
-
) : allRecords;
|
|
4038
|
-
return {
|
|
4039
|
-
data: pagedData,
|
|
4040
|
-
paging: {
|
|
4041
|
-
count: rowsFetched,
|
|
4042
|
-
limit: paging?.limit || 0,
|
|
4043
|
-
offset: paging?.offset || 0,
|
|
4044
|
-
nextPage: paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched ? String((paging.offset || 0) + paging.limit) : void 0,
|
|
4045
|
-
previousPage: paging?.offset ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10))) : void 0
|
|
4046
|
-
}
|
|
4047
|
-
};
|
|
4048
|
-
} catch (error) {
|
|
4049
|
-
const errorInfo = error;
|
|
4050
|
-
logger.error("Error fetching data from PSQL", {
|
|
4051
|
-
error: errorInfo.message,
|
|
4052
|
-
odbcErrors: errorInfo.odbcErrors,
|
|
4053
|
-
query: query.substring(0, 200)
|
|
4054
|
-
// Log first 200 chars of query
|
|
4055
|
-
});
|
|
4056
|
-
throw this.handleOdbcError(errorInfo);
|
|
4057
|
-
} finally {
|
|
4058
|
-
if (connection) {
|
|
4059
|
-
try {
|
|
4060
|
-
await connection.close();
|
|
4061
|
-
logger.debug("PSQL connection closed successfully");
|
|
4062
|
-
} catch (err) {
|
|
4063
|
-
logger.warn("Error closing PSQL connection (non-fatal)", {
|
|
4064
|
-
error: err
|
|
4065
|
-
});
|
|
4066
|
-
}
|
|
4067
|
-
}
|
|
4068
|
-
}
|
|
4069
|
-
}
|
|
4070
|
-
/**
|
|
4071
|
-
* Transform ODBC result set to array of Record<string, string> instances.
|
|
4072
|
-
* IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
|
|
4073
|
-
*/
|
|
4074
|
-
static recordsetToRecords(recordset) {
|
|
4075
|
-
if (!Array.isArray(recordset)) {
|
|
4076
|
-
return [];
|
|
4077
|
-
}
|
|
4078
|
-
const data = recordset.map((row) => {
|
|
4079
|
-
const transformedRow = {};
|
|
4080
|
-
Object.keys(row).forEach((key) => {
|
|
4081
|
-
const value = row[key];
|
|
4082
|
-
transformedRow[key] = value !== null && value !== void 0 ? String(value).trim() : "";
|
|
4083
|
-
});
|
|
4084
|
-
return transformedRow;
|
|
4085
|
-
});
|
|
4086
|
-
return data;
|
|
4087
|
-
}
|
|
4088
|
-
/**
|
|
4089
|
-
* Handle ODBC errors and provide meaningful messages
|
|
4090
|
-
*/
|
|
4091
|
-
handleOdbcError(error) {
|
|
4092
|
-
const odbcError = error.odbcErrors?.[0];
|
|
4093
|
-
const errorCode = odbcError?.state;
|
|
4094
|
-
const message = odbcError?.message || error.message;
|
|
4095
|
-
switch (errorCode) {
|
|
4096
|
-
case "08S01":
|
|
4097
|
-
return new Error(
|
|
4098
|
-
`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}`
|
|
4099
|
-
);
|
|
4100
|
-
case "28000":
|
|
4101
|
-
return new Error(
|
|
4102
|
-
`PSQL authentication failed. Check username/password. Original error: ${message}`
|
|
4103
|
-
);
|
|
4104
|
-
case "42000":
|
|
4105
|
-
return new Error(`PSQL SQL syntax error. Original error: ${message}`);
|
|
4106
|
-
case "42S02":
|
|
4107
|
-
return new Error(
|
|
4108
|
-
`PSQL table or view not found. Check table names in query. Original error: ${message}`
|
|
4109
|
-
);
|
|
4110
|
-
default:
|
|
4111
|
-
return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
|
|
4112
|
-
}
|
|
4113
|
-
}
|
|
4114
|
-
}
|
|
4115
|
-
function formatPsqlDate(psqlDate) {
|
|
4116
|
-
if (!psqlDate || psqlDate === "000000" || psqlDate.trim() === "") {
|
|
4117
|
-
return null;
|
|
4118
|
-
}
|
|
4119
|
-
try {
|
|
4120
|
-
const year = parseInt(psqlDate.substring(0, 2), 10);
|
|
4121
|
-
const month = parseInt(psqlDate.substring(2, 4), 10);
|
|
4122
|
-
const day = parseInt(psqlDate.substring(4, 6), 10);
|
|
4123
|
-
const fullYear = year + 2e3;
|
|
4124
|
-
if (month < 1 || month > 12 || day < 1 || day > 31) {
|
|
4125
|
-
return null;
|
|
4126
|
-
}
|
|
4127
|
-
const date = new Date(fullYear, month - 1, day);
|
|
4128
|
-
return date.toISOString().split("T")[0];
|
|
4129
|
-
} catch (error) {
|
|
4130
|
-
return null;
|
|
4131
|
-
}
|
|
4132
|
-
}
|
|
4133
|
-
function formatPsqlTime(psqlTime) {
|
|
4134
|
-
if (!psqlTime || psqlTime.trim() === "") {
|
|
4135
|
-
return null;
|
|
4136
|
-
}
|
|
4137
|
-
try {
|
|
4138
|
-
const hours = psqlTime.substring(0, 2);
|
|
4139
|
-
const minutes = psqlTime.substring(2, 4);
|
|
4140
|
-
return `${hours}:${minutes}:00`;
|
|
4141
|
-
} catch (error) {
|
|
4142
|
-
return null;
|
|
4143
|
-
}
|
|
4144
|
-
}
|
|
4145
|
-
function combinePsqlDateTime(psqlDate, psqlTime) {
|
|
4146
|
-
const date = formatPsqlDate(psqlDate);
|
|
4147
|
-
const time = formatPsqlTime(psqlTime);
|
|
4148
|
-
if (!date || !time) {
|
|
4149
|
-
return null;
|
|
4150
|
-
}
|
|
4151
|
-
return `${date}T${time}`;
|
|
4152
|
-
}
|
|
4153
|
-
function isPsqlDateEmpty(psqlDate) {
|
|
4154
|
-
return !psqlDate || psqlDate === "000000" || psqlDate.trim() === "";
|
|
4155
|
-
}
|
|
4156
|
-
function cleanPsqlCharField(value) {
|
|
4157
|
-
if (value === null || value === void 0) {
|
|
4158
|
-
return "";
|
|
4159
|
-
}
|
|
4160
|
-
return String(value).trim();
|
|
4161
|
-
}
|
|
4162
3975
|
export {
|
|
4163
3976
|
ApplicationInitializer,
|
|
4164
3977
|
BatchCacheManager,
|
|
4165
3978
|
CoreConfiguration,
|
|
4166
3979
|
ERPObjType,
|
|
4167
|
-
ERPType,
|
|
4168
3980
|
E as ErpApiConnectionParams,
|
|
4169
3981
|
ErrorHandler,
|
|
4170
3982
|
FileLogDeduper,
|
|
@@ -4186,7 +3998,6 @@ export {
|
|
|
4186
3998
|
MMSendWorkOrder,
|
|
4187
3999
|
MMSendWorkOrderOperation,
|
|
4188
4000
|
OAuthClient,
|
|
4189
|
-
PsqlService,
|
|
4190
4001
|
RecordTrackingManager,
|
|
4191
4002
|
RestAPIService,
|
|
4192
4003
|
SqlServerHelper,
|
|
@@ -4196,13 +4007,9 @@ export {
|
|
|
4196
4007
|
addNewFieldFromLookupField,
|
|
4197
4008
|
applyTimezoneOffsetsToFields,
|
|
4198
4009
|
buildLogicalCondition,
|
|
4199
|
-
cleanPsqlCharField,
|
|
4200
4010
|
cleanupNumbers,
|
|
4201
|
-
combinePsqlDateTime,
|
|
4202
4011
|
convertToLocalTime,
|
|
4203
4012
|
formatDateWithTZOffset,
|
|
4204
|
-
formatPsqlDate,
|
|
4205
|
-
formatPsqlTime,
|
|
4206
4013
|
getCachedTimezoneOffset,
|
|
4207
4014
|
g as getErpApiConnectionParams,
|
|
4208
4015
|
getErrorType,
|
|
@@ -4210,7 +4017,6 @@ export {
|
|
|
4210
4017
|
getPayloadWithoutIDField,
|
|
4211
4018
|
a as getSQLServerConfiguration,
|
|
4212
4019
|
getUniqueRows,
|
|
4213
|
-
isPsqlDateEmpty,
|
|
4214
4020
|
config as knexDatabaseConfig,
|
|
4215
4021
|
logger,
|
|
4216
4022
|
removeExtraneousFields,
|