@7365admin1/core 3.38.0 → 3.40.0

package/dist/index.mjs

@@ -23061,6 +23061,7 @@ function useVehicleRepo() {
     if (error) {
       throw new BadRequestError69(error.details[0].message);
     }
+    console.log("getVehicleByPlateNumber plateNumber", plateNumber);
     try {
       const data = await collection.findOne(
         { plateNumber, status: "active" },
@@ -23073,6 +23074,14 @@ function useVehicleRepo() {
       );
     }
   }
+  async function findOne(query) {
+    try {
+      const data = await collection.findOne(query);
+      return data;
+    } catch (error) {
+      throw new InternalServerError25("Failed to fetch findOne vehicle." + error);
+    }
+  }
   async function getVehicleBySiteAndPlateNumber(plateNumber, site, category, status) {
     const { error } = Joi39.string().required().validate(plateNumber);
     if (error) {
@@ -23381,7 +23390,8 @@ function useVehicleRepo() {
     getSpecificVehicleById,
     getBlocklistedVehicles,
     getVehicleBySiteAndPlateNumber,
-    getBlocklistedVehicleByPlateNumber
+    getBlocklistedVehicleByPlateNumber,
+    findOne
   };
 }
 
@@ -23460,12 +23470,13 @@ async function useDahuaDigestWithRetry({
   headers = {},
   timeout = 1e4,
   streaming = false,
-  retries = 3,
+  retries = 10,
   retryDelayMs = 0
 }) {
   let lastError;
   for (let attempt = 1; attempt <= retries; attempt++) {
     try {
+      const effectiveTimeout = streaming ? 0 : timeout;
       const response = await useDahuaDigest({
         host,
         username,
@@ -23473,16 +23484,23 @@ async function useDahuaDigestWithRetry({
         endpoint,
         method,
         headers,
-        timeout,
+        timeout: effectiveTimeout,
         streaming
       });
-      const text = getDahuaResponseText(response);
       const statusCode = getDahuaStatusCode(response);
-      const isOk = statusCode === 200 && text.includes("OK");
-      if (isOk) {
-        return response;
+      if (streaming) {
+        if (statusCode === 200) {
+          return response;
+        }
+      } else {
+        const text = getDahuaResponseText(response);
+        const isOk = statusCode === 200 && text.includes("OK");
+        if (isOk) {
+          return response;
+        }
       }
-      const shouldRetry = isDahuaInvalidAuthority(text);
+      const errorText = streaming ? `HTTP ${statusCode}` : getDahuaResponseText(response);
+      const shouldRetry = isDahuaInvalidAuthority(errorText);
       if (shouldRetry && attempt < retries) {
         loggerDahua.warn(
           `[${host}] Dahua Invalid Authority. Retrying ${attempt}/${retries}`
@@ -23492,7 +23510,7 @@ async function useDahuaDigestWithRetry({
         }
         continue;
       }
-      throw new Error(`Dahua response: ${text || `HTTP ${statusCode}`}`);
+      throw new Error(`Dahua response: ${errorText || `HTTP ${statusCode}`}`);
     } catch (error) {
       lastError = error;
       const message = error?.message || String(error);
@@ -23875,6 +23893,7 @@ function useDahuaService() {
     if (camera.status !== "active") {
       if (cameraRegistry.has(cameraId)) {
         loggerDahua.info(`[${camera?.siteName}-${camera?.direction}] Camera is ${camera.status}. Stopping connection.`);
+        console.log(`[${camera?.siteName}-${camera?.direction}] Camera is ${camera.status}. Stopping connection.`);
         cameraRegistry.get(cameraId)?.abort();
         cameraRegistry.delete(cameraId);
       }
@@ -23882,6 +23901,7 @@ function useDahuaService() {
     }
     if (cameraRegistry.has(cameraId)) {
       loggerDahua.info(`[${camera?.siteName}-${camera?.direction}] Stopping existing connection for update.`);
+      console.log(`[${camera?.siteName}-${camera?.direction}] Stopping existing connection for update.`);
       cameraRegistry.get(cameraId)?.abort();
       cameraRegistry.delete(cameraId);
     }
@@ -23901,11 +23921,14 @@ function useDahuaService() {
   }
   async function getTrafficJunction(camera, signal, onDetected) {
     console.log(`getTrafficJunction camera object`, camera);
+    let authFailureCount = 0;
+    const MAX_AUTH_RETRIES = 10;
     while (!signal.aborted) {
       let bufferQueue = null;
       let response = null;
+      let isAuthFailure = false;
       try {
-        response = await useDahuaDigest({
+        response = await useDahuaDigestWithRetry({
           host: camera?.host,
           username: camera?.username,
           password: camera?.password,
@@ -23913,16 +23936,32 @@ function useDahuaService() {
           timeout: 2e4,
           streaming: true
         });
-        if (response.statusCode === 401) {
-          loggerDahua.error(`[${camera?.siteName}-${camera?.direction}] 401 Unauthorized. Potential handshake or wrong credentials.`);
-          continue;
-        } else if ([400, 401, 403, 500].includes(response.statusCode)) {
-          loggerDahua.error(`[${camera?.siteName}-${camera?.direction}] Connection error: ${response.statusCode}`);
+        const statusCode = getDahuaStatusCode(response);
+        if (statusCode === 401) {
+          loggerDahua.error(`[${camera?.siteName}-${camera?.direction}] 401 Unauthorized - Handshake or Wrong Credentials`);
+          console.log(`[${camera?.siteName}-${camera?.direction}] 401 Unauthorized - Handshake or Wrong Credentials`);
+          throw new Error("401 Unauthorized - Handshake or Wrong Credentials");
+        } else if (statusCode === 403) {
+          loggerDahua.error(
+            `[${camera?.siteName}-${camera?.direction}] 403 Forbidden. Account locked or invalid permissions.`
+          );
           if (onDetected) {
-            onDetected({ site: camera?.site, messagePermanent: `Camera [${camera?.siteName}-${camera?.direction}]. Connection Error. Check username and password.` });
+            onDetected({
+              site: camera?.site,
+              direction: camera?.direction,
+              messagePermanent: `Camera [${camera?.siteName}-${camera?.direction}]. Connection Error. Check username and password and try after 10 minutes.`
+            });
+          }
+          return;
+        } else if ([400, 500].includes(statusCode)) {
+          loggerDahua.error(`[${camera?.siteName}-${camera?.direction}] Connection error: ${statusCode}`);
+          if (onDetected) {
+            onDetected({ site: camera?.site, messagePermanent: `Camera [${camera?.siteName}-${camera?.direction}]. Connection Error. Possible Not Authorized.` });
           }
           return;
         }
+        authFailureCount = 0;
+        isAuthFailure = false;
         loggerDahua.info(`[${camera?.siteName}-${camera?.direction}] Successfully connected to ANPR.`);
         const contentType = response.res.headers["content-type"];
         const boundaryMatch = contentType?.match(/boundary=(.*)$/i);
@@ -23967,15 +24006,53 @@ function useDahuaService() {
           loggerDahua.info(`[${camera?.siteName}-${camera?.direction}] Connection closed by system (Abort).`);
           break;
         }
-        loggerDahua.error(
-          `[${camera?.siteName}-${camera?.direction}] Connection lost or error: ${error.message || error}. Retrying in 10 seconds...`
-        );
-        if (onDetected) {
-          onDetected({
-            site: camera?.site,
-            direction: camera?.direction,
-            message: `Camera in [${camera?.siteName}-${camera?.direction}] Connection Lost. Retrying in 10 seconds. Check the camera if this issue persists, Or set the camera to Inactive to stop this notification.`
-          });
+        const errMsg = String(error?.message || error);
+        if (errMsg.includes("403") || errMsg.includes("Forbidden")) {
+          loggerDahua.error(
+            `[${camera?.siteName}-${camera?.direction}] 403 Forbidden thrown by Dahua client. Account locked or invalid credentials.`
+          );
+          if (onDetected) {
+            onDetected({
+              site: camera?.site,
+              direction: camera?.direction,
+              messagePermanent: `Camera [${camera?.siteName}-${camera?.direction}]. Connection Error. Check username and password and try after 10 minutes.`
+            });
+          }
+          return;
+        }
+        const isAuthError = errMsg.includes("401") || errMsg.includes("Unauthorized") || errMsg.includes("Invalid Authority");
+        if (isAuthError) {
+          authFailureCount++;
+          isAuthFailure = true;
+          loggerDahua.warn(
+            `[${camera?.siteName}-${camera?.direction}] Auth attempt ${authFailureCount}/${MAX_AUTH_RETRIES}`
+          );
+          if (authFailureCount >= MAX_AUTH_RETRIES) {
+            loggerDahua.error(
+              `[${camera?.siteName}-${camera?.direction}] Max auth failures reached (${MAX_AUTH_RETRIES}). Wrong credentials.`
+            );
+            if (onDetected) {
+              onDetected({
+                site: camera?.site,
+                direction: camera?.direction,
+                messagePermanent: `Camera [${camera?.siteName}-${camera?.direction}]. Connection Error. Check username and password.`
+              });
+            }
+            return;
+          }
+        } else {
+          authFailureCount = 0;
+          isAuthFailure = false;
+          loggerDahua.error(
+            `[${camera?.siteName}-${camera?.direction}] Connection lost or error: ${error.message || error}. Retrying in 10 seconds...`
+          );
+          if (onDetected) {
+            onDetected({
+              site: camera?.site,
+              direction: camera?.direction,
+              message: `Camera in [${camera?.siteName}-${camera?.direction}] Connection Lost. Retrying in 10 seconds. Check the camera if this issue persists, Or set the camera to Inactive to stop this notification.`
+            });
+          }
         }
       } finally {
         if (bufferQueue?.destroy) {
@@ -23997,7 +24074,8 @@ function useDahuaService() {
         }
       }
       if (!signal.aborted) {
-        await new Promise((res) => setTimeout(res, 1e4));
+        const waitMs = isAuthFailure ? 1e3 : 1e4;
+        await new Promise((res) => setTimeout(res, waitMs));
       }
     }
     loggerDahua.info(`[${camera?.siteName}-${camera?.direction}] ANPR Listener stopped.`);
@@ -24668,7 +24746,8 @@ function useSiteCameraRepo() {
         throw new BadRequestError71("Site camera not found.");
       }
       if (result?._id) {
-        const result2 = await findOne({ _id: new ObjectId44(result._id) });
+        const result2 = await findOne({ _id: new ObjectId44(result._id) }, void 0, { session });
+        console.log("updateById result2", result2);
         if (result2?._id) {
           const { listenToCamera } = useDahuaService();
           await listenToCamera(result2);
@@ -24733,6 +24812,9 @@ function useSiteCameraRepo() {
         throw new BadRequestError71("Invalid site ID format");
       }
     }
+    if (value.status) {
+      query.status = value.status;
+    }
     try {
       const items = await collection.aggregate([
         {
@@ -24803,7 +24885,7 @@ function useSiteCameraRepo() {
       throw new BadRequestError71("Failed to retrieve site cameras.");
     }
   }
-  async function findOne(query, project = {}) {
+  async function findOne(query, project = {}, options = {}) {
     try {
       const pipeline = [
         { $match: query },
@@ -24852,14 +24934,14 @@ function useSiteCameraRepo() {
       if (Object.keys(project).length > 0) {
         pipeline.push({ $project: project });
       }
-      const result = await collection.aggregate(pipeline).toArray();
+      const result = await collection.aggregate(pipeline, options).toArray();
       return result.length > 0 ? result[0] : null;
     } catch (error) {
       console.error("Error in findOne aggregation:", error);
       throw error;
     }
   }
-  async function findMany(query, project = {}) {
+  async function findMany(query, project = {}, options = {}) {
     try {
       const pipeline = [
         { $match: query },
@@ -24908,10 +24990,10 @@ function useSiteCameraRepo() {
       if (Object.keys(project).length > 0) {
         pipeline.push({ $project: project });
       }
-      const result = await collection.aggregate(pipeline).toArray();
+      const result = await collection.aggregate(pipeline, options).toArray();
       return result.length > 0 ? result : [];
     } catch (error) {
-      console.error("Error in findOne aggregation:", error);
+      console.error("Error in findMany aggregation:", error);
       throw error;
     }
   }
@@ -24928,7 +25010,9 @@ function useSiteCameraRepo() {
     getBySiteGuardPost,
     updateById,
     deleteById,
-    getAllCameraWithPassword
+    getAllCameraWithPassword,
+    findMany,
+    findOne
   };
 }
 
@@ -25060,9 +25144,9 @@ function usePersonRepo() {
           { email: { $regex: search, $options: "i" } },
           { nric: { $regex: search, $options: "i" } },
           { "plates.plateNumber": { $regex: search, $options: "i" } },
-          { contact: { $regex: makeContainsRegex(contact) } },
-          { contacts: { $regex: makeContainsRegex(contact) } },
-          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
+          { contact: { $regex: makeContainsRegex(search) } },
+          { contacts: { $regex: makeContainsRegex(search) } },
+          { plateNumbers: { $regex: makeContainsRegex(search) } }
         ]
       },
       ...ObjectId45.isValid(org) && { org: new ObjectId45(org) },
@@ -26865,7 +26949,8 @@ function useVehicleService() {
     deleteExpiredVehicles: _deleteExpiredVehicles,
     getVehicleByPlateNumber: _getVehicleByPlateNumber,
     getAllExpiredVehicles: _getAllExpiredVehicles,
-    bulkUpsertVehicles: _bulkUpsertVehicles
+    bulkUpsertVehicles: _bulkUpsertVehicles,
+    findOne
   } = useVehicleRepo();
   const {
     addPlateNumber: _addPlateNumber,
@@ -26889,15 +26974,18 @@ function useVehicleService() {
         throw new Error("Unable to start session for vehicle service.");
       }
     }
+    console.log("add vehicle service value.plateNumber", value.plateNumber);
     const [_vehiclePlateNumber] = value.plateNumber;
-    const [existingPlateNumber, org] = await Promise.all([
-      _getVehicleByPlateNumber(_vehiclePlateNumber),
+    console.log("add vehicle service plateNumber", _vehiclePlateNumber);
+    const [
+      // existingPlateNumber, 
+      org
+    ] = await Promise.all([
+      // _getVehicleByPlateNumber(_vehiclePlateNumber),
       _getById(value.org)
     ]);
     if (!org)
       throw new BadRequestError75("Org not found");
-    if (existingPlateNumber)
-      throw new BadRequestError75("Vehicle plate number already exists");
     if (!Object.values(OrgNature).includes(org.nature)) {
       throw new BadRequestError75(
         "This organization is not allowed to add vehicles."
@@ -26910,7 +26998,6 @@ function useVehicleService() {
       user,
       org: value.org
     });
-    console.log("userPermissions vehicle.service.ts", userPermissions);
     const hasSecurityBypass = addedBySecurity && Array.isArray(userPermissions) && (userPermissions.includes("*") || userPermissions.includes("vehicleManagement:approve-vehicle"));
     if (hasSecurityBypass) {
       addedByPM = true;
@@ -26969,17 +27056,16 @@ function useVehicleService() {
           const siteCameraReq = await _getAllSiteCameras({
             site: value.site,
             type: "anpr",
-            direction: ["both", "entry"],
+            direction: ["both", "entry", "residents"],
             page,
-            limit
+            limit,
+            status: "active"
           });
           pages = siteCameraReq.pages || 1;
           siteCameras.push(...siteCameraReq.items);
           page++;
         } while (page <= pages);
-        if (!siteCameras.length) {
-          throw new BadRequestError75("No site cameras found.");
-        }
+        console.log("add vehicle service siteCameras", siteCameras);
       }
       for (const plateNumber of plateNumbers) {
         const vehicleValue = {
@@ -31633,6 +31719,7 @@ function useSiteCameraService() {
   const { add: _add, getAllCameraWithPassword: _getAllCameraWithPassword } = useSiteCameraRepo();
   const { updateById: _updateById } = useSiteRepo();
   const dahuaService = useDahuaService();
+  const { updateById: _siteCameraUpdateById } = useSiteCameraRepo();
   let cleanupTask = null;
   async function add(value) {
     const { error } = schemaSiteCamera.validate(value);
@@ -31666,6 +31753,7 @@ function useSiteCameraService() {
         type: "anpr",
         page,
         limit
+        // site: "6923d6664150ca6a69b9f2b2"
       });
       pages = siteCameraReq.pages || 1;
       siteCameras.push(...siteCameraReq.items);
@@ -31681,9 +31769,27 @@ function useSiteCameraService() {
       }
     }
   }
+  async function updateById(id, value) {
+    const session = useAtlas43.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Unable to start session for site camera service.");
+    }
+    try {
+      session.startTransaction();
+      const result = await _siteCameraUpdateById(id, value, session);
+      await session.commitTransaction();
+      return result;
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
   return {
     add,
-    listenToCapturedPlateNumber
+    listenToCapturedPlateNumber,
+    updateById
   };
 }
 
@@ -31691,10 +31797,9 @@ function useSiteCameraService() {
 import { BadRequestError as BadRequestError89 } from "@7365admin1/node-server-utils";
 import Joi49 from "joi";
 function useSiteCameraController() {
-  const { add: _add } = useSiteCameraService();
+  const { add: _add, updateById: _updateById } = useSiteCameraService();
   const {
     getAll: _getAll,
-    updateById: _updateById,
     deleteById: _deleteById
   } = useSiteCameraRepo();
   async function add(req, res, next) {
@@ -32983,7 +33088,7 @@ function useAttendanceRepository() {
             localField: "user",
             foreignField: "_id",
             as: "user",
-            pipeline: [{ $project: { name: 1 } }]
+            pipeline: [{ $project: { name: 1, profile: 1 } }]
           }
         },
         { $unwind: { path: "$user", preserveNullAndEmptyArrays: true } }
@@ -32997,6 +33102,7 @@ function useAttendanceRepository() {
         {
           $project: {
             userName: "$user.name",
+            userProfile: "$user.profile",
             checkInTimestamp: "$checkIn.timestamp",
             checkOutTimestamp: "$checkOut.timestamp",
             createdAt: 1
@@ -35487,7 +35593,7 @@ function useVisitorTransactionService() {
         value.unitName = unit?.name;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      if (/^(guest|walk-in|contractor|delivery)$/.test(type)) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -35718,7 +35824,7 @@ function useVisitorTransactionService() {
         value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && !value.checkOut) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -35902,7 +36008,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;
@@ -35951,7 +36059,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;
@@ -55352,8 +55462,11 @@ function useNfcPatrolRouteRepo() {
     const query = {
       site
     };
-    if (search) {
-      query.$text = { $search: search };
+    if (search?.trim()) {
+      query.name = {
+        $regex: search.trim(),
+        $options: "i"
+      };
     }
     if (filter === "today" || filter === "notToday") {
       const singaporeDateString = (/* @__PURE__ */ new Date()).toLocaleString("en-US", {
@@ -58775,13 +58888,9 @@ function useNfcPatrolLogRepo() {
     };
     if (date) {
       if (type === "month") {
-        const [year, month] = date.split("-").map(Number);
-        const endDay = new Date(year, month, 0).getDate();
         query.date = {
-          $gte: `${year}-${String(month).padStart(2, "0")}-01`,
-          $lte: `${year}-${String(month).padStart(2, "0")}-${String(
-            endDay
-          ).padStart(2, "0")}`
+          $gte: `${date}-01-01`,
+          $lte: `${date}-12-31`
         };
       } else {
         query.date = date;
@@ -59109,47 +59218,52 @@ function useNfcPatrolLogController() {
       page: Joi111.number().integer().min(1).default(1),
       limit: Joi111.number().integer().min(1).max(100).default(10),
       site: Joi111.string().length(24).hex().required(),
-      date: Joi111.string().pattern(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/).required().messages({
-        "string.pattern.base": "Date must be in YYYY-MM-DD format (e.g. 2026-07-17)"
+      date: Joi111.string().pattern(/^\d{4}(-(0[1-9]|1[0-2])(-(0[1-9]|[12][0-9]|3[01]))?)?$/).optional().messages({
+        "string.pattern.base": "Date must be YYYY or YYYY-MM or YYYY-MM-DD"
       }),
       type: Joi111.string().valid("month").optional(),
       route: Joi111.object({
-        _id: Joi111.string().length(24).hex().required(),
-        startTime: Joi111.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).required()
-      }).required()
+        _id: Joi111.string().length(24).hex().optional(),
+        startTime: Joi111.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().messages({
+          "string.pattern.base": "startTime must be in HH:mm 24-hour format"
+        })
+      }).min(1).optional()
     });
     const query = {
+      page: req.query.page,
+      limit: req.query.limit,
       site: req.query.site,
       date: req.query.date,
-      route: {
-        _id: req.query["route._id"],
-        startTime: req.query["route.startTime"]
-      }
+      type: req.query.type,
+      route: req.query["route._id"] || req.query["route.startTime"] ? {
+        ...req.query["route._id"] ? { _id: req.query["route._id"] } : {},
+        ...req.query["route.startTime"] ? { startTime: req.query["route.startTime"] } : {}
+      } : void 0
     };
     const { error, value } = validation.validate(query, {
-      abortEarly: false
+      abortEarly: false,
+      allowUnknown: true,
+      stripUnknown: true
     });
     if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      logger159.log({ level: "error", message: messages });
-      next(new BadRequestError181(messages));
-      return;
+      return next(
+        new BadRequestError181(
+          error.details.map((d) => d.message).join(", ")
+        )
+      );
     }
-    const { page, limit, site, date, route } = value;
     try {
       const data = await _getAllBySite({
-        page,
-        limit,
-        site,
-        date,
-        route
+        page: value.page,
+        limit: value.limit,
+        site: value.site,
+        date: value.date,
+        type: value.type,
+        route: value.route
       });
-      res.status(200).json(data);
-      return;
+      return res.status(200).json(data);
     } catch (error2) {
-      logger159.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
+      return next(error2);
     }
   }
   async function completeCheckpoint(req, res, next) {
@@ -64737,34 +64851,62 @@ import axios3 from "axios";
 
 // src/utils/payment-signature.util.ts
 import * as crypto3 from "crypto";
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
+function sha512(input) {
+  return crypto3.createHash("sha512").update(input).digest("hex");
+}
+function assertSecret(secretKey) {
+  if (!secretKey) {
+    throw new Error("Payment signature: missing secret key.");
+  }
+}
 function paymentSignature(params, secretKey) {
-  const fieldOrder = ["mid", "order_id", "payment_type", "amount", "ccy", "card_no", "exp_date", "cvv2"];
+  assertSecret(secretKey);
+  const fieldOrder = [
+    "mid",
+    "order_id",
+    "payment_type",
+    "amount",
+    "ccy",
+    "card_no",
+    "exp_date",
+    "cvv2"
+  ];
   let concatenated = "";
   fieldOrder.forEach((v) => {
-    if (!params.hasOwnProperty(v)) {
+    if (!hasOwn(params, v)) {
       return;
-    } else if (v === "cvv2") {
-      concatenated += (params[v] ?? "").toString().slice(-1);
+    }
+    const raw = String(params[v] ?? "");
+    if (v === "cvv2") {
+      concatenated += raw.slice(-1);
     } else if (v === "card_no") {
-      concatenated += (params[v] ?? "").substring(0, 6) + (params[v] ?? "").slice(-4);
+      concatenated += raw.substring(0, 6) + raw.slice(-4);
     } else {
-      concatenated += params[v];
+      concatenated += raw;
     }
   });
   concatenated += secretKey;
-  const signature = crypto3.createHash("sha512").update(concatenated).digest("hex");
-  return signature;
+  return sha512(concatenated);
 }
 function genericSignature(params, secretKey) {
-  const paramsCopy = { ...params };
+  assertSecret(secretKey);
+  const paramsCopy = {
+    ...params
+  };
   delete paramsCopy["signature"];
-  const sortedParams = Object.keys(paramsCopy).sort().reduce((obj, key) => {
-    obj[key] = paramsCopy[key];
-    return obj;
-  }, {});
-  const concatenated = Object.values(sortedParams).join("") + secretKey;
-  const signature = crypto3.createHash("sha512").update(concatenated).digest("hex");
-  return signature;
+  const concatenated = Object.keys(paramsCopy).sort().map((key) => {
+    const value = paramsCopy[key];
+    if (value !== null && typeof value === "object") {
+      throw new Error(
+        `Payment signature: non-primitive value for field "${key}".`
+      );
+    }
+    return String(value ?? "");
+  }).join("") + secretKey;
+  return sha512(concatenated);
 }
 
 // src/repositories/reddot-payment.repository.ts
@@ -65193,7 +65335,7 @@ var useRedDotPaymentSvc = () => {
       };
       if (!process.env.MERCHANT_ENQUIRY) {
         throw new Error(
-          "MERCHANT_PAYMENT environment variable is not defined."
+          "MERCHANT_ENQUIRY environment variable is not defined."
         );
       }
       const url = process.env.MERCHANT_ENQUIRY;