@7365admin1/core 3.39.0 → 3.40.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.40.0
+
+### Minor Changes
+
+- fb9ac66: release changes to prod August 4
+
 ## 3.39.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as mongodb from 'mongodb';
-import { ObjectId, ClientSession, Db, Collection, Document } from 'mongodb';
+import { ObjectId, ClientSession, Db, Collection, Document, AggregateOptions } from 'mongodb';
 import Joi from 'joi';
 import { Request, Response, NextFunction } from 'express';
 import * as bson from 'bson';
@@ -2415,6 +2415,7 @@ declare function useVehicleRepo(): {
     }>;
     getVehicleBySiteAndPlateNumber: (plateNumber: string, site: string | ObjectId, category: string | ObjectId, status: string) => Promise<TVehicle | null>;
     getBlocklistedVehicleByPlateNumber: (plateNumber: string, site?: string) => Promise<bson.Document>;
+    findOne: (query: Record<string, any>) => Promise<TVehicle | null>;
 };
 
 declare function formatDahuaDate(date: Date): string;
@@ -2509,16 +2510,20 @@ declare function useSiteCameraRepo(): {
         direction?: string | string[];
         page?: number;
         limit?: number;
+        status?: string;
     }) => Promise<{
         pageRange: string;
         pages: number;
         items: Array<TSiteCamera>;
     }>;
+    findMany: (query: object, project?: object, options?: AggregateOptions) => Promise<Document[]>;
+    findOne: (query: object, project?: object, options?: AggregateOptions) => Promise<Document | null>;
 };
 
 declare function useSiteCameraService(): {
     add: (value: TSiteCamera) => Promise<"CCTV(s) added successfully." | "ANPR(s) added successfully.">;
     listenToCapturedPlateNumber: (onDetected?: ((data: any) => void) | undefined) => Promise<void>;
+    updateById: (id: string, value: Partial<TSiteCamera>) => Promise<string>;
 };
 
 declare function useSiteCameraController(): {

package/dist/index.js

@@ -23318,6 +23318,7 @@ function useVehicleRepo() {
     if (error) {
       throw new import_node_server_utils71.BadRequestError(error.details[0].message);
     }
+    console.log("getVehicleByPlateNumber plateNumber", plateNumber);
     try {
       const data = await collection.findOne(
         { plateNumber, status: "active" },
@@ -23330,6 +23331,14 @@ function useVehicleRepo() {
       );
     }
   }
+  async function findOne(query) {
+    try {
+      const data = await collection.findOne(query);
+      return data;
+    } catch (error) {
+      throw new import_node_server_utils71.InternalServerError("Failed to fetch findOne vehicle." + error);
+    }
+  }
   async function getVehicleBySiteAndPlateNumber(plateNumber, site, category, status) {
     const { error } = import_joi39.default.string().required().validate(plateNumber);
     if (error) {
@@ -23638,7 +23647,8 @@ function useVehicleRepo() {
     getSpecificVehicleById,
     getBlocklistedVehicles,
     getVehicleBySiteAndPlateNumber,
-    getBlocklistedVehicleByPlateNumber
+    getBlocklistedVehicleByPlateNumber,
+    findOne
   };
 }
 
@@ -23717,12 +23727,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,
@@ -23730,16 +23741,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}`
@@ -23749,7 +23767,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);
@@ -24132,6 +24150,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);
       }
@@ -24139,6 +24158,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);
     }
@@ -24158,11 +24178,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,
@@ -24170,16 +24193,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);
@@ -24224,15 +24263,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) {
@@ -24254,7 +24331,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.`);
@@ -24925,7 +25003,8 @@ function useSiteCameraRepo() {
         throw new import_node_server_utils73.BadRequestError("Site camera not found.");
       }
       if (result?._id) {
-        const result2 = await findOne({ _id: new import_mongodb44.ObjectId(result._id) });
+        const result2 = await findOne({ _id: new import_mongodb44.ObjectId(result._id) }, void 0, { session });
+        console.log("updateById result2", result2);
         if (result2?._id) {
           const { listenToCamera } = useDahuaService();
           await listenToCamera(result2);
@@ -24990,6 +25069,9 @@ function useSiteCameraRepo() {
         throw new import_node_server_utils73.BadRequestError("Invalid site ID format");
       }
     }
+    if (value.status) {
+      query.status = value.status;
+    }
     try {
       const items = await collection.aggregate([
         {
@@ -25060,7 +25142,7 @@ function useSiteCameraRepo() {
       throw new import_node_server_utils73.BadRequestError("Failed to retrieve site cameras.");
     }
   }
-  async function findOne(query, project = {}) {
+  async function findOne(query, project = {}, options = {}) {
     try {
       const pipeline = [
         { $match: query },
@@ -25109,14 +25191,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 },
@@ -25165,10 +25247,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;
     }
   }
@@ -25185,7 +25267,9 @@ function useSiteCameraRepo() {
     getBySiteGuardPost,
     updateById,
     deleteById,
-    getAllCameraWithPassword
+    getAllCameraWithPassword,
+    findMany,
+    findOne
   };
 }
 
@@ -27098,7 +27182,8 @@ function useVehicleService() {
     deleteExpiredVehicles: _deleteExpiredVehicles,
     getVehicleByPlateNumber: _getVehicleByPlateNumber,
     getAllExpiredVehicles: _getAllExpiredVehicles,
-    bulkUpsertVehicles: _bulkUpsertVehicles
+    bulkUpsertVehicles: _bulkUpsertVehicles,
+    findOne
   } = useVehicleRepo();
   const {
     addPlateNumber: _addPlateNumber,
@@ -27122,15 +27207,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 import_node_server_utils78.BadRequestError("Org not found");
-    if (existingPlateNumber)
-      throw new import_node_server_utils78.BadRequestError("Vehicle plate number already exists");
     if (!Object.values(OrgNature).includes(org.nature)) {
       throw new import_node_server_utils78.BadRequestError(
         "This organization is not allowed to add vehicles."
@@ -27143,7 +27231,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;
@@ -27202,17 +27289,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 import_node_server_utils78.BadRequestError("No site cameras found.");
-        }
+        console.log("add vehicle service siteCameras", siteCameras);
       }
       for (const plateNumber of plateNumbers) {
         const vehicleValue = {
@@ -31829,6 +31915,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);
@@ -31862,6 +31949,7 @@ function useSiteCameraService() {
         type: "anpr",
         page,
         limit
+        // site: "6923d6664150ca6a69b9f2b2"
       });
       pages = siteCameraReq.pages || 1;
       siteCameras.push(...siteCameraReq.items);
@@ -31877,9 +31965,27 @@ function useSiteCameraService() {
       }
     }
   }
+  async function updateById(id, value) {
+    const session = import_node_server_utils93.useAtlas.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
   };
 }
 
@@ -31887,10 +31993,9 @@ function useSiteCameraService() {
 var import_node_server_utils94 = require("@7365admin1/node-server-utils");
 var import_joi49 = __toESM(require("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) {