nets-service-sdk 1.1.19 → 1.1.21

package/dist/index.js

@@ -32,7 +32,9 @@ var require_utils_helper = __commonJS({
       return res.join("").toUpperCase();
     };
     String.prototype.toAsciiString = function() {
-      return this.match(/.{1,2}/g).map(function(v) {
+      const matches = this.match(/.{1,2}/g);
+      if (!matches) return "";
+      return matches.map(function(v) {
         return String.fromCharCode(parseInt(v, 16));
       }).join("");
     };
@@ -280,6 +282,17 @@ var require_hexRequest = __commonJS({
       console.log("buffer", buffer);
       return { buffer, ecn: body.ecn, hexString };
     };
+    module2.exports.generateFunction56Request = () => {
+      const date = moment().format("DDMMYYHHmmss");
+      const paddedValue = padWithLeadingZeros(date, "12");
+      const hexValue = paddedValue.toHexString();
+      const calculated = `0018${hexValue}35363031301C03`;
+      const calculatedXor = xorCalculation(calculated);
+      const hexString = `02${calculated}` + calculatedXor;
+      console.log("Recovery Function 56 Request:", hexString);
+      const buffer = Buffer.from(hexString, "hex");
+      return { buffer, ecn: date };
+    };
   }
 });
 
@@ -447,7 +460,9 @@ var require_parser = __commonJS({
         let status = false;
         const json = {};
         for (let i = 0; i < splitted.length; i++) {
+          if (!splitted[i] || splitted[i].length === 0) continue;
           const ascii = splitted[i].toAsciiString();
+          if (!ascii) continue;
           if (ascii?.indexOf(ecn) > -1 || i === 0 && ascii.length >= 12) {
             json["ECN"] = ascii.cleanUp();
             if (ascii?.indexOf(ecn) === -1) {
@@ -477,7 +492,9 @@ var require_parser = __commonJS({
         let status = false;
         const json = {};
         for (let i = 0; i < splitted.length; i++) {
+          if (!splitted[i] || splitted[i].length === 0) continue;
           const ascii = splitted[i].toAsciiString();
+          if (!ascii) continue;
           if (ascii?.indexOf(ecn) > -1 || i === 0 && ascii.length >= 12) {
             json["ECN"] = ascii.cleanUp();
           } else {
@@ -930,6 +947,32 @@ var require_responseHandler = __commonJS({
       }
       return isMatch;
     };
+    module2.exports.terminalRecovery = (hexFrame) => {
+      const ecn = activePaymentEcn;
+      const parsedValue = netsPaymentParser(hexFrame, ecn);
+      const response = jsonProcessor(parsedValue);
+      if (response.translated) {
+        activePaymentEcn = null;
+      }
+      if (response.translated && (response.translated.category == "SUCCESS" || response.translated.status == "APPROVED")) {
+        logger.log({ level: "info", message: "\u2705 Recovery SUCCESS: Last transaction was APPROVED." });
+        sendMessage2("clientRoom", "PAYMENT_MESSAGE", {
+          success: true,
+          status: "SUCCESS",
+          response,
+          action: "COMPLETED"
+        });
+        sendPaymentResponseToCloud(response.translated);
+      } else {
+        logger.log({ level: "warn", message: "\u26A0\uFE0F Recovery FAILED: Transaction status could not be confirmed as APPROVED." });
+        sendMessage2("clientRoom", "PAYMENT_MESSAGE", {
+          status: "FAILED",
+          action: "CANCELLED",
+          message: "Payment needs verification / Failed",
+          reason: "RECOVERY_NOT_CONFIRMED"
+        });
+      }
+    };
   }
 });
 
@@ -959,13 +1002,14 @@ var require_communication = __commonJS({
     var { initialiseRequest } = require_httpRequest();
     var requestType;
     var calculated;
-    var MAX_COUNT = 3;
+    var MAX_COUNT = 2;
     var WRONG_LRC_MAX_COUNT = 3;
     var count = MAX_COUNT;
     var lrcCount = WRONG_LRC_MAX_COUNT;
     var ackOrNack = null;
     var requestPayload = null;
     var ackTimeout = null;
+    var dataTimeout = null;
     var ACK = Buffer.alloc(1, 6, "hex");
     var NACK = Buffer.alloc(1, 21, "hex");
     var dataBuffer = Buffer.alloc(0);
@@ -981,6 +1025,10 @@ var require_communication = __commonJS({
         clearTimeout(ackTimeout);
         ackTimeout = null;
       }
+      if (dataTimeout) {
+        clearTimeout(dataTimeout);
+        dataTimeout = null;
+      }
     };
     module2.exports.checkACKorNACK = () => {
       if (ackTimeout) clearTimeout(ackTimeout);
@@ -1000,12 +1048,12 @@ var require_communication = __commonJS({
               message: `On ACK/NACK Listener: Terminal did not respond with ACK/NACK after max ${count} retries. Sending TERMINAL_ERROR to client.`
             });
             sendMessage2("clientRoom", "PAYMENT_MESSAGE", {
-              success: true,
+              status: "FAILED",
               action: "TERMINAL_ERROR"
             });
           }
         }
-      }, 4e3);
+      }, 2e3);
     };
     var resendData = () => {
       if (requestType == "STATUS_CHECK") {
@@ -1105,6 +1153,7 @@ var require_communication = __commonJS({
             clearTimeout(ackTimeout);
             ackTimeout = null;
           }
+          exports2.startDataTimeout();
           if (byte === 21) {
             count--;
             if (count >= 0) {
@@ -1115,7 +1164,7 @@ var require_communication = __commonJS({
                 level: "error",
                 message: `Terminal responded with NACK multiple times. Max retries reached. Sending TERMINAL_ERROR.`
               });
-              sendMessage2("clientRoom", "PAYMENT_MESSAGE", { success: true, action: "TERMINAL_ERROR" });
+              sendMessage2("clientRoom", "PAYMENT_MESSAGE", { status: "FAILED", action: "TERMINAL_ERROR" });
             }
           }
           continue;
@@ -1171,18 +1220,37 @@ var require_communication = __commonJS({
         }
       }
     };
+    module2.exports.triggerRecovery = () => {
+      const { generateFunction56Request } = require_hexRequest();
+      exports2.reset();
+      lrcCount = WRONG_LRC_MAX_COUNT;
+      count = MAX_COUNT;
+      const req = generateFunction56Request();
+      requestType = "RECOVERY";
+      calculated = req;
+      logger.log({ level: "info", message: "\u{1F680} Triggering Recovery (Function 56) due to LRC failures..." });
+      global.port.write(req.buffer);
+      exports2.checkACKorNACK();
+    };
     module2.exports.handleFullMessage = (fullFrame) => {
-      const { checkLrc: checkLrc2, terminalStatus: terminalStatus2, terminalLogon: terminalLogon2, terminalPayment: terminalPayment2, terminalCreditPayment: terminalCreditPayment2 } = require_responseHandler();
+      const { checkLrc: checkLrc2, terminalStatus: terminalStatus2, terminalLogon: terminalLogon2, terminalPayment: terminalPayment2, terminalCreditPayment: terminalCreditPayment2, terminalRecovery } = require_responseHandler();
       if (ackTimeout) {
         clearTimeout(ackTimeout);
         ackTimeout = null;
       }
+      if (dataTimeout) {
+        clearTimeout(dataTimeout);
+        dataTimeout = null;
+      }
       ackOrNack = Buffer.from([6]);
       const hexFrame = fullFrame.toString("hex").toUpperCase();
       logger.log({ level: "info", message: `Full frame processed: ${hexFrame}` });
-      if (checkLrc2(hexFrame)) {
+      const isLrcCorrect = checkLrc2(hexFrame);
+      if (isLrcCorrect) {
         logger.log({ level: "info", message: `LRC Correct. Sending ACK (0x06).` });
         global.port.write(ACK);
+        lrcCount = WRONG_LRC_MAX_COUNT;
+        count = MAX_COUNT;
         logger.log({ level: "info", message: `requestType: ${requestType}` });
         if (requestType === "STATUS_CHECK") {
           terminalStatus2(calculated?.ecn, hexFrame);
@@ -1192,12 +1260,65 @@ var require_communication = __commonJS({
           terminalPayment2(hexFrame, calculated?.ecn);
         } else if (requestType === "CREDIT_PAYMENT") {
           terminalCreditPayment2(hexFrame, calculated?.ecn);
+        } else if (requestType === "RECOVERY") {
+          terminalRecovery(hexFrame);
         }
       } else {
-        logger.log({ level: "error", message: `LRC Incorrect. Sending NACK (0x15).` });
-        global.port.write(NACK);
+        lrcCount--;
+        if (lrcCount > 0) {
+          logger.log({ level: "error", message: `LRC Incorrect. Sending NACK (0x15). Retries left: ${lrcCount}` });
+          global.port.write(NACK);
+        } else {
+          if (hexFrame.indexOf("415050524F564544") > -1) {
+            logger.log({ level: "info", message: "\u2705 LRC Incorrect 3 times, but APPROVED found in hex payload. Accepting with ACK." });
+            global.port.write(ACK);
+            lrcCount = WRONG_LRC_MAX_COUNT;
+            count = MAX_COUNT;
+            if (requestType === "PAYMENT") terminalPayment2(hexFrame, calculated?.ecn);
+            else if (requestType === "CREDIT_PAYMENT") terminalCreditPayment2(hexFrame, calculated?.ecn);
+            else if (requestType === "RECOVERY") terminalRecovery(hexFrame);
+            else if (requestType === "LOGON") terminalLogon2(calculated?.ecn, hexFrame);
+            else if (requestType === "STATUS_CHECK") terminalStatus2(calculated?.ecn, hexFrame);
+          } else {
+            logger.log({ level: "warn", message: `LRC Incorrect 3 times and NO approval found. Stopping.` });
+            global.port.write(NACK);
+            if (ackTimeout) {
+              clearTimeout(ackTimeout);
+              ackTimeout = null;
+            }
+            if (requestType !== "RECOVERY") {
+              sendMessage2("clientRoom", "PAYMENT_MESSAGE", {
+                status: "UNKNOWN",
+                action: "VERIFYING_STATUS",
+                message: "Payment status uncertain. Please wait while we verify...",
+                reason: "LRC_FAILURE"
+              });
+              setTimeout(() => exports2.triggerRecovery(), 2e3);
+            } else {
+              sendMessage2("clientRoom", "PAYMENT_MESSAGE", {
+                status: "FAILED",
+                action: "CANCELLED",
+                message: "Payment needs manual verification / Recovery failed.",
+                reason: "RECOVERY_LRC_FAILURE"
+              });
+            }
+          }
+        }
       }
     };
+    module2.exports.startDataTimeout = () => {
+      if (dataTimeout) clearTimeout(dataTimeout);
+      dataTimeout = setTimeout(() => {
+        dataTimeout = null;
+        logger.error({ level: "error", message: `Terminal response time out (60 seconds) after ACK.` });
+        sendMessage2("clientRoom", "PAYMENT_MESSAGE", {
+          status: "FAILED",
+          action: "TERMINAL_ERROR",
+          message: "Terminal response time out (60 seconds)"
+        });
+        exports2.reset();
+      }, 6e4);
+    };
     module2.exports.checkPortConnection = async () => {
       const portPath = config.simulation ? config.simulationPort : config.com;
       try {
@@ -1300,7 +1421,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "nets-service-sdk",
-      version: "1.1.19",
+      version: "1.1.21",
       description: "Utility functions for Nets Service",
       source: "src/index.js",
       main: "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nets-service-sdk",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "Utility functions for Nets Service",
   "source": "src/index.js",
   "main": "dist/index.js",