@7365admin1/core 3.75.0 → 3.76.0

package/dist/index.mjs

@@ -3175,6 +3175,20 @@ function serviceAppType(type) {
     return type;
   return APP_TYPE_ALIASES[type] ?? type;
 }
+function storedAppTypes(type) {
+  const app = serviceAppType(type);
+  return [
+    app,
+    ...Object.keys(APP_TYPE_ALIASES).filter((alias) => APP_TYPE_ALIASES[alias] === app)
+  ];
+}
+function appTypeQuery(type) {
+  const types = storedAppTypes(type);
+  return types.length === 1 ? types[0] : { $in: types };
+}
+function sameAppType(a, b) {
+  return !!a && !!b && serviceAppType(a) === serviceAppType(b);
+}
 
 // src/repositories/member.repo.ts
 import {
@@ -3482,7 +3496,7 @@ function useMemberRepo() {
       return cachedData;
     }
     try {
-      const data = await collection.findOne({ user, type });
+      const data = await collection.findOne({ user, type: appTypeQuery(type) });
       if (!data) {
         throw new NotFoundError5("Member not found.");
       }
@@ -3626,7 +3640,7 @@ function useMemberRepo() {
     search = search || "";
     page = page > 0 ? page - 1 : 0;
     const query2 = {
-      type: serviceAppType(type),
+      type: type ? appTypeQuery(type) : type,
       status
     };
     const cacheOptions = {
@@ -3755,7 +3769,7 @@ function useMemberRepo() {
     const query2 = {
       user,
       org: { $nin: [null, ""] },
-      type
+      type: appTypeQuery(type)
     };
     const cacheOptions = {
       page,
@@ -4172,7 +4186,7 @@ function useMemberRepo() {
     try {
       const data = await collection.findOne({
         user,
-        type,
+        type: appTypeQuery(type),
         org
       });
       if (!data) {
@@ -9836,7 +9850,7 @@ function pickSiteMembership(rows, type, site, org = "") {
   if (!site)
     return null;
   const live = rows.filter(
-    (m) => m.type === type && isLiveMembership(m) && (!org || idOf2(m.org) === org)
+    (m) => sameAppType(m.type, type) && isLiveMembership(m) && (!org || idOf2(m.org) === org)
   );
   const atSite = live.find((m) => idOf2(m.siteId) === site);
   if (atSite)
@@ -9850,10 +9864,10 @@ function pickLookupMembership(rows, type, site = "", org = "") {
   const atSite = site ? pickSiteMembership(list, type, site, org) : null;
   if (atSite)
     return atSite;
-  const inOrg = org ? list.find((m) => m.type === type && idOf2(m.org) === org.toLowerCase()) : void 0;
+  const inOrg = org ? list.find((m) => sameAppType(m.type, type) && idOf2(m.org) === org.toLowerCase()) : void 0;
   if (inOrg && isLiveMembership(inOrg))
     return inOrg;
-  return list.find((m) => m.type === type) ?? null;
+  return list.find((m) => sameAppType(m.type, type)) ?? null;
 }
 function memberListSiteScope(memberships, org) {
   const inOrg = (memberships ?? []).filter((m) => idOf2(m.org) === idOf2(org));
@@ -11827,7 +11841,7 @@ function useRoleRepo() {
       return cachedData;
     }
     try {
-      const data = await collection.find({ org, permissions: "*", type, status: "active" }).toArray();
+      const data = await collection.find({ org, permissions: "*", type: appTypeQuery(type), status: "active" }).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger22.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -11867,7 +11881,7 @@ function useRoleRepo() {
       throw new BadRequestError33("Role name is required.");
     }
     type = serviceAppType(type);
-    const query2 = type ? { name, type } : { name };
+    const query2 = type ? { name, type: appTypeQuery(type) } : { name };
     try {
       const cacheKey = makeCacheKey11(namespace_collection3, query2);
       const cachedData = await getCache(cacheKey);
@@ -11923,8 +11937,8 @@ function useRoleRepo() {
       cacheOptions.search = search;
     }
     if (type) {
-      query2.type = serviceAppType(type);
-      cacheOptions.type = query2.type;
+      query2.type = appTypeQuery(type);
+      cacheOptions.type = serviceAppType(type);
     }
     const cacheKey = makeCacheKey11(namespace_collection3, cacheOptions);
     const cachedData = await getCache(cacheKey);
@@ -14662,12 +14676,11 @@ async function ownerGrantCeiling(org, type) {
     return null;
   try {
     const orgDoc = await useOrgRepo().getById(orgId).catch(() => null);
-    const appType = serviceAppType(orgDoc?.nature);
-    if (!orgDoc?.invitedRole || appType !== type)
+    if (!orgDoc?.invitedRole || !sameAppType(orgDoc?.nature, type))
       return null;
     const role = await useRoleRepo().getRoleById(String(orgDoc.invitedRole)).catch(() => null);
     const permissions = role?.permissions;
-    const chosen = role && String(role.org ?? "") === orgId && role.default === true && role.type === appType && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
+    const chosen = role && String(role.org ?? "") === orgId && role.default === true && sameAppType(role.type, type) && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
     return chosen ? permissions.map(String) : null;
   } catch {
     return null;
@@ -21227,6 +21240,37 @@ function signPlaybackLink(params) {
     expiresAt: new Date(exp * 1e3).toISOString()
   };
 }
+function signLiveLink(host, {
+  relays = playbackRelays(),
+  now = /* @__PURE__ */ new Date()
+} = {}) {
+  const parsed = host ? parseCameraHost(host) : null;
+  if (!parsed || parsed.channel === null)
+    return null;
+  const key = relays[parsed.authority];
+  if (!key)
+    return null;
+  const exp = Math.floor(now.getTime() / 1e3) + PLAYBACK_LINK_SECONDS;
+  const channel = String(parsed.channel);
+  const sig = createHmac("sha256", key).update(`${channel}|${exp}`).digest("hex");
+  const liveAuth = `exp=${exp}&sig=${sig}`;
+  return {
+    /** The player page, ready for an iframe or a WebView. */
+    liveUrl: `https://${parsed.authority}/${channel}?${liveAuth}`,
+    /**
+     * The same signature, on its own, to append to any of the relay's live
+     * routes — the socket, the still, the clip. One signature serves all four
+     * because it covers the CHANNEL and not the path, which is what lets
+     * `insertScreenshot` keep splicing `screenshot` into the path.
+     */
+    liveAuth,
+    liveExpiresAt: new Date(exp * 1e3).toISOString()
+  };
+}
+function withLiveLink(fields, options) {
+  const live = signLiveLink(fields.host, options);
+  return live ? { ...fields, ...live } : fields;
+}
 
 // src/utils/camera-capability.util.ts
 var CAMERA_CAPABILITIES = [
@@ -22582,7 +22626,9 @@ function useCameraViewService() {
         // player-page URL, which is the one picture path proven to work, and the
         // plain `GET /site-cameras` already returns it to every authenticated
         // caller. The credential fields are still never included.
-        ...publicCameraFields({ ...camera, siteName: site?.name }),
+        ...withLiveLink(
+          publicCameraFields({ ...camera, siteName: site?.name })
+        ),
         // Answered before anything is requested, so a camera with no address or
         // an inactive one renders with a reason and costs zero device requests.
         // (An ANPR unit never reaches here — it is filtered out above.)
@@ -22625,7 +22671,7 @@ function useCameraViewService() {
   async function probeCamera(camera, cacheSeconds) {
     const id = camera?._id?.toString?.() ?? "";
     const identity = {
-      ...publicCameraFields(camera),
+      ...withLiveLink(publicCameraFields(camera)),
       unavailableReason: snapshotRefusalReason(camera)
     };
     const lastFrameAt = await getCache(`lastframe:${id}`) || null;
@@ -22759,7 +22805,7 @@ function useCameraViewService() {
     );
     const { capabilities } = capabilitiesOf(camera, probe);
     const base = {
-      camera: publicCameraFields(camera),
+      camera: withLiveLink(publicCameraFields(camera)),
       snapshotSupported: refusal === null,
       capabilities,
       // Filled in from the probe when the device answers. Today it does not, so
@@ -25673,7 +25719,7 @@ function useOrgController() {
         invitedModules?.permissions
       );
       const appOwnerRole = invitedModules?.permissions.length ? seededRoles.find(
-        (role) => role.type === serviceAppType(body.nature) && role.name === "owner"
+        (role) => sameAppType(role.type, body.nature) && role.name === "owner"
       ) : void 0;
       if (appOwnerRole) {
         try {
@@ -37968,6 +38014,87 @@ function useVehicleController() {
       next(error);
     }
   }
+  const MAX_BULK_VEHICLE_ROWS = 100;
+  async function addBulk(req, res, next) {
+    const rowSchema = Joi57.object({
+      // The sheet's own row id. Opaque to the server, handed straight back.
+      id: Joi57.string().trim().max(64).required(),
+      block: Joi57.string().hex().length(24).required(),
+      level: Joi57.string().hex().length(24).required(),
+      unit: Joi57.string().hex().length(24).required(),
+      name: Joi57.string().trim().min(1).required(),
+      plateNumber: Joi57.string().trim().min(1).required(),
+      nric: Joi57.string().trim().optional().allow("", null),
+      phoneNumber: Joi57.string().trim().optional().allow("", null)
+    });
+    const schema2 = Joi57.object({
+      site: Joi57.string().hex().length(24).required(),
+      org: Joi57.string().hex().length(24).required(),
+      category: Joi57.string().optional().valid(...Object.values(VehicleCategory)).default("resident" /* RESIDENT */),
+      rows: Joi57.array().items(rowSchema).min(1).max(MAX_BULK_VEHICLE_ROWS).required()
+    });
+    const { error, value } = schema2.validate(req.body, { abortEarly: false });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger79.log({ level: "error", message: messages });
+      next(new BadRequestError102(messages));
+      return;
+    }
+    try {
+      await requireSiteReach(req, value.site);
+      const user = req.user?.user || req.user?._id;
+      const results = [];
+      for (const row of value.rows) {
+        try {
+          const message = await _add(
+            {
+              site: value.site,
+              org: value.org,
+              type: "whitelist" /* WHITELIST */,
+              category: value.category,
+              name: row.name,
+              nric: row.nric || "",
+              phoneNumber: row.phoneNumber || "",
+              block: row.block,
+              level: row.level,
+              unit: row.unit,
+              plateNumber: [row.plateNumber]
+            },
+            void 0,
+            user
+          );
+          results.push({
+            id: row.id,
+            ok: true,
+            message: String(message ?? "Vehicle added successfully.")
+          });
+        } catch (rowError) {
+          logger79.log({
+            level: "error",
+            message: `bulk vehicle row ${row.id}: ${rowError?.message ?? rowError}`
+          });
+          results.push({
+            id: row.id,
+            ok: false,
+            message: String(
+              rowError?.message ?? "The vehicle could not be added."
+            )
+          });
+        }
+      }
+      const added = results.filter((result) => result.ok).length;
+      const failed = results.length - added;
+      res.status(200).json({
+        message: failed === 0 ? `${added} vehicle${added === 1 ? "" : "s"} added.` : `${added} of ${results.length} vehicles added; ${failed} could not be added.`,
+        added,
+        failed,
+        results
+      });
+    } catch (error2) {
+      logger79.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
   async function add(req, res, next) {
     const { error, value } = vehicleSchema.validate(req.body, {
       abortEarly: false
@@ -38443,6 +38570,7 @@ function useVehicleController() {
   }
   return {
     add,
+    addBulk,
     getVehicles,
     getSeasonPassTypes,
     getVehicleById,
@@ -91770,6 +91898,7 @@ export {
   sessionSchema,
   setIO,
   shiftSchema,
+  signLiveLink,
   signPlaybackLink,
   siteDayBounds,
   siteModulesHandlers,
@@ -92020,6 +92149,7 @@ export {
   vehicles_namespace_collection,
   visitors_namespace_collection,
   wallConfig,
+  withLiveLink,
   workOrderSchema,
   work_orders2_namespace_collection,
   work_orders_namespace_collection