easyproctor 0.0.27 → 0.0.29

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,9 @@ 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 sharedFirstScreen = tracks.find((el) => {
+    return ["screen:0:0", "Primary Monitor", ""].includes(el.label);
+  }) != null;
   if (!sharedFirstScreen && allowOnlyFirstMonitor) {
     tracks.forEach((el) => {
       el.stop();
@@ -133,11 +135,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 +163,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 +8286,7 @@ var defaultProctoringOptions = {
   captureScreen: true
 };
 var azureBlobUrl = "";
+var _captureScreen = true;
 function useProctoring(proctoringOptions, proctoringConfig) {
   ["examId", "clientId", "token"].forEach((el) => {
     const key = el;
@@ -8288,7 +8294,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 +8336,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) {
@@ -8500,6 +8507,21 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     if (!record) {
       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();
@@ -8561,7 +8583,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,9 @@ 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 sharedFirstScreen = tracks.find((el) => {
+    return ["screen:0:0", "Primary Monitor", ""].includes(el.label);
+  }) != null;
   if (!sharedFirstScreen && allowOnlyFirstMonitor) {
     tracks.forEach((el) => {
       el.stop();
@@ -8496,11 +8498,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 +8526,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 +8626,7 @@ var defaultProctoringOptions = {
   captureScreen: true
 };
 var azureBlobUrl = "";
+var _captureScreen = true;
 function useProctoring(proctoringOptions, proctoringConfig) {
   ["examId", "clientId", "token"].forEach((el) => {
     const key = el;
@@ -8628,7 +8634,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 +8676,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) {
@@ -8840,6 +8847,21 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     if (!record) {
       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();
@@ -8901,7 +8923,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.27",
+  "version": "0.0.29",
   "description": "Modulo web de gravação do EasyProctor",
   "main": "./index.js",
   "module": "./esm/index.js",