easyproctor 0.0.24 → 0.0.25

package/dtos/StartProctoringResponse.d.ts

@@ -7,5 +7,5 @@ export default interface StartProctoringDTO {
     examEndTime: string;
     status: number;
     cameraStream: MediaStream;
-    screenStream: MediaStream;
+    screenStream: MediaStream | undefined;
 }

package/esm/index.js

@@ -8277,7 +8277,8 @@ var defaultProctoringOptions = {
   cameraId: void 0,
   microphoneId: void 0,
   allowMultipleMonitors: false,
-  allowOnlyFirstMonitor: true
+  allowOnlyFirstMonitor: true,
+  captureScreen: true
 };
 var azureBlobUrl = "";
 function useProctoring(proctoringOptions, proctoringConfig) {
@@ -8328,20 +8329,31 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     }
     let cancelCameraCapture = null;
     let cancelScreenCapture = null;
-    const { cameraId, microphoneId, allowOnlyFirstMonitor } = options;
+    const { cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen } = options;
     try {
-      const { screenStream, stopScreenRecorder } = await startScreenCapture(screenBuffer, {
-        allowOnlyFirstMonitor,
-        onStopSharingScreenCallback: () => onStopSharingScreenCallback && onStopSharingScreenCallback()
-      });
+      let _screenStream = void 0;
+      if (captureScreen) {
+        const { screenStream, stopScreenRecorder } = await startScreenCapture(screenBuffer, {
+          allowOnlyFirstMonitor,
+          onStopSharingScreenCallback: () => onStopSharingScreenCallback && onStopSharingScreenCallback()
+        });
+        cancelScreenCapture = stopScreenRecorder;
+        _screenStream = screenStream;
+      }
       const { cameraStream, stopCameraRecording } = await startCameraCapture(cameraBuffer, { cameraId, microphoneId });
-      cancelScreenCapture = stopScreenRecorder;
       cancelCameraCapture = stopCameraRecording;
-      cancelCallback = async function() {
-        await Promise.all([cancelCameraCapture(), cancelScreenCapture()]);
-        cancelCallback = null;
-      };
-      return { screenStream, cameraStream };
+      if (captureScreen) {
+        cancelCallback = async function() {
+          await Promise.all([cancelCameraCapture(), cancelScreenCapture()]);
+          cancelCallback = null;
+        };
+      } else {
+        cancelCallback = async function() {
+          await Promise.all([cancelCameraCapture()]);
+          cancelCallback = null;
+        };
+      }
+      return { _screenStream, cameraStream };
     } catch (error) {
       cancelCallback = null;
       cancelScreenCapture && await cancelScreenCapture();
@@ -8377,7 +8389,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
   const _closeSession = (index) => {
     const finalCameraBuffer = cameraBuffer;
     const finalScreenBuffer = screenBuffer;
-    if (finalCameraBuffer.length == 0 || finalScreenBuffer.length == 0) {
+    if (finalCameraBuffer.length == 0) {
       throw PROCTORING_NOT_STARTED;
     }
     const cameraFileName = `EP_${proctoringId}_camera_${index}.webm`;
@@ -8387,7 +8399,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     return { cameraFile, screenFile };
   };
   async function start(options = defaultProctoringOptions) {
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true } = options;
     if (proctoringConfig != void 0) {
       setConfiguration(proctoringConfig.account, proctoringConfig.containerName, proctoringConfig.sas);
       azureBlobUrl = proctoringConfig.azureBlobUrl;
@@ -8408,7 +8420,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       throw PROCTORING_ALREADY_STARTED;
     }
     try {
-      const { cameraStream, screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor });
+      const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen });
       startTime = Date.now();
       startDate = new Date();
       const resp = await makeRequest({
@@ -8418,7 +8430,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         jwt: proctoringOptions.token
       });
       resp.cameraStream = cameraStream;
-      resp.screenStream = screenStream;
+      resp.screenStream = _screenStream;
       await insertRecord("exams", {
         id: resp.id,
         sessions: []
@@ -8454,7 +8466,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
   }
   async function resume(options = defaultProctoringOptions) {
     _clear();
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true } = options;
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
@@ -8468,16 +8480,17 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     if (!record) {
       throw PROCTORING_NOT_STARTED;
     }
-    const { cameraStream, screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor });
+    const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen });
     proctoringId = record.id;
     startTime = Date.now();
     startDate = new Date();
