easyproctor-hml 2.5.21 → 2.5.23

package/esm/index.js

@@ -12167,7 +12167,10 @@ function validatePartialVideoOptions(options) {
       width: options.width,
       height: options.height,
       minWidth: options.minWidth,
-      minHeight: options.minHeight
+      minHeight: options.minHeight,
+      timeSlice: options.timeSlice,
+      videoBitsPerSecond: options.videoBitsPerSecond,
+      mimeType: options.mimeType
     };
   } else {
     return { width: 640, height: 480 };
@@ -12254,7 +12257,7 @@ var proctoringId;
 function setRecorderProctoringId(id) {
   proctoringId = id;
 }
-function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCallback, audio = false) {
+function recorder(stream, buffer, videoOptions, onBufferSizeError = false, onBufferSizeErrorCallback, audio = false) {
   let resolvePromise;
   let stopped = false;
   let onBufferSizeInterval;
@@ -12274,15 +12277,28 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
       "vp9 codec not supported. Using default mimeType without vp9."
     );
   }
+  if (videoOptions == null ? void 0 : videoOptions.mimeType) {
+    recorderOptions.mimeType = videoOptions == null ? void 0 : videoOptions.mimeType;
+  }
+  if ((videoOptions == null ? void 0 : videoOptions.videoBitsPerSecond) != void 0) {
+    recorderOptions.videoBitsPerSecond = videoOptions == null ? void 0 : videoOptions.videoBitsPerSecond;
+  }
   if (audio) {
     recorderOptions = {
       mimeType: "audio/webm",
       audioBitsPerSecond: 64 * 1e3
     };
   }
+  console.log("recorderOptions bitsPerSecond", recorderOptions.bitsPerSecond);
   const mediaRecorder = new MediaRecorder(stream, recorderOptions);
   mediaRecorder.ondataavailable = (e3) => {
     bufferSize = bufferSize + e3.data.size;
+    console.log("video tracks length > 0", stream.getVideoTracks().length > 0);
+    if (stream.getVideoTracks().length > 0) {
+      const videoTrack = stream.getVideoTracks()[0];
+      console.log(videoTrack.readyState);
+      console.log(videoTrack.enabled);
+    }
     if (e3.data.size > 0) {
       buffer.push(e3.data);
     }
@@ -12296,6 +12312,7 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
           proctoringId,
           `onBufferSizeError: Recorder size equal 0 Mb`
         );
+        console.log("onbuffer size error");
         onBufferSizeErrorCallback && onBufferSizeErrorCallback();
       }
       lastEvent = e3;
@@ -12310,14 +12327,14 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
   function startRecording() {
     return new Promise((resolve) => {
       resolvePromise = resolve;
-      mediaRecorder.start();
+      var timeSlice = 1e4;
+      if ((videoOptions == null ? void 0 : videoOptions.timeSlice) != void 0) {
+        timeSlice = videoOptions == null ? void 0 : videoOptions.timeSlice;
+      }
+      console.log("startRecording", timeSlice);
+      mediaRecorder.start(timeSlice);
       bufferSize = 0;
       stopped = false;
-      if (onBufferSizeError) {
-        onBufferSizeInterval = setInterval(async () => {
-          await mediaRecorder.requestData();
-        }, 3e4);
-      }
     });
   }
   function stopRecording() {
@@ -12326,7 +12343,6 @@ function recorder(stream, buffer, onBufferSizeError = false, onBufferSizeErrorCa
         resolvePromise = resolve;
         mediaRecorder.stop();
         stopped = true;
-        clearInterval(onBufferSizeInterval);
         stream.getTracks().forEach((el) => {
           el.stop();
         });
@@ -12809,6 +12825,66 @@ var CameraRecorder = class {
       this.options.onBufferSizeErrorCallback && this.options.onBufferSizeErrorCallback();
     }
   }
+  async startStream(options) {
+    var _a2;
+    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) {
+      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;
+    const isPortrait = (_a2 = screen.orientation) == null ? void 0 : _a2.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;
+    }
+  }
+  async stopStream() {
+    if (this.cameraStream) {
+      this.cameraStream.getTracks().forEach((track) => track.stop());
+    }
+    if (this.internalClonedStream) {
+      this.internalClonedStream.getTracks().forEach((track) => track.stop());
+      this.internalClonedStream = null;
+    }
+    if (this.hardwareStream) {
+      this.hardwareStream.getTracks().forEach((track) => track.stop());
+      this.hardwareStream = null;
+    }
+  }
   async startRecording(options) {
     var _a2, _b, _c2, _d, _e3, _f, _g, _h;
     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)) {
@@ -12848,6 +12924,7 @@ var CameraRecorder = class {
       this.cameraStream,
       // streamToRecord,
       this.blobs,
+      this.videoOptions,
       this.options.onBufferSizeError,
       (e3) => this.bufferError(e3),
       false
@@ -15375,7 +15452,7 @@ var AudioRecorder = class {
       audio: { deviceId: this.options.microphoneId || "default" }
     };
     this.audioStream = await navigator.mediaDevices.getUserMedia(constraints);
-    const { startRecording, stopRecording, pauseRecording, resumeRecording } = recorder(this.audioStream, this.blobs, void 0, void 0, true);
+    const { startRecording, stopRecording, pauseRecording, resumeRecording } = recorder(this.audioStream, this.blobs, null, void 0, void 0, true);
     this.recordingStart = startRecording;
     this.recordingStop = stopRecording;
     this.recordingPause = pauseRecording;
@@ -17966,7 +18043,7 @@ var ScreenRecorder = class {
       });
       throw NOT_SHARED_SCREEN;
     }
