@7365admin1/core 3.52.5 → 3.52.6

package/dist/index.mjs

@@ -20723,7 +20723,6 @@ function MVehicle(value) {
   const expiredDate = new Date(createdAtDate);
   expiredDate.setFullYear(expiredDate.getFullYear() + 10);
   const createdAt = createdAtDate;
-  const expiredAt = value.end ?? expiredDate;
   return {
     plateNumber: value.plateNumber ?? "",
     type: value.type ?? "",
@@ -20740,7 +20739,12 @@ function MVehicle(value) {
     remarks: value.remarks ?? "",
     seasonPassType: value.seasonPassType ?? "",
     start: value.start ? new Date(value.start) : createdAt,
-    end: value.end ? new Date(value.end) : expiredAt,
+    // A blank expiry means "no expiry": it takes the createdAt + 10 years
+    // sentinel, the same as a null or absent one. This read `value.end ??
+    // expiredDate`, and `??` only falls through on null/undefined, so an empty
+    // string was stored verbatim as `end: ""` - a String in a Date field. That
+    // is what the expiry sweep then matched instead of the real expiries.
+    end: value.end ? new Date(value.end) : expiredDate,
     status: value.status ?? "active" /* ACTIVE */,
     unitName: value.unitName ?? "",
     peopleId: value.peopleId ?? "",
@@ -20792,6 +20796,12 @@ function MVehicleTransaction(value) {
     category: value.category ?? ""
   };
 }
+function expiredVehicleSweepFilter(now = /* @__PURE__ */ new Date()) {
+  return {
+    end: { $type: "date", $lte: now },
+    status: { $ne: "deleted" /* DELETED */ }
+  };
+}
 
 // src/repositories/vehicle.repo.ts
 import { ObjectId as ObjectId42 } from "mongodb";
@@ -21504,18 +21514,22 @@ function useVehicleRepo() {
   }
   async function deleteExpiredVehicles(ids2, session) {
     try {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const now = /* @__PURE__ */ new Date();
       const _ids = (ids2 ?? []).map((id) => toObjectId7(id)).filter((id) => Boolean(id));
       if (!_ids.length)
         return 0;
       const res = await collection.updateMany(
         {
           _id: { $in: _ids },
-          status: { $ne: "deleted" },
-          end: { $exists: true, $lte: now }
-          // check only end
+          ...expiredVehicleSweepFilter(now)
+        },
+        {
+          $set: {
+            status: "deleted",
+            deletedAt: now.toISOString(),
+            isDeletedInDahua: true
+          }
         },
-        { $set: { status: "deleted", deletedAt: now, isDeletedInDahua: true } },
         { session }
       );
       return res.modifiedCount;
@@ -21556,12 +21570,7 @@ function useVehicleRepo() {
   }
   async function getAllExpiredVehicles() {
     try {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      const query2 = {
-        end: { $lte: now },
-        status: { $ne: "deleted" }
-      };
-      const items = await collection.find(query2).toArray();
+      const items = await collection.find(expiredVehicleSweepFilter()).toArray();
       return items;
     } catch (error) {
       throw error;
@@ -35969,34 +35978,99 @@ function useVehicleService() {
       if (!siteCameras.length) {
         throw new Error("No site cameras found.");
       }
-      await Promise.all(
-        sanitizedValues.map(async (vehicleValue) => {
-          const plateNumber = vehicleValue.plateNumber;
-          const _mode = vehicleValue.type === "whitelist" /* WHITELIST */ ? "TrafficRedList" /* TRAFFIC_REDLIST */ : "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
-          const recNos = await Promise.all(
-            siteCameras.map(async (camera) => {
-              const { host, username, password } = camera;
-              const dahuaPayload = {
-                host,
-                username,
-                password,
-                plateNumber,
-                mode: _mode,
-                ...vehicleValue.start ? { start: String(vehicleValue.start) } : {},
-                ...vehicleValue.end ? { end: String(vehicleValue.end) } : {},
-                ...vehicleValue.name ? { owner: vehicleValue.name } : {},
-                ...vehicleValue.vehicleModel ? { vehicleType: vehicleValue.vehicleModel } : {},
-                ...vehicleValue.vehicleColor ? { vehicleColor: vehicleValue.vehicleColor } : {}
-              };
+      const written = /* @__PURE__ */ new Map();
+      const sweepRows = sanitizedValues.map((value, index) => ({
+        _id: String(index),
+        site,
+        plateNumber: value.plateNumber
+      }));
+      const { deletableIds: savableIds, skipped } = await sweepExpiredVehicles(
+        sweepRows,
+        {
+          camerasForSite: async () => siteCameras,
+          cameraLabel,
+          revoke: async (camera, row) => {
+            const rowId = String(row._id);
+            const vehicleValue = sanitizedValues[Number(rowId)];
+            const plateNumber = vehicleValue.plateNumber;
+            const { host, username, password } = camera;
+            const dahuaPayload = {
+              host,
+              username,
+              password,
+              plateNumber,
+              mode: vehicleValue.type === "whitelist" /* WHITELIST */ ? "TrafficRedList" /* TRAFFIC_REDLIST */ : "TrafficBlackList" /* TRAFFIC_BLACKLIST */,
+              ...vehicleValue.start ? { start: String(vehicleValue.start) } : {},
+              ...vehicleValue.end ? { end: String(vehicleValue.end) } : {},
+              ...vehicleValue.name ? { owner: vehicleValue.name } : {},
+              ...vehicleValue.vehicleModel ? { vehicleType: vehicleValue.vehicleModel } : {},
+              ...vehicleValue.vehicleColor ? { vehicleColor: vehicleValue.vehicleColor } : {}
+            };
+            try {
               const dahuaResponse = await _bulkInsertPlateNumber(dahuaPayload);
+              const responseStatus = dahuaResponse?.statusCode || dahuaResponse?.status || dahuaResponse?.res?.status || "unknown";
               const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
-              return responseData.split("=")[1]?.trim();
-            })
+              if (responseStatus !== 200) {
+                logCameraFailure(
+                  "bulk add",
+                  camera,
+                  `HTTP ${responseStatus}: ${responseData.slice(0, 500)}`
+                );
+                return {
+                  ok: false,
+                  reason: anprWriteReason(`HTTP ${responseStatus}`)
+                };
+              }
+              const recNo = String(responseData.split("=")[1]?.trim() ?? "");
+              if (recNo) {
+                vehicleValue.recNo = vehicleValue.recNo || recNo;
+                const entries = written.get(rowId) ?? [];
+                entries.push({ camera, recno: recNo });
+                written.set(rowId, entries);
+              }
+              return { ok: true, reason: "" };
+            } catch (error) {
+              logCameraFailure("bulk add", camera, error);
+              return { ok: false, reason: anprWriteReason(error) };
+            }
+          }
+        }
+      );
+      const failedRows = [];
+      for (const entry of skipped) {
+        const stranded = [];
+        for (const write of written.get(entry.id) ?? []) {
+          const outcome = await _removePlateNumber({
+            host: write.camera.host,
+            username: write.camera.username,
+            password: write.camera.password,
+            recno: write.recno,
+            mode: sanitizedValues[Number(entry.id)]?.type === "whitelist" /* WHITELIST */ ? "TrafficRedList" /* TRAFFIC_REDLIST */ : "TrafficBlackList" /* TRAFFIC_BLACKLIST */
+          }).catch((removeError) => anprRevokeThrew(removeError));
+          if (!outcome?.ok)
+            stranded.push(cameraLabel(write.camera));
+        }
+        let message = anprWriteFailureMessage(entry.failures);
+        if (stranded.length) {
+          logger63.error(
+            `bulkUpsertVehicles could not take the plate back off: ${stranded.join(", ")} (plate ${JSON.stringify(entry.plateNumber)})`
           );
-          vehicleValue.recNo = recNos.find((r) => r) ?? void 0;
-        })
+          message += ` WARNING: the plate number was written to ${stranded.join(", ")} and could not be removed again - it WILL still open the barrier. Remove it on the camera by hand.`;
+        }
+        logger63.error(
+          `bulkUpsertVehicles NOT saving plate ${JSON.stringify(entry.plateNumber)} (site ${entry.site}): ` + entry.failures.map((failure) => `${failure.camera} (${failure.reason})`).join(", ")
+        );
+        failedRows.push({
+          plateNumber: String(entry.plateNumber ?? ""),
+          message
+        });
+      }
+      const savable = new Set(savableIds);
+      const toSave = sanitizedValues.filter(
+        (_, index) => savable.has(String(index))
       );
-      return await _bulkUpsertVehicles(sanitizedValues);
+      const result = toSave.length ? await _bulkUpsertVehicles(toSave) : { matchedCount: 0, modifiedCount: 0, upsertedCount: 0 };
+      return { ...result, savedCount: toSave.length, failedRows };
     } catch (error) {
       throw error;
     }
@@ -91591,6 +91665,7 @@ export {
   encodeHidPacsCard,
   events_namespace_collection,
   expiredBulletinSweepFilter,
+  expiredVehicleSweepFilter,
   facility_bookings_namespace_collection,
   feedbackSchema,
   feedbacks2_namespace_collection,