@7365admin1/core 3.32.2-staging.74 → 3.32.2-staging.76

package/.changeset/dahua-credential-logging.md

@@ -0,0 +1,19 @@
+---
+"@7365admin1/core": patch
+---
+
+Stop logging camera and mailer credentials
+
+Six places wrote a secret or a resident's details to stdout on an ordinary code
+path. `getTrafficJunction` dumped the whole `TSiteCamera` object — including the
+camera's `username` and plaintext `password` — on every reconnect, and
+`addPlateNumber` logged its argument, which carries the same password plus a
+resident's plate number and owner name. `checkOutBySiteAndPlate` logged the
+matched visitor transaction. `siteCameraRepo.updateById` logged the re-read
+camera document, and `vehicleService.add` logged the whole array of a site's
+cameras, both with credentials in them. `sendEmail` printed `MAILER_PASSWORD`
+itself on every message sent.
+
+All now log identifiers, counts and outcomes only, through the module's logger
+rather than `console.log`; the mailer line is removed outright because it
+carried nothing but the secret.

package/dist/index.js

@@ -22700,7 +22700,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,
@@ -24737,6 +24736,47 @@ 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/services/dahua.service.ts
 var cameraRegistry = /* @__PURE__ */ new Map();
 var _savedOnDetected;
@@ -24929,7 +24969,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 });
         }
@@ -25228,8 +25270,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;
+    let connectionFailureCount = 0;
+    let alertedFailureCount = 0;
     const MAX_AUTH_RETRIES = 10;
     while (!signal.aborted) {
       let bufferQueue = null;
@@ -25257,19 +25303,33 @@ function useDahuaService() {
             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;
         } 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.` });
+            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);
@@ -25323,7 +25383,7 @@ function useDahuaService() {
             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;
@@ -25343,7 +25403,7 @@ function useDahuaService() {
               onDetected({
                 site: camera?.site,
                 direction: camera?.direction,
-                messagePermanent: `Camera [${camera?.siteName}-${camera?.direction}]. Connection Error. Check username and password.`
+                messagePermanent: cameraCredentialsMessage(camera)
               });
             }
             return;
@@ -25351,14 +25411,18 @@ function useDahuaService() {
         } 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)
             });
           }
         }
@@ -25395,7 +25459,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 = import_joi40.default.object({
       host: import_joi40.default.string().required(),
@@ -26055,7 +26121,7 @@ function useSiteCameraRepo() {
       }
       if (result?._id) {
         const result2 = await findOne({ _id: new import_mongodb46.ObjectId(result._id) }, void 0, { session });
-        console.log("updateById result2", result2);
+        import_node_server_utils74.logger.info(`Site camera ${result2?._id} re-read after update; reconnecting listener`);
         if (result2?._id) {
           const { listenToCamera } = useDahuaService();
           await listenToCamera(result2);
@@ -27581,7 +27647,9 @@ function useVehicleService() {
           siteCameras.push(...siteCameraReq.items);
           page++;
         } while (page <= pages);
-        console.log("add vehicle service siteCameras", siteCameras);
+        import_node_server_utils78.logger.info(
+          `addVehicle resolved ${siteCameras.length} site camera(s) for site ${value?.site}`
+        );
       }
       for (const plateNumber of plateNumbers) {
         const vehicleValue = {