@7365admin1/core 3.52.5-staging.249 → 3.52.5-staging.250

package/.changeset/visitor-dahua-cron-fail-closed.md

@@ -0,0 +1,27 @@
+---
+"@7365admin1/core": patch
+---
+
+Fail closed in the visitor ANPR sweep, and remove the dead invitation transaction
+
+`processTransactionDahuaStatus`, the hourly job that takes an expired or
+checked-out visitor's plate off the site's ANPR camera, marked the transaction
+`dahuaSyncStatus: "removed"` on the line after the camera call and only skipped
+on a thrown error. `removePlateNumber` does not throw for a device failure - it
+returns an outcome object - so a camera answering 401 or 500, or not answering
+at all, still had the transaction recorded as removed while the visitor's plate
+was still on the barrier. Nothing retried it either, because the query that
+feeds the sweep skips anything already marked removed.
+
+It now uses the same decision logic as the expired-vehicle sweep: only a
+transaction every camera confirmed is marked removed, and the rest are logged at
+error level naming the plate, the site and the camera, then retried on the next
+run. Each camera is also asked for its own record id before the removal, which
+is what the old "not found" message sniff was reaching for and what stops a
+transaction whose record is already gone from being retried for ever.
+
+`checkExpiredInvitation` opened a session and a transaction and then issued
+every write without that session, never committing: the transaction protected no
+write and the rollback rolled back nothing. Each invitation is independent, so
+there is no invariant spanning them and nothing for a transaction to protect -
+it is removed rather than wired up.

package/dist/index.js

@@ -16202,27 +16202,21 @@ function useVerificationService() {
     }
   }
   async function checkExpiredInvitation() {
-    const session = import_node_server_utils34.useAtlas.getClient()?.startSession();
-    session?.startTransaction();
     try {
       const verifications = await _getByStatus("pending");
+      const now = Date.now();
       for (const verification of verifications) {
-        const expiration = new Date(verification.expireAt).getTime();
-        const now = (/* @__PURE__ */ new Date()).getTime();
-        if (now > expiration) {
+        if (now > new Date(verification.expireAt).getTime()) {
           await _updateStatusById(verification._id.toString(), "expired");
         }
       }
       return "Successfully checked for expired invitations.";
     } catch (error) {
-      await session?.abortTransaction();
       import_node_server_utils34.logger.log({
         level: "info",
         message: `Error checking expired user invitation: ${error}`
       });
       throw error;
-    } finally {
-      session?.endSession();
     }
   }
   return {
@@ -23348,7 +23342,7 @@ function useDahuaService() {
     }
     try {
       value.owner = String(value.owner ?? "").replace(/['"]/g, "").replace(/[\/\\]/g, " - ").substring(0, 15).trim() || "unknown";
-      const formatDahuaDate2 = (dateStr, fallbackYearsAhead = 0) => {
+      const formatDahuaDate3 = (dateStr, fallbackYearsAhead = 0) => {
         const date = dateStr ? new Date(dateStr) : /* @__PURE__ */ new Date();
         if (!dateStr) {
           date.setMinutes(date.getMinutes() - 10);
@@ -23359,8 +23353,8 @@ function useDahuaService() {
         const pad = (num) => String(num).padStart(2, "0");
         return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
       };
-      const formattedStart = formatDahuaDate2(value.start);
-      const formattedEnd = formatDahuaDate2(value.end, 10);
+      const formattedStart = formatDahuaDate3(value.start);
+      const formattedEnd = formatDahuaDate3(value.end, 10);
       const beginTime = encodeURIComponent(formattedStart);
       const cancelTime = encodeURIComponent(formattedEnd);
       const plateNumber = encodeURIComponent(value.plateNumber);
@@ -52014,42 +52008,55 @@ function useVisitorTransactionService() {
           );
           if (!transactions.length)
             continue;
-          const successfulIds = [];
-          const batchSize = 5;
-          for (let i = 0; i < transactions.length; i += batchSize) {
-            const batch = transactions.slice(i, i + batchSize);
-            await Promise.all(
-              batch.map(async (transaction) => {
-                try {
-                  const dahuaPayload = {
-                    host: camera.host,
-                    username: camera.username,
-                    password: camera.password,
-                    mode: "TrafficRedList" /* TRAFFIC_REDLIST */,
-                    recno: transaction.recNo
-                  };
-                  await _removePlateNumber(dahuaPayload);
-                  successfulIds.push(transaction._id);
-                } catch (error) {
-                  const message = String(error?.message || "").toLowerCase();
-                  const isNotFound = message.includes("not found") || message.includes("does not exist") || message.includes("no record");
-                  if (isNotFound) {
-                    import_node_server_utils134.logger.warn(
-                      `Dahua record already missing for transaction ${transaction._id}, marking as removed.`
+          const { deletableIds, skipped } = await sweepExpiredVehicles(
+            transactions,
+            {
+              camerasForSite: async () => [camera],
+              revoke: async (anprCamera, transaction) => {
+                const credentials = {
+                  host: anprCamera.host,
+                  username: anprCamera.username,
+                  password: anprCamera.password,
+                  mode: "TrafficRedList" /* TRAFFIC_REDLIST */
+                };
+                let recno = String(transaction?.recNo ?? "");
+                const plateNumber = String(transaction?.plateNumber ?? "");
+                if (plateNumber) {
+                  try {
+                    const found = parseDahuaFind(
+                      await _getPlateNumber({
+                        ...credentials,
+                        plateNumber,
+                        requireOk: true
+                      }) ?? ""
                     );
-                    successfulIds.push(transaction._id);
-                    return;
+                    if (!found.exists)
+                      return ANPR_NOTHING_TO_REVOKE;
+                    if (found.recNo)
+                      recno = found.recNo;
+                  } catch (error) {
+                    return anprRevokeThrew(error);
                   }
-                  import_node_server_utils134.logger.error(
-                    `Failed to remove plate for transaction ${transaction._id}`,
-                    error
-                  );
                 }
-              })
+                if (!recno)
+                  return ANPR_NOTHING_TO_REVOKE;
+                return await _removePlateNumber({
+                  ...credentials,
+                  recno
+                }).catch((error) => anprRevokeThrew(error));
+              },
+              cameraLabel
+            }
+          );
+          for (const entry of skipped) {
+            import_node_server_utils134.logger.error(
+              `processTransactionDahuaStatus NOT marking transaction ${entry.id} removed (plate ${JSON.stringify(
+                entry.plateNumber
+              )}, site ${entry.site}): ` + entry.failures.map((failure) => `${failure.camera} (${failure.reason})`).join(", ") + `. The plate may still open the barrier, so the record is left unsynced and will be retried on the next run.`
             );
           }
-          if (successfulIds.length > 0) {
-            await _updateManyDahuaSyncStatus(successfulIds, "removed");
+          if (deletableIds.length > 0) {
+            await _updateManyDahuaSyncStatus(deletableIds, "removed");
           }
         }
         page++;