easyproctor 2.5.8 → 2.6.0

package/index.js

@@ -26440,9 +26440,8 @@ var BaseDetection = class {
     this.createdVideo && this.video && document.body.removeChild(this.video);
     this.createdVideo = false;
   }
-  enableCam(cameraStream) {
+  enableCam(cameraStream, delay = 1e4) {
     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();
+      }, delay);
+    });
     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":
@@ -30804,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",
@@ -30846,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;
   }
@@ -30861,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) => {
@@ -30900,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");
@@ -30919,9 +30919,13 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
         resolvePromise = resolve;
         mediaRecorder.onstop = () => {
           console.log("recorder onstop");
+          duration = Date.now() - startTime.getTime() || 0;
+          console.log("duration no onstop", duration);
+          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();
@@ -30957,6 +30961,9 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
   function getStartTime() {
     return startTime;
   }
+  function getDuration() {
+    return duration;
+  }
   return {
     startRecording,
     stopRecording,
@@ -30964,7 +30971,8 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
     resumeRecording,
     recorderOptions,
     getBufferSize,
-    getStartTime
+    getStartTime,
+    getDuration
   };
 }
 
@@ -31190,6 +31198,7 @@ var BROWSER_NOT_SUPPORTED = "browser_not_supported";
 var TOKEN_MISSING = "token_missing";
 var CREDENTIALS_MISSING = "credentials_missing";
 var SPY_SCAN_API_NOT_FOUND = "spy_scan_api_not_found";
+var SAFE_BROWSER_API_NOT_FOUND = "safe_browser_api_not_found";
 var EXTERNAL_CAMERA_NOT_STARTED = "external_camera_not_started";
 
 // src/modules/objectDetection.ts
@@ -31387,6 +31396,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;
@@ -31563,7 +31573,8 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       resumeRecording,
       recorderOptions,
       getBufferSize,
-      getStartTime
+      getStartTime,
+      getDuration
     } = recorder(
       this.cameraStream,
       // streamToRecord,
@@ -31579,6 +31590,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();
@@ -31594,6 +31606,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();
     }
@@ -31611,8 +31624,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();
@@ -31621,7 +31635,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 ? this.getDuration() : 0;
     try {
       if (this.animationFrameId) {
         cancelAnimationFrame(this.animationFrameId);
@@ -31639,14 +31653,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.");
@@ -31792,8 +31806,8 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         type: ((_b = this.recorderOptions) == null ? void 0 : _b.mimeType) || "video/webm"
       });
       const fixedBlob = await (0, import_fix_webm_duration.default)(rawBlob, this.duration);
