@etainabl/nodejs-sdk 1.3.117 → 1.3.119

package/dist/index.d.cts

@@ -615,23 +615,15 @@ interface Automation<IDType = ObjectId | string> {
 type FormattedConsumption = Omit<Consumption<string, string>, '_id'>;
 type FormattedReading = Omit<Reading<string, string>, '_id'>;
 type FormattedInvoice = Omit<Invoice<string, string>, '_id' | 's3Key'>;
-declare const collectionTypes: readonly ["readings", "consumptions", "invoices"];
-declare const errorCodes: readonly ["ACCOUNT_NOT_FOUND", "INVALID_DATE_FORMAT", "INVALID_TIME_FORMAT", "COLUMN_LIMIT_EXCEEDED", "INVALID_TIMESTAMP", "MISSING_DEVICE_ID", "UNSUPPORTED_UTILITY_TYPE", "VALIDATION_ERROR", "METER_READS_ZERO"];
-interface DLQPayload {
-    originalMessage: string;
-    account?: Account<string>;
-    automation: Automation<string>;
+interface HandleErrorParams {
+    etnApi: ReturnType<typeof _default$4>;
     automationRun: AutomationRun<string>;
-    error: {
-        message: string;
-        stack?: string;
-        timestamp: string;
-    };
-    context: {
-        messageId: string;
-        processingStage?: string;
-    };
+    lambdaSource: string;
+    error: Error;
+    accountId?: string;
 }
+declare const collectionTypes: readonly ["readings", "consumptions", "invoices"];
+declare const errorCodes: readonly ["ACCOUNT_NOT_FOUND", "INVALID_DATE_FORMAT", "INVALID_TIME_FORMAT", "COLUMN_LIMIT_EXCEEDED", "INVALID_TIMESTAMP", "MISSING_DEVICE_ID", "UNSUPPORTED_UTILITY_TYPE", "VALIDATION_ERROR", "METER_READS_ZERO"];
 type CollectionType = 'readings' | 'consumptions' | 'invoices';
 interface UploadCsv {
     csvContent: string;
@@ -640,25 +632,23 @@ interface UploadCsv {
     collectionType: CollectionType;
     orgFilename?: string;
 }
-declare function sendToDLQ({ payload, sqsClient }: {
-    payload: Partial<DLQPayload>;
-    sqsClient?: SQSClient;
-}): Promise<void>;
 declare function createCsv(data: (FormattedConsumption | FormattedReading | FormattedInvoice)[]): string;
 declare function uploadCsv({ csvContent, automationRun, s3Client, orgFilename, collectionType }: UploadCsv): Promise<string>;
+declare function handleError({ etnApi, automationRun, error, lambdaSource, accountId }: HandleErrorParams): Promise<void>;
+declare function deleteMessage(queueUrl: string, receiptHandle: string, sqsClient?: SQSClient): Promise<void>;
 
 type integrations_CollectionType = CollectionType;
-type integrations_DLQPayload = DLQPayload;
 type integrations_FormattedConsumption = FormattedConsumption;
 type integrations_FormattedInvoice = FormattedInvoice;
 type integrations_FormattedReading = FormattedReading;
 declare const integrations_collectionTypes: typeof collectionTypes;
 declare const integrations_createCsv: typeof createCsv;
+declare const integrations_deleteMessage: typeof deleteMessage;
 declare const integrations_errorCodes: typeof errorCodes;
-declare const integrations_sendToDLQ: typeof sendToDLQ;
+declare const integrations_handleError: typeof handleError;
 declare const integrations_uploadCsv: typeof uploadCsv;
 declare namespace integrations {
-  export { type integrations_CollectionType as CollectionType, type integrations_DLQPayload as DLQPayload, type integrations_FormattedConsumption as FormattedConsumption, type integrations_FormattedInvoice as FormattedInvoice, type integrations_FormattedReading as FormattedReading, integrations_collectionTypes as collectionTypes, integrations_createCsv as createCsv, integrations_errorCodes as errorCodes, integrations_sendToDLQ as sendToDLQ, integrations_uploadCsv as uploadCsv };
+  export { type integrations_CollectionType as CollectionType, type integrations_FormattedConsumption as FormattedConsumption, type integrations_FormattedInvoice as FormattedInvoice, type integrations_FormattedReading as FormattedReading, integrations_collectionTypes as collectionTypes, integrations_createCsv as createCsv, integrations_deleteMessage as deleteMessage, integrations_errorCodes as errorCodes, integrations_handleError as handleError, integrations_uploadCsv as uploadCsv };
 }
 
 interface AutomationRunLog<DateType = Date | string> {
@@ -676,8 +666,7 @@ interface AccountResult<IDType = ObjectId | string, DateType = Date | string> {
     mpan: string;
     deviceId?: string;
     status: 'success' | 'warning' | 'error' | 'running';
-    processedRows?: number;
-    failedRows?: number;
+    rowsProcessed?: number;
     dateRange?: {
         from?: DateType;
         to?: DateType;
@@ -736,6 +725,7 @@ interface AutomationRun<IDType = ObjectId | string, DateType = Date | string> {
     _id: IDType;
     automationId: IDType;
     companyId: IDType;
+    description: string;
     active: boolean;
     category: 'dataFetcher' | 'dataExtractor';
     status: 'running' | 'success' | 'failed' | 'completedWithWarnings';

package/dist/index.d.ts

@@ -615,23 +615,15 @@ interface Automation<IDType = ObjectId | string> {
 type FormattedConsumption = Omit<Consumption<string, string>, '_id'>;
 type FormattedReading = Omit<Reading<string, string>, '_id'>;
 type FormattedInvoice = Omit<Invoice<string, string>, '_id' | 's3Key'>;
-declare const collectionTypes: readonly ["readings", "consumptions", "invoices"];
-declare const errorCodes: readonly ["ACCOUNT_NOT_FOUND", "INVALID_DATE_FORMAT", "INVALID_TIME_FORMAT", "COLUMN_LIMIT_EXCEEDED", "INVALID_TIMESTAMP", "MISSING_DEVICE_ID", "UNSUPPORTED_UTILITY_TYPE", "VALIDATION_ERROR", "METER_READS_ZERO"];
-interface DLQPayload {
-    originalMessage: string;
-    account?: Account<string>;
-    automation: Automation<string>;
+interface HandleErrorParams {
+    etnApi: ReturnType<typeof _default$4>;
     automationRun: AutomationRun<string>;
-    error: {
-        message: string;
-        stack?: string;
-        timestamp: string;
-    };
-    context: {
-        messageId: string;
-        processingStage?: string;
-    };
+    lambdaSource: string;
+    error: Error;
+    accountId?: string;
 }
+declare const collectionTypes: readonly ["readings", "consumptions", "invoices"];
+declare const errorCodes: readonly ["ACCOUNT_NOT_FOUND", "INVALID_DATE_FORMAT", "INVALID_TIME_FORMAT", "COLUMN_LIMIT_EXCEEDED", "INVALID_TIMESTAMP", "MISSING_DEVICE_ID", "UNSUPPORTED_UTILITY_TYPE", "VALIDATION_ERROR", "METER_READS_ZERO"];
 type CollectionType = 'readings' | 'consumptions' | 'invoices';
 interface UploadCsv {
     csvContent: string;
@@ -640,25 +632,23 @@ interface UploadCsv {
     collectionType: CollectionType;
     orgFilename?: string;
 }
-declare function sendToDLQ({ payload, sqsClient }: {
-    payload: Partial<DLQPayload>;
-    sqsClient?: SQSClient;
-}): Promise<void>;
 declare function createCsv(data: (FormattedConsumption | FormattedReading | FormattedInvoice)[]): string;
 declare function uploadCsv({ csvContent, automationRun, s3Client, orgFilename, collectionType }: UploadCsv): Promise<string>;
+declare function handleError({ etnApi, automationRun, error, lambdaSource, accountId }: HandleErrorParams): Promise<void>;
+declare function deleteMessage(queueUrl: string, receiptHandle: string, sqsClient?: SQSClient): Promise<void>;
 
 type integrations_CollectionType = CollectionType;
-type integrations_DLQPayload = DLQPayload;
 type integrations_FormattedConsumption = FormattedConsumption;
 type integrations_FormattedInvoice = FormattedInvoice;
 type integrations_FormattedReading = FormattedReading;
 declare const integrations_collectionTypes: typeof collectionTypes;
 declare const integrations_createCsv: typeof createCsv;
+declare const integrations_deleteMessage: typeof deleteMessage;
 declare const integrations_errorCodes: typeof errorCodes;
-declare const integrations_sendToDLQ: typeof sendToDLQ;
+declare const integrations_handleError: typeof handleError;
 declare const integrations_uploadCsv: typeof uploadCsv;
 declare namespace integrations {
-  export { type integrations_CollectionType as CollectionType, type integrations_DLQPayload as DLQPayload, type integrations_FormattedConsumption as FormattedConsumption, type integrations_FormattedInvoice as FormattedInvoice, type integrations_FormattedReading as FormattedReading, integrations_collectionTypes as collectionTypes, integrations_createCsv as createCsv, integrations_errorCodes as errorCodes, integrations_sendToDLQ as sendToDLQ, integrations_uploadCsv as uploadCsv };
+  export { type integrations_CollectionType as CollectionType, type integrations_FormattedConsumption as FormattedConsumption, type integrations_FormattedInvoice as FormattedInvoice, type integrations_FormattedReading as FormattedReading, integrations_collectionTypes as collectionTypes, integrations_createCsv as createCsv, integrations_deleteMessage as deleteMessage, integrations_errorCodes as errorCodes, integrations_handleError as handleError, integrations_uploadCsv as uploadCsv };
 }
 
 interface AutomationRunLog<DateType = Date | string> {
@@ -676,8 +666,7 @@ interface AccountResult<IDType = ObjectId | string, DateType = Date | string> {
     mpan: string;
     deviceId?: string;
     status: 'success' | 'warning' | 'error' | 'running';
-    processedRows?: number;
-    failedRows?: number;
+    rowsProcessed?: number;
     dateRange?: {
         from?: DateType;
         to?: DateType;
@@ -736,6 +725,7 @@ interface AutomationRun<IDType = ObjectId | string, DateType = Date | string> {
     _id: IDType;
     automationId: IDType;
     companyId: IDType;
+    description: string;
     active: boolean;
     category: 'dataFetcher' | 'dataExtractor';
     status: 'running' | 'success' | 'failed' | 'completedWithWarnings';

package/dist/index.js

@@ -17485,8 +17485,9 @@ var integrations_exports = {};
 __export(integrations_exports, {
   collectionTypes: () => collectionTypes,
   createCsv: () => createCsv,
+  deleteMessage: () => deleteMessage,
   errorCodes: () => errorCodes,
-  sendToDLQ: () => sendToDLQ,
+  handleError: () => handleError,
   uploadCsv: () => uploadCsv
 });
 var import_sync = require("csv-stringify/sync");
@@ -21623,66 +21624,6 @@ var errorCodes = [
   "VALIDATION_ERROR",
   "METER_READS_ZERO"
 ];
-async function sendToDLQ({ payload, sqsClient }) {
-  if (!process.env.DEAD_LETTER_QUEUE_URL) {
-    throw new Error("QueueUrl is required to send to DLQ");
-  }
-  if (!payload || !payload.account) {
-    throw new Error("Payload and account information are required");
-  }
-  const { automation, account, context, error } = payload;
-  if (!context || !context.processingStage) {
-    throw new Error("Context with processingStage is required");
-  }
-  if (!account || !account._id) {
-    throw new Error("Account information with _id is required");
-  }
-  if (!error || !error.message || !error.timestamp) {
-    throw new Error("Error information with message and timestamp is required");
-  }
-  if (!automation || !automation._id) {
-    throw new Error("Automation information with _id is required");
-  }
-  if (!sqsClient) {
-    sqsClient = new import_client_sqs.SQSClient({ region: "eu-west-1" });
-  }
-  await sqsClient.send(
-    new import_client_sqs.SendMessageCommand({
-      QueueUrl: process.env.DEAD_LETTER_QUEUE_URL,
-      MessageBody: JSON.stringify(payload),
-      MessageAttributes: {
-        service: {
-          DataType: "String",
-          StringValue: automation.service
-        },
-        accountId: {
-          DataType: "String",
-          StringValue: account._id || "unknown"
-        },
-        category: {
-          DataType: "String",
-          StringValue: automation.category || "unknown"
-        },
-        automationId: {
-          DataType: "String",
-          StringValue: automation._id || "unknown"
-        },
-        processingStage: {
-          DataType: "String",
-          StringValue: context.processingStage
-        },
-        timestamp: {
-          DataType: "String",
-          StringValue: error.timestamp
-        },
-        lambdaFunctionName: {
-          DataType: "String",
-          StringValue: process.env.AWS_LAMBDA_FUNCTION_NAME || "unknown"
-        }
-      }
-    })
-  );
-}
 function createCsv(data) {
   function flattenObject(obj, prefix = "") {
     const flattened = {};
@@ -21763,6 +21704,44 @@ async function uploadCsv({ csvContent, automationRun, s3Client, orgFilename, col
     throw new Error(error);
   }
 }
+async function handleError({ etnApi, automationRun, error, lambdaSource, accountId }) {
+  await etnApi.createAutomationRunLog(automationRun._id, {
+    message: error.message,
+    status: "error",
+    lambdaSource
+  });
+  const message = automationRun.source?.fileName ? `Automation "${automationRun.description}" FAILED while processing file: ${automationRun.source.fileName}` : `Automation "${automationRun.description}" FAILED.`;
+  await etnApi.createLog({
+    message,
+    context: {
+      status: "error",
+      error: error.message,
+      automationId: automationRun.automationId,
+      automationDescription: automationRun.description,
+      automationRunId: automationRun._id
+    },
+    type: "automation-ingest",
+    userSub: lambdaSource,
+    companyId: automationRun.companyId
+  });
+  if (accountId) {
+    await etnApi.updateAccountStatusForAutomation(automationRun.automationId, accountId, { status: "error" });
+  }
+}
+async function deleteMessage(queueUrl, receiptHandle, sqsClient) {
+  if (!queueUrl || !receiptHandle) {
+    throw new Error("QueueUrl and ReceiptHandle are required to delete a message");
+  }
+  if (!sqsClient) {
+    sqsClient = new import_client_sqs.SQSClient({ region: "eu-west-1" });
+  }
+  const deleteMessageCommand = new import_client_sqs.DeleteMessageCommand({
+    QueueUrl: queueUrl,
+    ReceiptHandle: receiptHandle
+  });
+  await sqsClient.send(deleteMessageCommand);
+  console.log("Deleted SQS message", { ReceiptHandle: receiptHandle });
+}
 
 // src/types/index.ts
 var import_mongodb2 = require("mongodb");