easyproctor-hml 2.5.36 → 2.5.38

package/esm/index.js

@@ -9202,6 +9202,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" });
     }
@@ -9497,8 +9498,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) {
@@ -12715,6 +12714,7 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
   let bufferSize;
   bufferSize = 0;
   let startTime;
+  let duration = 0;
   let recorderOptions = {
     // eslint-disable-next-line no-useless-escape
     mimeType: "video/webm",
@@ -12754,6 +12754,8 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
       if (stopped) {
         console.log("buildMediaRecorder ondataavailable stopped");
         resolvePromise && resolvePromise();
+        const duration2 = Date.now() - startTime.getTime() || 0;
+        console.log("duration no ondataavailable", duration2);
       }
     };
     return mediaRecorder2;
@@ -12766,6 +12768,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) => {
@@ -12824,9 +12827,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);
         };
         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 +12869,9 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
   function getStartTime() {
     return startTime;
   }
+  function getDuration() {
+    return duration;
+  }
   return {
     startRecording,
     stopRecording,
@@ -12869,7 +12879,8 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
     resumeRecording,
     recorderOptions,
     getBufferSize,
-    getStartTime
+    getStartTime,
+    getDuration
   };
 }
 
@@ -13468,7 +13479,8 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       resumeRecording,
       recorderOptions,
       getBufferSize,
-      getStartTime
+      getStartTime,
+      getDuration
     } = recorder(
       this.cameraStream,
       // streamToRecord,
@@ -13484,6 +13496,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();
@@ -13516,7 +13529,7 @@ 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.isCanvasLoopActive = false;
     this.faceDetection && this.faceDetection.detecting && this.faceDetection.stopDetection();
@@ -13526,7 +13539,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 +13557,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 +13711,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 +13725,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) {
@@ -22386,7 +22414,8 @@ var Proctoring = class {
     this.onChangeDevicesCallback = (devices) => {
       return;
     };
-    this.onRealtimeAlertsCallback = (response) => {
+    this.onRealtimeAlertsCallback = async (response) => {
+      await this.internalOnRealtimeAlerts(response);
       return;
     };
     this.onBufferSizeErrorCallback = (cameraStream) => {
@@ -22524,23 +22553,26 @@ var Proctoring = class {
     };
     await verifyFace(1);
   }
+  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") {
+        await this.backend.startRealtimeAlert({
+          proctoringId: this.proctoringId,
+          begin: response.begin,
+          end: response.end,
+          alert: this.convertRealtimeCategoryToAlertCategory(response.category)
+        });
+      } else if (response.status === "OK") {
+        await this.stopRealtimeAlert(response);
+      }
+    }
+  }
   async onRealtimeAlerts(options = {}) {
     this.setOnLostFocusAlertRecorderCallback();
     this.setOnFocusAlertRecorderCallback();
     this.onRealtimeAlertsCallback = async (response) => {
+      await this.internalOnRealtimeAlerts(response);
       options.data && options.data(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") {
-          await this.backend.startRealtimeAlert({
-            proctoringId: this.proctoringId,
-            begin: response.begin,
-            end: response.end,
-            alert: this.convertRealtimeCategoryToAlertCategory(response.category)
-          });
-        } else if (response.status === "OK") {
-          await this.stopRealtimeAlert(response);
-        }
-      }
     };
   }
   setOnBufferSizeErrorCallback(cb) {

package/index.js

@@ -26487,6 +26487,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" });
     }
@@ -26782,8 +26783,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) {
@@ -30812,6 +30811,7 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
   let bufferSize;
   bufferSize = 0;
   let startTime;
+  let duration = 0;
   let recorderOptions = {
     // eslint-disable-next-line no-useless-escape
     mimeType: "video/webm",
@@ -30851,6 +30851,8 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
       if (stopped) {
         console.log("buildMediaRecorder ondataavailable stopped");
         resolvePromise && resolvePromise();
+        const duration2 = Date.now() - startTime.getTime() || 0;
+        console.log("duration no ondataavailable", duration2);
       }
     };
     return mediaRecorder2;
@@ -30863,6 +30865,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) => {
@@ -30921,9 +30924,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);
         };
         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 +30966,9 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
   function getStartTime() {
     return startTime;
   }
+  function getDuration() {
+    return duration;
+  }
   return {
     startRecording,
     stopRecording,
@@ -30966,7 +30976,8 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
     resumeRecording,
     recorderOptions,
     getBufferSize,
-    getStartTime
+    getStartTime,
+    getDuration
   };
 }
 
@@ -31565,7 +31576,8 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       resumeRecording,
       recorderOptions,
       getBufferSize,
-      getStartTime
+      getStartTime,
+      getDuration
     } = recorder(
       this.cameraStream,
       // streamToRecord,
@@ -31581,6 +31593,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();
@@ -31613,7 +31626,7 @@ 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.isCanvasLoopActive = false;
     this.faceDetection && this.faceDetection.detecting && this.faceDetection.stopDetection();
@@ -31623,7 +31636,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 +31654,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 +31808,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 +31822,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) {
@@ -37635,7 +37663,8 @@ var Proctoring = class {
     this.onChangeDevicesCallback = (devices) => {
       return;
     };
-    this.onRealtimeAlertsCallback = (response) => {
+    this.onRealtimeAlertsCallback = async (response) => {
+      await this.internalOnRealtimeAlerts(response);
       return;
     };
     this.onBufferSizeErrorCallback = (cameraStream) => {
@@ -37773,23 +37802,26 @@ var Proctoring = class {
     };
     await verifyFace(1);
   }
+  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") {
+        await this.backend.startRealtimeAlert({
+          proctoringId: this.proctoringId,
+          begin: response.begin,
+          end: response.end,
+          alert: this.convertRealtimeCategoryToAlertCategory(response.category)
+        });
+      } else if (response.status === "OK") {
+        await this.stopRealtimeAlert(response);
+      }
+    }
+  }
   async onRealtimeAlerts(options = {}) {
     this.setOnLostFocusAlertRecorderCallback();
     this.setOnFocusAlertRecorderCallback();
     this.onRealtimeAlertsCallback = async (response) => {
+      await this.internalOnRealtimeAlerts(response);
       options.data && options.data(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") {
-          await this.backend.startRealtimeAlert({
-            proctoringId: this.proctoringId,
-            begin: response.begin,
-            end: response.end,
-            alert: this.convertRealtimeCategoryToAlertCategory(response.category)
-          });
-        } else if (response.status === "OK") {
-          await this.stopRealtimeAlert(response);
-        }
-      }
     };
   }
   setOnBufferSizeErrorCallback(cb) {

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

@@ -54,6 +54,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.36",
+  "version": "2.5.38",
   "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;
 };

package/proctoring/proctoring.d.ts

@@ -73,6 +73,7 @@ export declare class Proctoring {
     private convertRealtimeTypeToWarningType;
     private stopRealtimeAlert;
     private onRealtimeAlertsCallback;
+    private internalOnRealtimeAlerts;
     onRealtimeAlerts(options?: ProctoringRealtimeAlertsOptions): Promise<void>;
     private onBufferSizeErrorCallback;
     setOnBufferSizeErrorCallback(cb: (cameraStream?: any) => void): void;