@dxos/plugin-thread 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/src/components/Call/Call.tsx

@@ -1,93 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useAtomValue } from '@effect-atom/atom-react';
-import React, { type FC, type PropsWithChildren } from 'react';
-
-import { useCapability } from '@dxos/app-framework/ui';
-import { type ThemedClassName } from '@dxos/react-ui';
-
-import { useDebugMode } from '../../hooks';
-import { ThreadCapabilities } from '../../types';
-import { AudioStream } from '../Media';
-import { ParticipantGrid } from '../Participant';
-
-import { Toolbar, type ToolbarProps } from './Toolbar';
-
-//
-// Root
-//
-
-type CallRootProps = PropsWithChildren<ThemedClassName>;
-
-const CallRoot: FC<CallRootProps> = ({ children }) => {
-  return <div className='relative flex flex-col grow overflow-hidden'>{children}</div>;
-};
-
-CallRoot.displayName = 'CallRoot';
-
-//
-// Audio
-//
-
-type CallAudioProps = {};
-
-const CallAudio: FC<CallAudioProps> = () => {
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const audioTracksToPlay = useAtomValue(call.audioTracksToPlayAtom);
-
-  return <AudioStream tracks={audioTracksToPlay} />;
-};
-
-CallAudio.displayName = 'CallAudio';
-
-//
-// Room
-//
-
-type CallGridProps = {
-  fullscreen?: boolean;
-};
-
-const CallGrid: FC<CallGridProps> = ({ fullscreen }) => {
-  const debug = useDebugMode();
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const self = useAtomValue(call.selfAtom);
-  const users = useAtomValue(call.usersAtom);
-
-  return (
-    <div className='grid grow p-4 dark:bg-neutral-900'>
-      <ParticipantGrid self={self} users={users} debug={debug} fullscreen={fullscreen} />
-    </div>
-  );
-};
-
-CallGrid.displayName = 'CallGrid';
-
-//
-// Toolbar
-//
-
-type CallToolbarProps = Pick<ToolbarProps, 'channel' | 'onLeave'>;
-
-const CallToolbar: FC<CallToolbarProps> = (props) => {
-  return (
-    <div className='absolute bottom-0 left-0 right-0 flex justify-center'>
-      <Toolbar isInRoom {...props} />
-    </div>
-  );
-};
-
-CallToolbar.displayName = 'CallToolbar';
-
-//
-// Export
-//
-
-export const Call = {
-  Root: CallRoot,
-  Grid: CallGrid,
-  Audio: CallAudio,
-  Toolbar: CallToolbar,
-};

package/src/components/Call/Toolbar.tsx

