@runwayml/avatars-react 0.4.0 → 0.6.0

package/dist/index.cjs

@@ -27,44 +27,15 @@ async function consumeSession(options) {
   }
   return response.json();
 }
-
-// src/utils/suspense-resource.ts
-function createSuspenseResource(promise) {
-  let status = "pending";
-  let result;
-  let error;
-  const suspender = promise.then(
-    (value) => {
-      status = "fulfilled";
-      result = value;
-    },
-    (err) => {
-      status = "rejected";
-      error = err;
-    }
-  );
-  return {
-    read() {
-      switch (status) {
-        case "pending":
-          throw suspender;
-        case "rejected":
-          throw error;
-        case "fulfilled":
-          return result;
-      }
-    }
-  };
+function useLatest(value) {
+  const ref = react.useRef(value);
+  react.useEffect(() => {
+    ref.current = value;
+  }, [value]);
+  return ref;
 }
 
 // src/hooks/useCredentials.ts
-var resourceCache = /* @__PURE__ */ new Map();
-function computeKey(options) {
-  if (options.credentials) return `direct:${options.credentials.sessionId}`;
-  if (options.sessionId && options.sessionKey)
-    return `session:${options.sessionId}`;
-  return `connect:${options.avatarId}:${options.connectUrl ?? "custom"}`;
-}
 async function fetchCredentials(options) {
   const { avatarId, sessionId, sessionKey, connectUrl, connect, baseUrl } = options;
   if (sessionId && sessionKey) {
@@ -95,28 +66,106 @@ async function fetchCredentials(options) {
   );
 }
 function useCredentials(options) {
-  const key = computeKey(options);
+  const {
+    credentials: directCredentials,
+    avatarId,
+    sessionId,
+    sessionKey,
+    connectUrl,
+    connect,
+    baseUrl,
+    onError
+  } = options;
+  const onErrorRef = useLatest(onError);
+  const [state, setState] = react.useState(() => {
+    if (directCredentials) {
+      return { status: "ready", credentials: directCredentials, error: null };
+    }
+    return { status: "loading", credentials: null, error: null };
+  });
   react.useEffect(() => {
+    if (directCredentials) {
+      setState({
+        status: "ready",
+        credentials: directCredentials,
+        error: null
+      });
+      return;
+    }
+    let cancelled = false;
+    setState({ status: "loading", credentials: null, error: null });
+    async function load() {
+      try {
+        const fetchOptions = {
+          avatarId,
+          sessionId,
+          sessionKey,
+          connectUrl,
+          connect,
+          baseUrl
+        };
+        const credentials = await fetchCredentials(fetchOptions);
+        if (!cancelled) {
+          setState({ status: "ready", credentials, error: null });
+        }
+      } catch (err) {
+        if (!cancelled) {
+          const error = err instanceof Error ? err : new Error(String(err));
+          setState({ status: "error", credentials: null, error });
+          onErrorRef.current?.(error);
+        }
+      }
+    }
+    load();
     return () => {
-      resourceCache.delete(key);
+      cancelled = true;
     };
-  }, [key]);
-  if (options.credentials) {
-    return options.credentials;
-  }
-  let resource = resourceCache.get(key);
-  if (!resource) {
-    resource = createSuspenseResource(fetchCredentials(options));
-    resourceCache.set(key, resource);
+  }, [
+    directCredentials,
+    avatarId,
+    sessionId,
+    sessionKey,
+    connectUrl,
+    connect,
+    baseUrl
+  ]);
+  return state;
+}
+async function hasMediaDevice(kind) {
+  try {
+    const devices = await navigator.mediaDevices.enumerateDevices();
+    return devices.some((device) => device.kind === kind);
+  } catch {
+    return false;
   }
-  return resource.read();
 }
-function useLatest(value) {
-  const ref = react.useRef(value);
+function useDeviceAvailability(requestAudio, requestVideo) {
+  const [state, setState] = react.useState({
+    audio: false,
+    video: false,
+    isChecking: true
+  });
   react.useEffect(() => {
-    ref.current = value;
-  }, [value]);
-  return ref;
+    let cancelled = false;
+    async function checkDevices() {
+      const [hasAudio, hasVideo] = await Promise.all([
+        requestAudio ? hasMediaDevice("audioinput") : Promise.resolve(false),
+        requestVideo ? hasMediaDevice("videoinput") : Promise.resolve(false)
+      ]);
+      if (!cancelled) {
+        setState({
+          audio: requestAudio && hasAudio,
+          video: requestVideo && hasVideo,
+          isChecking: false
+        });
+      }
+    }
+    checkDevices();
+    return () => {
+      cancelled = true;
+    };
+  }, [requestAudio, requestVideo]);
+  return state;
 }
 var DEFAULT_ROOM_OPTIONS = {
   adaptiveStream: false,
@@ -142,13 +191,14 @@ var AvatarSessionContext = react.createContext(
 function AvatarSession({
   credentials,
   children,
-  audio = true,
-  video = true,
+  audio: requestAudio = true,
+  video: requestVideo = true,
   onEnd,
   onError,
   __unstable_roomOptions
 }) {
   const errorRef = react.useRef(null);
+  const deviceAvailability = useDeviceAvailability(requestAudio, requestVideo);
   const handleError = (error) => {
     errorRef.current = error;
     onError?.(error);
@@ -157,14 +207,29 @@ function AvatarSession({
     ...DEFAULT_ROOM_OPTIONS,
     ...__unstable_roomOptions
   };
+  if (deviceAvailability.isChecking) {
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      AvatarSessionContext.Provider,
+      {
+        value: {
+          state: "connecting",
+          sessionId: credentials.sessionId,
+          error: null,
+          end: async () => {
+          }
+        },
+        children
+      }
+    );
+  }
   return /* @__PURE__ */ jsxRuntime.jsxs(
     componentsReact.LiveKitRoom,
     {
       serverUrl: credentials.serverUrl,
       token: credentials.token,
       connect: true,
-      audio,
-      video,
+      audio: deviceAvailability.audio,
+      video: deviceAvailability.video,
       onDisconnected: () => onEnd?.(),
       onError: handleError,
       options: roomOptions,
@@ -223,14 +288,34 @@ function useAvatarSessionContext() {
   }
   return context;
 }
+function LoadingSessionProvider({
+  state,
+  error,
+  children
+}) {
+  const contextValue = {
+    state,
+    sessionId: "",
+    error,
+    end: async () => {
+    }
+  };
+  return /* @__PURE__ */ jsxRuntime.jsx(AvatarSessionContext.Provider, { value: contextValue, children });
+}
 function useAvatar() {
-  const remoteParticipants = componentsReact.useRemoteParticipants();
+  const room = componentsReact.useMaybeRoomContext();
+  const hasRoomContext = room !== void 0;
+  const remoteParticipants = componentsReact.useRemoteParticipants({ room });
   const avatarParticipant = remoteParticipants[0] ?? null;
   const videoTracks = componentsReact.useTracks(
     [{ source: livekitClient.Track.Source.Camera, withPlaceholder: true }],
-    { onlySubscribed: true, updateOnlyOn: [] }
+    {
+      onlySubscribed: true,
+      updateOnlyOn: [],
+      room: hasRoomContext ? room : void 0
+    }
   ).filter((ref) => !ref.participant.isLocal);
-  const videoTrackRef = videoTracks[0] ?? null;
+  const videoTrackRef = hasRoomContext ? videoTracks[0] ?? null : null;
   const hasVideo = videoTrackRef !== null && componentsReact.isTrackReference(videoTrackRef);
   return {
     participant: avatarParticipant,
@@ -272,40 +357,57 @@ function AvatarVideo({ children, ...props }) {
   if (children) {
     return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: children(videoStatus) });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { ...props, "data-avatar-video": "", "data-status": videoStatus.status, children: videoStatus.status === "ready" && componentsReact.isTrackReference(videoStatus.videoTrackRef) && /* @__PURE__ */ jsxRuntime.jsx(componentsReact.VideoTrack, { trackRef: videoStatus.videoTrackRef }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "div",
+    {
+      ...props,
+      "data-avatar-video": "",
+      "data-avatar-status": videoStatus.status,
+      children: videoStatus.status === "ready" && componentsReact.isTrackReference(videoStatus.videoTrackRef) && /* @__PURE__ */ jsxRuntime.jsx(componentsReact.VideoTrack, { trackRef: videoStatus.videoTrackRef })
+    }
+  );
 }
 function useLocalMedia() {
-  const { localParticipant } = componentsReact.useLocalParticipant();
+  const room = componentsReact.useMaybeRoomContext();
+  const hasRoomContext = room !== void 0;
+  const { localParticipant } = componentsReact.useLocalParticipant({ room });
   const audioDevices = componentsReact.useMediaDevices({ kind: "audioinput" });
   const videoDevices = componentsReact.useMediaDevices({ kind: "videoinput" });
-  const hasMic = audioDevices.length > 0;
-  const hasCamera = videoDevices.length > 0;
+  const hasMic = audioDevices?.length > 0;
+  const hasCamera = videoDevices?.length > 0;
   const isMicEnabled = localParticipant?.isMicrophoneEnabled ?? false;
   const isCameraEnabled = localParticipant?.isCameraEnabled ?? false;
   const isScreenShareEnabled = localParticipant?.isScreenShareEnabled ?? false;
   const isMicEnabledRef = useLatest(isMicEnabled);
   const isCameraEnabledRef = useLatest(isCameraEnabled);
   const isScreenShareEnabledRef = useLatest(isScreenShareEnabled);
+  const hasMicRef = useLatest(hasMic);
+  const hasCameraRef = useLatest(hasCamera);
   const toggleMic = react.useCallback(() => {
-    localParticipant?.setMicrophoneEnabled(!isMicEnabledRef.current);
-  }, [localParticipant, isMicEnabledRef]);
+    if (hasMicRef.current || isMicEnabledRef.current) {
+      localParticipant?.setMicrophoneEnabled(!isMicEnabledRef.current);
+    }
+  }, [localParticipant]);
   const toggleCamera = react.useCallback(() => {
-    localParticipant?.setCameraEnabled(!isCameraEnabledRef.current);
-  }, [localParticipant, isCameraEnabledRef]);
+    if (hasCameraRef.current || isCameraEnabledRef.current) {
+      localParticipant?.setCameraEnabled(!isCameraEnabledRef.current);
+    }
+  }, [localParticipant]);
   const toggleScreenShare = react.useCallback(() => {
     localParticipant?.setScreenShareEnabled(!isScreenShareEnabledRef.current);
-  }, [localParticipant, isScreenShareEnabledRef]);
+  }, [localParticipant]);
   const tracks = componentsReact.useTracks(
     [{ source: livekitClient.Track.Source.Camera, withPlaceholder: true }],
     {
       onlySubscribed: false,
-      updateOnlyOn: []
+      updateOnlyOn: [],
+      room: hasRoomContext ? room : void 0
     }
   );
   const localIdentity = localParticipant?.identity;
-  const localVideoTrackRef = tracks.find(
+  const localVideoTrackRef = hasRoomContext ? tracks.find(
     (trackRef) => trackRef.participant.identity === localIdentity && trackRef.source === livekitClient.Track.Source.Camera
-  ) ?? null;
+  ) ?? null : null;
   return {
     hasMic,
     hasCamera,
@@ -327,13 +429,22 @@ function ControlBar({
   ...props
 }) {
   const session = useAvatarSession();
-  const { isMicEnabled, isCameraEnabled, toggleMic, toggleCamera } = useLocalMedia();
+  const {
+    isMicEnabled,
+    isCameraEnabled,
+    isScreenShareEnabled,
+    toggleMic,
+    toggleCamera,
+    toggleScreenShare
+  } = useLocalMedia();
   const isActive = session.state === "active";
   const state = {
     isMicEnabled,
     isCameraEnabled,
+    isScreenShareEnabled,
     toggleMic,
     toggleCamera,
+    toggleScreenShare,
     endCall: session.end,
     isActive
   };
@@ -343,14 +454,14 @@ function ControlBar({
   if (!isActive) {
     return null;
   }
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { ...props, "data-active": isActive, children: [
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { ...props, "data-avatar-control-bar": "", "data-avatar-active": isActive, children: [
     showMicrophone && /* @__PURE__ */ jsxRuntime.jsx(
       "button",
       {
         type: "button",
         onClick: toggleMic,
-        "data-control": "microphone",
-        "data-enabled": isMicEnabled,
+        "data-avatar-control": "microphone",
+        "data-avatar-enabled": isMicEnabled,
         "aria-label": isMicEnabled ? "Mute microphone" : "Unmute microphone",
         children: microphoneIcon
       }
@@ -360,8 +471,8 @@ function ControlBar({
       {
         type: "button",
         onClick: toggleCamera,
-        "data-control": "camera",
-        "data-enabled": isCameraEnabled,
+        "data-avatar-control": "camera",
+        "data-avatar-enabled": isCameraEnabled,
         "aria-label": isCameraEnabled ? "Turn off camera" : "Turn on camera",
         children: cameraIcon
       }
@@ -371,7 +482,8 @@ function ControlBar({
       {
         source: livekitClient.Track.Source.ScreenShare,
         showIcon: false,
-        "data-control": "screen-share",
+        "data-avatar-control": "screen-share",
+        "data-avatar-enabled": isScreenShareEnabled,
         "aria-label": "Toggle screen share",
         children: screenShareIcon
       }
@@ -381,7 +493,8 @@ function ControlBar({
       {
         type: "button",
         onClick: session.end,
-        "data-control": "end-call",
+        "data-avatar-control": "end-call",
+        "data-avatar-enabled": true,
         "aria-label": "End call",
         children: phoneIcon
       }
@@ -455,7 +568,11 @@ var phoneIcon = /* @__PURE__ */ jsxRuntime.jsx(
     children: /* @__PURE__ */ jsxRuntime.jsx("path", { d: "M12.8429 22.5693L11.4018 21.0986C11.2675 20.9626 11.1625 20.7995 11.0935 20.6197C11.0245 20.4399 10.9931 20.2474 11.0013 20.0545C11.0094 19.8616 11.0569 19.6726 11.1408 19.4995C11.2247 19.3265 11.343 19.1732 11.4883 19.0495C13.127 17.7049 15.0519 16.7714 17.1083 16.3239C19.0064 15.892 20.9744 15.892 22.8725 16.3239C24.9374 16.7743 26.8693 17.7147 28.5117 19.0691C28.6565 19.1924 28.7746 19.3451 28.8585 19.5176C28.9423 19.69 28.99 19.8784 28.9986 20.0707C29.0072 20.263 28.9764 20.455 28.9083 20.6345C28.8402 20.814 28.7362 20.9771 28.603 21.1133L27.1619 22.584C26.9311 22.8242 26.6226 22.9706 26.2938 22.9959C25.9651 23.0211 25.6385 22.9235 25.3751 22.7212C24.8531 22.3127 24.2875 21.9657 23.689 21.6869C23.4525 21.5774 23.2517 21.4009 23.1103 21.1785C22.969 20.9561 22.8931 20.697 22.8917 20.4319V19.1867C21.0053 18.6573 19.0139 18.6573 17.1275 19.1867V20.4319C17.1261 20.697 17.0502 20.9561 16.9089 21.1785C16.7676 21.4009 16.5667 21.5774 16.3302 21.6869C15.7317 21.9657 15.1661 22.3127 14.6442 22.7212C14.3779 22.9258 14.0473 23.0233 13.7152 22.9953C13.383 22.9673 13.0726 22.8156 12.8429 22.5693Z" })
   }
 );
-function UserVideo({ children, mirror = true, ...props }) {
+function UserVideo({
+  children,
+  mirror = true,
+  ...props
+}) {
   const { localVideoTrackRef, isCameraEnabled } = useLocalMedia();
   const hasVideo = localVideoTrackRef !== null && componentsReact.isTrackReference(localVideoTrackRef);
   const state = {
@@ -470,9 +587,10 @@ function UserVideo({ children, mirror = true, ...props }) {
     "div",
     {
       ...props,
-      "data-has-video": hasVideo,
-      "data-camera-enabled": isCameraEnabled,
-      "data-mirror": mirror,
+      "data-avatar-user-video": "",
+      "data-avatar-has-video": hasVideo,
+      "data-avatar-camera-enabled": isCameraEnabled,
+      "data-avatar-mirror": mirror,
       children: hasVideo && localVideoTrackRef && componentsReact.isTrackReference(localVideoTrackRef) && /* @__PURE__ */ jsxRuntime.jsx(componentsReact.VideoTrack, { trackRef: localVideoTrackRef })
     }
   );
@@ -493,19 +611,44 @@ function AvatarCall({
   ...props
 }) {
   const onErrorRef = useLatest(onError);
-  const credentials = useCredentials({
+  const credentialsState = useCredentials({
     avatarId,
     sessionId,
     sessionKey,
     credentials: directCredentials,
     connectUrl,
     connect,
-    baseUrl
+    baseUrl,
+    onError: (err) => onErrorRef.current?.(err)
   });
   const handleSessionError = (err) => {
     onErrorRef.current?.(err);
   };
   const backgroundStyle = avatarImageUrl ? { "--avatar-image": `url(${avatarImageUrl})` } : void 0;
+  const defaultChildren = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(AvatarVideo, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(UserVideo, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(ControlBar, {})
+  ] });
+  if (credentialsState.status !== "ready") {
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      "div",
+      {
+        ...props,
+        "data-avatar-call": "",
+        "data-avatar-id": avatarId,
+        style: { ...props.style, ...backgroundStyle },
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          LoadingSessionProvider,
+          {
+            state: credentialsState.status === "error" ? "error" : "connecting",
+            error: credentialsState.error,
+            children: children ?? defaultChildren
+          }
+        )
+      }
+    );
+  }
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
@@ -516,30 +659,31 @@ function AvatarCall({
       children: /* @__PURE__ */ jsxRuntime.jsx(
         AvatarSession,
         {
-          credentials,
+          credentials: credentialsState.credentials,
           onEnd,
           onError: handleSessionError,
           __unstable_roomOptions,
-          children: children ?? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(AvatarVideo, {}),
-            /* @__PURE__ */ jsxRuntime.jsx(UserVideo, {}),
-            /* @__PURE__ */ jsxRuntime.jsx(ControlBar, {})
-          ] })
+          children: children ?? defaultChildren
         }
       )
     }
   );
 }
-function ScreenShareVideo({ children, ...props }) {
-  const { localParticipant } = componentsReact.useLocalParticipant();
+function ScreenShareVideo({
+  children,
+  ...props
+}) {
+  const room = componentsReact.useMaybeRoomContext();
+  const hasRoomContext = room !== void 0;
+  const { localParticipant } = componentsReact.useLocalParticipant({ room });
   const tracks = componentsReact.useTracks(
     [{ source: livekitClient.Track.Source.ScreenShare, withPlaceholder: false }],
-    { onlySubscribed: false }
+    { onlySubscribed: false, room: hasRoomContext ? room : void 0 }
   );
   const localIdentity = localParticipant?.identity;
-  const screenShareTrackRef = tracks.find(
+  const screenShareTrackRef = hasRoomContext ? tracks.find(
     (trackRef) => trackRef.participant.identity === localIdentity && trackRef.source === livekitClient.Track.Source.ScreenShare
-  ) ?? null;
+  ) ?? null : null;
   const isSharing = screenShareTrackRef !== null && componentsReact.isTrackReference(screenShareTrackRef);
   const state = {
     isSharing,
@@ -551,7 +695,7 @@ function ScreenShareVideo({ children, ...props }) {
   if (!isSharing) {
     return null;
   }
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { ...props, "data-sharing": isSharing, children: screenShareTrackRef && componentsReact.isTrackReference(screenShareTrackRef) && /* @__PURE__ */ jsxRuntime.jsx(componentsReact.VideoTrack, { trackRef: screenShareTrackRef }) });
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { ...props, "data-avatar-screen-share": "", "data-avatar-sharing": isSharing, children: screenShareTrackRef && componentsReact.isTrackReference(screenShareTrackRef) && /* @__PURE__ */ jsxRuntime.jsx(componentsReact.VideoTrack, { trackRef: screenShareTrackRef }) });
 }
 
 Object.defineProperty(exports, "AudioRenderer", {