easyproctor-hml 2.5.28 → 2.5.30

package/index.js

@@ -30387,38 +30387,93 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
     };
   }
   console.log("recorderOptions bitsPerSecond", recorderOptions.videoBitsPerSecond);
-  const mediaRecorder = new MediaRecorder(stream4, recorderOptions);
-  mediaRecorder.ondataavailable = (e2) => {
-    if (mediaRecorder.state != "recording") return;
-    bufferSize = bufferSize + e2.data.size;
-    console.log("video tracks length > 0", stream4.getVideoTracks().length > 0);
-    if (stream4.getVideoTracks().length > 0) {
-      const videoTrack = stream4.getVideoTracks()[0];
-      console.log(videoTrack.readyState);
-      console.log(videoTrack.enabled);
-    }
-    if (e2.data.size > 0) {
-      buffer.push(e2.data);
-    }
-    if (!stopped) {
-      if (lastEvent && e2.data.size === lastEvent.data.size || e2.data.size === 0) {
-        proctoringId && lastEvent && e2.data.size === lastEvent.data.size && trackers.registerOnBufferSizeError(
-          proctoringId,
-          `onBufferSizeError: Recorder size freezed: ${e2.data.size} Mb`
-        );
-        proctoringId && e2.data.size === 0 && trackers.registerOnBufferSizeError(
-          proctoringId,
-          `onBufferSizeError: Recorder size equal 0 Mb`
-        );
-        console.log("onbuffer size error" + e2.data.size);
-        onBufferSizeErrorCallback && onBufferSizeErrorCallback();
+  function buildMediaRecorder(stream5, recorderOptions2) {
+    const tracks = stream5.getTracks();
+    if (tracks.length == 0) {
+      throw new Error("No tracks found");
+    }
+    const invalidTracks = tracks.find((t2) => t2.readyState != "live");
+    if (invalidTracks) {
+      throw new Error("Track not live: " + invalidTracks.label);
+    }
+    console.log("buildMediaRecorder tracks OK");
+    let mediaRecorder2 = new MediaRecorder(stream5, recorderOptions2);
+    console.log("buildMediaRecorder mediaRecorder OK");
+    mediaRecorder2.ondataavailable = (e2) => {
+      bufferSize = bufferSize + e2.data.size;
+      console.log("video tracks length > 0", stream5.getVideoTracks().length > 0);
+      if (stream5.getVideoTracks().length > 0) {
+        const videoTrack = stream5.getVideoTracks()[0];
+        console.log(videoTrack.readyState);
+        console.log(videoTrack.enabled);
+      }
+      if (e2.data.size > 0) {
+        buffer.push(e2.data);
+      }
+      if (!stopped) {
+        if (lastEvent && e2.data.size === lastEvent.data.size || e2.data.size === 0) {
+          proctoringId && lastEvent && e2.data.size === lastEvent.data.size && trackers.registerOnBufferSizeError(
+            proctoringId,
+            `onBufferSizeError: Recorder size freezed: ${e2.data.size} Mb`
+          );
+          proctoringId && e2.data.size === 0 && trackers.registerOnBufferSizeError(
+            proctoringId,
+            `onBufferSizeError: Recorder size equal 0 Mb`
+          );
+          console.log("onbuffer size error" + e2.data.size);
+          onBufferSizeErrorCallback && onBufferSizeErrorCallback();
+        }
+        lastEvent = e2;
+      } else {
+        resolvePromise && resolvePromise();
       }
-      lastEvent = e2;
-    } else {
-      resolvePromise && resolvePromise();
+    };
+    return mediaRecorder2;
+  }
+  let mediaRecorder = buildMediaRecorder(stream4, recorderOptions);
+  async function startRecorder(recorder2) {
+    return new Promise((resolve, reject) => {
+      let started = false;
+      recorder2.onstart = () => {
+        started = true;
+        resolve();
+      };
+      recorder2.onerror = (e2) => {
+        reject(e2);
+      };
+      try {
+        recorder2.start(1e4);
+      } catch (e2) {
+        return reject(e2);
+      }
+      setTimeout(() => {
+        if (!started) {
+          reject(new Error("Timeout ao iniciar o recorder"));
+        }
+      }, 500);
+    });
+  }
+  async function startWithRetry(recorder2) {
+    for (let i2 = 0; i2 < 3; i2++) {
+      try {
+        console.log("startWithRetry try", i2);
+        await startRecorder(recorder2);
+        if (recorder2.state === "recording") {
+          bufferSize = 0;
+          stopped = false;
+          return;
+        }
+      } catch (e2) {
+        console.error("Erro ao iniciar o recorder:", e2);
+      }
+      await new Promise((r2) => setTimeout(r2, 300));
+      recorder2 = buildMediaRecorder(stream4, recorderOptions);
     }
-  };
-  function startRecording() {
+    throw new Error("Falha ao iniciar o recorder");
+  }
+  async function startRecording() {
+    await startWithRetry(mediaRecorder);
+    return;
     return new Promise((resolve, reject) => {
       var timeSlice = 1e4;
       if ((videoOptions == null ? void 0 : videoOptions.timeSlice) != void 0) {
@@ -30445,9 +30500,10 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
       bufferSize = 0;
       stopped = false;
       setTimeout(async () => {
-        console.log("onstart Timeout");
+        if (mediaRecorder.state == "recording") return;
+        +console.log("onstart Timeout");
         reject(new Error("onstart Timeout"));
-      }, 3e3);
+      }, 2e3);
     });
   }
   function stopRecording() {
@@ -30490,6 +30546,7 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
   }
   return {
     startRecording,
+    startWithRetry,
     stopRecording,
     pauseRecording,
     resumeRecording,
@@ -30854,6 +30911,7 @@ var CameraRecorder = class {
     this.isCanvasLoopActive = false;
     this.hardwareStream = null;
     this.internalClonedStream = null;
+    this.videoElement = null;
     this.currentRetries = 0;
     this.packageCount = 0;
     this.noiseWait = 20;
@@ -30984,8 +31042,131 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       this.hardwareStream = null;
     }
   }
+  async waitForVideoFlow() {
+    return new Promise((resolve) => {
+      const check = () => {
+        var _a2;
+        if (this.videoElement && ((_a2 = this.videoElement) == null ? void 0 : _a2.readyState) >= 3) return resolve();
+        else requestAnimationFrame(check);
+      };
+      check();
+    });
+  }
+  async attachAndWarmup(stream4) {
+    this.videoElement = document.createElement("video");
+    this.videoElement.srcObject = stream4;
+    this.videoElement.muted = true;
+    await this.videoElement.play().catch((e2) => {
+    });
+    console.log("cameraStream.getVideoTracks() length:", this.cameraStream.getVideoTracks().length);
+    await new Promise((resolve) => {
+      var _a2;
+      if (this.videoElement && ((_a2 = this.videoElement) == null ? void 0 : _a2.readyState) >= 1) return resolve();
+      if (this.videoElement)
+        this.videoElement.onloadedmetadata = () => resolve();
+    });
+    console.log("metadata ok");
+    await this.waitForVideoFlow();
+    console.log("waitForVideoFlow ok");
+    await new Promise((r2) => setTimeout(r2, 300));
+  }
   async startRecording(options) {
-    var _a2, _b, _c2, _d, _e2, _f, _g, _h;
+    var _a2, _b, _c2, _d, _e2, _f, _g;
+    console.log("startRecording Camera Recorder");
+    if ((((_a2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _a2.detectPerson) || ((_b = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _b.detectCellPhone) || ((_c2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _c2.detectFace)) && !(options == null ? void 0 : options.retry)) {
+      console.log("startRecording Camera Recorder initializeDetectors");
+      await this.initializeDetectors();
+    }
+    const { cameraId, microphoneId } = this.options;
+    const constraints = {
+      audio: { deviceId: microphoneId },
+      video: {
+        deviceId: cameraId,
+        width: this.videoOptions.width,
+        height: this.videoOptions.height,
+        frameRate: 15
+      }
+    };
+    try {
+      this.hardwareStream = await navigator.mediaDevices.getUserMedia(
+        constraints
+      );
+      this.cameraStream = this.hardwareStream;
+    } catch (error) {
+      console.log("startRecording Camera Recorder error", error);
+      if (error.toString() == "NotReadableError: Could not start video source")
+        throw "N\xE3o foi poss\xEDvel conectar a camera, ela pode estar sendo utilizada por outro programa";
+      throw error;
+    }
+    await this.attachAndWarmup(this.cameraStream);
+    const {
+      startRecording,
+      stopRecording,
+      pauseRecording,
+      resumeRecording,
+      recorderOptions,
+      getBufferSize
+    } = recorder(
+      this.cameraStream,
+      // streamToRecord,
+      this.blobs,
+      this.videoOptions,
+      this.options.onBufferSizeError,
+      (e2) => this.bufferError(e2),
+      false
+    );
+    this.recordingStart = startRecording;
+    this.recordingStop = stopRecording;
+    this.recordingPause = pauseRecording;
+    this.recordingResume = resumeRecording;
+    this.recorderOptions = recorderOptions;
+    this.getBufferSize = getBufferSize;
+    try {
+      await new Promise((r2) => setTimeout(r2, 500));
+      await this.recordingStart();
+    } catch (error) {
+      console.log("startRecording Camera Recorder error", error);
+      throw error;
+    }
+    const track = this.cameraStream.getVideoTracks()[0];
+    const settings = track.getSettings();
+    let { width = 0, height = 0 } = settings;
+    const isPortrait = (_d = screen.orientation) == null ? void 0 : _d.type.includes("portrait");
+    if (isPortrait && isMobileDevice()) {
+      if (this.videoOptions.width == height && this.videoOptions.height == width) {
+        [width, height] = [height, width];
+      }
+    }
+    if (this.videoOptions.minWidth > width || this.videoOptions.minHeight > height) {
+      throw STREAM_UNDER_MINIMUM_PERMITTED;
+    } else if (this.videoOptions.width !== width || this.videoOptions.height !== height) {
+      trackers.registerAnotherStream(
+        this.proctoringId,
+        `Maybe have another stream active
+Video Options: ${JSON.stringify(
+          this.videoOptions,
+          null,
+          2
+        )}
+Setting: ${JSON.stringify(settings, null, 2)}`
+      );
+      throw ANOTHER_STREAM_ACTIVE;
+    }
+    if ((_e2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _e2.detectFace) {
+      await this.faceDetection.enableCam(this.cameraStream);
+    }
+    if (((_f = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _f.detectPerson) || ((_g = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _g.detectCellPhone)) {
+      await this.objectDetection.enableCam(this.cameraStream);
+    }
+    this.filesToUpload = [];
+    if (this.options.proctoringType == "REALTIME") {
+      this.captureFrame();
+    }
+    this.packageCount = 0;
+    console.log("startRecording Camera Recorder OK");
+  }
+  async startRecordingOld(options) {
+    var _a2, _b, _c2, _d, _e2, _f, _g;
     console.log("startRecording Camera Recorder");
     if ((((_a2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _a2.detectPerson) || ((_b = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _b.detectCellPhone) || ((_c2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _c2.detectFace)) && !(options == null ? void 0 : options.retry)) {
       console.log("startRecording Camera Recorder initializeDetectors");
@@ -31015,6 +31196,17 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     const track = this.cameraStream.getVideoTracks()[0];
     const settings = track.getSettings();
     let { width = 0, height = 0 } = settings;
+    console.log("cameraStream.getVideoTracks() length:", this.cameraStream.getVideoTracks().length);
+    await new Promise((resolve) => {
+      const interval = setInterval(() => {
+        console.log("cameraStream.getVideoTracks()[0].readyState", this.cameraStream.getVideoTracks()[0].readyState);
+        if (this.cameraStream.getVideoTracks()[0].readyState == "live") {
+          clearInterval(interval);
+          resolve();
+        }
+      }, 100);
+    });
+    await new Promise((r2) => setTimeout(r2, 300));
     const {
       startRecording,
       stopRecording,
@@ -31039,6 +31231,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     this.getBufferSize = getBufferSize;
     console.log("startRecording Camera Recorder recordingStart");
     try {
+      await new Promise((r2) => setTimeout(r2, 500));
       await this.recordingStart();
     } catch (error) {
       console.log("startRecording Camera Recorder error", error);
@@ -31065,11 +31258,10 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       );
       throw ANOTHER_STREAM_ACTIVE;
     }
-    ((_e2 = this.paramsConfig.imageBehaviourParameters) == null ? void 0 : _e2.useUploadImage) && this.options.proctoringType == "IMAGE" && this.photoShotsCycle();
-    if ((_f = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _f.detectFace) {
+    if ((_e2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _e2.detectFace) {
       await this.faceDetection.enableCam(this.cameraStream);
     }
-    if (((_g = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _g.detectPerson) || ((_h = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _h.detectCellPhone)) {
+    if (((_f = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _f.detectPerson) || ((_g = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _g.detectCellPhone)) {
       await this.objectDetection.enableCam(this.cameraStream);
     }
     this.filesToUpload = [];
@@ -31080,6 +31272,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     console.log("startRecording Camera Recorder finished");
   }
   async stopRecording() {
+    var _a2, _b, _c2;
     console.log("Stopping Camera Recorder...");
     this.isCanvasLoopActive = false;
     this.recordingStop && await this.recordingStop();
@@ -31099,8 +31292,18 @@ Setting: ${JSON.stringify(settings, null, 2)}`
         this.hardwareStream.getTracks().forEach((track) => track.stop());
         this.hardwareStream = null;
       }
-    } catch {
-      console.error("Erro ao parar os streams de m\xEDdia.");
+      if (this.videoElement) {
+        (_a2 = this.videoElement) == null ? void 0 : _a2.remove();
+        this.videoElement = null;
+      }
+      if (this.video) {
+        (_b = this.video) == null ? void 0 : _b.remove();
+      }
+      if (this.canvas) {
+        (_c2 = this.canvas) == null ? void 0 : _c2.remove();
+      }
+    } catch (error) {
+      console.error("Erro ao parar os streams de m\xEDdia.", error);
     }
     this.faceDetection && this.faceDetection.detecting && this.faceDetection.stopDetection();
     this.objectDetection && this.objectDetection.detecting && this.objectDetection.stopDetection();
@@ -31119,35 +31322,6 @@ Setting: ${JSON.stringify(settings, null, 2)}`
   async resumeRecording() {
     await this.recordingResume();
   }
-  photoShotsCycle() {
-    let imageFile;
-    this.configImageCapture();
-    this.imageInterval = setInterval(async () => {
-      this.canvas.getContext("2d").drawImage(
-        this.video,
-        0,
-        0,
-        this.videoOptions.width,
-        this.videoOptions.height
-      );
-      const image_data_url = this.canvas.toDataURL("image/jpeg");
-      imageFile = await this.getFile(
-        image_data_url,
-        `${this.proctoringId}_${this.imageCount + 1}.jpg`,
-        "image/jpeg"
-      );
-      if (imageFile && this.upload && this.backendToken) {
-        this.upload.upload(
-          {
-            file: imageFile
-          },
-          this.backendToken,
-          true
-        );
-        this.imageCount++;
-      }
-    }, this.paramsConfig.imageBehaviourParameters.uploadInterval * 1e3);
-  }
   async getCurrentImageBase64() {
     if (!this.video || !this.canvas) {
       this.configImageCapture();
@@ -33853,7 +34027,6 @@ var _ExternalCameraChecker = class _ExternalCameraChecker {
     this.connection = null;
     this.context = context;
     this.onRealtimeAlertsCallback = onRealtimeAlertsCallback;
-    console.log("context -> ", context);
     this.backend = new BackendService({
       type: (context == null ? void 0 : context.type) || "prod",
       token: context.token
@@ -34907,6 +35080,7 @@ var Proctoring = class {
       try {
         console.log("start Proctoring recorder.startAll");
         await this.recorder.startAll();
+        console.log("start Proctoring recorder.startAll ok");
       } catch (error) {
         console.log("start Proctoring error", error);
         alert(error);

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

@@ -36,6 +36,7 @@ export declare class CameraRecorder implements IRecorder {
     private isCanvasLoopActive;
     private hardwareStream;
     private internalClonedStream;
+    private videoElement;
     constructor(options: {
         cameraId?: string;
         microphoneId?: string;
@@ -46,7 +47,7 @@ export declare class CameraRecorder implements IRecorder {
         onRealtimeAlertsCallback?: (response: any) => void;
     }, videoOptions: ProctoringVideoOptions, paramsConfig?: IParamsConfig, backend?: BackendService, backendToken?: string);
     file?: File;
-    recordingStart: () => any;
+    recordingStart: () => Promise<void>;
     recordingStop: () => any;
     recordingPause: () => any;
     recordingResume: () => any;
@@ -60,13 +61,17 @@ export declare class CameraRecorder implements IRecorder {
         retry?: boolean;
     }): Promise<void>;
     stopStream(): Promise<void>;
+    waitForVideoFlow(): Promise<void>;
+    attachAndWarmup(stream: MediaStream): Promise<void>;
     startRecording(options?: {
         retry?: boolean;
     }): Promise<void>;
+    startRecordingOld(options?: {
+        retry?: boolean;
+    }): Promise<void>;
     stopRecording(): Promise<void>;
     pauseRecording(): Promise<void>;
     resumeRecording(): Promise<void>;
-    photoShotsCycle(): void;
     getCurrentImageBase64(): Promise<string>;
     packageCount: number;
     captureFrame(): void;

package/package.json

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

package/plugins/recorder.d.ts

@@ -2,6 +2,7 @@ import { ProctoringVideoOptions } from "../proctoring/options/ProctoringVideoOpt
 export declare function setRecorderProctoringId(id: string): void;
 export default function recorder(stream: MediaStream, buffer: Blob[], videoOptions: ProctoringVideoOptions | null, onBufferSizeError?: boolean, onBufferSizeErrorCallback?: (e?: any) => void, audio?: boolean): {
     startRecording: () => Promise<void>;
+    startWithRetry: (recorder: MediaRecorder) => Promise<void>;
     stopRecording: () => Promise<void>;
     pauseRecording: () => Promise<void>;
     resumeRecording: () => Promise<void>;