@@ -1,189 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { useAtomValue } from '@effect-atom/atom-react';
-import React from 'react';
-
-import { useCapability } from '@dxos/app-framework/ui';
-import { useAppGraph } from '@dxos/app-toolkit/ui';
-import { Obj } from '@dxos/echo';
-import { Node, useActionRunner } from '@dxos/plugin-graph';
-import { useActions, useNode } from '@dxos/plugin-graph';
-import {
-  Icon,
-  IconButton,
-  type IconButtonProps,
-  Toolbar as NaturalToolbar,
-  type ThemedClassName,
-  toLocalizedString,
-  useTranslation,
-} from '@dxos/react-ui';
-import { groupHoverControlItemWithTransition, mx } from '@dxos/ui-theme';
-
-import { meta } from '../../meta';
-import { ThreadCapabilities } from '../../types';
-import { type Channel } from '../../types';
-
-export type ToolbarProps = ThemedClassName<{
-  channel?: Channel.Channel;
-  participants?: number;
-  autoHideControls?: boolean;
-  isInRoom?: boolean;
-  onJoin?: () => void;
-  onLeave?: () => void;
-}>;
-
-// TODO(wittjosiah): Use ToolbarMenu.
-export const Toolbar = ({
-  classNames,
-  channel,
-  participants,
-  autoHideControls = true,
-  onJoin,
-  onLeave,
-}: ToolbarProps) => {
-  const { t } = useTranslation(meta.id);
-  const { graph } = useAppGraph();
-  const runAction = useActionRunner();
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const media = useAtomValue(call.mediaAtom);
-  const joined = useAtomValue(call.joinedAtom);
-  const raisedHand = useAtomValue(call.raisedHandAtom);
-
-  // Channel app graph node.
-  const node = useNode(graph, channel && Obj.getDXN(channel).toString());
-  const actions = useActions(graph, node?.id).filter((action) => action.properties.disposition === 'toolbar');
-
-  // Screen sharing.
-  const isScreensharing = media.screenshareTrack !== undefined;
-  const canSharescreen =
-    typeof navigator.mediaDevices !== 'undefined' && navigator.mediaDevices.getDisplayMedia !== undefined;
-
-  // TODO(wittjosiah): In order to use toolbar, need to update to actually use the graph action callbacks directly.
-  return (
-    <div className={mx('z-20 flex justify-center m-8', autoHideControls && groupHoverControlItemWithTransition)}>
-      <NaturalToolbar.Root classNames={['p-2 bg-modal-surface rounded-md shadow-md', classNames]}>
-        <ToggleButton
-          active={media.audioEnabled}
-          state={{
-            on: {
-              icon: 'ph--microphone--regular',
-              label: t('mic off'),
-              onClick: () => call.turnAudioOff(),
-              classNames: 'bg-call-active',
-            },
-            off: {
-              icon: 'ph--microphone-slash--duotone',
-              label: t('mic on'),
-              onClick: () => call.turnAudioOn(),
-            },
-          }}
-        />
-        <ToggleButton
-          active={media.videoEnabled}
-          state={{
-            on: {
-              icon: 'ph--video-camera--regular',
-              label: t('camera off'),
-              onClick: () => call.turnVideoOff(),
-            },
-            off: {
-              icon: 'ph--video-camera-slash--duotone',
-              label: t('camera on'),
-              onClick: () => call.turnVideoOn(),
-            },
-          }}
-        />
-
-        {(participants !== undefined && (
-          <div className='flex justify-center items-center gap-2 w-[5rem] text-xs text-subdued'>
-            <Icon icon='ph--users--regular' size={4} />
-            <div>{participants}</div>
-          </div>
-        )) || <NaturalToolbar.Separator variant='gap' />}
-
-        {joined && (
-          <>
-            <ToggleButton
-              disabled={!canSharescreen}
-              active={isScreensharing}
-              state={{
-                on: {
-                  icon: 'ph--monitor--regular',
-                  label: t('screenshare off'),
-                  onClick: () => call.turnScreenshareOff(),
-                },
-                off: {
-                  icon: 'ph--monitor-arrow-up--duotone',
-                  label: t('screenshare on'),
-                  onClick: () => call.turnScreenshareOn(),
-                },
-              }}
-            />
-
-            {/* Companion actions. */}
-            {actions
-              .filter((action): action is Node.Action => Node.isAction(action))
-              .map((action) => (
-                <IconButton
-                  key={action.id}
-                  {...defaultButtonProps}
-                  icon={action.properties.icon}
-                  label={toLocalizedString(action.properties.label, t)}
-                  classNames={action.properties.classNames}
-                  onClick={() => node && void runAction(action, { parent: node })}
-                />
-              ))}
-
-            <ToggleButton
-              active={raisedHand}
-              state={{
-                on: {
-                  icon: 'ph--hand-waving--regular',
-                  label: t('lower hand'),
-                  onClick: () => call.setRaisedHand(false),
-                },
-                off: {
-                  icon: 'ph--hand-palm--duotone',
-                  label: t('raise hand'),
-                  onClick: () => call.setRaisedHand(true),
-                },
-              }}
-            />
-          </>
-        )}
-        {joined ? (
-          <IconButton variant='destructive' icon='ph--phone-x--regular' label={t('leave call')} onClick={onLeave} />
-        ) : (
-          <IconButton variant='primary' icon='ph--phone-incoming--regular' label={t('join call')} onClick={onJoin} />
-        )}
-      </NaturalToolbar.Root>
-    </div>
-  );
-};
-
-Toolbar.displayName = 'MeetingToolbar';
-
-type ToolbarButtonProps = Pick<IconButtonProps, 'disabled'> & {
-  active?: boolean;
-  state: {
-    on: Pick<IconButtonProps, 'icon' | 'label' | 'onClick' | 'classNames'>;
-    off: Pick<IconButtonProps, 'icon' | 'label' | 'onClick' | 'classNames'>;
-  };
-};
-
-const defaultButtonProps: Partial<IconButtonProps> = {
-  size: 5,
-  iconOnly: true,
-};
-
-const ToggleButton = ({ active, state }: ToolbarButtonProps) => (
-  <IconButton
-    {...defaultButtonProps}
-    classNames={[active ? (state.on.classNames ?? 'bg-call-active') : state.off.classNames]}
-    icon={active ? state.on.icon : state.off.icon}
-    label={active ? state.on.label : state.off.label}
-    onClick={active ? state.on.onClick : state.off.onClick}
-  />
-);

