(fix): remove unused dependencies
(fix): remove dead code (fix): remove unused exports
This commit is contained in:
parent
2a8fade420
commit
be56080ba1
29 changed files with 168 additions and 338 deletions
|
|
@ -16,15 +16,11 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@livekit/components-react": "^2.9.20",
|
||||
"@tanstack/react-query": "^5.100.7",
|
||||
"@tanstack/react-router": "^1.169.1",
|
||||
"@tanstack/react-virtual": "^3.13.24",
|
||||
"@tauri-apps/api": "^2",
|
||||
"@tensamin/crypto": "workspace:*",
|
||||
"@tensamin/markdown": "workspace:*",
|
||||
"@tensamin/shared": "workspace:*",
|
||||
"@tensamin/storage": "workspace:*",
|
||||
"@tensamin/tauri": "workspace:*",
|
||||
"@tensamin/ttp": "workspace:*",
|
||||
"@tensamin/ui": "*",
|
||||
"@tensamin/user": "workspace:*",
|
||||
|
|
@ -34,7 +30,6 @@
|
|||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"recharts": "^3.8.1",
|
||||
"sonner": "^2.0.7",
|
||||
"zod": "^4.3.6",
|
||||
"zustand": "^5.0.8"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
import { Button, Tooltip, TooltipContent, TooltipTrigger } from "@tensamin/ui";
|
||||
import { Button } from "@tensamin/ui";
|
||||
import { toggleDeaf, useCall } from "../../store";
|
||||
import { HeadphoneOff, Headphones } from "lucide-react";
|
||||
import { type CallButtonProps, iconScale, withTooltip } from "./tooltipButton";
|
||||
|
||||
export default function DeafButton({
|
||||
className,
|
||||
iconSize,
|
||||
tooltip,
|
||||
portalContainer,
|
||||
}: {
|
||||
className?: string;
|
||||
iconSize?: number;
|
||||
tooltip?: string;
|
||||
portalContainer?: HTMLElement;
|
||||
}) {
|
||||
}: CallButtonProps) {
|
||||
const deaf = useCall((state) => state.deaf);
|
||||
|
||||
const button = (
|
||||
|
|
@ -22,27 +18,12 @@ export default function DeafButton({
|
|||
className={className}
|
||||
>
|
||||
{deaf ? (
|
||||
<HeadphoneOff
|
||||
style={{ scale: (iconSize ? iconSize + 100 : 100) + "%" }}
|
||||
/>
|
||||
<HeadphoneOff style={iconScale(iconSize)} />
|
||||
) : (
|
||||
<Headphones
|
||||
style={{ scale: (iconSize ? iconSize + 100 : 100) + "%" }}
|
||||
/>
|
||||
<Headphones style={iconScale(iconSize)} />
|
||||
)}
|
||||
</Button>
|
||||
);
|
||||
|
||||
if (!tooltip) {
|
||||
return button;
|
||||
}
|
||||
|
||||
return (
|
||||
<Tooltip>
|
||||
<TooltipTrigger render={button} />
|
||||
<TooltipContent portalProps={{ container: portalContainer }}>
|
||||
{tooltip}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
);
|
||||
return withTooltip(button, tooltip, portalContainer);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
import { LeaveIcon } from "@livekit/components-react";
|
||||
import { Button, Tooltip, TooltipContent, TooltipTrigger } from "@tensamin/ui";
|
||||
import { Button } from "@tensamin/ui";
|
||||
import { disconnect, useCall } from "../../store";
|
||||
import { type CallButtonProps, iconScale, withTooltip } from "./tooltipButton";
|
||||
|
||||
export default function LeaveButton({
|
||||
className,
|
||||
iconSize,
|
||||
tooltip,
|
||||
portalContainer,
|
||||
}: {
|
||||
className?: string;
|
||||
iconSize?: number;
|
||||
tooltip?: string;
|
||||
portalContainer?: HTMLElement;
|
||||
}) {
|
||||
}: CallButtonProps) {
|
||||
const state = useCall((store) => store.state);
|
||||
|
||||
const button = (
|
||||
|
|
@ -22,20 +18,9 @@ export default function LeaveButton({
|
|||
disabled={state === "closing" || state === "closed"}
|
||||
variant="destructive"
|
||||
>
|
||||
<LeaveIcon style={{ scale: (iconSize ? iconSize + 100 : 100) + "%" }} />
|
||||
<LeaveIcon style={iconScale(iconSize)} />
|
||||
</Button>
|
||||
);
|
||||
|
||||
if (!tooltip) {
|
||||
return button;
|
||||
}
|
||||
|
||||
return (
|
||||
<Tooltip>
|
||||
<TooltipTrigger render={button} />
|
||||
<TooltipContent portalProps={{ container: portalContainer }}>
|
||||
{tooltip}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
);
|
||||
return withTooltip(button, tooltip, portalContainer);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
import { Button, Tooltip, TooltipContent, TooltipTrigger } from "@tensamin/ui";
|
||||
import { Button } from "@tensamin/ui";
|
||||
import { toggleMute, useCall } from "../../store";
|
||||
import { Mic, MicOff } from "lucide-react";
|
||||
import { type CallButtonProps, iconScale, withTooltip } from "./tooltipButton";
|
||||
|
||||
export default function MuteButton({
|
||||
className,
|
||||
iconSize,
|
||||
tooltip,
|
||||
portalContainer,
|
||||
}: {
|
||||
className?: string;
|
||||
iconSize?: number;
|
||||
tooltip?: string;
|
||||
portalContainer?: HTMLElement;
|
||||
}) {
|
||||
}: CallButtonProps) {
|
||||
const micEnabled = useCall((state) => state.micEnabled);
|
||||
|
||||
const button = (
|
||||
|
|
@ -22,23 +18,12 @@ export default function MuteButton({
|
|||
onClick={() => void toggleMute()}
|
||||
>
|
||||
{micEnabled ? (
|
||||
<Mic style={{ scale: (iconSize ? iconSize + 100 : 100) + "%" }} />
|
||||
<Mic style={iconScale(iconSize)} />
|
||||
) : (
|
||||
<MicOff style={{ scale: (iconSize ? iconSize + 100 : 100) + "%" }} />
|
||||
<MicOff style={iconScale(iconSize)} />
|
||||
)}
|
||||
</Button>
|
||||
);
|
||||
|
||||
if (!tooltip) {
|
||||
return button;
|
||||
}
|
||||
|
||||
return (
|
||||
<Tooltip>
|
||||
<TooltipTrigger render={button} />
|
||||
<TooltipContent portalProps={{ container: portalContainer }}>
|
||||
{tooltip}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
);
|
||||
return withTooltip(button, tooltip, portalContainer);
|
||||
}
|
||||
|
|
|
|||
32
packages/call/src/components/buttons/tooltipButton.tsx
Normal file
32
packages/call/src/components/buttons/tooltipButton.tsx
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
import { type ReactElement } from "react";
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@tensamin/ui";
|
||||
|
||||
export type CallButtonProps = {
|
||||
className?: string;
|
||||
iconSize?: number;
|
||||
tooltip?: string;
|
||||
portalContainer?: HTMLElement;
|
||||
};
|
||||
|
||||
export function iconScale(iconSize?: number) {
|
||||
return { scale: (iconSize ? iconSize + 100 : 100) + "%" };
|
||||
}
|
||||
|
||||
export function withTooltip(
|
||||
button: ReactElement,
|
||||
tooltip?: string,
|
||||
portalContainer?: HTMLElement,
|
||||
) {
|
||||
if (!tooltip) {
|
||||
return button;
|
||||
}
|
||||
|
||||
return (
|
||||
<Tooltip>
|
||||
<TooltipTrigger render={button} />
|
||||
<TooltipContent portalProps={{ container: portalContainer }}>
|
||||
{tooltip}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ import {
|
|||
import { Track, type Participant } from "livekit-client";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useUser, type User } from "@tensamin/user/context";
|
||||
import { useIsSpeaking } from "../../speakingIndicator";
|
||||
import { useIsSpeaking } from "../../speakingState";
|
||||
import VideoViewer from "../videoViewer";
|
||||
import { HeadphoneOff, MicOff, Monitor, Plus, Shield } from "lucide-react";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
import { log } from "@tensamin/shared/log";
|
||||
import { useCall } from "./store";
|
||||
import {
|
||||
clearSpeakingParticipants,
|
||||
removeSpeakingParticipant,
|
||||
setMicGated,
|
||||
updateSpeakingParticipants,
|
||||
} from "./speakingState";
|
||||
|
||||
const SPEAKING_THRESHOLD = 0.01;
|
||||
const SPEAKING_HANGTIME_MS = 500;
|
||||
|
|
@ -85,12 +90,7 @@ class SpeakingDetector {
|
|||
}
|
||||
this.entries.delete(participantId);
|
||||
|
||||
useCall.setState((state) => {
|
||||
if (!state.speakingParticipantIds.has(participantId)) return state;
|
||||
const next = new Set(state.speakingParticipantIds);
|
||||
next.delete(participantId);
|
||||
return { speakingParticipantIds: next };
|
||||
});
|
||||
removeSpeakingParticipant(participantId);
|
||||
|
||||
if (participantId === this.localParticipantId && this.localMicGateClosed) {
|
||||
this.muteLocalTrack(false);
|
||||
|
|
@ -104,7 +104,7 @@ class SpeakingDetector {
|
|||
entry.isSpeaking = false;
|
||||
entry.lastSpeakingTime = 0;
|
||||
}
|
||||
useCall.setState({ speakingParticipantIds: new Set() });
|
||||
clearSpeakingParticipants();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -131,7 +131,7 @@ class SpeakingDetector {
|
|||
}
|
||||
|
||||
this.localMicGateClosed = muted;
|
||||
useCall.setState({ micGated: muted });
|
||||
setMicGated(muted);
|
||||
}
|
||||
|
||||
private applyNoiseGate(rms: number) {
|
||||
|
|
@ -197,24 +197,7 @@ class SpeakingDetector {
|
|||
}
|
||||
|
||||
if (changed.size > 0) {
|
||||
useCall.setState((state) => {
|
||||
let hasDiff = false;
|
||||
const next = new Set(state.speakingParticipantIds);
|
||||
for (const [id, speaking] of changed) {
|
||||
if (speaking) {
|
||||
if (!next.has(id)) {
|
||||
next.add(id);
|
||||
hasDiff = true;
|
||||
}
|
||||
} else {
|
||||
if (next.has(id)) {
|
||||
next.delete(id);
|
||||
hasDiff = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return hasDiff ? { speakingParticipantIds: next } : state;
|
||||
});
|
||||
updateSpeakingParticipants(changed);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -246,7 +229,3 @@ export function disposeSpeakingDetector(): void {
|
|||
detectorInstance = null;
|
||||
}
|
||||
}
|
||||
|
||||
export function useIsSpeaking(participantId: number): boolean {
|
||||
return useCall((state) => state.speakingParticipantIds.has(participantId));
|
||||
}
|
||||
|
|
|
|||
55
packages/call/src/speakingState.ts
Normal file
55
packages/call/src/speakingState.ts
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
import { create } from "zustand";
|
||||
|
||||
type SpeakingState = {
|
||||
speakingParticipantIds: Set<number>;
|
||||
micGated: boolean;
|
||||
};
|
||||
|
||||
const useSpeakingState = create<SpeakingState>(() => ({
|
||||
speakingParticipantIds: new Set(),
|
||||
micGated: false,
|
||||
}));
|
||||
|
||||
export function setMicGated(micGated: boolean) {
|
||||
useSpeakingState.setState({ micGated });
|
||||
}
|
||||
|
||||
export function clearSpeakingParticipants() {
|
||||
useSpeakingState.setState({ speakingParticipantIds: new Set() });
|
||||
}
|
||||
|
||||
export function removeSpeakingParticipant(participantId: number) {
|
||||
useSpeakingState.setState((state) => {
|
||||
if (!state.speakingParticipantIds.has(participantId)) return state;
|
||||
const next = new Set(state.speakingParticipantIds);
|
||||
next.delete(participantId);
|
||||
return { speakingParticipantIds: next };
|
||||
});
|
||||
}
|
||||
|
||||
export function updateSpeakingParticipants(changed: Map<number, boolean>) {
|
||||
useSpeakingState.setState((state) => {
|
||||
let hasDiff = false;
|
||||
const next = new Set(state.speakingParticipantIds);
|
||||
|
||||
for (const [id, speaking] of changed) {
|
||||
if (speaking) {
|
||||
if (!next.has(id)) {
|
||||
next.add(id);
|
||||
hasDiff = true;
|
||||
}
|
||||
} else if (next.has(id)) {
|
||||
next.delete(id);
|
||||
hasDiff = true;
|
||||
}
|
||||
}
|
||||
|
||||
return hasDiff ? { speakingParticipantIds: next } : state;
|
||||
});
|
||||
}
|
||||
|
||||
export function useIsSpeaking(participantId: number): boolean {
|
||||
return useSpeakingState((state) =>
|
||||
state.speakingParticipantIds.has(participantId),
|
||||
);
|
||||
}
|
||||
|
|
@ -109,8 +109,6 @@ type CallStore = {
|
|||
layoutVersion: number;
|
||||
screenRef: React.RefObject<HTMLDivElement | null> | null;
|
||||
runtime: Runtime | null;
|
||||
speakingParticipantIds: Set<number>;
|
||||
micGated: boolean;
|
||||
};
|
||||
|
||||
let _keyProvider: ExternalE2EEKeyProvider | null = null;
|
||||
|
|
@ -857,7 +855,6 @@ export async function disconnect() {
|
|||
watchedStreamParticipantIds: [],
|
||||
pendingWatchedParticipantIds: [],
|
||||
activeScreenShareParticipantIds: [],
|
||||
micGated: false,
|
||||
});
|
||||
|
||||
getRoom().remoteParticipants.forEach((participant) => {
|
||||
|
|
@ -1079,8 +1076,6 @@ export const useCall = create<CallStore>(() => ({
|
|||
layoutVersion: 0,
|
||||
screenRef: null,
|
||||
runtime: null,
|
||||
speakingParticipantIds: new Set(),
|
||||
micGated: false,
|
||||
}));
|
||||
|
||||
// Register app-level call listeners and wire React dependencies into the store.
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
import { z } from "zod";
|
||||
import { ttp } from "@tensamin/shared/data";
|
||||
|
||||
export type RawMessages = z.infer<typeof ttp.messages_get.response>["messages"];
|
||||
|
||||
export type RawMessage = RawMessages[number];
|
||||
|
||||
export type LiveMessage = RawMessage & {
|
||||
failed?: boolean;
|
||||
localId: string;
|
||||
};
|
||||
Loading…
Reference in a new issue