@7365admin1/layer-common 4.146.0 → 4.147.1

package/components/VisitorPassKeyQRScanner.vue

@@ -6,7 +6,7 @@
             <v-card class="screen-modal qr-scanner">
                 <div class="qr-scanner__head">
                     <v-card-title>Scan QR Code</v-card-title>
-                    <AppButton variant="icon" icon="mdi-close" @click="closeDialog()" />
+                    <v-btn icon="mdi-close" variant="text" aria-label="Close" @click="closeDialog()" />
                 </div>
 
                 <div class="screen-modal__body qr-scanner__body">

package/components/VisitorSocketPopUp.vue

@@ -41,7 +41,7 @@
       fires, what it links to, or how long it stays; only how it is drawn.
     -->
     <v-snackbar
-      v-if="!isUnregisteredVisitorRoute && enableUnregisteredSnackbar && canViewVisitor"
+      v-if="enableUnregisteredSnackbar && canViewVisitor"
       v-model="snackBarMessage.modal"
       :timeout="-1"
       location="bottom center"
@@ -75,8 +75,10 @@
       </div>
 
       <div class="anpr-toast__actions">
+        <!-- "Register" for a user who can register (Update right), as the
+             security mobile app; otherwise only through to the list. -->
         <AppButton variant="ghost" @click="goToUnregistered">
-          Go to Unregistered
+          {{ canUpdateVisitor ? "Register" : "Go to Unregistered" }}
         </AppButton>
       </div>
     </v-snackbar>
@@ -131,6 +133,11 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  /** The visitor Update right: the notice's button reads "Register". */
+  canUpdateVisitor: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const config = useRuntimeConfig();
@@ -141,8 +148,36 @@ const { tab } = useVisitor();
 const { enableUnregistered, ensureANPRSettings } = useANPRSettings(
   () => props.siteId
 );
-const enableUnregisteredSnackbar = computed(() => enableUnregistered.value);
-const { socketUnregisteredVisitorTrigger, visitorSocketData } =
+// The security mobile app's rule (isecure365 `useUnregisteredTab`): the
+// site's Unregistered switch AND an ANPR camera facing an entrance (entry /
+// both). With the switch alone the notice could appear for a site whose
+// cameras never register anyone arriving.
+const { getAllSiteCameras } = useSiteSettings();
+const hasEntryFacingAnprCamera = ref(false);
+
+async function loadEntryFacingAnprCamera(siteId: string) {
+  hasEntryFacingAnprCamera.value = false;
+  if (!siteId) return;
+  try {
+    const res = await getAllSiteCameras({ site: siteId, type: "anpr", page: 1, limit: 100 });
+    if (siteId !== props.siteId) return;
+    const items = Array.isArray(res?.items)
+      ? res.items
+      : Array.isArray(res?.data?.items)
+        ? res.data.items
+        : [];
+    hasEntryFacingAnprCamera.value = items.some(
+      (camera: any) => camera?.direction === "entry" || camera?.direction === "both"
+    );
+  } catch {
+    hasEntryFacingAnprCamera.value = false;
+  }
+}
+
+const enableUnregisteredSnackbar = computed(
+  () => enableUnregistered.value && hasEntryFacingAnprCamera.value
+);
+const { socketUnregisteredVisitorTrigger, visitorSocketData, registerVisitorFormData } =
   useVisitorSocket();
 
 const APP_NAME = publicConfig.APP || "";
@@ -260,10 +295,10 @@ const showPlate = (plateNumber: string) => {
   }
 
   snackBarMessage.plateNumber = plateNumber;
+  // No timeout (security mobile app, 2026-10): it stays on every screen until
+  // it is closed or its button is used. A newer plate replaces it. (The
+  // window below is no longer started; its cancels are harmless.)
   snackBarMessage.modal = true;
