easyproctor-hml 2.5.31 → 2.5.32

package/index.js

@@ -30309,46 +30309,6 @@ function isMobileDevice() {
   return /Android|iPhone|iPad|iPod/i.test(navigator.userAgent);
 }
 
-// src/plugins/insights.ts
-var backendService;
-var init = (backend) => {
-  backendService = backend;
-  return backendService;
-};
-var eventNames = {
-  DEVICES_CHECKED: "devices_checked",
-  START: "start",
-  FINISH: "finish",
-  ERROR: "error",
-  UPLOAD: "upload",
-  UPLOAD_FILE: "upload_file",
-  DOWNLOAD_VIDEO: "download_video",
-  BUFFER_SIZE: "buffer_size",
-  ANOTHER_STREAM: "another_stream",
-  CHANGE_DEVICE: "change_device",
-  STOP_SHARING_SCREEN: "stop_sharing_screen",
-  ERROR_RECORDER_RTC: "error_recorder_rtc",
-  BROWSER_NOT_SUPPORTED: "browser_not_supported",
-  SAVE_ON_SESSION: "save_on_session"
-};
-var log = (eventName, properties) => backendService && backendService.log(eventName, properties);
-var trackers = {
-  registerDevicesChecked: (proctoringId2, success, description) => log(eventNames.DEVICES_CHECKED, { proctoringId: proctoringId2, success, description }),
-  registerStart: (proctoringId2, success, description) => log(eventNames.START, { proctoringId: proctoringId2, success, description }),
-  registerFinish: (proctoringId2, success, description) => log(eventNames.FINISH, { proctoringId: proctoringId2, success, description }),
-  registerError: (proctoringId2, description) => log(eventNames.ERROR, { proctoringId: proctoringId2, description }),
-  registerBrowserNotSupported: (proctoringId2, description) => log(eventNames.BROWSER_NOT_SUPPORTED, { proctoringId: proctoringId2, description }),
-  registerUpload: (proctoringId2, success, description, serviceType, uploadTime) => log(eventNames.UPLOAD, { proctoringId: proctoringId2, success, description, serviceType, uploadTime }),
-  registerUploadFile: (proctoringId2, description, fileType) => log(eventNames.UPLOAD_FILE, { proctoringId: proctoringId2, description, fileType }),
-  registerChangeDevice: (proctoringId2, inOrOut, description) => log(eventNames.CHANGE_DEVICE, { proctoringId: proctoringId2, inOrOut, description }),
-  registerStopSharingScreen: (proctoringId2, description) => log(eventNames.STOP_SHARING_SCREEN, { proctoringId: proctoringId2, description }),
-  registerErrorRecorderRTC: (proctoringId2, description) => log(eventNames.ERROR_RECORDER_RTC, { proctoringId: proctoringId2, description }),
-  registerDownloadFile: (proctoringId2, description) => log(eventNames.DOWNLOAD_VIDEO, { proctoringId: proctoringId2, description }),
-  registerOnBufferSizeError: (proctoringId2, description) => log(eventNames.BUFFER_SIZE, { proctoringId: proctoringId2, description }),
-  registerAnotherStream: (proctoringId2, description) => log(eventNames.ANOTHER_STREAM, { proctoringId: proctoringId2, description }),
-  registerSaveOnSession: (proctoringId2, description) => log(eventNames.SAVE_ON_SESSION, { proctoringId: proctoringId2, description })
-};
-
 // src/plugins/recorder.ts
 var proctoringId;
 function setRecorderProctoringId(id) {
@@ -30410,21 +30370,7 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
       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 {
+      if (stopped) {
         resolvePromise && resolvePromise();
       }
     };
@@ -30437,6 +30383,7 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
       let started = false;
       recorder2.onstart = () => {
         started = true;
+        console.log("recorder onstart");
         resolve();
       };
       recorder2.onerror = (ev) => {
@@ -30471,86 +30418,37 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
       }, 2e3);
     });
   }
-  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));
-      if (recorder2) {
-        try {
-          if (recorder2.state !== "inactive") {
-            recorder2.stop();
-            console.log("Recorder antigo parado");
-          }
-        } catch (e2) {
-          console.warn("Erro ao parar recorder antigo:", e2);
-        }
-      }
-      recorder2 = buildMediaRecorder(stream4, recorderOptions);
-    }
-    throw new Error("Falha ao iniciar o recorder");
-  }
   async function startRecording() {
     try {
-      await startWithRetry(mediaRecorder);
+      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");
+      }
     } catch (e2) {
+      console.error("Erro ao iniciar o recorder:", e2);
+      await new Promise((r2) => setTimeout(r2, 300));
       throw e2;
     }
     return;