package/src/components/Call/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './Call';
-export * from './Toolbar';

package/src/components/Lobby/Lobby.tsx

@@ -1,121 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { useAtomValue } from '@effect-atom/atom-react';
-import React, { type FC, type PropsWithChildren, useEffect, useState } from 'react';
-
-import { useCapability } from '@dxos/app-framework/ui';
-import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/ui-theme';
-
-import { meta } from '../../meta';
-import { ThreadCapabilities } from '../../types';
-import { Toolbar, type ToolbarProps } from '../Call';
-import { VideoObject } from '../Media';
-import { ResponsiveContainer } from '../ResponsiveGrid';
-
-// TODO(wittjosiah): Repurpose lobby for preview.
-
-const SWARM_PEEK_INTERVAL = 1_000;
-
-//
-// Root
-//
-
-type LobbyRootProps = PropsWithChildren<ThemedClassName>;
-
-const LobbyRoot: FC<LobbyRootProps> = ({ children }) => {
-  return <div className='relative flex flex-col grow overflow-hidden group'>{children}</div>;
-};
-
-LobbyRoot.displayName = 'LobbyRoot';
-
-//
-// Preview
-//
-
-type LobbyPreviewProps = {};
-
-const LobbyPreview: FC<LobbyPreviewProps> = () => {
-  const { t } = useTranslation(meta.id);
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const media = useAtomValue(call.mediaAtom);
-  const [classNames, setClassNames] = useState('');
-  useEffect(() => {
-    if (!media.videoEnabled) {
-      setClassNames('');
-      return;
-    }
-
-    // Video element will expand once the stream is available.
-    const timeout = setTimeout(() => {
-      setClassNames('outline-neutral-900 opacity-100');
-    }, 500);
-
-    return () => clearTimeout(timeout);
-  }, [media.videoEnabled]);
-
-  return (
-    <div className='grid grow p-4'>
-      <ResponsiveContainer>
-        {(media.videoEnabled && (
-          <VideoObject
-            videoStream={media.videoStream}
-            flip
-            muted
-            classNames={mx(
-              'rounded-md outline outline-2 outline-transparent opacity-0 transition-all duration-500',
-              classNames,
-            )}
-          />
-        )) || <div className='p-4 outline outline-separator rounded-md'>{t('camera off label')}</div>}
-      </ResponsiveContainer>
-    </div>
-  );
-};
-
-LobbyPreview.displayName = 'LobbyPreview';
-
-//
-// Toolbar
-//
-
-type LobbyToolbarProps = ThemedClassName<
-  {
-    roomId: string;
-  } & Pick<ToolbarProps, 'onJoin'>
->;
-
-const LobbyToolbar: FC<LobbyToolbarProps> = ({ roomId, ...props }) => {
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const [count, setCount] = useState<number>(0);
-
-  // TODO(wittjosiah): Leaving the room doesn't remove you from the swarm.
-  useEffect(() => {
-    void call.peek(roomId).then((count) => setCount(count));
-    const interval = setInterval(() => {
-      void call.peek(roomId).then((count) => setCount(count));
-    }, SWARM_PEEK_INTERVAL);
-
-    return () => clearInterval(interval);
-  }, [call, roomId]);
-
-  return (
-    <div className='absolute bottom-0 left-0 right-0 flex justify-center'>
-      <Toolbar participants={count} isInRoom={false} {...props} />
-    </div>
-  );
-};
-
-LobbyToolbar.displayName = 'LobbyToolbar';
-
-//
-// Export
-//
-
-export const Lobby = {
-  Root: LobbyRoot,
-  Preview: LobbyPreview,
-  Toolbar: LobbyToolbar,
-};

