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

package/components/HidIntercomManagement.vue

@@ -234,6 +234,13 @@
             <v-radio label="UDP" value="UDP" />
             <v-radio label="TCP" value="TCP" />
           </v-radio-group>
+          <div class="sip-switch-row sip-section-switch">
+            <div>
+              <span>Enable video</span>
+              <small>Allow this reader to send and receive video during SIP calls.</small>
+            </div>
+            <v-switch v-model="sipForm.videoEnabled" :disabled="!sipForm.enabled" color="success" density="compact" hide-details />
+          </div>
         </v-card-text>
         <v-card-actions class="dialog-actions pa-0">
           <v-btn class="text-none action-cancel" variant="flat" height="44" @click="sipDialog = false">Cancel</v-btn>
@@ -446,14 +453,27 @@
           </div>
 
           <div class="web-phone-console">
-            <div class="web-phone-media" :class="{ 'has-video': webPhoneForm.video && webPhone.callState.value === 'active' }">
+            <div
+              class="web-phone-media"
+              :class="{
+                'has-video': webPhoneForm.video && webPhone.callState.value === 'active',
+                'has-local-video': webPhone.localVideoAvailable.value,
+                'has-remote-video': webPhone.remoteVideoAvailable.value,
+              }"
+            >
               <video ref="remoteVideoEl" autoplay playsinline class="remote-video" />
               <video ref="localVideoEl" autoplay muted playsinline class="local-video" />
               <audio ref="remoteAudioEl" autoplay />
-              <div v-if="!webPhoneForm.video || webPhone.callState.value !== 'active'" class="audio-call-state">
+              <div
+                v-if="!webPhoneForm.video || webPhone.callState.value !== 'active' || !webPhone.remoteVideoAvailable.value"
+                class="audio-call-state"
+              >
                 <v-icon size="54">{{ webPhoneCallIcon }}</v-icon>
                 <strong>{{ webPhoneCallLabel }}</strong>
                 <span v-if="webPhone.currentTarget.value">{{ webPhone.currentTarget.value }}</span>
+                <span v-if="webPhoneForm.video && webPhone.callState.value === 'active' && !webPhone.remoteVideoAvailable.value">
+                  Waiting for video from the other device
+                </span>
               </div>
             </div>
 
@@ -507,7 +527,15 @@
                   variant="outlined"
                   :disabled="webPhone.callState.value !== 'active'"
                   :title="webPhone.muted.value ? 'Unmute' : 'Mute'"
-                  @click="webPhone.toggleMute"
+                  @click="toggleWebMute"
+                />
+                <v-btn
+                  v-if="webPhoneForm.video"
+                  :icon="webPhone.cameraEnabled.value ? 'mdi-video' : 'mdi-video-off'"
+                  variant="outlined"
+                  :disabled="webPhone.callState.value !== 'active' || !webPhone.localVideoAvailable.value"
+                  :title="webPhone.cameraEnabled.value ? 'Turn camera off' : 'Turn camera on'"
+                  @click="toggleWebCamera"
                 />
                 <v-btn
                   icon="mdi-phone-hangup"
