easyproctor 0.0.89 → 1.0.1

package/README.md

@@ -219,12 +219,9 @@ const {
 });
 ```
 
-## Release Note V 0.0.89
+## Release Note V 1.0.1
 
-- Adicionou o callback onChangeDevices
-- Adicionou a integração com a extensão do chrome
-- Adicionou o modal de checkDevices
-- Comentou o script do EBML
+- Retirada de requisição da hora no finish
 
 
 ## License

package/esm/index.js

@@ -18,13 +18,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 
-// node_modules/form-data/lib/browser.js
-var require_browser = __commonJS({
-  "node_modules/form-data/lib/browser.js"(exports, module) {
-    module.exports = typeof self == "object" ? self.FormData : window.FormData;
-  }
-});
-
 // src/plugins/mp3.js
 var require_mp3 = __commonJS({
   "src/plugins/mp3.js"(exports, module) {
@@ -14308,6 +14301,13 @@ var require_mp3 = __commonJS({
   }
 });
 
+// node_modules/form-data/lib/browser.js
+var require_browser = __commonJS({
+  "node_modules/form-data/lib/browser.js"(exports, module) {
+    module.exports = typeof self == "object" ? self.FormData : window.FormData;
+  }
+});
+
 // src/modules/checkPermissions.ts
 async function checkPermissions() {
   try {
@@ -14356,6 +14356,12 @@ async function enumarateDevices() {
   return devices;
 }
 
+// src/plugins/MicRecorder2.ts
+var MicRecorder = require_mp3();
+function createMicRecorder(config) {
+  return new MicRecorder(config);
+}
+
 // src/new-flow/proctoring/ProctoringSession.ts
 var ProctoringSession = class {
   constructor(id) {
@@ -14378,6 +14384,12 @@ var ProctoringSession = class {
     this.state = "Recording" /* Recording */;
     this.startedAt = new Date(Date.now());
   }
+  pause() {
+    this.state = "Paused" /* Paused */;
+  }
+  resume() {
+    this.state = "Recording" /* Recording */;
+  }
   stop() {
     this.state = "Ended" /* Ended */;
     this.sessionDuration = Date.now() - this.startedAt.getTime();
@@ -14399,22 +14411,78 @@ var ProctoringSession = class {
   }
 };
 
+// src/new-flow/recorders/AudioRecorder.ts
+var AudioRecorder = class {
+  constructor() {
+    this.blobs = [];
+  }
+  async startRecording() {
+    this.recorder = createMicRecorder({
+      bitRate: 128
+    });
+    this.recorder.start().catch((e) => {
+      throw new Error("Error on Audio to Start Recording");
+    });
+  }
+  async pauseRecording() {
+  }
+  async resumeRecording() {
+  }
+  async stopRecording() {
+    if (!this.recorder)
+      return;
+    const response = await this.recorder.stop().getMp3().then(async ([buffer, blob]) => {
+      return { buffer, blob };
+    }).catch((e) => {
+      alert("We could not retrieve your message");
+      return void 0;
+    });
+    if (response) {
+      this.blobs.push(response.blob);
+    }
+  }
+  async saveOnSession(session) {
+    session.addRecording({
+      device: "",
+      file: new File(this.blobs, `EP_${session.id}_audio_0.mp3`, {
+        type: "audio/mp3"
+      }),
+      origin: "Mic" /* Mic */
+    });
+  }
+};
+
 // src/plugins/recorder.ts
-function recorder(stream, buffer) {
+function recorder(stream, buffer, audio = false) {
   let resolvePromise;
-  const options = {
+  let options = {
     mimeType: "video/webm;codecs=vp9",
     videoBitsPerSecond: 128e3,
     audioBitsPerSecond: 64 * 1e3
   };
+  if (audio) {
+    options = {
+      mimeType: "audio/webm",
+      audioBitsPerSecond: 64 * 1e3
+    };
+  }
   const mediaRecorder = new MediaRecorder(stream, options);
   mediaRecorder.ondataavailable = (e) => {
     if (e.data.size > 0) {
       buffer.push(e.data);
     }
+    if (audio && mediaRecorder.state == "inactive") {
+      const blob = new Blob(buffer, { type: "audio/mpeg-3" });
+      buffer = [blob];
+    }
     resolvePromise && resolvePromise();
   };
-  mediaRecorder.start();
+  function startRecording() {
+    return new Promise((resolve) => {
+      resolvePromise = resolve;
+      mediaRecorder.start();
+    });
+  }
   function stopRecording() {
     return new Promise((resolve) => {
       if (mediaRecorder.state == "recording") {
@@ -14428,7 +14496,28 @@ function recorder(stream, buffer) {
       }
     });
   }
-  return stopRecording;
+  function pauseRecording() {
+    return new Promise((resolve) => {
+      if (mediaRecorder.state == "recording") {
+        mediaRecorder.pause();
+        resolve();
+      } else {
+        resolve();
+      }
+    });
+  }
+  function resumeRecording() {
+    return new Promise((resolve) => {
+      console.log("Resumindo...");
+      if (mediaRecorder.state == "paused") {
+        mediaRecorder.resume();
+        resolve();
+      } else {
+        resolve();
+      }
+    });
+  }
+  return { startRecording, stopRecording, pauseRecording, resumeRecording };
 }
 
 // src/new-flow/recorders/CameraRecorder.ts
@@ -14458,15 +14547,33 @@ var CameraRecorder = class {
       }
     };
     this.cameraStream = await navigator.mediaDevices.getUserMedia(constraints);
-    const stopRecording = recorder(this.cameraStream, this.blobs);
+    const { startRecording, stopRecording, pauseRecording, resumeRecording } = recorder(this.cameraStream, this.blobs);
+    this.recordingStart = startRecording;
     this.recordingStop = stopRecording;
+    this.recordingPause = pauseRecording;
+    this.recordingResume = resumeRecording;
+    this.recordingStart();
   }
   async stopRecording() {
     await this.recordingStop();
   }
+  async pauseRecording() {
+    console.log("Pausing...");
+    await this.recordingPause();
+    console.log("Paused");
+  }
+  async resumeRecording() {
+    console.log("Resuming...");
+    await this.recordingResume();
+    console.log("Resumed");
+  }
   async saveOnSession(session) {
+    const settings = this.cameraStream.getVideoTracks()[0].getSettings();
+    const settingsAudio = this.cameraStream.getAudioTracks()[0].getSettings();
     session.addRecording({
-      device: "",
+      device: `Audio
+	Sample Rate: ${settingsAudio.sampleRate}
+	Sample Size: ${settingsAudio.sampleSize}`,
       file: new File(this.blobs, `EP_${session.id}_camera_0.webm`, {
         type: "video/webm"
       }),
@@ -14485,6 +14592,7 @@ var PROCTORING_NOT_STARTED = "proctoring_not_started";
 var ScreenRecorder = class {
   constructor(options) {
     this.blobs = [];
+    this.blobsFinal = [];
     this.options = options;
   }
   async startRecording() {
@@ -14515,8 +14623,14 @@ var ScreenRecorder = class {
       });
       throw NOT_SHARED_FIRST_SCREEN;
     }
-    const stopRecording = recorder(this.screenStream, this.blobs);
+    const { startRecording, stopRecording } = recorder(this.screenStream, this.blobs);
+    this.recordingStart = startRecording;
     this.recordingStop = stopRecording;
+    this.recordingStart();
+  }
+  async pauseRecording() {
+  }
+  async resumeRecording() {
   }
   async stopRecording() {
     await this.recordingStop();
@@ -14660,12 +14774,14 @@ var DeviceChecker = class {
       width: this.videoOptions.width,
       height: this.videoOptions.height
     });
+    this.audioRecorder = new AudioRecorder();
     this.screenRecorder = options.captureScreen ? new ScreenRecorder({
       allowOnlyFirstMonitor: options.allowOnlyFirstMonitor || options.allowOnlyFirstMonitor == void 0 ? true : false,
       onStopSharingScreenCallback: () => {
       }
     }) : void 0;
     await this.cameraRecorder.startRecording();
+    await this.audioRecorder.startRecording();
     if (this.screenRecorder) {
       await this.screenRecorder.startRecording();
     }
@@ -14678,6 +14794,7 @@ var DeviceChecker = class {
     const checkDevices = document.querySelector("#checkDevices");
     checkDevices == null ? void 0 : checkDevices.remove();
     await this.cameraRecorder.stopRecording();
+    await this.audioRecorder.stopRecording();
     if (this.screenRecorder) {
       await this.screenRecorder.stopRecording();
     }
@@ -14708,8 +14825,8 @@ var Extension = class {
       }, 1e3);
     });
   }
-  sendVerifyMsg() {
-    window.postMessage({ type: "easyproctor", func: "verifyExtensionEasyproctor" }, "*");
+  sendVerifyMsg(link, token) {
+    window.postMessage({ type: "easyproctor", func: "verifyExtensionEasyproctor", url: link, token }, "*");
   }
   verify(event) {
     if (event.source == window && event.data.sender && event.data.sender === "easyproctor-extension" && event.data.message_name && event.data.message_name === "progress") {
@@ -14727,7 +14844,6 @@ var Extension = class {
   }
   addEventListener() {
     window.addEventListener("message", (event) => this.verify(event));
-    setTimeout(() => this.sendVerifyMsg(), 5e3);
   }
 };
 
@@ -22772,8 +22888,10 @@ var trackers = {
   registerStart: (proctoringId, success, description) => registerCustomEvent(eventNames.START, { proctoringId, success, description }),
   registerFinish: (proctoringId, success, description) => registerCustomEvent(eventNames.FINISH, { proctoringId, success, description }),
   registerError: (proctoringId, description) => registerCustomEvent(eventNames.ERROR, { proctoringId, description }),
-  registerUploadVideo: (proctoringId, success, description, serviceType, uploadTime) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, success, description, serviceType, uploadTime }),
-  registerChangeDevice: (proctoringId, inOrOut, devicesChanged) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, inOrOut, devicesChanged })
+  registerUpload: (proctoringId, success, description, serviceType, uploadTime) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, success, description, serviceType, uploadTime }),
+  registerUploadFile: (proctoringId, description, fileType) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, description, fileType }),
+  registerChangeDevice: (proctoringId, inOrOut, devicesChanged) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, inOrOut, devicesChanged }),
+  registerStopSharingScreen: (proctoringId, description) => registerCustomEvent(eventNames.UPLOAD_VIDEO, { proctoringId, description })
 };
 
 // src/modules/onChangeDevices.ts
@@ -24607,10 +24725,12 @@ var BackendService = class {
     this.baseUrl = this.selectBaseUrl(options.type);
   }
   selectBaseUrl(type) {
-    if (type === "dev") {
+    if (type === "dev" /* dev */) {
       return DEV_BASE_URL;
-    } else if (type === "homol") {
+    } else if (type === "homol" /* homol */) {
       return HOMOL_BASE_URL;
+    } else if (type === "prod" /* prod */) {
+      return PROD_BASE_URL;
     } else {
       return PROD_BASE_URL;
     }
@@ -24631,6 +24751,8 @@ var BackendService = class {
       path: `/AzureKey/getInsights`,
       method: "GET",
       jwt: proctoringOptions.token
+    }).catch((error) => {
+      throw "N\xE3o foi poss\xEDvel realizar a requisi\xE7\xE3o, tente novamente mais tarde";
     });
     return insights2.data;
   }
@@ -24681,8 +24803,7 @@ var BackendService = class {
   }
   async finishAndSendUrls(proctoringOptions, proctoringSession) {
     var _a2, _b, _c;
-    const serverHour = await this.getServerHour(proctoringOptions.token).catch(() => void 0);
-    const serverTime = serverHour ? new Date(serverHour).toISOString() : new Date().toISOString();
+    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;
@@ -24806,6 +24927,16 @@ var ProctoringRecorder = class {
     const startPromises = this.recorders.map((rec) => rec.startRecording());
     await Promise.all(startPromises);
   }
+  async pauseAll() {
+    this.session.pause();
+    const pausePromises = this.recorders.map((rec) => rec.pauseRecording());
+    await Promise.all(pausePromises);
+  }
+  async resumeAll() {
+    this.session.resume();
+    const resumePromises = this.recorders.map((rec) => rec.resumeRecording());
+    await Promise.all(resumePromises);
+  }
   async stopAll() {
     const stopPromises = this.recorders.map((rec) => rec.stopRecording());
     await Promise.all(stopPromises);
@@ -24821,8 +24952,9 @@ var ProctoringRecorder = class {
 
 // src/new-flow/proctoring/ProctoringUploader.ts
 var ProctoringUploader = class {
-  constructor(session, uploadServices) {
+  constructor(session, proctoringId, uploadServices) {
     this.session = session;
+    this.proctoringId = proctoringId;
     this.uploadServices = uploadServices;
   }
   async upload(token, progress) {
@@ -24879,6 +25011,18 @@ var ProctoringUploader = class {
         }
       }, token);
       if (result) {
+        let fileType = "";
+        if (rec.file.name.search("camera") !== -1) {
+          fileType = "Camera";
+        } else if (rec.file.name.search("screen") !== -1) {
+          fileType = "Screen";
+        } else if (rec.file.name.search("audio") !== -1) {
+          fileType = "Audio";
+        }
+        trackers.registerUploadFile(this.proctoringId, `Upload File
+	Name: ${rec.file.name}
+	Type: ${rec.file.type}
+	Size: ${rec.file.size}`, fileType);
         return result;
       }
     }
@@ -24901,6 +25045,16 @@ var AlertRecorder = class {
       window.addEventListener("focus", () => this.onReturnFocus());
     }
   }
+  async pauseRecording() {
+    window.removeEventListener("blur", () => this.onLostFocus());
+    window.removeEventListener("focus", () => this.onReturnFocus());
+  }
+  async resumeRecording() {
+    if (this.optionsProctoring.captureScreen) {
+      window.addEventListener("blur", () => this.onLostFocus());
+      window.addEventListener("focus", () => this.onReturnFocus());
+    }
+  }
   async stopRecording() {
     window.removeEventListener("blur", () => this.onLostFocus());
     window.removeEventListener("focus", () => this.onReturnFocus());
@@ -24930,49 +25084,6 @@ var AlertRecorder = class {
   }
 };
 
-// src/plugins/MicRecorder2.ts
-var MicRecorder = require_mp3();
-function createMicRecorder(config) {
-  return new MicRecorder(config);
-}
-
-// src/new-flow/recorders/AudioRecorder.ts
-var AudioRecorder = class {
-  constructor() {
-    this.blobs = [];
-  }
-  async startRecording() {
-    this.recorder = createMicRecorder({
-      bitRate: 128
-    });
-    this.recorder.start().catch((e) => {
-      throw new Error("Error on Audio to Start Recording");
-    });
-  }
-  async stopRecording() {
-    if (!this.recorder)
-      return;
-    const response = await this.recorder.stop().getMp3().then(async ([buffer, blob]) => {
-      return { buffer, blob };
-    }).catch((e) => {
-      alert("We could not retrieve your message");
-      return void 0;
-    });
-    if (response) {
-      this.blobs.push(response.blob);
-    }
-  }
-  async saveOnSession(session) {
-    session.addRecording({
-      device: "",
-      file: new File(this.blobs, `EP_${session.id}_audio_0.mp3`, {
-        type: "audio/mp3"
-      }),
-      origin: "Mic" /* Mic */
-    });
-  }
-};
-
 // src/new-flow/repository/IndexDbSessionRepository.ts
 var IndexDbSessionRepository = class {
   constructor(dbName, storeName) {
@@ -25059,8 +25170,8 @@ var AwsUploadService = class {
     this.proctoringId = proctoringId;
   }
   async upload(data, token) {
+    const { file, onProgress } = data;
     try {
-      const { file, onProgress } = data;
       const progressCallback = (e) => {
         const progress = e.loadedBytes / file.size * 100;
         onProgress && onProgress(Math.round(progress));
@@ -25084,8 +25195,11 @@ var AwsUploadService = class {
         uploaded
       };
     } catch (err) {
-      trackers.registerError(this.proctoringId, "Failed to upload to azure");
-      throw new Error("Failed to upload to azure");
+      trackers.registerError(this.proctoringId, `Failed to upload to AWS
+	File name: ${file.name}
+	File type: ${file.type}
+	File size: ${file.size}`);
+      throw new Error("Failed to upload to AWS");
     }
   }
 };
@@ -25097,8 +25211,8 @@ var AzureUploadService = class {
     this.proctoringId = proctoringId;
   }
   async upload(data, token) {
+    const { file, onProgress } = data;
     try {
-      const { file, onProgress } = data;
       const progressCallback = (e) => {
         const progress = e.loadedBytes / file.size * 100;
         onProgress && onProgress(Math.round(progress));
@@ -25121,7 +25235,10 @@ var AzureUploadService = class {
         uploaded
       };
     } catch (err) {
-      trackers.registerError(this.proctoringId, "Failed to upload to azure");
+      trackers.registerError(this.proctoringId, `Failed to upload to Azure
+	File name: ${file.name}
+	File type: ${file.type}
+	File size: ${file.size}`);
       throw new Error("Failed to upload to azure");
     }
   }
@@ -25145,6 +25262,8 @@ var Proctoring = class {
     this.state = "Stop" /* Stop */;
     this.serviceType = "Upload" /* Upload */;
     this.onStopSharingScreenCallback = () => {
+      console.log("Stop sharing screen");
+      trackers.registerStopSharingScreen(this.proctoringId, "Stop sharing screen");
     };
     this.onLostFocusCallback = () => {
     };
@@ -25200,6 +25319,8 @@ var Proctoring = class {
   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;
@@ -25221,19 +25342,20 @@ var Proctoring = class {
       }, this.sessionOptions.proctoringType);
       this.proctoringId = startResponse.id;
       this.proctoringSession = new ProctoringSession(this.proctoringId);
-      const allRecorders = this.createRecorders(options);
+      this.allRecorders = this.createRecorders(options);
       await this.recorder.startAll();
       await this.repository.save(this.proctoringSession);
       trackers.registerStart(this.proctoringId, true, "");
-      startResponse.cameraStream = allRecorders.cameraRecorder.cameraStream;
-      if (allRecorders.screenRecorder) {
-        startResponse.screenStream = allRecorders.screenRecorder.screenStream;
+      startResponse.cameraStream = this.allRecorders.cameraRecorder.cameraStream;
+      if (this.allRecorders.screenRecorder) {
+        startResponse.screenStream = this.allRecorders.screenRecorder.screenStream;
       }
       this.state = "Recording" /* Recording */;
       return startResponse;
     } catch (error) {
       await this.cancel();
-      trackers.registerStart(this.proctoringId, false, "" + error);
+      trackers.registerStart(this.proctoringId, false, `Token: ${this.context.token}
+Error: ` + error);
       this.state = "Stop" /* Stop */;
       throw error;
     }
@@ -25255,13 +25377,13 @@ var Proctoring = class {
     let uploader;
     let uploaderServices;
     if (versionVerify() !== "1.0.0.0") {
-      uploader = new ProctoringUploader(this.proctoringSession, [
+      uploader = new ProctoringUploader(this.proctoringSession, this.proctoringId, [
         new DownloadService(this.proctoringId)
       ]);
       uploaderServices = "Download";
       this.serviceType = "Download" /* Download */;
     } else {
-      uploader = new ProctoringUploader(this.proctoringSession, [
+      uploader = new ProctoringUploader(this.proctoringSession, this.proctoringId, [
         new AzureUploadService(this.proctoringId, this.backend),
         new AwsUploadService(this.proctoringId, this.backend),
         new DownloadService(this.proctoringId)
@@ -25279,11 +25401,11 @@ var Proctoring = class {
     }
     if (!extensionSuccess || !this.extension.hasExtension) {
       await uploader.upload(this.context.token, options.onProgress).catch(async (error) => {
-        trackers.registerUploadVideo(this.proctoringSession.id, false, `upload error: ${error}
+        trackers.registerUpload(this.proctoringSession.id, false, `upload error: ${error}
 
 Upload Services: ${uploaderServices}`, this.serviceType);
         if (versionVerify() !== "1.0.0.0") {
-          uploader = new ProctoringUploader(this.proctoringSession, [
+          uploader = new ProctoringUploader(this.proctoringSession, this.proctoringId, [
             new AzureUploadService(this.proctoringId, this.backend),
             new AwsUploadService(this.proctoringId, this.backend),
             new DownloadService(this.proctoringId)
@@ -25291,14 +25413,14 @@ Upload Services: ${uploaderServices}`, this.serviceType);
           uploaderServices = "Azure, AWS, Download";
           this.serviceType = "Upload" /* Upload */;
           await uploader.upload(this.context.token, options.onProgress).catch((error2) => {
-            trackers.registerUploadVideo(this.proctoringSession.id, false, `upload backup error: ${error2}
+            trackers.registerUpload(this.proctoringSession.id, false, `upload backup error: ${error2}
 
 Upload Services: ${uploaderServices}
 Upload backup for Safe Browser`, this.serviceType);
           });
         }
       });