package/src/components/Lobby/index.ts

@@ -1,5 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './Lobby';

package/src/components/Media/AudioStream.tsx

@@ -1,67 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React, { type FC, useEffect, useRef } from 'react';
-
-export type AudioStreamProps = {
-  tracks: MediaStreamTrack[];
-};
-
-export const AudioStream: FC<AudioStreamProps> = ({ tracks }) => {
-  const mediaStreamRef = useRef(new MediaStream());
-  const ref = useRef<HTMLAudioElement>(null);
-
-  useEffect(() => {
-    const audio = ref.current;
-    if (!audio) {
-      return;
-    }
-
-    const mediaStream = mediaStreamRef.current;
-    audio.srcObject = mediaStream;
-  }, []);
-
-  const resetSrcObject = () => {
-    const audio = ref.current;
-    const mediaStream = mediaStreamRef.current;
-    if (!audio || !mediaStream) {
-      return;
-    }
-
-    // Need to set srcObject again in Chrome and call play() again for Safari
-    // https://www.youtube.com/live/Tkx3OGrwVk8?si=K--P_AzNnAGrjraV&t=2533
-    // Calling play() this way to make Chrome happy otherwise it throws an error.
-    audio.addEventListener('canplay', () => audio.play(), { once: true });
-    audio.srcObject = mediaStream;
-  };
-
-  return (
-    <>
-      <audio ref={ref} autoPlay />
-      {tracks.map((track) => (
-        <AudioTrack key={track.id} track={track} mediaStream={mediaStreamRef.current} resetSrcObject={resetSrcObject} />
-      ))}
-    </>
-  );
-};
-
-type AudioTrackParams = {
-  track: MediaStreamTrack;
-  mediaStream: MediaStream;
-  resetSrcObject: () => void;
-};
-
-const AudioTrack = ({ track, mediaStream, resetSrcObject }: AudioTrackParams) => {
-  useEffect(() => {
-    const currentTrack = track;
-    mediaStream.addTrack(currentTrack);
-    resetSrcObject();
-    return () => {
-      mediaStream.removeTrack(currentTrack);
-      resetSrcObject();
-    };
-  }, [track, mediaStream]);
-
-  return null;
-};

package/src/components/Media/VideoObject.stories.tsx

