@7365admin1/layer-common 3.1.4-staging.56 → 3.1.4-staging.58

package/composables/useHidAmico.ts

@@ -48,6 +48,26 @@ type HidPermissionListResponse = {
   limit: number;
 };
 
+type HidFacialEnrollmentResult = {
+  user_id?: number;
+  success?: boolean;
+  scores?: Record<string, unknown>;
+  errors?: Array<{ code?: number; message?: string }>;
+};
+
+export type HidSipAccountData = {
+  orgId: string;
+  site: string;
+  userId: string;
+  extension: string;
+  username: string;
+  password: string;
+  sipAddress: string;
+  websocketUrl: string;
+  status: "active";
+  provisionedAt: string;
+};
+
 export default function useHidAmico() {
   const basePath = "/api/access-management/hid";
 
@@ -142,6 +162,33 @@ export default function useHidAmico() {
     });
   }
 
+  function setUserImage(
+    readerId: string,
+    hidUserId: string | number,
+    image: Blob,
+    options: { timestamp?: number; match?: boolean } = {},
+  ) {
+    return useNuxtApp().$api<{ data: HidFacialEnrollmentResult }>(
+      `${basePath}/readers/${readerId}/users/${hidUserId}/image`,
+      {
+        method: "PUT",
+        query: {
+          ...(options.timestamp ? { timestamp: options.timestamp } : {}),
+          match: options.match ?? true,
+        },
+        headers: { "Content-Type": "application/octet-stream" },
+        body: image,
+      },
+    );
+  }
+
+  function deleteUserImage(readerId: string, hidUserId: string | number) {
+    return useNuxtApp().$api<Record<string, unknown>>(
+      `${basePath}/readers/${readerId}/users/${hidUserId}/image`,
+      { method: "DELETE" },
+    );
+  }
+
   function createIdentity(readerId: string, payload: HidIdentityPayload) {
     return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/${readerId}/identities`, {
       method: "POST",
@@ -181,16 +228,25 @@ export default function useHidAmico() {
     });
   }
 
-  function getSitePermissions(siteId: string) {
+  function getSitePermissions(siteId: string, orgId: string, readerId: string) {
     return useNuxtApp().$api<{ data: THidSitePermissions }>(
       `${basePath}/sites/${siteId}/permissions`,
-      { method: "GET" },
+      { method: "GET", query: { orgId, readerId } },
+    );
+  }
+
+  function ensureSipAccount(siteId: string, orgId: string) {
+    return useNuxtApp().$api<{ data: HidSipAccountData }>(
+      `${basePath}/sites/${siteId}/intercom/sip-account`,
+      { method: "POST", body: { orgId } },
     );
   }
 
   function getPermissionCandidates(
     siteId: string,
     query: {
+      orgId: string;
+      readerId: string;
       category: THidPermissionCategory | "intercom";
       search?: string;
       page?: number;
@@ -205,11 +261,13 @@ export default function useHidAmico() {
 
   function updateSitePermissions(
     siteId: string,
+    orgId: string,
+    readerId: string,
     assignments: Array<Pick<THidPermissionAssignment, "subjectId" | "category" | "intercom">>,
   ) {
     return useNuxtApp().$api<{ data: THidSitePermissions; message: string }>(
       `${basePath}/sites/${siteId}/permissions`,
-      { method: "PUT", body: { assignments } },
+      { method: "PUT", body: { orgId, readerId, assignments } },
     );
   }
 
@@ -226,6 +284,8 @@ export default function useHidAmico() {
     setReaderConfiguration,
     getLogs,
     getUserImage,
+    setUserImage,
+    deleteUserImage,
     getIdentities,
     createIdentity,
     updateIdentity,
@@ -233,6 +293,7 @@ export default function useHidAmico() {
     getIntercomStatus,
     makeIntercomCall,
     finalizeIntercomCall,
+    ensureSipAccount,
     getSitePermissions,
     getPermissionCandidates,
     updateSitePermissions,

package/composables/useSipWebPhone.ts

@@ -25,6 +25,9 @@ export default function useSipWebPhone() {
   const callState = ref<CallState>("idle");
   const errorMessage = ref("");
   const muted = ref(false);
+  const cameraEnabled = ref(false);
+  const localVideoAvailable = ref(false);
+  const remoteVideoAvailable = ref(false);
   const currentTarget = ref("");
   const activeConfig = shallowRef<SipWebPhoneConfig>();
 
@@ -38,9 +41,30 @@ export default function useSipWebPhone() {
     connectionState.value = "connecting";
     errorMessage.value = "";
     activeConfig.value = { ...config };
+    let clearRegistrationTimer = () => {};
 
     try {
       const { SimpleUser: SimpleUserConstructor } = await import("sip.js/lib/platform/web");
+      let registrationSettled = false;
+      let resolveRegistration: (() => void) | undefined;
+      let rejectRegistration: ((error: Error) => void) | undefined;
+      const registrationPromise = new Promise<void>((resolve, reject) => {
+        resolveRegistration = resolve;
+        rejectRegistration = reject;
+      });
+      const registrationTimeout = globalThis.setTimeout(() => {
+        if (registrationSettled) return;
+        registrationSettled = true;
+        rejectRegistration?.(new Error("SIP registration timed out. Check the WebSocket server and account credentials."));
+      }, 15000);
+      clearRegistrationTimer = () => globalThis.clearTimeout(registrationTimeout);
+      const settleRegistration = (error?: Error) => {
+        if (registrationSettled) return;
+        registrationSettled = true;
+        clearRegistrationTimer();
+        if (error) rejectRegistration?.(error);
+        else resolveRegistration?.();
+      };
       const delegate: SimpleUserDelegate = {
         onCallCreated: () => {
           if (callState.value !== "incoming") callState.value = "calling";
@@ -51,17 +75,30 @@ export default function useSipWebPhone() {
         },
         onCallAnswered: () => {
           callState.value = "active";
+          syncVideoState();
+        },
+        onCallHangup: () => {
+          const previousState = callState.value;
+          resetCall();
+          if (previousState === "calling") {
+            errorMessage.value = "The call was not answered or was rejected by the destination.";
+          }
         },
-        onCallHangup: () => resetCall(),
         onRegistered: () => {
           connectionState.value = "registered";
+          settleRegistration();
         },
         onUnregistered: () => {
+          if (connectionState.value === "connecting") {
+            settleRegistration(new Error("SIP registration was rejected. Check the username and password."));
+          }
           connectionState.value = "disconnected";
         },
-        onServerDisconnect: (error) => {
-          connectionState.value = error ? "error" : "disconnected";
-          if (error) errorMessage.value = error.message;
+        onServerDisconnect: () => {
+          const error = new Error("The SIP WebSocket server disconnected during registration.");
+          connectionState.value = "error";
+          errorMessage.value = error.message;
+          settleRegistration(error);
           resetCall();
         },
       };
@@ -87,7 +124,9 @@ export default function useSipWebPhone() {
       simpleUser.value = user;
       await user.connect();
       await user.register();
+      await registrationPromise;
     } catch (error) {
+      clearRegistrationTimer();
       await disconnect(false);
       connectionState.value = "error";
       errorMessage.value = getErrorMessage(error);
@@ -159,18 +198,65 @@ export default function useSipWebPhone() {
 
   function toggleMute() {
     const user = requireUser();
-    if (muted.value) {
-      user.unmute();
-    } else {
-      user.mute();
+    const tracks = user.localMediaStream?.getAudioTracks() || [];
+    if (!tracks.length) throw new Error("No microphone track is available for this call.");
+    const enable = muted.value;
+    tracks.forEach((track) => {
+      track.enabled = enable;
+    });
+    muted.value = !enable;
+  }
+
+  function toggleCamera() {
+    const user = requireUser();
+    const tracks = user.localMediaStream?.getVideoTracks() || [];
+    if (!tracks.length) throw new Error("No camera track is available. Reconnect the web phone with video enabled.");
+    const enable = !cameraEnabled.value;
+    tracks.forEach((track) => {
+      track.enabled = enable;
+    });
+    cameraEnabled.value = enable;
+  }
+
+  function syncVideoState() {
+    const user = simpleUser.value;
+    const localStream = user?.localMediaStream;
+    const remoteStream = user?.remoteMediaStream;
+    const localTrack = localStream?.getVideoTracks()[0];
+    const remoteTrack = remoteStream?.getVideoTracks()[0];
+
+    const updateState = () => {
+      const currentLocalTrack = localStream?.getVideoTracks()[0];
+      const currentRemoteTrack = remoteStream?.getVideoTracks()[0];
+      localVideoAvailable.value = Boolean(currentLocalTrack && currentLocalTrack.readyState === "live");
+      remoteVideoAvailable.value = Boolean(currentRemoteTrack && currentRemoteTrack.readyState === "live");
+      cameraEnabled.value = Boolean(currentLocalTrack?.enabled);
+    };
+
+    updateState();
+    if (localStream) localStream.onaddtrack = updateState;
+    if (remoteStream) remoteStream.onaddtrack = updateState;
+
+    if (localTrack) {
+      localTrack.onended = () => {
+        localVideoAvailable.value = false;
+        cameraEnabled.value = false;
+      };
+    }
+    if (remoteTrack) {
+      remoteTrack.onended = () => {
+        remoteVideoAvailable.value = false;
+      };
     }
-    muted.value = user.isMuted();
   }
 
   function resetCall() {
     callState.value = "idle";
     currentTarget.value = "";
     muted.value = false;
+    cameraEnabled.value = false;
+    localVideoAvailable.value = false;
+    remoteVideoAvailable.value = false;
   }
 
   function requireRegisteredUser() {
@@ -193,6 +279,9 @@ export default function useSipWebPhone() {
     callState: readonly(callState),
     errorMessage: readonly(errorMessage),
     muted: readonly(muted),
+    cameraEnabled: readonly(cameraEnabled),
+    localVideoAvailable: readonly(localVideoAvailable),
+    remoteVideoAvailable: readonly(remoteVideoAvailable),
     currentTarget: readonly(currentTarget),
     isRegistered,
     hasCall,
@@ -203,6 +292,7 @@ export default function useSipWebPhone() {
     decline,
     hangup,
     toggleMute,
+    toggleCamera,
   };
 }
 
@@ -232,5 +322,11 @@ function normalizeDestination(target: string, aor: string) {
 }
 
 function getErrorMessage(error: unknown) {
+  if (error instanceof DOMException && error.name === "NotAllowedError") {
+    return "Camera or microphone permission was denied. Allow media access in the browser and reconnect the web phone.";
+  }
+  if (error instanceof DOMException && error.name === "NotFoundError") {
+    return "No camera or microphone was found for this video call.";
+  }
   return error instanceof Error ? error.message : "SIP connection failed.";
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.1.4-staging.56",
+  "version": "3.1.4-staging.58",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

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" />
+      <HidIntercomManagement :site="siteId" :org="orgId" />
     </HidEnabledGate>
   </v-container>
 </template>

package/types/site.d.ts

@@ -13,10 +13,16 @@ declare type THidPermissionAssignment = {
   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;