@7365admin1/core 3.42.1 → 3.42.2

package/dist/index.mjs

@@ -21947,7 +21947,6 @@ async function sendEmail({ to, subject, text, html }) {
       pass: MAILER_PASSWORD
     }
   });
-  console.log(MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT);
   const mailOptions = {
     from: `Seven 365 <${MAILER_EMAIL}>`,
     to,
@@ -23993,6 +23992,86 @@ var loggerDahua = winston.createLogger({
   ]
 });
 
+// src/utils/camera-alert.util.ts
+var DIRECTION_WORDS = {
+  entry: "entry",
+  exit: "exit",
+  both: "entry and exit",
+  visitors: "visitor",
+  residents: "resident"
+};
+function describeCamera(camera) {
+  const site = String(camera?.siteName ?? "").trim();
+  const name = String(camera?.name ?? "").trim();
+  const at = site ? ` at ${site}` : "";
+  if (name)
+    return `Camera "${name}"${at}`;
+  const words = DIRECTION_WORDS[String(camera?.direction ?? "").trim().toLowerCase()];
+  return words ? `The ${words} ANPR camera${at}` : `The ANPR camera${at}`;
+}
+function cameraUnreachableMessage(camera) {
+  return `${describeCamera(camera)} is not responding. Plate reads and automatic barrier opening are stopped while it is down. The server keeps trying to reconnect on its own. If it does not come back, ask your site technician or the security-system installer to check the camera's power and network.`;
+}
+function cameraRecoveredMessage(camera) {
+  return `${describeCamera(camera)} is responding again. Plate reads have resumed.`;
+}
+function cameraCredentialsMessage(camera) {
+  return `${describeCamera(camera)} refused the login, so it cannot read plates. The username or password saved for it is wrong. An administrator can correct them in Site Settings > Cameras; if they are already correct, the camera's own account needs checking by your site technician.`;
+}
+function cameraNotAuthorisedMessage(camera) {
+  return `${describeCamera(camera)} rejected our connection, so it cannot read plates. This usually means its account is not allowed to use the plate-reading feed. Please ask your site technician or the security-system installer to check the camera's account permissions.`;
+}
+var CAMERA_ALERT_AT_ATTEMPT = [1, 6, 30, 90];
+var CAMERA_ALERT_EVERY_AFTER = 90;
+function shouldAlertOnFailure(consecutiveFailures) {
+  if (!Number.isInteger(consecutiveFailures) || consecutiveFailures < 1)
+    return false;
+  if (CAMERA_ALERT_AT_ATTEMPT.includes(consecutiveFailures))
+    return true;
+  if (consecutiveFailures < CAMERA_ALERT_EVERY_AFTER)
+    return false;
+  return (consecutiveFailures - CAMERA_ALERT_EVERY_AFTER) % CAMERA_ALERT_EVERY_AFTER === 0;
+}
+
+// src/utils/dahua-protocol.util.ts
+var DAHUA_AUTH_ATTEMPTS_BEFORE_ALERT = 2;
+var AUTH_BACKOFF_MS = [6e4, 3e5, 9e5];
+function dahuaAuthBackoffMs(consecutiveAuthFailures) {
+  const index = Math.min(
+    Math.max(consecutiveAuthFailures, 1),
+    AUTH_BACKOFF_MS.length
+  );
+  return AUTH_BACKOFF_MS[index - 1];
+}
+function classifyDahuaStatus(statusCode) {
+  if (statusCode === 401)
+    return "challenge";
+  if (statusCode === 403)
+    return "rejected";
+  if (statusCode === 400 || statusCode === 500)
+    return "fatal";
+  return "proceed";
+}
+function classifyDahuaFailure(message) {
+  const text = String(message ?? "");
+  if (/\b403\b|forbidden/i.test(text))
+    return "rejected";
+  if (/\b401\b|unauthorized|invalid authority|digest/i.test(text)) {
+    return "challenge";
+  }
+  return "transient";
+}
+var enc = (value) => encodeURIComponent(String(value));
+function buildPlateUpdateEndpoint(value) {
+  return `/cgi-bin/recordUpdater.cgi?action=update&name=${enc(value.mode)}&recno=${enc(value.recno)}&PlateNumber=${enc(value.plateNumber)}&BeginTime=${enc(value.start)}&CancelTime=${enc(value.end)}&+OpenGate=${value.openGate}&MasterOfCar=${enc(value.owner)}`;
+}
+function buildPlateInsertEndpoint(value) {
+  return `/cgi-bin/recordUpdater.cgi?action=insert&name=${enc(value.mode)}&PlateNumber=${enc(value.plateNumber)}&VehicleType=${enc(value.vehicleType)}&VehicleColor=${enc(value.vehicleColor)}&BeginTime=${enc(value.start)}&CancelTime=${enc(value.end)}&+OpenGate=${value.openGate}&MasterOfCar=${enc(value.owner)}`;
+}
+function buildPlateRemoveEndpoint(value) {
+  return `/cgi-bin/recordUpdater.cgi?action=remove&recno=${enc(value.recno)}&name=${enc(value.mode)}`;
+}
+
 // src/services/dahua.service.ts
 var cameraRegistry = /* @__PURE__ */ new Map();
 var _savedOnDetected;
