@newtonschool/react_proctoring_library 0.0.74 → 0.0.75

package/dist/components/webcam-activity-tracker/electron.js

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ElectronWebCam;
-require("core-js/modules/es.promise.js");
-require("core-js/modules/es.weak-map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/es.promise.js");
 var _react = require("react");
-var _loadable = _interopRequireDefault(require("../../utils/loadable"));
+var _reactWebcam = _interopRequireDefault(require("react-webcam"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -17,9 +16,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const Webcam = (0, _loadable.default)(() => Promise.resolve().then(() => _interopRequireWildcard(require('react-webcam'))));
 function ElectronWebCam(_ref) {
   let {
     setAskPermissionAction,
@@ -29,19 +25,19 @@ function ElectronWebCam(_ref) {
   } = _ref;
   const {
     permissionSetter,
-    permissions,
     references,
     setPermissionErrors,
     device
   } = (0, _react.useContext)(proctoredContext);
+  const [permissionGrantedInElectron, setPermissionGrantedInElectron] = (0, _react.useState)(false);
   const setVideoPermission = permissionSetter.video;
-  const isVideoTurnedOn = permissions.video;
   const webcamReference = references.webcamReference;
   const {
     recurring = false,
     recurringFetchInterval = 30000
   } = config;
   const deviceId = device === null || device === void 0 ? void 0 : device.webCamDeviceId;
+  const [retry, setRetry] = (0, _react.useState)(0);
   (0, _react.useEffect)(() => {
     setAskPermissionAction(oldAskPermissionAction => _objectSpread(_objectSpread({}, oldAskPermissionAction), {}, {
       video: async () => {
@@ -61,14 +57,6 @@ function ElectronWebCam(_ref) {
           const permissionGranted = await window.electron.actions.startWebCamRecording(devices[0].deviceId);
           if (permissionGranted) {
             device.setWebCamDeviceId(devices[0].deviceId);
-            navigator.mediaDevices.getUserMedia({
-              video: true
-            }).then(streams => {
-              const stream = streams.getVideoTracks()[0];
-              webcamReference.current = {
-                stream
-              };
-            });
           } else {
             throw new Error('Error starting webcam recording');
           }
@@ -94,7 +82,7 @@ function ElectronWebCam(_ref) {
             fileUploadConfig: config.fileUploadConfig
           });
         }
-        setVideoPermission(true);
+        setPermissionGrantedInElectron(true);
       } catch (error) {
         setPermissionErrors(oldErrors => _objectSpread(_objectSpread({}, oldErrors || {}), {}, {
           video: (error === null || error === void 0 ? void 0 : error.message) || 'Error while taking webcam snapshot'
@@ -104,14 +92,14 @@ function ElectronWebCam(_ref) {
     if (deviceId) {
       startWebCamSnapshot();
     }
-  }, [config.fileUploadConfig, deviceId, recurring, recurringFetchInterval, setVideoPermission, setPermissionErrors]);
+  }, [config.fileUploadConfig, deviceId, recurring, recurringFetchInterval, device.webCamDeviceId]);
   (0, _react.useEffect)(() => {
     if (deviceId) {
       const permissionSetter = permission => {
-        setVideoPermission(permission);
+        setPermissionGrantedInElectron(permission);
       };
       window.electron.states.isWebCamRecordingStarted(deviceId).then(permission => {
-        setVideoPermission(permission);
+        setPermissionGrantedInElectron(permission);
       });
       const id = window.electron.listener.webCamSnapshotRecordingStatusChanged(deviceId, permissionSetter);
       return () => {
@@ -119,13 +107,27 @@ function ElectronWebCam(_ref) {
       };
     }
   }, [deviceId]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: isVideoTurnedOn && /*#__PURE__*/(0, _jsxRuntime.jsx)(Webcam, {
-      audio: false,
-      screenshotFormat: "image/jpeg",
-      ref: webcamReference,
-      className: "captured-video-canvas hide",
-      id: 'WEBCAM_REFERENCE_ID'
-    })
-  });
+  (0, _react.useEffect)(() => {
+    if (!permissionGrantedInElectron) {
+      setVideoPermission(false);
+    }
+  }, [permissionGrantedInElectron]);
+  if (!permissionGrantedInElectron) {
+    return;
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactWebcam.default, {
+    audio: false,
+    screenshotFormat: "image/jpeg",
+    onUserMedia: () => {
+      setVideoPermission(true);
+    },
+    onUserMediaError: () => {
+      if (retry < 3) {
+        setRetry(retry + 1);
+      }
+    },
+    ref: webcamReference,
+    className: "captured-video-canvas hide",
+    id: 'WEBCAM_REFERENCE_ID'
+  }, "".concat(deviceId, "-").concat(retry));
 }

package/dist/hooks/electron/useKishokMode.js

@@ -24,6 +24,15 @@ function useKishokMode(_ref) {
     isFullscreen
   } = (0, _useGenericFullScreenData.default)(isElectronApp);
   const shouldShowProctoredComponent = (0, _breachUtils.showProctoredComponent)(proctorParams, permissions);
+  const [isDocumentFocused, setIsDocumentFocused] = (0, _react.useState)(true);
+  (0, _react.useEffect)(() => {
+    window.addEventListener('focus', () => {
+      setIsDocumentFocused(true);
+    });
+    window.addEventListener('blur', () => {
+      setIsDocumentFocused(false);
+    });
+  }, []);
   (0, _react.useEffect)(() => {
     const updateOnlineStatus = () => {
       setConnectedToInternet(window.navigator.onLine);
@@ -33,11 +42,11 @@ function useKishokMode(_ref) {
     updateOnlineStatus();
   }, []);
   (0, _react.useEffect)(() => {
-    if (typeof window !== 'undefined' && shouldShowProctoredComponent && isFullscreen && isElectronApp && connectedToInternet) {
+    if (typeof window !== 'undefined' && shouldShowProctoredComponent && isFullscreen && isElectronApp && connectedToInternet && isDocumentFocused) {
       window.electron.actions.enableKioskMode();
     } else {
       var _window$electron, _window$electron$acti;
       (_window$electron = window.electron) === null || _window$electron === void 0 ? void 0 : (_window$electron$acti = _window$electron.actions) === null || _window$electron$acti === void 0 ? void 0 : _window$electron$acti.disableKioskMode();
     }
-  }, [isFullscreen, shouldShowProctoredComponent, isElectronApp]);
+  }, [isFullscreen, shouldShowProctoredComponent, isElectronApp, isDocumentFocused]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newtonschool/react_proctoring_library",
-  "version": "0.0.74",
+  "version": "0.0.75",
   "description": "Used to proctor online tests",
   "author": "ayushkagrawal,shreyachandra,weastel",
   "main": "dist/index.js",