easyproctor 0.0.82 → 0.0.83

package/index.js

@@ -33386,7 +33386,9 @@ var eventNames = {
   START: "start",
   FINISH: "finish",
   ERROR: "error",
-  UPLOAD_VIDEO: "upload_video"
+  UPLOAD_VIDEO: "upload_video",
+  START_RECORD: "start_record",
+  FILE: "file"
 };
 var trackError = (exception) => insights.trackException({ exception });
 var registerCustomEvent = (eventName, properties) => insights.trackEvent({ name: eventName, properties });
@@ -33397,7 +33399,8 @@ var trackers = {
   registerStart: (proctoringId, success, description) => registerCustomEvent(eventNames.START, { proctoringId, success, description }),
   registerFinish: (proctoringId, success, description) => registerCustomEvent(eventNames.FINISH, { proctoringId, success, description }),
   registerError: (proctoringId, description) => registerCustomEvent(eventNames.ERROR, { proctoringId, description }),
-  registerUploadVideo: (proctoringId, success, description, uploadTime) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, success, description, uploadTime })
+  registerUploadVideo: (proctoringId, success, description, uploadTime) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, success, description, uploadTime }),
+  registerRecord: (proctoringId, success, description) => registerCustomEvent(eventNames.START_RECORD, { proctoringId, success, description })
 };
 
 // node_modules/axios/lib/helpers/bind.js
@@ -35790,7 +35793,6 @@ var axios_default2 = axios_default;
 // src/modules/http.ts
 var baseUrl = "https://proctoring-api.easyproctor.tech/api";
 async function setBaseUrl(homol) {
-  console.log("homol -> ", homol);
   if (homol)
     baseUrl = "https://proctoring-api-hml.easyproctor.tech/api";
 }