-      const file = new File(
-        [rawBlob],
+      const fileWithDuration = new File(
+        [fixedBlob],
         `EP_${session.id}_camera_0.webm`,
         { type: rawBlob.type }
       );
@@ -31804,7 +31818,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
 
 	Video:
 	${JSON.stringify(this.recorderOptions)}`,
-        file,
+        file: fileWithDuration,
         origin: "Camera" /* Camera */
       });
     }
@@ -33077,7 +33091,7 @@ var _DeviceCheckerService = class _DeviceCheckerService {
   videoDeviceInterface(stream4) {
     this.DeviceCheckerUI && this.DeviceCheckerUI.videoDeviceInterfaceUI(stream4);
     this.isUnderResolution();
-    this.faceDetection.enableCam(stream4);
+    this.faceDetection.enableCam(stream4, 1e3);
   }
   audioDeviceInterface(stream4) {
     this.volumeMeter = new VolumeMeter(this.cameraRecorder.cameraStream);
@@ -36778,6 +36792,49 @@ var Auth = class {
   }
 };
 
+// src/new-flow/backend/SafeBrowserBackendService.ts
+var SafeBrowserBackendService = class {
+  constructor() {
+    this.baseUrl = "http://localhost:7485/Station/api";
+  }
+  async isAlive() {
+    const paramsConfig = await this.makeRequestAxios({
+      path: `/health`,
+      method: "GET",
+      jwt: this.token
+    }).catch((error) => {
+      throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
+    });
+    return paramsConfig.data;
+  }
+  async setProctoringId(proctoringId2) {
+    const paramsConfig = await this.makeRequestAxios({
+      path: `/update-station/` + proctoringId2,
+      method: "POST",
+      jwt: this.token
+    }).catch((error) => {
+      throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
+    });
+    return paramsConfig.data;
+  }
+  async makeRequestAxios(data) {
+    const { path, method, body, jwt } = data;
+    const resp = await axios_default.request({
+      url: this.baseUrl + path,
+      method,
+      headers: {
+        Authorization: `Bearer ${jwt}`,
+        "Access-Control-Allow-Origin": "*"
+      },
+      data: body
+    });
+    if (resp.status >= 400) {
+      throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
+    }
+    return resp;
+  }
+};
+
 // src/proctoring/ExternalCameraChecker.ts
 var import_signalr = __toESM(require_cjs());
 var import_qrcode = __toESM(require_lib());
@@ -37692,6 +37749,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,
@@ -37699,6 +37757,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);
       }
     }
@@ -37781,7 +37840,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;
@@ -37811,6 +37870,13 @@ var Proctoring = class {
       } catch (error) {
         throw SPY_SCAN_API_NOT_FOUND;
       }
+      try {
+        if (options == null ? void 0 : options.useSafeBrowserAPI) {
+          await this.safeBrowserBackendService.isAlive();
+        }
+      } catch (error) {
+        throw SAFE_BROWSER_API_NOT_FOUND;
+      }
       if (this.state != "Stop" /* Stop */) {
         throw PROCTORING_ALREADY_STARTED;
       }
@@ -37846,6 +37912,13 @@ var Proctoring = class {
       this.allRecorders.cameraRecorder.setProctoringId(this.proctoringId);
       this.allRecorders.noiseRecorder.setProctoringId(this.proctoringId);
       this.proctoringSession.setProctoringId(this.proctoringId);
+      try {
+        if (options == null ? void 0 : options.useSafeBrowserAPI) {
+          await this.safeBrowserBackendService.setProctoringId(this.proctoringId);
+        }
+      } catch (error) {
+        throw SAFE_BROWSER_API_NOT_FOUND;
+      }
       try {
         console.log("Starting recorders");
         await this.recorder.startAll();
@@ -38067,7 +38140,7 @@ Error: ` + error
     }
   }
   async initConfig(useGeolocation) {
-    var _a2;
+    var _a2, _b;
     try {
       const paramsConfig = await this.backend.getParamsConfig(
         this.context
@@ -38099,6 +38172,9 @@ Error: ` + error
           onRealtimeAlertsCallback: (response) => this.onRealtimeAlertsCallback(response)
         });
       }
+      if ((_b = this.sessionOptions) == null ? void 0 : _b.useSafeBrowserAPI) {
+        this.safeBrowserBackendService = new SafeBrowserBackendService();
+      }
     } catch (err) {
       this.proctoringId && trackers.registerError(this.proctoringId, "Erro no initConfig!");
       await this.cancel();

package/modules/BaseDetection.d.ts

@@ -22,7 +22,7 @@ export declare class BaseDetection {
     }, paramsConfig?: IParamsConfig, classVideo?: string, classDiv?: string);
     initializeDetector(): Promise<void>;
     stopDetection(): void;
-    enableCam(cameraStream?: MediaProvider | null | undefined): void;
+    enableCam(cameraStream?: MediaProvider | null | undefined, delay?: number): void;
     lastVideoTime: number;
     lastExecutionDate: number;
     predictWebcam(): Promise<void>;

package/new-flow/backend/SafeBrowserBackendService.d.ts

@@ -0,0 +1,13 @@
+export declare class SafeBrowserBackendService {
+    private readonly baseUrl;
+    token: string;
+    constructor();
+    isAlive(): Promise<boolean>;
+    setProctoringId(proctoringId: string): Promise<any>;
+    makeRequestAxios<R>(data: {
+        path: string;
+        method: "GET" | "POST" | "PUT";
+        body?: any;
+        jwt: string;
+    }): Promise<R>;
+}

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",
-  "version": "2.5.8",
+  "version": "2.6.0",
   "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/options/ProctoringOptions.d.ts

@@ -12,6 +12,7 @@ export interface ProctoringSessionOptions {
     useSpyScan?: boolean;
     useExternalCamera?: boolean;
     useChallenge?: boolean;
+    useSafeBrowserAPI?: boolean;
     screenRecorderOptions?: {
         width: number;
         height: number;

package/proctoring/proctoring.d.ts

@@ -54,6 +54,7 @@ export declare class Proctoring {
     private recorder;
     private allRecorders;
     private spyCam;
+    private safeBrowserBackendService;
     appChecker: ExternalCameraChecker;
     private verifyFirstFaceInterval;
     private onStopSharingScreenCallback;