@newtonschool/react_proctoring_library 0.0.126-beta.1 → 0.0.127

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

@@ -122,7 +122,8 @@ const ProctorApp = _ref => {
         askPermission
       },
       browserDetails: (0, _browserUtils.getBrowserDetails)(),
-      permissionErrors: permissionErrors
+      permissionErrors: permissionErrors,
+      allPermissionGrantedOnce: allPermissionGrantedOnce.current
     }, permissionPassedProps)), !shouldShowProctoredComponent && !customPermissionView && /*#__PURE__*/(0, _jsxRuntime.jsx)(_permissions.Permission, {
       permissions: permissions,
       proctorParams: proctorParams,

package/dist/components/secondaryDevice/index.js

@@ -29,20 +29,27 @@ const SecondaryDevice = _ref => {
     const cleanup = (0, _proctoringStatusUtils.setupDeviceStatusListeners)({
       firebaseClient,
       isSecondaryDevice,
+      allPermissionGranted,
       onPrimaryDeviceStatusChange: connectionStatus => {
         setPrimaryDeviceOnline(connectionStatus);
       },
       onSecondaryDeviceStatusChange: (connectionStatus, allPermissionGranted) => {
         setSecondaryDeviceOnline(connectionStatus);
         setSecondaryDeviceAllPermissionGranted(allPermissionGranted);
-      },
-      allPermissionGranted
+      }
     });
     return cleanup;
   }, [firebaseClient, isSecondaryDevice, allPermissionGranted]);
