@machinemetrics/mm-erp-sdk 0.2.0-beta.2 → 0.3.0-beta.0

package/src/utils/erp-timezone-utils.ts

@@ -0,0 +1,99 @@
+import { DateTime } from "luxon";
+import logger from "../services/reporting-service/logger.js";
+import { getCachedTimezoneName } from "./local-data-store/jobs-shared-data.js";
+
+/**
+ * Retrieves the ERP timezone name that should have been cached during initialization.
+ * @throws Error when the timezone cache has not been populated.
+ */
+export function getERPTimezone(): string {
+  const timezone = getCachedTimezoneName();
+  if (!timezone) {
+    throw new Error(
+      "ERP timezone is not cached. Run getTimezoneOffsetAndPersist() to populate it."
+    );
+  }
+  return timezone;
+}
+
+/**
+ * Converts a UTC ISO-8601 datetime string to the ERP's local timezone (also ISO-8601).
+ * @param utcDateTime ISO-8601 datetime string representing UTC time.
+ * @param timezone Optional timezone override; defaults to the cached ERP timezone.
+ * @returns ISO-8601 string in the ERP timezone.
+ */
+export function convertUtcDateTimeToErpLocal(
+  utcDateTime: string,
+  timezone?: string
+): string {
+  if (!utcDateTime) {
+    throw new Error("convertUtcDateTimeToErpLocal requires a non-empty UTC datetime string");
+  }
+  try {
+    const targetZone = timezone ?? getERPTimezone();
+    const parsedUtc = DateTime.fromISO(utcDateTime, { zone: "utc" });
+    if (!parsedUtc.isValid) {
+      throw new Error(
+        `Invalid UTC datetime "${utcDateTime}": ${parsedUtc.invalidReason}`
+      );
+    }
+
+    const localized = parsedUtc.setZone(targetZone);
+    if (!localized.isValid) {
+      throw new Error(
+        `Unable to convert UTC datetime "${utcDateTime}" to target zone "${targetZone}": ${localized.invalidReason}`
+      );
+    }
+
+    return localized.toISO();
+  } catch (error) {
+    logger.error("convertUtcDateTimeToErpLocal: Failed to convert datetime", {
+      utcDateTime,
+      error,
+    });
+    throw new Error(
+      "Failed to convert UTC datetime to ERP local timezone. See logs for details."
+    );
+  }
+}
+
+/**
+ * Converts an ERP-local ISO-8601 datetime string to UTC (still ISO-8601).
+ * @param localDateTime ISO-8601 datetime string representing ERP local time.
+ * @param timezone Optional timezone override; defaults to the cached ERP timezone.
+ * @returns ISO-8601 string in UTC.
+ */
+export function convertErpLocalDateTimeToUtc(
+  localDateTime: string,
+  timezone?: string
+): string {
+  if (!localDateTime) {
+    throw new Error("convertErpLocalDateTimeToUtc requires a non-empty local datetime string");
+  }
+  try {
+    const sourceZone = timezone ?? getERPTimezone();
+    const parsedLocal = DateTime.fromISO(localDateTime, { zone: sourceZone });
+    if (!parsedLocal.isValid) {
+      throw new Error(
+        `Invalid ERP local datetime "${localDateTime}" for zone "${sourceZone}": ${parsedLocal.invalidReason}`
+      );
+    }
+
+    const utcDateTime = parsedLocal.setZone("utc");
+    if (!utcDateTime.isValid) {
+      throw new Error(
+        `Unable to convert ERP local datetime "${localDateTime}" to UTC: ${utcDateTime.invalidReason}`
+      );
+    }
+
+    return utcDateTime.toISO();
+  } catch (error) {
+    logger.error("convertErpLocalDateTimeToUtc: Failed to convert datetime", {
+      localDateTime,
+      error,
+    });
+    throw new Error(
+      "Failed to convert ERP local datetime to UTC. See logs for details."
+    );
+  }
+}

package/src/utils/erp-type-from-entity.ts