-    return new Promise((resolve, reject) => {
-      var timeSlice = 1e4;
-      if ((videoOptions == null ? void 0 : videoOptions.timeSlice) != void 0) {
-        timeSlice = videoOptions == null ? void 0 : videoOptions.timeSlice;
-      }
-      console.log("startRecording", timeSlice);
-      try {
-        mediaRecorder.onstart = () => {
-          console.log("Grava\xE7\xE3o iniciada com sucesso!");
-          resolve();
-        };
-        mediaRecorder.onerror = (e2) => {
-          console.error("Erro no MediaRecorder:", e2);
-          reject(e2);
-        };
-        console.log("mediaRecorder.state", mediaRecorder.state);
-        console.log(stream4.active);
-        console.log(stream4.getTracks().map((t2) => t2.readyState));
-        mediaRecorder.start(timeSlice);
-      } catch (e2) {
-        console.error("Falha ao iniciar:", e2);
-        reject(e2);
-      }
-      bufferSize = 0;
-      stopped = false;
-      setTimeout(async () => {
-        if (mediaRecorder.state == "recording") return;
-        +console.log("onstart Timeout");
-        reject(new Error("onstart Timeout"));
-      }, 2e3);
-    });
   }
   function stopRecording() {
     return new Promise((resolve) => {
       if (mediaRecorder.state == "recording") {
+        console.log("stopRecording Recorder est\xE1 em estado recording, iniciando stop");
         resolvePromise = resolve;
-        mediaRecorder.requestData();
-        mediaRecorder.stop();
         stopped = true;
-        stream4.getTracks().forEach((el) => {
-          el.stop();
-        });
+        mediaRecorder.stop();
       } else {
+        console.log("stopRecording Recorder n\xE3o est\xE1 em estado recording");
         resolve();
       }
+      stream4.getTracks().forEach((el) => {
+        el.stop();
+      });
     });
   }
   function pauseRecording() {
@@ -30578,7 +30476,6 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
   }
   return {
     startRecording,
-    startWithRetry,
     stopRecording,
     pauseRecording,
     resumeRecording,
@@ -30587,6 +30484,46 @@ function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBu
   };
 }
 