@@ -35843,9 +35845,6 @@ async function setConfiguration(_account, _cointainerName, _sas) {
   containerName = _cointainerName;
   sas = _sas;
   blobServiceClient = new import_storage_blob.BlobServiceClient(`https://${account}.blob.core.windows.net${sas}`);
-  console.log(account);
-  console.log(containerName);
-  console.log(sas);
 }
 function sendError(proctoringId) {
   trackers.registerError(proctoringId, message);
@@ -36123,16 +36122,33 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     try {
       let _screenStream = void 0;
       if (captureScreen) {
-        const { screenStream, stopScreenRecorder } = await startScreenCapture(screenBuffer, {
-          allowOnlyFirstMonitor,
-          onStopSharingScreenCallback: () => onStopSharingScreenCallback && onStopSharingScreenCallback()
-        });
-        cancelScreenCapture = stopScreenRecorder;
-        _screenStream = screenStream;
+        try {
+          const { screenStream, stopScreenRecorder } = await startScreenCapture(screenBuffer, {
+            allowOnlyFirstMonitor,
+            onStopSharingScreenCallback: () => onStopSharingScreenCallback && onStopSharingScreenCallback()
+          });
+          cancelScreenCapture = stopScreenRecorder;
+          trackers.registerRecord(proctoringId, true, `Start Screen Recorder`);
+          _screenStream = screenStream;
+        } catch (e) {
+          trackers.registerRecord(proctoringId, false, `Start Screen Recorder Error: ${e}`);
+        }
+      }
+      let cameraStream = new MediaStream();
+      try {
+        const cameraCaptureResponse = await startCameraCapture(cameraBuffer, { cameraId, microphoneId }, videoOptions);
+        cameraStream = cameraCaptureResponse.cameraStream;
+        cancelCameraCapture = await cameraCaptureResponse.stopCameraRecording;
+        trackers.registerRecord(proctoringId, true, `Start Camera Recorder`);
+      } catch (e) {
+        trackers.registerRecord(proctoringId, false, `Start Camera Recorder Error: ${e}`);
+      }
+      try {
+        startAudio();
+        trackers.registerRecord(proctoringId, true, `Start Audio Recorder`);
+      } catch (e) {
+        trackers.registerRecord(proctoringId, false, `Start Audio Recorder Error: ${e}`);
       }
-      const { cameraStream, stopCameraRecording } = await startCameraCapture(cameraBuffer, { cameraId, microphoneId }, videoOptions);
-      startAudio();
-      cancelCameraCapture = await stopCameraRecording;
       if (captureScreen) {
         cancelCallback = async function() {
           await Promise.all([cancelCameraCapture(), cancelScreenCapture()]);
@@ -36199,11 +36215,34 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     const cameraFileName = `EP_${proctoringId}_camera_${index}.webm`;
     const audioFileName = `EP_${proctoringId}_audio_${index}.mp3`;
     const screenFIleName = `EP_${proctoringId}_screen_${index}.webm`;
-    const cameraFile = new File(finalCameraBuffer, cameraFileName, { type: "video/webm" });
-    const audioFile = new File(finalAudioBuffer, audioFileName, { type: blob.type });
+    let cameraFile = new File([], "null");
+    let audioFile = new File([], "null");
     let screenFile;
+    try {
+      cameraFile = new File(finalCameraBuffer, cameraFileName, { type: "video/webm" });
+      trackers.registerRecord(proctoringId, true, `Camera Recorder File
+	name: ${cameraFile.name}
+	size: ${cameraFile.size}`);
+    } catch (e) {
+      trackers.registerRecord(proctoringId, false, `Camera Recorder File Error: ${e}`);
+    }
+    try {
+      audioFile = new File(finalAudioBuffer, audioFileName, { type: blob.type });
+      trackers.registerRecord(proctoringId, true, `Audio Recorder File
+	name: ${audioFile.name}
+	size: ${audioFile.size}`);
+    } catch (e) {
+      trackers.registerRecord(proctoringId, false, `Audio Recorder File Error: ${e}`);
+    }
     if (finalScreenBuffer.length != 0) {
-      screenFile = new File(finalScreenBuffer, screenFIleName, { type: "video/webm" });
+      try {
+        screenFile = new File(finalScreenBuffer, screenFIleName, { type: "video/webm" });
+        trackers.registerRecord(proctoringId, true, `Screen Recorder File
+	name: ${screenFile.name}
+	size: ${screenFile.size}`);
+      } catch (e) {
+        trackers.registerRecord(proctoringId, false, `Screen Recorder File Error: ${e}`);
+      }
     }
     return { cameraFile, audioFile, screenFile };
   };
@@ -36219,7 +36258,6 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     init(config.insights);
   }
   async function start(options = defaultProctoringOptions, videoOptions = { width: 640, height: 480 }) {
-    console.log(lastClick);
     if (lastClick >= Date.now() - delay)
       throw PROCTORING_ALREADY_STARTED;
     lastClick = Date.now();
@@ -36271,7 +36309,6 @@ function useProctoring(proctoringOptions, homolConfig = false) {
         sessions: []
       });
       proctoringId = resp.id;
-      console.log("proctoringId", proctoringId);
       trackers.registerStart(proctoringId, true, "");
       _addListeners(captureScreen);
       return resp;
@@ -36294,11 +36331,9 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     checkPermissions();
     startAudio();
     const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen, proctoringType }, videoOptions);
