@7365admin1/core 3.23.0 → 3.24.0

package/dist/index.mjs

@@ -8778,6 +8778,7 @@ function MMember(value) {
   const schema2 = Joi7.object({
     _id: Joi7.string().hex().optional().allow("", null),
     name: Joi7.string().required(),
+    email: Joi7.string().email().optional().allow("", null),
     user: Joi7.string().hex().required(),
     type: Joi7.string().required(),
     role: Joi7.string().hex().optional().allow("", null),
@@ -8786,6 +8787,7 @@ function MMember(value) {
     siteId: Joi7.string().hex().optional().allow("", null),
     siteName: Joi7.string().optional().allow("", null),
     status: Joi7.string().optional().allow("", null),
+    dateInvited: Joi7.string().optional().allow("", null),
     onboardingRequired: Joi7.boolean().optional(),
     onboardingCompleted: Joi7.boolean().optional(),
     onboardingCompletedAt: Joi7.string().optional().allow("", null),
@@ -8828,6 +8830,7 @@ function MMember(value) {
   return {
     _id: value._id,
     name: value.name,
+    email: value.email ?? "",
     user: value.user ?? "",
     type: value.type,
     role: value.role ?? "",
@@ -8836,6 +8839,7 @@ function MMember(value) {
     siteId: value.siteId ?? "",
     siteName: value.siteName ?? "",
     status: value.status || "active",
+    dateInvited: value.dateInvited ?? value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     onboardingRequired: value.onboardingRequired ?? false,
     onboardingCompleted: value.onboardingCompleted ?? !value.onboardingRequired,
     onboardingCompletedAt: value.onboardingCompletedAt ?? "",
@@ -9132,7 +9136,8 @@ function useMemberRepo() {
       page,
       limit,
       type,
-      status
+      status,
+      projectionVersion: 2
     };
     if (org) {
       try {
@@ -9183,15 +9188,27 @@ function useMemberRepo() {
           }
         },
         { $unwind: { path: "$roles", preserveNullAndEmptyArrays: true } },
+        {
+          $lookup: {
+            from: "users",
+            localField: "user",
+            foreignField: "_id",
+            as: "users",
+            pipeline: [{ $project: { email: 1 } }]
+          }
+        },
+        { $unwind: { path: "$users", preserveNullAndEmptyArrays: true } },
         {
           $project: {
             name: 1,
+            email: { $ifNull: ["$email", "$users.email"] },
             user: 1,
             roleName: "$roles.name",
             role: "$roles._id",
             org: 1,
             orgName: 1,
             status: 1,
+            dateInvited: { $ifNull: ["$dateInvited", "$createdAt"] },
             siteId: 1,
             siteName: 1,
             type: 1
@@ -14046,8 +14063,10 @@ function useMemberService() {
           orgName: org?.name || "",
           user: _user?._id?.toString() || "",
           name: _user?.name || "",
+          email: invite.email,
           role: invite.metadata?.role?.toString() || "",
           type: invite.metadata?.app ?? "organization",
+          dateInvited: invite.createdAt,
           siteId: invite.metadata?.siteId?.toString() || "",
           siteName: invite.metadata?.siteName || ""
         },
@@ -14094,8 +14113,10 @@ function useMemberService() {
           orgName: org.name || "",
           user: user._id?.toString() || "",
           name: user?.email,
+          email: user.email,
           role: roleId,
           type: app,
+          dateInvited: (/* @__PURE__ */ new Date()).toISOString(),
           siteId: siteId ?? "",
           siteName: siteName ?? "",
           onboardingRequired,
@@ -23782,6 +23803,7 @@ function useDahuaService() {
     );
   }
   async function getTrafficJunction(camera, signal, onDetected) {
+    console.log(`getTrafficJunction camera object`, camera);
     while (!signal.aborted) {
       let bufferQueue = null;
       let response = null;
@@ -27172,119 +27194,123 @@ function useVehicleService() {
     if (!session) {
       throw new Error("Unable to start session for vehicle service.");
     }
-    const vehicle = await _getVehicleById(_id);
-    const plate = vehicle.plates.find((p) => p._id.toString() === _id);
-    const _name = value.name ? value.name : vehicle.name;
-    const _plateNumber = plate?.plateNumber;
-    const _start = vehicle.start;
-    const _end = vehicle.end;
-    const _recNo = plate.recNo;
-    const _type = value.type ? value.type : plate.type;
-    if (value.peopleId) {
-      value.peopleId = new ObjectId49(value.peopleId);
-    }
-    const { name, plateNumber, start, end, recNo, type, unit, site, ...rest } = value;
-    const startDahua = value.start ? formatDahuaDate(new Date(value.start)) : formatDahuaDate(new Date(_start));
-    const endDahua = value.end ? formatDahuaDate(new Date(value.end)) : formatDahuaDate(new Date(_end));
     try {
       session.startTransaction();
-      if (name || plateNumber || start || end) {
-        const siteCameras = [];
-        let page = 1;
-        let pages = 1;
-        const limit = 20;
-        do {
-          const siteCameraReq = await _getAllSiteCameras({
-            site,
-            type: "anpr",
-            direction: ["both", "entry"],
-            page,
-            limit
-          });
-          pages = siteCameraReq.pages || 1;
-          siteCameras.push(...siteCameraReq.items);
-          page++;
-        } while (page < pages);
-        if (!siteCameras.length) {
-          throw new BadRequestError75("No site cameras found.");
-        }
-        for (const camera of siteCameras) {
-          const { host, username, password } = camera;
-          if (value.type) {
-            const removePlateNumber = {
-              host,
-              username,
-              password,
-              mode: plate.type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
-              //whitelist or blocklist
-              recno: _recNo
-            };
-            const responseForDeletion = await _removePlateNumber(
-              removePlateNumber
-            );
-            if (responseForDeletion?.statusCode !== 200) {
-              throw new BadRequestError75(
-                "Failed to delete plate number to ANPR"
-              );
-            }
-            const dahuaPayload = {
-              host,
-              username,
-              password,
-              plateNumber: _plateNumber,
-              mode: value.type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
-              //whitelist or blocklist
-              owner: _name,
-              ...startDahua ? { start: startDahua } : {},
-              ...endDahua ? { end: endDahua } : {}
-            };
-            const dahuaResponse = await _addPlateNumber(dahuaPayload);
-            if (dahuaResponse?.statusCode !== 200) {
-              throw new BadRequestError75(
-                "Failed to update plate number to ANPR"
-              );
-            }
-            const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
-            value.recNo = responseData.split("=")[1]?.trim();
-            const normalizedPlateNumber = Array.isArray(plateNumber) ? plateNumber[0] : plateNumber;
-            if (value.peopleId && value.recNo) {
-              await _pushVehicleById(
-                value.peopleId,
-                {
-                  plateNumber: normalizedPlateNumber,
-                  recNo: value.recNo
-                },
-                session
-              );
-            }
-          } else {
-            const dahuaPayload = {
-              host,
-              username,
-              password,
-              plateNumber: plateNumber ? plateNumber : _plateNumber,
-              recno: _recNo,
-              mode: _type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
-              start: startDahua,
-              end: endDahua,
-              owner: name ? name : _name
-            };
-            const dahuaResponse = await _updatePlateNumber(dahuaPayload);
-            const normalizedPlateNumber = Array.isArray(plateNumber) ? plateNumber[0] : plateNumber;
-            if (value.peopleId && value.recNo) {
-              await _pushVehicleById(
-                value.peopleId,
-                {
-                  plateNumber: normalizedPlateNumber,
-                  recNo: _recNo
-                },
-                session
-              );
-            }
-            if (dahuaResponse?.statusCode !== 200) {
-              throw new BadRequestError75(
-                "Failed to update plate number to ANPR"
+      const vehicle = await _getVehicleById(_id);
+      const plate = vehicle.plates.find((p) => p._id.toString() === _id);
+      const _name = vehicle.name;
+      const _plateNumber = plate?.plateNumber;
+      const _start = vehicle.start;
+      const _end = vehicle.end;
+      const _recNo = plate.recNo;
+      const _type = value.type ? value.type : plate.type;
+      if (value.peopleId) {
+        value.peopleId = new ObjectId49(value.peopleId);
+      }
+      const { name, plateNumber, start, end, recNo, type, unit, site, block, level, ...rest } = value;
+      if (_name != name || _plateNumber != plateNumber) {
+        const startDahua = value.start ? formatDahuaDate(new Date(value.start)) : formatDahuaDate(new Date(_start));
+        const endDahua = value.end ? formatDahuaDate(new Date(value.end)) : formatDahuaDate(new Date(_end));
+        if (name || plateNumber || start || end) {
+          const siteCameras = [];
+          let page = 1;
+          let pages = 1;
+          const limit = 20;
+          do {
+            const siteCameraReq = await _getAllSiteCameras({
+              site,
+              type: "anpr",
+              direction: ["both", "entry", "residents"],
+              page,
+              limit
+            });
+            pages = siteCameraReq.pages || 1;
+            siteCameras.push(...siteCameraReq.items);
+            page++;
+          } while (page < pages);
+          if (!siteCameras.length) {
+            throw new BadRequestError75("No site cameras found.");
+          }
+          for (const camera of siteCameras) {
+            const { host, username, password } = camera;
+            if (_plateNumber != plateNumber) {
+              console.log("updateVehicleById _plateNumber != plateNumber", _plateNumber, plateNumber);
+              const removePlateNumber = {
+                host,
+                username,
+                password,
+                mode: plate.type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+                //whitelist or blocklist
+                recno: _recNo
+              };
+              const responseForDeletion = await _removePlateNumber(
+                removePlateNumber
               );
+              if (responseForDeletion?.statusCode !== 200) {
+                throw new BadRequestError75(
+                  "Failed to delete plate number to ANPR"
+                );
+              }
+              const dahuaPayload = {
+                host,
+                username,
+                password,
+                plateNumber,
+                mode: value.type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+                //whitelist or blocklist
+                owner: name,
+                ...startDahua ? { start: startDahua } : {},
+                ...endDahua ? { end: endDahua } : {}
+              };
+              const dahuaResponse = await _addPlateNumber(dahuaPayload);
+              if (dahuaResponse?.statusCode !== 200) {
+                throw new BadRequestError75(
+                  "Failed to update plate number to ANPR"
+                );
+              }
+              const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+              value.recNo = responseData.split("=")[1]?.trim();
+              if (value.peopleId && value.recNo) {
+                await _pushVehicleById(
+                  value.peopleId,
+                  {
+                    plateNumber,
+                    recNo: value.recNo
+                  },
+                  session
+                );
+              }
+            } else {
+              console.log("updateVehicleById _plateNumber == plateNumber", _plateNumber, plateNumber);
+              const dahuaPayload = {
+                host,
+                username,
+                password,
+                plateNumber,
+                // recno: _recNo,
+                mode: _type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+                start: startDahua,
+                end: endDahua,
+                owner: name ? name : _name
+              };
+              const dahuaResponse = await _addPlateNumber(dahuaPayload);
+              const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+              value.recNo = responseData.split("=")[1]?.trim();
+              if (value.peopleId && value.recNo) {
+                await _pushVehicleById(
+                  value.peopleId,
+                  {
+                    plateNumber,
+                    recNo: value.recNo
+                  },
+                  session
+                );
+              }
+              if (dahuaResponse?.statusCode !== 200) {
+                throw new BadRequestError75(
+                  "Failed to update plate number to ANPR"
+                );
+              }
             }
           }
         }
@@ -27295,6 +27321,12 @@ function useVehicleService() {
         ...plateNumber && { plateNumber },
         ...start && { start },
         ...end && { end },
+        ...block && {
+          block: typeof block === "string" ? new ObjectId49(block) : block
+        },
+        ...level && {
+          level: typeof level === "string" ? new ObjectId49(level) : level
+        },
         ...unit && {
           unit: typeof unit === "string" ? new ObjectId49(unit) : unit
         },
@@ -31102,9 +31134,9 @@ function useVehicleController() {
         site: Joi48.string().hex().length(24).required(),
         name: Joi48.string().optional().allow("", null),
         phoneNumber: Joi48.string().optional().allow("", null),
-        block: Joi48.number().integer().optional().allow(0, null),
-        level: Joi48.string().optional().allow("", null),
-        unit: Joi48.string().optional().allow("", null),
+        block: Joi48.string().hex().length(24).allow("", null),
+        level: Joi48.string().hex().length(24).optional().allow("", null),
+        unit: Joi48.string().hex().length(24).optional().allow("", null),
         plateNumber: Joi48.string().optional().allow("", null),
         nric: Joi48.string().optional().allow("", null),
         start: Joi48.string().isoDate().optional().allow(null, ""),
@@ -31134,7 +31166,11 @@ function useVehicleController() {
       return;
     } catch (error) {
       logger68.log({ level: "error", message: error.message });
-      next(error);
+      if (error?.message) {
+        next(new BadRequestError87(error?.message));
+      } else {
+        next(error);
+      }
       return;
     }
   }
@@ -68304,7 +68340,7 @@ var BidType = /* @__PURE__ */ ((BidType2) => {
 })(BidType || {});
 var BidStatus = /* @__PURE__ */ ((BidStatus3) => {
   BidStatus3["PENDING"] = "pending";
-  BidStatus3["ACCEPTED"] = "accepted";
+  BidStatus3["SOLD"] = "sold";
   BidStatus3["RESERVED"] = "reserved";
   BidStatus3["CANCELLED"] = "cancelled";
   return BidStatus3;
@@ -69573,6 +69609,9 @@ var schemaHidAmicoSync = Joi151.object({
 var schemaHidAmicoExecuteActions = Joi151.object({
   actions: Joi151.array().items(Joi151.object().unknown(true)).min(1).required()
 }).unknown(true);
+var schemaHidAmicoIntercomCall = Joi151.object({
+  target: Joi151.string().trim().required()
+}).unknown(true);
 var schemaHidAmicoConfiguration = Joi151.object().pattern(Joi151.string(), Joi151.array().items(Joi151.string())).min(1).unknown(true);
 var schemaHidAmicoSetConfiguration = Joi151.object().unknown(true);
 var schemaHidAmicoObjectOperation = Joi151.object({
@@ -69984,6 +70023,32 @@ import crypto5 from "crypto";
 import axios4 from "axios";
 import { BadRequestError as BadRequestError230 } from "@7365admin1/node-server-utils";
 var PASSWORD_PREFIX = "v1";
+var PJSIP_CONFIGURATION_KEYS = [
+  "enabled",
+  "server_ip",
+  "server_port",
+  "server_outbound_port",
+  "server_outbound_port_range",
+  "numeric_branch_enabled",
+  "branch",
+  "login",
+  "peer_to_peer_enabled",
+  "reg_status_query_period",
+  "server_retry_interval",
+  "max_call_time",
+  "auto_answer_enabled",
+  "auto_answer_delay",
+  "auto_call_button_enabled",
+  "rex_enabled",
+  "dialing_display_mode",
+  "auto_call_target",
+  "custom_identifier_auto_call",
+  "video_enabled",
+  "open_door_enabled",
+  "open_door_command",
+  "mic_volume",
+  "speaker_volume"
+];
 function getSecretKey() {
   const secret = process.env.HID_AMICO_SECRET || process.env.ACCESS_TOKEN_SECRET || "iservice365-hid-amico";
   return crypto5.createHash("sha256").update(secret).digest();
@@ -70030,6 +70095,28 @@ function toHidRequestError(error, path5) {
   }
   return error;
 }
+function getErrorMessage(error) {
+  return String(error?.message || "");
+}
+function isSipStatusUnavailable(error) {
+  const message = getErrorMessage(error).toLowerCase();
+  return message.includes("/get_sip_status.fcgi") && (message.includes("unable to obtain sip status") || message.includes("status 400"));
+}
+function normalizePjsipConfiguration(response) {
+  const data = response?.data || response || {};
+  return data.pjsip || data.data?.pjsip || data.result?.pjsip || {};
+}
+function buildSipStatusFallback(configurationResponse, nativeError) {
+  const configuration = normalizePjsipConfiguration(configurationResponse);
+  const enabled = String(configuration?.enabled ?? "0") === "1";
+  return {
+    status: enabled ? 100 : -1,
+    statusText: enabled ? "SIP status unavailable" : "SIP disabled",
+    nativeStatusAvailable: false,
+    nativeError: getErrorMessage(nativeError),
+    configuration
+  };
+}
 var HidAmicoClient = class {
   constructor(reader) {
     this.reader = reader;
@@ -70175,6 +70262,27 @@ var HidAmicoClient = class {
     const res = await this.post(this.url("/set_configuration.fcgi"), payload);
     return res.data;
   }
+  async getSipStatus() {
+    if (!this.session) {
+      await this.login();
+    }
+    const res = await this.post(this.url("/get_sip_status.fcgi"), {});
+    return res.data;
+  }
+  async makeSipCall(target) {
+    if (!this.session) {
+      await this.login();
+    }
+    const res = await this.post(this.url("/make_sip_call.fcgi"), { target });
+    return res.data;
+  }
+  async finalizeSipCall() {
+    if (!this.session) {
+      await this.login();
+    }
+    const res = await this.post(this.url("/finalize_sip_call.fcgi"), {});
+    return res.data;
+  }
 };
 function normalizeBatches(payload) {
   if (Array.isArray(payload?.objects)) {
@@ -70449,6 +70557,63 @@ function useHidAmicoService() {
       await client.logout();
     }
   }
+  async function getIntercomStatus(id) {
+    const reader = await getActiveReader(id);
+    const client = new HidAmicoClient(reader);
+    try {
+      await client.login();
+      let result;
+      try {
+        result = await client.getSipStatus();
+      } catch (error) {
+        if (!isSipStatusUnavailable(error)) {
+          throw error;
+        }
+        const configuration = await client.getConfiguration({ pjsip: PJSIP_CONFIGURATION_KEYS });
+        result = buildSipStatusFallback(configuration, error);
+      }
+      await repo.updateById(id, { lastSeenAt: /* @__PURE__ */ new Date() });
+      await repo.addEvent({ reader: id, site: reader.site, type: "intercom_status", payload: result });
+      return result;
+    } catch (error) {
+      await repo.addEvent({ reader: id, site: reader.site, type: "intercom_status_failed", payload: { message: error.message } });
+      throw error;
+    } finally {
+      await client.logout();
+    }
+  }
+  async function makeIntercomCall(id, target) {
+    const reader = await getActiveReader(id);
+    const client = new HidAmicoClient(reader);
+    try {
+      await client.login();
+      const result = await client.makeSipCall(target);
+      await repo.updateById(id, { lastSeenAt: /* @__PURE__ */ new Date() });
+      await repo.addEvent({ reader: id, site: reader.site, type: "intercom_call", payload: { target, result } });
+      return result;
+    } catch (error) {
+      await repo.addEvent({ reader: id, site: reader.site, type: "intercom_call_failed", payload: { target, message: error.message } });
+      throw error;
+    } finally {
+      await client.logout();
+    }
+  }
+  async function finalizeIntercomCall(id) {
+    const reader = await getActiveReader(id);
+    const client = new HidAmicoClient(reader);
+    try {
+      await client.login();
+      const result = await client.finalizeSipCall();
+      await repo.updateById(id, { lastSeenAt: /* @__PURE__ */ new Date() });
+      await repo.addEvent({ reader: id, site: reader.site, type: "intercom_hangup", payload: result || {} });
+      return result;
+    } catch (error) {
+      await repo.addEvent({ reader: id, site: reader.site, type: "intercom_hangup_failed", payload: { message: error.message } });
+      throw error;
+    } finally {
+      await client.logout();
+    }
+  }
   return {
     listReaders,
     createReader,
@@ -70467,7 +70632,10 @@ function useHidAmicoService() {
     getDoorState,
     executeActions,
     getConfiguration,
-    setConfiguration
+    setConfiguration,
+    getIntercomStatus,
+    makeIntercomCall,
+    finalizeIntercomCall
   };
 }
 
@@ -70724,6 +70892,43 @@ function useHidAmicoController() {
       next(error);
     }
   }
+  async function getIntercomStatus(req, res, next) {
+    const { error, value } = schemaHidAmicoReaderIdParams.validate(req.params);
+    if (error) {
+      next(new BadRequestError231(error.message));
+      return;
+    }
+    try {
+      res.json({ data: await service.getIntercomStatus(value.readerId) });
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function makeIntercomCall(req, res, next) {
+    const params = schemaHidAmicoReaderIdParams.validate(req.params);
+    const body = schemaHidAmicoIntercomCall.validate(req.body ?? {});
+    if (params.error || body.error) {
+      next(new BadRequestError231(params.error?.message || body.error?.message));
+      return;
+    }
+    try {
+      res.json({ data: await service.makeIntercomCall(params.value.readerId, body.value.target) });
+    } catch (error) {
+      next(error);
+    }
+  }
+  async function finalizeIntercomCall(req, res, next) {
+    const { error, value } = schemaHidAmicoReaderIdParams.validate(req.params);
+    if (error) {
+      next(new BadRequestError231(error.message));
+      return;
+    }
+    try {
+      res.json({ data: await service.finalizeIntercomCall(value.readerId) });
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     listReaders,
     createReader,
@@ -70742,7 +70947,10 @@ function useHidAmicoController() {
     executeActions,
     getConfiguration,
     setConfiguration,
-    runObjectOperation
+    runObjectOperation,
+    getIntercomStatus,
+    makeIntercomCall,
+    finalizeIntercomCall
   };
 }
 export {
@@ -70953,6 +71161,7 @@ export {
   schemaHidAmicoIdentity,
   schemaHidAmicoIdentityIdParams,
   schemaHidAmicoIdentityQuery,
+  schemaHidAmicoIntercomCall,
   schemaHidAmicoLogQuery,
   schemaHidAmicoNotificationParams,
   schemaHidAmicoObjectOperation,