-    const { startRecording, stopRecording } = recorder(this.screenStream, this.blobs, this.options.onBufferSizeError, onBufferSizeErrorCallback);
+    const { startRecording, stopRecording } = recorder(this.screenStream, this.blobs, null, this.options.onBufferSizeError, onBufferSizeErrorCallback);
     this.recordingStart = startRecording;
     this.recordingStop = stopRecording;
     this.recordingStart();
@@ -21986,7 +22063,10 @@ var Proctoring = class {
         width: this.videoOptions.width,
         height: this.videoOptions.height,
         minWidth: this.videoOptions.minWidth,
-        minHeight: this.videoOptions.minHeight
+        minHeight: this.videoOptions.minHeight,
+        timeSlice: this.videoOptions.timeSlice,
+        videoBitsPerSecond: this.videoOptions.videoBitsPerSecond,
+        mimeType: this.videoOptions.mimeType
       },
       this.paramsConfig,
       this.backend,

package/index.js

@@ -30264,7 +30264,10 @@ function validatePartialVideoOptions(options) {
       width: options.width,
       height: options.height,
       minWidth: options.minWidth,
-      minHeight: options.minHeight
+      minHeight: options.minHeight,
+      timeSlice: options.timeSlice,
+      videoBitsPerSecond: options.videoBitsPerSecond,
+      mimeType: options.mimeType
     };
   } else {
     return { width: 640, height: 480 };
@@ -30351,7 +30354,7 @@ var proctoringId;
 function setRecorderProctoringId(id) {
   proctoringId = id;
 }
-function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorCallback, audio = false) {
+function recorder(stream4, buffer, videoOptions, onBufferSizeError = false, onBufferSizeErrorCallback, audio = false) {
   let resolvePromise;
   let stopped = false;
   let onBufferSizeInterval;
@@ -30371,15 +30374,28 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
       "vp9 codec not supported. Using default mimeType without vp9."
     );
   }
+  if (videoOptions == null ? void 0 : videoOptions.mimeType) {
+    recorderOptions.mimeType = videoOptions == null ? void 0 : videoOptions.mimeType;
+  }
+  if ((videoOptions == null ? void 0 : videoOptions.videoBitsPerSecond) != void 0) {
+    recorderOptions.videoBitsPerSecond = videoOptions == null ? void 0 : videoOptions.videoBitsPerSecond;
+  }
   if (audio) {
     recorderOptions = {
       mimeType: "audio/webm",
       audioBitsPerSecond: 64 * 1e3
     };
   }
+  console.log("recorderOptions bitsPerSecond", recorderOptions.bitsPerSecond);
   const mediaRecorder = new MediaRecorder(stream4, recorderOptions);
   mediaRecorder.ondataavailable = (e3) => {
     bufferSize = bufferSize + e3.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 (e3.data.size > 0) {
       buffer.push(e3.data);
     }
@@ -30393,6 +30409,7 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
           proctoringId,
           `onBufferSizeError: Recorder size equal 0 Mb`
         );
+        console.log("onbuffer size error");
         onBufferSizeErrorCallback && onBufferSizeErrorCallback();
       }
       lastEvent = e3;
