easyproctor-hml 2.5.37 → 2.5.39

package/esm/index.js

@@ -9157,7 +9157,6 @@ var BaseDetection = class {
   }
   enableCam(cameraStream) {
     var _a2;
-    console.log("BaseDetection enableCam");
     if (!this.detector) {
       console.log("Wait! Detector not loaded yet.");
       return;
@@ -9183,7 +9182,11 @@ var BaseDetection = class {
     cameraStream && !this.video.srcObject && (this.video.srcObject = cameraStream);
     this.video.play();
     const that = this;
-    (_a2 = this.video) == null ? void 0 : _a2.addEventListener("loadeddata", () => that.predictWebcam());
+    (_a2 = this.video) == null ? void 0 : _a2.addEventListener("loadeddata", () => {
+      this.animationFrameId = setTimeout(() => {
+        that.predictWebcam();
+      }, 1e4);
+    });
     const style = document.createElement("style");
     style.type = "text/css";
     style.innerHTML = `
@@ -9202,6 +9205,7 @@ var BaseDetection = class {
     console.log("BaseDetection enableCam OK");
   }
   async predictWebcam() {
+    if (this.detecting == false) return;
     if (this.lastVideoTime === -1) {
       await this.detector.setOptions({ runningMode: "VIDEO" });
     }
@@ -9263,7 +9267,7 @@ var BaseDetection = class {
       case "person_ok":
         return "Pessoa detectada";
       case "cellphone_ok":
-        return "Nenhum celular detectadoa";
+        return "Nenhum celular detectado";
       case "face_ok":
         return "Face detectada";
       case "ok_position_face_detected":
@@ -9497,8 +9501,6 @@ var FaceDetection = class extends BaseDetection {
   }
   verify(result) {
     var _a2;
-    console.log("this.numFacesSent", this.numFacesSent);
-    console.log("result.detections.length", result.detections.length);
     if (((_a2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _a2.detectFace) && result.detections.length !== this.numFacesSent) {
       this.numFacesSent = result.detections.length;
       if (result.detections.length === 0) {
@@ -12709,12 +12711,12 @@ function setRecorderProctoringId(id) {
 }
 function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCallback, audio = false) {
   let resolvePromise;
-  let stopped = false;
   let onBufferSizeInterval;
   let lastEvent;
   let bufferSize;
   bufferSize = 0;
   let startTime;
+  let duration = 0;
   let recorderOptions = {
     // eslint-disable-next-line no-useless-escape
     mimeType: "video/webm",
@@ -12751,10 +12753,6 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
       if (e3.data.size > 0) {
         buffer.push(e3.data);
       }
-      if (stopped) {
-        console.log("buildMediaRecorder ondataavailable stopped");
-        resolvePromise && resolvePromise();
-      }
     };
     return mediaRecorder2;
   }
@@ -12766,6 +12764,7 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
       recorder2.onstart = () => {
         started = true;
         console.log("recorder onstart");
+        startTime = new Date(Date.now());
         resolve();
       };
       recorder2.onerror = (ev) => {
@@ -12805,7 +12804,6 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
       await startRecorder(mediaRecorder);
       if (mediaRecorder.state === "recording") {
         bufferSize = 0;
-        stopped = false;
         return;
       } else {
         console.log("Recorder n\xE3o est\xE1 em estado recording ap\xF3s start");
@@ -12824,9 +12822,13 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
         resolvePromise = resolve;
         mediaRecorder.onstop = () => {
           console.log("recorder onstop");
+          const duration2 = Date.now() - startTime.getTime() || 0;
+          console.log("duration no onstop", duration2);
+          resolvePromise && resolvePromise();
         };
-        stopped = true;
         mediaRecorder.stop();
+        duration = Date.now() - startTime.getTime() || 0;
+        console.log("duration imediatamente ap\xF3s mediaRecorder.stop()", duration);
       } else {
         console.log("stopRecording Recorder n\xE3o est\xE1 em estado recording");
         resolve();
@@ -12862,6 +12864,9 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
   function getStartTime() {
     return startTime;
   }
+  function getDuration() {
+    return duration;
+  }
   return {
     startRecording,
     stopRecording,
@@ -12869,7 +12874,8 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
     resumeRecording,
     recorderOptions,
     getBufferSize,
-    getStartTime
+    getStartTime,
+    getDuration
   };
 }
 
@@ -13292,6 +13298,7 @@ var CameraRecorder = class {
     this.internalClonedStream = null;
     this.videoElement = null;
     this.duration = 0;
+    this.stopped = false;
     this.currentRetries = 0;
     this.packageCount = 0;
     this.noiseWait = 20;
@@ -13468,7 +13475,8 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       resumeRecording,
       recorderOptions,
       getBufferSize,
-      getStartTime
+      getStartTime,
+      getDuration
     } = recorder(
       this.cameraStream,
       // streamToRecord,
@@ -13484,6 +13492,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     this.recorderOptions = recorderOptions;
     this.getBufferSize = getBufferSize;
     this.getStartTime = getStartTime;
+    this.getDuration = getDuration;
     try {
       await new Promise((r3) => setTimeout(r3, 500));
       await this.recordingStart();
@@ -13499,6 +13508,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         throw error;
       }
     }
+    this.stopped = false;
     if (((_b = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _b.detectPerson) || ((_c2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _c2.detectCellPhone) || ((_d = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _d.detectFace)) {
       await this.initializeDetectors();
     }
@@ -13516,8 +13526,9 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     console.log("Camera Recorder started OK");
   }
   async stopRecording() {
-    var _a2, _b, _c2, _d;
+    var _a2, _b, _c2;
     console.log("Camera Recorder stopRecording");
+    this.stopped = true;
     this.isCanvasLoopActive = false;
     this.faceDetection && this.faceDetection.detecting && this.faceDetection.stopDetection();
     this.objectDetection && this.objectDetection.detecting && this.objectDetection.stopDetection();
@@ -13526,7 +13537,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     this.volumeMeter && this.volumeMeter.stop();
     this.intervalNoiseDetection && clearInterval(this.intervalNoiseDetection);
     this.recordingStop && await this.recordingStop();
-    this.duration = Date.now() - ((_a2 = this.getStartTime()) == null ? void 0 : _a2.getTime()) || 0;
+    this.duration = this.getDuration();
     try {
       if (this.animationFrameId) {
         cancelAnimationFrame(this.animationFrameId);
@@ -13544,14 +13555,14 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         this.hardwareStream = null;
       }
       if (this.videoElement) {
-        (_b = this.videoElement) == null ? void 0 : _b.remove();
+        (_a2 = this.videoElement) == null ? void 0 : _a2.remove();
         this.videoElement = null;
       }
       if (this.video) {
-        (_c2 = this.video) == null ? void 0 : _c2.remove();
+        (_b = this.video) == null ? void 0 : _b.remove();
       }
       if (this.canvas) {
-        (_d = this.canvas) == null ? void 0 : _d.remove();
+        (_c2 = this.canvas) == null ? void 0 : _c2.remove();
       }
     } catch (e3) {
       console.error("Erro ao parar os streams de m\xEDdia.");
@@ -13698,7 +13709,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       });
       const fixedBlob = await (0, import_fix_webm_duration.default)(rawBlob, this.duration);
       const file = new File(
-        [fixedBlob],
+        [rawBlob],
         `EP_${session.id}_camera_0.webm`,
         { type: rawBlob.type }
       );
@@ -13712,6 +13723,21 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         file,
         origin: "Camera" /* Camera */
       });
+      const fileWithDuration = new File(
+        [fixedBlob],
+        `EP_${session.id}_camera_with_duration.webm`,
+        { type: rawBlob.type }
+      );
+      session.addRecording({
+        device: `Audio
+	Sample Rate: ${settingsAudio.sampleRate}
+	Sample Size: ${settingsAudio.sampleSize}
+
+	Video:
+	${JSON.stringify(this.recorderOptions)}`,
+        file: fileWithDuration,
+        origin: "Camera" /* Camera */
+      });
     }
   }
   async getFile(file, name, type) {
@@ -22528,6 +22554,7 @@ var Proctoring = class {
   async internalOnRealtimeAlerts(response) {
     if (this.sessionOptions.proctoringType === "REALTIME" && (response.type === "face_detection_on_stream" || response.type === "person_detection_on_stream" || response.type === "lost_focus" || response.type === "focus")) {
       if (response.status === "ALERT") {
+        if (this.allRecorders.cameraRecorder.stopped) return;
         await this.backend.startRealtimeAlert({
           proctoringId: this.proctoringId,
           begin: response.begin,
@@ -22535,6 +22562,7 @@ var Proctoring = class {
           alert: this.convertRealtimeCategoryToAlertCategory(response.category)
         });
       } else if (response.status === "OK") {
+        if (this.allRecorders.cameraRecorder.stopped && response.description !== "face_stop") return;
         await this.stopRealtimeAlert(response);
       }
     }
@@ -22617,7 +22645,7 @@ var Proctoring = class {
       recorders.push(screenRecorder);
     }
     this.recorder = new ProctoringRecorder(this.proctoringSession, recorders);
-    return { cameraRecorder, screenRecorder, alertRecorder, noiseRecorder };
+    return { screenRecorder, alertRecorder, noiseRecorder, cameraRecorder };
   }
   async login() {
     var _a2;

package/index.js

@@ -26442,7 +26442,6 @@ var BaseDetection = class {
   }
   enableCam(cameraStream) {
     var _a2;
-    console.log("BaseDetection enableCam");
     if (!this.detector) {
       console.log("Wait! Detector not loaded yet.");
       return;
@@ -26468,7 +26467,11 @@ var BaseDetection = class {
     cameraStream && !this.video.srcObject && (this.video.srcObject = cameraStream);
     this.video.play();
     const that = this;
-    (_a2 = this.video) == null ? void 0 : _a2.addEventListener("loadeddata", () => that.predictWebcam());
+    (_a2 = this.video) == null ? void 0 : _a2.addEventListener("loadeddata", () => {
+      this.animationFrameId = setTimeout(() => {
+        that.predictWebcam();
+      }, 1e4);
+    });
     const style = document.createElement("style");
     style.type = "text/css";
     style.innerHTML = `
@@ -26487,6 +26490,7 @@ var BaseDetection = class {
     console.log("BaseDetection enableCam OK");
   }
   async predictWebcam() {
+    if (this.detecting == false) return;
     if (this.lastVideoTime === -1) {
       await this.detector.setOptions({ runningMode: "VIDEO" });
     }
@@ -26548,7 +26552,7 @@ var BaseDetection = class {
       case "person_ok":
         return "Pessoa detectada";
       case "cellphone_ok":
-        return "Nenhum celular detectadoa";
+        return "Nenhum celular detectado";
       case "face_ok":
         return "Face detectada";
       case "ok_position_face_detected":
@@ -26782,8 +26786,6 @@ var FaceDetection = class extends BaseDetection {
   }
   verify(result) {
     var _a2;
-    console.log("this.numFacesSent", this.numFacesSent);
-    console.log("result.detections.length", result.detections.length);
     if (((_a2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _a2.detectFace) && result.detections.length !== this.numFacesSent) {
       this.numFacesSent = result.detections.length;
       if (result.detections.length === 0) {
@@ -30806,12 +30808,12 @@ function setRecorderProctoringId(id) {
 }
 function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorCallback, audio = false) {
   let resolvePromise;
-  let stopped = false;
   let onBufferSizeInterval;
   let lastEvent;
   let bufferSize;
   bufferSize = 0;
   let startTime;
+  let duration = 0;
   let recorderOptions = {
     // eslint-disable-next-line no-useless-escape
     mimeType: "video/webm",
@@ -30848,10 +30850,6 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
       if (e3.data.size > 0) {
         buffer.push(e3.data);
       }
-      if (stopped) {
-        console.log("buildMediaRecorder ondataavailable stopped");
-        resolvePromise && resolvePromise();
-      }
     };
     return mediaRecorder2;
   }
@@ -30863,6 +30861,7 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
       recorder2.onstart = () => {
         started = true;
         console.log("recorder onstart");
+        startTime = new Date(Date.now());
         resolve();
       };
       recorder2.onerror = (ev) => {
@@ -30902,7 +30901,6 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
       await startRecorder(mediaRecorder);
       if (mediaRecorder.state === "recording") {
         bufferSize = 0;
-        stopped = false;
         return;
       } else {
         console.log("Recorder n\xE3o est\xE1 em estado recording ap\xF3s start");
@@ -30921,9 +30919,13 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
         resolvePromise = resolve;
         mediaRecorder.onstop = () => {
           console.log("recorder onstop");
+          const duration2 = Date.now() - startTime.getTime() || 0;
+          console.log("duration no onstop", duration2);
+          resolvePromise && resolvePromise();
         };
-        stopped = true;
         mediaRecorder.stop();
+        duration = Date.now() - startTime.getTime() || 0;
+        console.log("duration imediatamente ap\xF3s mediaRecorder.stop()", duration);
       } else {
         console.log("stopRecording Recorder n\xE3o est\xE1 em estado recording");
         resolve();
@@ -30959,6 +30961,9 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
   function getStartTime() {
     return startTime;
   }
+  function getDuration() {
+    return duration;
+  }
   return {
     startRecording,
     stopRecording,
@@ -30966,7 +30971,8 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
     resumeRecording,
     recorderOptions,
     getBufferSize,
-    getStartTime
+    getStartTime,
+    getDuration
   };
 }
 
@@ -31389,6 +31395,7 @@ var CameraRecorder = class {
     this.internalClonedStream = null;
     this.videoElement = null;
     this.duration = 0;
+    this.stopped = false;
     this.currentRetries = 0;
     this.packageCount = 0;
     this.noiseWait = 20;
@@ -31565,7 +31572,8 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       resumeRecording,
       recorderOptions,
       getBufferSize,
-      getStartTime
+      getStartTime,
+      getDuration
     } = recorder(
       this.cameraStream,
       // streamToRecord,
@@ -31581,6 +31589,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     this.recorderOptions = recorderOptions;
     this.getBufferSize = getBufferSize;
     this.getStartTime = getStartTime;
+    this.getDuration = getDuration;
     try {
       await new Promise((r3) => setTimeout(r3, 500));
       await this.recordingStart();
@@ -31596,6 +31605,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         throw error;
       }
     }
+    this.stopped = false;
     if (((_b = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _b.detectPerson) || ((_c2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _c2.detectCellPhone) || ((_d = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _d.detectFace)) {
       await this.initializeDetectors();
     }
@@ -31613,8 +31623,9 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     console.log("Camera Recorder started OK");
   }
   async stopRecording() {
-    var _a2, _b, _c2, _d;
+    var _a2, _b, _c2;
     console.log("Camera Recorder stopRecording");
+    this.stopped = true;
     this.isCanvasLoopActive = false;
     this.faceDetection && this.faceDetection.detecting && this.faceDetection.stopDetection();
     this.objectDetection && this.objectDetection.detecting && this.objectDetection.stopDetection();
@@ -31623,7 +31634,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     this.volumeMeter && this.volumeMeter.stop();
     this.intervalNoiseDetection && clearInterval(this.intervalNoiseDetection);
     this.recordingStop && await this.recordingStop();
-    this.duration = Date.now() - ((_a2 = this.getStartTime()) == null ? void 0 : _a2.getTime()) || 0;
+    this.duration = this.getDuration();
     try {
       if (this.animationFrameId) {
         cancelAnimationFrame(this.animationFrameId);
@@ -31641,14 +31652,14 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         this.hardwareStream = null;
       }
       if (this.videoElement) {
-        (_b = this.videoElement) == null ? void 0 : _b.remove();
+        (_a2 = this.videoElement) == null ? void 0 : _a2.remove();
         this.videoElement = null;
       }
       if (this.video) {
-        (_c2 = this.video) == null ? void 0 : _c2.remove();
+        (_b = this.video) == null ? void 0 : _b.remove();
       }
       if (this.canvas) {
-        (_d = this.canvas) == null ? void 0 : _d.remove();
+        (_c2 = this.canvas) == null ? void 0 : _c2.remove();
       }
     } catch {
       console.error("Erro ao parar os streams de m\xEDdia.");
@@ -31795,7 +31806,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       });
       const fixedBlob = await (0, import_fix_webm_duration.default)(rawBlob, this.duration);
       const file = new File(
-        [fixedBlob],
+        [rawBlob],
         `EP_${session.id}_camera_0.webm`,
         { type: rawBlob.type }
       );
@@ -31809,6 +31820,21 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         file,
         origin: "Camera" /* Camera */
       });
+      const fileWithDuration = new File(
+        [fixedBlob],
+        `EP_${session.id}_camera_with_duration.webm`,
+        { type: rawBlob.type }
+      );
+      session.addRecording({
+        device: `Audio
+	Sample Rate: ${settingsAudio.sampleRate}
+	Sample Size: ${settingsAudio.sampleSize}
+
+	Video:
+	${JSON.stringify(this.recorderOptions)}`,
+        file: fileWithDuration,
+        origin: "Camera" /* Camera */
+      });
     }
   }
   async getFile(file, name, type) {
@@ -37777,6 +37803,7 @@ var Proctoring = class {
   async internalOnRealtimeAlerts(response) {
     if (this.sessionOptions.proctoringType === "REALTIME" && (response.type === "face_detection_on_stream" || response.type === "person_detection_on_stream" || response.type === "lost_focus" || response.type === "focus")) {
       if (response.status === "ALERT") {
+        if (this.allRecorders.cameraRecorder.stopped) return;
         await this.backend.startRealtimeAlert({
           proctoringId: this.proctoringId,
           begin: response.begin,
@@ -37784,6 +37811,7 @@ var Proctoring = class {
           alert: this.convertRealtimeCategoryToAlertCategory(response.category)
         });
       } else if (response.status === "OK") {
+        if (this.allRecorders.cameraRecorder.stopped && response.description !== "face_stop") return;
         await this.stopRealtimeAlert(response);
       }
     }
@@ -37866,7 +37894,7 @@ var Proctoring = class {
       recorders.push(screenRecorder);
     }
     this.recorder = new ProctoringRecorder(this.proctoringSession, recorders);
-    return { cameraRecorder, screenRecorder, alertRecorder, noiseRecorder };
+    return { screenRecorder, alertRecorder, noiseRecorder, cameraRecorder };
   }
   async login() {
     var _a2;

package/new-flow/recorders/CameraRecorder.d.ts

@@ -38,6 +38,7 @@ export declare class CameraRecorder implements IRecorder {
     private internalClonedStream;
     private videoElement;
     private duration;
+    stopped: boolean;
     constructor(options: {
         cameraId?: string;
         microphoneId?: string;
@@ -54,6 +55,7 @@ export declare class CameraRecorder implements IRecorder {
     recordingResume: () => any;
     getBufferSize: () => any;
     getStartTime: () => any;
+    getDuration: () => any;
     setProctoringId(proctoringId: string): void;
     initializeDetectors(): Promise<void>;
     configImageCapture(): void;

package/package.json

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

package/plugins/recorder.d.ts

@@ -7,4 +7,5 @@ export default function recorder(stream: MediaStream, buffer: Blob[], onBufferSi
     recorderOptions: MediaRecorderOptions;
     getBufferSize: () => number;
     getStartTime: () => Date | undefined;
+    getDuration: () => number;
 };