@7365admin1/layer-common 3.2.4 → 3.2.6

package/composables/useLocalAuth.ts

@@ -1,36 +1,7 @@
 export default function useLocalAuth() {
   const { cookieConfig } = useRuntimeConfig().public;
 
-  const _address = {
-    country: "",
-    address1: "",
-    address2: "",
-    city: "",
-    province: "",
-    postalCode: "",
-  };
-
-  const user = {
-    _id: "",
-    givenName: "",
-    middleName: "",
-    surname: "",
-    address: _address,
-    email: "",
-    password: "",
-    type: "",
-    createdAt: "",
-    organization: "",
-    role: "",
-    primaryPhone: "",
-    mobilePhone: "",
-    serviceProviders: [],
-  };
-
-  const currentUser = useState(
-    "currentUser",
-    (): TUser | null => JSON.parse(JSON.stringify(user))
-  );
+  const currentUser = useState<TUser | null>("currentUser", () => null);
 
   async function authenticate() {
     const user = useCookie("user", cookieConfig).value;
@@ -41,9 +12,7 @@ export default function useLocalAuth() {
       );
 
     watchEffect(() => {
-      if (getCurrentUserReq.value) {
-        currentUser.value = getCurrentUserReq.value as TUser;
-      }
+      currentUser.value = (getCurrentUserReq.value as TUser | null) ?? null;
     });
 
     watchEffect(() => {
@@ -70,6 +39,7 @@ export default function useLocalAuth() {
     useCookie("sid", cookieConfig).value = null;
     useCookie("user", cookieConfig).value = null;
     useCookie("organization", cookieConfig).value = null;
+    currentUser.value = null;
   }
 
   async function logout() {
@@ -79,17 +49,20 @@ export default function useLocalAuth() {
         await useNuxtApp().$api(`/api/auth/${sid}`, {
           method: "DELETE",
         });
-
-        clearCookies();
       } catch (error) {
         console.error("Logout failed:", error);
       }
+
+      clearCookies();
     }
   }
 
   async function getCurrentUser() {
     const user = useCookie("user", cookieConfig).value;
-    if (!user) return null;
+    if (!user) {
+      currentUser.value = null;
+      return null;
+    }
     const _user = await useNuxtApp().$api<TUser>(`/api/users/id/${user}`, {
       method: "GET",
     });

package/composables/useOrg.ts

@@ -170,7 +170,7 @@ export default function useOrg() {
 
   function updateOrg(
     id: string,
-    value: Partial<Pick<TOrg, "name" | "type" | "email" | "nature" | "contact">>
+    value: Partial<Pick<TOrg, "name" | "type" | "email" | "nature" | "contact" | "terms" | "policies">>
   ) {
     return useNuxtApp()
       .$api<Record<string, any>>(`/api/organizations/${id}`, {

package/composables/useSiteSettings.ts

@@ -99,6 +99,54 @@ 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 }[] }
@@ -175,6 +223,8 @@ export default function () {
     updateSite,
     addCamera,
     getAllSiteCameras,
+    getSiteWall,
+    getSiteHealth,
     setSiteGuardPosts,
     updateSiteCamera,
     deleteSiteCameraById,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -16,6 +16,7 @@
     "preview": "nuxt preview .playground",
     "test": "esbuild composables/useVisitorSocket.ts --format=esm --outfile=test/.build/useVisitorSocket.mjs --log-level=error && node --test \"test/*.test.mjs\"",
     "test:theme": "node --test \"utils/theme.test.ts\"",
+    "test:camera-wall": "node --test \"utils/camera-wall.test.ts\"",
     "release": "yarn run build && changeset publish"
   },
   "devDependencies": {

package/types/org.d.ts

@@ -11,4 +11,6 @@ declare type TOrg = {
   status?: string;
   deletedAt?: string;
   nature?: string;
+  terms?: string;
+  policies?: string;
 };