easyproctor 0.0.26 → 0.0.30

package/esm/index.js

@@ -2,7 +2,7 @@
 function recorder(stream, buffer) {
   let resolvePromise;
   const options = {
-    mimeType: "video/webm; codecs=vp9",
+    mimeType: "video/webm",
     videoBitsPerSecond: 128e3,
     audioBitsPerSecond: 64 * 1e3
   };
@@ -70,7 +70,16 @@ async function startScreenCapture(buffer, options) {
   const screenStream = await navigator.mediaDevices.getDisplayMedia(displayMediaStreamConstraints);
   const tracks = screenStream.getVideoTracks();
   tracks[0].onended = onStopSharingScreenCallback;
-  const sharedFirstScreen = tracks.find((el) => el.getSettings().deviceId == "screen:0:0") != null;
+  const isFirefox = navigator.userAgent.indexOf("Firefox") > -1;
+  if (isFirefox) {
+    const hasMultipleMonitors = !tracks.find((el) => el.label == "Primary Monitor");
+    if (hasMultipleMonitors) {
+      throw MULTIPLE_MONITORS_DETECTED;
+    }
+  }
+  const sharedFirstScreen = tracks.find((el) => {
+    return ["screen:0:0", "Primary Monitor"].includes(el.label);
+  }) != null;
   if (!sharedFirstScreen && allowOnlyFirstMonitor) {
     tracks.forEach((el) => {
       el.stop();
@@ -133,11 +142,11 @@ async function makeRequest(data) {
 async function enumarateDevices() {
   const mediaDevices = await navigator.mediaDevices.enumerateDevices();
   const devices = {
-    cameras: mediaDevices.filter((el) => el.kind == "videoinput" && el.deviceId && el.label).map((e) => {
-      return { label: e.label, id: e.deviceId };
+    cameras: mediaDevices.filter((el) => el.kind == "videoinput" && el.deviceId).map((e) => {
+      return { label: e.label || "Generic Device", id: e.deviceId };
     }),
-    microphones: mediaDevices.filter((el) => el.kind == "audioinput" && el.deviceId && el.label).map((e) => {
-      return { label: e.label, id: e.deviceId };
+    microphones: mediaDevices.filter((el) => el.kind == "audioinput" && el.deviceId).map((e) => {
+      return { label: e.label || "Generic Device", id: e.deviceId };
     })
   };
   return devices;
@@ -161,6 +170,9 @@ async function checkPermissions() {
 }
 async function checkIfhasMultipleMonitors() {
   return new Promise((resolve, reject) => {
+    if (typeof PresentationRequest === "undefined") {
+      resolve(false);
+    }
     const presentationRequest = new PresentationRequest("receiver.html");
     presentationRequest.getAvailability().then((availability) => {
       let hasMultipleMonitors = availability.value;
@@ -8281,6 +8293,7 @@ var defaultProctoringOptions = {
   captureScreen: true
 };
 var azureBlobUrl = "";
+var _captureScreen = true;
 function useProctoring(proctoringOptions, proctoringConfig) {
   ["examId", "clientId", "token"].forEach((el) => {
     const key = el;
@@ -8288,7 +8301,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       throw REQUIRED_FIELD_NOT_PROVIDED + ": " + key;
     }
   });
-  if (!navigator.mediaDevices.getDisplayMedia || !window.indexedDB || typeof PresentationRequest === "undefined") {
+  if (!navigator.mediaDevices.getDisplayMedia || !window.indexedDB) {
     throw INCOMPATIBLE_NAVIGATOR;
   }
   function download(file) {
@@ -8330,6 +8343,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     let cancelCameraCapture = null;
     let cancelScreenCapture = null;
     const { cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen } = options;
+    _captureScreen = captureScreen;
     try {
       let _screenStream = void 0;
       if (captureScreen) {
@@ -8364,12 +8378,14 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     }
   }
   const _onLostFocus = () => {
-    onLostFocusCallback && onLostFocusCallback();
-    alerts.push({
-      begin: Date.now() - startTime,
-      alert: 25,
-      end: 0
-    });
+    if (Date.now() - startTime > 1e4) {
+      onLostFocusCallback && onLostFocusCallback();
+      alerts.push({
+        begin: Date.now() - startTime,
+        alert: 25,
+        end: 0
+      });
+    }
   };
   const _onReturnFocus = () => {
     const lastAlert = alerts[alerts.length - 1];
@@ -8408,9 +8424,14 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       azureBlobUrl = proctoringConfig.azureBlobUrl;
       setBaseUrl(proctoringConfig.baseUrl);
     } else {
-      setConfiguration("iarisprod", "iaris", "?sv=2020-08-04&ss=bfqt&srt=sco&sp=rwdlacupitfx&se=2025-12-28T06:34:02Z&st=2021-12-27T22:34:02Z&spr=https&sig=1rsgx389pHZCnJYd44peuWSfeCUdN8bQ9EfcLoMOdDc%3D");
-      azureBlobUrl = "https://iarisprod.blob.core.windows.net/iaris";
-      setBaseUrl("https://iaris.easyproctor.tech/api");
+      const config = await makeRequest({
+        url: `/AzureKey`,
+        method: "GET",
+        jwt: proctoringOptions.token
+      });
+      setConfiguration(config.account, config.containerName, config.sas);
+      azureBlobUrl = config.azureBlobUrl;
+      setBaseUrl(config.baseUrl);
     }
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
@@ -8493,9 +8514,23 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     const { onProgress } = options;
     const record = await getRecord("exams");
     if (!record) {
-      console.log("OXE");
       throw PROCTORING_NOT_STARTED;
     }
+    try {
+      if (azureBlobUrl == "") {
+        const config = await makeRequest({
+          url: `/AzureKey`,
+          method: "GET",
+          jwt: proctoringOptions.token
+        });
+        setConfiguration(config.account, config.containerName, config.sas);
+        azureBlobUrl = config.azureBlobUrl;
+        setBaseUrl(config.baseUrl);
+      }
+    } catch (error) {
+      trackers.registerError(proctoringId, "Erro ao buscar credenciais!");
+      throw "Erro ao buscar credenciais!";
+    }
     onStopSharingScreenCallback = void 0;
     if (cancelCallback) {
       await cancelCallback();
@@ -8557,7 +8592,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         body: {
           endDate: time,
           videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[0].videoCameraUrl,
-          videoScreenUrl: `${azureBlobUrl}/` + sessionsDto[0].videoScreenUrl
+          videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[0].videoScreenUrl : ""
         },
         jwt: proctoringOptions.token
       });

package/index.js

@@ -8365,7 +8365,7 @@ __export(exports, {
 function recorder(stream, buffer) {
   let resolvePromise;
   const options = {
-    mimeType: "video/webm; codecs=vp9",
+    mimeType: "video/webm",
     videoBitsPerSecond: 128e3,
     audioBitsPerSecond: 64 * 1e3
   };
@@ -8433,7 +8433,16 @@ async function startScreenCapture(buffer, options) {
   const screenStream = await navigator.mediaDevices.getDisplayMedia(displayMediaStreamConstraints);
   const tracks = screenStream.getVideoTracks();
   tracks[0].onended = onStopSharingScreenCallback;
-  const sharedFirstScreen = tracks.find((el) => el.getSettings().deviceId == "screen:0:0") != null;
+  const isFirefox = navigator.userAgent.indexOf("Firefox") > -1;
+  if (isFirefox) {
+    const hasMultipleMonitors = !tracks.find((el) => el.label == "Primary Monitor");
+    if (hasMultipleMonitors) {
+      throw MULTIPLE_MONITORS_DETECTED;
+    }
+  }
+  const sharedFirstScreen = tracks.find((el) => {
+    return ["screen:0:0", "Primary Monitor"].includes(el.label);
+  }) != null;
   if (!sharedFirstScreen && allowOnlyFirstMonitor) {
     tracks.forEach((el) => {
       el.stop();
@@ -8496,11 +8505,11 @@ async function makeRequest(data) {
 async function enumarateDevices() {
   const mediaDevices = await navigator.mediaDevices.enumerateDevices();
   const devices = {
-    cameras: mediaDevices.filter((el) => el.kind == "videoinput" && el.deviceId && el.label).map((e) => {
-      return { label: e.label, id: e.deviceId };
+    cameras: mediaDevices.filter((el) => el.kind == "videoinput" && el.deviceId).map((e) => {
+      return { label: e.label || "Generic Device", id: e.deviceId };
     }),
-    microphones: mediaDevices.filter((el) => el.kind == "audioinput" && el.deviceId && el.label).map((e) => {
-      return { label: e.label, id: e.deviceId };
+    microphones: mediaDevices.filter((el) => el.kind == "audioinput" && el.deviceId).map((e) => {
+      return { label: e.label || "Generic Device", id: e.deviceId };
     })
   };
   return devices;
@@ -8524,6 +8533,9 @@ async function checkPermissions() {
 }
 async function checkIfhasMultipleMonitors() {
   return new Promise((resolve, reject) => {
+    if (typeof PresentationRequest === "undefined") {
+      resolve(false);
+    }
     const presentationRequest = new PresentationRequest("receiver.html");
     presentationRequest.getAvailability().then((availability) => {
       let hasMultipleMonitors = availability.value;
@@ -8621,6 +8633,7 @@ var defaultProctoringOptions = {
   captureScreen: true
 };
 var azureBlobUrl = "";
+var _captureScreen = true;
 function useProctoring(proctoringOptions, proctoringConfig) {
   ["examId", "clientId", "token"].forEach((el) => {
     const key = el;
@@ -8628,7 +8641,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       throw REQUIRED_FIELD_NOT_PROVIDED + ": " + key;
     }
   });
-  if (!navigator.mediaDevices.getDisplayMedia || !window.indexedDB || typeof PresentationRequest === "undefined") {
+  if (!navigator.mediaDevices.getDisplayMedia || !window.indexedDB) {
     throw INCOMPATIBLE_NAVIGATOR;
   }
   function download(file) {
@@ -8670,6 +8683,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     let cancelCameraCapture = null;
     let cancelScreenCapture = null;
     const { cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen } = options;
+    _captureScreen = captureScreen;
     try {
       let _screenStream = void 0;
       if (captureScreen) {
@@ -8704,12 +8718,14 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     }
   }
   const _onLostFocus = () => {
-    onLostFocusCallback && onLostFocusCallback();
-    alerts.push({
-      begin: Date.now() - startTime,
-      alert: 25,
-      end: 0
-    });
+    if (Date.now() - startTime > 1e4) {
+      onLostFocusCallback && onLostFocusCallback();
+      alerts.push({
+        begin: Date.now() - startTime,
+        alert: 25,
+        end: 0
+      });
+    }
   };
   const _onReturnFocus = () => {
     const lastAlert = alerts[alerts.length - 1];
@@ -8748,9 +8764,14 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       azureBlobUrl = proctoringConfig.azureBlobUrl;
       setBaseUrl(proctoringConfig.baseUrl);
     } else {
-      setConfiguration("iarisprod", "iaris", "?sv=2020-08-04&ss=bfqt&srt=sco&sp=rwdlacupitfx&se=2025-12-28T06:34:02Z&st=2021-12-27T22:34:02Z&spr=https&sig=1rsgx389pHZCnJYd44peuWSfeCUdN8bQ9EfcLoMOdDc%3D");
-      azureBlobUrl = "https://iarisprod.blob.core.windows.net/iaris";
-      setBaseUrl("https://iaris.easyproctor.tech/api");
+      const config = await makeRequest({
+        url: `/AzureKey`,
+        method: "GET",
+        jwt: proctoringOptions.token
+      });
+      setConfiguration(config.account, config.containerName, config.sas);
+      azureBlobUrl = config.azureBlobUrl;
+      setBaseUrl(config.baseUrl);
     }
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
@@ -8833,9 +8854,23 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     const { onProgress } = options;
     const record = await getRecord("exams");
     if (!record) {
-      console.log("OXE");
       throw PROCTORING_NOT_STARTED;
     }
+    try {
+      if (azureBlobUrl == "") {
+        const config = await makeRequest({
+          url: `/AzureKey`,
+          method: "GET",
+          jwt: proctoringOptions.token
+        });
+        setConfiguration(config.account, config.containerName, config.sas);
+        azureBlobUrl = config.azureBlobUrl;
+        setBaseUrl(config.baseUrl);
+      }
+    } catch (error) {
+      trackers.registerError(proctoringId, "Erro ao buscar credenciais!");
+      throw "Erro ao buscar credenciais!";
+    }
     onStopSharingScreenCallback = void 0;
     if (cancelCallback) {
       await cancelCallback();
@@ -8897,7 +8932,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         body: {
           endDate: time,
           videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[0].videoCameraUrl,
-          videoScreenUrl: `${azureBlobUrl}/` + sessionsDto[0].videoScreenUrl
+          videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[0].videoScreenUrl : ""
         },
         jwt: proctoringOptions.token
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easyproctor",
-  "version": "0.0.26",
+  "version": "0.0.30",
   "description": "Modulo web de gravação do EasyProctor",
   "main": "./index.js",
   "module": "./esm/index.js",