@7365admin1/core 3.79.1-staging.336 → 3.79.1-staging.338

package/CHANGELOG.md

@@ -1,5 +1,64 @@
 # @iservice365/core
 
+## 3.80.0
+
+### Minor Changes
+
+- a267a47: Vehicle statuses say which list a vehicle is on, a site holds a plate once
+  whatever its status, and every vehicle keeps a history.
+
+  **Statuses.** A whitelist vehicle is `active`, a season pass `temporary`, a
+  blocked vehicle `blocked`. Blocking a resident or season pass puts its plate on
+  the blocklist of every active camera except Exit for ten years (whatever the
+  pass's own dates) and takes it OFF every camera's allowed list, so no camera
+  holds a plate on both lists; approving a pending blocklist vehicle uses the
+  same ten years, and a new camera is filled the same way. Unblocking sets `unblocked` and takes the plate off every active camera's
+  blocklist by plate number - and off the allowed list too, so an unblocked car
+  is on no list rather than quietly whitelisted again. A blocked, unblocked,
+  deleted or inactive vehicle can be blocked again in place. Everything that
+  writes, syncs, revokes or recognises a plate at the gate now treats `active`,
+  `temporary` and `blocked` as live; the gate still recognises a season pass as a
+  registered resident until its expiry, and an unblocked plate no longer counts
+  as blocked at visitor check-in.
+
+  **Categories and tabs.** A whitelist vehicle is filed `resident`, a season
+  pass `season_pass` (new), and a vehicle added to the blocklist `visitor` or
+  `contractor` (new in the vehicle enum; default `visitor`); blocked from a visitor transaction it keeps that type - `delivery`, `pick-up` or `drop-off` (new), a guest as `visitor`. A season pass seen at the gate is logged as a `resident` transaction. Blocking keeps the
+  category, so a blocked resident is still `resident`; editing a season pass type
+  on or off moves a whitelist vehicle between `resident` and `season_pass`. The
+  vehicle list takes `view` - `residents`, `season-passes` or `block-listed` -
+  for the three tabs; older season passes saved as `resident` show under Season
+  Passes. The gate counts `resident` and `season_pass` as registered.
+
+  **Update an existing plate from the add form.** `existingPlatesAtSite`
+  answers which of the plates being added the site already holds, with each
+  record's tab and status; `moveVehicle` saves the form's details on that record
+  and moves it to the form's tab (off every camera list, onto the list of its new
+  kind; pending for a security agency without the approve permission). Its
+  history records "moved".
+
+  **Sync.** `syncVehicleToCameras` puts a live vehicle's plate on every active
+  camera of its list that lacks it (a plate saved while its cameras were
+  inactive), camera by camera, and records the cameras that took it;
+  `activeCameraCounts` gives the active cameras per list so the screens can offer
+  it.
+
+  **One plate per site.** Adding a plate the site already has - deleted,
+  pending, temporary, blocked or unblocked included - is refused with its status
+  and "edit the existing vehicle instead" (restore, for a deleted one). The same
+  check guards approve, restore and plate edits. Matching ignores case and
+  spacing.
+
+  **History.** `history` holds the last 20 changes - created, updated,
+  approved, restored, blocked, unblocked, deleted - each with the user's id, the
+  time and the fields that changed. `getSpecificVehicleById` adds each user's
+  name.
+
+  **Also:** the vehicle list returns every status unless one is asked for; the
+  camera's record id (`recNo`) is no longer stored; `processDeletingExpiredVehicles`
+  is no longer needed (the camera enforces each pass's own expiry) and should be
+  unscheduled by the API.
+
 ## 3.79.0
 
 ### Minor Changes

package/dist/index.js

@@ -35163,25 +35163,44 @@ function useVehicleService() {
     }
     return failures;
   }
