@7365admin1/core 3.20.0 → 3.21.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.21.0
+
+### Minor Changes
+
+- bd9d8d9: release changes in vehicles api
+
 ## 3.20.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2152,7 +2152,7 @@ declare function useDahuaService(): {
         end?: string;
         owner?: string;
         isOpenGate?: boolean;
-    }) => Promise<urllib.HttpClientResponse<any>>;
+    }) => Promise<any>;
     removePlateNumber: (value: {
         host: string;
         username: string;

package/dist/index.js

@@ -24136,7 +24136,14 @@ function useDahuaService() {
     }
     loggerDahua.info(`[${camera?.siteName}-${camera?.direction}] ANPR Listener stopped.`);
   }
+  function extractRecNo(responseText) {
+    if (!responseText)
+      return null;
+    const match = responseText.match(/recno=(\d+)/i);
+    return match ? match[1] : null;
+  }
   async function addPlateNumber(value) {
+    let recno = null;
     const validation = import_joi40.default.object({
       host: import_joi40.default.string().required(),
       username: import_joi40.default.string().required(),
@@ -24148,25 +24155,113 @@ function useDahuaService() {
       owner: import_joi40.default.string().optional().allow("", null),
       isOpenGate: import_joi40.default.boolean().optional().allow(null)
     });
-    const { error } = validation.validate(value);
-    if (error) {
-      throw new import_node_server_utils72.BadRequestError(`Validation error: ${error.message}`);
+    const { error: validationError } = validation.validate(value);
+    if (validationError) {
+      throw new import_node_server_utils72.BadRequestError(`Validation error: ${validationError.message}`);
     }
-    value.owner = String(value.owner ?? "").substring(0, 15) || "unknown";
-    const _openGate = String(value.isOpenGate);
-    const isOpenGateString = _openGate && _openGate !== "undefined" ? _openGate : "true";
-    const endpoint = `/cgi-bin/recordUpdater.cgi?action=insert&name=${value.mode}&PlateNumber=${value.plateNumber}&BeginTime=${value.start}&CancelTime=${value.end}&+OpenGate=${isOpenGateString}&MasterOfCar=${value.owner}`;
     try {
-      const response = await useDahuaDigest({
-        host: value.host,
-        username: value.username,
-        password: value.password,
-        endpoint
-      });
-      return response;
-    } catch (error2) {
-      loggerDahua.error(`[${value.host}] Error adding plate number:`, error2);
-      throw new import_node_server_utils72.BadRequestError(`Failed to add plate number: ${error2.message}`);
+      value.owner = String(value.owner ?? "").substring(0, 15) || "unknown";
+      const formatDahuaDate2 = (dateStr, fallbackYearsAhead = 0) => {
+        const date = dateStr ? new Date(dateStr) : /* @__PURE__ */ new Date();
+        if (!dateStr) {
+          date.setMinutes(date.getMinutes() - 10);
+        }
+        if (fallbackYearsAhead > 0 && !dateStr) {
+          date.setFullYear(date.getFullYear() + fallbackYearsAhead);
+        }
+        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 beginTime = encodeURIComponent(formattedStart);
+      const cancelTime = encodeURIComponent(formattedEnd);
+      const plateNumber = encodeURIComponent(value.plateNumber);
+      const ownerName = encodeURIComponent(value.owner);
+      const endpoint = `/cgi-bin/recordUpdater.cgi?action=insert&name=${value.mode}&PlateNumber=${plateNumber}&BeginTime=${beginTime}&CancelTime=${cancelTime}&MasterOfCar=${ownerName}`;
+      try {
+        const insertResponse = await useDahuaDigestWithRetry({
+          host: value.host,
+          username: value.username,
+          password: value.password,
+          endpoint,
+          retries: 10,
+          retryDelayMs: 0
+        });
+        const insertText = getDahuaResponseText(insertResponse);
+        const insertedId = insertText.match(/\d+/)?.[0] || "unknown";
+        return {
+          ...insertResponse,
+          statusCode: 200,
+          data: Buffer.from(`recno=${insertedId}`)
+        };
+      } catch (insertError) {
+        const errorMessage = insertError?.message || String(insertError);
+        if (/recno=/i.test(errorMessage)) {
+          loggerDahua.info(`[${value.host}] Insert confirmed successfully via raw RecNo response text.`);
+          const insertedId = errorMessage.match(/\d+/)?.[0] || "unknown";
+          return {
+            statusCode: 200,
+            data: Buffer.from(`recno=${insertedId}`)
+          };
+        }
+        if (errorMessage.includes("Bad Request") || errorMessage.includes("Dahua response: Error")) {
+          loggerDahua.info(`[${value.host}] Insert failed (duplicate). Checking if plate ${value.plateNumber} already exists...`);
+          const findEndpoint = `/cgi-bin/recordFinder.cgi?action=find&name=${value.mode}&condition.PlateNumber=${plateNumber}`;
+          try {
+            const findResponse = await useDahuaDigestWithRetry({
+              host: value.host,
+              username: value.username,
+              password: value.password,
+              endpoint: findEndpoint,
+              retries: 5
+            });
+            const textData = getDahuaResponseText(findResponse);
+            recno = extractRecNo(textData);
+          } catch (findError) {
+            const findErrorMessage = findError?.message || String(findError);
+            recno = extractRecNo(findErrorMessage);
+            if (!recno) {
+              loggerDahua.error(`[${value.host}] Failed handling existing duplicate plate flow`, findError);
+            }
+          }
+          if (recno) {
+            loggerDahua.info(`[${value.host}] Found existing record ID: ${recno}. Updating registration instead...`);
+            const updateEndpoint = `/cgi-bin/recordUpdater.cgi?action=update&name=${value.mode}&recno=${recno}&PlateNumber=${plateNumber}&BeginTime=${beginTime}&CancelTime=${cancelTime}&MasterOfCar=${ownerName}`;
+            try {
+              const updateResponse = await useDahuaDigestWithRetry({
+                host: value.host,
+                username: value.username,
+                password: value.password,
+                endpoint: updateEndpoint,
+                retries: 5
+              });
+              return {
+                ...updateResponse,
+                statusCode: 200,
+                data: Buffer.from(`recno=${recno}`)
+              };
+            } catch (updateError) {
+              const updateErrorMessage = updateError?.message || String(updateError);
+              if (/recno=/i.test(updateErrorMessage) || /ok/i.test(updateErrorMessage)) {
+                loggerDahua.info(`[${value.host}] Update confirmed successfully despite wrapper omission.`);
+                if (!recno) {
+                  recno = extractRecNo(updateErrorMessage);
+                }
+                return {
+                  statusCode: 200,
+                  data: Buffer.from(`recno=${recno}`)
+                };
+              }
+              throw updateError;
+            }
+          }
+        }
+        throw insertError;
+      }
+    } catch (finalError) {
+      loggerDahua.error(`[${value.host}] Error adding plate number:`, finalError);
+      throw new import_node_server_utils72.BadRequestError(`Failed to add plate number: ${finalError.message || finalError}`);
     }
   }
   async function updatePlateNumber(value) {
@@ -27118,7 +27213,7 @@ function useVehicleService() {
         const siteCameraReq = await _getAllSiteCameras({
           site: siteId,
           type: "anpr",
-          direction: ["both", "entry"],
+          direction: ["both", "entry", "residents"],
           page,
           limit
         });
@@ -27142,11 +27237,14 @@ function useVehicleService() {
           owner
         };
         const dahuaResponse = await _addPlateNumber(dahuaPayload);
-        if (dahuaResponse?.statusCode !== 200) {
+        if (dahuaResponse?.statusCode != 200) {
+          console.log("dahuaResponse", dahuaResponse);
+          console.log("approveVehicleById dahuaResponse dahuaResponse?.statusCode != 200", dahuaResponse?.statusCode);
           throw new import_node_server_utils78.BadRequestError("Failed to add plate number to ANPR");
         }
         const responseData = dahuaResponse?.data.toString("utf-8");
         value.recNo = responseData.split("=")[1]?.trim();
+        console.log("approveVehicleById recNo", value.recNo);
       }
       value.status = "active" /* ACTIVE */;
       if (vehicle.peopleId && value.recNo) {
@@ -57765,6 +57863,26 @@ function useNewDashboardRepo() {
     const siteIdObj = (0, import_node_server_utils200.toObjectId)(siteId);
     const startOfToday = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
     const endOfToday = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
+    const localTodayStr = import_moment.default.tz("Asia/Singapore").format("YYYY-MM-DD");
+    const facilityTodayStart = import_moment.default.utc(`${localTodayStr}T00:00:00.000Z`).toDate();
+    const facilityTodayEnd = import_moment.default.utc(`${localTodayStr}T23:59:59.999Z`).toDate();
+    const localYesterdayStr = import_moment.default.tz("Asia/Singapore").subtract(1, "day").format("YYYY-MM-DD");
+    const facilityYesterdayStart = import_moment.default.utc(`${localYesterdayStr}T00:00:00.000Z`).toDate();
+    const facilityYesterdayEnd = import_moment.default.utc(`${localYesterdayStr}T23:59:59.999Z`).toDate();
+    let facilityPeriodRange = { $gte: facilityTodayStart, $lte: facilityTodayEnd };
+    if (period === "thisWeek" /* THIS_WEEK */) {
+      const startStr = import_moment.default.tz("Asia/Singapore").subtract(7, "days").format("YYYY-MM-DD");
+      facilityPeriodRange = {
+        $gte: import_moment.default.utc(`${startStr}T00:00:00.000Z`).toDate(),
+        $lte: facilityTodayEnd
+      };
+    } else if (period === "thisMonth" /* THIS_MONTH */) {
+      const startStr = import_moment.default.tz("Asia/Singapore").subtract(30, "days").format("YYYY-MM-DD");
+      facilityPeriodRange = {
+        $gte: import_moment.default.utc(`${startStr}T00:00:00.000Z`).toDate(),
+        $lte: facilityTodayEnd
+      };
+    }
     const upcomingEvents = await db.collection(events_namespace_collection).find({
       site: { $in: [siteIdObj, siteId] },
       status: { $nin: ["deleted", "Deleted"] },
@@ -57976,11 +58094,11 @@ function useNewDashboardRepo() {
             site: { $in: [siteIdObj, siteId] },
             ...facilityMatchObj,
             $or: [
-              { createdAt: periodRange },
+              { date: facilityPeriodRange },
               {
-                createdAt: {
-                  $gte: periodRange.$gte.toISOString(),
-                  $lte: periodRange.$lte.toISOString()
+                date: {
+                  $gte: facilityPeriodRange.$gte.toISOString(),
+                  $lte: facilityPeriodRange.$lte.toISOString()
                 }
               }
             ],
@@ -58019,11 +58137,11 @@ function useNewDashboardRepo() {
             site: { $in: [siteIdObj, siteId] },
             ...facilityMatchObj,
             $or: [
-              { createdAt: { $gte: yesterday, $lte: yesterdayEnd } },
+              { date: { $gte: facilityYesterdayStart, $lte: facilityYesterdayEnd } },
               {
-                createdAt: {
-                  $gte: yesterday.toISOString(),
-                  $lte: yesterdayEnd.toISOString()
+                date: {
+                  $gte: facilityYesterdayStart.toISOString(),
+                  $lte: facilityYesterdayEnd.toISOString()
                 }
               }
             ],
@@ -58038,11 +58156,11 @@ function useNewDashboardRepo() {
             site: { $in: [siteIdObj, siteId] },
             ...facilityMatchObj,
             $or: [
-              { createdAt: { $gte: today, $lte: todayEnd } },
+              { date: { $gte: facilityTodayStart, $lte: facilityTodayEnd } },
               {
-                createdAt: {
-                  $gte: today.toISOString(),
-                  $lte: todayEnd.toISOString()
+                date: {
+                  $gte: facilityTodayStart.toISOString(),
+                  $lte: facilityTodayEnd.toISOString()
                 }
               }
             ],