@7365admin1/core 2.51.0 → 2.53.0

package/dist/index.mjs

@@ -13093,23 +13093,42 @@ var CameraType = /* @__PURE__ */ ((CameraType2) => {
 })(CameraType || {});
 var schemaUpdateSiteCamera = Joi34.object({
   host: Joi34.string().required(),
-  username: Joi34.string().required(),
-  password: Joi34.string().required(),
+  username: Joi34.string().when("type", {
+    is: "anpr",
+    then: Joi34.required(),
+    otherwise: Joi34.optional().allow(null, "")
+  }),
+  password: Joi34.string().when("type", {
+    is: "anpr",
+    then: Joi34.required(),
+    otherwise: Joi34.optional().allow(null, "")
+  }),
   category: Joi34.string().allow("standard", "resident", "visitor").required(),
   guardPost: Joi34.number().integer().optional(),
-  direction: Joi34.string().optional().allow("entry", "exit", "both", "none")
+  direction: Joi34.string().optional().allow("entry", "exit", "both", "none"),
+  status: Joi34.string().optional().allow("active", "inactive", "deleted"),
+  name: Joi34.string().optional().allow(null, "")
 });
 var schemaSiteCamera = Joi34.object({
   _id: Joi34.string().hex().optional(),
   site: Joi34.string().hex().required(),
   host: Joi34.string().required(),
-  username: Joi34.string().required(),
-  password: Joi34.string().required(),
+  username: Joi34.string().when("type", {
+    is: "anpr",
+    then: Joi34.required(),
+    otherwise: Joi34.optional().allow(null, "")
+  }),
+  password: Joi34.string().when("type", {
+    is: "anpr",
+    then: Joi34.required(),
+    otherwise: Joi34.optional().allow(null, "")
+  }),
   type: Joi34.string().allow("ip", "anpr").required(),
   category: Joi34.string().allow("standard", "resident", "visitor").required(),
   direction: Joi34.string().required().allow("entry", "exit", "both", "none"),
   guardPost: Joi34.number().integer().optional(),
   status: Joi34.string().optional().allow("active", "inactive", "deleted"),
+  name: Joi34.string().optional().allow(null, ""),
   createdAt: Joi34.date().optional(),
   updatedAt: Joi34.date().optional(),
   deletedAt: Joi34.date().optional()
@@ -13138,6 +13157,7 @@ function MSiteCamera(value) {
     guardPost: value.guardPost ?? 0,
     status: value.status ?? "active",
     direction: value.direction ?? "",
+    name: value.name ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt ?? "",
     deletedAt: value.deletedAt ?? ""
@@ -13458,7 +13478,24 @@ var schemaUpdateVisTrans = Joi36.object({
   checkInRemarks: Joi36.string().optional().allow("", null),
   checkOutRemarks: Joi36.string().optional().allow("", null),
   expectedCheckIn: Joi36.string().isoDate().optional(),
-  purpose: Joi36.string().optional().allow(null, "")
+  purpose: Joi36.string().optional().allow(null, ""),
+  members: Joi36.array().items(
+    Joi36.object({
+      name: Joi36.string().optional().allow(null, ""),
+      nric: Joi36.string().optional().allow(null, ""),
+      visitorPass: Joi36.array().items(
+        Joi36.object({
+          keyId: Joi36.string().hex().length(24).required()
+        })
+      ).optional().allow(null),
+      passKeys: Joi36.array().items(
+        Joi36.object({
+          keyId: Joi36.string().hex().length(24).required()
+        })
+      ).optional().allow(null),
+      contact: Joi36.string().optional().allow(null, "")
+    })
+  ).optional().allow(null)
 });
 function MVisitorTransaction(value) {
   const { error } = schemaVisitorTransaction.validate(value, {
@@ -13908,14 +13945,14 @@ function useVisitorTransactionRepo() {
       );
     }
   }
-  async function updateById(_id, value, session, isNotManualCheckOut = true) {
+  async function updateById(_id, value, session, isManualCheckOut = true) {
     try {
       _id = new ObjectId40(_id);
     } catch (error) {
       throw new BadRequestError66("Invalid visitor transaction ID format.");
     }
     value.updatedAt = /* @__PURE__ */ new Date();
-    if (value.checkOut && isNotManualCheckOut) {
+    if (value.checkOut && isManualCheckOut) {
       value.manualCheckout = true;
     }
     try {
@@ -17371,7 +17408,7 @@ function useDahuaService() {
             );
           }
         }
-        if (["entry", "both"].includes(designation) && direction.toLowerCase() === "approach" && plateNumber) {
+        if (["entry"].includes(designation) && plateNumber) {
           await closeOpenTransaction(plateNumber);
           const vehicle = await getVehicleByPlateNumber(plateNumber);
           const visitorTransaction = {
@@ -17426,11 +17463,11 @@ function useDahuaService() {
           } catch (error) {
             console.log("failed to create visitor transaction", error);
             loggerDahua.error(
-              `[${site}][${gate}] Error creating visitor transaction:`,
+              `[${site}][${host}] Error creating visitor transaction:`,
               error
             );
           }
-        } else if (["exit", "both"].includes(designation) && direction.toLowerCase() === "leave" && plateNumber) {
+        } else if (["exit"].includes(designation) && plateNumber) {
           const vehicle = await getVehicleByPlateNumber(plateNumber);
           const existingOpenTransaction = await getOpenByPlateNumber(
             plateNumber,
@@ -17455,6 +17492,92 @@ function useDahuaService() {
           if (onDetected2) {
             onDetected2({ reload: true, site: existingOpenTransaction?.site?.toString(), host, direction });
           }
+        } else if (["both"].includes(designation) && plateNumber) {
+          if (direction.toLowerCase() === "leave") {
+            const vehicle = await getVehicleByPlateNumber(plateNumber);
+            const existingOpenTransaction = await getOpenByPlateNumber(
+              plateNumber,
+              site
+            );
+            if (existingOpenTransaction?._id) {
+              currentTransactionId = existingOpenTransaction._id.toString();
+              currentSnapshotField = "snapshotExitImage";
+            }
+            if (vehicle?.recNo) {
+              const dahuaPayload = {
+                host,
+                username,
+                password,
+                plateNumber,
+                mode: "TrafficRedList" /* TRAFFIC_REDLIST */,
+                recno: vehicle?.recNo
+              };
+              await removePlateNumber(dahuaPayload);
+            }
+            await closeOpenTransaction(plateNumber);
+            if (onDetected2 && existingOpenTransaction?.site) {
+              onDetected2({ reload: true, site: existingOpenTransaction?.site?.toString(), host, direction });
+            }
+          } else if (direction.toLowerCase() === "approach") {
+            await closeOpenTransaction(plateNumber);
+            const vehicle = await getVehicleByPlateNumber(plateNumber);
+            const visitorTransaction = {
+              site,
+              plateNumber,
+              org,
+              status: "unregistered" /* UNREGISTERED */
+            };
+            const typesForAutoRegister = Object.values(PersonTypes);
+            let startDate = vehicle?.start ? new Date(vehicle?.start) : /* @__PURE__ */ new Date();
+            let endDate = vehicle?.end ? new Date(vehicle?.end) : new Date(startDate.getTime() + 60 * 60 * 1e3);
+            if (vehicle && typeof vehicle.category === "string" && typesForAutoRegister.includes(vehicle.category)) {
+              visitorTransaction.name = vehicle.name;
+              visitorTransaction.nric = vehicle.nric;
+              visitorTransaction.contact = vehicle.phoneNumber;
+              visitorTransaction.block = Number(vehicle.block);
+              visitorTransaction.level = vehicle.level;
+              visitorTransaction.unit = vehicle.unit?.toString();
+              visitorTransaction.unitName = vehicle.unitName;
+              visitorTransaction.type = vehicle.category;
+              visitorTransaction.status = "registered" /* REGISTERED */;
+              visitorTransaction.recNo = vehicle.recNo;
+              visitorTransaction.expiredAt = vehicle.end;
+            }
+            const dahuaPayload = {
+              host,
+              username,
+              password,
+              plateNumber,
+              mode: "TrafficRedList" /* TRAFFIC_REDLIST */,
+              owner: vehicle?.name ?? ""
+            };
+            dahuaPayload.start = formatDahuaDate(startDate);
+            dahuaPayload.end = formatDahuaDate(endDate);
+            const shouldHaveTimeLimit = visitorTransaction.type === "guest" /* GUEST */ || visitorTransaction.status === "unregistered" /* UNREGISTERED */;
+            if (shouldHaveTimeLimit) {
+              const startDate2 = /* @__PURE__ */ new Date();
+              const endDate2 = new Date(startDate2.getTime() + 60 * 60 * 1e3);
+              dahuaPayload.start = formatDahuaDate(startDate2);
+              dahuaPayload.end = formatDahuaDate(endDate2);
+              visitorTransaction.expiredAt = endDate2.toISOString();
+            }
+            try {
+              await addPlateNumber(dahuaPayload);
+              const result = await add(visitorTransaction, void 0, true);
+              const transactionId = result?._id;
+              currentTransactionId = transactionId?.toString();
+              currentSnapshotField = "snapshotEntryImage";
+              if (onDetected2) {
+                onDetected2({ _id: transactionId, site: result?.site?.toString(), plateNumber: result.plateNumber, host, direction });
+              }
+            } catch (error) {
+              console.log("failed to create visitor transaction", error);
+              loggerDahua.error(
+                `[${site}][${host}] Error creating visitor transaction:`,
+                error
+              );
+            }
+          }
         }
       }
     }
@@ -17586,6 +17709,9 @@ function useDahuaService() {
     }
   }
   async function listenToCamera(camera, onDetected) {
+    if (camera?.type != "anpr" && camera?.status != "deleted") {
+      return;
+    }
     if (onDetected) {
       _savedOnDetected = onDetected;
     }
@@ -17594,6 +17720,14 @@ function useDahuaService() {
       return;
     }
     const cameraId = camera._id.toString();
+    if (camera.status !== "active") {
+      if (cameraRegistry.has(cameraId)) {
+        loggerDahua.info(`[${camera?.host ?? camera?._id}] Camera is ${camera.status}. Stopping connection.`);
+        cameraRegistry.get(cameraId)?.abort();
+        cameraRegistry.delete(cameraId);
+      }
+      return;
+    }
     if (cameraRegistry.has(cameraId)) {
       loggerDahua.info(`[${camera.host}] Stopping existing connection for update.`);
       cameraRegistry.get(cameraId)?.abort();
@@ -17741,6 +17875,9 @@ function useDahuaService() {
           continue;
         } else if ([400, 401, 403, 500].includes(response.statusCode)) {
           loggerDahua.error(`[${host}] Connection error: ${response.statusCode}`);
+          if (onDetected) {
+            onDetected({ site, messagePermanent: `Camera with last 3 characters ${host?.slice(-3)} Connection Error. Check username and password.` });
+          }
           return;
         }
         loggerDahua.info(`[${host}] Successfully connected to ANPR.`);
@@ -17793,8 +17930,15 @@ function useDahuaService() {
           break;
         }
         loggerDahua.error(
-          `[${host}] Connection lost or error: ${error.message || error}. Retrying in 5s...`
+          `[${host}] Connection lost or error: ${error.message || error}. Retrying in 10 seconds...`
         );
+        if (onDetected) {
+          onDetected({
+            site,
+            host,
+            message: `Camera in ${gate} 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) {
           try {
@@ -17815,7 +17959,7 @@ function useDahuaService() {
         }
       }
       if (!signal.aborted) {
-        await new Promise((res) => setTimeout(res, 5e3));
+        await new Promise((res) => setTimeout(res, 1e4));
       }
     }
     loggerDahua.info(`[${host}] ANPR Listener stopped.`);
@@ -18317,6 +18461,8 @@ function useSiteCameraRepo() {
     }
     try {
       await collection.deleteOne({ _id }, { session });
+      const { listenToCamera } = useDahuaService();
+      await listenToCamera({ _id, status: "deleted" });
       delCachedData();
       return "Successfully deleted site camera.";
     } catch (error) {
@@ -19382,6 +19528,9 @@ function useBuildingService() {
 // src/controllers/building.controller.ts
 import { BadRequestError as BadRequestError81, logger as logger62 } from "@7365admin1/node-server-utils";
 import Joi44 from "joi";
+import ExcelJS from "exceljs";
+import csv from "csv-parser";
+import fs from "fs";
 function useBuildingController() {
   const {
     getAll: _getAll,
@@ -19403,7 +19552,10 @@ function useBuildingController() {
       serial: Joi44.string().optional().allow("", null),
       status: Joi44.string().optional().allow("", null),
       // buildingFloorPlan: Joi.array().items(Joi.string()).optional(),
-      buildingFiles: Joi44.array().items({ id: Joi44.string().hex().optional().allow("", null), name: Joi44.string().optional().allow("", null) }).optional().allow("", null)
+      buildingFiles: Joi44.array().items({
+        id: Joi44.string().hex().optional().allow("", null),
+        name: Joi44.string().optional().allow("", null)
+      }).optional().allow("", null)
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -19541,13 +19693,125 @@ function useBuildingController() {
       next(error2);
     }
   }
+  async function uploadSpreadsheetBuilding(req, res, next) {
+    try {
+      if (!req.file) {
+        next(new BadRequestError81("Spreadsheet file is required."));
+        return;
+      }
+      const { originalname, path: path4 } = req.file;
+      const lowerName = originalname.toLowerCase();
+      const rowSchema = Joi44.object({
+        block: Joi44.number().integer().min(0).required(),
+        level: Joi44.string().optional().allow(null, ""),
+        unit: Joi44.string().optional().allow(null, ""),
+        category: Joi44.string().trim().required(),
+        name: Joi44.string().trim().optional().allow(null, ""),
+        email: Joi44.string().email().lowercase().optional().allow(null, ""),
+        phoneNumber: Joi44.string().trim().optional().allow(null, "")
+      });
+      const querySchema = Joi44.object({
+        site: Joi44.string().hex().length(24).required(),
+        org: Joi44.string().hex().length(24).optional().allow(null, "")
+      });
+      const { error: queryError, value: queryValue } = querySchema.validate(
+        req.query,
+        { abortEarly: false, convert: true }
+      );
+      if (queryError) {
+        next(
+          new BadRequestError81(
+            queryError.details.map((d) => d.message).join(", ")
+          )
+        );
+        return;
+      }
+      const { site, org } = queryValue;
+      let rows = [];
+      if (lowerName.endsWith(".xlsx") || lowerName.endsWith(".xls")) {
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.readFile(path4);
+        const worksheet = workbook.worksheets[0];
+        if (!worksheet) {
+          next(
+            new BadRequestError81("No worksheet found in uploaded Excel file.")
+          );
+          return;
+        }
+        const headerRow = worksheet.getRow(1);
+        const headers = (headerRow.values || []).slice(1).map(
+          (header) => String(header ?? "").trim().replace(/\(.*\)/, "").trim()
+        );
+        worksheet.eachRow((row, rowNumber) => {
+          if (rowNumber === 1)
+            return;
+          const rowData = {};
+          headers.forEach((header, index) => {
+            rowData[header] = row.getCell(index + 1).value ?? "";
+          });
+          if (Object.values(rowData).some(
+            (v) => v !== "" && v !== null && v !== void 0
+          )) {
+            rows.push(rowData);
+          }
+        });
+      } else if (lowerName.endsWith(".csv")) {
+        rows = await new Promise((resolve, reject) => {
+          const parsed = [];
+          fs.createReadStream(path4).pipe(csv()).on("headers", (headers) => {
+            headers = headers.map(
+              (h) => h.trim().replace(/\(.*\)/, "").trim()
+            );
+          }).on("data", (row) => parsed.push(row)).on("end", () => resolve(parsed)).on("error", reject);
+        });
+      } else {
+        next(
+          new BadRequestError81("Only .xlsx, .xls, or .csv files are allowed.")
+        );
+        return;
+      }
+      const validRows = [];
+      const invalidRows = [];
+      rows.forEach((row, index) => {
+        const { error, value } = rowSchema.validate(row, {
+          abortEarly: false,
+          stripUnknown: true
+        });
+        if (error) {
+          invalidRows.push({
+            row: index + 2,
+            data: row,
+            errors: error.details.map((d) => d.message)
+          });
+        } else {
+          validRows.push(value);
+        }
+      });
+      res.status(200).json({
+        message: "Spreadsheet import completed (buildings).",
+        fileName: originalname,
+        totalRows: rows.length,
+        validRows: validRows.length,
+        invalidRows: invalidRows.length,
+        validationErrors: invalidRows,
+        data: validRows
+        // testing: return the validated building rows directly
+      });
+      fs.unlink(path4, () => {
+      });
+    } catch (error) {
+      logger62.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
   return {
     createBuilding,
     getAll,
     getById,
     updateById,
     deleteById,
-    getBuildingLevel
+    getBuildingLevel,
+    uploadSpreadsheetBuilding
   };
 }
 
@@ -19868,9 +20132,9 @@ function useBuildingUnitController() {
 // src/controllers/vehicle.controller.ts
 import { BadRequestError as BadRequestError84, logger as logger65 } from "@7365admin1/node-server-utils";
 import Joi46 from "joi";
-import ExcelJS from "exceljs";
-import csv from "csv-parser";
-import fs from "fs";
+import ExcelJS2 from "exceljs";
+import csv2 from "csv-parser";
+import fs2 from "fs";
 function useVehicleController() {
   const {
     add: _add,
@@ -19990,7 +20254,7 @@ function useVehicleController() {
       const { site, org } = queryValue;
       let rows = [];
       if (lowerName.endsWith(".xlsx") || lowerName.endsWith(".xls")) {
-        const workbook = new ExcelJS.Workbook();
+        const workbook = new ExcelJS2.Workbook();
         await workbook.xlsx.readFile(path4);
         const worksheet = workbook.worksheets[0];
         if (!worksheet) {
@@ -20019,7 +20283,7 @@ function useVehicleController() {
       } else if (lowerName.endsWith(".csv")) {
         rows = await new Promise((resolve, reject) => {
           const parsed = [];
-          fs.createReadStream(path4).pipe(csv()).on("headers", (headers) => {
+          fs2.createReadStream(path4).pipe(csv2()).on("headers", (headers) => {
             headers = headers.map(
               (h) => h.trim().replace(/\(.*\)/, "").trim()
             );
@@ -20062,7 +20326,7 @@ function useVehicleController() {
         validationErrors: invalidRows,
         data
       });
-      fs.unlink(path4, () => {
+      fs2.unlink(path4, () => {
       });
     } catch (error) {
       logger65.log({ level: "error", message: error.message });
@@ -20230,7 +20494,8 @@ function useVehicleController() {
         recNo: Joi46.string().optional().allow(null, ""),
         type: Joi46.string().optional().valid(...Object.values(VehicleType)).allow(null, ""),
         peopleId: Joi46.string().hex().length(24).optional().allow(null, ""),
-        seasonPassType: Joi46.string().optional().allow("", null)
+        seasonPassType: Joi46.string().optional().allow("", null),
+        remarks: Joi46.string().optional().allow("", null)
       });
       const { error, value } = schema2.validate(
         {
@@ -20459,8 +20724,9 @@ function useSiteCameraService() {
     try {
       session.startTransaction();
       await _add(value, session);
+      const message = value.type === "ip" ? "CCTV(s) added successfully." : "ANPR(s) added successfully.";
       await session.commitTransaction();
-      return "ANPR(s) added successfully.";
+      return message;
     } catch (error2) {
       await session.abortTransaction();
       throw error2;
@@ -33793,7 +34059,7 @@ import {
 import { ObjectId as ObjectId90 } from "mongodb";
 
 // src/utils/access-management.ts
-import fs2 from "fs";
+import fs3 from "fs";
 import path2 from "path";
 import axios from "axios";
 import { parseStringPromise } from "xml2js";
@@ -33823,7 +34089,7 @@ var minifyXml = (xml) => {
   return xml.replace(/>\s+</g, "><").replace(/\n/g, "").replace(/\r/g, "").replace(/\t/g, "").trim();
 };
 var readTemplate = (name, params) => {
-  const template = fs2.readFileSync(
+  const template = fs3.readFileSync(
     path2.join(__dirname, `../dist/public/xml-templates/${name}.xml`),
     "utf-8"
   );
@@ -33954,14 +34220,14 @@ import { parseStringPromise as parseStringPromise2 } from "xml2js";
 
 // src/utils/rsa-encryption.ts
 import * as crypto2 from "crypto";
-import fs3 from "fs";
+import fs4 from "fs";
 import path3 from "path";
 var pub = path3.resolve(process.cwd(), "./src/public/rsa-keys/new_rsa_512_pub.pem");
 var priv = path3.resolve(process.cwd(), "./src/public/rsa-keys/new_rsa_512_priv.pem");
 var EncryptionCredentials = class {
 };
-EncryptionCredentials.RAW_PUBLIC_KEY = fs3.readFileSync(pub, "utf8");
-EncryptionCredentials.RAW_PRIVATE_KEY = fs3.readFileSync(priv, "utf8");
+EncryptionCredentials.RAW_PUBLIC_KEY = fs4.readFileSync(pub, "utf8");
+EncryptionCredentials.RAW_PRIVATE_KEY = fs4.readFileSync(priv, "utf8");
 var EntrypassRSAEncryption = class extends EncryptionCredentials {
   static hexToCardNumber(hex) {
     if (!/^[0-9A-Fa-f]{8}$/.test(hex)) {