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

package/.changeset/vehicle-one-plate-per-site.md

@@ -35,6 +35,12 @@ 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

package/dist/index.d.ts

@@ -4123,6 +4123,15 @@ declare function useVehicleService(): {
         view: string;
     }[]>;
     moveVehicle: (_id: string, value: TVehicle, user?: string) => Promise<string>;
+    activeCameraCounts: (site: string) => Promise<{
+        allowed: number;
+        blocked: number;
+    }>;
+    syncVehicleToCameras: (_id: string, user?: string) => Promise<{
+        message: string;
+        synced: number;
+        failed: number;
+    }>;
     fillCameraLists: (site: unknown, camera: {
         id?: string;
         host?: string;
@@ -4188,6 +4197,8 @@ declare function useVehicleController(): {
     removeFromBlocklist: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     existingPlates: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     moveVehicle: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    activeCameraCounts: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    syncVehicleToCameras: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useSiteCameraRepo(): {

package/dist/index.js

@@ -18525,6 +18525,7 @@ function useVehicleRepo() {
           seasonPassType: 1,
           start: 1,
           end: 1,
+          remarks: 1,
           nric: 1,
           plateNumber: 1,
           site: 1,
@@ -18571,7 +18572,9 @@ function useVehicleRepo() {
               // A season pass's expiry, shown under its number.
               seasonPassType: "$seasonPassType",
               start: "$start",
-              end: "$end"
+              end: "$end",
+              // Each record's own remarks (e.g. why it was blocked).
+              remarks: "$remarks"
             }
           }
         }
@@ -35160,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 };
@@ -35565,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;
@@ -35593,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,
@@ -35611,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"
           })
         );
@@ -35722,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(
@@ -36128,6 +36157,76 @@ function useVehicleService() {
       throw error;
     }
   }