@@ -1,4 +1,4 @@
-import { ERPObjType } from "../types/erp-types";
+import { ERPObjType } from "../types/erp-types.js";
 
 export function getERPAPITypeFromEntity(
   entity: string,

package/src/utils/http-client.ts

@@ -1,5 +1,5 @@
 import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from "axios";
-import logger from "../services/reporting-service/logger";
+import logger from "../services/reporting-service/logger.js";
 
 export class HTTPError extends Error {
   constructor(
@@ -64,10 +64,9 @@ class AxiosClient implements HTTPClient {
    *   It can be convenient to set `baseURL` for an instance of axios to pass relative URLs to methods of that instance.
    */
   constructor(baseUrl: string, retryAttempts: number) {
-    const timeout = parseInt(process.env.MM_API_TIMEOUT || "30000");
     this.client = axios.create({
       baseURL: baseUrl,
-      timeout: timeout,
+      timeout: 30000,
       headers: {
         "Content-Type": "application/json",
       },
@@ -109,7 +108,7 @@ class AxiosClient implements HTTPClient {
       params: config.params,
       signal: controller.signal,
     };
-
+// MLW TODO
     logger.info("HTTP request starting", { 
       url: config.url, 
       method: config.method, 
@@ -128,8 +127,10 @@ class AxiosClient implements HTTPClient {
     try {
       for (let attempt = 0; attempt <= this.retryAttempts; attempt++) {
         try {
+          // MLW TODO
           logger.info(`HTTP request attempt ${attempt + 1}/${this.retryAttempts + 1}`);
           const response = await this.client.request<T>(axiosConfig);
+          // MLW TODO
           logger.info("HTTP request succeeded", { status: response.status });
           return {
             data: response.data,

package/src/utils/index.ts

@@ -1,93 +1,92 @@
 /**
  * Utility functions for data manipulation
  */
-export { getUniqueRows } from "./uniqueRows";
-export { removeExtraneousFields } from "./removeExtraneousFields";
-export { getPayloadWithoutIDField } from "./removeIdFieldFromPayload";
-export { trimObjectValues } from "./trimObjectValues";
-export { cleanupNumbers } from "./cleanup-numbers";
+export { getUniqueRows } from "./uniqueRows.js";
+export { removeExtraneousFields } from "./removeExtraneousFields.js";
+export { getPayloadWithoutIDField } from "./removeIdFieldFromPayload.js";
+export { trimObjectValues } from "./trimObjectValues.js";
+export { cleanupNumbers } from "./cleanup-numbers.js";
 export {
   addNewFieldFromExternalSource,
   addNewFieldFromLookupField,
-} from "./data-transformation";
+} from "./data-transformation.js";
 
 /**
  * Timezone and time-related utilities
  */
-export { getTimezoneOffsetAndPersist } from "./time-utils";
-export { formatDateWithTZOffset, convertToLocalTime, toISOWithOffset } from "./timezone";
-export { applyTimezoneOffsetsToFields } from "./time-utils";
-export * from "./time-utils";
+export { getTimezoneOffsetAndPersist } from "./time-utils.js";
+export { formatDateWithTZOffset, convertToLocalTime, toISOWithOffset } from "./timezone.js";
+export { applyTimezoneOffsetsToFields } from "./time-utils.js";
+export {
+  convertUtcDateTimeToErpLocal,
+  convertErpLocalDateTimeToUtc,
+  getERPTimezone,
+} from "./erp-timezone-utils.js";
+export * from "./time-utils.js";
 
 /**
  * Caching and record tracking utilities
  */
-export { RecordTrackingManager } from "../services/caching-service/record-tracking-manager";
-export type { RecordTrackingObject } from "../services/caching-service/record-tracking-manager";
-export { HashedCacheManager } from "../services/caching-service/hashed-cache-manager";
-export { BatchCacheManager } from "../services/caching-service/batch-cache-manager";
+export { RecordTrackingManager } from "../services/caching-service/record-tracking-manager.js";
+export type { RecordTrackingObject } from "../services/caching-service/record-tracking-manager.js";
+export { HashedCacheManager } from "../services/caching-service/hashed-cache-manager.js";
+export { BatchCacheManager } from "../services/caching-service/batch-cache-manager.js";
 
 /**
  * Process and data transformation utilities
  */
-export { StandardProcessDrivers } from "./standard-process-drivers/";
-export type { WriteEntitiesToMMResult } from "./standard-process-drivers/";
-export { MMBatchValidationError } from "./standard-process-drivers/";
+export { StandardProcessDrivers } from "./standard-process-drivers/index.js";
+export type { WriteEntitiesToMMResult } from "./standard-process-drivers/index.js";
+export { MMBatchValidationError } from "./standard-process-drivers/index.js";
 export {
   getCachedTimezoneOffset,
   getCachedTimezoneName,
-} from "./local-data-store/jobs-shared-data";
+} from "./local-data-store/jobs-shared-data.js";
 
 // Local data store
 export {
   getInitialLoadComplete,
   setInitialLoadComplete,
-} from "./local-data-store/jobs-shared-data";
+} from "./local-data-store/jobs-shared-data.js";
 
 /**
  * ERP API utilities
  */
-export * from "../services/erp-api-services/rest/rest-api-service";
-export * from "../services/erp-api-services/rest/get-query-params";
-export { getERPAPITypeFromEntity } from "./erp-type-from-entity";
+export * from "../services/erp-api-services/rest/rest-api-service.js";
+export * from "../services/erp-api-services/rest/get-query-params.js";
+export { getERPAPITypeFromEntity } from "./erp-type-from-entity.js";
 
 /**
  * HTTP Client utilities
  */
-export { HTTPClientFactory } from "./http-client";
-export { HTTPError } from "./http-client";
-export type { HTTPClient, HTTPRequestConfig, HTTPResponse } from "./http-client";
+export { HTTPClientFactory } from "./http-client.js";
+export { HTTPError } from "./http-client.js";
+export type { HTTPClient, HTTPRequestConfig, HTTPResponse } from "./http-client.js";
 
 /**
  * MM Labor Ticket utilities
  */
-export * from "./mm-labor-ticket-helpers";
-export { getErrorType } from './error-utils';
-
-/**
- * Error formatting utilities
- */
-export { formatError, formatErrorForLogging } from './error-formatter';
-export type { FormattedError } from './error-formatter';
+export * from "./mm-labor-ticket-helpers.js";
+export { getErrorType } from './error-utils.js';
 
 /**
  * MM Connector Logger utilities
  */
-export { MMConnectorLogger, LogEntry, type LogResponse, type LogLevelString } from './connector-log/mm-connector-logger';
-export { FileLogDeduper } from './connector-log/log-deduper';
+export { MMConnectorLogger, LogEntry, type LogResponse, type LogLevelString } from './connector-log/mm-connector-logger.js';
+export { FileLogDeduper } from './connector-log/log-deduper.js';
 
 /**
  * Application initializer
  */
-export * from "./application-initializer";
+export * from "./application-initializer.js";
 
 /**
  * GraphQL utilities
  */
-export { GraphQLService } from "../services/erp-api-services/graphql/graphql-service";
-export { OAuthClient } from "../services/erp-api-services/oauth-client";
+export { GraphQLService } from "../services/erp-api-services/graphql/graphql-service.js";
+export { OAuthClient } from "../services/erp-api-services/oauth-client.js";
 
 /**
  * Connector factory utilities
  */
-export { createConnectorFromPath } from "./connector-factory";
+export { createConnectorFromPath } from "./connector-factory.js";

package/src/utils/local-data-store/database-lock.ts

@@ -1,7 +1,7 @@
 import {
   readDatabaseLockState,
   writeDatabaseLockState,
-} from "./jobs-shared-data";
+} from "./jobs-shared-data.js";
 
 interface DatabaseLock {
   isLocked: boolean;

package/src/utils/local-data-store/jobs-shared-data.ts

@@ -72,6 +72,8 @@ export const setInitialLoadComplete = (complete: boolean): void => {
 };
 
 /**
+ * @deprecated The cached numeric offset cannot account for DST changes.
+ * Prefer using the cached timezone name with Luxon helpers for conversions.
  * Gets the company's cached current timezone offset (e.g., -5)
  * @returns The cached timezone offset or 0 if not found
  */

package/src/utils/mm-labor-ticket-helpers.ts

@@ -1,15 +1,13 @@
-import { convertToLocalTime, toISOWithOffset } from "./timezone";
-import { MMReceiveLaborTicket } from "../services/mm-api-service/types/receive-types";
+import { MMReceiveLaborTicket } from "../services/mm-api-service/types/receive-types.js";
+import { convertUtcDateTimeToErpLocal, getERPTimezone } from "./erp-timezone-utils.js";
 
 /**
- * Apply timezone offsets to datetime fields specifically for the MMApiReceiveLaborTicket object from the Zulu-based MM API
- * (presumably) before sending to the ERP
+ * Converts key datetime fields from UTC (MachineMetrics API) to the ERP's local timezone.
+ * All inputs/outputs are ISO-8601 strings, and invalid inputs throw errors.
  * @param laborTicket The MMApiReceiveLaborTicket object to convert
- * @param timezoneOffset The timezone offset to apply
  */
 export function convertLaborTicketToLocalTimezone(
-  laborTicket: MMReceiveLaborTicket,
-  timezoneOffset: number
+  laborTicket: MMReceiveLaborTicket
 ): MMReceiveLaborTicket {
   const timeFields = [
     "clockIn",
@@ -20,9 +18,14 @@ export function convertLaborTicketToLocalTimezone(
     "workOrderOperationClosedDate",
   ] as const;
 
+  const timezone = getERPTimezone();
   timeFields.forEach((field) => {
-    const localTime = convertToLocalTime(laborTicket[field], timezoneOffset);
-    laborTicket[field] = localTime ? toISOWithOffset(localTime, timezoneOffset) : null;
+    const value = laborTicket[field];
+    if (value) {
+      laborTicket[field] = convertUtcDateTimeToErpLocal(value, timezone);
+    } else {
+      laborTicket[field] = null;
+    }
   });
   return laborTicket;
 }

package/src/utils/removeExtraneousFields.ts

@@ -1,4 +1,4 @@
-import { ERPObject } from "../types/erp-types";
+import { ERPObject } from "../types/erp-types.js";
 
 /**
  * Retain only the fields listed in retainFields[] in the payload

package/src/utils/removeIdFieldFromPayload.ts

@@ -1,4 +1,4 @@
-import { ERPObject } from "../types/erp-types";
+import { ERPObject } from "../types/erp-types.js";
 
 /**
  * Remove all fields listed in idField[] the from the payload

package/src/utils/resource-group.ts

@@ -1,9 +1,9 @@
-import logger from "../services/reporting-service/logger";
+import logger from "../services/reporting-service/logger.js";
 import {
   MMApiClient,
   MMGraphQLResourceResponse,
   MMMachineGroupsResponse,
-} from "../services/mm-api-service";
+} from "../services/mm-api-service/index.js";
 
 // The GraphQLResourceTypes interface has been replaced by the centralized
 // MM response interfaces: MMGraphQLResourceResponse and MMMachineGroupsResponse

package/src/utils/standard-process-drivers/error-processor.ts

@@ -1,12 +1,12 @@
-import { ERPObjType } from "../../types/erp-types";
-import { BatchCacheManager } from "../../services/caching-service/batch-cache-manager";
+import { ERPObjType } from "../../types/erp-types.js";
+import { BatchCacheManager } from "../../services/caching-service/batch-cache-manager.js";
 import {
   IToRESTApiObject,
   MM207NonLaborTicketResponse,
   MM207LaborTicketResponse,
-} from "../../services/mm-api-service";
-import { EntityTransformer } from "../../services/mm-api-service/types/entity-transformer";
-import logger from "../../services/reporting-service/logger";
+} from "../../services/mm-api-service/index.js";
+import { EntityTransformer } from "../../services/mm-api-service/types/entity-transformer.js";
+import logger from "../../services/reporting-service/logger.js";
 
 /**
  * Handles error processing and record management utilities for MM API operations

package/src/utils/standard-process-drivers/index.ts

@@ -1,4 +1,4 @@
 // Public exports for standard-process-drivers
-export { StandardProcessDrivers } from "./standard-process-drivers";
-export type { WriteEntitiesToMMResult } from "./standard-process-drivers";
-export { MMBatchValidationError } from "./standard-process-drivers";
+export { StandardProcessDrivers } from "./standard-process-drivers.js";
+export type { WriteEntitiesToMMResult } from "./standard-process-drivers.js";
+export { MMBatchValidationError } from "./standard-process-drivers.js";