@100mslive/roomkit-react 0.3.19-alpha.8 → 0.3.19

package/src/Prebuilt/components/VirtualBackground/VBHandler.tsx

@@ -1,7 +1,8 @@
 // Open issue with eslint-plugin-import https://github.com/import-js/eslint-plugin-import/issues/1810
 // eslint-disable-next-line
 import { HMSVBPlugin, HMSVirtualBackgroundTypes } from '@100mslive/hms-virtual-background/hmsvbplugin';
-
+import { parsedUserAgent } from '@100mslive/react-sdk';
+import { isSafari } from '../../common/constants';
 export class VBPlugin {
   private hmsPlugin?: HMSVBPlugin;
   private effectsPlugin?: any;
@@ -13,8 +14,8 @@ export class VBPlugin {
     if (effectsSDKKey) {
       try {
         // eslint-disable-next-line
-        const { HMSEffectsPlugin } = await import('@100mslive/hms-virtual-background/hmseffectsplugin');
-        this.effectsPlugin = new HMSEffectsPlugin(effectsSDKKey, onInit);
+        const effects = await import('@100mslive/hms-virtual-background/hmseffectsplugin');
+        this.effectsPlugin = new effects.HMSEffectsPlugin(effectsSDKKey, onInit);
       } catch (error) {
         console.error('Failed to initialise HMSEffectsPlugin:', error, 'Using HMSVBPlugin');
         this.hmsPlugin = new HMSVBPlugin(HMSVirtualBackgroundTypes.NONE, HMSVirtualBackgroundTypes.NONE);
@@ -101,6 +102,17 @@ export class VBPlugin {
     this.effectsPlugin = undefined;
     this.hmsPlugin = undefined;
   };
+
+  isEffectsSupported = () => {
+    if (!isSafari) {
+      return true;
+    }
+    const browserVersion = parsedUserAgent?.getBrowser()?.version || '16';
+    if (browserVersion && parseInt(browserVersion.split('.')[0]) < 17) {
+      return false;
+    }
+    return true;
+  };
 }
 
 export const VBHandler = new VBPlugin();

package/src/Prebuilt/components/VirtualBackground/VBPicker.tsx

@@ -25,7 +25,6 @@ import {
 import { BlurPersonHighIcon, CrossCircleIcon, CrossIcon } from '@100mslive/react-icons';
 import { Box, config as cssConfig, Flex, Loading, Slider, Video } from '../../../index';
 import { Text } from '../../../Text';
-import { doesBrowserSupportEffectsSDK } from './util';
 import { VBCollection } from './VBCollection';
 import { VBHandler } from './VBHandler';
 // @ts-ignore
@@ -49,7 +48,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
   const [blurAmount, setBlurAmount] = useState(VBHandler.getBlurAmount() || 0.5);
   const roomState = useHMSStore(selectRoomState);
   const isLargeRoom = useHMSStore(selectIsLargeRoom);
-  const [isBlurSupported, setIsBlurSupported] = useState(false);
+  const isEffectsSupported = VBHandler.isEffectsSupported();
   const isEffectsEnabled = useHMSStore(selectIsEffectsEnabled);
   const effectsKey = useHMSStore(selectEffectsKey);
   const isMobile = useMedia(cssConfig.media.md);
@@ -64,14 +63,22 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
   const showVideoTile = isVideoOn && isLargeRoom && !inPreview;
 
   useEffect(() => {
+    const addHMSVBPlugin = async () => {
+      setLoadingEffects(false);
+      if (!role) {
+        return;
+      }
+      await VBHandler.initialisePlugin();
+      await hmsActions.addPluginToVideoTrack(
+        VBHandler.getVBObject() as HMSVBPlugin,
+        Math.floor(role.publishParams.video.frameRate / 2),
+      );
+    };
     const initializeVirtualBackground = async () => {
       if (!track?.id || pluginLoadingRef.current || isPluginAdded) {
         return;
       }
 
-      const isEffectsSupported = doesBrowserSupportEffectsSDK();
-      setIsBlurSupported(isEffectsSupported);
-
       try {
         pluginLoadingRef.current = true;
         if (isEffectsEnabled && isEffectsSupported && effectsKey) {
@@ -79,17 +86,14 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
           await VBHandler.initialisePlugin(effectsKey, () => {
             setLoadingEffects(false);
           });
-          hmsActions.addPluginsToVideoStream([VBHandler.getVBObject() as HMSMediaStreamPlugin]);
-        } else {
-          setLoadingEffects(false);
-          if (!role) {
-            return;
+          const vbInstance = VBHandler.getVBObject();
+          if (vbInstance.getName() === 'HMSEffects') {
+            hmsActions.addPluginsToVideoStream([VBHandler.getVBObject() as HMSMediaStreamPlugin]);
+          } else {
+            await addHMSVBPlugin();
           }
-          await VBHandler.initialisePlugin();
-          await hmsActions.addPluginToVideoTrack(
-            VBHandler.getVBObject() as HMSVBPlugin,
-            Math.floor(role.publishParams.video.frameRate / 2),
-          );
+        } else {
+          await addHMSVBPlugin();
         }
 
         const handleDefaultBackground = async () => {
@@ -117,6 +121,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
     role,
     isPluginAdded,
     isEffectsEnabled,
+    isEffectsSupported,
     effectsKey,
     track?.id,
     background,
@@ -185,7 +190,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
                 await VBHandler?.setBlur(blurAmount);
                 hmsActions.setAppData(APP_DATA.background, HMSVirtualBackgroundTypes.BLUR);
               },
-              supported: isBlurSupported,
+              supported: isEffectsSupported && isEffectsEnabled,
             },
           ]}
           activeBackground={background}

package/src/Prebuilt/plugins/CaptionsViewer.tsx

@@ -144,7 +144,10 @@ class Queue {
 }
 
 class CaptionMaintainerQueue {
-  captionData: Queue = new Queue();
+  captionData: Queue;
+  constructor() {
+    this.captionData = new Queue();
+  }
   push(data: HMSTranscript[] = []) {
     data.forEach((value: HMSTranscript) => {
       this.captionData.enqueue(value);

package/dist/Prebuilt/components/VirtualBackground/util.d.ts

@@ -1 +0,0 @@
-export declare const doesBrowserSupportEffectsSDK: () => boolean;