@@ -631,7 +659,7 @@ type DetailItem = {
 };
 
 type IntercomRow = {
-  reader: Record<string, any>;
+  reader: Record<string, unknown>;
   name: string;
   location: string;
   serverAddress: string;
@@ -647,6 +675,7 @@ type IntercomRow = {
   password: string;
   operatingMode: string;
   protocol: string;
+  videoEnabled: boolean;
   dialMode: string;
   dialModeLabel: string;
   dialCode: string;
@@ -659,7 +688,7 @@ type IntercomRow = {
   externalDialButton: boolean;
   unknownContact: boolean;
   callAfter: string;
-  pjsip: Record<string, any>;
+  pjsip: Record<string, unknown>;
 };
 
 const {
@@ -753,6 +782,7 @@ const sipForm = reactive({
   password: "",
   operatingMode: "sip-client",
   protocol: "UDP",
+  videoEnabled: false,
 });
 
 const callForm = reactive({
@@ -863,6 +893,7 @@ const intercomDetailSections = computed(() => {
       items: [
         { label: "Operating Mode", value: row?.operatingMode },
         { label: "Protocol", value: row?.protocol },
+        { label: "Video", value: row?.videoEnabled ? "Enabled" : "Disabled" },
       ],
     },
     {
@@ -1005,7 +1036,7 @@ function paginate<T>(items: T[]) {
   return items.slice(start, start + limit);
 }
 
-function toIntercomRow(reader: Record<string, any>, pjsip: Record<string, any>, status: string): IntercomRow {
+function toIntercomRow(reader: Record<string, unknown>, pjsip: Record<string, unknown>, status: string): IntercomRow {
   const peerToPeer = toFlag(getPjsipValue(pjsip, ["peer_to_peer_enabled", "peerToPeerEnabled"])) === "1";
   const dialMode = toText(getPjsipValue(pjsip, ["dialing_display_mode", "dialingDisplayMode"]), "0");
   const initialRtpPort = toText(getPjsipValue(pjsip, ["server_outbound_port", "initialRtpPort", "initial_rtp_port"]), "N/A");
@@ -1019,13 +1050,13 @@ function toIntercomRow(reader: Record<string, any>, pjsip: Record<string, any>,
 
   return {
     reader,
-    name: reader.name || reader.deviceId || "HID Reader",
-    location: reader.location || "N/A",
+    name: toText(reader.name || reader.deviceId, "HID Reader"),
+    location: toText(reader.location, "N/A"),
     serverAddress: toText(getPjsipValue(pjsip, ["server_ip", "serverAddress", "server_address", "serverIp"]), "N/A"),
     serverPort: toText(getPjsipValue(pjsip, ["server_port", "serverPort", "port"]), "N/A"),
     initialRtpPort,
     finalRtpPort,
-    monitorPath: reader.monitorPath || "N/A",
+    monitorPath: toText(reader.monitorPath, "N/A"),
     status,
     sipEnabled: toFlag(getPjsipValue(pjsip, ["enabled"])) === "1",
     numericExtension: toFlag(getPjsipValue(pjsip, ["numeric_branch_enabled", "numericExtension", "numericExtensionEnabled"])) === "1",
@@ -1034,6 +1065,7 @@ function toIntercomRow(reader: Record<string, any>, pjsip: Record<string, any>,
     password: toText(getPjsipValue(pjsip, ["password"]), ""),
     operatingMode: peerToPeer ? "Peer-to-Peer" : "SIP Client",
     protocol: toText(getPjsipValue(pjsip, ["protocol"]), "UDP"),
+    videoEnabled: toFlag(getPjsipValue(pjsip, ["video_enabled", "videoEnabled"])) === "1",
     dialMode,
     dialModeLabel: getDialModeLabel(dialMode),
     dialCode: toText(getPjsipValue(pjsip, ["open_door_command", "dialCode"]), "N/A"),
@@ -1050,7 +1082,7 @@ function toIntercomRow(reader: Record<string, any>, pjsip: Record<string, any>,
   };
 }
 
-function normalizePjsip(...sources: Record<string, any>[]) {
+function normalizePjsip(...sources: Record<string, unknown>[]) {
   for (const source of sources) {
     const candidate = findPjsipCandidate(source);
     if (candidate) return candidate;
@@ -1058,42 +1090,43 @@ function normalizePjsip(...sources: Record<string, any>[]) {
   return {};
 }
 
-function findPjsipCandidate(source: Record<string, any> | undefined): Record<string, any> | undefined {
+function findPjsipCandidate(source: Record<string, unknown> | undefined): Record<string, unknown> | undefined {
   if (!source || typeof source !== "object") return undefined;
   const candidates = [
     source.pjsip,
-    source.configuration?.pjsip,
-    source.result?.pjsip,
-    source.result?.configuration?.pjsip,
-    source.data?.pjsip,
-    source.data?.configuration?.pjsip,
-    source.data?.result?.pjsip,
-    source.data?.result?.configuration?.pjsip,
-    source.data?.data?.pjsip,
-    source.data?.data?.configuration?.pjsip,
-    source.configuration,
-    source.data?.configuration,
-    source.data?.data?.configuration,
+    toRecord(source.pjsip),
+    toRecord(toRecord(source.configuration).pjsip),
+    toRecord(toRecord(source.result).pjsip),
+    toRecord(toRecord(toRecord(source.result).configuration).pjsip),
+    toRecord(toRecord(source.data).pjsip),
+    toRecord(toRecord(toRecord(source.data).configuration).pjsip),
+    toRecord(toRecord(toRecord(source.data).result).pjsip),
+    toRecord(toRecord(toRecord(toRecord(source.data).result).configuration).pjsip),
+    toRecord(toRecord(toRecord(source.data).data).pjsip),
+    toRecord(toRecord(toRecord(toRecord(source.data).data).configuration).pjsip),
+    toRecord(source.configuration),
+    toRecord(toRecord(source.data).configuration),
+    toRecord(toRecord(toRecord(source.data).data).configuration),
     source,
   ];
 
   return candidates.find((candidate) => isPjsipCandidate(candidate));
 }
 
-function isPjsipCandidate(value: unknown): value is Record<string, any> {
+function isPjsipCandidate(value: unknown): value is Record<string, unknown> {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
   return pjsipKeys.some((key) => Object.prototype.hasOwnProperty.call(value, key)) ||
     ["serverAddress", "serverIp", "serverPort", "extension", "peerToPeerEnabled"].some((key) => Object.prototype.hasOwnProperty.call(value, key));
 }
 
-function getPjsipValue(source: Record<string, any>, keys: string[]) {
+function getPjsipValue(source: Record<string, unknown>, keys: string[]) {
   for (const key of keys) {
     if (source?.[key] !== undefined && source?.[key] !== null && source?.[key] !== "") return source[key];
   }
   return undefined;
 }
 
-function normalizeStatus(response: Record<string, any>, pjsip: Record<string, any>) {
+function normalizeStatus(response: Record<string, unknown>, pjsip: Record<string, unknown>) {
   const status = Number(response?.status);
   if (toFlag(pjsip.enabled) === "0" || status === -1) return "Disabled";
   if (status === 200) return "Connected";
@@ -1133,6 +1166,7 @@ function openSipDialog(row: IntercomRow) {
   sipForm.password = row.password;
   sipForm.operatingMode = row.operatingMode === "Peer-to-Peer" ? "peer-to-peer" : "sip-client";
   sipForm.protocol = row.protocol || "UDP";
+  sipForm.videoEnabled = row.videoEnabled;
   sipDialog.value = true;
 }
 
@@ -1172,6 +1206,7 @@ function openWebPhoneDialog(row?: IntercomRow) {
     selectedRow.value = activeRow;
     if (!webPhone.isRegistered.value && activeRow.extension !== "N/A") {
       webPhoneForm.destination = activeRow.extension;
+      webPhoneForm.video = activeRow.videoEnabled;
     }
   }
   webPhoneDialog.value = true;
@@ -1240,7 +1275,7 @@ async function startWebCall() {
   webPhoneActionLoading.value = true;
   try {
     await webPhone.call(webPhoneForm.destination);
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
     webPhoneActionLoading.value = false;
@@ -1251,7 +1286,7 @@ async function answerWebCall() {
   webPhoneActionLoading.value = true;
   try {
     await webPhone.answer();
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
     webPhoneActionLoading.value = false;
@@ -1262,7 +1297,7 @@ async function declineWebCall() {
   webPhoneActionLoading.value = true;
   try {
     await webPhone.decline();
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
     webPhoneActionLoading.value = false;
@@ -1273,13 +1308,29 @@ async function hangupWebCall() {
   webPhoneActionLoading.value = true;
   try {
     await webPhone.hangup();
-  } catch (error: any) {
+  } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
     webPhoneActionLoading.value = false;
   }
 }
 
+function toggleWebCamera() {
+  try {
+    webPhone.toggleCamera();
+  } catch (error: unknown) {
+    showMessage(getErrorMessage(error), "error");
+  }
+}
+
+function toggleWebMute() {
+  try {
+    webPhone.toggleMute();
+  } catch (error: unknown) {
+    showMessage(getErrorMessage(error), "error");
+  }
+}
+
 function openContactDialog(contact?: ContactRow) {
   selectedContact.value = contact || null;
   contactForm.id = contact?.id;
@@ -1328,6 +1379,7 @@ async function saveSipSettings() {
     login: isPeerToPeer ? "" : sipForm.login,
     password: isPeerToPeer ? "" : sipForm.password,
     peer_to_peer_enabled: isPeerToPeer ? "1" : "0",
+    video_enabled: sipForm.videoEnabled ? "1" : "0",
   });
   if (saved) {
     sipDialog.value = false;
@@ -1852,6 +1904,20 @@ export default {
   margin-bottom: 12px;
 }
 
+.sip-section-switch > div {
+  display: flex;
+  min-width: 0;
+  padding: 8px 12px 8px 0;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.sip-section-switch small {
+  color: #667085;
+  font-size: 10px;
+  line-height: 1.4;
+}
+
 .sip-switch-row :deep(.v-switch) {
   flex: 0 0 auto;
 }
@@ -2392,7 +2458,7 @@ export default {
   object-fit: cover;
 }
 
-.web-phone-media.has-video .remote-video {
+.web-phone-media.has-remote-video .remote-video {
   display: block;
 }
 
@@ -2409,10 +2475,14 @@ export default {
   object-fit: cover;
 }
 
-.web-phone-media.has-video .local-video {
+.web-phone-media.has-local-video .local-video {
   display: block;
 }
 
+.web-phone-media.has-remote-video .audio-call-state {
+  display: none;
+}
+
 .audio-call-state {
   display: flex;
   align-items: center;

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.57",
+  "version": "3.1.4-staging.58",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {