@7365admin1/core 3.52.2-staging.235 → 3.52.2-staging.236

package/.changeset/vehicle-anpr-revoke-safety.md

@@ -0,0 +1,11 @@
+---
+"@7365admin1/core": patch
+---
+
+Vehicle management: make deleting and editing a vehicle safe against the ANPR cameras.
+
+Deleting a vehicle no longer reports success when the plate is still on a camera. `bypass` now defaults to false, `removePlateNumber` returns an explicit per-camera outcome instead of swallowing its error, and a delete that cannot be confirmed on every camera holding the plate is refused with the record left intact so it can be retried. A site with no ANPR camera has nothing to revoke and now deletes successfully instead of failing with "No site cameras found."
+
+Each camera is asked for its own record id before the removal, because a Dahua `recNo` is a per-device sequence number and the one stored on the vehicle only matches whichever camera was written last. Editing only the vehicle's name now removes the old whitelist record before inserting the new one, instead of leaving the previous entry on the camera for good.
+
+Also: `pullVehicleByRecNo` is scoped to the person or site the plate belongs to (it matched on the record id alone, which is not unique across devices), the paginated camera lookups no longer skip their last page, and editing or deleting a vehicle now requires `vehicle-mgmt:update-vehicle` / `vehicle-mgmt:delete-vehicle` on the server, matching the gate the apps already apply in the browser.

package/dist/index.d.ts

@@ -2505,6 +2505,31 @@ declare function useBuildingUnitController(): {
     getAllLevelsWithUnits: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
+/**
+ * "Was this plate actually taken off the camera?" — the one place that answers
+ * it, for the three paths that revoke an ANPR whitelist/blocklist record:
+ * deleting a vehicle, and the two branches of editing one.
+ *
+ * The reason this file exists: `removePlateNumber` used to `catch`, log, and
+ * return `undefined`, so a device that refused, timed out or was unreachable
+ * came back looking exactly like one that had removed the record. The delete
+ * path then reported "Vehicle deleted successfully." while the plate was still
+ * on the barrier — the vehicle could keep driving in after the record was gone
+ * from the system, and there was nothing on screen to say so.
+ *
+ * Nothing here talks to a device or to the database, so it is testable on its
+ * own — see `test/anpr-revoke.test.mjs`.
+ */
+/** One camera's answer to "remove this record". */
+type AnprRevokeOutcome = {
+    /** True ONLY when the device confirmed the removal, or held nothing to remove. */
+    ok: boolean;
+    /** HTTP status the device answered with, when it answered at all. */
+    statusCode?: number;
+    /** Why it failed, in words an operator can act on. Empty when `ok`. */
+    reason: string;
+};
+
 declare enum CameraType {
     IP = "ip",
     ANPR = "anpr"
@@ -2573,7 +2598,7 @@ declare function useDahuaService(): {
         password: string;
         mode: string;
         recno: string;
-    }) => Promise<urllib.HttpClientResponse<any> | undefined>;
+    }) => Promise<AnprRevokeOutcome>;
     updatePlateNumber: (value: {
         host: string;
         username: string;
@@ -2592,6 +2617,18 @@ declare function useDahuaService(): {
         password: string;
         mode: string;
         plateNumber: string;
+        /**
+         * Treat a device that did not answer 200 as an error rather than as "the
+         * plate is not on this camera".
+         *
+         * `useDahuaDigest` does not throw on a bad status, so a 401 or a 500 comes
+         * back as an empty body, which `parseDahuaFind` reads as `found=0`. For the
+         * visitor check-in callers that has always meant "not blocklisted" and is
+         * left exactly as it is — a camera fault must not stop a visitor at the
+         * gate. For the vehicle revoke paths it would mean "nothing to remove", and
+         * they must not conclude that from a camera that never answered.
+         */
+        requireOk?: boolean;
     }) => Promise<any>;
     bulkInsertPlateNumber: (value: {
         host: string;
@@ -4109,7 +4146,7 @@ declare function useCameraViewService(): {
         userId?: string;
     }) => Promise<{
         reason: string;
-        verified: "recorder-video-port" | "nothing";
+        verified: "nothing" | "recorder-video-port";
         verifiedDescription: string;
         cameraVerified: null;
         relayVerified: null;
@@ -4123,7 +4160,7 @@ declare function useCameraViewService(): {
         driftSeconds: null;
         detailUnavailableReason: string | null;
     } | {
-        verified: "recorder-video-port" | "nothing";
+        verified: "nothing" | "recorder-video-port";
         verifiedDescription: string;
         cameraVerified: null;
         relayVerified: null;
@@ -4166,7 +4203,7 @@ declare function useCameraViewService(): {
     }) => Promise<{
         cameras: ({
             reason: string;
-            verified: "recorder-video-port" | "nothing";
+            verified: "nothing" | "recorder-video-port";
             verifiedDescription: string;
             cameraVerified: null;
             relayVerified: null;
@@ -4180,7 +4217,7 @@ declare function useCameraViewService(): {
             lastFrameAt: string | null;
             unavailableReason: string | null;
         } | {
-            verified: "recorder-video-port" | "nothing";
+            verified: "nothing" | "recorder-video-port";
             verifiedDescription: string;
             cameraVerified: null;
             relayVerified: null;
@@ -5011,7 +5048,10 @@ declare function usePersonRepo(): {
         plateNumber: string;
         recNo: string;
     }, session?: ClientSession) => Promise<void>;
-    pullVehicleByRecNo: (recNo: string, session?: ClientSession) => Promise<void>;
+    pullVehicleByRecNo: (recNo: string, scope: {
+        peopleId?: string | ObjectId;
+        site?: string | ObjectId;
+    }, session?: ClientSession) => Promise<void>;
     getByUserId: (userId: string | ObjectId) => Promise<TPerson | null>;
     reviewResidentPerson: (_id: ObjectId | string, value: Partial<TPerson>, session?: ClientSession) => Promise<mongodb.UpdateResult<TPerson>>;
     addFromVisitor: (value: visitorPersonRepo, session?: ClientSession) => Promise<mongodb.InsertOneResult<TPerson>>;

package/dist/index.js

@@ -18186,11 +18186,23 @@ function usePersonRepo() {
       throw new import_node_server_utils41.InternalServerError("Failed to push vehicle plates by nric.");
     }
   }
-  async function pullVehicleByRecNo(recNo, session) {
+  async function pullVehicleByRecNo(recNo, scope, session) {
     const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const owner = scope?.peopleId ? (0, import_node_server_utils41.toObjectId)(scope.peopleId) : null;
+    const site = scope?.site ? (0, import_node_server_utils41.toObjectId)(scope.site) : null;
+    if (!owner && !site) {
+      throw new import_node_server_utils41.BadRequestError(
+        "Cannot remove a vehicle plate without a person or a site."
+      );
+    }
+    const filter = { "plates.recNo": recNo };
+    if (owner)
+      filter._id = owner;
+    else
+      filter.site = site;
     try {
       await collection.updateOne(
-        { "plates.recNo": recNo },
+        filter,
         {
           $pull: {
             plates: {
@@ -22296,6 +22308,25 @@ function buildPlateRemoveEndpoint(value) {
   return `/cgi-bin/recordUpdater.cgi?action=remove&recno=${enc(value.recno)}&name=${enc(value.mode)}`;
 }
 
+// src/utils/anpr-revoke.util.ts
+function anprRevokeOutcome(response) {
+  const statusCode = response?.statusCode ?? response?.status ?? response?.res?.status;
+  if (statusCode === 200)
+    return { ok: true, statusCode, reason: "" };
+  if (statusCode === void 0) {
+    return { ok: false, reason: "the camera did not answer" };
+  }
+  return { ok: false, statusCode, reason: `the camera answered ${statusCode}` };
+}
+function anprRevokeThrew(error) {
+  const message = error?.message ?? String(error ?? "");
+  return { ok: false, reason: message || "the camera could not be reached" };
+}
+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.`;
+}
+
 // src/services/dahua.service.ts
 function notifyCameraFault(camera, message) {
   NotificationService.cameraFault({
@@ -23187,9 +23218,10 @@ function useDahuaService() {
           mode: value.mode
         })
       });
-      return response;
+      return anprRevokeOutcome(response);
     } catch (error2) {
       loggerDahua.error(`[${value.host}] Error removing plate number:`, error2);
+      return anprRevokeThrew(error2);
     }
   }
   async function getPlateNumber(value) {
@@ -23198,7 +23230,8 @@ function useDahuaService() {
       username: import_joi24.default.string().required(),
       password: import_joi24.default.string().required(),
       plateNumber: import_joi24.default.string().required(),
-      mode: import_joi24.default.string().valid(...Object.values(ANPRMode)).required()
+      mode: import_joi24.default.string().valid(...Object.values(ANPRMode)).required(),
+      requireOk: import_joi24.default.boolean().optional()
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -23211,6 +23244,12 @@ function useDahuaService() {
         password: value.password,
         endpoint: `/cgi-bin/recordFinder.cgi?action=find&name=${value.mode}&condition.PlateNumber=${encodeURIComponent(value.plateNumber)}`
       });
+      if (value.requireOk) {
+        const statusCode = getDahuaStatusCode(response);
+        if (statusCode !== 200) {
+          throw new Error(`the camera answered ${statusCode ?? "nothing"}`);
+        }
+      }
       const text2 = response?.data?.toString?.("utf-8");
       return text2;
     } catch (error2) {
@@ -35215,31 +35254,72 @@ function useVehicleService() {
         pages = siteCameraReq.pages || 1;
         siteCameras.push(...siteCameraReq.items);
         page++;
-      } while (page < pages);
-      if (!siteCameras.length) {
-        throw new import_node_server_utils99.BadRequestError("No site cameras found.");
-      }
+      } while (page <= pages);
+      import_node_server_utils99.logger.info(
+        `deleteVehicle resolved ${siteCameras.length} ANPR camera(s) for site ${site}`
+      );
+      const vehicle = await findOne({ _id: new import_mongodb67.ObjectId(_id) });
+      const plateNumber = String(vehicle?.plateNumber ?? "");
+      const failures = [];
       for (const camera of siteCameras) {
         const host = camera.host;
         const username = camera.username;
         const password = camera.password;
-        const dahuaPayload = {
+        const label = String(
+          camera?.name || camera?._id || "ANPR camera"
+        );
+        let recnoForCamera = recno;
+        if (plateNumber) {
+          try {
+            const found = parseDahuaFind(
+              await _getPlateNumber({
+                host,
+                username,
+                password,
+                mode: _mode,
+                plateNumber,
+                requireOk: true
+              }) ?? ""
+            );
+            if (!found.exists)
+              continue;
+            if (found.recNo)
+              recnoForCamera = found.recNo;
+          } catch (error) {
+            failures.push({
+              camera: label,
+              reason: anprRevokeThrew(error).reason
+            });
+            continue;
+          }
+        }
+        const outcome = await _removePlateNumber({
           host,
           username,
           password,
-          recno,
+          recno: recnoForCamera,
           mode: _mode
-        };
-        const dahuaResponse = await _removePlateNumber(dahuaPayload);
-        if (!bypass && dahuaResponse?.statusCode !== 200) {
-          throw new import_node_server_utils99.BadRequestError(
-            `Failed to remove plate number to ANPR from ${type}`
-          );
+        });
+        if (!outcome?.ok) {
+          failures.push({
+            camera: label,
+            reason: outcome?.reason || "the camera did not answer"
+          });
         }
       }
+      if (failures.length) {
+        const message = anprRevokeFailureMessage(failures);
+        if (!bypass)
+          throw new import_node_server_utils99.BadRequestError(message);
+        import_node_server_utils99.logger.warn(`deleteVehicle bypassed a failed ANPR revoke: ${message}`);
+      }
       await Promise.all([
         _deleteVehicle(_id, session),
-        _pullVehicleByRecNo(recno, session)
+        _pullVehicleByRecNo(
+          recno,
+          { peopleId: vehicle?.peopleId, site },
+          session
+        )
       ]);
       await session.commitTransaction();
       return `Vehicle plate number deleted from ${type} record successfully.`;
@@ -35303,7 +35383,7 @@ function useVehicleService() {
         pages = siteCameraReq.pages || 1;
         siteCameras.push(...siteCameraReq.items);
         page++;
-      } while (page < pages);
+      } while (page <= pages);
       if (!siteCameras.length) {
         throw new import_node_server_utils99.BadRequestError("No site cameras found.");
       }
@@ -35382,7 +35462,7 @@ function useVehicleService() {
           pages = siteCameraReq.pages || 1;
           siteCameras.push(...siteCameraReq.items);
           page++;
-        } while (page < pages);
+        } while (page <= pages);
         if (!siteCameras.length) {
           throw new import_node_server_utils99.BadRequestError("No site cameras found.");
         }
@@ -35460,7 +35540,7 @@ function useVehicleService() {
         pages = siteCameraReq.pages || 1;
         siteCameras.push(...siteCameraReq.items);
         page++;
-      } while (page < pages);
+      } while (page <= pages);
       if (!siteCameras.length) {
         throw new import_node_server_utils99.BadRequestError("No site cameras found.");
       }
@@ -35549,7 +35629,7 @@ function useVehicleService() {
             pages = siteCameraReq.pages || 1;
             siteCameras.push(...siteCameraReq.items);
             page++;
-          } while (page < pages);
+          } while (page <= pages);
           if (!siteCameras.length) {
             throw new import_node_server_utils99.BadRequestError("No site cameras found.");
           }
@@ -35604,6 +35684,37 @@ function useVehicleService() {
               }
             } else {
               console.log("updateVehicleById _plateNumber == plateNumber", _plateNumber, plateNumber);
+              const existing = parseDahuaFind(
+                await _getPlateNumber({
+                  host,
+                  username,
+                  password,
+                  mode: _type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+                  plateNumber,
+                  requireOk: true
+                }) ?? ""
+              );
+              if (existing.exists) {
+                const outcome = await _removePlateNumber({
+                  host,
+                  username,
+                  password,
+                  mode: _type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+                  recno: existing.recNo || _recNo
+                });
+                if (!outcome?.ok) {
+                  throw new import_node_server_utils99.BadRequestError(
+                    anprRevokeFailureMessage([
+                      {
+                        camera: String(
+                          camera?.name || camera?._id || "ANPR camera"
+                        ),
+                        reason: outcome?.reason || "the camera did not answer"
+                      }
+                    ], "updated")
+                  );
+                }
+              }
               const dahuaPayload = {
                 host,
                 username,
@@ -35785,7 +35896,7 @@ function useVehicleService() {
           pages = siteCameraReq.pages || 1;
           siteCameras.push(...siteCameraReq.items);
           page++;
-        } while (page < pages);
+        } while (page <= pages);
         if (!siteCameras.length) {
           throw new import_node_server_utils99.BadRequestError("No site cameras found.");
         }
@@ -35877,7 +35988,7 @@ function useVehicleService() {
           pages = siteCameraReq.pages || 1;
           siteCameras.push(...siteCameraReq.items);
           page++;
-        } while (page < pages);
+        } while (page <= pages);
         if (!siteCameras.length) {
           throw new import_node_server_utils99.BadRequestError("No site cameras found.");
         }
@@ -39223,10 +39334,18 @@ function useVehicleController() {
     getBlocklistedVehicles: _getBlocklistedVehicles,
     getVehicleSite: _getVehicleSite
   } = useVehicleRepo();
-  async function requireVehicleReach(req, _id) {
+  async function requireVehicleReach(req, _id, permission) {
     const vehicle = await _getVehicleSite(_id);
-    await requireSiteReach(req, vehicle?.site);
+    await requireSiteReach(req, vehicle?.site, permission);
   }
+  const VEHICLE_UPDATE = {
+    permissions: ["vehicle-mgmt:update-vehicle"],
+    message: "You do not have permission to edit vehicles."
+  };
+  const VEHICLE_DELETE = {
+    permissions: ["vehicle-mgmt:delete-vehicle"],
+    message: "You do not have permission to delete vehicles."
+  };
   function normalizeRow(row) {
     return Object.fromEntries(
       Object.entries(row).map(([key, value]) => [
@@ -39595,7 +39714,7 @@ function useVehicleController() {
         return;
       }
       const { _id, ...rest } = value;
-      await requireVehicleReach(req, _id);
+      await requireVehicleReach(req, _id, VEHICLE_UPDATE);
       await _updateVehicleById(_id, rest);
       res.json({ message: "Successfully updated vehicle." });
       return;
@@ -39617,7 +39736,11 @@ function useVehicleController() {
       recno: import_joi55.default.string().required(),
       site: import_joi55.default.string().hex().length(24).required(),
       type: import_joi55.default.string().valid(...Object.values(VehicleType)).required(),
-      bypass: import_joi55.default.boolean().optional().default(true)
+      // Fail closed. Defaulted to TRUE, and neither the web app nor the MA
+      // app sends the field, so EVERY delete skipped the camera-revoke guard
+      // and reported success whatever the cameras answered. Bypassing is only
+      // ever honoured now when a caller asks for it explicitly.
+      bypass: import_joi55.default.boolean().optional().default(false)
     });
     const { error, value } = deleteVehicleSchema.validate({
       _id: req.params.id,
@@ -39631,7 +39754,7 @@ function useVehicleController() {
     }
     const { recno, site, type, bypass, _id } = value;
     try {
-      await requireVehicleReach(req, _id);
+      await requireVehicleReach(req, _id, VEHICLE_DELETE);
       const data = await _deleteVehicle(_id, recno, site, type, bypass);
       res.json({
         message: "Vehicle deleted successfully.",
@@ -39946,7 +40069,7 @@ function useSiteCameraService() {
       pages = siteCameraReq.pages || 1;
       siteCameras.push(...siteCameraReq.items);
       page++;
-    } while (page < pages);
+    } while (page <= pages);
     if (!siteCameras.length) {
       throw new import_node_server_utils114.BadRequestError("No ANPR cameras found.");
     }