+// src/plugins/insights.ts
+var backendService;
+var init = (backend) => {
+  backendService = backend;
+  return backendService;
+};
+var eventNames = {
+  DEVICES_CHECKED: "devices_checked",
+  START: "start",
+  FINISH: "finish",
+  ERROR: "error",
+  UPLOAD: "upload",
+  UPLOAD_FILE: "upload_file",
+  DOWNLOAD_VIDEO: "download_video",
+  BUFFER_SIZE: "buffer_size",
+  ANOTHER_STREAM: "another_stream",
+  CHANGE_DEVICE: "change_device",
+  STOP_SHARING_SCREEN: "stop_sharing_screen",
+  ERROR_RECORDER_RTC: "error_recorder_rtc",
+  BROWSER_NOT_SUPPORTED: "browser_not_supported",
+  SAVE_ON_SESSION: "save_on_session"
+};
+var log = (eventName, properties) => backendService && backendService.log(eventName, properties);
+var trackers = {
+  registerDevicesChecked: (proctoringId2, success, description) => log(eventNames.DEVICES_CHECKED, { proctoringId: proctoringId2, success, description }),
+  registerStart: (proctoringId2, success, description) => log(eventNames.START, { proctoringId: proctoringId2, success, description }),
+  registerFinish: (proctoringId2, success, description) => log(eventNames.FINISH, { proctoringId: proctoringId2, success, description }),
+  registerError: (proctoringId2, description) => log(eventNames.ERROR, { proctoringId: proctoringId2, description }),
+  registerBrowserNotSupported: (proctoringId2, description) => log(eventNames.BROWSER_NOT_SUPPORTED, { proctoringId: proctoringId2, description }),
+  registerUpload: (proctoringId2, success, description, serviceType, uploadTime) => log(eventNames.UPLOAD, { proctoringId: proctoringId2, success, description, serviceType, uploadTime }),
+  registerUploadFile: (proctoringId2, description, fileType) => log(eventNames.UPLOAD_FILE, { proctoringId: proctoringId2, description, fileType }),
+  registerChangeDevice: (proctoringId2, inOrOut, description) => log(eventNames.CHANGE_DEVICE, { proctoringId: proctoringId2, inOrOut, description }),
+  registerStopSharingScreen: (proctoringId2, description) => log(eventNames.STOP_SHARING_SCREEN, { proctoringId: proctoringId2, description }),
+  registerErrorRecorderRTC: (proctoringId2, description) => log(eventNames.ERROR_RECORDER_RTC, { proctoringId: proctoringId2, description }),
+  registerDownloadFile: (proctoringId2, description) => log(eventNames.DOWNLOAD_VIDEO, { proctoringId: proctoringId2, description }),
+  registerOnBufferSizeError: (proctoringId2, description) => log(eventNames.BUFFER_SIZE, { proctoringId: proctoringId2, description }),
+  registerAnotherStream: (proctoringId2, description) => log(eventNames.ANOTHER_STREAM, { proctoringId: proctoringId2, description }),
+  registerSaveOnSession: (proctoringId2, description) => log(eventNames.SAVE_ON_SESSION, { proctoringId: proctoringId2, description })
+};
+
 // src/new-flow/upload/UploadService.ts
 var UploadService = class {
   constructor(proctoringId2, backend) {
@@ -30999,15 +30936,13 @@ var CameraRecorder = class {
   }
   async bufferError(e2) {
     var _a2, _b;
-    console.log("buffer error Camera Recorder params " + this.paramsConfig.videoBehaviourParameters);
+    console.log("buffer error Camera Recorder error", e2);
     const retryEnabled = ((_a2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _a2.retryEnabled) || false;
     const maxRetries = ((_b = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _b.maxRetries) || 3;
     if (retryEnabled && this.currentRetries < maxRetries) {
       console.log("buffer error Camera Recorder retry");
       await this.recordingStop();
-      await this.startRecording({
-        retry: true
-      });
+      await this.startRecording();
       this.currentRetries++;
       this.options.onBufferSizeErrorCallback && this.options.onBufferSizeErrorCallback(this.cameraStream);
     } else {
@@ -31102,34 +31037,10 @@ Setting: ${JSON.stringify(settings, null, 2)}`
     console.log("waitForVideoFlow ok");
     await new Promise((r2) => setTimeout(r2, 300));
   }
-  async startRecording(options) {
-    var _a2, _b, _c2, _d, _e2, _f, _g;
+  async startRecording() {
+    var _a2, _b, _c2, _d, _e2, _f, _g, _h;
     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.startStream();
     await this.attachAndWarmup(this.cameraStream);
     const {
       startRecording,
@@ -31158,118 +31069,24 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       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];
+      this.stopRecording();
+      const maxRetries = ((_a2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _a2.maxRetries) || 3;
+      if (this.currentRetries < maxRetries) {
+        console.log("buffer error Camera Recorder retry", this.currentRetries);
+        this.currentRetries++;
+        await this.startRecording();
+      } else {
+        throw error;
       }
     }
-    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)) {
+    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)) {
       console.log("startRecording Camera Recorder initializeDetectors");
       await this.initializeDetectors();
     }
-    const { cameraId, microphoneId, onBufferSizeErrorCallback } = 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
-      );
-    } 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;
-    }
-    this.cameraStream = this.hardwareStream;
     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,
-      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;
-    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);
-      throw error;
-    }
-    const isPortrait = (_d = screen.orientation) == null ? void 0 : _d.type.includes("portrait");
+    const isPortrait = (_e2 = screen.orientation) == null ? void 0 : _e2.type.includes("portrait");
     if (isPortrait && isMobileDevice()) {
       if (this.videoOptions.width == height && this.videoOptions.height == width) {
         [width, height] = [height, width];
@@ -31290,10 +31107,10 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       );
       throw ANOTHER_STREAM_ACTIVE;
     }
-    if ((_e2 = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _e2.detectFace) {
+    if ((_f = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _f.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)) {
+    if (((_g = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _g.detectPerson) || ((_h = this.paramsConfig.videoBehaviourParameters) == null ? void 0 : _h.detectCellPhone)) {
       await this.objectDetection.enableCam(this.cameraStream);
     }
     this.filesToUpload = [];
@@ -31301,7 +31118,7 @@ Setting: ${JSON.stringify(settings, null, 2)}`
       this.captureFrame();
     }
     this.packageCount = 0;
-    console.log("startRecording Camera Recorder finished");
+    console.log("startRecording Camera Recorder OK");
   }
   async stopRecording() {
     var _a2, _b, _c2;

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

@@ -63,12 +63,7 @@ export declare class CameraRecorder implements IRecorder {
     stopStream(): Promise<void>;
     waitForVideoFlow(): Promise<void>;
     attachAndWarmup(stream: MediaStream): Promise<void>;
-    startRecording(options?: {
-        retry?: boolean;
-    }): Promise<void>;
-    startRecordingOld(options?: {
-        retry?: boolean;
-    }): Promise<void>;
+    startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
     pauseRecording(): Promise<void>;
     resumeRecording(): Promise<void>;

package/package.json

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

package/plugins/recorder.d.ts

@@ -2,7 +2,6 @@ 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>;