easyproctor 1.0.2 → 1.0.3

package/README.md

@@ -219,9 +219,12 @@ const {
 });
 ```
 
-## Release Note V 1.0.1
+## Release Note V 1.0.2
 
-- Retirada de requisição da hora no finish
+- Correção na função checkDevices
+- Adicionado callback onNoiseDetected
+- Correção de erro relacionado ao link do blob no download e na extensão
+- Correção send percentage on finish with extension
 
 
 ## License

package/esm/index.js

@@ -14642,17 +14642,16 @@ var ScreenRecorder = class {
 };
 
 // src/proctoring/options/ProctoringOptions.ts
-function getDefaultProctoringOptions() {
-  return {
-    cameraId: void 0,
-    microphoneId: void 0,
-    allowMultipleMonitors: false,
-    allowOnlyFirstMonitor: true,
-    captureScreen: true,
-    proctoringType: "IMAGE",
-    insights: ""
-  };
-}
+var getDefaultProctoringOptions = {
+  cameraId: void 0,
+  microphoneId: void 0,
+  allowMultipleMonitors: false,
+  allowOnlyFirstMonitor: true,
+  captureScreen: true,
+  noiseLimit: 40,
+  proctoringType: "IMAGE",
+  insights: ""
+};
 
 // src/proctoring/options/ProctoringVideoOptions.ts
 function validatePartialVideoOptions(options) {
@@ -14670,68 +14669,82 @@ function validatePartialVideoOptions(options) {
 var DeviceChecker = class {
   constructor() {
   }
-  async checkDevices(options = getDefaultProctoringOptions(), _videoOptions) {
-    this.checkDevicesInterface();
-    const { cameraStream, _screenStream } = await this.startCheckDevices(options, _videoOptions);
-    this.videoDeviceInterface(cameraStream);
-    this.audioDeviceInterface(cameraStream);
+  async checkDevices(options = getDefaultProctoringOptions, _videoOptions = { width: 1080, height: 720 }) {
+    this.options = {
+      ...getDefaultProctoringOptions,
+      ...options,
+      captureScreen: false,
+      allowMultipleMonitors: true,
+      allowOnlyFirstMonitor: false
+    };
+    this.videoOptions = _videoOptions;
+    return this.checkDevicesInterface();
   }
   checkDevicesInterface() {
-    const fullBg = document.createElement("div");
-    fullBg.setAttribute("id", "checkDevices");
-    fullBg.style.backgroundColor = "rgba(0,0,0,0.4)";
-    fullBg.style.zIndex = "1000";
-    fullBg.style.position = "absolute";
-    fullBg.style.top = "0";
-    fullBg.style.left = "0";
-    fullBg.style.height = "100vh";
-    fullBg.style.width = "100%";
-    fullBg.style.display = "flex";
-    fullBg.style.alignItems = "center";
-    fullBg.style.justifyContent = "center";
-    const modal = document.createElement("div");
-    modal.style.backgroundColor = "#fff";
-    modal.style.zIndex = "1001";
-    modal.style.width = "400px";
-    modal.style.borderRadius = "10px";
-    modal.style.padding = "20px 10px";
-    modal.style.display = "flex";
-    modal.style.flexDirection = "column";
-    modal.style.alignItems = "center";
-    const h3 = document.createElement("h3");
-    h3.innerText = "Verificar dispositivos";
-    h3.style.color = "rgb(22, 163, 74)";
-    h3.style.fontWeight = "bold";
-    h3.style.fontSize = "26px";
-    h3.style.marginBottom = "15px";
-    modal.appendChild(h3);
-    const video = document.createElement("video");
-    video.setAttribute("id", "cameraStream");
-    video.style.width = "20rem";
-    video.style.backgroundColor = "#000";
-    video.style.borderRadius = "10px";
-    video.style.marginBottom = "15px";
-    modal.appendChild(video);
-    const meter = document.createElement("meter");
-    meter.setAttribute("id", "audioStream");
-    meter.setAttribute("high", "0.25");
-    meter.setAttribute("max", "1");
-    meter.style.width = "20rem";
-    meter.style.borderRadius = "10px";
-    meter.style.marginBottom = "15px";
-    modal.appendChild(meter);
-    const button = document.createElement("button");
-    button.setAttribute("id", "confirmBtn");
-    button.innerText = "Confirmar";
-    button.style.width = "200px";
-    button.style.height = "50px";
-    button.style.backgroundColor = "rgb(22, 163, 74)";
-    button.style.color = "#fff";
-    button.style.borderRadius = "10px";
-    button.addEventListener("click", () => this.closeCheckDevices());
-    modal.appendChild(button);
-    fullBg.appendChild(modal);
-    document.body.appendChild(fullBg);
+    return new Promise((resolve) => {
+      const fullBg = document.createElement("div");
+      fullBg.setAttribute("id", "checkDevices");
+      fullBg.style.backgroundColor = "rgba(0,0,0,0.4)";
+      fullBg.style.zIndex = "1000";
+      fullBg.style.position = "absolute";
+      fullBg.style.top = "0";
+      fullBg.style.left = "0";
+      fullBg.style.height = "100vh";
+      fullBg.style.width = "100%";
+      fullBg.style.display = "flex";
+      fullBg.style.alignItems = "center";
+      fullBg.style.justifyContent = "center";
+      const modal = document.createElement("div");
+      modal.style.backgroundColor = "#fff";
+      modal.style.zIndex = "1001";
+      modal.style.width = "400px";
+      modal.style.borderRadius = "10px";
+      modal.style.padding = "20px 10px";
+      modal.style.display = "flex";
+      modal.style.flexDirection = "column";
+      modal.style.alignItems = "center";
+      const h3 = document.createElement("h3");
+      h3.innerText = "Verificar dispositivos";
+      h3.style.color = "rgb(22, 163, 74)";
+      h3.style.fontWeight = "bold";
+      h3.style.fontSize = "26px";
+      h3.style.marginBottom = "15px";
+      modal.appendChild(h3);
+      const video = document.createElement("video");
+      video.setAttribute("id", "cameraStream");
+      video.style.width = "20rem";
+      video.style.backgroundColor = "#000";
+      video.style.borderRadius = "10px";
+      video.style.marginBottom = "15px";
+      modal.appendChild(video);
+      const meter = document.createElement("meter");
+      meter.setAttribute("id", "audioStream");
+      meter.setAttribute("high", "0.25");
+      meter.setAttribute("max", "1");
+      meter.style.width = "20rem";
+      meter.style.borderRadius = "10px";
+      meter.style.marginBottom = "15px";
+      modal.appendChild(meter);
+      const button = document.createElement("button");
+      button.setAttribute("id", "confirmBtn");
+      button.innerText = "Confirmar";
+      button.style.width = "200px";
+      button.style.height = "50px";
+      button.style.backgroundColor = "rgb(22, 163, 74)";
+      button.style.color = "#fff";
+      button.style.borderRadius = "10px";
+      button.addEventListener("click", () => {
+        this.closeCheckDevices();
+        resolve("Complete");
+      });
+      modal.appendChild(button);
+      fullBg.appendChild(modal);
+      document.body.appendChild(fullBg);
+      this.startCheckDevices(this.options, this.videoOptions);
+    });
+  }
+  async startDevice() {
+    const { cameraStream, _screenStream } = await this.startCheckDevices(this.options, this.videoOptions);
   }
   videoDeviceInterface(stream) {
     const cameraStream = document.querySelector("#cameraStream");
@@ -14758,7 +14771,7 @@ var DeviceChecker = class {
     };
     window.requestAnimationFrame(onFrame);
   }
-  async startCheckDevices(options = getDefaultProctoringOptions(), _videoOptions) {
+  async startCheckDevices(options = getDefaultProctoringOptions, _videoOptions) {
     var _a2;
     this.videoOptions = validatePartialVideoOptions(_videoOptions);
     await checkPermissions();
@@ -14780,6 +14793,8 @@ var DeviceChecker = class {
     if (this.screenRecorder) {
       await this.screenRecorder.startRecording();
     }
+    this.videoDeviceInterface(this.cameraRecorder.cameraStream);
+    this.audioDeviceInterface(this.cameraRecorder.cameraStream);
     return {
       cameraStream: this.cameraRecorder.cameraStream,
       _screenStream: (_a2 = this.screenRecorder) == null ? void 0 : _a2.screenStream
@@ -14825,7 +14840,7 @@ var Extension = class {
   }
   verify(event) {
     if (event.source == window && event.data.sender && event.data.sender === "easyproctor-extension" && event.data.message_name && event.data.message_name === "progress") {
-      this.onProgress(100);
+      this.options.onProgress && this.options.onProgress(100);
     }
     if (event.source == window && event.data.sender && event.data.sender === "easyproctor-extension" && event.data.message_name && event.data.message_name === "start") {
       this.responseStart = true;
@@ -24751,6 +24766,16 @@ var BackendService = class {
     });
     return insights2.data;
   }
+  async getAzureBlobUrl(proctoringOptions) {
+    const blobUrl = await this.makeRequestAxios({
+      path: `/AzureKey/get-blob-url`,
+      method: "GET",
+      jwt: proctoringOptions.token
+    }).catch((error) => {
+      throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
+    });
+    return blobUrl.data;
+  }
   async getAzureSignedUrl(token, file) {
     const urlAzure = await this.makeRequestAxios({
       path: `/AzureKey/signed-url`,
@@ -24797,15 +24822,21 @@ var BackendService = class {
     });
   }
   async finishAndSendUrls(proctoringOptions, proctoringSession) {
-    var _a2, _b, _c;
+    var _a2, _b, _c, _d, _e, _f;
     const serverTime = new Date().toISOString();
     const videoCameraUpload = (_a2 = proctoringSession.recordings.find((e) => e.origin === "Camera" /* Camera */)) == null ? void 0 : _a2.upload;
     const audioCameraUpload = (_b = proctoringSession.recordings.find((e) => e.origin === "Mic" /* Mic */)) == null ? void 0 : _b.upload;
     const videoScreenUpload = (_c = proctoringSession.recordings.find((e) => e.origin === "Screen" /* Screen */)) == null ? void 0 : _c.upload;
     const clearUrl = (url) => url ? url.substring(0, url.indexOf("?")) : void 0;
-    const videoCameraUrl = clearUrl(videoCameraUpload == null ? void 0 : videoCameraUpload.azureUrl);
-    const audioCameraUrl = clearUrl(audioCameraUpload == null ? void 0 : audioCameraUpload.azureUrl);
-    const videoScreenUrl = clearUrl(videoScreenUpload == null ? void 0 : videoScreenUpload.azureUrl);
+    let videoCameraUrl = clearUrl(videoCameraUpload == null ? void 0 : videoCameraUpload.azureUrl);
+    let audioCameraUrl = clearUrl(audioCameraUpload == null ? void 0 : audioCameraUpload.azureUrl);
+    let videoScreenUrl = clearUrl(videoScreenUpload == null ? void 0 : videoScreenUpload.azureUrl);
+    if (!videoCameraUrl || !audioCameraUrl || !videoScreenUrl) {
+      const blobUrl = await this.getAzureBlobUrl(proctoringOptions);
+      !videoCameraUrl && (videoCameraUrl = `${blobUrl}/${(_d = proctoringSession.recordings.find((e) => e.origin === "Camera" /* Camera */)) == null ? void 0 : _d.file.name}`);
+      !audioCameraUrl && (audioCameraUrl = `${blobUrl}/${(_e = proctoringSession.recordings.find((e) => e.origin === "Mic" /* Mic */)) == null ? void 0 : _e.file.name}`);
+      !videoScreenUrl && proctoringSession.recordings.find((e) => e.origin === "Screen" /* Screen */) && (videoScreenUrl = `${blobUrl}/${(_f = proctoringSession.recordings.find((e) => e.origin === "Screen" /* Screen */)) == null ? void 0 : _f.file.name}`);
+    }
     await this.makeRequest({
       path: `/proctoring/finish/${proctoringOptions.examId}`,
       method: "POST",
@@ -25025,16 +25056,62 @@ var ProctoringUploader = class {
   }
 };
 
+// src/new-flow/recorders/VolumeMeter.ts
+var VolumeMeter = class {
+  constructor(stream) {
+    this.stream = stream;
+  }
+  start() {
+    return new Promise((resolve, reject) => {
+      try {
+        const audioContext = new AudioContext();
+        const analyser = audioContext.createAnalyser();
+        const microphone = audioContext.createMediaStreamSource(this.stream);
+        this.scriptProcessor = audioContext.createScriptProcessor(2048, 1, 1);
+        analyser.smoothingTimeConstant = 0.8;
+        analyser.fftSize = 1024;
+        microphone.connect(analyser);
+        analyser.connect(this.scriptProcessor);
+        this.scriptProcessor.connect(audioContext.destination);
+        const that = this;
+        this.scriptProcessor.onaudioprocess = function() {
+          const array = new Uint8Array(analyser.frequencyBinCount);
+          analyser.getByteFrequencyData(array);
+          const arraySum = array.reduce((a, value) => a + value, 0);
+          const average = arraySum / array.length;
+          that.setVolume(average);
+        };
+        resolve(true);
+      } catch (error) {
+        this.stop();
+        reject(`Error: ${error}`);
+      }
+    });
+  }
+  stop() {
+    this.scriptProcessor && this.scriptProcessor.disconnect();
+  }
+  getVolume() {
+    return this.volume;
+  }
+  setVolume(value) {
+    this.volume = value;
+  }
+};
+
 // src/new-flow/recorders/AlertRecorder.ts
 var AlertRecorder = class {
-  constructor(options, optionsProctoring) {
+  constructor(options, optionsProctoring, cameraRecorder) {
     this.alerts = [];
     this.onLostFocusCallback = options.onLostFocusCallback;
     this.onFocusCallback = options.onFocusCallback;
+    this.onNoiseDetectedCallback = options.onNoiseDetectedCallback;
     this.optionsProctoring = optionsProctoring;
+    this.cameraRecorder = cameraRecorder;
   }
   async startRecording() {
     this.startTime = new Date(Date.now());
+    this.intervalNoiseDetection = setInterval(() => this.onNoiseDetected(), 500);
     if (this.optionsProctoring.captureScreen) {
       window.addEventListener("blur", () => this.onLostFocus());
       window.addEventListener("focus", () => this.onReturnFocus());
@@ -25043,16 +25120,25 @@ var AlertRecorder = class {
   async pauseRecording() {
     window.removeEventListener("blur", () => this.onLostFocus());
     window.removeEventListener("focus", () => this.onReturnFocus());
+    window.removeEventListener("focus", () => this.onNoiseDetected());
+    this.volumeMeter.stop();
+    clearInterval(this.intervalNoiseDetection);
   }
   async resumeRecording() {
+    this.volumeMeter = void 0;
+    this.intervalNoiseDetection = setInterval(() => this.onNoiseDetected(), 500);
     if (this.optionsProctoring.captureScreen) {
       window.addEventListener("blur", () => this.onLostFocus());
       window.addEventListener("focus", () => this.onReturnFocus());
+      window.addEventListener("focus", () => this.onNoiseDetected());
     }
   }
   async stopRecording() {
     window.removeEventListener("blur", () => this.onLostFocus());
     window.removeEventListener("focus", () => this.onReturnFocus());
+    window.removeEventListener("focus", () => this.onNoiseDetected());
+    this.volumeMeter.stop();
+    clearInterval(this.intervalNoiseDetection);
   }
   async saveOnSession(session) {
     this.alerts.forEach((alert2) => {
@@ -25077,6 +25163,19 @@ var AlertRecorder = class {
       lastAlert.end = Date.now() - this.startTime.getTime();
     }
   }
+  onNoiseDetected() {
+    var _a2;
+    if (!this.volumeMeter && this.cameraRecorder.cameraStream) {
+      this.volumeMeter = new VolumeMeter(this.cameraRecorder.cameraStream);
+      this.volumeMeter.start().catch((e) => {
+        console.log(e);
+        this.volumeMeter = void 0;
+      });
+    }
+    if (((_a2 = this.volumeMeter) == null ? void 0 : _a2.getVolume()) >= (this.optionsProctoring.noiseLimit || 40)) {
+      this.onNoiseDetectedCallback();
+    }
+  }
 };
 
 // src/new-flow/repository/IndexDbSessionRepository.ts
@@ -25264,6 +25363,8 @@ var Proctoring = class {
     };
     this.onFocusCallback = () => {
     };
+    this.onNoiseDetectedCallback = () => {
+    };
     this.backend = new BackendService({
       type: context.type
     });
@@ -25279,11 +25380,14 @@ var Proctoring = class {
   setOnFocusCallback(cb) {
     this.onFocusCallback = () => cb();
   }
+  setOnNoiseDetectedCallback(cb) {
+    this.onNoiseDetectedCallback = () => cb();
+  }
   async onChangeDevices(options = {}) {
     const onChange = new onChangeDevices(this.repositoryDevices, this.proctoringId);
     onChange.startRecording(options);
   }
-  createRecorders(options = getDefaultProctoringOptions()) {
+  createRecorders(options = getDefaultProctoringOptions) {
     var _a2;
     const cameraRecorder = new CameraRecorder({
       cameraId: this.sessionOptions.cameraId,
@@ -25299,8 +25403,9 @@ var Proctoring = class {
     }) : void 0;
     const alertRecorder = new AlertRecorder({
       onFocusCallback: () => this.onFocusCallback(),
-      onLostFocusCallback: () => this.onLostFocusCallback()
-    }, options);
+      onLostFocusCallback: () => this.onLostFocusCallback(),
+      onNoiseDetectedCallback: () => this.onNoiseDetectedCallback()
+    }, options, cameraRecorder);
     this.onChangeDevices();
     const recorders = [
       cameraRecorder,
@@ -25311,14 +25416,14 @@ var Proctoring = class {
     this.recorder = new ProctoringRecorder(this.proctoringSession, recorders);
     return { cameraRecorder, audioRecorder, screenRecorder, alertRecorder };
   }
-  async start(options = getDefaultProctoringOptions(), _videoOptions = {}) {
+  async start(options = getDefaultProctoringOptions, _videoOptions = {}) {
     this.extension = new Extension();
     this.extension.addEventListener();
     const baseURL = this.backend.selectBaseUrl(this.context.type);
     setTimeout(() => this.extension.sendVerifyMsg(baseURL, this.context.token), 5e3);
     const devices = await enumarateDevices();
     await this.repositoryDevices.save({ ...devices, id: "devices" });
-    this.sessionOptions = options;
+    this.sessionOptions = { ...getDefaultProctoringOptions, ...options };
     this.videoOptions = validatePartialVideoOptions(_videoOptions);
     if (this.state != "Stop" /* Stop */) {
       throw PROCTORING_ALREADY_STARTED;
@@ -25337,7 +25442,7 @@ var Proctoring = class {
       }, this.sessionOptions.proctoringType);
       this.proctoringId = startResponse.id;
       this.proctoringSession = new ProctoringSession(this.proctoringId);
-      this.allRecorders = this.createRecorders(options);
+      this.allRecorders = this.createRecorders(this.sessionOptions);
       await this.recorder.startAll();
       await this.repository.save(this.proctoringSession);
       trackers.registerStart(this.proctoringId, true, "");
@@ -25362,7 +25467,7 @@ Error: ` + error);
     this.state = "Stop" /* Stop */;
   }
   async finish(options = {}) {
-    this.extension.onProgress = () => options.onProgress;
+    this.extension.options = options;
     if (this.state !== "Recording" /* Recording */) {
       throw PROCTORING_NOT_STARTED;
     }
@@ -25474,7 +25579,7 @@ Upload Services: ${uploaderServices}`, this.serviceType);
       throw PROCTORING_NOT_STARTED;
     }
     await this.verifyMultipleMonitors(this.sessionOptions);
-    const allRecorders = this.createRecorders(this.sessionOptions);
+    this.allRecorders = this.createRecorders(this.sessionOptions);
     await this.recorder.startAll();
     this.proctoringSession.recordings = [];
     await this.repository.save(this.proctoringSession);
@@ -25501,6 +25606,7 @@ function useProctoring(proctoringOptions, enviromentConfig = "prod") {
   const resume = proctoring.resume.bind(proctoring);
   const onFocus = proctoring.setOnFocusCallback.bind(proctoring);
   const onLostFocus = proctoring.setOnLostFocusCallback.bind(proctoring);
+  const onNoiseDetected = proctoring.setOnNoiseDetectedCallback.bind(proctoring);
   const onChangeDevices2 = proctoring.onChangeDevices.bind(proctoring);
   const onStopSharingScreen = proctoring.setOnStopSharingScreenCallback.bind(proctoring);
   const checkDevices = checker.checkDevices.bind(checker);
@@ -25509,6 +25615,7 @@ function useProctoring(proctoringOptions, enviromentConfig = "prod") {
     finish,
     onFocus,
     onLostFocus,
+    onNoiseDetected,
     onChangeDevices: onChangeDevices2,
     checkDevices,
     pause,

package/extension/extension.d.ts

@@ -1,9 +1,9 @@
-import { ProgressCallback } from "../new-flow/upload/uploadCalback";
+import { ProctoringFinisherOptions } from "../proctoring/proctoring";
 export declare class Extension {
     hasExtension: boolean;
     tryes: number;
     responseStart: boolean;
-    onProgress: ProgressCallback;
+    options: ProctoringFinisherOptions;
     start(): Promise<boolean>;
     sendVerifyMsg(link: string, token: string): void;
     private verify;