@7365admin1/core 3.52.2-staging.239 → 3.52.2-staging.240

package/.changeset/camera-error-wording-and-plate-cleanup.md

@@ -0,0 +1,11 @@
+---
+"@7365admin1/core": patch
+---
+
+Write camera failures in words an operator can act on, and stop offering plates whose vehicle has been deleted.
+
+Camera failure messages no longer carry a camera's `_id`, its host, an IP, a port or a raw driver error. A camera is named by its display name and direction ("North Gate (entry)", or "the entry camera" when it has no name), and the reason is plain language ("the camera could not be reached"). The full technical detail — record id, host, and the device's or driver's own text — goes to the server log instead. The same treatment is applied to create, approve, restore, block, unblock, edit and delete; `blocklistVehicles`, `removeFromBlocklist` and `reactivateVehicleById` previously said only "Failed to delete/update/add plate number to ANPR", which named no camera and said nothing about what happened to the record. Blocking now states the opposite consequence to saving, because a failed blacklist write leaves the car able to get in.
+
+`site.people.plates[]` no longer keeps a plate after its vehicle is deleted. The pull matched on `recNo`, which Dahua numbers per device, so the copy on the vehicle and the copy on the person diverged and the update silently matched nothing; it now matches on the plate number, and leaves the plate alone when a second live vehicle still holds it. Unblocking, which soft-deletes the record, now pulls the plate too. `GET /api/people/unit/:unit` and `GET /api/people` also drop any plate whose vehicle records are all deleted, so rows that had already drifted are not offered either. A plate the resident merely declared, with no vehicle record at all, is unchanged.
+
+Unblocking a vehicle at a site with no ANPR camera now succeeds instead of failing with "No site cameras found." — there is nothing to revoke, which is the state the unblock is trying to reach. Approve, Restore, Block and Edit still refuse in that state, now saying why and what did not happen.

package/dist/index.d.ts

@@ -2528,6 +2528,14 @@ type AnprRevokeOutcome = {
     statusCode?: number;
     /** Why it failed, in words an operator can act on. Empty when `ok`. */
     reason: string;
+    /**
+     * The technical cause, for the SERVER LOG only. Never rendered.
+     *
+     * `reason` used to BE this string, so a driver error went straight to the
+     * browser: "connect EHOSTUNREACH 129.126.212.21:8081" put an internal IP and
+     * port in front of a condo manager, who can do nothing with either.
+     */
+    detail?: string;
 };
 
 declare enum CameraType {

package/dist/index.js

@@ -17573,9 +17573,39 @@ function usePersonRepo() {
     throw new import_node_server_utils41.InternalServerError("Unable to connect to server.");
   }
   const collection = db2.collection(site_people_namespace_collection);
+  const vehiclesCollection = db2.collection("vehicles");
   const { delNamespace, getCache, setCache } = (0, import_node_server_utils41.useCache)(
     site_people_namespace_collection
   );
+  async function withoutDeletedPlates(people) {
+    const numbers = Array.from(
+      new Set(
+        people.flatMap(
+          (person) => (Array.isArray(person?.plates) ? person.plates : []).map((plate) => plate?.plateNumber).filter((value) => typeof value === "string" && !!value)
+        )
+      )
+    );
+    if (!numbers.length)
+      return people;
+    const records = await vehiclesCollection.find(
+      { plateNumber: { $in: numbers } },
+      { projection: { plateNumber: 1, status: 1, site: 1 } }
+    ).toArray();
+    const live = /* @__PURE__ */ new Map();
+    for (const record of records) {
+      const key = `${String(record.site)}|${record.plateNumber}`;
+      live.set(key, live.get(key) === true || record.status !== "deleted");
+    }
+    return people.map((person) => {
+      if (!Array.isArray(person?.plates) || !person.plates.length)
+        return person;
+      const plates = person.plates.filter((plate) => {
+        const key = `${String(person.site)}|${plate?.plateNumber}`;
+        return !live.has(key) || live.get(key) === true;
+      });
+      return plates.length === person.plates.length ? person : { ...person, plates };
+    });
+  }
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -17751,7 +17781,12 @@ function usePersonRepo() {
         collection.aggregate([{ $match: query2 }, { $count: "total" }], { session }).toArray()
       ]);
       const totalCount = countResult[0]?.total || 0;