-  // Restart the 20s window from zero. A replacement plate gets a full window
-  // of its own; without this it inherited whatever was left of the one before.
-  plateToastWindow.restart();
 };
 
 const connectSocket = () => {
@@ -284,17 +319,27 @@ const connectSocket = () => {
 
   socket.value.on("anpr-messages", (data: TVisitorSocketData) => {
     const plateNumber = data?.plateNumber?.trim() || "";
-    const isCheckIn = Boolean(plateNumber);
-    const isPlateNumberChanging =
-      Boolean(lastPlateNumber.value) && lastPlateNumber.value !== plateNumber;
+    const recordId = String(data?._id ?? "").trim();
 
-    socketUnregisteredVisitorTrigger.value = false;
+    // Every message still reaches the visitor list (its reload).
     visitorSocketData.value = null;
     visitorSocketData.value = data;
     newVisitor.value = data;
 
-    if (isCheckIn) {
-      showPlate(plateNumber);
+    if (plateNumber) {
+      // An arrival. Only one with both the record id and the plate is kept for
+      // Register, and it drops any outstanding trigger; a read with no record
+      // has nothing to register and raises no notice (security mobile app).
+      // Nothing else on the feed touches the stored arrival.
+      if (recordId) {
+        registerVisitorFormData.value = {
+          _id: recordId,
+          plateNumber,
+          site: data?.site,
+        };
+        socketUnregisteredVisitorTrigger.value = false;
+        showPlate(plateNumber);
+      }
       lastPlateNumber.value = plateNumber;
       return;
     }
@@ -354,24 +399,27 @@ const goToUnregistered = async () => {
   });
 };
 
+// A site switch, or leaving the signed-in layout (logout): the open notice and
+// the stored arrival belong to the old site, so neither survives it.
+const clearPlateNotice = () => {
+  snackBarMessage.modal = false;
+  registerVisitorFormData.value = null;
+  socketUnregisteredVisitorTrigger.value = false;
+};
+
 watch(
   () => props.siteId,
-  () => {
+  (siteId, previous) => {
+    if (previous !== undefined && siteId !== previous) clearPlateNotice();
     disconnectSocket();
     connectSocket();
+    void loadEntryFacingAnprCamera(siteId);
   },
   { immediate: true, deep: true }
 );
 
-watch(
-  () => route.fullPath,
-  () => {
-    if (isUnregisteredVisitorRoute.value) {
-      snackBarMessage.modal = false;
-    }
-  },
-  { immediate: true }
-);
+// The notice now also shows on the Unregistered tab (security mobile app):
+// its button opens Register for the record there.
 
 watch(enableUnregisteredSnackbar, (enabled) => {
   if (!enabled) {
@@ -402,6 +450,7 @@ watch(
 );
 
 onUnmounted(() => {
+  clearPlateNotice();
   plateToastWindow.cancel();
   if (typeof document !== "undefined") {
     document.removeEventListener("keydown", onEscape);

package/composables/usePeople.ts

@@ -1,3 +1,10 @@
+import {
+  VISITOR_PERSON_TYPES,
+  recordIdsOf,
+  visitorPeopleResults,
+  type VisitorPerson,
+} from "../utils/visitor-people";
+
 export default function () {
   async function getAll({
     page = 1,
@@ -66,6 +73,51 @@ export default function () {
     });
   }
 
+  /**
+   * The visitor form's autofill lookup across EVERY visitor type, as the
+   * security mobile app (isecure365 `findAnyVisitorType`): one request with
+   * `type[]=guest&type[]=contractor&type[]=delivery`, the type being registered
+   * listed first, and one person on file under several types merged into one
+   * result. `walk-in` is looked up as `guest`.
+   */
+  async function findVisitorPeopleAnyType(
+    by: "nric" | "contact" | "plateNumber",
+    term: string,
+    site?: string,
+    preferType?: string
+  ): Promise<VisitorPerson[]> {
+    const res = await $fetch<any>(`/api/people`, {
+      method: "GET",
+      query: {
+        [by]: term,
+        ...(site ? { site } : {}),
+        "type[]": [...VISITOR_PERSON_TYPES],
+      },
+    });
+    const items: VisitorPerson[] = Array.isArray(res)
+      ? res
+      : Array.isArray(res?.items)
+        ? res.items
+        : Array.isArray(res?.data?.items)
+          ? res.data.items
+          : Array.isArray(res?.data)
+            ? res.data
+            : [];
+    const type = preferType === "walk-in" ? "guest" : preferType;
+    return visitorPeopleResults(items, type);
+  }
+
+  /**
+   * Deletes the People records behind one autofill result (a merged result is
+   * several): `PUT /api/people/:id`, a soft delete. For a person saved with a
+   * wrong NRIC; past visits are not touched.
+   */
+  async function deletePersonRecords(person: VisitorPerson) {
+    for (const id of recordIdsOf(person)) {
+      await deleteById(id);
+    }
+  }
+
   async function findPersonByContact(
     contact: string
   ): Promise<null | Partial<TPeople>> {
@@ -164,6 +216,8 @@ export default function () {
     findPersonByNRICMultipleResult,
     findPersonByPhoneNumberMultipleResult,
     findPersonByPlateNumberMultipleResult,
+    findVisitorPeopleAnyType,
+    deletePersonRecords,
     findPersonByContact,
     getPeopleByUnit,
     getOccupiedStructure,

package/composables/useVisitor.ts

@@ -4,11 +4,13 @@ export default function () {
     value: TVisitorType;
   };
 
+  // The Add type picker, in iSecure's order and words (`VISITOR_FORM_TYPES` /
+  // `VISITOR_FORM_TITLES`). The values are the stored types - never rename.
   const visitorSelection: TVisitorSelection[] = [
-    { label: "Drive-in", value: "guest" },
+    { label: "Guest", value: "guest" },
     { label: "Contractor", value: "contractor" },
-    { label: "Walk-In", value: "walk-in" },
     { label: "Delivery", value: "delivery" },
+    { label: "Walk-In", value: "walk-in" },
     { label: "Pick-Up", value: "pick-up" },
     { label: "Drop-Off", value: "drop-off" },
   ];

package/composables/useVisitorSocket.ts

@@ -64,7 +64,25 @@ export const plateToast = (
   };
 };
 
+/**
+ * The last vehicle ARRIVAL the ANPR camera read, kept so the plate notice's
+ * Register / "Go to Unregistered" opens the Register flow for THAT record.
+ * As the security mobile app (isecure365 `anpr-unregistered.ts`): only a read
+ * with both the record id and the plate is kept, and nothing else on the feed
+ * (a camera alert, a reload) replaces it.
+ */
+export type TRegisterVisitorFormData = {
+  /** The unregistered record the camera created - the one the form updates. */
+  _id: string;
+  plateNumber: string;
+  site?: string;
+};
+
 export const useVisitorSocket = () => {
+  const registerVisitorFormData = useState(
+    "registerVisitorFormData",
+    (): TRegisterVisitorFormData | null => null,
+  );
   const socketUnregisteredVisitorTrigger = useState(
     "socketUnregisteredVisitorTrigger",
     () => false,
@@ -76,6 +94,7 @@ export const useVisitorSocket = () => {
   
 
   return {
+    registerVisitorFormData,
     socketUnregisteredVisitorTrigger,
     visitorSocketData,
   };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.146.0",
+  "version": "4.147.1",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",
@@ -69,6 +69,7 @@
     "sass": "^1.80.6",
     "sip.js": "0.21.2",
     "socket.io-client": "^4.8.3",
+    "tesseract.js": "^5.1.1",
     "vue-draggable-next": "^2.3.0",
     "vue3-signature": "^0.2.4",
     "vuetify-pro-tiptap": "^2.8.2",

package/utils/nric-card.ts

@@ -0,0 +1,278 @@
+/**
+ * Ported verbatim from the security mobile app (isecure365
+ * `src/features/visitors/nric-card.ts`) so the web NRIC scan reads a card
+ * exactly as the app does. Keep the two in step.
+ *
+ * Reading a Singapore NRIC (or FIN card) from the text the camera saw.
+ *
+ * The visitor form's "Scan" beside the NRIC field photographs the card, runs
+ * on-device text recognition (`modules/text-recognizer`) and hands the lines
+ * here. Nothing leaves the device: the photo is deleted straight after it is
+ * read, and only the two values below reach the form.
+ *
+ * The front of the card reads, top to bottom:
+ *
+ *     REPUBLIC OF SINGAPORE
+ *     IDENTITY CARD NO.  S1234567D
+ *     Name
+ *     TAN AH KOW            <- may wrap onto a second line
+ *     (name in Chinese / Tamil / Jawi, when there is one)
+ *     Race  ...   Date of birth  ...   Sex  ...   Country/Place of birth ...
+ *
+ * The back carries the number again (with its barcode), so the number alone
+ * can also be read from the back.
+ */
+
+/** One line of recognised text and where it sits in the photo. */
+export type CardLine = {
+  text: string;
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+};
+
+export type NricCardRead = {
+  nric: string | null;
+  name: string | null;
+};
+
+const WEIGHTS = [2, 7, 6, 5, 4, 3, 2];
+
+/** Check letter by remainder, per prefix family. `T` / `G` add 4 first. */
+const CHECK_LETTERS: Record<string, { letters: string; offset: number }> = {
+  S: { letters: "JZIHGFEDCBA", offset: 0 },
+  T: { letters: "JZIHGFEDCBA", offset: 4 },
+  F: { letters: "XWUTRQPNMLK", offset: 0 },
+  G: { letters: "XWUTRQPNMLK", offset: 4 },
+};
+
+/**
+ * Whether the last letter matches the number. `null` for an M-series FIN,
+ * whose check letter is not checked here: the scanner instead waits for the
+ * same M number to be read twice in a row.
+ */
+export function isNricChecksumValid(nric: string): boolean | null {
+  const value = nric.toUpperCase();
+  if (!/^[STFGM]\d{7}[A-Z]$/.test(value)) return false;
+  const rule = CHECK_LETTERS[value[0]];
+  if (!rule) return null;
+  let sum = rule.offset;
+  for (let i = 0; i < 7; i += 1) sum += Number(value[i + 1]) * WEIGHTS[i];
+  return rule.letters[sum % 11] === value[8];
+}
+
+/** Characters text recognition commonly puts where a digit is printed. */
+const AS_DIGIT: Record<string, string> = {
+  O: "0",
+  D: "0",
+  Q: "0",
+  I: "1",
+  L: "1",
+  Z: "2",
+  S: "5",
+  G: "6",
+  B: "8",
+};
+
+/** A letter, seven digit-like characters, a letter — before any fixing. */
+const NRIC_LIKE = /^[STFGM5][0-9ODQILZSGB]{7}[A-Z]$/;
+
+function fixCandidate(raw: string): string {
+  const prefix = raw[0] === "5" ? "S" : raw[0];
+  const digits = raw
+    .slice(1, 8)
+    .split("")
+    .map((ch) => AS_DIGIT[ch] ?? ch)
+    .join("");
+  return `${prefix}${digits}${raw[8]}`;
+}
+
+/**
+ * The NRIC/FIN in the text, or null. A number whose check letter matches wins
+ * over one that only has the right shape (an M-series FIN).
+ */
+export function findNric(lines: CardLine[]): string | null {
+  const texts = lines.map((line) => line.text);
+  // Each line on its own, then everything joined in case the number was split.
+  texts.push(lines.map((line) => line.text).join(""));
+
+  let shapeOnly: string | null = null;
+  for (const text of texts) {
+    const compact = text.toUpperCase().replace(/[^A-Z0-9]/g, "");
+    for (let start = 0; start + 9 <= compact.length; start += 1) {
+      const window = compact.slice(start, start + 9);
+      if (!NRIC_LIKE.test(window)) continue;
+      const candidate = fixCandidate(window);
+      const valid = isNricChecksumValid(candidate);
+      if (valid === true) return candidate;
+      if (valid === null && !shapeOnly) shapeOnly = candidate;
+    }
+  }
+  return shapeOnly;
+}
+
+/**
+ * A number with the NRIC's shape whose check letter does NOT match, or null.
+ *
+ * Never filled in on its own: the scanner only offers it ("Use anyway") once
+ * the same number has been read several times in a row, so a one-off misread
+ * never reaches the form but a worn card, or a specimen with a dummy number,
+ * does not leave the guard stuck.
+ */
+export function findUncheckedNric(lines: CardLine[]): string | null {
+  const texts = lines.map((line) => line.text);
+  texts.push(lines.map((line) => line.text).join(""));
+  for (const text of texts) {
+    const compact = text.toUpperCase().replace(/[^A-Z0-9]/g, "");
+    for (let start = 0; start + 9 <= compact.length; start += 1) {
+      const window = compact.slice(start, start + 9);
+      if (!NRIC_LIKE.test(window)) continue;
+      const candidate = fixCandidate(window);
+      if (isNricChecksumValid(candidate) === false) return candidate;
+    }
+  }
+  return null;
+}
+
+const NAME_LABEL = /^\s*name\b[\s:.]*/i;
+/** Labels that come after the name on the card: reading stops at them. */
+const AFTER_NAME = /\b(race|date|birth|sex|country|identity|republic)\b/i;
+
+/** Printed names are capitals: letters, spaces and a little punctuation. */
+function asName(text: string): string | null {
+  const value = text.replace(/\s+/g, " ").trim();
+  if (!/^[A-Za-z][A-Za-z .,'@/()-]*$/.test(value)) return null;
+  const letters = value.replace(/[^A-Za-z]/g, "");
+  if (letters.length < 2) return null;
+  const capitals = letters.replace(/[^A-Z]/g, "").length;
+  // A few lower-case misreads are fine; mostly lower case is a label, not a name.
+  if (capitals / letters.length < 0.8) return null;
+  return value.toUpperCase();
+}
+
+/**
+ * The labels printed right under the name ("Race", "Date of birth", "Sex",
+ * "Country/Place of birth"), left-aligned with it. Not "Date of issue", which
+ * is on the back.
+ */
+const UNDER_NAME = /\b(race|sex|country|date of b\w*|birth)\b/i;
+/** Capitals on the card that are not the holder's name. */
+const NOT_A_NAME = /\b(republic|singapore|identity|card|specimen)\b/i;
+
+/**
+ * Race values printed on the card, under "Race". When the name line itself is
+ * not read, the Race value is the next line in capitals and was being taken
+ * for the name.
+ */
+const RACE_VALUES = new Set([
+  "CHINESE",
+  "MALAY",
+  "INDIAN",
+  "EURASIAN",
+  "CAUCASIAN",
+  "FILIPINO",
+  "JAVANESE",
+  "BOYANESE",
+  "BUGIS",
+  "SIKH",
+  "ARAB",
+  "JAPANESE",
+  "KOREAN",
+  "THAI",
+  "VIETNAMESE",
+  "BURMESE",
+  "SINHALESE",
+  "PAKISTANI",
+  "BANGLADESHI",
+  "NEPALESE",
+  "INDONESIAN",
+  "OTHERS",
+]);
+
+function nameOf(line: CardLine): string | null {
+  const name = asName(line.text);
+  if (!name || NOT_A_NAME.test(name) || RACE_VALUES.has(name)) return null;
+  return name;
+}
+
+/**
+ * The name from its first line, plus the lines it wraps onto: a long name
+ * wraps onto a second line set tight under the first; the name in another
+ * script below it has a wider gap and is not Latin.
+ */
+function joinName(first: CardLine, following: CardLine[]): string {
+  const parts = [first];
+  for (const line of following) {
+    if (AFTER_NAME.test(line.text)) break;
+    const previous = parts[parts.length - 1];
+    const gap = line.y - (previous.y + previous.height);
+    if (nameOf(line) && gap < previous.height * 0.6 && parts.length < 3) {
+      parts.push(line);
+    } else break;
+  }
+  return parts
+    .map((line) => nameOf(line))
+    .join(" ")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
+/** The name under the "Name" label, starting at the label's left edge. */
+function nameUnderLabel(sorted: CardLine[]): string | null {
+  const labelIndex = sorted.findIndex((line) => NAME_LABEL.test(line.text));
+  if (labelIndex < 0) return null;
+  const label = sorted[labelIndex];
+
+  // "Name TAN AH KOW" read as one line.
+  const sameLine = asName(label.text.replace(NAME_LABEL, ""));
+  if (sameLine && !AFTER_NAME.test(sameLine) && !NOT_A_NAME.test(sameLine)) {
+    return sameLine;
+  }
+
+  const tolerance = Math.max(label.height * 1.5, label.width * 0.5);
+  const below = sorted
+    .slice(labelIndex + 1)
+    .filter(
+      (line) => line.y > label.y && Math.abs(line.x - label.x) <= tolerance,
+    );
+  // The first line under the label must be the name; anything else ends it.
+  if (!below.length || AFTER_NAME.test(below[0].text) || !nameOf(below[0])) {
+    return null;
+  }
+  return joinName(below[0], below.slice(1));
+}
+
+/**
+ * Without the "Name" label (it is printed small and is often not read): the
+ * name is the first line in capitals in the column above "Race" / "Date of
+ * birth", which are left-aligned with it.
+ */
+function nameAboveDetails(sorted: CardLine[]): string | null {
+  const details = sorted.filter((line) => UNDER_NAME.test(line.text));
+  if (!details.length) return null;
+  // The top row of those labels, its left-most: "Race" or "Date of birth",
+  // never "Sex" beside it.
+  const top = details[0];
+  const anchor = details
+    .filter((line) => Math.abs(line.y - top.y) <= top.height)
+    .reduce((left, line) => (line.x < left.x ? line : left));
+
+  const tolerance = anchor.height * 2;
+  const column = sorted.filter(
+    (line) => line.y < anchor.y && Math.abs(line.x - anchor.x) <= tolerance,
+  );
+  const firstIndex = column.findIndex((line) => nameOf(line) !== null);
+  if (firstIndex < 0) return null;
+  return joinName(column[firstIndex], column.slice(firstIndex + 1));
+}
+
+/** The holder's name off the front of the card, or null. */
+export function findName(lines: CardLine[]): string | null {
+  const sorted = [...lines].sort((a, b) => a.y - b.y || a.x - b.x);
+  return nameUnderLabel(sorted) ?? nameAboveDetails(sorted);
+}
+
+export function readNricCard(lines: CardLine[]): NricCardRead {
+  return { nric: findNric(lines), name: findName(lines) };
+}

package/utils/schedule-task.ts

@@ -268,7 +268,8 @@ export function buildSummary(
   now: Date = new Date(),
 ): string {
   const year = sgtParts(now).date.slice(0, 4);
-  const areas = `${f.areaCount} area${f.areaCount === 1 ? "" : "s"}`;
+  // One extra check = exactly one more round per picked area each time it runs (not one per normal visit).
+  const areas = f.areaCount === 1 ? "1 area" : `each of ${f.areaCount} areas`;
   const units = `${unitCount} unit${unitCount === 1 ? "" : "s"}`;
   const next = nextRunDate(f, now);
   const nextText = next ? `${DAYS[weekdayOf(next)]} ${fmtDate(next, year)}` : "never";