nets-service-sdk 1.1.14 → 1.1.15

package/dist/index.js

@@ -6,7 +6,6 @@ var __commonJS = (cb, mod) => function __require() {
 // src/utils.helper.js
 var require_utils_helper = __commonJS({
   "src/utils.helper.js"(exports2, module2) {
-    var { SerialPort } = require("serialport");
     var crypto = require("crypto");
     var _ = require("lodash");
     module2.exports.padWithLeadingZeros = (num, totalLength) => {
@@ -53,34 +52,6 @@ var require_utils_helper = __commonJS({
         ""
       ).trim();
     };
-    SerialPort.prototype._disconnected = function(err) {
-      this.paused = true;
-      this.emit("disconnect", err);
-      if (this.closing) {
-        return;
-      }
-      if (this.fd === null) {
-        return;
-      }
-      this.closing = true;
-      if (process.platform !== "win32") {
-        this.readable = false;
-        if (this.serialPoller) {
-          this.serialPoller.close();
-        }
-      }
-      SerialPortBinding.close(
-        this.fd,
-        function(err2) {
-          this.closing = false;
-          if (err2) {
-            debug("Disconnect close completed with error: ", err2);
-          }
-          this.fd = null;
-          this.emit("close");
-        }.bind(this)
-      );
-    };
     module2.exports.generateServiceKey = (payload) => {
       const key = `${process.env.user}:${process.env.password}`;
       const algorithm = "aes256";
@@ -950,6 +921,10 @@ var require_communication = __commonJS({
             });
             resendData();
           } else {
+            logger.log({
+              level: "warn",
+              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,
               action: "TERMINAL_ERROR"
@@ -1018,20 +993,6 @@ var require_communication = __commonJS({
             });
             global.port.on("data", (data) => {
               logger.log({ level: "info", message: `Raw data: ${data.toString("hex")}` });
-              if (data.length == 1) {
-                console.log(data);
-                if (data[0] === 6 || data[0] === 6 || data[0] === 21 || data[0] === 21) {
-                  const byte = data[0];
-                  ackOrNack = Buffer.from([byte]);
-                  data = data.slice(1);
-                  logger.log({ level: "info", message: `Terminal sent ${byte === 6 ? "ACK" : "NACK"} (0x${byte.toString(16)})` });
-                  if (byte === 21 || byte === 21) {
-                    count--;
-                    if (count >= 0) resendData();
-                    else sendMessage2("clientRoom", "PAYMENT_MESSAGE", { success: true, action: "TERMINAL_ERROR" });
-                  }
-                }
-              }
               dataBuffer = Buffer.concat([dataBuffer, data]);
               exports2.processIncomingData();
             });
@@ -1060,17 +1021,42 @@ var require_communication = __commonJS({
       }
     };
     module2.exports.processIncomingData = () => {
-      while (dataBuffer.length >= 3) {
-        const stxIndex = dataBuffer.indexOf(2);
-        if (stxIndex === -1) {
-          dataBuffer = Buffer.alloc(0);
-          break;
+      while (dataBuffer.length > 0) {
+        if (dataBuffer[0] === 6 || dataBuffer[0] === 21) {
+          const byte = dataBuffer[0];
+          ackOrNack = Buffer.from([byte]);
+          dataBuffer = dataBuffer.slice(1);
+          logger.log({ level: "info", message: `Terminal sent ${byte === 6 ? "ACK" : "NACK"} (0x${byte.toString(16).padStart(2, "0")})` });
+          if (ackTimeout) {
+            clearTimeout(ackTimeout);
+            ackTimeout = null;
+          }
+          if (byte === 21) {
+            count--;
+            if (count >= 0) {
+              logger.log({ level: "info", message: `Terminal NACK received, retrying ${requestType}...` });
+              resendData();
+            } else {
+              logger.log({
+                level: "error",
+                message: `Terminal responded with NACK multiple times. Max retries reached. Sending TERMINAL_ERROR.`
+              });
+              sendMessage2("clientRoom", "PAYMENT_MESSAGE", { success: true, action: "TERMINAL_ERROR" });
+            }
+          }
+          continue;
         }
-        if (stxIndex > 0) {
-          dataBuffer = dataBuffer.slice(stxIndex);
+        if (dataBuffer[0] !== 2) {
+          const nextStart = dataBuffer.slice(1).findIndex((b) => b === 2 || b === 6 || b === 21);
+          if (nextStart === -1) {
+            dataBuffer = Buffer.alloc(0);
+            break;
+          } else {
+            dataBuffer = dataBuffer.slice(nextStart + 1);
+            continue;
+          }
         }
         if (dataBuffer.length < 3) break;
-        if (dataBuffer.length < 3) break;
         const lenBytes = dataBuffer.slice(1, 3).toString("hex");
         const bodyLen = parseInt(lenBytes, 10);
         const expectedFrameSize = 1 + 2 + bodyLen + 2;
@@ -1086,7 +1072,10 @@ var require_communication = __commonJS({
             dataBuffer = dataBuffer.slice(etxIndex + 2);
             exports2.handleFullMessage(frame);
           } else {
-            if (dataBuffer.length > 1024) dataBuffer = Buffer.alloc(0);
+            if (dataBuffer.length > 2048) {
+              logger.log({ level: "warn", message: "Stale data in buffer exceeds limit, clearing." });
+              dataBuffer = Buffer.alloc(0);
+            }
             break;
           }
         }
@@ -1119,9 +1108,51 @@ var require_communication = __commonJS({
         global.port.write(NACK);
       }
     };
-    module2.exports.sentToTerminal = (type, body) => {
+    module2.exports.checkPortConnection = async () => {
+      const portPath = config.simulation ? config.simulationPort : config.com;
+      try {
+        const ports = await SerialPort.list();
+        const availablePorts = ports.map((p) => p.path);
+        if (!availablePorts.includes(portPath)) {
+          logger.error({
+            level: "error",
+            message: `\u274C Port ${portPath} is NOT connected to the system.`
+          });
+          return { success: false, error: "PORT_DISCONNECTED" };
+        }
+        if (!global.port || !global.port.isOpen) {
+          logger.error({
+            level: "error",
+            message: `\u274C Port ${portPath} is connected but NOT open.`
+          });
+          if (config.terminal === "enable" || !config.terminal) {
+            logger.log({ level: "info", message: "Attempting to re-initialize port..." });
+            exports2.initialize();
+          }
+          return { success: false, error: "PORT_NOT_OPEN" };
+        }
+        return { success: true };
+      } catch (e) {
+        logger.error({
+          level: "error",
+          message: `Error checking port connection: ${e.message}`
+        });
+        return { success: false, error: e.message };
+      }
+    };
+    module2.exports.sentToTerminal = async (type, body) => {
       requestType = type;
       requestPayload = body;
+      const portStatus = await exports2.checkPortConnection();
+      if (!portStatus.success) {
+        const msgType = requestType === "STATUS_CHECK" ? "STATUS_MESSAGE" : requestType === "LOGON" ? "LOGON_MESSAGE" : "PAYMENT_MESSAGE";
+        sendMessage2("clientRoom", msgType, {
+          status: "FAILED",
+          action: "TERMINAL_ERROR",
+          error: portStatus.error,
+          message: "Port is not connected or not responding."
+        });
+      }
       if (requestType == "STATUS_CHECK") {
         calculated = generateStatusReq();
         sendMessage2("clientRoom", "STATUS_MESSAGE", {
@@ -1152,9 +1183,13 @@ var require_communication = __commonJS({
           lastPaymentTime = now;
         }
         exports2.reset();
-        const { setPaymentCloudUrl, setPaymentOrderId } = require_responseHandler();
+        const {
+          setPaymentCloudUrl,
+          setPaymentOrderId
+        } = require_responseHandler();
         if (body && body.cloud_url) setPaymentCloudUrl(body.cloud_url);
-        if (body && (body.reference || body.orderId)) setPaymentOrderId(body.reference || body.orderId);
+        if (body && (body.reference || body.orderId))
+          setPaymentOrderId(body.reference || body.orderId);
         calculated = generatePaymentRequest(body);
         console.log(calculated);
         sendMessage2("clientRoom", "PAYMENT_MESSAGE", {

package/package.json

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