+  async function activeCameraCounts(site) {
+    const [allowed, blocked] = await Promise.all([
+      allowCamerasAt(site),
+      blockCamerasAt(site)
+    ]);
+    return { allowed: allowed.length, blocked: blocked.length };
+  }
+  async function syncVehicleToCameras(_id, user) {
+    const vehicle = await findOne({ _id: new import_mongodb76.ObjectId(_id) });
+    if (!vehicle)
+      throw new import_node_server_utils109.NotFoundError("Vehicle not found.");
+    if (!isLiveVehicleStatus(vehicle.status)) {
+      throw new import_node_server_utils109.BadRequestError(
+        `This vehicle is ${String(vehicle.status || "not live")}, so it is not put on any camera.`
+      );
+    }
+    const blocked = vehicle.type === "blocklist" /* BLOCKLIST */;
+    const cameras = blocked ? await blockCamerasAt(vehicle.site) : await allowCamerasAt(vehicle.site);
+    if (!cameras.length) {
+      throw new import_node_server_utils109.BadRequestError(
+        "There is no active ANPR camera to sync to. Switch a camera on first."
+      );
+    }
+    const plateNumber = String(vehicle.plateNumber ?? "");
+    const write = {
+      plateNumber,
+      mode: blocked ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+      owner: String(vehicle.name ?? ""),
+      ...blocked ? blockWindow() : cameraWindow(vehicle.start, vehicle.end)
+    };
+    const journal = cameraJournal();
+    const took = [];
+    const failures = [];
+    for (const camera of cameras) {
+      const result = await writeToCameras([camera], write, journal, {
+        onlyIfMissing: true
+      });
+      if (result.failures.length)
+        failures.push(...result.failures);
+      else
+        took.push(camera);
+    }
+    const hostKey = (value) => String(value ?? "").trim().toLowerCase().replace(/\/+$/, "");
+    const tookHosts = new Set(took.map((camera) => hostKey(camera.host)));
+    const current = Array.isArray(vehicle.anprCameras) ? vehicle.anprCameras : [];
+    try {
+      await _setAnprCameras(_id, [
+        ...current.filter((entry) => !tookHosts.has(hostKey(entry.host))),
+        ...anprCameraSummary(took, blocked ? "blocked" : "allowed")
+      ]);
+      if (took.length) {
+        await _pushHistory(_id, vehicleHistoryEntry("synced", user, ["anprCameras"]));
+      }
+    } catch (error) {
+      import_node_server_utils109.logger.error(`syncVehicleToCameras could not record ${_id}: ${error?.message ?? error}`);
+    }
+    const list = blocked ? "blocklist" : "allowed list";
+    if (!failures.length) {
+      return {
+        message: `Vehicle ${plateNumber} is on the ${list} of all ${took.length} active camera${took.length === 1 ? "" : "s"}.`,
+        synced: took.length,
+        failed: 0
+      };
+    }
+    return {
+      message: `Vehicle ${plateNumber} was synced to ${took.length} of ${cameras.length} active cameras. Not synced: ${failures.map((f) => `${f.camera} (${f.reason})`).join("; ")}.`,
+      synced: took.length,
+      failed: failures.length
+    };
+  }
   async function existingPlatesAtSite(site, plateNumbers) {
     const seen = /* @__PURE__ */ new Set();
     const items = [];
@@ -36253,12 +36352,12 @@ function useVehicleService() {
         ...value.phoneNumber !== void 0 && { phoneNumber: value.phoneNumber },
         ...value.nric !== void 0 && { nric: value.nric },
         ...value.remarks !== void 0 && { remarks: value.remarks },
-        ...toBlocklist ? {} : {
-          ...value.block && { block: asId(value.block) },
-          ...value.level && { level: asId(value.level) },
-          ...value.unit && { unit: asId(value.unit) },
-          ...value.peopleId && { peopleId: asId(value.peopleId) }
-        }
+        // Block / level / unit whenever the form sends them - a Block Listed
+        // vehicle blocked from a visitor transaction brings the visit's.
+        ...value.block && { block: asId(value.block) },
+        ...value.level && { level: asId(value.level) },
+        ...value.unit && { unit: asId(value.unit) },
+        ...toBlocklist ? {} : { ...value.peopleId && { peopleId: asId(value.peopleId) } }
       };
       const changed = changedFields(vehicle, formattedValue);
       await _updateVehicleById(_id, formattedValue, session);
@@ -36564,6 +36663,8 @@ function useVehicleService() {
     removeFromBlocklist,
     existingPlatesAtSite,
     moveVehicle,
+    activeCameraCounts,
+    syncVehicleToCameras,
     fillCameraLists,
     newCameraPlateRows,
     writeVehicleToNewCamera
@@ -40139,7 +40240,9 @@ function useVehicleController() {
     blocklistVehicles: _blocklistVehicles,
     removeFromBlocklist: _removeFromBlocklist,
     existingPlatesAtSite: _existingPlatesAtSite,
-    moveVehicle: _moveVehicle
+    moveVehicle: _moveVehicle,
+    activeCameraCounts: _activeCameraCounts,
+    syncVehicleToCameras: _syncVehicleToCameras
   } = useVehicleService();
   const {
     getSeasonPassTypes: _getSeasonPassTypes,
@@ -40168,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"
@@ -40574,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;
@@ -40970,6 +41077,42 @@ function useVehicleController() {
       return;
     }
   }
+  async function activeCameraCounts(req, res, next) {
+    const { error, value } = import_joi58.default.object({
+      site: import_joi58.default.string().hex().length(24).required()
+    }).validate({ site: req.params.site });
+    if (error) {
+      next(new import_node_server_utils123.BadRequestError(error.message));
+      return;
+    }
+    try {
+      await requireSiteReach(req, value.site, VEHICLE_LIST);
+      res.json(await _activeCameraCounts(value.site));
+      return;
+    } catch (error2) {
+      import_node_server_utils123.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function syncVehicleToCameras(req, res, next) {
+    const { error, value } = import_joi58.default.object({
+      _id: import_joi58.default.string().hex().length(24).required()
+    }).validate({ _id: req.params.id });
+    if (error) {
+      next(new import_node_server_utils123.BadRequestError(error.message));
+      return;
+    }
+    try {
+      await requireVehicleReach(req, value._id, VEHICLE_UPDATE);
+      res.json(await _syncVehicleToCameras(value._id, actingUser(req)));
+      return;
+    } catch (error2) {
+      import_node_server_utils123.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     addBulk,
@@ -40988,7 +41131,9 @@ function useVehicleController() {
     blocklistVehicles,
     removeFromBlocklist,
     existingPlates,
-    moveVehicle
+    moveVehicle,
+    activeCameraCounts,
+    syncVehicleToCameras
   };
 }