@@ -30407,14 +30424,14 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
   function startRecording() {
     return new Promise((resolve) => {
       resolvePromise = resolve;
-      mediaRecorder.start();
+      var timeSlice = 1e4;
+      if ((videoOptions == null ? void 0 : videoOptions.timeSlice) != void 0) {
+        timeSlice = videoOptions == null ? void 0 : videoOptions.timeSlice;
+      }
+      console.log("startRecording", timeSlice);
+      mediaRecorder.start(timeSlice);
       bufferSize = 0;
       stopped = false;
-      if (onBufferSizeError) {
-        onBufferSizeInterval = setInterval(async () => {
-          await mediaRecorder.requestData();
-        }, 3e4);
-      }
     });
   }
   function stopRecording() {
@@ -30423,7 +30440,6 @@ function recorder(stream4, buffer, onBufferSizeError = false, onBufferSizeErrorC
         resolvePromise = resolve;
         mediaRecorder.stop();
         stopped = true;
-        clearInterval(onBufferSizeInterval);
         stream4.getTracks().forEach((el) => {
           el.stop();
         });
@@ -30906,6 +30922,66 @@ var CameraRecorder = class {
       this.options.onBufferSizeErrorCallback && this.options.onBufferSizeErrorCallback();
     }
   }
+  async startStream(options) {
+    var _a2;
+    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) {
+      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;
+    const isPortrait = (_a2 = screen.orientation) == null ? void 0 : _a2.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;
+    }
+  }
+  async stopStream() {
+    if (this.cameraStream) {
+      this.cameraStream.getTracks().forEach((track) => track.stop());
+    }
+    if (this.internalClonedStream) {
+      this.internalClonedStream.getTracks().forEach((track) => track.stop());
+      this.internalClonedStream = null;
+    }
+    if (this.hardwareStream) {
+      this.hardwareStream.getTracks().forEach((track) => track.stop());
+      this.hardwareStream = null;
+    }
+  }
   async startRecording(options) {
     var _a2, _b, _c2, _d, _e3, _f, _g, _h;
     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)) {
@@ -30945,6 +31021,7 @@ var CameraRecorder = class {
       this.cameraStream,
       // streamToRecord,
       this.blobs,
+      this.videoOptions,
       this.options.onBufferSizeError,
       (e3) => this.bufferError(e3),
       false
@@ -33472,7 +33549,7 @@ var AudioRecorder = class {
       audio: { deviceId: this.options.microphoneId || "default" }
     };
     this.audioStream = await navigator.mediaDevices.getUserMedia(constraints);
-    const { startRecording, stopRecording, pauseRecording, resumeRecording } = recorder(this.audioStream, this.blobs, void 0, void 0, true);
+    const { startRecording, stopRecording, pauseRecording, resumeRecording } = recorder(this.audioStream, this.blobs, null, void 0, void 0, true);
     this.recordingStart = startRecording;
     this.recordingStop = stopRecording;
     this.recordingPause = pauseRecording;
@@ -36063,7 +36140,7 @@ var ScreenRecorder = class {
       });
       throw NOT_SHARED_SCREEN;
     }
-    const { startRecording, stopRecording } = recorder(this.screenStream, this.blobs, this.options.onBufferSizeError, onBufferSizeErrorCallback);
+    const { startRecording, stopRecording } = recorder(this.screenStream, this.blobs, null, this.options.onBufferSizeError, onBufferSizeErrorCallback);
     this.recordingStart = startRecording;
     this.recordingStop = stopRecording;
     this.recordingStart();
@@ -37235,7 +37312,10 @@ var Proctoring = class {
         width: this.videoOptions.width,
         height: this.videoOptions.height,
         minWidth: this.videoOptions.minWidth,
-        minHeight: this.videoOptions.minHeight
+        minHeight: this.videoOptions.minHeight,
+        timeSlice: this.videoOptions.timeSlice,
+        videoBitsPerSecond: this.videoOptions.videoBitsPerSecond,
+        mimeType: this.videoOptions.mimeType
       },
       this.paramsConfig,
       this.backend,

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

@@ -56,6 +56,10 @@ export declare class CameraRecorder implements IRecorder {
     configImageCapture(): void;
     currentRetries: number;
     bufferError(e: any): Promise<void>;
+    startStream(options?: {
+        retry?: boolean;
+    }): Promise<void>;
+    stopStream(): Promise<void>;
     startRecording(options?: {
         retry?: boolean;
     }): Promise<void>;

package/package.json

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

package/plugins/recorder.d.ts

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

package/proctoring/options/ProctoringVideoOptions.d.ts

@@ -3,6 +3,9 @@ export interface ProctoringVideoOptions {
     height: number;
     minWidth?: number;
     minHeight?: number;
+    timeSlice?: number;
+    videoBitsPerSecond?: number;
+    mimeType?: string;
 }
 export declare function validatePartialVideoOptions(options: Partial<ProctoringVideoOptions>): ProctoringVideoOptions;
 export declare const getDefaultProctoringVideoOptions: ProctoringVideoOptions;