+  (0, _react.useEffect)(() => {
+    (0, _proctoringStatusUtils.updateCurrentDeviceStatus)({
+      firebaseClient,
+      isSecondaryDevice,
+      allPermissionGranted
+    });
+  }, [firebaseClient, isSecondaryDevice, allPermissionGranted]);
   (0, _react.useEffect)(() => {
     if (isSecondaryDevice) {
-      setSecondaryDevicePermission(primaryDeviceOnline && secondaryDeviceOnline);
+      setSecondaryDevicePermission(secondaryDeviceOnline);
     } else {
       setSecondaryDevicePermission(primaryDeviceOnline && secondaryDeviceOnline && secondaryDeviceAllPermissionGranted);
     }

package/dist/hooks/web/useFullScreenData.js

@@ -4,21 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = useFullscreenData;
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = require("react");
 var _utils = require("../../utils");
 var _fullScreen = _interopRequireDefault(require("../../utils/fullScreen"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const browserFullscreenElementProp = (0, _utils.getBrowserFullscreenElementProp)();
+const isIOS = typeof window !== 'undefined' && /iPad|iPhone|iPod/.test(navigator.userAgent || '') && !window.MSStream;
 function useFullscreenData() {
   const fullScreenElement = (0, _react.useRef)(document.documentElement);
-  const [isFullscreen, setIsFullscreen] = (0, _react.useState)(typeof window !== 'undefined' && (document[browserFullscreenElementProp] != null || !!window.NS_TESTING_ENVIRONMENT));
+  const [isFullscreen, setIsFullscreen] = (0, _react.useState)(typeof window !== 'undefined' && (isIOS || document[browserFullscreenElementProp] != null || !!window.NS_TESTING_ENVIRONMENT));
   const setFullscreen = (0, _react.useCallback)(() => {
     var _fullScreenElement$cu, _fullScreenElement$cu2, _fullScreenElement$cu3, _fullScreenElement$cu4, _fullScreenElement$cu5, _fullScreenElement$cu6;
     if (!fullScreenElement || !fullScreenElement.current) {
       return;
     }
-    if (typeof window !== 'undefined' && window.NS_TESTING_ENVIRONMENT) {
+    if (typeof window !== 'undefined' && (window.NS_TESTING_ENVIRONMENT || isIOS)) {
       setIsFullscreen(true);
       return;
     }
@@ -31,6 +34,9 @@ function useFullscreenData() {
     });
   }, []);
   (0, _react.useEffect)(() => {
+    if (isIOS) {
+      return;
+    }
     const cleanup = _fullScreen.default.addFullScreenListener(() => {
       setIsFullscreen(document[browserFullscreenElementProp] !== null);
     });

package/dist/utils/permission.js

@@ -18,7 +18,6 @@ const hasAllPermissions = (requiredPermissions, permissions) => {
       hasPermission = hasPermission && false;
     }
   });
-  console.log('::[hasAllPermissions]', status, 'allGranted:', hasPermission);
   return hasPermission;
 };
 exports.hasAllPermissions = hasAllPermissions;

package/dist/utils/proctoringStatusUtils.js

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setupDeviceStatusListeners = exports.setSecondaryDeviceConnected = exports.setPrimaryDeviceConnected = void 0;
+exports.updateCurrentDeviceStatus = exports.setupDeviceStatusListeners = exports.setSecondaryDeviceConnected = exports.setPrimaryDeviceConnected = void 0;
 var _defaults = require("../constants/defaults");
+const HEARTBEAT_INTERVAL_MS = 5000;
+const OTHER_DEVICE_HEARTBEAT_TIMEOUT_MS = 15000;
+
 /**
  * Marks the primary device as connected in Firebase. Call when desktop webcam
  * connects successfully. No-op if firebaseClient is missing required fields.
@@ -54,6 +57,40 @@ const setSecondaryDeviceConnected = firebaseClient => {
   });
 };
 
+/**
+ * Utility to update the current device's status (connected + permissions + heartbeat)
+ * based on whether it's a primary or secondary device.
+ *
+ * @param {Object} params
+ * @param {Object} params.firebaseClient
+ * @param {boolean} params.isSecondaryDevice
+ * @param {boolean} params.allPermissionGranted
+ * @returns {Promise<void>|undefined}
+ */
+exports.setSecondaryDeviceConnected = setSecondaryDeviceConnected;
+const updateCurrentDeviceStatus = _ref => {
+  let {
+    firebaseClient,
+    isSecondaryDevice,
+    allPermissionGranted
+  } = _ref;
+  if (!(firebaseClient !== null && firebaseClient !== void 0 && firebaseClient.userUuid) || !(firebaseClient !== null && firebaseClient !== void 0 && firebaseClient.myFirebaseDB) || !(firebaseClient !== null && firebaseClient !== void 0 && firebaseClient.getRef) || !(firebaseClient !== null && firebaseClient !== void 0 && firebaseClient.updateValue)) {
+    return undefined;
+  }
+  const {
+    updateValue: update,
+    getRef: ref
+  } = firebaseClient;
+  const deviceKey = isSecondaryDevice ? 'secondaryDevice' : 'primaryDevice';
+  const deviceStatusRef = ref(firebaseClient.myFirebaseDB, "".concat(_defaults.PROCTORING_STATUS_PATH, "/").concat(firebaseClient.userUuid, "/").concat(deviceKey));
+  const payload = {
+    allPermissionGranted
+  };
+  return update(deviceStatusRef, payload).catch(error => {
+    console.error('::[proctoringStatusUtils] Failed to update current device status:', error);
+  });
+};
+
 /**
  * Sets up Firebase device status: marks current device (primary/secondary) as connected,
  * registers onDisconnect, and subscribes to primary and secondary status.
@@ -67,15 +104,14 @@ const setSecondaryDeviceConnected = firebaseClient => {
  * @param {boolean} params.allPermissionGranted
  * @returns {() => void} Cleanup function to unsubscribe, or no-op if setup skipped
  */
-exports.setSecondaryDeviceConnected = setSecondaryDeviceConnected;
-const setupDeviceStatusListeners = _ref => {
+exports.updateCurrentDeviceStatus = updateCurrentDeviceStatus;
+const setupDeviceStatusListeners = _ref2 => {
   let {
     firebaseClient,
     isSecondaryDevice,
     onPrimaryDeviceStatusChange,
-    onSecondaryDeviceStatusChange,
-    allPermissionGranted
-  } = _ref;
+    onSecondaryDeviceStatusChange
+  } = _ref2;
   const {
     userUuid,
     firestoreAuthStatus,
@@ -92,12 +128,44 @@ const setupDeviceStatusListeners = _ref => {
   const primaryDeviceStatusRef = ref(myFirebaseDB, "".concat(_defaults.PROCTORING_STATUS_PATH, "/").concat(userUuid, "/primaryDevice"));
   const secondaryDeviceStatusRef = ref(myFirebaseDB, "".concat(_defaults.PROCTORING_STATUS_PATH, "/").concat(userUuid, "/secondaryDevice"));
   const currentDeviceStatusRef = isSecondaryDevice ? secondaryDeviceStatusRef : primaryDeviceStatusRef;
-  update(currentDeviceStatusRef, {
-    allPermissionGranted
-  });
+  const otherDeviceStatusRef = isSecondaryDevice ? primaryDeviceStatusRef : secondaryDeviceStatusRef;
+
+  // When this client disconnects (tab close, network loss)
   onDisconnect(currentDeviceStatusRef).update({
     connected: false
+  }).catch(err => {
+    console.error('::[proctoringStatusUtils] Failed to mark current device disconnected:', err);
   });
+  let heartbeatIntervalId = null;
+  if (typeof window !== 'undefined' && typeof setInterval === 'function') {
+    heartbeatIntervalId = setInterval(() => {
+      const now = Date.now();
+
+      // Send heartbeat for current device if document is not hidden
+      if (!document.hidden) {
+        update(currentDeviceStatusRef, {
+          connected: true,
+          lastHeartbeatAt: now
+        }).catch(error => {
+          console.error('::[proctoringStatusUtils] Failed to send heartbeat for current device:', error);
+        });
+      }
+
+      // Check other device's last heartbeat; if > OTHER_DEVICE_HEARTBEAT_TIMEOUT_MS then mark as disconnected.
+      onValue(otherDeviceStatusRef, snapshot => {
+        const val = snapshot.val();
+        const lastBeat = val === null || val === void 0 ? void 0 : val.lastHeartbeatAt;
+        const isConnected = Boolean(val === null || val === void 0 ? void 0 : val.connected);
+        if (isConnected && typeof lastBeat === 'number' && now - lastBeat > OTHER_DEVICE_HEARTBEAT_TIMEOUT_MS) {
+          update(otherDeviceStatusRef, {
+            connected: false
+          }).catch(otherErr => {
+            console.error('::[proctoringStatusUtils] Failed to mark other device disconnected due to stale heartbeat:', otherErr);
+          });
+        }
+      });
+    }, HEARTBEAT_INTERVAL_MS);
+  }
   const unsubscribePrimary = onValue(primaryDeviceStatusRef, snapshot => {
     const val = snapshot.val();
     onPrimaryDeviceStatusChange(Boolean(val === null || val === void 0 ? void 0 : val.connected));
@@ -109,6 +177,9 @@ const setupDeviceStatusListeners = _ref => {
   return () => {
     unsubscribePrimary();
     unsubscribeSecondary();
+    if (heartbeatIntervalId) {
+      clearInterval(heartbeatIntervalId);
+    }
   };
 };
 exports.setupDeviceStatusListeners = setupDeviceStatusListeners;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newtonschool/react_proctoring_library",
-  "version": "0.0.126-beta.1",
+  "version": "0.0.127",
   "description": "Used to proctor online tests",
   "author": "ayushkagrawal,shreyachandra,weastel",
   "main": "dist/index.js",
@@ -19,8 +19,8 @@
     "react-webcam": "6.0.0"
   },
   "peerDependencies": {
-    "react": ">=16.8.0",
-    "react-dom": ">=16.8.0"
+    "react": "18.3.0",
+    "react-dom": "18.3.0"
   },
   "scripts": {
     "build": "babel src --out-dir dist --copy-files",