-    console.log("Recording...");
     return { cameraStream, _screenStream };
   }
   async function closeCheckDevices() {
-    console.log("Stoping record...");
     onStopSharingScreenCallback = void 0;
     if (cancelCallback) {
       await cancelCallback();
@@ -36311,7 +36346,6 @@ function useProctoring(proctoringOptions, homolConfig = false) {
     screenBuffer = [];
     alerts = [];
     cancelCallback = null;
-    console.log("Finish record");
     return { cameraBlob, screenBlob };
   }
   async function pause() {
@@ -36387,157 +36421,214 @@ function useProctoring(proctoringOptions, homolConfig = false) {
       trackers.registerError(proctoringId, "N\xE3o foi poss\xEDvel requisitar a data do servidor!" + e);
     }
     proctoringId = record.id;
-    console.log("procotoringId resume", proctoringId);
     startDate = serverTime ? new Date(serverTime.toString()) : new Date();
     startTime = startDate.getTime();
     return { cameraStream, _screenStream };
   }
   async function finish(options = {}) {
+    let step = 0;
     const { onProgress } = options;
     const record = await getRecord("exams");
     if (!record) {
       trackers.registerError(proctoringId, "Proctoring n\xE3o iniciado!");
       throw PROCTORING_NOT_STARTED;
     }
+    let serverTime;
+    let cameraFile = new File([], "null");
+    let audioFile = new File([], "null");
+    let screenFile;
+    const allFiles = [];
     try {
-      if (azureBlobUrl == "") {
-        setBaseUrl(homolConfig);
-        config = await makeRequest({
-          url: `/AzureKey`,
-          method: "GET",
-          jwt: proctoringOptions.token
+      try {
+        if (azureBlobUrl == "") {
+          setBaseUrl(homolConfig);
+          config = await makeRequest({
+            url: `/AzureKey`,
+            method: "GET",
+            jwt: proctoringOptions.token
+          });
+          setConfiguration(config.account, config.containerName, config.sas);
+          azureBlobUrl = config.azureBlobUrl;
+        }
+      } catch (error) {
+        trackers.registerError(proctoringId, "Erro ao buscar credenciais!");
+        throw "Erro ao buscar credenciais!";
+      }
+      onStopSharingScreenCallback = void 0;
+      if (cancelCallback) {
+        await cancelCallback();
+        step++;
+        try {
+          serverTime = await makeRequest({
+            url: `/Proctoring/server-hour`,
+            method: "GET",
+            jwt: proctoringOptions.token
+          });
+        } catch (e) {
+          trackers.registerError(proctoringId, "N\xE3o foi poss\xEDvel requisitar a data do servidor!" + e);
+          throw "N\xE3o foi poss\xEDvel requisitar a data do servidor! -> " + e;
+        }
+        await closeSession();
+        step++;
+        record.sessions.push({
+          alerts,
+          cameraFile,
+          audioFile,
+          screenFile,
+          id: "" + record.sessions.length + 1,
+          start: startDate ? startDate.toISOString() : (serverTime ? new Date(serverTime.toString()) : new Date()).toISOString(),
+          end: serverTime ? new Date(serverTime.toString()).toISOString() : new Date().toISOString()
         });
-        setConfiguration(config.account, config.containerName, config.sas);
-        azureBlobUrl = config.azureBlobUrl;
+        step++;
+      }
+      if (record.sessions.length == 0) {
+        trackers.registerError(proctoringId, "Nenhum v\xEDdeo gravado!");
+        throw NO_VIDEOS_RECORDED;
+      }
+      const time = serverTime ? new Date(serverTime.toString()).toISOString() : new Date().toISOString();
+      pushAllFiles();
+      step++;
+      const totalFiles = allFiles.length;
+      const uploadProgress = Array(totalFiles).fill(0);
+      const handleOnProgress = () => {
+        onProgress && onProgress(uploadProgress.reduce((acc, el) => acc += el, 0) / totalFiles);
+      };
+      const sessionsDto = [];
+      record.sessions.forEach((session) => {
+        sessionsDto.push({
+          alerts: session.alerts,
+          id: session.id,
+          end: session.end,
+          start: session.start,
+          videoCameraUrl: session.cameraFile.name,
+          audioCameraUrl: session.audioFile.name,
+          videoScreenUrl: session.screenFile ? session.screenFile.name : ""
+        });
+      });
+      try {
+        await makeRequest({
+          url: "/proctoring/save-screen",
+          method: "POST",
+          jwt: proctoringOptions.token,
+          body: {
+            proctoringId,
+            alerts: [...sessionsDto[sessionsDto.length - 1].alerts]
+          }
+        });
+      } catch (error) {
+        trackers.registerFinish(proctoringId, false, "save-screen error: " + error);
+        throw "save-screen error: " + error;
       }
-    } catch (error) {
-      trackers.registerError(proctoringId, "Erro ao buscar credenciais!");
-      throw "Erro ao buscar credenciais!";
-    }
-    onStopSharingScreenCallback = void 0;
-    let serverTime;
-    console.log("cancelCallback: ", cancelCallback);
-    if (cancelCallback) {
-      await cancelCallback();
       try {
-        serverTime = await makeRequest({
-          url: `/Proctoring/server-hour`,
-          method: "GET",
+        await makeRequest({
+          url: `/proctoring/finish/${proctoringOptions.examId}`,
+          method: "POST",
+          body: {
+            endDate: time,
+            videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoCameraUrl,
+            audioCameraUrl: `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].audioCameraUrl,
+            videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoScreenUrl : ""
+          },
           jwt: proctoringOptions.token
         });
-      } catch (e) {
-        trackers.registerError(proctoringId, "N\xE3o foi poss\xEDvel requisitar a data do servidor!" + e);
+        trackers.registerFinish(proctoringId, true, "");
+      } catch (error) {
+        trackers.registerFinish(proctoringId, false, "finish error: " + error);
       }
-      const { cameraFile, audioFile, screenFile } = await _closeSession(record.sessions.length);
+      checkVersionAndDownload();
+      if (versionVerify() === "1.0.0.0") {
+        try {
+          trackers.registerUploadVideo(proctoringId, true, "Starting upload");
+          const timeBefore = performance.now();
+          const uploadPromises = allFiles.map((c, i) => {
+            trackers.registerUploadVideo(proctoringId, true, `file: ${c.name}, size ${c.size}`);
+            return upload({
+              file: c,
+              onProgress: (progress) => {
+                uploadProgress[i] = progress;
+                handleOnProgress();
+              }
+            }, proctoringId, config, proctoringOptions.token);
+          });
+          const timeAfter = performance.now();
+          await Promise.all(uploadPromises);
+          const executionTime = timeAfter - timeBefore;
+          trackers.registerUploadVideo(proctoringId, true, "Finish upload", executionTime);
+        } catch (error) {
+          trackers.registerUploadVideo(proctoringId, false, "" + error);
+        }
+      }
+    } catch (e) {
+      console.log("Erro no fluxo de finish, iniciando download de backup\nError: " + e);
+      trackers.registerError(proctoringId, "Erro no fluxo de finish, iniciando download de backup\n" + e);
+      switch (step) {
+        case 0:
+          if (cancelCallback) {
+            await cancelCallback();
+          }
+        case 1: {
+          await closeSession();
+        }
+        case 2:
+          pushRecord();
+        case 3: {
+          pushAllFiles();
+        }
+        case 4: {
+          checkVersionAndDownload();
+        }
+      }
+      console.log("Enviando tracker de error");
+      trackers.registerUploadVideo(proctoringId, false, "Download feito como backup no Catch");
+    }
+    cameraBuffer = [];
+    screenBuffer = [];
+    alerts = [];
+    cancelCallback = null;
+    async function closeSession() {
+      const closeSessionReturn = await _closeSession(record.sessions.length);
+      cameraFile = closeSessionReturn.cameraFile;
+      audioFile = closeSessionReturn.audioFile;
+      screenFile = closeSessionReturn.screenFile;
+    }
+    function pushRecord() {
       record.sessions.push({
         alerts,
         cameraFile,
         audioFile,
         screenFile,
         id: "" + record.sessions.length + 1,
-        start: startDate ? startDate.toISOString() : (serverTime ? new Date(serverTime.toString()) : new Date()).toISOString(),
-        end: serverTime ? new Date(serverTime.toString()).toISOString() : new Date().toISOString()
+        start: startDate ? startDate.toISOString() : new Date().toISOString(),
+        end: new Date().toISOString()
       });
+      _removeListeners();
     }
-    if (record.sessions.length == 0) {
-      trackers.registerError(proctoringId, "Nenhum v\xEDdeo gravado!");
-      throw NO_VIDEOS_RECORDED;
-    }
-    const time = serverTime ? new Date(serverTime.toString()).toISOString() : new Date().toISOString();
-    const allFiles = [];
-    record.sessions.forEach((session) => {
-      if (session.cameraFile)
-        allFiles.push(session.cameraFile);
-      if (session.audioFile)
-        allFiles.push(session.audioFile);
-      if (session.screenFile != void 0)
-        allFiles.push(session.screenFile);
-    });
-    const totalFiles = allFiles.length;
-    const uploadProgress = Array(totalFiles).fill(0);
-    const handleOnProgress = () => {
-      onProgress && onProgress(uploadProgress.reduce((acc, el) => acc += el, 0) / totalFiles);
-    };
-    _removeListeners();
-    const sessionsDto = [];
-    record.sessions.forEach((session) => {
-      sessionsDto.push({
-        alerts: session.alerts,
-        id: session.id,
-        end: session.end,
-        start: session.start,
-        videoCameraUrl: session.cameraFile.name,
-        audioCameraUrl: session.audioFile.name,
-        videoScreenUrl: session.screenFile ? session.screenFile.name : ""
+    function pushAllFiles() {
+      record.sessions.forEach((session) => {
+        if (session.cameraFile)
+          allFiles.push(session.cameraFile);
+        if (session.audioFile)
+          allFiles.push(session.audioFile);
+        if (session.screenFile != void 0)
+          allFiles.push(session.screenFile);
       });
-    });
-    try {
-      await makeRequest({
-        url: "/proctoring/save-screen",
-        method: "POST",
-        jwt: proctoringOptions.token,
-        body: {
-          proctoringId,
-          alerts: [...sessionsDto[sessionsDto.length - 1].alerts]
-        }
-      });
-    } catch (error) {
-      trackers.registerFinish(proctoringId, false, "save-screen error: " + error);
     }
-    try {
-      await makeRequest({
-        url: `/proctoring/finish/${proctoringOptions.examId}`,
-        method: "POST",
-        body: {
-          endDate: time,
-          videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoCameraUrl,
-          audioCameraUrl: `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].audioCameraUrl,
-          videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoScreenUrl : ""
-        },
-        jwt: proctoringOptions.token
-      });
-      trackers.registerFinish(proctoringId, true, "");
-    } catch (error) {
-      trackers.registerFinish(proctoringId, false, "finish error: " + error);
-    }
-    if (versionVerify() !== "1.0.0.0") {
-      try {
-        trackers.registerUploadVideo(proctoringId, true, "Starting download");
-        allFiles.map((c) => {
-          download2(c);
-        });
-        onProgress && onProgress(Math.round(100));
-        trackers.registerUploadVideo(proctoringId, true, "Finish download");
-      } catch (error) {
-        console.log("Enviando tracker de error");
-        trackers.registerUploadVideo(proctoringId, false, "erro no download " + error);
-      }
-    } else {
-      try {
-        trackers.registerUploadVideo(proctoringId, true, "Starting upload");
-        const timeBefore = performance.now();
-        const uploadPromises = allFiles.map((c, i) => {
-          return upload({
-            file: c,
-            onProgress: (progress) => {
-              uploadProgress[i] = progress;
-              handleOnProgress();
-            }
-          }, proctoringId, config, proctoringOptions.token);
-        });
-        const timeAfter = performance.now();
-        await Promise.all(uploadPromises);
-        const executionTime = timeAfter - timeBefore;
-        trackers.registerUploadVideo(proctoringId, true, "Finish upload", executionTime);
-      } catch (error) {
-        console.log("Enviando tracker de error");
-        trackers.registerUploadVideo(proctoringId, false, "" + error);
+    function checkVersionAndDownload() {
+      if (versionVerify() !== "1.0.0.0") {
+        try {
+          trackers.registerUploadVideo(proctoringId, true, "Starting download");
+          allFiles.map((c) => {
+            trackers.registerUploadVideo(proctoringId, true, `file: ${c.name}, size ${c.size}`);
+            download2(c);
+          });
+          onProgress && onProgress(Math.round(100));
+          trackers.registerUploadVideo(proctoringId, true, "Finish download");
+        } catch (error) {
+          console.log("Enviando tracker de error");
+          trackers.registerUploadVideo(proctoringId, false, "erro no download " + error);
+        }
       }
     }
-    cameraBuffer = [];
-    screenBuffer = [];
-    alerts = [];
-    cancelCallback = null;
   }
   function onFocus(cb) {
     onFocusCallback = cb;

package/package.json

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

package/plugins/insights.d.ts

@@ -9,5 +9,6 @@ declare const trackers: {
     registerFinish: (proctoringId: string, success: boolean, description: string) => void;
     registerError: (proctoringId: string, description: string) => void;
     registerUploadVideo: (proctoringId: string, success: boolean, description: string, uploadTime?: number) => void;
+    registerRecord: (proctoringId: string, success: boolean, description: string) => void;
 };
 export { trackers, init };