@@ -1,60 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type StoryObj } from '@storybook/react-vite';
-import React, { useEffect, useState } from 'react';
-
-import { scheduleTask } from '@dxos/async';
-import { Context } from '@dxos/context';
-import { log } from '@dxos/log';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
-
-import { getUserMediaTrack } from '../../calls';
-import { ResponsiveContainer } from '../ResponsiveGrid';
-
-import { VideoObject, type VideoObjectProps } from './VideoObject';
-
-const DefaultStory = (props: VideoObjectProps) => {
-  log.info('render');
-  const [videoStream, setVideoStream] = useState<MediaStream>();
-  useEffect(() => {
-    const ctx = new Context();
-    scheduleTask(ctx, async () => {
-      try {
-        const stream = new MediaStream();
-        stream.addTrack(await getUserMediaTrack('videoinput'));
-        setVideoStream(stream);
-      } catch (err) {
-        log.catch(err);
-      }
-    });
-
-    return () => {
-      void ctx.dispose();
-      videoStream?.getTracks().forEach((track) => track.stop());
-    };
-  }, []);
-
-  return (
-    <ResponsiveContainer>
-      <VideoObject videoStream={videoStream} flip {...props} />
-    </ResponsiveContainer>
-  );
-};
-
-const meta = {
-  title: 'plugins/plugin-thread/components/VideoObject',
-  component: VideoObject,
-  render: DefaultStory,
-  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
-  parameters: {
-    layout: 'fullscreen',
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof VideoObject>;
-
-export const SelfView: Story = {};

package/src/components/Media/VideoObject.tsx

@@ -1,58 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React, { type JSX, forwardRef, memo, useEffect, useRef } from 'react';
-
-import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/ui-theme';
-
-export type VideoObjectProps = Omit<JSX.IntrinsicElements['video'], 'className' | 'ref'> &
-  ThemedClassName<{
-    videoStream?: MediaStream;
-    flip?: boolean;
-    // TODO(burdon): If screenshare then contain.
-    contain?: boolean;
-  }>;
-
-export const VideoObject = memo(
-  forwardRef<HTMLVideoElement, VideoObjectProps>(({ videoStream, classNames, flip, contain, ...rest }, ref) => {
-    const internalRef = useRef<HTMLVideoElement | null>(null);
-
-    useEffect(() => {
-      const video = internalRef.current;
-      if (video && videoStream) {
-        video.srcObject = videoStream;
-        video.setAttribute('autoplay', 'true');
-        video.setAttribute('playsinline', 'true');
-      }
-    }, [videoStream, internalRef.current]);
-
-    // NOTE: The video element typically has a max size of 1280x720.
-    return (
-      <video
-        className={mx(
-          'w-full aspect-video',
-          flip && 'scale-x-[-1]',
-          contain ? 'object-contain' : 'object-cover',
-          classNames,
-        )}
-        ref={(v) => {
-          internalRef.current = v;
-          if (ref === null) {
-            return;
-          }
-
-          if (typeof ref === 'function') {
-            ref(v);
-          } else {
-            ref.current = v;
-          }
-        }}
-        {...rest}
-      />
-    );
-  }),
-);
-
-VideoObject.displayName = 'VideoObject';

package/src/components/Media/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export * from './AudioStream';
-export * from './VideoObject';

package/src/components/Participant/Participant.tsx

@@ -1,76 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { useAtomValue } from '@effect-atom/atom-react';
-import React, { memo, useMemo } from 'react';
-
-import { useCapability } from '@dxos/app-framework/ui';
-
-import { type EncodedTrackName, type UserState } from '../../calls';
-import { ThreadCapabilities } from '../../types';
-import { VideoObject } from '../Media';
-import { ResponsiveGridItem, type ResponsiveGridItemProps } from '../ResponsiveGrid';
-
-export const SCREENSHARE_SUFFIX = '_screenshare';
-
-export const Participant = memo(({ item: user, debug, ...props }: ResponsiveGridItemProps<UserState>) => {
-  const call = useCapability(ThreadCapabilities.CallManager);
-  const self = useAtomValue(call.selfAtom);
-  const media = useAtomValue(call.mediaAtom);
-  const isSelf: boolean = self.id !== undefined && user.id !== undefined && user.id.startsWith(self.id);
-  const isScreenshare = user.id?.endsWith(SCREENSHARE_SUFFIX);
-
-  // Get pulled video stream for non-self users.
-  const pulledVideoStream = useMemo<MediaStream | undefined>(() => {
-    if (isSelf) {
-      return undefined;
-    }
-    const trackName =
-      isScreenshare && user.tracks?.screenshareEnabled
-        ? (user.tracks?.screenshare as EncodedTrackName)
-        : !isScreenshare && user.tracks?.videoEnabled
-          ? (user.tracks?.video as EncodedTrackName)
-          : undefined;
-    return trackName ? media.pulledVideoStreams[trackName]?.stream : undefined;
-  }, [
-    isSelf,
-    isScreenshare,
-    media.pulledVideoStreams,
-    user.tracks?.screenshare,
-    user.tracks?.video,
-    user.tracks?.screenshareEnabled,
-    user.tracks?.videoEnabled,
-  ]);
-
-  const videoStream = useMemo<MediaStream | undefined>(() => {
-    if (isSelf) {
-      return isScreenshare ? media.screenshareVideoStream : media.videoStream;
-    }
-    return pulledVideoStream;
-  }, [isSelf, isScreenshare, media.videoStream, media.screenshareVideoStream, pulledVideoStream]);
-
-  return (
-    <ResponsiveGridItem
-      {...props}
-      item={user}
-      name={user.name}
-      self={isSelf}
-      screenshare={!!media.screenshareVideoStream}
-      video={media.videoEnabled}
-      mute={user ? !user.tracks?.audioEnabled : false}
-      wave={user.raisedHand}
-      speaking={user.speaking}
-      debug={debug}
-    >
-      <VideoObject
-        videoStream={videoStream}
-        flip={isSelf && !isScreenshare}
-        contain={!!isScreenshare}
-        classNames='rounded-md'
-      />
-    </ResponsiveGridItem>
-  );
-});
-
-Participant.displayName = 'Participant';