Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 43a8b98a6a | |||
| 0f9a7e39ce | |||
| 8265e2d719 | |||
| 4f91309f7f | |||
| bcd457e2d6 |
Binary file not shown.
5
client/app/components.d.ts
vendored
5
client/app/components.d.ts
vendored
@@ -13,15 +13,20 @@ declare module 'vue' {
|
|||||||
PrimeButton: typeof import('primevue/button')['default']
|
PrimeButton: typeof import('primevue/button')['default']
|
||||||
PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
|
PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
|
||||||
PrimeCard: typeof import('primevue/card')['default']
|
PrimeCard: typeof import('primevue/card')['default']
|
||||||
|
PrimeCheckbox: typeof import('primevue/checkbox')['default']
|
||||||
|
PrimeDivider: typeof import('primevue/divider')['default']
|
||||||
PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
|
PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
|
||||||
PrimeInputText: typeof import('primevue/inputtext')['default']
|
PrimeInputText: typeof import('primevue/inputtext')['default']
|
||||||
PrimeMenu: typeof import('primevue/menu')['default']
|
PrimeMenu: typeof import('primevue/menu')['default']
|
||||||
PrimePanel: typeof import('primevue/panel')['default']
|
PrimePanel: typeof import('primevue/panel')['default']
|
||||||
PrimePassword: typeof import('primevue/password')['default']
|
PrimePassword: typeof import('primevue/password')['default']
|
||||||
PrimeProgressBar: typeof import('primevue/progressbar')['default']
|
PrimeProgressBar: typeof import('primevue/progressbar')['default']
|
||||||
|
PrimeScrollPanel: typeof import('primevue/scrollpanel')['default']
|
||||||
|
PrimeSelect: typeof import('primevue/select')['default']
|
||||||
PrimeSelectButton: typeof import('primevue/selectbutton')['default']
|
PrimeSelectButton: typeof import('primevue/selectbutton')['default']
|
||||||
PrimeSlider: typeof import('primevue/slider')['default']
|
PrimeSlider: typeof import('primevue/slider')['default']
|
||||||
PrimeToast: typeof import('primevue/toast')['default']
|
PrimeToast: typeof import('primevue/toast')['default']
|
||||||
|
PrimeToggleSwitch: typeof import('primevue/toggleswitch')['default']
|
||||||
RouterLink: typeof import('vue-router')['RouterLink']
|
RouterLink: typeof import('vue-router')['RouterLink']
|
||||||
RouterView: typeof import('vue-router')['RouterView']
|
RouterView: typeof import('vue-router')['RouterView']
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
style="height: 75px;"
|
style="height: 75px;"
|
||||||
>
|
>
|
||||||
<slot name="left">
|
<slot name="left">
|
||||||
<h1>
|
<h1 v-if="!!title">
|
||||||
{{ title }}
|
{{ title }}
|
||||||
</h1>
|
</h1>
|
||||||
</slot>
|
</slot>
|
||||||
@@ -19,7 +19,12 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
defineProps<{
|
defineProps<{
|
||||||
title: string
|
title?: string
|
||||||
secondary?: boolean
|
secondary?: boolean
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
defineSlots<{
|
||||||
|
left: () => unknown
|
||||||
|
right: () => unknown
|
||||||
|
}>()
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="py-3">
|
<div class="py-3">
|
||||||
<div class="flex items-center gap-3 ">
|
<div class="flex items-center gap-3 ">
|
||||||
<PrimeAvatar
|
<PrimeAvatar size="small">
|
||||||
icon="pi pi-user"
|
<template #icon>
|
||||||
size="small"
|
<User :size="20" />
|
||||||
/>
|
</template>
|
||||||
|
</PrimeAvatar>
|
||||||
|
|
||||||
<div class="flex-1">
|
<div class="flex-1">
|
||||||
<div class="text-sm leading-5 font-medium text-color whitespace-nowrap overflow-ellipsis">
|
<div class="text-sm leading-5 font-medium text-color whitespace-nowrap overflow-ellipsis">
|
||||||
@@ -15,7 +16,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<PrimeBadge v-if="audioConsumerPaused" severity="info" value="Muted" />
|
<PrimeBadge v-if="inputMuted" severity="info" value="Muted" />
|
||||||
|
<!-- <PrimeBadge v-if="outputMuted" severity="info" value="No sound" /> -->
|
||||||
<PrimeBadge v-if="isMe" severity="secondary" value="You" />
|
<PrimeBadge v-if="isMe" severity="secondary" value="You" />
|
||||||
|
|
||||||
<template v-if="!isMe">
|
<template v-if="!isMe">
|
||||||
@@ -40,13 +42,14 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { ChadClient } from '#shared/types'
|
import type { ChadClient } from '#shared/types'
|
||||||
import type { MenuItem } from 'primevue/menuitem'
|
import type { MenuItem } from 'primevue/menuitem'
|
||||||
|
import { User } from 'lucide-vue-next'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
client: ChadClient
|
client: ChadClient
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const { inputMuted, outputMuted } = useApp()
|
const { outputMuted } = useApp()
|
||||||
const { getClientConsumers } = useMediasoup()
|
const { getClientConsumers, micProducer } = useMediasoup()
|
||||||
const { me } = useClients()
|
const { me } = useClients()
|
||||||
|
|
||||||
const menuRef = useTemplateRef<HTMLAudioElement>('menu')
|
const menuRef = useTemplateRef<HTMLAudioElement>('menu')
|
||||||
@@ -78,9 +81,9 @@ const audioConsumer = computed(() => {
|
|||||||
return consumers.find(consumer => consumer.track.kind === 'audio')
|
return consumers.find(consumer => consumer.track.kind === 'audio')
|
||||||
})
|
})
|
||||||
|
|
||||||
const audioConsumerPaused = computed(() => {
|
const inputMuted = computed(() => {
|
||||||
if (isMe.value)
|
if (isMe.value)
|
||||||
return false
|
return micProducer.value?.paused ?? false
|
||||||
|
|
||||||
const consumers = getClientConsumers(props.client.socketId)
|
const consumers = getClientConsumers(props.client.socketId)
|
||||||
|
|
||||||
@@ -94,13 +97,13 @@ const audioTrack = computed(() => {
|
|||||||
const { setGain } = useAudioContext(audioTrack)
|
const { setGain } = useAudioContext(audioTrack)
|
||||||
|
|
||||||
watch(volume, (volume) => {
|
watch(volume, (volume) => {
|
||||||
if (outputMuted.value)
|
// if (outputMuted.value)
|
||||||
return
|
// return
|
||||||
|
|
||||||
setGain(volume * 0.01)
|
setGain(volume * 0.01)
|
||||||
})
|
})
|
||||||
|
|
||||||
watch(outputMuted, (outputMuted) => {
|
// watch(outputMuted, (outputMuted) => {
|
||||||
setGain(outputMuted ? 0 : (volume.value * 0.01))
|
// setGain(outputMuted ? 0 : (volume.value * 0.01))
|
||||||
})
|
// })
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -4,13 +4,12 @@ export default function useAudioContext(audioTrack: Ref<MediaStreamTrack | undef
|
|||||||
const ctx = new (window.AudioContext || window.webkitAudioContext)()
|
const ctx = new (window.AudioContext || window.webkitAudioContext)()
|
||||||
|
|
||||||
const stream = new MediaStream()
|
const stream = new MediaStream()
|
||||||
|
const audioEl = new Audio()
|
||||||
|
|
||||||
const sourceNode = shallowRef<MediaStreamAudioSourceNode>()
|
const sourceNode = shallowRef<MediaStreamAudioSourceNode>()
|
||||||
const gainNode = ctx.createGain()
|
const gainNode = ctx.createGain()
|
||||||
|
|
||||||
let hackExecuted = false
|
watch(audioTrack, async (track, prevTrack) => {
|
||||||
|
|
||||||
watch(audioTrack, (track, prevTrack) => {
|
|
||||||
if (prevTrack)
|
if (prevTrack)
|
||||||
stream.removeTrack(prevTrack)
|
stream.removeTrack(prevTrack)
|
||||||
|
|
||||||
@@ -19,16 +18,14 @@ export default function useAudioContext(audioTrack: Ref<MediaStreamTrack | undef
|
|||||||
|
|
||||||
stream.addTrack(track)
|
stream.addTrack(track)
|
||||||
|
|
||||||
if (!hackExecuted) {
|
if (!audioEl.srcObject) {
|
||||||
const audioEl = new Audio()
|
|
||||||
audioEl.srcObject = stream
|
audioEl.srcObject = stream
|
||||||
audioEl.muted = true
|
audioEl.muted = true
|
||||||
hackExecuted = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceNode.value = ctx.createMediaStreamSource(stream)
|
sourceNode.value = ctx.createMediaStreamSource(stream)
|
||||||
|
|
||||||
connect()
|
await connect()
|
||||||
}, { immediate: true })
|
}, { immediate: true })
|
||||||
|
|
||||||
useEventListener(document, 'click', async () => {
|
useEventListener(document, 'click', async () => {
|
||||||
@@ -36,10 +33,16 @@ export default function useAudioContext(audioTrack: Ref<MediaStreamTrack | undef
|
|||||||
await ctx.resume()
|
await ctx.resume()
|
||||||
}
|
}
|
||||||
|
|
||||||
connect()
|
await connect()
|
||||||
}, { once: true })
|
}, { once: true })
|
||||||
|
|
||||||
function connect() {
|
onScopeDispose(() => {
|
||||||
|
audioEl.pause()
|
||||||
|
audioEl.srcObject = null
|
||||||
|
ctx.close()
|
||||||
|
})
|
||||||
|
|
||||||
|
async function connect() {
|
||||||
if (!sourceNode.value || ctx.state === 'suspended')
|
if (!sourceNode.value || ctx.state === 'suspended')
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -246,12 +246,13 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
|
|
||||||
const stream = await navigator.mediaDevices.getUserMedia({
|
const stream = await navigator.mediaDevices.getUserMedia({
|
||||||
audio: {
|
audio: {
|
||||||
autoGainControl: false,
|
deviceId: { exact: preferences.inputDeviceId.value },
|
||||||
noiseSuppression: true,
|
autoGainControl: { exact: preferences.autoGainControl.value },
|
||||||
echoCancellation: false,
|
echoCancellation: { exact: preferences.echoCancellation.value },
|
||||||
channelCount: 2,
|
noiseSuppression: { exact: preferences.noiseSuppression.value },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const track = stream.getAudioTracks()[0]
|
const track = stream.getAudioTracks()[0]
|
||||||
|
|
||||||
if (!track)
|
if (!track)
|
||||||
@@ -268,6 +269,7 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
|
|
||||||
producers.value.set(micProducer.value.id, micProducer.value)
|
producers.value.set(micProducer.value.id, micProducer.value)
|
||||||
triggerRef(producers)
|
triggerRef(producers)
|
||||||
|
triggerRef(micProducer)
|
||||||
|
|
||||||
micProducer.value.on('transportclose', () => {
|
micProducer.value.on('transportclose', () => {
|
||||||
micProducer.value = undefined
|
micProducer.value = undefined
|
||||||
@@ -283,7 +285,6 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
return
|
return
|
||||||
|
|
||||||
producers.value.delete(micProducer.value.id)
|
producers.value.delete(micProducer.value.id)
|
||||||
triggerRef(producers)
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
micProducer.value.close()
|
micProducer.value.close()
|
||||||
@@ -294,6 +295,10 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
}
|
}
|
||||||
|
finally {
|
||||||
|
triggerRef(producers)
|
||||||
|
triggerRef(micProducer)
|
||||||
|
}
|
||||||
|
|
||||||
micProducer.value = undefined
|
micProducer.value = undefined
|
||||||
}
|
}
|
||||||
@@ -304,21 +309,25 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
|
|
||||||
const producer = getProducerByType(type)
|
const producer = getProducerByType(type)
|
||||||
|
|
||||||
if (!producer)
|
if (!producer.value)
|
||||||
return
|
return
|
||||||
|
|
||||||
if (producer.paused)
|
if (producer.value.paused)
|
||||||
return
|
return
|
||||||
|
|
||||||
try {
|
try {
|
||||||
producer.pause()
|
producer.value.pause()
|
||||||
|
|
||||||
await signaling.socket.value.emitWithAck('pauseProducer', {
|
await signaling.socket.value.emitWithAck('pauseProducer', {
|
||||||
producerId: producer.id,
|
producerId: producer.value.id,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
producer.resume()
|
producer.value.resume()
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
triggerRef(producers)
|
||||||
|
triggerRef(producer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,18 +337,22 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
|
|
||||||
const producer = getProducerByType(type)
|
const producer = getProducerByType(type)
|
||||||
|
|
||||||
if (!producer)
|
if (!producer.value)
|
||||||
return
|
return
|
||||||
|
|
||||||
try {
|
try {
|
||||||
producer.resume()
|
producer.value.resume()
|
||||||
|
|
||||||
await signaling.socket.value.emitWithAck('resumeProducer', {
|
await signaling.socket.value.emitWithAck('resumeProducer', {
|
||||||
producerId: producer.id,
|
producerId: producer.value.id,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
producer.pause()
|
producer.value.pause()
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
triggerRef(producers)
|
||||||
|
triggerRef(producer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -350,14 +363,40 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
function getProducerByType(type: ProducerType) {
|
function getProducerByType(type: ProducerType) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'microphone':
|
case 'microphone':
|
||||||
return micProducer.value
|
return micProducer
|
||||||
case 'camera':
|
case 'camera':
|
||||||
return cameraProducer.value
|
return cameraProducer
|
||||||
case 'share':
|
case 'share':
|
||||||
return shareProducer.value
|
return shareProducer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
watch(
|
||||||
|
preferences.inputDeviceId,
|
||||||
|
async (inputDeviceId) => {
|
||||||
|
await disableMic()
|
||||||
|
|
||||||
|
if (!inputDeviceId)
|
||||||
|
return
|
||||||
|
|
||||||
|
await enableMic()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
watch([
|
||||||
|
preferences.inputDeviceId,
|
||||||
|
preferences.echoCancellation,
|
||||||
|
preferences.autoGainControl,
|
||||||
|
preferences.noiseSuppression,
|
||||||
|
], async ([inputDeviceId]) => {
|
||||||
|
await disableMic()
|
||||||
|
|
||||||
|
if (!inputDeviceId)
|
||||||
|
return
|
||||||
|
|
||||||
|
await enableMic()
|
||||||
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
init,
|
init,
|
||||||
consumers,
|
consumers,
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
import { createGlobalState, useDevicesList } from '@vueuse/core'
|
import { createGlobalState, useDevicesList, useLocalStorage } from '@vueuse/core'
|
||||||
|
|
||||||
export const usePreferences = createGlobalState(() => {
|
export const usePreferences = createGlobalState(() => {
|
||||||
const inputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>()
|
const inputDeviceId = useLocalStorage<MediaDeviceInfo['deviceId']>('INPUT_DEVICE_ID', 'default')
|
||||||
const outputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>()
|
const outputDeviceId = useLocalStorage<MediaDeviceInfo['deviceId']>('OUTPUT_DEVICE_ID', 'default')
|
||||||
|
|
||||||
|
const autoGainControl = useLocalStorage('AUTO_GAIN_CONTROL', false)
|
||||||
|
const noiseSuppression = useLocalStorage('NOISE_SUPPRESSION', true)
|
||||||
|
const echoCancellation = useLocalStorage('ECHO_CANCELLATION', true)
|
||||||
|
|
||||||
const {
|
const {
|
||||||
ensurePermissions,
|
ensurePermissions,
|
||||||
@@ -12,11 +16,24 @@ export const usePreferences = createGlobalState(() => {
|
|||||||
audioOutputs,
|
audioOutputs,
|
||||||
} = useDevicesList()
|
} = useDevicesList()
|
||||||
|
|
||||||
|
const inputDeviceExist = computed(() => {
|
||||||
|
return audioInputs.value.some(device => device.deviceId === inputDeviceId.value)
|
||||||
|
})
|
||||||
|
|
||||||
|
const outputDeviceExist = computed(() => {
|
||||||
|
return audioOutputs.value.some(device => device.deviceId === outputDeviceId.value)
|
||||||
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
inputDeviceId,
|
inputDeviceId,
|
||||||
outputDeviceId,
|
outputDeviceId,
|
||||||
videoInputs,
|
autoGainControl,
|
||||||
audioInputs,
|
noiseSuppression,
|
||||||
audioOutputs,
|
echoCancellation,
|
||||||
|
inputDeviceExist,
|
||||||
|
outputDeviceExist,
|
||||||
|
videoInputs: computed(() => JSON.parse(JSON.stringify(videoInputs.value))),
|
||||||
|
audioInputs: computed(() => JSON.parse(JSON.stringify(audioInputs.value))),
|
||||||
|
audioOutputs: computed(() => JSON.parse(JSON.stringify(audioOutputs.value))),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -66,11 +66,9 @@ export const useSignaling = createSharedComposable(() => {
|
|||||||
|
|
||||||
const uri = host ? `${protocol}//${host}` : ``
|
const uri = host ? `${protocol}//${host}` : ``
|
||||||
|
|
||||||
socket.value = io(`http://localhost:4000/webrtc`, {
|
socket.value = io(`${uri}/webrtc`, {
|
||||||
path: `/chad/ws`,
|
path: `${pathname}/ws`,
|
||||||
transports: ['websocket'],
|
transports: ['websocket'],
|
||||||
// socket.value = io(`${uri}/webrtc`, {
|
|
||||||
// path: `${pathname}/ws`,
|
|
||||||
withCredentials: true,
|
withCredentials: true,
|
||||||
auth: {
|
auth: {
|
||||||
userId: me.value.id,
|
userId: me.value.id,
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export const useUpdater = createGlobalState(() => {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
lastUpdate,
|
lastUpdate,
|
||||||
|
checking,
|
||||||
checkForUpdates,
|
checkForUpdates,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ const options = computed(() => {
|
|||||||
{
|
{
|
||||||
label: 'Register',
|
label: 'Register',
|
||||||
routeName: 'Register',
|
routeName: 'Register',
|
||||||
|
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,52 +1,100 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="grid grid-cols-2 h-screen">
|
<div class="grid grid-cols-2 gap-2 p-2 h-screen grid-rows-[auto_1fr]">
|
||||||
<div class="flex flex-col shadow-xl shadow-surface-950 overflow-y-hidden">
|
<div
|
||||||
<AppHeader title="Надарики">
|
class="flex items-center justify-between gap-2 rounded-xl p-3 bg-surface-950"
|
||||||
<template #right>
|
>
|
||||||
<PrimeButtonGroup class="ml-auto">
|
<div class="inline-flex items-center gap-3">
|
||||||
<PrimeButton
|
<PrimeBadge v-if="isTauri" class="opacity-50" severity="secondary" :value="version" size="small" />
|
||||||
icon="pi pi-microphone" size="large" :severity="inputMuted ? 'contrast' : 'secondary'"
|
<PrimeBadge :severity="connected ? 'success' : 'danger' " />
|
||||||
:outlined="!inputMuted" @click="toggleInput"
|
</div>
|
||||||
/>
|
|
||||||
<PrimeButton
|
|
||||||
icon="pi pi-headphones" size="large" :severity="outputMuted ? 'contrast' : 'secondary'"
|
|
||||||
:outlined="!outputMuted" @click="toggleOutput"
|
|
||||||
/>
|
|
||||||
</PrimeButtonGroup>
|
|
||||||
|
|
||||||
<PrimeButton icon="pi pi-cog" size="large" :text="!inPreferences" :severity="inPreferences ? 'contrast' : 'secondary'" @click="onClickPreferences" />
|
<PrimeButtonGroup class="ml-auto">
|
||||||
|
<PrimeButton outlined @click="toggleInput">
|
||||||
|
<template #icon>
|
||||||
|
<Component :is="inputMuted ? MicOff : Mic" />
|
||||||
|
</template>
|
||||||
|
</PrimeButton>
|
||||||
|
<PrimeButton outlined @click="toggleOutput">
|
||||||
|
<template #icon>
|
||||||
|
<Component :is="outputMuted ? VolumeOff : Volume2" />
|
||||||
|
</template>
|
||||||
|
</PrimeButton>
|
||||||
|
</PrimeButtonGroup>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="flex items-center justify-center rounded-xl p-3 bg-surface-950"
|
||||||
|
>
|
||||||
|
<PrimeSelectButton
|
||||||
|
v-model="activeTab"
|
||||||
|
:options="tabs"
|
||||||
|
data-key="id"
|
||||||
|
:allow-empty="false"
|
||||||
|
style="--p-togglebutton-content-padding: 0.25rem 0.5rem"
|
||||||
|
>
|
||||||
|
<template #option="{ option }">
|
||||||
|
<Component :is="option.icon" size="24" />
|
||||||
</template>
|
</template>
|
||||||
</AppHeader>
|
</PrimeSelectButton>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-auto-animate class="p-3 overflow-y-auto flex-1 bg-surface-900 overflow-hidden divide-y divide-surface-800">
|
<PrimeScrollPanel class="bg-surface-900 rounded-xl" style="min-height: 0">
|
||||||
|
<div v-auto-animate class="p-3 divide-y divide-surface-800">
|
||||||
<ClientRow v-for="client of clients" :key="client.id" :client="client" />
|
<ClientRow v-for="client of clients" :key="client.id" :client="client" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</PrimeScrollPanel>
|
||||||
|
|
||||||
<div class="overflow-y-auto">
|
<PrimeScrollPanel class="bg-surface-900 rounded-xl" style="min-height: 0">
|
||||||
<slot />
|
<div class="p-3">
|
||||||
</div>
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
|
</PrimeScrollPanel>
|
||||||
<div class="fixed top-3 right-3 inline-flex items-center gap-3">
|
|
||||||
<PrimeBadge v-if="isTauri" class="opacity-50" severity="secondary" :value="version" size="small" />
|
|
||||||
<PrimeBadge :severity="connected ? 'success' : 'danger' " />
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { MessageCircle, Mic, MicOff, Settings, UserPen, Volume2, VolumeOff } from 'lucide-vue-next'
|
||||||
|
|
||||||
const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri } = useApp()
|
const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri } = useApp()
|
||||||
const { connect, connected } = useSignaling()
|
const { connect, connected } = useSignaling()
|
||||||
|
|
||||||
|
interface Tab {
|
||||||
|
id: string
|
||||||
|
icon: Component
|
||||||
|
onClick: () => void | Promise<void>
|
||||||
|
}
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
|
|
||||||
const inPreferences = computed(() => {
|
const tabs: Tab[] = [
|
||||||
return route.name === 'Preferences'
|
{
|
||||||
})
|
id: 'Index',
|
||||||
|
icon: MessageCircle,
|
||||||
|
onClick: () => {
|
||||||
|
navigateTo({ name: 'Index' })
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'Profile',
|
||||||
|
icon: UserPen,
|
||||||
|
onClick: () => {
|
||||||
|
navigateTo({ name: 'Profile' })
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'Preferences',
|
||||||
|
icon: Settings,
|
||||||
|
onClick: () => {
|
||||||
|
navigateTo({ name: 'Preferences' })
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
function onClickPreferences() {
|
const activeTab = ref<Tab>(tabs.find(tab => tab.id === route.name) ?? tabs[0]!)
|
||||||
navigateTo(!inPreferences.value ? { name: 'Preferences' } : '/')
|
|
||||||
}
|
watch(activeTab, (activeTab) => {
|
||||||
|
activeTab.onClick()
|
||||||
|
})
|
||||||
|
|
||||||
connect()
|
connect()
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
export default defineNuxtRouteMiddleware(async (to, from) => {
|
export default defineNuxtRouteMiddleware(async (to, from) => {
|
||||||
// if (import.meta.dev || import.meta.server)
|
if (import.meta.dev || import.meta.server)
|
||||||
// return
|
return
|
||||||
|
|
||||||
const { isTauri } = useApp()
|
const { isTauri } = useApp()
|
||||||
|
|
||||||
|
|||||||
@@ -1,62 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col gap-3 p-3 pt-12">
|
<div class="flex items-center justify-center">
|
||||||
<PrimePanel header="Clients" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }">
|
<PrimeCard>
|
||||||
<dl v-for="client in clients" :key="client.socketId" class="">
|
<template #content>
|
||||||
<div v-for="(value, key) in client" :key="key" class="py-2">
|
The chat is under development.
|
||||||
<dt class="font-bold">
|
</template>
|
||||||
{{ key }}
|
</PrimeCard>
|
||||||
</dt>
|
|
||||||
<dd class="pl-8">
|
|
||||||
{{ value }}
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
</dl>
|
|
||||||
</PrimePanel>
|
|
||||||
|
|
||||||
<PrimePanel header="Producers" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }">
|
|
||||||
<dl v-for="[_, producer] in Array.from(producers)" :key="producer.id" class="">
|
|
||||||
<div v-for="key in ['id', 'paused']" :key="key" class="py-2">
|
|
||||||
<dt class="font-bold">
|
|
||||||
{{ key }}
|
|
||||||
</dt>
|
|
||||||
<dd class="pl-8">
|
|
||||||
{{ producer[key] }}
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
</dl>
|
|
||||||
</PrimePanel>
|
|
||||||
|
|
||||||
<PrimePanel header="Consumers" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }">
|
|
||||||
<dl v-for="[_, consumer] in Array.from(consumers)" :key="consumer.id" class="">
|
|
||||||
<div v-for="key in ['id', 'paused']" :key="key" class="py-2">
|
|
||||||
<dt class="font-bold">
|
|
||||||
{{ key }}
|
|
||||||
</dt>
|
|
||||||
<dd class="pl-8">
|
|
||||||
{{ consumer[key] }}
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
</dl>
|
|
||||||
</PrimePanel>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- <div class="flex items-center justify-center p-3"> -->
|
|
||||||
<!-- <PrimeCard> -->
|
|
||||||
<!-- <template #subtitle> -->
|
|
||||||
<!-- Important information -->
|
|
||||||
<!-- </template> -->
|
|
||||||
|
|
||||||
<!-- <template #content> -->
|
|
||||||
<!-- The chat is under development. -->
|
|
||||||
<!-- </template> -->
|
|
||||||
<!-- </PrimeCard> -->
|
|
||||||
<!-- </div> -->
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
const { clients } = useClients()
|
|
||||||
const { producers, consumers } = useMediasoup()
|
|
||||||
|
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
|
name: 'Index',
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,23 +1,60 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<AppHeader title="Preferences" secondary />
|
<PrimeFloatLabel variant="on">
|
||||||
|
<PrimeSelect
|
||||||
|
v-model="inputDeviceId"
|
||||||
|
:options="audioInputs"
|
||||||
|
option-label="label"
|
||||||
|
option-value="deviceId"
|
||||||
|
fluid
|
||||||
|
input-id="inputDevice"
|
||||||
|
:invalid="!inputDeviceExist"
|
||||||
|
/>
|
||||||
|
<label for="inputDevice">Input device</label>
|
||||||
|
</PrimeFloatLabel>
|
||||||
|
|
||||||
<form class="flex flex-col gap-3 p-3" @submit.prevent="save">
|
<div class="flex items-center gap-2 mt-3">
|
||||||
<PrimeFloatLabel variant="on">
|
<PrimeToggleSwitch v-model="autoGainControl" input-id="autoGainControl" />
|
||||||
<PrimeInputText id="username" v-model="displayName" size="large" fluid autocomplete="off" />
|
<label for="autoGainControl">Auto Gain Control</label>
|
||||||
<label for="username">Username</label>
|
|
||||||
</PrimeFloatLabel>
|
|
||||||
|
|
||||||
<PrimeButton label="Save" type="submit" :disabled="!valid" />
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div v-if="isTauri" class="p-3">
|
|
||||||
<PrimeButton label="Check for Updates" fluid severity="info" @click="onCheckForUpdates" />
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="p-3">
|
<div class="flex items-center gap-2 mt-3">
|
||||||
<PrimeButton label="Logout" fluid severity="danger" @click="logout()" />
|
<PrimeToggleSwitch v-model="echoCancellation" input-id="echoCancellation" />
|
||||||
|
<label for="echoCancellation">Echo Cancellation</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="flex items-center gap-2 mt-3">
|
||||||
|
<PrimeToggleSwitch v-model="noiseSuppression" input-id="noiseSuppression" />
|
||||||
|
<label for="noiseSuppression">Noise Suppression</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- <PrimeFloatLabel variant="on"> -->
|
||||||
|
<!-- <PrimeSelect -->
|
||||||
|
<!-- v-model="outputDeviceId" -->
|
||||||
|
<!-- :options="audioOutputs" -->
|
||||||
|
<!-- option-label="label" -->
|
||||||
|
<!-- option-value="deviceId" -->
|
||||||
|
<!-- fluid -->
|
||||||
|
<!-- class="mt-6" -->
|
||||||
|
<!-- input-id="outputDevice" -->
|
||||||
|
<!-- :invalid="!outputDeviceExist" -->
|
||||||
|
<!-- -->
|
||||||
|
<!-- /> -->
|
||||||
|
<!-- <label for="outputDevice">Output device</label> -->
|
||||||
|
<!-- </PrimeFloatLabel> -->
|
||||||
|
|
||||||
|
<template v-if="isTauri">
|
||||||
|
<PrimeDivider />
|
||||||
|
|
||||||
|
<PrimeButton
|
||||||
|
size="small"
|
||||||
|
label="Check for Updates"
|
||||||
|
fluid
|
||||||
|
severity="info"
|
||||||
|
:loading="checking"
|
||||||
|
@click="onCheckForUpdates"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<PrimeToast position="bottom-center" group="updater">
|
<PrimeToast position="bottom-center" group="updater">
|
||||||
@@ -39,26 +76,22 @@
|
|||||||
definePageMeta({
|
definePageMeta({
|
||||||
name: 'Preferences',
|
name: 'Preferences',
|
||||||
})
|
})
|
||||||
|
|
||||||
const { isTauri } = useApp()
|
const { isTauri } = useApp()
|
||||||
const { checkForUpdates } = useUpdater()
|
const { checking, checkForUpdates } = useUpdater()
|
||||||
const { me, setMe, logout } = useAuth()
|
const {
|
||||||
|
inputDeviceId,
|
||||||
|
outputDeviceId,
|
||||||
|
autoGainControl,
|
||||||
|
noiseSuppression,
|
||||||
|
echoCancellation,
|
||||||
|
inputDeviceExist,
|
||||||
|
outputDeviceExist,
|
||||||
|
audioInputs,
|
||||||
|
audioOutputs,
|
||||||
|
} = usePreferences()
|
||||||
|
|
||||||
const signaling = useSignaling()
|
|
||||||
const toast = useToast()
|
const toast = useToast()
|
||||||
|
|
||||||
const displayName = ref(me.value?.displayName || '')
|
|
||||||
|
|
||||||
const valid = computed(() => {
|
|
||||||
if (!displayName.value || !me.value)
|
|
||||||
return false
|
|
||||||
|
|
||||||
if (displayName.value === me.value.displayName)
|
|
||||||
return false
|
|
||||||
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
|
|
||||||
async function onCheckForUpdates() {
|
async function onCheckForUpdates() {
|
||||||
const update = await checkForUpdates()
|
const update = await checkForUpdates()
|
||||||
|
|
||||||
@@ -76,20 +109,5 @@ async function onCheckForUpdates() {
|
|||||||
detail: `Version ${update?.version ?? '1.0.1'} is available!`,
|
detail: `Version ${update?.version ?? '1.0.1'} is available!`,
|
||||||
closable: false,
|
closable: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
// asdasd
|
|
||||||
}
|
|
||||||
|
|
||||||
async function save() {
|
|
||||||
if (!valid.value)
|
|
||||||
return
|
|
||||||
|
|
||||||
const updatedMe = await signaling.socket.value?.emitWithAck('updateClient', {
|
|
||||||
displayName: displayName.value,
|
|
||||||
})
|
|
||||||
|
|
||||||
setMe({ ...me.value, displayName: updatedMe.displayName })
|
|
||||||
|
|
||||||
toast.add({ severity: 'success', summary: 'Saved', life: 1000, closable: false })
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
62
client/app/pages/profile.vue
Normal file
62
client/app/pages/profile.vue
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
<template>
|
||||||
|
<form @submit.prevent="save()">
|
||||||
|
<PrimeFloatLabel variant="on">
|
||||||
|
<PrimeInputText id="displayName" v-model="displayName" fluid autocomplete="off" />
|
||||||
|
<label for="displayName">Display name</label>
|
||||||
|
</PrimeFloatLabel>
|
||||||
|
|
||||||
|
<PrimeDivider />
|
||||||
|
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<PrimeButton label="Save" :disabled="!valid" :loading="saving" fluid type="submit" />
|
||||||
|
<PrimeButton severity="danger" class="shrink-0" @click="logout()">
|
||||||
|
<template #icon>
|
||||||
|
<LogOut />
|
||||||
|
</template>
|
||||||
|
</PrimeButton>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { LogOut } from 'lucide-vue-next'
|
||||||
|
|
||||||
|
definePageMeta({
|
||||||
|
name: 'Profile',
|
||||||
|
})
|
||||||
|
|
||||||
|
const { me, setMe, logout } = useAuth()
|
||||||
|
const signaling = useSignaling()
|
||||||
|
const toast = useToast()
|
||||||
|
|
||||||
|
const displayName = ref(me.value?.displayName || '')
|
||||||
|
|
||||||
|
const saving = ref(false)
|
||||||
|
|
||||||
|
const valid = computed(() => {
|
||||||
|
if (!me.value)
|
||||||
|
return false
|
||||||
|
|
||||||
|
if (displayName.value === me.value.displayName)
|
||||||
|
return false
|
||||||
|
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
if (!valid.value)
|
||||||
|
return
|
||||||
|
|
||||||
|
saving.value = true
|
||||||
|
|
||||||
|
const updatedMe = await signaling.socket.value?.emitWithAck('updateClient', {
|
||||||
|
displayName: displayName.value,
|
||||||
|
})
|
||||||
|
|
||||||
|
setMe({ ...me.value!, displayName: (updatedMe.displayName as string) })
|
||||||
|
|
||||||
|
toast.add({ severity: 'success', summary: 'Saved', life: 1000, closable: false })
|
||||||
|
|
||||||
|
saving.value = false
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -97,7 +97,7 @@ export default defineNuxtConfig({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
define: {
|
define: {
|
||||||
__API_BASE_URL__: JSON.stringify(import.meta.env.API_BASE_URL || '/api'),
|
__API_BASE_URL__: JSON.stringify(import.meta.env.API_BASE_URL || 'http://localhost:4000/chad'),
|
||||||
__COMMIT_SHA__: JSON.stringify(import.meta.env.COMMIT_SHA || 'local'),
|
__COMMIT_SHA__: JSON.stringify(import.meta.env.COMMIT_SHA || 'local'),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
"@tauri-apps/plugin-process": "~2",
|
"@tauri-apps/plugin-process": "~2",
|
||||||
"@tauri-apps/plugin-updater": "~2",
|
"@tauri-apps/plugin-updater": "~2",
|
||||||
"@vueuse/core": "^13.9.0",
|
"@vueuse/core": "^13.9.0",
|
||||||
|
"lucide-vue-next": "^0.562.0",
|
||||||
"mediasoup-client": "^3.16.7",
|
"mediasoup-client": "^3.16.7",
|
||||||
"nuxt": "^4.2.2",
|
"nuxt": "^4.2.2",
|
||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||||
"productName": "chad",
|
"productName": "chad",
|
||||||
"version": "0.2.9",
|
"version": "0.2.12",
|
||||||
"identifier": "xyz.koptilnya.chad",
|
"identifier": "xyz.koptilnya.chad",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../.output/public",
|
"frontendDist": "../.output/public",
|
||||||
|
|||||||
@@ -4041,6 +4041,7 @@ __metadata:
|
|||||||
"@vueuse/core": "npm:^13.9.0"
|
"@vueuse/core": "npm:^13.9.0"
|
||||||
eslint: "npm:^9.36.0"
|
eslint: "npm:^9.36.0"
|
||||||
eslint-plugin-format: "npm:^1.0.2"
|
eslint-plugin-format: "npm:^1.0.2"
|
||||||
|
lucide-vue-next: "npm:^0.562.0"
|
||||||
mediasoup-client: "npm:^3.16.7"
|
mediasoup-client: "npm:^3.16.7"
|
||||||
nuxt: "npm:^4.2.2"
|
nuxt: "npm:^4.2.2"
|
||||||
postcss: "npm:^8.5.6"
|
postcss: "npm:^8.5.6"
|
||||||
@@ -7024,6 +7025,15 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
"lucide-vue-next@npm:^0.562.0":
|
||||||
|
version: 0.562.0
|
||||||
|
resolution: "lucide-vue-next@npm:0.562.0"
|
||||||
|
peerDependencies:
|
||||||
|
vue: ">=3.0.1"
|
||||||
|
checksum: 10c0/5ba792ea5e48d01fc99a3c5ae4a59d9767e5d4c7826901800831cf051cf85eb4a680b3564d2910ed4d17dc1d35223c37d006bdbcdb291d90a9491b9c6a20ae14
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"magic-regexp@npm:^0.10.0":
|
"magic-regexp@npm:^0.10.0":
|
||||||
version: 0.10.0
|
version: 0.10.0
|
||||||
resolution: "magic-regexp@npm:0.10.0"
|
resolution: "magic-regexp@npm:0.10.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user