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

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;