-      trackers.registerUploadVideo(this.proctoringSession.id, true, `upload success
+      trackers.registerUpload(this.proctoringSession.id, true, `upload success
 
 Upload Services: ${uploaderServices}`, this.serviceType);
     }
@@ -25351,31 +25473,28 @@ Upload Services: ${uploaderServices}`, this.serviceType);
     await this.repository.save(this.proctoringSession);
     this.state = "Paused" /* Paused */;
   }
-  async resume(options = getDefaultProctoringOptions(), examId, _videoOptions = {
-    width: 640,
-    height: 480
-  }) {
+  async resume() {
     var _a2;
     if (this.state != "Paused" /* Paused */) {
       throw PROCTORING_NOT_STARTED;
     }
     await this.verifyMultipleMonitors(this.sessionOptions);
-    const allRecorders = this.createRecorders(options);
+    const allRecorders = this.createRecorders(this.sessionOptions);
     await this.recorder.startAll();
     this.proctoringSession.recordings = [];
     await this.repository.save(this.proctoringSession);
     this.state = "Recording" /* Recording */;
     return {
-      cameraStream: allRecorders.cameraRecorder.cameraStream,
-      _screenStream: (_a2 = allRecorders.screenRecorder) == null ? void 0 : _a2.screenStream
+      cameraStream: this.allRecorders.cameraRecorder.cameraStream,
+      _screenStream: (_a2 = this.allRecorders.screenRecorder) == null ? void 0 : _a2.screenStream
     };
   }
 };
 
 // src/proctoring/useProctoring.ts
-function useProctoring(proctoringOptions, homolConfig = "prod") {
+function useProctoring(proctoringOptions, enviromentConfig = "prod" /* prod */) {
   const proctoring = new Proctoring({
-    type: homolConfig,
+    type: enviromentConfig,
     clientId: proctoringOptions.clientId,
     examId: proctoringOptions.examId,
     token: proctoringOptions.token

package/extension/extension.d.ts

@@ -5,7 +5,7 @@ export declare class Extension {
     responseStart: boolean;
     onProgress: ProgressCallback;
     start(): Promise<boolean>;
-    sendVerifyMsg(): void;
+    sendVerifyMsg(link: string, token: string): void;
     private verify;
     addEventListener(): void;
 }