@7365admin1/core 2.49.0 → 2.50.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.50.0
+
+### Minor Changes
+
+- 10d2dfd: get latest changes today 05/06/2026
+
 ## 2.49.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2187,6 +2187,7 @@ declare function useVehicleRepo(): {
             [key: number]: any;
         };
     }>;
+    getSpecificVehicleById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document>>;
 };
 
 declare function formatDahuaDate(date: Date): string;
@@ -2233,6 +2234,7 @@ declare function useVehicleController(): {
     reactivateVehicleById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAllVehiclesByUnitId: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     uploadSpreadsheetVehicles: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getSpecificVehicleById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useSiteCameraRepo(): {
@@ -2701,7 +2703,7 @@ declare function useVisitorTransactionRepo(): {
         pageRange: string;
     }>;
     getOpenByPlateNumber: (plateNumber: string, site: string | ObjectId) => Promise<TVisitorTransaction | null>;
-    updateById: (_id: string | ObjectId, value: Partial<TVisitorTransaction>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    updateById: (_id: string | ObjectId, value: Partial<TVisitorTransaction>, session?: ClientSession, isNotManualCheckOut?: boolean) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteVisitorTransaction: (_id: string | ObjectId) => Promise<number>;
     createTextIndex: () => Promise<void>;
     getDeliveryPickupTransactions: () => Promise<mongodb.WithId<bson.Document>[]>;
@@ -3114,6 +3116,7 @@ type TPatrolLog = {
     cameras: Array<logCamera>;
     status: Array<string>;
     incidentReport: incidentReport;
+    platform?: string;
     createdAt?: Date | string;
     updatedAt?: Date | string;
     deletedAt?: Date | string;
@@ -3133,6 +3136,7 @@ declare function MPatrolLog(value: TPatrolLog): {
     status: string[];
     route: string | ObjectId | undefined;
     incidentReport: incidentReport;
+    platForm: string;
     createdAt: string | Date;
     updatedAt: string | Date;
     deletedAt: string | Date;
@@ -5300,6 +5304,7 @@ type TIncidentReport = {
     approvedByName?: string;
     remarks?: string | null;
     status: "pending" | "approved" | "rejected";
+    platform?: string;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
@@ -5321,6 +5326,7 @@ declare function MIncidentReport(value: TIncidentReport): {
     approvedByName: string;
     remarks: string | null;
     status: "pending" | "approved" | "rejected";
+    platForm: string;
     createdAt: string | Date;
     updatedAt: string | Date | undefined;
     deletedAt: string | Date | undefined;
@@ -5502,7 +5508,7 @@ declare function useOccurrenceEntryRepo(): {
 
 declare function useOccurrenceEntryService(): {
     add: (value: TOccurrenceEntry) => Promise<string>;
-    updateOccurrenceEntryById: (id: string | ObjectId, value: TOccurrenceEntry) => Promise<string>;
+    updateOccurrenceEntryById: (id: string | ObjectId, value: TOccurrenceEntry) => Promise<"Successfully updated occurrence entry (incident report)." | "Successfully updated daily occurrence entry.">;
 };
 
 declare function useOccurrenceEntryController(): {

package/dist/index.js

@@ -14045,14 +14045,14 @@ function useVisitorTransactionRepo() {
       );
     }
   }
-  async function updateById(_id, value, session) {
+  async function updateById(_id, value, session, isNotManualCheckOut = true) {
     try {
       _id = new import_mongodb40.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils68.BadRequestError("Invalid visitor transaction ID format.");
     }
     value.updatedAt = /* @__PURE__ */ new Date();
-    if (value.checkOut) {
+    if (value.checkOut && isNotManualCheckOut) {
       value.manualCheckout = true;
     }
     try {
@@ -14803,6 +14803,22 @@ function useVehicleRepo() {
       throw error;
     }
   }
+  async function getSpecificVehicleById(_id) {
+    try {
+      _id = new import_mongodb42.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils70.BadRequestError("Invalid vehicle ID format.");
+    }
+    try {
+      const result = await collection.findOne({ _id });
+      if (!result) {
+        throw new import_node_server_utils70.NotFoundError("Vehicle not found.");
+      }
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
   async function getByPlaceNumber(value) {
     const { error } = import_joi38.default.string().required().validate(value);
     if (error) {
@@ -15061,7 +15077,8 @@ function useVehicleRepo() {
     deleteExpiredVehicles,
     getAllVehiclesByUnitId,
     getAllExpiredVehicles,
-    bulkUpsertVehicles
+    bulkUpsertVehicles,
+    getSpecificVehicleById
   };
 }
 
@@ -17317,6 +17334,7 @@ var loggerDahua = winston.createLogger({
 
 // src/services/dahua.service.ts
 var cameraRegistry = /* @__PURE__ */ new Map();
+var _savedOnDetected;
 function useDahuaDigest({
   host = "",
   username = "",
@@ -17381,7 +17399,7 @@ function useDahuaService() {
       queue.push(buffer);
       if (queue.length >= BACKPRESSURE_THRESHOLD && streamRef && !streamRef.isPaused()) {
         loggerDahua.warn(
-          `[${site}][${gate}] Queue at ${queue.length}/${MAX_QUEUE_SIZE}, pausing stream`
+          `[${site}][${host}] Queue at ${queue.length}/${MAX_QUEUE_SIZE}, pausing stream`
         );
         streamRef.pause();
       }
@@ -17398,7 +17416,7 @@ function useDahuaService() {
         streamRef.resume();
       }
       loggerDahua.info(
-        `[${site}][${gate}] BufferQueue destroyed. Processed=${processedChunks}, Dropped=${droppedChunks}`
+        `[${site}][${host}] BufferQueue destroyed. Processed=${processedChunks}, Dropped=${droppedChunks}`
       );
     }
     async function processNext(onDetected2) {
@@ -17446,9 +17464,9 @@ function useDahuaService() {
             const transactionId = existingOpenTransaction?._id?.toString() || "";
             if (existingOpenTransaction && !existingOpenTransaction.checkOut && transactionId) {
               await updateById(transactionId, {
-                checkOut: (/* @__PURE__ */ new Date()).toISOString(),
-                updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-              });
+                checkOut: /* @__PURE__ */ new Date(),
+                updatedAt: /* @__PURE__ */ new Date()
+              }, void 0, false);
             }
           } catch (error) {
             loggerDahua.error(
@@ -17507,7 +17525,7 @@ function useDahuaService() {
             currentTransactionId = transactionId?.toString();
             currentSnapshotField = "snapshotEntryImage";
             if (onDetected2) {
-              onDetected2({ _id: transactionId, site: result?.site?.toString(), plateNumber: result.plateNumber });
+              onDetected2({ _id: transactionId, site: result?.site?.toString(), plateNumber: result.plateNumber, host, direction });
             }
           } catch (error) {
             console.log("failed to create visitor transaction", error);
@@ -17516,8 +17534,7 @@ function useDahuaService() {
               error
             );
           }
-        }
-        if (["exit", "both"].includes(designation) && direction.toLowerCase() === "leave" && plateNumber) {
+        } else if (["exit", "both"].includes(designation) && direction.toLowerCase() === "leave" && plateNumber) {
           const vehicle = await getVehicleByPlateNumber(plateNumber);
           const existingOpenTransaction = await getOpenByPlateNumber(
             plateNumber,
@@ -17539,6 +17556,9 @@ function useDahuaService() {
             await removePlateNumber(dahuaPayload);
           }
           await closeOpenTransaction(plateNumber);
+          if (onDetected2) {
+            onDetected2({ reload: true, site: existingOpenTransaction?.site?.toString(), host, direction });
+          }
         }
       }
     }
@@ -17595,7 +17615,7 @@ function useDahuaService() {
       try {
         await import_fs.promises.mkdir(dir, { recursive: true });
         await import_fs.promises.writeFile(snapFolder, accumulatedImageBuffer);
-        loggerDahua.debug(`[${host}] Saved image locally: ${filename}`);
+        loggerDahua.info(`[${host}] Saved image locally: ${filename}`);
         const fileId = await _createFile(
           {
             originalname: filename,
@@ -17670,9 +17690,12 @@ function useDahuaService() {
     }
   }
   async function listenToCamera(camera, onDetected) {
+    if (onDetected) {
+      _savedOnDetected = onDetected;
+    }
     if (!camera?._id) {
       loggerDahua.error(`Camera _id is required to listen to camera.`);
-      throw new import_node_server_utils75.BadRequestError("Camera _id is required to listen to camera.");
+      return;
     }
     const cameraId = camera._id.toString();
     if (cameraRegistry.has(cameraId)) {
@@ -17682,6 +17705,11 @@ function useDahuaService() {
     }
     const controller = new AbortController();
     cameraRegistry.set(cameraId, controller);
+    const onDetectedHandler = onDetected || _savedOnDetected;
+    if (!onDetectedHandler) {
+      loggerDahua.error(`No plate detection handler registered for camera ${cameraId}`);
+      return;
+    }
     getTrafficJunction(
       camera.host,
       camera.username,
@@ -17691,7 +17719,7 @@ function useDahuaService() {
       camera.direction,
       cameraId,
       controller.signal,
-      onDetected
+      onDetectedHandler
     );
   }
   async function getTrafficJunctionOld(host = "", username = "", password = "", site = "", gate = "", designation = "", cameraId, signal, onDetected) {
@@ -17812,9 +17840,12 @@ function useDahuaService() {
           timeout: 2e4,
           streaming: true
         });
-        if ([400, 401, 403, 500].includes(response.statusCode)) {
+        if (response.statusCode === 401) {
+          loggerDahua.error(`[${host}] 401 Unauthorized. Potential handshake or wrong credentials.`);
+          continue;
+        } else if ([400, 401, 403, 500].includes(response.statusCode)) {
           loggerDahua.error(`[${host}] Connection error: ${response.statusCode}`);
-          throw new Error(`Failed to connect to ANPR: ${response.statusCode}`);
+          return;
         }
         loggerDahua.info(`[${host}] Successfully connected to ANPR.`);
         const contentType = response.res.headers["content-type"];
@@ -17861,16 +17892,31 @@ function useDahuaService() {
           });
         });
       } catch (error) {
-        if (signal.aborted)
+        if (signal.aborted || error.name === "AbortError" || error.code === "UND_ERR_ABORTED") {
+          loggerDahua.info(`[${host}] Connection closed by system (Abort).`);
           break;
+        }
         loggerDahua.error(
           `[${host}] Connection lost or error: ${error.message || error}. Retrying in 5s...`
         );
       } finally {
-        if (bufferQueue?.destroy)
-          bufferQueue.destroy();
-        if (response?.res && !response.res.destroyed)
-          response.res.destroy();
+        if (bufferQueue?.destroy) {
+          try {
+            bufferQueue.destroy();
+          } catch (e) {
+            loggerDahua.error(`[${host}] Error destroying buffer queue:`, e);
+          }
+        }
+        if (response?.res && typeof response.res.destroy === "function" && !response.res.destroyed) {
+          try {
+            response.res.on("error", () => {
+              loggerDahua.error(`[${host}] Stream error during cleanup, likely already closed.`);
+            });
+            response.res.destroy();
+          } catch (err) {
+            loggerDahua.debug(`Cleanup: stream already closing: ${err?.message}`);
+          }
+        }
       }
       if (!signal.aborted) {
         await new Promise((res) => setTimeout(res, 5e3));
@@ -18086,6 +18132,8 @@ function useSiteCameraRepo() {
     try {
       value = MSiteCamera(value);
       const res = await collection.insertOne(value, { session });
+      const { listenToCamera } = useDahuaService();
+      await listenToCamera({ ...value, _id: res.insertedId });
       delCachedData();
       return res.insertedId;
     } catch (error) {
@@ -19917,7 +19965,8 @@ function useVehicleController() {
     getVehicles: _getVehicles,
     getVehicleById: _getVehicleById,
     getVehiclesByNRIC: _getVehiclesByNRIC,
-    getAllVehiclesByUnitId: _getAllVehiclesByUnitId
+    getAllVehiclesByUnitId: _getAllVehiclesByUnitId,
+    getSpecificVehicleById: _getSpecificVehicleById
   } = useVehicleRepo();
   function normalizeRow(row) {
     return Object.fromEntries(
@@ -20031,7 +20080,9 @@ function useVehicleController() {
           return;
         }
         const headerRow = worksheet.getRow(1);
-        const headers = (headerRow.values || []).slice(1).map((header) => String(header ?? "").trim());
+        const headers = (headerRow.values || []).slice(1).map(
+          (header) => String(header ?? "").trim().replace(/\(.*\)/, "").trim()
+        );
         worksheet.eachRow((row, rowNumber) => {
           if (rowNumber === 1)
             return;
@@ -20048,7 +20099,11 @@ function useVehicleController() {
       } else if (lowerName.endsWith(".csv")) {
         rows = await new Promise((resolve, reject) => {
           const parsed = [];
-          import_fs2.default.createReadStream(path4).pipe((0, import_csv_parser.default)()).on("data", (row) => parsed.push(row)).on("end", () => resolve(parsed)).on("error", reject);
+          import_fs2.default.createReadStream(path4).pipe((0, import_csv_parser.default)()).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(
@@ -20213,6 +20268,31 @@ function useVehicleController() {
       return;
     }
   }
+  async function getSpecificVehicleById(req, res, next) {
+    const schema2 = import_joi46.default.object({
+      _id: import_joi46.default.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate(
+      { _id: req.params.id },
+      { abortEarly: false }
+    );
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils87.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils87.BadRequestError(messages));
+      return;
+    }
+    const { _id } = value;
+    try {
+      const site = await _getSpecificVehicleById(_id);
+      res.json(site);
+      return;
+    } catch (error2) {
+      import_node_server_utils87.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function updateVehicleById(req, res, next) {
     try {
       const schema2 = import_joi46.default.object({
@@ -20432,7 +20512,8 @@ function useVehicleController() {
     getVehiclesByNRIC,
     reactivateVehicleById,
     getAllVehiclesByUnitId,
-    uploadSpreadsheetVehicles
+    uploadSpreadsheetVehicles,
+    getSpecificVehicleById
   };
 }
 
@@ -23535,6 +23616,12 @@ function useVisitorTransactionService() {
         const parsed = new Date(value.checkOut);
         value.checkOut = isNaN(parsed.getTime()) ? null : parsed;
       }
+      if (value.site) {
+        value.site = typeof value.site === "string" ? new import_mongodb59.ObjectId(value.site) : value.site;
+      }
+      if (value.unit) {
+        value.unit = typeof value.unit === "string" ? new import_mongodb59.ObjectId(value.unit) : value.unit;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -26331,7 +26418,7 @@ function usePatrolRouteRepo() {
               id: "$_id",
               start: startOfDay,
               end: endOfDay,
-              site: new import_mongodb67.ObjectId(site)
+              site: import_mongodb67.ObjectId.isValid(site) ? new import_mongodb67.ObjectId(site) : null
             },
             pipeline: [
               {
@@ -26362,10 +26449,8 @@ function usePatrolRouteRepo() {
         { $skip: page * limit },
         { $limit: limit }
       ];
-      const [items, countResult] = await Promise.all([
-        collection.aggregate(basePipeline, { session }).toArray(),
-        collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
-      ]);
+      const items = await collection.aggregate(basePipeline, { session }).toArray();
+      const countResult = await collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray();
       const totalCount = countResult[0]?.total || 0;
       const data = (0, import_node_server_utils117.paginate)(items, page, limit, totalCount);
       setCache(cacheKey, data, 15 * 60).then(() => import_node_server_utils117.logger.info(`Cache set for key: ${cacheKey}`)).catch(
@@ -26373,6 +26458,7 @@ function usePatrolRouteRepo() {
       );
       return data;
     } catch (error) {
+      console.error("[getScheduledRoute] ERROR:", error?.message, error?.stack);
       throw error;
     }
   }
@@ -26659,6 +26745,7 @@ var schemaPatrolLog = import_joi65.default.object({
   cameras: import_joi65.default.array().items(schemeLogCamera).required(),
   status: import_joi65.default.array().items(import_joi65.default.string().valid("complete", "late", "incomplete")).required(),
   incidentReport: incidentReportLog,
+  platform: import_joi65.default.string().valid("web", "mobile").optional().allow(null, ""),
   createdAt: import_joi65.default.date().optional(),
   updatedAt: import_joi65.default.date().optional(),
   deletedAt: import_joi65.default.date().optional()
@@ -26672,7 +26759,8 @@ var schemaUpdatePatrolLog = import_joi65.default.object({
   end: import_joi65.default.string().optional().allow(null, ""),
   cameras: import_joi65.default.array().items(schemeLogCamera).optional().allow(null, ""),
   status: import_joi65.default.array().items(import_joi65.default.string().valid("complete", "late", "incomplete")).optional().allow(null, ""),
-  incidentReport: incidentReportLog
+  incidentReport: incidentReportLog,
+  platform: import_joi65.default.string().valid("web", "mobile").optional().allow(null, "")
 });
 function MPatrolLog(value) {
   const { error } = schemaPatrolLog.validate(value);
@@ -26726,6 +26814,7 @@ function MPatrolLog(value) {
     status: value.status ?? [],
     route: value.route,
     incidentReport: value.incidentReport,
+    platForm: value.platform ?? "",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? "",
     deletedAt: value.deletedAt ?? ""
@@ -27078,6 +27167,7 @@ function usePatrolLogService() {
           }
         }
       }
+      value.platform = value.platform === "web" ? "web" : "mobile";
       const result = await _add(value, session);
       await session.commitTransaction();
       return result;
@@ -41140,6 +41230,7 @@ var schemaIncidentReport = import_joi99.default.object({
   approvedBy: import_joi99.default.string().hex().allow(null, "").optional(),
   approvedByName: import_joi99.default.string().optional().allow("", null),
   remarks: import_joi99.default.string().optional().allow("", null),
+  platform: import_joi99.default.string().valid("web", "mobile").optional().allow(null, ""),
   status: import_joi99.default.string().valid("pending", "approved", "rejected").default("pending")
 });
 var schemaUpdateIncidentReport = import_joi99.default.object({
@@ -41220,6 +41311,7 @@ var schemaUpdateIncidentReport = import_joi99.default.object({
   approvedBy: import_joi99.default.string().hex().allow(null, "").optional(),
   approvedByName: import_joi99.default.string().optional().allow("", null),
   remarks: import_joi99.default.string().optional().allow("", null),
+  platform: import_joi99.default.string().valid("web", "mobile").optional().allow(null, ""),
   status: import_joi99.default.string().valid("pending", "approved", "rejected").default("pending")
 });
 function MIncidentReport(value) {
@@ -41281,6 +41373,7 @@ function MIncidentReport(value) {
     approvedByName: value.approvedByName ?? "",
     remarks: value.remarks ?? null,
     status: value.status ?? "pending",
+    platForm: value.platform ?? "",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -41746,6 +41839,7 @@ function useIncidentReportService() {
           }
         }
       }
+      value.platform = value.platform === "web" ? "web" : "mobile";
       const result = await _add(value, session);
       await session?.commitTransaction();
       return result;
@@ -42818,6 +42912,11 @@ function useOccurrenceEntryService() {
       if (!occurrenceEntry) {
         throw new Error("Occurrence entry not found.");
       }
+      if (value.incidentReportId) {
+        await _updateOccurrenceEntryById(id, value, session);
+        await session?.commitTransaction();
+        return "Successfully updated occurrence entry (incident report).";
+      }
       const entryCount = await _getLatestSerialNumberInGroup(
         occurrenceEntry.dailyOccurrenceBookId,
         Number(occurrenceEntry.serialNumber)
@@ -42850,6 +42949,8 @@ function useOccurrenceEntryService() {
       value.date = value.date ? value.date : occurrenceEntry.date;
       value.userName = value.userName ? value.userName : occurrenceEntry.signature.name;
       value.createdByName = value.createdByName ? value.createdByName : occurrenceEntry.createdByName;
+      if (occurrenceEntry.incidentReportId)
+        value.incidentReportId = occurrenceEntry.incidentReportId;
       await _updateOccurrenceBookById(dobId, {
         totalInput: book.totalInput + 1
       });