@7365admin1/layer-common 3.2.1-staging.72 → 3.2.2

package/composables/useSiteSettings.ts

@@ -99,54 +99,6 @@ export default function () {
     });
   }
 
-  /**
-   * The monitoring wall for one site.
-   *
-   * A different endpoint from `getAllSiteCameras`, and the difference is the
-   * point. That one is the Settings panel's paginated CRUD list; this one is
-   * purpose-built for a wall and is what the React Native app already uses:
-   *
-   * - it is **site-scoped and authorised server-side** — the caller must be a
-   *   member of the site, of its owning organisation, or work for an
-   *   organisation engaged to serve it;
-   * - it returns `type: "ip"` cameras only, so an ANPR unit can never land on a
-   *   monitoring wall;
-   * - it returns each camera's **capability descriptor** and the server's own
-   *   `unavailableReason`, so a tile explains itself instead of showing a black
-   *   rectangle;
-   * - it never returns a credential, and it contacts no device.
-   *
-   * Unpaginated by design: a wall shows a site's cameras, and paging them was
-   * an artefact of borrowing the CRUD list.
-   */
-  async function getSiteWall(siteId: string) {
-    return await useNuxtApp().$api<Record<string, any>>(
-      `/api/site-cameras/site/${siteId}/wall`,
-      { method: "GET" }
-    );
-  }
-
-  /**
-   * Health for the cameras currently on screen.
-   *
-   * Same site scoping as the wall, and the ids are narrowed to the visible
-   * tiles on purpose: this is the one camera call that can reach a device, and
-   * asking about cameras nobody is looking at spends a real budget for nothing.
-   *
-   * **Reachability is answered per RECORDER and cached there**, so a wall of
-   * twelve channels on one device is one connect rather than twelve, and
-   * several supervisors watching the same wall is still one. That is what makes
-   * it safe to ask on a timer at all — but only a slow one: the server caches
-   * for `healthCacheSeconds`, and asking faster than the cache buys nothing and
-   * costs round trips.
-   */
-  async function getSiteHealth(siteId: string, cameraIds: string[]) {
-    return await useNuxtApp().$api<Record<string, any>>(
-      `/api/site-cameras/site/${siteId}/health`,
-      { method: "GET", query: { ids: cameraIds.join(",") } }
-    );
-  }
-
   async function updateSiteInformation(
     siteId: string,
     payload: { bgImage: string; description: string; docs: { id: string; name: string }[] }
@@ -223,8 +175,6 @@ export default function () {
     updateSite,
     addCamera,
     getAllSiteCameras,
-    getSiteWall,
-    getSiteHealth,
     setSiteGuardPosts,
     updateSiteCamera,
     deleteSiteCameraById,

package/composables/useWebUsb.ts

@@ -11,10 +11,6 @@ interface USBDevice {
   close(): Promise<void>;
   selectConfiguration(configurationValue: number): Promise<void>;
   claimInterface(interfaceNumber: number): Promise<void>;
-  selectAlternateInterface(
-    interfaceNumber: number,
-    alternateSetting: number,
-  ): Promise<void>;
   releaseInterface(interfaceNumber: number): Promise<void>;
   transferOut(
     endpointNumber: number,
@@ -23,27 +19,14 @@ interface USBDevice {
   configuration: {
     interfaces: Array<{
       interfaceNumber: number;
-      alternate: USBAlternateInterface;
       alternates: Array<{
-        alternateSetting: number;
-        interfaceClass: number;
         endpoints: Array<{
           endpointNumber: number;
           direction: "in" | "out";
         }>;
       }>;
     }>;
-  } | null;
-  configurations: Array<{ configurationValue: number }>;
-}
-
-interface USBAlternateInterface {
-  alternateSetting: number;
-  interfaceClass: number;
-  endpoints: Array<{
-    endpointNumber: number;
-    direction: "in" | "out";
-  }>;
+  };
 }
 
 interface USBOutTransferResult {
@@ -56,86 +39,13 @@ declare global {
     usb: {
       getDevices(): Promise<USBDevice[]>;
       requestDevice(options: {
-        filters: Array<{
-          vendorId?: number;
-          productId?: number;
-          classCode?: number;
-        }>;
+        filters: Array<{ vendorId?: number; productId?: number }>;
       }): Promise<USBDevice>;
     };
   }
 }
 
 export default function useWebUsb() {
-  const printerConnections = new WeakMap<
-    USBDevice,
-    { interfaceNumber: number; endpointNumber: number }
-  >();
-
-  const protectedInterfaceClasses = new Set([0x01, 0x03, 0x08, 0x0b, 0x0e, 0x10, 0xe0]);
-
-  function getErrorMessage(error: unknown, fallback: string) {
-    return error instanceof Error && error.message ? error.message : fallback;
-  }
-
-  function findPrinterInterface(device: USBDevice) {
-    const candidates = (device.configuration?.interfaces || []).flatMap((usbInterface) =>
-      usbInterface.alternates.flatMap((alternate) => {
-        const outputEndpoint = alternate.endpoints.find((endpoint) => endpoint.direction === "out");
-        if (!outputEndpoint || protectedInterfaceClasses.has(alternate.interfaceClass)) return [];
-
-        return [{
-          interfaceNumber: usbInterface.interfaceNumber,
-          alternateSetting: alternate.alternateSetting,
-          activeAlternateSetting: usbInterface.alternate.alternateSetting,
-          interfaceClass: alternate.interfaceClass,
-          endpointNumber: outputEndpoint.endpointNumber,
-        }];
-      }),
-    );
-
-    candidates.sort((left, right) => {
-      const priority = (interfaceClass: number) => interfaceClass === 0x07 ? 0 : interfaceClass === 0xff ? 1 : 2;
-      return priority(left.interfaceClass) - priority(right.interfaceClass);
-    });
-
-    return candidates[0] || null;
-  }
-
-  async function preparePrinterDevice(device: USBDevice) {
-    await device.open();
-    if (!device.configuration) {
-      await device.selectConfiguration(device.configurations[0]?.configurationValue || 1);
-    }
-
-    const printerInterface = findPrinterInterface(device);
-    if (!printerInterface) {
-      throw new Error(
-        "The selected USB device is not a compatible printer. Select the receipt printer instead of a Bluetooth, camera, keyboard, or other system device.",
-      );
-    }
-
-    await device.claimInterface(printerInterface.interfaceNumber);
-    if (printerInterface.alternateSetting !== printerInterface.activeAlternateSetting) {
-      await device.selectAlternateInterface(
-        printerInterface.interfaceNumber,
-        printerInterface.alternateSetting,
-      );
-    }
-
-    printerConnections.set(device, {
-      interfaceNumber: printerInterface.interfaceNumber,
-      endpointNumber: printerInterface.endpointNumber,
-    });
-    return device;
-  }
-
-  function getPrinterConnection(device: USBDevice) {
-    const connection = printerConnections.get(device);
-    if (!connection) throw new Error("Printer interface is not connected");
-    return connection;
-  }
-
   const isWebUsbSupported = computed(() => {
     return typeof navigator !== "undefined" && "usb" in navigator;
   });
@@ -165,9 +75,7 @@ export default function useWebUsb() {
       throw new Error("Web USB is not supported in this browser");
     }
     try {
-      const device = await navigator.usb.requestDevice({
-        filters: [{ classCode: 0x07 }, { classCode: 0xff }],
-      });
+      const device = await navigator.usb.requestDevice({ filters: [] });
       return {
         vendorId: device.vendorId,
         productId: device.productId,
@@ -176,12 +84,12 @@ export default function useWebUsb() {
         serialNumber: device.serialNumber || "Unknown",
         deviceId: `${device.vendorId}:${device.productId}`,
       };
-    } catch (error: unknown) {
-      if (error instanceof DOMException && error.name === "NotFoundError") {
+    } catch (error: any) {
+      if (error.name === "NotFoundError") {
         throw new Error("No device selected");
       }
       console.error("Error requesting USB device:", error);
-      throw new Error(getErrorMessage(error, "Failed to access USB printer"));
+      throw new Error("Failed to access USB device");
     }
   };
 
@@ -202,17 +110,14 @@ export default function useWebUsb() {
         });
       }
       console.log("[WebUSB] Opening device:", device.vendorId, device.productId);
-      await preparePrinterDevice(device);
+      await device.open();
+      await device.selectConfiguration(1);
+      await device.claimInterface(0);
       console.log("[WebUSB] Device opened and interface claimed.");
       return device;
-    } catch (error: unknown) {
+    } catch (error) {
       console.error("Error connecting to USB device:", error);
-      try {
-        await device?.close();
-      } catch (closeError) {
-        console.error("Error closing rejected USB device:", closeError);
-      }
-      throw new Error(getErrorMessage(error, "Failed to connect to USB printer"));
+      throw new Error("Failed to connect to USB device");
     }
   };
 
@@ -268,20 +173,15 @@ export default function useWebUsb() {
           ? "Connection and print test successful"
           : "Connection successful but print test failed",
       };
-    } catch (error: unknown) {
+    } catch (error: any) {
       return {
         success: false,
-        error: getErrorMessage(error, "Failed to connect to USB printer"),
+        error: error.message,
         message: "Connection failed",
       };
     } finally {
       if (device) {
         try {
-          const connection = printerConnections.get(device);
-          if (connection) {
-            await device.releaseInterface(connection.interfaceNumber);
-            printerConnections.delete(device);
-          }
           await device.close();
         } catch (closeError) {
           console.error("Error closing device:", closeError);
@@ -305,16 +205,21 @@ export default function useWebUsb() {
       ];
 
       const testData = new Uint8Array(testCommands);
-      const { endpointNumber } = getPrinterConnection(device);
-      await device.transferOut(endpointNumber, testData);
+      const usbInterface = device.configuration.interfaces[0];
+      const alternate = usbInterface.alternates[0];
+      const outputEndpoint = alternate.endpoints.find(
+        (ep: any) => ep.direction === "out",
+      );
+
+      if (!outputEndpoint) {
+        throw new Error("No output endpoint found");
+      }
+
+      await device.transferOut(outputEndpoint.endpointNumber, testData);
       return { success: true, message: "Test print sent successfully" };
-    } catch (error: unknown) {
+    } catch (error: any) {
       console.error("Test print error:", error);
-      return {
-        success: false,
-        error: getErrorMessage(error, "Test print failed"),
-        message: "Test print failed",
-      };
+      return { success: false, error: error.message, message: "Test print failed" };
     }
   };
 
@@ -449,8 +354,13 @@ export default function useWebUsb() {
   ) => {
     try {
       console.log("[WebUSB] printQrCode start — doorLevel:", doorLevel, "liftLevel:", liftLevel, "company:", companyName, "address:", address);
-      const { endpointNumber } = getPrinterConnection(device);
-      console.log("[WebUSB] Using endpoint:", endpointNumber);
+      const usbInterface = device.configuration.interfaces[0];
+      const alternate = usbInterface.alternates[0];
+      const outputEndpoint = alternate.endpoints.find(
+        (ep: any) => ep.direction === "out",
+      );
+      if (!outputEndpoint) throw new Error("No output endpoint found");
+      console.log("[WebUSB] Using endpoint:", outputEndpoint.endpointNumber);
 
       const canvas = await createReceiptLayout(
         urlImage,
@@ -465,17 +375,17 @@ export default function useWebUsb() {
       const rasterData = canvasToRaster(canvas);
       console.log("[WebUSB] Raster data size:", rasterData.byteLength, "bytes");
 
-      await device.transferOut(endpointNumber, rasterData.buffer);
+      await device.transferOut(outputEndpoint.endpointNumber, rasterData.buffer);
       console.log("[WebUSB] Raster data sent.");
 
       const CUT = new Uint8Array([0x1d, 0x56, 0x41, 0x10]);
-      await device.transferOut(endpointNumber, CUT.buffer);
+      await device.transferOut(outputEndpoint.endpointNumber, CUT.buffer);
       console.log("[WebUSB] Cut command sent.");
 
       return { success: true, message: "QR print sent successfully" };
-    } catch (error: unknown) {
+    } catch (error: any) {
       console.error("[WebUSB] printQrCode error:", error);
-      return { success: false, error: getErrorMessage(error, "Unable to print QR code") };
+      return { success: false, error: error.message };
     }
   };
 

package/middleware/member.ts

@@ -0,0 +1,4 @@
+export default defineNuxtRouteMiddleware(() => {
+  if (import.meta.server) return;
+  const adminMember = useCookie("admin-member").value ?? "";
+});

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.1-staging.72",
+  "version": "3.2.2",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -41,7 +41,6 @@
     "qrcode": "^1.5.4",
     "qrcode.vue": "^3.4.1",
     "sass": "^1.80.6",
-    "sip.js": "0.21.2",
     "socket.io-client": "^4.8.3",
     "vue-draggable-next": "^2.3.0",
     "vue3-signature": "^0.2.4",

package/pages/[org]/[site]/access-mgmt/identity-mapping/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before mapping identities."
+    >
+      <HidIdentityMapping :site="siteId" :org="orgId" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
+});
+
+const route = useRoute();
+const siteId = computed(() => String(route.params.site ?? ""));
+const orgId = computed(() => String(route.params.org ?? ""));
+</script>

package/pages/[org]/[site]/access-mgmt/intercom/index.vue

@@ -5,7 +5,7 @@
       :org="orgId"
       message="Enable HID as a service for this site before configuring HID intercom."
     >
-      <HidIntercomManagement :site="siteId" :org="orgId" />
+      <HidIntercomManagement :site="siteId" />
     </HidEnabledGate>
   </v-container>
 </template>

package/plugins/secure-member.client.ts

@@ -12,40 +12,75 @@ export default defineNuxtPlugin(() => {
 
   const { userAppRole, id, orgNature } = useLocalSetup();
 
-  router.beforeEach(async (to) => {
+  router.afterEach(async (to) => {
     const isMember = to.meta?.memberOnly;
 
     if (!isMember) return;
 
     const APP = useRuntimeConfig().public.APP;
-    const org =
-      (to.params.org as string) || (to.params.organization as string) || "";
+    const org = computed(
+      () =>
+        (to.params.org as string) || (to.params.organization as string) || ""
+    );
 
-    if (!hexSchema.safeParse(org).success) {
-      return { name: "require-organization-membership" };
+    console.log('[secure-member-plugin', 'org', org.value)
+
+    if (!hexSchema.safeParse(org.value).success) {
+      return router.replace({ name: "require-organization-membership" });
     }
 
-    const userId = useCookie("user").value ?? "";
-    if (!userId) return { name: "index" };
+    const userId = computed(() => useCookie("user").value ?? "");
+
+    const { data: userMemberData, error: userMemberError } =
+      await useLazyAsyncData(
+        "plugin-get-member-by-id-" + userId.value + "-" + APP + "-" + org.value,
+        () => getByUserType(userId.value, APP, org.value),
+        { watch: [userId] }
+      );
+
+    watchEffect(() => {
+      if (userMemberError.value) {
+        console.log('running-secure-member-redirect-plugin')
+        navigateTo(
+          {
+            name: "index",
+          },
+          { replace: true }
+        );
+      }
+    });
+
+    const roleId = ref("roleId");
 
-    try {
-      const userMemberData = await getByUserType(userId, APP, org);
-      id.value = userMemberData.org ?? "";
+    watchEffect(() => {
+      if (userMemberData.value) {
+        id.value = userMemberData.value.org ?? "";
+        roleId.value = userMemberData.value.role ?? "roleId";
+      }
+    });
 
-      const [orgResult, roleResult] = await Promise.allSettled([
-        getById(org),
-        userMemberData.role ? getRoleById(userMemberData.role) : null,
-      ]);
+    const { data: getOrgByIdReq } = await useLazyAsyncData(
+      "plugin-get-org-by-id-" + org.value,
+      () => getById(org.value),
+      { watch: [org] }
+    );
 
-      if (orgResult.status === "fulfilled" && orgResult.value) {
-        orgNature.value = orgResult.value.nature ?? "";
+    watchEffect(() => {
+      if (getOrgByIdReq.value) {
+        orgNature.value = getOrgByIdReq.value.nature ?? "";
       }
+    });
 
-      if (roleResult.status === "fulfilled" && roleResult.value) {
-        userAppRole.value = roleResult.value;
+    const { data: getRoleByIdReq } = await useLazyAsyncData(
+      "plugin-get-role-by-id-" + roleId.value,
+      () => getRoleById(roleId.value),
+      { watch: [roleId] }
+    );
+
+    watchEffect(() => {
+      if (getRoleByIdReq.value) {
+        userAppRole.value = getRoleByIdReq.value;
       }
-    } catch (error) {
-      return { name: "index" };
-    }
+    });
   });
 });

package/plugins/vuetify.ts

@@ -42,8 +42,6 @@ import {
 } from "vuetify-pro-tiptap";
 import "vuetify-pro-tiptap/style.css";
 
-import { LIGHT_THEME, DARK_THEME } from "../utils/theme";
-
 export default defineNuxtPlugin((app) => {
   const vuetify = createVuetify({
     defaults: {
@@ -71,43 +69,17 @@ export default defineNuxtPlugin((app) => {
       //   hint: "This field is required",
       // },
     },
-    /**
-     * THE PRODUCT HAS TWO THEMES, AND UNTIL NOW ONLY ONE OF THEM WAS OURS.
-     *
-     * Every app shows a light/dark toggle in the app bar (Layout/Header.vue),
-     * and it sets Vuetify's built-in "light" and "dark" themes. Those were left
-     * at Vuetify's factory values, so one click on any screen in any of the
-     * eleven apps threw the brand away: `primary` stopped being the Seven365
-     * navy and became Material blue #2196F3 - and `primary` is the navigation
-     * drawer's fill - while `primary-button` and `text-primary`, used in around
-     * eighty places across the layer and the apps, do not exist in a stock
-     * theme at all, so those components lost their colour to an undefined CSS
-     * variable. There was also no way back to the brand: the toggle only ever
-     * flipped between the two stock themes.
-     *
-     * The fix is to make the stock names OURS rather than to add new names.
-     * Several components already branch on `theme.global.name === "dark"` (this
-     * layer's FormDialog, property-management's facility icons), so a
-     * differently-named dark theme would have left every one of them silently
-     * on their light branch inside a dark app. Overriding `light` and `dark`
-     * means the toggle, `v-theme-provider theme="light"`, the `plain-dark`
-     * layout and all of those comparisons keep working, and start being right.
-     *
-     * The colours themselves, and every ratio they were chosen for, are in
-     * `utils/theme.ts`, which `utils/theme.test.ts` measures on every run.
-     */
     theme: {
-      defaultTheme: "light",
+      defaultTheme: "iservice365",
       themes: {
-        light: LIGHT_THEME,
-        dark: DARK_THEME,
-        /**
-         * The name this product booted on before the two above carried the
-         * brand. Kept, and identical to `light`, so anything that asks for it
-         * by name - in an app that is not in this repository - still gets a
-         * theme rather than a blank one.
-         */
-        iservice365: LIGHT_THEME,
+        iservice365: {
+          dark: false,
+          colors: {
+            primary: "#042134",
+            "primary-button": "#1867C0",
+            "text-primary": "#052439",
+          },
+        },
       },
     },
     icons: {

package/types/site.d.ts

@@ -1,76 +1,5 @@
 declare type TSiteCreate = Pick<TSite, "name" | "description" | "orgId">;
 
-declare type THidQrCodeFormat = "0" | "1" | "2";
-
-declare type THidPermissionCategory =
-  | "resident"
-  | "property_management"
-  | "service_provider";
-
-declare type THidPermissionAssignment = {
-  subjectId: string;
-  category: THidPermissionCategory;
-  name: string;
-  subtitle?: string;
-  intercom: boolean;
-  readerId?: string;
-  location?: string;
-  locationKey?: string;
-};
-
-declare type THidSitePermissions = {
-  orgId: string;
-  site: string;
-  readerId: string;
-  location: string;
-  assignments: THidPermissionAssignment[];
-  counts: {
-    resident: number;
-    propertyManagement: number;
-    serviceProvider: number;
-    intercom: number;
-  };
-};
-
-declare type THidPermissionCandidate = THidPermissionAssignment & {
-  selected: boolean;
-};
-
-declare type THidQrCodePassConfig = {
-  enabled: boolean;
-  onlineMode?: boolean;
-  readerId: string;
-  qrFormat: THidQrCodeFormat;
-  identificationMethods?: {
-    facial: boolean;
-    card: boolean;
-    qrCode: boolean;
-    idPassword: boolean;
-    pin: boolean;
-    bluetooth: boolean;
-  };
-  printer: {
-    vendorId: string;
-    productId: string;
-  };
-  template: {
-    header: string;
-    subtext: string;
-  };
-  validityMinutes: number | null;
-  updatedAt?: string;
-};
-
-declare type TSiteMetadata = {
-  block?: number;
-  guardPosts?: number;
-  gracePeriod?: number;
-  incidentCounter?: number;
-  incidentLogo?: string;
-  services?: Record<string, unknown>[];
-  hidQrCodePass?: THidQrCodePassConfig;
-};
-
 
 declare type TSite = {
   _id?: string;

package/.changeset/camera-wall-gated-endpoint.md

@@ -1,47 +0,0 @@
----
-"@7365admin1/layer-common": patch
----
-
-Draw the camera wall from the gated wall endpoint, and show the server's own
-reason on a tile.
-
-`CameraWall` fetched its cameras from `GET /api/site-cameras` - the Settings
-panel's paginated CRUD list, which took its site from an optional query
-parameter and checked nothing about the caller. Any signed-in user from any
-organisation could read every camera in the estate through it, `host` and
-`username` included.
-
-It now calls `GET /api/site-cameras/site/:siteId/wall`, which already exists,
-which the React Native monitoring app was built against, and which is
-authorised server-side: the caller must be a member of the site, of its owning
-organisation, or work for an organisation actively engaged to serve it. That
-endpoint also returns `type: "ip"` cameras only and each camera's capability
-descriptor, so a wall cannot be handed an ANPR unit and a tile can explain
-itself.
-
-Two consequences worth stating:
-
-- **The pager is gone.** The wall endpoint returns the site's cameras in one
-  answer. Paging a video wall was an artefact of borrowing the CRUD list.
-- **A tile now prefers the server's `unavailableReason`** over the reason it
-  used to work out itself. The server knows things the browser cannot - chiefly
-  "No recorder is configured for this camera's relay", which is the true answer
-  for every camera in the estate until the API host is configured, and which the
-  wall used to replace with its own guess. Offline still beats everything, since
-  it explains every tile at once.
-
-No permission gate was invented here. Each application still gates its own menu
-entry; this component draws what it is given, and the server decides.
-
-Two smaller things in the same area:
-
-- **A refused wall now says so.** The catch-all message told every failure to
-  "check your connection", which sends somebody who simply may not see that
-  site off to debug their wifi. A 401/403/404 now reads "You do not have access
-  to this site's cameras." The server answers "not yours" and "does not exist"
-  identically, so this wording does not distinguish them either.
-- **`middleware/member.ts` is removed.** It read a cookie into an unused
-  variable and did nothing else - a file named like a membership gate that was
-  not one. No page in any of the eleven web apps referenced it. The real check
-  is `plugins/secure-member.client.ts`, driven by `memberOnly` page meta, which
-  is untouched.