-      const data = (0, import_node_server_utils41.paginate)(items, page, limit, totalCount);
+      const data = (0, import_node_server_utils41.paginate)(
+        await withoutDeletedPlates(items),
+        page,
+        limit,
+        totalCount
+      );
       return data;
     } catch (error) {
       throw error;
@@ -18004,7 +18039,7 @@ function usePersonRepo() {
         },
         { $unwind: { path: "$unit", preserveNullAndEmptyArrays: true } }
       ]).toArray();
-      return data;
+      return await withoutDeletedPlates(data);
     } catch (error) {
       throw new import_node_server_utils41.InternalServerError(
         "Failed to fetch people type residents by unit."
@@ -18203,10 +18238,22 @@ function usePersonRepo() {
         "Cannot remove a vehicle plate without a person or a site."
       );
     }
-    const match = recNo ? { recNo } : scope?.plateNumber ? { plateNumber: scope.plateNumber } : {};
+    const match = scope?.plateNumber ? { plateNumber: scope.plateNumber } : recNo ? { recNo } : {};
     if (!Object.keys(match).length)
       return;
     const matchKey = Object.keys(match)[0];
+    if (matchKey === "plateNumber" && site) {
+      const survivor = await vehiclesCollection.findOne(
+        {
+          site,
+          plateNumber: scope.plateNumber,
+          status: { $ne: "deleted" }
+        },
+        { projection: { _id: 1 }, session }
+      );
+      if (survivor)
+        return;
+    }
     const filter = {
       [`plates.${matchKey}`]: match[matchKey]
     };
@@ -22443,34 +22490,119 @@ function anprRevokeOutcome(response) {
   if (statusCode === 200)
     return { ok: true, statusCode, reason: "" };
   if (statusCode === void 0) {
-    return { ok: false, reason: "the camera did not answer" };
+    return {
+      ok: false,
+      reason: CAMERA_FAILURE_REASONS.transient,
+      detail: "the device reply carried no status code"
+    };
   }
-  return { ok: false, statusCode, reason: `the camera answered ${statusCode}` };
+  return {
+    ok: false,
+    statusCode,
+    reason: reasonForStatus(statusCode),
+    detail: `the camera answered HTTP ${statusCode}`
+  };
 }
 function anprRevokeThrew(error) {
-  const message = error?.message ?? String(error ?? "");
-  return { ok: false, reason: message || "the camera could not be reached" };
+  const message = String(error?.message ?? error ?? "");
+  return {
+    ok: false,
+    reason: cameraFailureReason(message),
+    detail: message || "the request threw with no message"
+  };
+}
+function cameraFailureSentence(options) {
+  const { failures, operation, outcome, consequence } = options;
+  return `The plate number could not be ${operation} ${cameraCount(failures.length)}: ${cameraDetail(failures)}. The vehicle has NOT been ${outcome} \u2014 ${consequence}. Please check the ${failures.length === 1 ? "camera" : "cameras"} and try again.`;
 }
 function anprRevokeFailureMessage(failures, action = "deleted") {
-  const detail = failures.map((failure) => `${failure.camera} (${failure.reason})`).join("; ");
-  return `The plate number could not be removed from ${failures.length} ANPR camera(s): ${detail}. The vehicle has NOT been ${action} \u2014 it would still open the barrier. Check the camera, then try again.`;
+  return cameraFailureSentence({
+    failures,
+    operation: "removed from",
+    outcome: action,
+    consequence: "it would still open the barrier"
+  });
 }
-var WRITE_REASONS = {
+function anprRestoreFailureMessage(failures) {
+  return cameraFailureSentence({
+    failures,
+    operation: "added to",
+    outcome: "restored",
+    consequence: "it would not open the barrier"
+  });
+}
+function anprBlockFailureMessage(failures) {
+  return cameraFailureSentence({
+    failures,
+    operation: "added to",
+    outcome: "blocked",
+    consequence: "it would still open the barrier"
+  });
+}
+function anprUnblockFailureMessage(failures) {
+  return cameraFailureSentence({
+    failures,
+    operation: "removed from",
+    outcome: "unblocked",
+    consequence: "it would still be turned away at the barrier"
+  });
+}
+var CAMERA_FAILURE_REASONS = {
   challenge: "the camera refused the login saved for it (its username or password is wrong, or the account is temporarily locked after failed logins)",
   rejected: "the camera rejected the request \u2014 its account is not allowed to change the plate list",
   transient: "the camera could not be reached"
 };
-function anprWriteReason(detail) {
+function cameraFailureReason(detail) {
   const message = detail?.message ?? String(detail ?? "");
-  return WRITE_REASONS[classifyDahuaFailure(message)];
+  return CAMERA_FAILURE_REASONS[classifyDahuaFailure(message)];
+}
+function reasonForStatus(statusCode) {
+  if (statusCode === 401)
+    return CAMERA_FAILURE_REASONS.challenge;
+  if (statusCode === 403)
+    return CAMERA_FAILURE_REASONS.rejected;
+  return "the camera answered with an error";
 }
+var DIRECTION_WORDS2 = {
+  entry: "entry",
+  exit: "exit",
+  both: "entry/exit",
+  visitors: "visitor lane",
+  residents: "resident lane"
+};
+function cameraLabel(camera) {
+  const name = String(camera?.name ?? "").trim();
+  const direction = DIRECTION_WORDS2[String(camera?.direction ?? "").trim().toLowerCase()];
+  if (name && direction)
+    return `${name} (${direction})`;
+  if (name)
+    return name;
+  if (direction)
+    return `the ${direction} camera`;
+  return "an ANPR camera";
+}
+function cameraCount(total) {
+  return total === 1 ? "1 ANPR camera" : `${total} ANPR cameras`;
+}
+function cameraDetail(failures) {
+  const parts = failures.map((f) => `${f.camera} \u2014 ${f.reason}`);
+  return Array.from(new Set(parts)).join("; ");
+}
+var anprWriteReason = cameraFailureReason;
 function anprWriteFailureMessage(failures, action = "added") {
-  const detail = failures.map((failure) => `${failure.camera} (${failure.reason})`).join("; ");
-  return `The plate number could not be ${action} to ${failures.length} ANPR camera(s): ${detail}. The vehicle has NOT been saved \u2014 it would not open the barrier. Check the camera, then try again.`;
+  return cameraFailureSentence({
+    failures,
+    operation: "added to",
+    outcome: action === "added" ? "saved" : action,
+    consequence: "it would not open the barrier"
+  });
 }
 function anprNoCameraMessage(type) {
   return `Vehicle saved to the ${type} record. There is no active ANPR camera at this site, so the plate has NOT been registered on a barrier yet and the gate will not open for it. It will need to be added once a camera is set up and switched on.`;
 }
+function anprNoCameraRefusal(outcome) {
+  return `There is no ANPR camera set up at this site, so the plate cannot be registered on a barrier. The vehicle has NOT been ${outcome}. Add a camera in Settings first, then try again.`;
+}
 
 // src/services/dahua.service.ts
 function notifyCameraFault(camera, message) {
@@ -35188,8 +35320,11 @@ function parseDahuaFind(text2) {
     plateNumber: text2.match(/records\[0\]\.PlateNumber=(.*)/)?.[1]?.trim()
   };
 }
-function cameraLabel(camera) {
-  return String(camera?.name || camera?._id || "ANPR camera");
+function logCameraFailure(where, camera, detail) {
+  const raw = String(detail?.message ?? detail ?? "");
+  import_node_server_utils99.logger.error(
+    `${where}: ANPR camera ${String(camera?._id ?? "unknown id")} host ${String(camera?.host ?? "unknown host")} name ${JSON.stringify(String(camera?.name ?? ""))} direction ${JSON.stringify(String(camera?.direction ?? ""))} failed: ${raw || "no detail"}`
+  );
 }
 function useVehicleService() {
   const {
@@ -35336,9 +35471,7 @@ function useVehicleService() {
           for (const camera of siteCameras) {
             const { host, username, password } = camera;
             const plateNumber2 = vehicleValue.plateNumber;
-            const label = String(
-              camera?.name || camera?._id || "ANPR camera"
-            );
+            const label = cameraLabel(camera);
             const dahuaPayload = {
               host,
               username,
@@ -35354,6 +35487,11 @@ function useVehicleService() {
               const responseStatus = dahuaResponse?.statusCode || dahuaResponse?.status || dahuaResponse?.res?.status || "unknown";
               const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
               if (responseStatus !== 200) {
+                logCameraFailure(
+                  "add",
+                  camera,
+                  `HTTP ${responseStatus}: ${responseData.slice(0, 500)}`
+                );
                 failures.push({
                   camera: label,
                   reason: anprWriteReason(`HTTP ${responseStatus}`)
@@ -35375,6 +35513,7 @@ function useVehicleService() {
                 );
               }
             } catch (error) {
+              logCameraFailure("add", camera, error);
               failures.push({ camera: label, reason: anprWriteReason(error) });
             }
           }
@@ -35452,9 +35591,7 @@ function useVehicleService() {
         const host = camera.host;
         const username = camera.username;
         const password = camera.password;
-        const label = String(
-          camera?.name || camera?._id || "ANPR camera"
-        );
+        const label = cameraLabel(camera);
         let recnoForCamera = recno;
         if (plateNumber) {
           try {
@@ -35473,10 +35610,9 @@ function useVehicleService() {
             if (found.recNo)
               recnoForCamera = found.recNo;
           } catch (error) {
-            failures.push({
-              camera: label,
-              reason: anprRevokeThrew(error).reason
-            });
+            const outcome2 = anprRevokeThrew(error);
+            logCameraFailure("deleteVehicle lookup", camera, outcome2.detail);
+            failures.push({ camera: label, reason: outcome2.reason });
             continue;
           }
         }
@@ -35490,9 +35626,14 @@ function useVehicleService() {
           mode: _mode
         });
         if (!outcome?.ok) {
+          logCameraFailure(
+            "deleteVehicle revoke",
+            camera,
+            outcome?.detail ?? "no outcome returned"
+          );
           failures.push({
             camera: label,
-            reason: outcome?.reason || "the camera did not answer"
+            reason: outcome?.reason || "the camera could not be reached"
           });
         }
       }
@@ -35572,7 +35713,7 @@ function useVehicleService() {
         page++;
       } while (page <= pages);
       if (!siteCameras.length) {
-        throw new import_node_server_utils99.BadRequestError("No site cameras found.");
+        throw new import_node_server_utils99.BadRequestError(anprNoCameraRefusal("approved"));
       }
       for (const camera of siteCameras) {
         const { host, username, password } = camera;
@@ -35588,6 +35729,11 @@ function useVehicleService() {
         };
         const dahuaResponse = await _addPlateNumber(dahuaPayload);
         if (dahuaResponse?.statusCode != 200) {
+          logCameraFailure(
+            "approveVehicleById",
+            camera,
+            `HTTP ${dahuaResponse?.statusCode ?? "none"}`
+          );
           throw new import_node_server_utils99.BadRequestError(
             anprWriteFailureMessage([
               {
@@ -35735,7 +35881,7 @@ function useVehicleService() {
         page++;
       } while (page <= pages);
       if (!siteCameras.length) {
-        throw new import_node_server_utils99.BadRequestError("No site cameras found.");
+        throw new import_node_server_utils99.BadRequestError(anprNoCameraRefusal("restored"));
       }
       for (const camera of siteCameras) {
         const { host, username, password } = camera;
@@ -35751,7 +35897,21 @@ function useVehicleService() {
         };
         const dahuaResponse = await _addPlateNumber(dahuaPayload);
         if (dahuaResponse?.statusCode !== 200) {
-          throw new import_node_server_utils99.BadRequestError("Failed to add plate number to ANPR");
+          logCameraFailure(
+            "reactivateVehicleById",
+            camera,
+            `HTTP ${dahuaResponse?.statusCode ?? "none"}`
+          );
+          throw new import_node_server_utils99.BadRequestError(
+            anprRestoreFailureMessage([
+              {
+                camera: cameraLabel(camera),
+                reason: anprWriteReason(
+                  `HTTP ${dahuaResponse?.statusCode ?? "none"}`
+                )
+              }
+            ])
+          );
         }
         const responseData = dahuaResponse?.data.toString("utf-8");
         value.recNo = responseData.split("=")[1]?.trim();
@@ -35835,7 +35995,7 @@ function useVehicleService() {
             page++;
           } while (page <= pages);
           if (!siteCameras.length) {
-            throw new import_node_server_utils99.BadRequestError("No site cameras found.");
+            throw new import_node_server_utils99.BadRequestError(anprNoCameraRefusal("updated"));
           }
           for (const camera of siteCameras) {
             const { host, username, password } = camera;
@@ -35852,12 +36012,17 @@ function useVehicleService() {
                 removePlateNumber
               );
               if (!responseForDeletion?.ok) {
+                logCameraFailure(
+                  "updateVehicleById revoke",
+                  camera,
+                  responseForDeletion?.detail ?? "no outcome returned"
+                );
                 throw new import_node_server_utils99.BadRequestError(
                   anprRevokeFailureMessage(
                     [
                       {
                         camera: cameraLabel(camera),
-                        reason: responseForDeletion?.reason || "the camera did not answer"
+                        reason: responseForDeletion?.reason || "the camera could not be reached"
                       }
                     ],
                     "updated"
@@ -35879,6 +36044,7 @@ function useVehicleService() {
               try {
                 dahuaResponse = await _addPlateNumber(dahuaPayload);
               } catch (error) {
+                logCameraFailure("updateVehicleById write", camera, error);
                 const restored = await restorePlateOnCamera({
                   ...removePlateNumber,
                   plateNumber: _plateNumber,
@@ -35894,6 +36060,11 @@ function useVehicleService() {
                 );
               }
               if (dahuaResponse?.statusCode !== 200) {
+                logCameraFailure(
+                  "updateVehicleById write",
+                  camera,
+                  `HTTP ${dahuaResponse?.statusCode ?? "none"}`
+                );
                 throw new import_node_server_utils99.BadRequestError(
                   anprWriteFailureMessage(
                     [
@@ -35940,11 +36111,16 @@ function useVehicleService() {
                   recno: existing.recNo || _recNo
                 });
                 if (!outcome?.ok) {
+                  logCameraFailure(
+                    "updateVehicleById revoke",
+                    camera,
+                    outcome?.detail ?? "no outcome returned"
+                  );
                   throw new import_node_server_utils99.BadRequestError(
                     anprRevokeFailureMessage([
                       {
                         camera: cameraLabel(camera),
-                        reason: outcome?.reason || "the camera did not answer"
+                        reason: outcome?.reason || "the camera could not be reached"
                       }
                     ], "updated")
                   );
@@ -35965,6 +36141,7 @@ function useVehicleService() {
               try {
                 dahuaResponse = await _addPlateNumber(dahuaPayload);
               } catch (error) {
+                logCameraFailure("updateVehicleById write", camera, error);
                 const restored = existing.exists ? await restorePlateOnCamera({
                   ...dahuaPayload,
                   owner: _name
@@ -35977,6 +36154,11 @@ function useVehicleService() {
                 );
               }
               if (dahuaResponse?.statusCode !== 200) {
+                logCameraFailure(
+                  "updateVehicleById write",
+                  camera,
+                  `HTTP ${dahuaResponse?.statusCode ?? "none"}`
+                );
                 throw new import_node_server_utils99.BadRequestError(
                   anprWriteFailureMessage(
                     [
@@ -36157,7 +36339,7 @@ function useVehicleService() {
           page++;
         } while (page <= pages);
         if (!siteCameras.length) {
-          throw new import_node_server_utils99.BadRequestError("No site cameras found.");
+          throw new import_node_server_utils99.BadRequestError(anprNoCameraRefusal("blocked"));
         }
         for (const camera of siteCameras) {
           const { host, username, password } = camera;
@@ -36171,8 +36353,23 @@ function useVehicleService() {
           const responseForDeletion = await _removePlateNumber(
             removePlateNumber
           );
-          if (responseForDeletion?.statusCode !== 200) {
-            throw new import_node_server_utils99.BadRequestError("Failed to delete plate number to ANPR");
+          if (!responseForDeletion?.ok) {
+            logCameraFailure(
+              "blocklistVehicles revoke",
+              camera,
+              responseForDeletion?.detail ?? "no outcome returned"
+            );
+            throw new import_node_server_utils99.BadRequestError(
+              anprRevokeFailureMessage(
+                [
+                  {
+                    camera: cameraLabel(camera),
+                    reason: responseForDeletion?.reason || "the camera could not be reached"
+                  }
+                ],
+                "updated"
+              )
+            );
           }
           const dahuaPayload = {
             host,
@@ -36186,7 +36383,21 @@ function useVehicleService() {
           };
           const dahuaResponse = await _addPlateNumber(dahuaPayload);
           if (dahuaResponse?.statusCode !== 200) {
-            throw new import_node_server_utils99.BadRequestError("Failed to update plate number to ANPR");
+            logCameraFailure(
+              "blocklistVehicles write",
+              camera,
+              `HTTP ${dahuaResponse?.statusCode ?? "none"}`
+            );
+            throw new import_node_server_utils99.BadRequestError(
+              anprBlockFailureMessage([
+                {
+                  camera: cameraLabel(camera),
+                  reason: anprWriteReason(
+                    `HTTP ${dahuaResponse?.statusCode ?? "none"}`
+                  )
+                }
+              ])
+            );
           }
           const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
           value.recNo = responseData.split("=")[1]?.trim();
@@ -36248,9 +36459,9 @@ function useVehicleService() {
           siteCameras.push(...siteCameraReq.items);
           page++;
         } while (page <= pages);
-        if (!siteCameras.length) {
-          throw new import_node_server_utils99.BadRequestError("No site cameras found.");
-        }
+        import_node_server_utils99.logger.info(
+          `removeFromBlocklist resolved ${siteCameras.length} ANPR camera(s)`
+        );
         for (const camera of siteCameras) {
           const { host, username, password } = camera;
           const removePlateNumber = {
@@ -36263,12 +36474,35 @@ function useVehicleService() {
           const responseForDeletion = await _removePlateNumber(
             removePlateNumber
           );
-          if (responseForDeletion?.statusCode !== 200) {
-            throw new import_node_server_utils99.BadRequestError("Failed to delete plate number to ANPR");
+          if (!responseForDeletion?.ok) {
+            logCameraFailure(
+              "removeFromBlocklist revoke",
+              camera,
+              responseForDeletion?.detail ?? "no outcome returned"
+            );
+            throw new import_node_server_utils99.BadRequestError(
+              anprUnblockFailureMessage([
+                {
+                  camera: cameraLabel(camera),
+                  reason: responseForDeletion?.reason || "the camera could not be reached"
+                }
+              ])
+            );
           }
         }
       }
       await _deleteVehicle(_id, session);
+      if ((value.peopleId || site) && (_plateNumber || _recNo)) {
+        await _pullVehicleByRecNo(
+          String(_recNo ?? ""),
+          {
+            peopleId: value.peopleId,
+            site,
+            plateNumber: _plateNumber
+          },
+          session
+        );
+      }
       await session.commitTransaction();
     } catch (error) {
       await session.abortTransaction();