@newtonschool/react_proctoring_library 0.0.75 → 0.0.78

package/dist/components/fullscreen/index.js

@@ -8,7 +8,7 @@ require("core-js/modules/es.symbol.description.js");
 var _react = require("react");
 var _useGenericFullScreenData = _interopRequireDefault(require("../../hooks/useGenericFullScreenData"));
 var _ElectronContext = require("../../contexts/ElectronContext");
-var _useKishokMode = _interopRequireDefault(require("../../hooks/electron/useKishokMode"));
+var _useKioskMode = _interopRequireDefault(require("../../hooks/electron/useKioskMode"));
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -25,13 +25,15 @@ function FullScreen(_ref) {
   const {
     setFullscreen
   } = (0, _useGenericFullScreenData.default)(isElectronApp);
-  (0, _useKishokMode.default)({
+  (0, _useKioskMode.default)({
     proctoredContext,
     proctorParams
   });
   (0, _react.useEffect)(() => {
     setAskPermissionAction(oldAskPermissionAction => _objectSpread(_objectSpread({}, oldAskPermissionAction), {}, {
-      fullscreen: () => setFullscreen(true)
+      fullscreen: () => {
+        setFullscreen(true);
+      }
     }));
   }, [setAskPermissionAction, setFullscreen]);
   return null;

package/dist/components/proctor-app/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.ProctorApp = void 0;
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/es.promise.js");
 var _react = _interopRequireWildcard(require("react"));
 require("./index.scss");
 var _permissions = require("../permissions");
@@ -64,12 +65,14 @@ const ProctorApp = _ref => {
   const CustomPermissionView = customPermissionView;
   const proctorParams = (0, _react.useMemo)(() => _objectSpread(_objectSpread({}, _defaults.defaultConfig), config.proctorParams), [config.proctorParams]);
   const shouldShowProctoredComponent = (0, _breachUtils.showProctoredComponent)(proctorParams, permissions);
-  const askPermission = (0, _react.useCallback)(requiredPermissions => {
+  const askPermission = (0, _react.useCallback)(async requiredPermissions => {
+    const allPromises = [];
     requiredPermissions.forEach(element => {
       if (!permissions[element] && askPermissionAction[element]) {
-        askPermissionAction[element]();
+        allPromises.push(askPermissionAction[element]());
       }
     });
+    await Promise.all(allPromises);
   }, [permissions, askPermissionAction]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "".concat(proctorParams.copyPasteProctoring ? 'disable-copy-paste fullwidth fullheight' : 'fullwidth fullheight'),

package/dist/components/proctor-context-app/index.js

@@ -43,6 +43,7 @@ const ProctoredContextApp = _ref => {
     screenshare: null
   });
   const [screensharePermission, setScreensharePermission] = (0, _react.useState)();
+  const [_, setUpdateId] = (0, _react.useState)(0);
   const webcamReference = (0, _react.useRef)(null);
   const screenshareReference = (0, _react.useRef)(null);
   const [screenshareStream, setScreenshareStream] = (0, _react.useState)(null);
@@ -57,6 +58,9 @@ const ProctoredContextApp = _ref => {
     fullscreen: isFullscreen,
     screenshare: screensharePermission
   }), [videoPermission, audioPermisison, isFullscreen, screensharePermission]);
+  const forceUpdate = () => {
+    setUpdateId(oldId => oldId + 1);
+  };
   const endTest = () => {
     if (isElectronApp) {
       window.electron.actions.stopProctoring();
@@ -91,7 +95,8 @@ const ProctoredContextApp = _ref => {
         webcamReference,
         screenshareReference
       },
-      screenshareStream
+      screenshareStream,
+      forceUpdate
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ElectronContext.ElectronContextProvider, {
       value: isElectronApp,

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

@@ -29,7 +29,7 @@ function ElectronScreenShare(_ref) {
   (0, _react.useEffect)(() => {
     setAskPermissionAction(oldAskPermissionAction => _objectSpread(_objectSpread({}, oldAskPermissionAction), {}, {
       screenshare: async () => {
-        device.setScreenShareDeviceId(false);
+        device.setScreenShareDeviceId(undefined);
         setPermissionErrors(oldErrors => _objectSpread(_objectSpread({}, oldErrors || {}), {}, {
           screenshare: null
         }));
@@ -89,18 +89,16 @@ function ElectronScreenShare(_ref) {
     }
   }, [streamDeviceId, config]);
   (0, _react.useEffect)(() => {
-    if (streamDeviceId) {
-      const permissionSetter = permission => {
-        setScreensharePermission(permission);
-      };
-      window.electron.states.isScreenShareRecordingStarted(streamDeviceId).then(recordingStarted => {
-        permissionSetter(recordingStarted);
-      });
-      const id = window.electron.listener.screenShareRecordingStatusChanged(streamDeviceId, permissionSetter);
-      return () => {
-        window.electron.listener.removeListener(id, permissionSetter);
-      };
-    }
+    const permissionSetter = permission => {
+      setScreensharePermission(permission);
+    };
+    window.electron.states.isScreenShareRecordingStarted(streamDeviceId).then(recordingStarted => {
+      permissionSetter(recordingStarted);
+    });
+    const id = window.electron.listener.screenShareRecordingStatusChanged(streamDeviceId, permissionSetter);
+    return () => {
+      window.electron.listener.removeListener(id, permissionSetter);
+    };
   }, [streamDeviceId]);
   return null;
 }

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

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ElectronWebCam;
-require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.promise.js");
 var _react = require("react");
 var _reactWebcam = _interopRequireDefault(require("react-webcam"));
@@ -16,20 +17,27 @@ 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); }
+const getMacBookDevice = function getMacBookDevice() {
+  let devices = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  if (devices.length === 1) {
+    return devices[0];
+  }
+  return devices.find(device => device.label.includes('FaceTime HD Camera'));
+};
 function ElectronWebCam(_ref) {
   let {
     setAskPermissionAction,
     proctoredContext,
-    proctorParams,
     config
   } = _ref;
   const {
     permissionSetter,
     references,
+    permissions,
     setPermissionErrors,
-    device
+    device,
+    forceUpdate
   } = (0, _react.useContext)(proctoredContext);
-  const [permissionGrantedInElectron, setPermissionGrantedInElectron] = (0, _react.useState)(false);
   const setVideoPermission = permissionSetter.video;
   const webcamReference = references.webcamReference;
   const {
@@ -37,7 +45,6 @@ function ElectronWebCam(_ref) {
     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 () => {
@@ -54,9 +61,13 @@ function ElectronWebCam(_ref) {
           if (devices.length === 0) {
             throw new Error('No webcam devices found');
           }
-          const permissionGranted = await window.electron.actions.startWebCamRecording(devices[0].deviceId);
+          const macBookDevice = getMacBookDevice(devices);
+          if (!device) {
+            throw new Error('No webcam devices found');
+          }
+          const permissionGranted = await window.electron.actions.startWebCamRecording(macBookDevice.deviceId);
           if (permissionGranted) {
-            device.setWebCamDeviceId(devices[0].deviceId);
+            device.setWebCamDeviceId(macBookDevice.deviceId);
           } else {
             throw new Error('Error starting webcam recording');
           }
@@ -82,7 +93,7 @@ function ElectronWebCam(_ref) {
             fileUploadConfig: config.fileUploadConfig
           });
         }
-        setPermissionGrantedInElectron(true);
+        setVideoPermission(true);
       } catch (error) {
         setPermissionErrors(oldErrors => _objectSpread(_objectSpread({}, oldErrors || {}), {}, {
           video: (error === null || error === void 0 ? void 0 : error.message) || 'Error while taking webcam snapshot'
@@ -96,10 +107,10 @@ function ElectronWebCam(_ref) {
   (0, _react.useEffect)(() => {
     if (deviceId) {
       const permissionSetter = permission => {
-        setPermissionGrantedInElectron(permission);
+        setVideoPermission(permission);
       };
       window.electron.states.isWebCamRecordingStarted(deviceId).then(permission => {
-        setPermissionGrantedInElectron(permission);
+        setVideoPermission(true);
       });
       const id = window.electron.listener.webCamSnapshotRecordingStatusChanged(deviceId, permissionSetter);
       return () => {
@@ -107,27 +118,17 @@ function ElectronWebCam(_ref) {
       };
     }
   }, [deviceId]);
-  (0, _react.useEffect)(() => {
-    if (!permissionGrantedInElectron) {
-      setVideoPermission(false);
-    }
-  }, [permissionGrantedInElectron]);
-  if (!permissionGrantedInElectron) {
+  if (!permissions.video) {
     return;
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactWebcam.default, {
     audio: false,
     screenshotFormat: "image/jpeg",
     onUserMedia: () => {
-      setVideoPermission(true);
-    },
-    onUserMediaError: () => {
-      if (retry < 3) {
-        setRetry(retry + 1);
-      }
+      forceUpdate(true);
     },
     ref: webcamReference,
     className: "captured-video-canvas hide",
     id: 'WEBCAM_REFERENCE_ID'
-  }, "".concat(deviceId, "-").concat(retry));
+  });
 }

package/dist/hooks/electron/{useKishokMode.js → useKioskMode.js}

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = useKishokMode;
+exports.default = useKioskMode;
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = require("react");
 var _breachUtils = require("../../utils/breachUtils");
 var _useGenericFullScreenData = _interopRequireDefault(require("../useGenericFullScreenData"));
 var _ElectronContext = require("../../contexts/ElectronContext");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function useKishokMode(_ref) {
+function useKioskMode(_ref) {
   let {
     proctoredContext,
     proctorParams

package/dist/hooks/electron/usePageVisibility.js

@@ -3,35 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = useWakeUpLock;
+exports.default = usePageVisibility;
 require("core-js/modules/web.dom-collections.iterator.js");
-require("core-js/modules/es.promise.js");
 var _react = require("react");
 var _ElectronContext = require("../../contexts/ElectronContext");
-function useWakeUpLock() {
-  const [isWakeUpLockAcquired, setIsWakeUpLockAcquired] = (0, _react.useState)(0);
+function usePageVisibility(isProctorParam) {
+  const [isPageFocused, setIsPageFocused] = (0, _react.useState)(true);
   const isElectronApp = (0, _react.useContext)(_ElectronContext.ElectronContext);
-  const acquireWakeUpLock = async () => {
-    const id = await window.electron.actions.startWakeLock();
-    setIsWakeUpLockAcquired(id);
-  };
-  const releaseWakeUpLock = async () => {
-    window.electron.actions.stopWakeLock(isWakeUpLockAcquired);
-    setIsWakeUpLockAcquired(0);
-  };
   (0, _react.useEffect)(() => {
     if (isElectronApp) {
-      const isWakeUpLockChangeHandler = isPageFocused => {
-        setIsWakeUpLockAcquired(isPageFocused);
+      const isPageFocusChanged = isPageFocused => {
+        setIsPageFocused(isPageFocused);
       };
-      const signal = window.electron.listener.isPageVisibilityChanged(isWakeUpLockChangeHandler);
+      const signal = window.electron.listener.isPageFocusedChanged(isPageFocusChanged);
       return () => {
-        window.electron.listener.removeListener(signal, isWakeUpLockChangeHandler);
+        window.electron.listener.removeListener(signal, isPageFocusChanged);
       };
     }
   }, [isElectronApp]);
-  return {
-    acquireWakeUpLock,
-    releaseWakeUpLock
-  };
+  return isPageFocused && isProctorParam;
 }

package/dist/hooks/useGenericFullScreenData.js

@@ -8,6 +8,7 @@ var _useFullScreenData = _interopRequireDefault(require("./web/useFullScreenData
 var _useFullScreenData2 = _interopRequireDefault(require("./electron/useFullScreenData"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function useGenericFullScreenData(isElectronApp) {
+  console.log(isElectronApp, 'isElectronApp');
   const {
     isFullscreen: webIsFullScreen,
     setFullscreen: setWebIsFullScreen

package/package.json

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