+  const CAMERA_WRITE_ROUNDS = 3;
+  const CAMERA_WRITE_RETRY_DELAY_MS = 3e3;
   async function writeToCameras(cameras, write, journal, options = {}) {
     const failures = [];
     let recNo = "";
     for (const camera of cameras) {
-      try {
-        if (options.onlyIfMissing) {
-          const { inserted } = await ensurePlateOnCamera(camera, write);
-          if (inserted)
+      for (let round = 1; ; round++) {
+        try {
+          if (options.onlyIfMissing || round > 1) {
+            const { inserted } = await ensurePlateOnCamera(camera, write);
+            if (inserted)
+              journal.inserted(camera, write.mode, write.plateNumber);
+          } else {
+            recNo = await insertPlateOnCamera(camera, write) || recNo;
             journal.inserted(camera, write.mode, write.plateNumber);
-        } else {
-          recNo = await insertPlateOnCamera(camera, write) || recNo;
-          journal.inserted(camera, write.mode, write.plateNumber);
+          }
+          if (round > 1) {
+            import_node_server_utils109.logger.info(
+              `[${cameraLabel(camera)}] write ${write.mode} went through on round ${round}`
+            );
+          }
+          break;
+        } catch (error) {
+          const transient = classifyDahuaFailure(error?.message ?? error) === "transient";
+          if (transient && round < CAMERA_WRITE_ROUNDS) {
+            logCameraFailure(`write ${write.mode} (round ${round}, retrying)`, camera, error);
+            await new Promise(
+              (resolve) => setTimeout(resolve, CAMERA_WRITE_RETRY_DELAY_MS * round)
+            );
+            continue;
+          }
+          logCameraFailure(`write ${write.mode}`, camera, error);
+          failures.push({
+            camera: cameraLabel(camera),
+            reason: anprWriteReason(error)
+          });
+          break;
         }
-      } catch (error) {
-        logCameraFailure(`write ${write.mode}`, camera, error);
-        failures.push({
-          camera: cameraLabel(camera),
-          reason: anprWriteReason(error)
-        });
       }
     }
     return { failures, recNo };
@@ -35568,6 +35587,9 @@ function useVehicleService() {
     }
     const _plateNumber = String(vehicle.plateNumber ?? "");
     const owner = vehicle.name;
+    const approveOutcome = ["deleted", "inactive", "rejected"].includes(
+      String(vehicle.status ?? "")
+    ) ? "restored" : "approved";
     const isBlocklist = vehicle.type === "blocklist" /* BLOCKLIST */;
     const mode = listMode(vehicle.type);
     const hasStart = typeof vehicle.start === "string" ? vehicle.start.trim() !== "" : !!vehicle.start;
@@ -35596,7 +35618,7 @@ function useVehicleService() {
       const cameraSite = vehicle.site ?? siteId;
       const siteCameras = isBlocklist ? await blockCamerasAt(cameraSite) : await allowCamerasAt(cameraSite);
       if (!siteCameras.length) {
-        throw new import_node_server_utils109.BadRequestError(anprNoCameraRefusal("approved"));
+        throw new import_node_server_utils109.BadRequestError(anprNoCameraRefusal(approveOutcome));
       }
       const { failures } = await writeToCameras(
         siteCameras,
@@ -35614,7 +35636,7 @@ function useVehicleService() {
           cameraFailureSentence({
             failures,
             operation: "added to",
-            outcome: "approved",
+            outcome: approveOutcome,
             consequence: isBlocklist ? "it would still open the barrier" : "it would not open the barrier"
           })
         );
@@ -35725,7 +35747,11 @@ function useVehicleService() {
     const ownEnd = validDate(vehicle.end);
     let startDate;
     let endDate;
-    if (ownEnd) {
+    if (isBlocklist) {
+      const block = blockWindow();
+      startDate = new Date(block.start);
+      endDate = new Date(block.end);
+    } else if (ownEnd) {
       if (ownEnd.getTime() <= Date.now()) {
         throw new import_node_server_utils109.BadRequestError(
           `This vehicle's expiry date (${dahuaWallClock(
@@ -40245,6 +40271,10 @@ function useVehicleController() {
     message: "You do not have permission to view vehicles."
   };
   const VEHICLE_DETAILS = {
+    permissions: ["vehicle-mgmt:see-vehicle-details"],
+    message: "You do not have permission to view vehicle details."
+  };
+  const VEHICLE_EDIT_READ = {
     permissions: [
       "vehicle-mgmt:see-vehicle-details",
       "vehicle-mgmt:update-vehicle"
@@ -40651,7 +40681,7 @@ function useVehicleController() {
     }
     const { _id } = value;
     try {
-      await requireVehicleReach(req, _id, VEHICLE_DETAILS);
+      await requireVehicleReach(req, _id, VEHICLE_EDIT_READ);
       const site = await _getSpecificVehicleById(_id);
       res.json(site);
       return;