@@ -24038,7 +24117,8 @@ async function useDahuaDigestWithRetry({
   retryDelayMs = 0
 }) {
   let lastError;
-  for (let attempt = 1; attempt <= retries; attempt++) {
+  const effectiveRetries = Math.min(retries, DAHUA_AUTH_ATTEMPTS_BEFORE_ALERT);
+  for (let attempt = 1; attempt <= effectiveRetries; attempt++) {
     try {
       const effectiveTimeout = streaming ? 0 : timeout;
       const response = await useDahuaDigest({
@@ -24065,9 +24145,9 @@ async function useDahuaDigestWithRetry({
       }
       const errorText = streaming ? `HTTP ${statusCode}` : getDahuaResponseText(response);
       const shouldRetry = isDahuaInvalidAuthority(errorText);
-      if (shouldRetry && attempt < retries) {
+      if (shouldRetry && attempt < effectiveRetries) {
         loggerDahua.warn(
-          `[${host}] Dahua Invalid Authority. Retrying ${attempt}/${retries}`
+          `[${host}] Dahua Invalid Authority. Retrying ${attempt}/${effectiveRetries}`
         );
         if (retryDelayMs > 0) {
           await sleep(retryDelayMs);
@@ -24079,9 +24159,9 @@ async function useDahuaDigestWithRetry({
       lastError = error;
       const message = error?.message || String(error);
       const shouldRetry = isDahuaInvalidAuthority(message);
-      if (shouldRetry && attempt < retries) {
+      if (shouldRetry && attempt < effectiveRetries) {
         loggerDahua.warn(
-          `[${host}] Dahua Invalid Authority error. Retrying ${attempt}/${retries}`
+          `[${host}] Dahua Invalid Authority error. Retrying ${attempt}/${effectiveRetries}`
         );
         if (retryDelayMs > 0) {
           await sleep(retryDelayMs);
@@ -24185,7 +24265,9 @@ function useDahuaService() {
         return;
       try {
         const result = await _checkOutBySiteAndPlate(site, plateNumber2);
-        console.log("checkOutBySiteAndPlate result", result);
+        loggerDahua.info(
+          `checkOutBySiteAndPlate matched=${Boolean(result)} type=${result?.type ?? "none"}`
+        );
         if (onDetected2 && result?.type != "resident" && result?.site) {
           onDetected2({ reload: true, site: result?.site?.toString(), siteName: camera?.siteName, cameraDirection: camera?.direction, direction });
         }
@@ -24484,9 +24566,12 @@ function useDahuaService() {
     );
   }
   async function getTrafficJunction(camera, signal, onDetected) {
-    console.log(`getTrafficJunction camera object`, camera);
+    loggerDahua.info(
+      `getTrafficJunction starting for camera ${camera?._id} [${camera?.siteName}-${camera?.direction}] host ${camera?.host}`
+    );
     let authFailureCount = 0;
-    const MAX_AUTH_RETRIES = 10;
+    let connectionFailureCount = 0;
+    let alertedFailureCount = 0;
     while (!signal.aborted) {
       let bufferQueue = null;
       let response = null;
@@ -24501,31 +24586,48 @@ function useDahuaService() {
           streaming: true
         });
         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) {
+        const verdict = classifyDahuaStatus(statusCode);
+        if (verdict === "challenge") {
+          loggerDahua.warn(`[${camera?.siteName}-${camera?.direction}] 401 - digest challenge not completed; will re-authenticate after backoff.`);
+          throw new Error("401 Unauthorized - digest challenge not completed");
+        } else if (verdict === "rejected") {
           loggerDahua.error(
-            `[${camera?.siteName}-${camera?.direction}] 403 Forbidden. Account locked or invalid permissions.`
+            `[${camera?.siteName}-${camera?.direction}] 403 Forbidden - credentials rejected by the device. Not retrying.`
           );
           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.`
+              // Superseded #1803's own wording: cameraCredentialsMessage already
+              // says the login was refused and where to correct it, and no longer
+              // claims a ten-minute lockout.
+              messagePermanent: cameraCredentialsMessage(camera)
             });
           }
           return;
-        } else if ([400, 500].includes(statusCode)) {
+        } else if (verdict === "fatal") {
           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.` });
+            onDetected({ site: camera?.site, messagePermanent: cameraNotAuthorisedMessage(camera) });
           }
           return;
         }
         authFailureCount = 0;
         isAuthFailure = false;
+        if (alertedFailureCount > 0 && onDetected) {
+          onDetected({
+            site: camera?.site,
+            direction: camera?.direction,
+            // `event` and `camera` let a client group or clear an alert per
+            // camera instead of matching on the message text. Older clients
+            // ignore them and just render `message`, as they always have.
+            event: "camera-recovered",
+            camera: camera?._id?.toString(),
+            message: cameraRecoveredMessage(camera)
+          });
+        }
+        connectionFailureCount = 0;
+        alertedFailureCount = 0;
         loggerDahua.info(`[${camera?.siteName}-${camera?.direction}] Successfully connected to ANPR.`);
         const contentType = response.res.headers["content-type"];
         const boundaryMatch = contentType?.match(/boundary=(.*)$/i);
@@ -24571,50 +24673,53 @@ function useDahuaService() {
           break;
         }
         const errMsg = String(error?.message || error);
-        if (errMsg.includes("403") || errMsg.includes("Forbidden")) {
+        const failure = classifyDahuaFailure(errMsg);
+        if (failure === "rejected") {
           loggerDahua.error(
-            `[${camera?.siteName}-${camera?.direction}] 403 Forbidden thrown by Dahua client. Account locked or invalid credentials.`
+            `[${camera?.siteName}-${camera?.direction}] 403 Forbidden thrown by Dahua client - credentials rejected. Not retrying.`
           );
           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.`
+              messagePermanent: cameraCredentialsMessage(camera)
             });
           }
           return;
         }
-        const isAuthError = errMsg.includes("401") || errMsg.includes("Unauthorized") || errMsg.includes("Invalid Authority");
-        if (isAuthError) {
+        if (failure === "challenge") {
           authFailureCount++;
           isAuthFailure = true;
           loggerDahua.warn(
-            `[${camera?.siteName}-${camera?.direction}] Auth attempt ${authFailureCount}/${MAX_AUTH_RETRIES}`
+            `[${camera?.siteName}-${camera?.direction}] Authentication attempt ${authFailureCount} failed; next attempt in ${dahuaAuthBackoffMs(authFailureCount) / 1e3}s`
           );
-          if (authFailureCount >= MAX_AUTH_RETRIES) {
+          if (authFailureCount === DAHUA_AUTH_ATTEMPTS_BEFORE_ALERT) {
             loggerDahua.error(
-              `[${camera?.siteName}-${camera?.direction}] Max auth failures reached (${MAX_AUTH_RETRIES}). Wrong credentials.`
+              `[${camera?.siteName}-${camera?.direction}] ${authFailureCount} consecutive authentication failures. Slowing down and alerting the operator.`
             );
             if (onDetected) {
               onDetected({
                 site: camera?.site,
                 direction: camera?.direction,
-                messagePermanent: `Camera [${camera?.siteName}-${camera?.direction}]. Connection Error. Check username and password.`
+                messagePermanent: cameraCredentialsMessage(camera)
               });
             }
-            return;
           }
         } else {
           authFailureCount = 0;
           isAuthFailure = false;
+          connectionFailureCount++;
           loggerDahua.error(
-            `[${camera?.siteName}-${camera?.direction}] Connection lost or error: ${error.message || error}. Retrying in 10 seconds...`
+            `[${camera?.siteName}-${camera?.direction}] Connection lost or error: ${error.message || error}. Retrying in 10 seconds... (failure ${connectionFailureCount})`
           );
-          if (onDetected) {
+          if (onDetected && shouldAlertOnFailure(connectionFailureCount)) {
+            alertedFailureCount = connectionFailureCount;
             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.`
+              event: "camera-fault",
+              camera: camera?._id?.toString(),
+              message: cameraUnreachableMessage(camera)
             });
           }
         }
@@ -24638,7 +24743,7 @@ function useDahuaService() {
         }
       }
       if (!signal.aborted) {
-        const waitMs = isAuthFailure ? 1e3 : 1e4;
+        const waitMs = isAuthFailure ? dahuaAuthBackoffMs(authFailureCount) : 1e4;
         await new Promise((res) => setTimeout(res, waitMs));
       }
     }
@@ -24651,7 +24756,9 @@ function useDahuaService() {
     return match ? match[1] : null;
   }
   async function addPlateNumber(value) {
-    console.log("addPlateNumber called with value:", value);
+    loggerDahua.info(
+      `addPlateNumber called for host ${value?.host} mode ${value?.mode}`
+    );
     let recno = null;
     const validation = Joi42.object({
       host: Joi42.string().required(),
@@ -24796,7 +24903,15 @@ function useDahuaService() {
       const openGateString = String(value.isOpenGate);
       _isOpenGate = openGateString ? openGateString : "true";
     }
-    const endpoint = `/cgi-bin/recordUpdater.cgi?action=update&name=${value.mode}&recno=${value.recno}&PlateNumber=${value.plateNumber}&BeginTime=${value.start}&CancelTime=${value.end}&+OpenGate=${_isOpenGate}&MasterOfCar=${value.owner}`;
+    const endpoint = buildPlateUpdateEndpoint({
+      mode: value.mode,
+      recno: value.recno,
+      plateNumber: value.plateNumber,
+      start: value.start,
+      end: value.end,
+      owner: value.owner,
+      openGate: _isOpenGate
+    });
     try {
       const response = await useDahuaDigest({
         host: value.host,
@@ -24829,7 +24944,10 @@ function useDahuaService() {
         host: value.host,
         username: value.username,
         password: value.password,
-        endpoint: `/cgi-bin/recordUpdater.cgi?action=remove&recno=${value.recno}&name=${value.mode}`
+        endpoint: buildPlateRemoveEndpoint({
+          recno: value.recno,
+          mode: value.mode
+        })
       });
       return response;
     } catch (error2) {
@@ -24885,7 +25003,16 @@ function useDahuaService() {
     value.vehicleColor = String(value.vehicleColor ?? "").substring(0, 31) || "unknown";
     const _openGate = String(value.isOpenGate);
     const isOpenGateString = _openGate && _openGate !== "undefined" ? _openGate : "true";
-    const endpoint = `/cgi-bin/recordUpdater.cgi?action=insert&name=${value.mode}&PlateNumber=${value.plateNumber}&VehicleType=${value.vehicleType}&VehicleColor=${value.vehicleColor}&BeginTime=${value.start}&CancelTime=${value.end}&+OpenGate=${isOpenGateString}&MasterOfCar=${value.owner}`;
+    const endpoint = buildPlateInsertEndpoint({
+      mode: value.mode,
+      plateNumber: value.plateNumber,
+      vehicleType: value.vehicleType,
+      vehicleColor: value.vehicleColor,
+      start: value.start,
+      end: value.end,
+      owner: value.owner,
+      openGate: isOpenGateString
+    });
     try {
       const response = await useDahuaDigest({
         host: value.host,
@@ -25311,7 +25438,7 @@ function useSiteCameraRepo() {
       }
       if (result?._id) {
         const result2 = await findOne({ _id: new ObjectId47(result._id) }, void 0, { session });
-        console.log("updateById result2", result2);
+        logger51.info(`Site camera ${result2?._id} re-read after update; reconnecting listener`);
         if (result2?._id) {
           const { listenToCamera } = useDahuaService();
           await listenToCamera(result2);
@@ -27625,7 +27752,9 @@ function useVehicleService() {
           siteCameras.push(...siteCameraReq.items);
           page++;
         } while (page <= pages);
-        console.log("add vehicle service siteCameras", siteCameras);
+        logger55.info(
+          `addVehicle resolved ${siteCameras.length} site camera(s) for site ${value?.site}`
+        );
       }
       for (const plateNumber of plateNumbers) {
         const vehicleValue = {