-    return { cameraStream, screenStream };
+    return { cameraStream, _screenStream };
   }
   async function finish(options = {}) {
     const { onProgress } = options;
     const record = await getRecord("exams");
     if (!record) {
+      console.log("OXE");
       throw PROCTORING_NOT_STARTED;
     }
     onStopSharingScreenCallback = void 0;

package/index.d.ts

@@ -6,6 +6,7 @@ interface ProctoringOptions {
     microphoneId?: string;
     allowMultipleMonitors?: boolean;
     allowOnlyFirstMonitor?: boolean;
+    captureScreen?: boolean;
 }
 interface ProctoringConfig {
     azureBlobUrl: string;
@@ -26,7 +27,7 @@ export declare function useProctoring(proctoringOptions: {
     pause: () => Promise<void>;
     resume: (options?: ProctoringOptions) => Promise<{
         cameraStream: MediaStream;
-        screenStream: MediaStream;
+        _screenStream: MediaStream | undefined;
     }>;
     onFocus: (cb: () => void) => void;
     onLostFocus: (cb: () => void) => void;

package/index.js

@@ -8617,7 +8617,8 @@ var defaultProctoringOptions = {
   cameraId: void 0,
   microphoneId: void 0,
   allowMultipleMonitors: false,
-  allowOnlyFirstMonitor: true
+  allowOnlyFirstMonitor: true,
+  captureScreen: true
 };
 var azureBlobUrl = "";
 function useProctoring(proctoringOptions, proctoringConfig) {
@@ -8668,20 +8669,31 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     }
     let cancelCameraCapture = null;
     let cancelScreenCapture = null;
-    const { cameraId, microphoneId, allowOnlyFirstMonitor } = options;
+    const { cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen } = options;
     try {
-      const { screenStream, stopScreenRecorder } = await startScreenCapture(screenBuffer, {
-        allowOnlyFirstMonitor,
-        onStopSharingScreenCallback: () => onStopSharingScreenCallback && onStopSharingScreenCallback()
-      });
+      let _screenStream = void 0;
+      if (captureScreen) {
+        const { screenStream, stopScreenRecorder } = await startScreenCapture(screenBuffer, {
+          allowOnlyFirstMonitor,
+          onStopSharingScreenCallback: () => onStopSharingScreenCallback && onStopSharingScreenCallback()
+        });
+        cancelScreenCapture = stopScreenRecorder;
+        _screenStream = screenStream;
+      }
       const { cameraStream, stopCameraRecording } = await startCameraCapture(cameraBuffer, { cameraId, microphoneId });
-      cancelScreenCapture = stopScreenRecorder;
       cancelCameraCapture = stopCameraRecording;
-      cancelCallback = async function() {
-        await Promise.all([cancelCameraCapture(), cancelScreenCapture()]);
-        cancelCallback = null;
-      };
-      return { screenStream, cameraStream };
+      if (captureScreen) {
+        cancelCallback = async function() {
+          await Promise.all([cancelCameraCapture(), cancelScreenCapture()]);
+          cancelCallback = null;
+        };
+      } else {
+        cancelCallback = async function() {
+          await Promise.all([cancelCameraCapture()]);
+          cancelCallback = null;
+        };
+      }
+      return { _screenStream, cameraStream };
     } catch (error) {
       cancelCallback = null;
       cancelScreenCapture && await cancelScreenCapture();
@@ -8717,7 +8729,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
   const _closeSession = (index) => {
     const finalCameraBuffer = cameraBuffer;
     const finalScreenBuffer = screenBuffer;
-    if (finalCameraBuffer.length == 0 || finalScreenBuffer.length == 0) {
+    if (finalCameraBuffer.length == 0) {
       throw PROCTORING_NOT_STARTED;
     }
     const cameraFileName = `EP_${proctoringId}_camera_${index}.webm`;
@@ -8727,7 +8739,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     return { cameraFile, screenFile };
   };
   async function start(options = defaultProctoringOptions) {
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true } = options;
     if (proctoringConfig != void 0) {
       setConfiguration(proctoringConfig.account, proctoringConfig.containerName, proctoringConfig.sas);
       azureBlobUrl = proctoringConfig.azureBlobUrl;
@@ -8748,7 +8760,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
       throw PROCTORING_ALREADY_STARTED;
     }
     try {
-      const { cameraStream, screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor });
+      const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen });
       startTime = Date.now();
       startDate = new Date();
       const resp = await makeRequest({
@@ -8758,7 +8770,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
         jwt: proctoringOptions.token
       });
       resp.cameraStream = cameraStream;
-      resp.screenStream = screenStream;
+      resp.screenStream = _screenStream;
       await insertRecord("exams", {
         id: resp.id,
         sessions: []
@@ -8794,7 +8806,7 @@ function useProctoring(proctoringOptions, proctoringConfig) {
   }
   async function resume(options = defaultProctoringOptions) {
     _clear();
-    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false } = options;
+    const { cameraId, microphoneId, allowOnlyFirstMonitor = true, allowMultipleMonitors = false, captureScreen = true } = options;
     if (!allowMultipleMonitors) {
       const hasMultipleMonitors = await checkIfhasMultipleMonitors();
       if (hasMultipleMonitors) {
@@ -8808,16 +8820,17 @@ function useProctoring(proctoringOptions, proctoringConfig) {
     if (!record) {
       throw PROCTORING_NOT_STARTED;
     }
-    const { cameraStream, screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor });
+    const { cameraStream, _screenStream } = await _startCapture({ cameraId, microphoneId, allowOnlyFirstMonitor, captureScreen });
     proctoringId = record.id;
     startTime = Date.now();
     startDate = new Date();
-    return { cameraStream, screenStream };
+    return { cameraStream, _screenStream };
   }
   async function finish(options = {}) {
     const { onProgress } = options;
     const record = await getRecord("exams");
     if (!record) {
+      console.log("OXE");
       throw PROCTORING_NOT_STARTED;
     }
     onStopSharingScreenCallback = void 0;

package/package.json

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