easyproctor-hml 0.0.9 → 0.0.10

package/README.md

@@ -219,9 +219,9 @@ const {
 });
 ```
 
-## Release Note V 0.0.84
+## Release Note V 0.0.88
 
-- Deploy fluxo novo para testes
+- Corrigindo callback da função finish
 
 ## License
 

package/esm/index.js

@@ -14474,7 +14474,7 @@ var CameraRecorder = class {
     console.log("video buffer", this.blobs);
     session.addRecording({
       device: "",
-      file: new File(this.blobs, `EP_${session.id}_camera.webm`, {
+      file: new File(this.blobs, `EP_${session.id}_camera_0.webm`, {
         type: "video/webm"
       }),
       origin: "Camera" /* Camera */
@@ -14532,7 +14532,7 @@ var ScreenRecorder = class {
     console.log("screen buffer", this.blobs);
     session.addRecording({
       device: "",
-      file: new File(this.blobs, `EP_${session.id}_screen.webm`, {
+      file: new File(this.blobs, `EP_${session.id}_screen_0.webm`, {
         type: "video/webm"
       }),
       origin: "Screen" /* Screen */
@@ -16614,7 +16614,7 @@ var ProctoringUploader = class {
     this.session = session;
     this.uploadServices = uploadServices;
   }
-  async upload(progress, token) {
+  async upload(token, progress) {
     await this.uploadRecordings(token, progress);
   }
   async uploadRecordings(token, onProgress) {
@@ -16682,11 +16682,13 @@ var ProctoringUploader = class {
 
 // src/new-flow/recorders/AlertRecorder.ts
 var AlertRecorder = class {
-  constructor(options, optionsProctoring) {
+  constructor(options, optionsProctoring, repositoryDevices) {
     this.alerts = [];
     this.onLostFocusCallback = options.onLostFocusCallback;
     this.onFocusCallback = options.onFocusCallback;
+    this.onChangeDevicesCallback = options.onChangeDevicesCallback;
     this.optionsProctoring = optionsProctoring;
+    this.repositoryDevices = repositoryDevices;
   }
   async startRecording() {
     this.startTime = new Date(Date.now());
@@ -16694,6 +16696,7 @@ var AlertRecorder = class {
       window.addEventListener("blur", () => this.onLostFocus());
       window.addEventListener("focus", () => this.onReturnFocus());
     }
+    navigator.mediaDevices.ondevicechange = () => this.onChangeDevices();
   }
   async stopRecording() {
     window.removeEventListener("blur", () => this.onLostFocus());
@@ -16722,6 +16725,13 @@ var AlertRecorder = class {
       lastAlert.end = Date.now() - this.startTime.getTime();
     }
   }
+  async onChangeDevices() {
+    this.onChangeDevicesCallback();
+    const devices = await enumarateDevices();
+    console.log(devices);
+    const response = await this.repositoryDevices.get("devices");
+    console.log("devices DB: ", response);
+  }
 };
 
 // src/plugins/MicRecorder2.ts
@@ -16761,7 +16771,7 @@ var AudioRecorder = class {
     console.log("audio buffer", [this.blobs]);
     session.addRecording({
       device: "",
-      file: new File(this.blobs, `EP_${session.id}_audio.mp3`, {
+      file: new File(this.blobs, `EP_${session.id}_audio_0.mp3`, {
         type: "audio/mp3"
       }),
       origin: "Mic" /* Mic */
@@ -16771,10 +16781,12 @@ var AudioRecorder = class {
 
 // src/new-flow/repository/IndexDbSessionRepository.ts
 var IndexDbSessionRepository = class {
-  constructor() {
+  constructor(dbName, storeName) {
     this.dbName = "EasyProctorDb";
-    this.dbVersion = 1;
+    this.dbVersion = 2;
     this.storeName = "exams2";
+    this.dbName = dbName;
+    this.storeName = storeName;
   }
   async save(data) {
     const { transaction, store } = await this.connectToStore("readwrite");
@@ -16824,7 +16836,7 @@ var IndexDbSessionRepository = class {
     if (this.connection)
       return this.connection;
     return new Promise((resolve, reject) => {
-      const request = window.indexedDB.open(this.dbName, 2);
+      const request = window.indexedDB.open(this.dbName, this.dbVersion);
       request.onerror = (event) => {
         console.log("request.onerror", event);
         reject("Can't connect to IndexedDB");
@@ -24986,13 +24998,14 @@ var Proctoring = class {
     };
     this.onFocusCallback = () => {
     };
-    this.onProgress = (percentage) => {
+    this.onChangeDevicesCallback = () => {
     };
     console.log("new proctoring", context);
     this.backend = new BackendService({
       type: context.type
     });
-    this.repository = new IndexDbSessionRepository();
+    this.repository = new IndexDbSessionRepository("EasyProctorDb", "exams2");
+    this.repositoryDevices = new IndexDbSessionRepository("EasyProctorDbDevices", "devices");
   }
   setOnStopSharingScreenCallback(cb) {
     console.log("proctoring.setOnStopSharingScreenCallback");
@@ -25006,9 +25019,9 @@ var Proctoring = class {
     console.log("proctoring.setOnFocusCallback");
     this.onFocusCallback = () => cb();
   }
-  setOnProgress(cb) {
-    console.log("proctoring.setOnProgress");
-    this.onProgress = (percentage) => cb(percentage);
+  setOnChangeDevicesCallback(cb) {
+    console.log("proctoring.setOnChangeDevicesCallback");
+    this.onChangeDevicesCallback = () => cb();
   }
   createRecorders(options = getDefaultProctoringOptions()) {
     var _a2;
@@ -25026,8 +25039,9 @@ var Proctoring = class {
     }) : void 0;
     const alertRecorder = new AlertRecorder({
       onFocusCallback: () => this.onFocusCallback(),
-      onLostFocusCallback: () => this.onLostFocusCallback()
-    }, options);
+      onLostFocusCallback: () => this.onLostFocusCallback(),
+      onChangeDevicesCallback: () => this.onChangeDevicesCallback()
+    }, options, this.repositoryDevices);
     const recorders = [
       cameraRecorder,
       audioRecorder,
@@ -25039,6 +25053,8 @@ var Proctoring = class {
   }
   async start(options = getDefaultProctoringOptions(), _videoOptions = {}) {
     console.log("proctoring.start", options, _videoOptions);
+    const devices = await enumarateDevices();
+    await this.repositoryDevices.save({ ...devices, id: "devices" });
     this.sessionOptions = options;
     this.videoOptions = validatePartialVideoOptions(_videoOptions);
     if (this.state != "Stop" /* Stop */) {
@@ -25094,27 +25110,42 @@ var Proctoring = class {
     await this.recorder.saveAllOnSession();
     await this.repository.save(this.proctoringSession);
     let uploader;
+    let uploaderServices;
     if (versionVerify() !== "1.0.0.0") {
       uploader = new ProctoringUploader(this.proctoringSession, [
         new DownloadService(this.proctoringId)
       ]);
+      uploaderServices = "Download";
     } else {
       uploader = new ProctoringUploader(this.proctoringSession, [
         new AzureUploadService(this.proctoringId, this.backend),
         new AwsUploadService(this.proctoringId, this.backend),
         new DownloadService(this.proctoringId)
       ]);
+      uploaderServices = "Azure, AWS, Download";
     }
-    await uploader.upload(this.onProgress, this.context.token).catch(async (error) => {
+    await uploader.upload(this.context.token, options.onProgress).catch(async (error) => {
+      trackers.registerUploadVideo(this.proctoringSession.id, false, `upload error: ${error}
+
+Upload Services: ${uploaderServices}`);
       if (versionVerify() !== "1.0.0.0") {
         uploader = new ProctoringUploader(this.proctoringSession, [
           new AzureUploadService(this.proctoringId, this.backend),
           new AwsUploadService(this.proctoringId, this.backend),
           new DownloadService(this.proctoringId)
         ]);
-        await uploader.upload(this.onProgress, this.context.token);
+        uploaderServices = "Azure, AWS, Download";
+        await uploader.upload(this.context.token, options.onProgress).catch((error2) => {
+          trackers.registerUploadVideo(this.proctoringSession.id, false, `upload backup error: ${error2}
+
+Upload Services: ${uploaderServices}
+Upload backup for Safe Browser`);
+        });
       }
     });
+    trackers.registerUploadVideo(this.proctoringSession.id, true, `upload success
+
+Upload Services: ${uploaderServices}`);
     await this.backend.saveScreenAlerts(this.context, this.proctoringSession).catch((err) => {
       trackers.registerFinish(this.proctoringSession.id, false, "save-screen error: " + err);
     });
@@ -25202,6 +25233,7 @@ function useProctoring(proctoringOptions, homolConfig = "prod") {
   const resume = proctoring.resume.bind(proctoring);
   const onFocus = proctoring.setOnFocusCallback.bind(proctoring);
   const onLostFocus = proctoring.setOnLostFocusCallback.bind(proctoring);
+  const onChangeDevices = proctoring.setOnChangeDevicesCallback.bind(proctoring);
   const onStopSharingScreen = proctoring.setOnStopSharingScreenCallback.bind(proctoring);
   const checkDevices = checker.checkDevices.bind(checker);
   const closeCheckDevices = checker.closeCheckDevices.bind(checker);
@@ -25210,6 +25242,7 @@ function useProctoring(proctoringOptions, homolConfig = "prod") {
     finish,
     onFocus,
     onLostFocus,
+    onChangeDevices,
     checkDevices,
     closeCheckDevices,
     pause,

package/index.js

@@ -33415,7 +33415,7 @@ var CameraRecorder = class {
     console.log("video buffer", this.blobs);
     session.addRecording({
       device: "",
-      file: new File(this.blobs, `EP_${session.id}_camera.webm`, {
+      file: new File(this.blobs, `EP_${session.id}_camera_0.webm`, {
         type: "video/webm"
       }),
       origin: "Camera" /* Camera */
@@ -33473,7 +33473,7 @@ var ScreenRecorder = class {
     console.log("screen buffer", this.blobs);
     session.addRecording({
       device: "",
-      file: new File(this.blobs, `EP_${session.id}_screen.webm`, {
+      file: new File(this.blobs, `EP_${session.id}_screen_0.webm`, {
         type: "video/webm"
       }),
       origin: "Screen" /* Screen */
@@ -36162,7 +36162,7 @@ var ProctoringUploader = class {
     this.session = session;
     this.uploadServices = uploadServices;
   }
-  async upload(progress, token) {
+  async upload(token, progress) {
     await this.uploadRecordings(token, progress);
   }
   async uploadRecordings(token, onProgress) {
@@ -36230,11 +36230,13 @@ var ProctoringUploader = class {
 
 // src/new-flow/recorders/AlertRecorder.ts
 var AlertRecorder = class {
-  constructor(options, optionsProctoring) {
+  constructor(options, optionsProctoring, repositoryDevices) {
     this.alerts = [];
     this.onLostFocusCallback = options.onLostFocusCallback;
     this.onFocusCallback = options.onFocusCallback;
+    this.onChangeDevicesCallback = options.onChangeDevicesCallback;
     this.optionsProctoring = optionsProctoring;
+    this.repositoryDevices = repositoryDevices;
   }
   async startRecording() {
     this.startTime = new Date(Date.now());
@@ -36242,6 +36244,7 @@ var AlertRecorder = class {
       window.addEventListener("blur", () => this.onLostFocus());
       window.addEventListener("focus", () => this.onReturnFocus());
     }
+    navigator.mediaDevices.ondevicechange = () => this.onChangeDevices();
   }
   async stopRecording() {
     window.removeEventListener("blur", () => this.onLostFocus());
@@ -36270,6 +36273,13 @@ var AlertRecorder = class {
       lastAlert.end = Date.now() - this.startTime.getTime();
     }
   }
+  async onChangeDevices() {
+    this.onChangeDevicesCallback();
+    const devices = await enumarateDevices();
+    console.log(devices);
+    const response = await this.repositoryDevices.get("devices");
+    console.log("devices DB: ", response);
+  }
 };
 
 // src/plugins/MicRecorder2.ts
@@ -36309,7 +36319,7 @@ var AudioRecorder = class {
     console.log("audio buffer", [this.blobs]);
     session.addRecording({
       device: "",
-      file: new File(this.blobs, `EP_${session.id}_audio.mp3`, {
+      file: new File(this.blobs, `EP_${session.id}_audio_0.mp3`, {
         type: "audio/mp3"
       }),
       origin: "Mic" /* Mic */
@@ -36319,10 +36329,12 @@ var AudioRecorder = class {
 
 // src/new-flow/repository/IndexDbSessionRepository.ts
 var IndexDbSessionRepository = class {
-  constructor() {
+  constructor(dbName, storeName) {
     this.dbName = "EasyProctorDb";
-    this.dbVersion = 1;
+    this.dbVersion = 2;
     this.storeName = "exams2";
+    this.dbName = dbName;
+    this.storeName = storeName;
   }
   async save(data) {
     const { transaction, store } = await this.connectToStore("readwrite");
@@ -36372,7 +36384,7 @@ var IndexDbSessionRepository = class {
     if (this.connection)
       return this.connection;
     return new Promise((resolve, reject) => {
-      const request = window.indexedDB.open(this.dbName, 2);
+      const request = window.indexedDB.open(this.dbName, this.dbVersion);
       request.onerror = (event) => {
         console.log("request.onerror", event);
         reject("Can't connect to IndexedDB");
@@ -36520,13 +36532,14 @@ var Proctoring = class {
     };
     this.onFocusCallback = () => {
     };
-    this.onProgress = (percentage) => {
+    this.onChangeDevicesCallback = () => {
     };
     console.log("new proctoring", context);
     this.backend = new BackendService({
       type: context.type
     });
-    this.repository = new IndexDbSessionRepository();
+    this.repository = new IndexDbSessionRepository("EasyProctorDb", "exams2");
+    this.repositoryDevices = new IndexDbSessionRepository("EasyProctorDbDevices", "devices");
   }
   setOnStopSharingScreenCallback(cb) {
     console.log("proctoring.setOnStopSharingScreenCallback");
@@ -36540,9 +36553,9 @@ var Proctoring = class {
     console.log("proctoring.setOnFocusCallback");
     this.onFocusCallback = () => cb();
   }
-  setOnProgress(cb) {
-    console.log("proctoring.setOnProgress");
-    this.onProgress = (percentage) => cb(percentage);
+  setOnChangeDevicesCallback(cb) {
+    console.log("proctoring.setOnChangeDevicesCallback");
+    this.onChangeDevicesCallback = () => cb();
   }
   createRecorders(options = getDefaultProctoringOptions()) {
     var _a;
@@ -36560,8 +36573,9 @@ var Proctoring = class {
     }) : void 0;
     const alertRecorder = new AlertRecorder({
       onFocusCallback: () => this.onFocusCallback(),
-      onLostFocusCallback: () => this.onLostFocusCallback()
-    }, options);
+      onLostFocusCallback: () => this.onLostFocusCallback(),
+      onChangeDevicesCallback: () => this.onChangeDevicesCallback()
+    }, options, this.repositoryDevices);
     const recorders = [
       cameraRecorder,
       audioRecorder,
@@ -36573,6 +36587,8 @@ var Proctoring = class {
   }
   async start(options = getDefaultProctoringOptions(), _videoOptions = {}) {
     console.log("proctoring.start", options, _videoOptions);
+    const devices = await enumarateDevices();
+    await this.repositoryDevices.save({ ...devices, id: "devices" });
     this.sessionOptions = options;
     this.videoOptions = validatePartialVideoOptions(_videoOptions);
     if (this.state != "Stop" /* Stop */) {
@@ -36628,27 +36644,42 @@ var Proctoring = class {
     await this.recorder.saveAllOnSession();
     await this.repository.save(this.proctoringSession);
     let uploader;
+    let uploaderServices;
     if (versionVerify() !== "1.0.0.0") {
       uploader = new ProctoringUploader(this.proctoringSession, [
         new DownloadService(this.proctoringId)
       ]);
+      uploaderServices = "Download";
     } else {
       uploader = new ProctoringUploader(this.proctoringSession, [
         new AzureUploadService(this.proctoringId, this.backend),
         new AwsUploadService(this.proctoringId, this.backend),
         new DownloadService(this.proctoringId)
       ]);
+      uploaderServices = "Azure, AWS, Download";
     }
-    await uploader.upload(this.onProgress, this.context.token).catch(async (error) => {
+    await uploader.upload(this.context.token, options.onProgress).catch(async (error) => {
+      trackers.registerUploadVideo(this.proctoringSession.id, false, `upload error: ${error}
+
+Upload Services: ${uploaderServices}`);
       if (versionVerify() !== "1.0.0.0") {
         uploader = new ProctoringUploader(this.proctoringSession, [
           new AzureUploadService(this.proctoringId, this.backend),
           new AwsUploadService(this.proctoringId, this.backend),
           new DownloadService(this.proctoringId)
         ]);
-        await uploader.upload(this.onProgress, this.context.token);
+        uploaderServices = "Azure, AWS, Download";
+        await uploader.upload(this.context.token, options.onProgress).catch((error2) => {
+          trackers.registerUploadVideo(this.proctoringSession.id, false, `upload backup error: ${error2}
+
+Upload Services: ${uploaderServices}
+Upload backup for Safe Browser`);
+        });
       }
     });
+    trackers.registerUploadVideo(this.proctoringSession.id, true, `upload success
+
+Upload Services: ${uploaderServices}`);
     await this.backend.saveScreenAlerts(this.context, this.proctoringSession).catch((err) => {
       trackers.registerFinish(this.proctoringSession.id, false, "save-screen error: " + err);
     });
@@ -36736,6 +36767,7 @@ function useProctoring(proctoringOptions, homolConfig = "prod") {
   const resume = proctoring.resume.bind(proctoring);
   const onFocus = proctoring.setOnFocusCallback.bind(proctoring);
   const onLostFocus = proctoring.setOnLostFocusCallback.bind(proctoring);
+  const onChangeDevices = proctoring.setOnChangeDevicesCallback.bind(proctoring);
   const onStopSharingScreen = proctoring.setOnStopSharingScreenCallback.bind(proctoring);
   const checkDevices = checker.checkDevices.bind(checker);
   const closeCheckDevices = checker.closeCheckDevices.bind(checker);
@@ -36744,6 +36776,7 @@ function useProctoring(proctoringOptions, homolConfig = "prod") {
     finish,
     onFocus,
     onLostFocus,
+    onChangeDevices,
     checkDevices,
     closeCheckDevices,
     pause,

package/new-flow/proctoring/ProctoringUploader.d.ts

@@ -6,7 +6,7 @@ export declare class ProctoringUploader {
     private session;
     private uploadServices;
     constructor(session: ProctoringSession, uploadServices: IUploadService[] | IDownloadService[]);
-    upload(progress: ProgressCallback, token: string): Promise<void>;
+    upload(token: string, progress?: ProgressCallback): Promise<void>;
     private uploadRecordings;
     private uploadAllFiles;
     private uploadFile;

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

@@ -1,19 +1,24 @@
 import { ProctoringSessionOptions } from "../../proctoring/options/ProctoringOptions";
 import { ProctoringSession } from "../proctoring/ProctoringSession";
+import { ISessionRepository } from "../repository/ISessionRepository";
 import { IRecorder } from "./IRecorder";
 export declare class AlertRecorder implements IRecorder {
     private alerts;
     private startTime;
     private onLostFocusCallback;
     private onFocusCallback;
+    private onChangeDevicesCallback;
     private optionsProctoring;
+    private repositoryDevices;
     constructor(options: {
         onLostFocusCallback: () => void;
         onFocusCallback: () => void;
-    }, optionsProctoring: ProctoringSessionOptions);
+        onChangeDevicesCallback: () => void;
+    }, optionsProctoring: ProctoringSessionOptions, repositoryDevices: ISessionRepository);
     startRecording(): Promise<void>;
     stopRecording(): Promise<void>;
     saveOnSession(session: ProctoringSession): Promise<void>;
     private onLostFocus;
     private onReturnFocus;
+    private onChangeDevices;
 }

package/new-flow/repository/ISessionRepository.d.ts

@@ -1,9 +1,10 @@
+import Devices from "../../interfaces/Devices";
 import { ProctoringSession } from "../proctoring/ProctoringSession";
 export interface ISessionRepository {
-    save(data: ProctoringSession): Promise<void>;
-    list(): Promise<ProctoringSession[]>;
+    save(data: Devices | ProctoringSession): Promise<void>;
+    list(): Promise<ProctoringSession[] | Devices[]>;
     delete(id: string): Promise<void>;
-    get(id: string): Promise<ProctoringSession | undefined>;
+    get(id: string): Promise<ProctoringSession | Devices | undefined>;
     clear(): Promise<void>;
     hasSessions(): Promise<boolean>;
 }

package/new-flow/repository/IndexDbSessionRepository.d.ts

@@ -1,13 +1,15 @@
+import Devices from "../../interfaces/Devices";
 import { ProctoringSession } from "../proctoring/ProctoringSession";
 import { ISessionRepository } from "./ISessionRepository";
 export declare class IndexDbSessionRepository implements ISessionRepository {
     private dbName;
     private dbVersion;
     private storeName;
-    save(data: ProctoringSession): Promise<void>;
+    constructor(dbName: string, storeName: string);
+    save(data: Devices | ProctoringSession): Promise<void>;
     delete(id: string): Promise<void>;
-    get(id: string): Promise<ProctoringSession | undefined>;
-    list(): Promise<ProctoringSession[]>;
+    get(id: string): Promise<ProctoringSession | Devices | undefined>;
+    list(): Promise<ProctoringSession[] | Devices[]>;
     clear(): Promise<void>;
     private processRequest;
     hasSessions(): Promise<boolean>;

package/package.json

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

package/proctoring/proctoring.d.ts

@@ -21,6 +21,7 @@ export declare class Proctoring {
     private readonly context;
     private readonly backend;
     private readonly repository;
+    private readonly repositoryDevices;
     private proctoringId;
     private insights?;
     private proctoringSession;
@@ -34,8 +35,8 @@ export declare class Proctoring {
     setOnLostFocusCallback(cb: () => void): void;
     private onFocusCallback;
     setOnFocusCallback(cb: () => void): void;
-    private onProgress;
-    setOnProgress(cb: (percentage: number) => void): void;
+    private onChangeDevicesCallback;
+    setOnChangeDevicesCallback(cb: () => void): void;
     constructor(context: ProctoringContext);
     private createRecorders;
     start(options?: ProctoringSessionOptions, _videoOptions?: Partial<ProctoringVideoOptions>): Promise<StartProctoringResponse>;

package/proctoring/useProctoring.d.ts

@@ -9,6 +9,7 @@ export declare function useProctoring(proctoringOptions: {
     finish: (options?: import("./proctoring").ProctoringFinisherOptions) => Promise<void>;
     onFocus: (cb: () => void) => void;
     onLostFocus: (cb: () => void) => void;
+    onChangeDevices: (cb: () => void) => void;
     checkDevices: (options: import("./options/ProctoringOptions").ProctoringSessionOptions | undefined, _videoOptions: Partial<import("./options/ProctoringVideoOptions").ProctoringVideoOptions>) => Promise<{
         cameraStream: MediaStream;
         _screenStream: MediaStream | undefined;