easyproctor 0.0.41 → 0.0.44

package/esm/index.js

@@ -8424,8 +8424,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     }
     return { cameraFile, screenFile };
   };
-  async function start(options = defaultProctoringOptions) {
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
+  async function initConfig() {
     if (proctoringConfig != void 0) {
       setConfiguration(proctoringConfig.account, proctoringConfig.containerName, proctoringConfig.sas);
       azureBlobUrl = proctoringConfig.azureBlobUrl;
@@ -8442,6 +8441,10 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       setBaseUrl(config.baseUrl);
       init(config.insights);
     }
+  }
+  async function start(options = defaultProctoringOptions) {
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
+    await initConfig();
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
@@ -8451,6 +8454,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     const hasExam = await getRecord("exams");
     if (hasExam != null) {
       await clearBuffers("exams");
+      cancelCallback = null;
     }
     try {
       const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen, proctoringType });
@@ -8471,6 +8475,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       resp.screenStream = _screenStream;
       await insertRecord("exams", {
         id: resp.id,
+        examId: proctoringOptions.examId,
         sessions: []
       });
       proctoringId = resp.id;
@@ -8507,9 +8512,10 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     await insertRecord("exams", record);
     _clear();
   }
-  async function resume(options = defaultProctoringOptions) {
+  async function resume(options = defaultProctoringOptions, examId) {
     _clear();
     const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
+    await initConfig();
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
@@ -8522,6 +8528,10 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     const record = await getRecord("exams");
     if (!record) {
       throw PROCTORING_NOT_STARTED;
+    } else if (record) {
+      console.log(examId);
+      if (record.examId != examId)
+        throw PROCTORING_NOT_STARTED;
     }
     const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen, proctoringType });
     const serverTime = await makeRequest({
@@ -8612,7 +8622,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         jwt: proctoringOptions.token,
         body: {
           proctoringId,
-          alerts: [...sessionsDto[0].alerts]
+          alerts: [...sessionsDto[sessionsDto.length - 1].alerts]
         }
       });
     } catch (error) {
@@ -8624,9 +8634,9 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         method: "POST",
         body: {
           endDate: time,
-          videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[0].videoCameraUrl,
+          videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoCameraUrl,
           audioCameraUrl: "",
-          videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[0].videoScreenUrl : ""
+          videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoScreenUrl : ""
         },
         jwt: proctoringOptions.token
       });

package/index.d.ts

@@ -30,7 +30,7 @@ export declare function useProctoring(proctoringOptions: {
     }) => Promise<void>;
     finishAudio: () => Promise<void>;
     pause: () => Promise<void>;
-    resume: (options?: ProctoringOptions) => Promise<{
+    resume: (options: ProctoringOptions | undefined, examId: string) => Promise<{
         cameraStream: MediaStream;
         _screenStream: MediaStream | undefined;
     }>;

package/index.js

@@ -8764,8 +8764,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     }
     return { cameraFile, screenFile };
   };
-  async function start(options = defaultProctoringOptions) {
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
+  async function initConfig() {
     if (proctoringConfig != void 0) {
       setConfiguration(proctoringConfig.account, proctoringConfig.containerName, proctoringConfig.sas);
       azureBlobUrl = proctoringConfig.azureBlobUrl;
@@ -8782,6 +8781,10 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       setBaseUrl(config.baseUrl);
       init(config.insights);
     }
+  }
+  async function start(options = defaultProctoringOptions) {
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
+    await initConfig();
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
@@ -8791,6 +8794,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     const hasExam = await getRecord("exams");
     if (hasExam != null) {
       await clearBuffers("exams");
+      cancelCallback = null;
     }
     try {
       const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen, proctoringType });
@@ -8811,6 +8815,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       resp.screenStream = _screenStream;
       await insertRecord("exams", {
         id: resp.id,
+        examId: proctoringOptions.examId,
         sessions: []
       });
       proctoringId = resp.id;
@@ -8847,9 +8852,10 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     await insertRecord("exams", record);
     _clear();
   }
-  async function resume(options = defaultProctoringOptions) {
+  async function resume(options = defaultProctoringOptions, examId) {
     _clear();
     const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true, proctoringType } = options;
+    await initConfig();
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
@@ -8862,6 +8868,10 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     const record = await getRecord("exams");
     if (!record) {
       throw PROCTORING_NOT_STARTED;
+    } else if (record) {
+      console.log(examId);
+      if (record.examId != examId)
+        throw PROCTORING_NOT_STARTED;
     }
     const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen, proctoringType });
     const serverTime = await makeRequest({
@@ -8952,7 +8962,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         jwt: proctoringOptions.token,
         body: {
           proctoringId,
-          alerts: [...sessionsDto[0].alerts]
+          alerts: [...sessionsDto[sessionsDto.length - 1].alerts]
         }
       });
     } catch (error) {
@@ -8964,9 +8974,9 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         method: "POST",
         body: {
           endDate: time,
-          videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[0].videoCameraUrl,
+          videoCameraUrl: `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoCameraUrl,
           audioCameraUrl: "",
-          videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[0].videoScreenUrl : ""
+          videoScreenUrl: _captureScreen ? `${azureBlobUrl}/` + sessionsDto[sessionsDto.length - 1].videoScreenUrl : ""
         },
         jwt: proctoringOptions.token
       });

package/interfaces/ProctoringRecord.d.ts

@@ -9,6 +9,7 @@ export interface ProctoringSession {
     end: string;
 }
 export interface ProctoringRecord {
+    examId: string;
     id: string;
     sessions: ProctoringSession[];
 }

package/package.json

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