31 Commits

Author SHA1 Message Date
47a464f08f screen sharing
All checks were successful
Deploy / publish-web (push) Successful in 48s
2025-12-26 18:22:22 +06:00
4d5db12e1b screen sharing
Some checks failed
Deploy / deploy (push) Successful in 35s
Deploy / publish-web (push) Failing after 22s
2025-12-26 17:36:30 +06:00
4f59cbcf65 screen sharing
All checks were successful
Deploy / deploy (push) Successful in 35s
2025-12-26 17:21:59 +06:00
3b3f6b6e40 update 2025-12-26 01:44:16 +06:00
461cbc6f83 profile rest
All checks were successful
Deploy / publish-web (push) Successful in 46s
2025-12-26 01:25:14 +06:00
a5cda8828f refactor
All checks were successful
Deploy / deploy (push) Successful in 34s
2025-12-26 01:22:34 +06:00
778f0a5687 refactor
All checks were successful
Deploy / deploy (push) Successful in 35s
2025-12-26 01:18:54 +06:00
2aca9bca08 refactor
All checks were successful
Deploy / deploy (push) Successful in 40s
2025-12-26 01:13:21 +06:00
7ed23df3e9 refactor
All checks were successful
Deploy / deploy (push) Successful in 39s
2025-12-26 01:08:44 +06:00
2ac88f1010 user preferences
All checks were successful
Deploy / publish-web (push) Successful in 2m14s
2025-12-25 22:53:12 +06:00
c2cffd18de user preferences 2025-12-25 22:51:02 +06:00
bf38267c37 user preferences
All checks were successful
Deploy / deploy (push) Successful in 36s
2025-12-25 22:50:56 +06:00
22c5fafb11 user preferences
All checks were successful
Deploy / deploy (push) Successful in 36s
2025-12-25 21:30:30 +06:00
37683c42a9 user preferences
All checks were successful
Deploy / deploy (push) Successful in 35s
2025-12-25 21:27:54 +06:00
2cbc75d7e3 user preferences
All checks were successful
Deploy / deploy (push) Successful in 37s
2025-12-25 21:24:41 +06:00
6721f63d22 user preferences
All checks were successful
Deploy / deploy (push) Successful in 36s
2025-12-25 21:22:43 +06:00
b47643552f user preferences
All checks were successful
Deploy / deploy (push) Successful in 36s
2025-12-25 21:08:14 +06:00
0ab3e15784 cors origins
All checks were successful
Deploy / deploy (push) Successful in 37s
2025-12-25 07:38:07 +06:00
28c64edaf8 update 2025-12-25 07:33:18 +06:00
67a8dc7782 update 2025-12-25 07:30:57 +06:00
43a8b98a6a update 2025-12-25 07:21:45 +06:00
0f9a7e39ce update 2025-12-25 07:21:30 +06:00
8265e2d719 update 2025-12-25 03:51:29 +06:00
4f91309f7f update 2025-12-24 06:29:44 +06:00
bcd457e2d6 update 2025-12-24 06:20:11 +06:00
8eef4fc477 update 2025-12-24 04:39:46 +06:00
614867bd12 update 2025-12-24 04:35:41 +06:00
cdf2bf5952 update 2025-12-24 04:35:13 +06:00
a4bd6705b6 Merge branch 'master' of git.koptilnya.xyz:opti1337/chad
Some checks failed
Deploy / publish-windows (push) Has been cancelled
2025-12-24 04:03:07 +06:00
723048c72a update 2025-12-24 04:02:53 +06:00
06ea0cd488 Обновить .gitea/workflows/deploy-client.yml
Some checks failed
Deploy / publish-windows (push) Failing after 6m3s
2025-12-23 19:52:47 +00:00
46 changed files with 1343 additions and 606 deletions

View File

@@ -1,16 +1,55 @@
name: Deploy name: Deploy
on: on:
workflow_dispatch:
push: push:
tags: tags:
- "v[0-9]+.[0-9]+.[0-9]+" - "v[0-9]+.[0-9]+.[0-9]+"
# paths: # paths:
# - ".gitea/workflows/deploy-client.yml" # - ".gitea/workflows/deploy-client.yml"
# - "client/**" # - "client/**"
jobs: jobs:
publish-windows: # publish-windows:
# runs-on: ubuntu-latest
#
# steps:
# - name: Keyscan
# run: |
# ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts
#
# - name: Checkout
# uses: actions/checkout@v4
# with:
# ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
# ssh-strict: false
# persist-credentials: false
#
# - name: Build
# run: |
# docker build \
# -t chad-client-windows-builder \
# -f ./client/Dockerfile.windows \
# ./client \
# --build-arg COMMIT_SHA=${{ gitea.sha }} \
# --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} \
# --build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
#
# docker create --name chad-client-windows-container chad-client-windows-builder
# mkdir -p artifacts
# docker cp chad-client-windows-container:/artifacts artifacts/
# docker rm chad-client-windows-container
# ls -la artifacts
#
# - name: Publish
# uses: akkuman/gitea-release-action@v1
# with:
# files: |
# artifacts/**
# draft: true
publish-web:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@@ -26,57 +65,19 @@ jobs:
persist-credentials: false persist-credentials: false
- name: Build - name: Build
run: docker build -t chad-client -f ./client/Dockerfile.web ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }}
- name: Stop old container
run: docker rm -f chad-client || true
- name: Run
run: | run: |
docker build \ docker run -d \
-t chad-client-windows-builder \ --name chad-client \
-f ./client/Dockerfile.windows \ --network traefik \
./client \ --label "traefik.enable=true" \
--build-arg COMMIT_SHA=${{ gitea.sha }} \ --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \
--build-arg API_BASE_URL=${{ vars.API_BASE_URL }} \ --label "traefik.http.routers.chad-client.entrypoints=websecure" \
--build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \
--label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
docker create --name chad-client-windows-container chad-client-windows-builder chad-client:latest
mkdir -p artifacts
docker cp chad-client-windows-container:/artifacts artifacts/
docker rm chad-client-windows-container
ls -la artifacts
- name: Publish
uses: akkuman/gitea-release-action@v1
with:
files: |
artifacts/**
draft: true
# publish-web:
# runs-on: ubuntu-latest
# steps:
# - name: Keyscan
# run: |
# ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts
# - name: Checkout
# uses: actions/checkout@v4
# with:
# ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
# ssh-strict: false
# persist-credentials: false
# - name: Build
# run: docker build -t chad-client -f ./client/Dockerfile.web ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }}
# - name: Stop old container
# run: docker rm -f chad-client || true
# - name: Run
# run: |
# docker run -d \
# --name chad-client \
# --network traefik \
# --label "traefik.enable=true" \
# --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \
# --label "traefik.http.routers.chad-client.entrypoints=websecure" \
# --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \
# --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
# chad-client:latest

Binary file not shown.

View File

@@ -6,8 +6,9 @@ RUN corepack enable
RUN yarn set version stable RUN yarn set version stable
COPY package.json yarn.lock .yarnrc.yml ./ COPY package.json yarn.lock .yarnrc.yml ./
COPY .yarn ./.yarn
RUN yarn install RUN yarn install --immutable
COPY . . COPY . .
ARG COMMIT_SHA=unknown ARG COMMIT_SHA=unknown

View File

@@ -7,7 +7,5 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
console.group('Build Info') const route = useRoute()
console.log(`COMMIT_SHA: ${__COMMIT_SHA__}`)
console.groupEnd()
</script> </script>

View File

@@ -6,8 +6,25 @@ body {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
background-image: radial-gradient(var(--p-surface-700), var(--p-surface-800));
background-size: 200% 200%;
background-position: left -100% top -100%;
} }
#__nuxt { #__nuxt {
--p-scrollpanel-bar-size: 5px;
--p-scrollpanel-bar-background: var(--p-surface-950);
--p-divider-horizontal-margin: 2rem 0 1rem;
height: 100%; height: 100%;
} }
.p-divider {
&:first-child {
--p-divider-horizontal-margin: 1rem 0 1rem;
}
}
.p-scrollpanel-bar-y {
translate: -0.25rem;
}

View File

@@ -13,16 +13,18 @@ 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']
PrimeFieldset: typeof import('primevue/fieldset')['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']
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']
} }

View File

@@ -1,25 +0,0 @@
<template>
<div
class="flex items-center justify-between gap-2 border-b-2 border-surface-800 px-3 py-3"
:class="{
'bg-surface-950': !secondary,
'bg-surface-900': secondary,
}"
style="height: 75px;"
>
<slot name="left">
<h1>
{{ title }}
</h1>
</slot>
<slot name="right" />
</div>
</template>
<script setup lang="ts">
defineProps<{
title: string
secondary?: boolean
}>()
</script>

View File

@@ -1,21 +1,23 @@
<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 overflow-hidden">
<div class="text-sm leading-5 font-medium text-color whitespace-nowrap overflow-ellipsis"> <div class="overflow-hidden text-sm leading-5 font-medium text-color whitespace-nowrap overflow-ellipsis">
{{ client.displayName }} {{ client.displayName }}
</div> </div>
<div v-if="client.username !== client.displayName" class="mt-1 text-xs leading-5 text-muted-color"> <div v-if="client.username !== client.displayName" class="overflow-hidden mt-1 text-xs leading-5 text-muted-color">
{{ client.username }} {{ client.username }}
</div> </div>
</div> </div>
<PrimeBadge v-if="audioConsumerPaused" severity="info" value="Muted" /> <PrimeBadge v-if="client.outputMuted" severity="info" value="No sound" />
<PrimeBadge v-else-if="inputMuted" severity="info" value="Muted" />
<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,29 +42,31 @@
<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 { useLocalStorage } from '@vueuse/core'
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 volume = useLocalStorage<number>(computed(() => `CLIENT_VOLUME_${props.client.userId}`), 100, { writeDefaults: false })
const menuRef = useTemplateRef<HTMLAudioElement>('menu') const menuRef = useTemplateRef<HTMLAudioElement>('menu')
const volume = ref(100)
const menuItems: MenuItem[] = [ const menuItems: MenuItem[] = [
{ // {
label: 'Mute', // label: 'Mute',
icon: 'pi pi-headphones', // icon: 'pi pi-headphones',
}, // },
{ // {
label: 'DM', // label: 'DM',
icon: 'pi pi-comment', // icon: 'pi pi-comment',
disabled: true, // disabled: true,
}, // },
] ]
const isMe = computed(() => { const isMe = computed(() => {
@@ -78,9 +82,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,11 +98,8 @@ const audioTrack = computed(() => {
const { setGain } = useAudioContext(audioTrack) const { setGain } = useAudioContext(audioTrack)
watch(volume, (volume) => { watch(volume, (volume) => {
if (outputMuted.value) setGain(outputMuted.value ? 0 : (volume * 0.01))
return }, { immediate: true })
setGain(volume * 0.01)
})
watch(outputMuted, (outputMuted) => { watch(outputMuted, (outputMuted) => {
setGain(outputMuted ? 0 : (volume.value * 0.01)) setGain(outputMuted ? 0 : (volume.value * 0.01))

View File

@@ -6,76 +6,102 @@ import { useClients } from '~/composables/use-clients'
export const useApp = createGlobalState(() => { export const useApp = createGlobalState(() => {
const { clients } = useClients() const { clients } = useClients()
const mediasoup = useMediasoup() const mediasoup = useMediasoup()
const signaling = useSignaling()
const toast = useToast() const toast = useToast()
const inputMuted = ref(false) const ready = ref(false)
const outputMuted = ref(false)
const previousInputMuted = ref(inputMuted.value)
const isTauri = computed(() => '__TAURI_INTERNALS__' in window) const isTauri = computed(() => '__TAURI_INTERNALS__' in window)
const commitSha = __COMMIT_SHA__
const version = computedAsync(() => isTauri.value ? getVersion() : 'web', '-') const version = computedAsync(() => isTauri.value ? getVersion() : 'web', '-')
function muteInput() { const inputMuted = computed(() => {
inputMuted.value = true return !!mediasoup.micProducer.value?.paused
} })
const previousInputMuted = ref(inputMuted.value)
function unmuteInput() { const outputMuted = ref(false)
inputMuted.value = false
}
function toggleInput() { const sharingEnabled = computed(() => {
return !!mediasoup.shareProducer.value
})
async function muteInput() {
if (inputMuted.value) if (inputMuted.value)
unmuteInput() return
else
muteInput()
}
function muteOutput() {
outputMuted.value = true
}
function unmuteOutput() {
outputMuted.value = false
}
function toggleOutput() {
if (outputMuted.value)
unmuteOutput()
else
muteOutput()
}
watch(inputMuted, async (inputMuted) => {
if (inputMuted) {
await mediasoup.pauseProducer('microphone') await mediasoup.pauseProducer('microphone')
toast.add({ severity: 'info', summary: 'Microphone muted', closable: false, life: 1000 })
} }
else {
async function unmuteInput() {
if (!inputMuted.value)
return
if (outputMuted.value) { if (outputMuted.value) {
outputMuted.value = false await unmuteOutput()
}
await mediasoup.resumeProducer('microphone')
} }
const toastText = inputMuted ? 'Microphone muted' : 'Microphone activated' await mediasoup.resumeProducer('microphone')
toast.add({ severity: 'info', summary: toastText, closable: false, life: 1000 })
toast.add({ severity: 'info', summary: 'Microphone activated', closable: false, life: 1000 })
}
async function toggleInput() {
if (inputMuted.value)
await unmuteInput()
else
await muteInput()
}
async function muteOutput() {
if (outputMuted.value)
return
outputMuted.value = true
previousInputMuted.value = inputMuted.value
await muteInput()
await signaling.socket.value?.emitWithAck('updateClient', {
outputMuted: false,
}) })
watch(outputMuted, (outputMuted) => { toast.add({ severity: 'info', summary: 'Sound muted', closable: false, life: 1000 })
if (outputMuted) { }
previousInputMuted.value = inputMuted.value
muteInput() async function unmuteOutput() {
outputMuted.value = false
if (!previousInputMuted.value)
await unmuteInput()
await signaling.socket.value?.emitWithAck('updateClient', {
outputMuted: false,
})
toast.add({ severity: 'info', summary: 'Sound resumed', closable: false, life: 1000 })
}
async function toggleOutput() {
if (outputMuted.value)
await unmuteOutput()
else
await muteOutput()
}
async function toggleShare() {
if (!mediasoup.shareProducer.value) {
await mediasoup.enableShare()
} }
else { else {
inputMuted.value = previousInputMuted.value await mediasoup.disableProducer('share')
}
} }
const toastText = outputMuted ? 'Sound muted' : 'Sound resumed'
toast.add({ severity: 'info', summary: toastText, closable: false, life: 1000 })
})
return { return {
ready,
clients, clients,
inputMuted, inputMuted,
muteInput, muteInput,
@@ -87,5 +113,8 @@ export const useApp = createGlobalState(() => {
toggleOutput, toggleOutput,
version, version,
isTauri, isTauri,
commitSha,
toggleShare,
sharingEnabled,
} }
}) })

View File

@@ -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

View File

@@ -0,0 +1,28 @@
import { createGlobalState, useDevicesList } from '@vueuse/core'
export const useDevices = createGlobalState(() => {
const {
ensurePermissions,
permissionGranted,
videoInputs,
audioInputs,
audioOutputs,
} = useDevicesList()
async function getShareStream(fps = 30) {
return navigator.mediaDevices.getDisplayMedia({
audio: false,
video: {
displaySurface: 'monitor',
frameRate: { max: fps },
},
})
}
return {
videoInputs: computed<MediaDeviceInfo[]>(() => JSON.parse(JSON.stringify(videoInputs.value))),
audioInputs: computed<MediaDeviceInfo[]>(() => JSON.parse(JSON.stringify(audioInputs.value))),
audioOutputs: computed<MediaDeviceInfo[]>(() => JSON.parse(JSON.stringify(audioOutputs.value))),
getShareStream,
}
})

View File

@@ -1,4 +1,5 @@
import type { ChadClient } from '#shared/types' import type { ChadClient } from '#shared/types'
import type { MediaKind, ProducerOptions } from 'mediasoup-client/types'
import { createSharedComposable } from '@vueuse/core' import { createSharedComposable } from '@vueuse/core'
import * as mediasoupClient from 'mediasoup-client' import * as mediasoupClient from 'mediasoup-client'
import { usePreferences } from '~/composables/use-preferences' import { usePreferences } from '~/composables/use-preferences'
@@ -25,7 +26,6 @@ export const useMediasoup = createSharedComposable(() => {
const signaling = useSignaling() const signaling = useSignaling()
const { addClient, removeClient } = useClients() const { addClient, removeClient } = useClients()
const preferences = usePreferences() const preferences = usePreferences()
const { me } = useAuth()
const device = shallowRef<mediasoupClient.Device>() const device = shallowRef<mediasoupClient.Device>()
const rtpCapabilities = shallowRef<mediasoupClient.types.RtpCapabilities>() const rtpCapabilities = shallowRef<mediasoupClient.types.RtpCapabilities>()
@@ -158,7 +158,7 @@ export const useMediasoup = createSharedComposable(() => {
producerId, producerId,
kind, kind,
rtpParameters, rtpParameters,
streamId: `${socketId}-${appData.share ? 'share' : 'mic-webcam'}`, streamId: `${socketId}-${appData.source === 'share' ? 'share' : 'mic-webcam'}`,
appData: { ...appData, socketId }, appData: { ...appData, socketId },
}) })
@@ -234,30 +234,77 @@ export const useMediasoup = createSharedComposable(() => {
return consumers.value.values().filter(consumer => consumer.appData.socketId === socketId) return consumers.value.values().filter(consumer => consumer.appData.socketId === socketId)
} }
async function enableMic() { async function enableProducer(type: ProducerType, options: ProducerOptions) {
if (micProducer.value) const producer = getProducerByType(type)
if (producer.value)
return return
if (!device.value || !sendTransport.value) if (!device.value || !sendTransport.value)
return return
if (!device.value.canProduce('audio')) if (!options.track)
return return
if (!device.value.canProduce(options.track.kind as MediaKind))
return
producer.value = await sendTransport.value.produce(options)
producers.value.set(producer.value.id, producer.value)
triggerRef(producers)
triggerRef(producer)
producer.value.on('transportclose', () => {
micProducer.value = undefined
})
producer.value.on('trackended', () => {
disableProducer(type)
})
}
async function disableProducer(type: ProducerType) {
const producer = getProducerByType(type)
if (!signaling.socket.value || !producer.value)
return
producers.value.delete(producer.value.id)
try {
producer.value.close()
await signaling.socket.value.emitWithAck('closeProducer', {
producerId: producer.value.id,
})
}
catch {
}
finally {
triggerRef(producers)
triggerRef(producer)
}
producer.value = undefined
}
async function enableMic() {
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)
return return
micProducer.value = await sendTransport.value.produce({ await enableProducer('microphone', {
track, track,
codecOptions: { codecOptions: {
opusStereo: true, opusStereo: true,
@@ -265,37 +312,41 @@ export const useMediasoup = createSharedComposable(() => {
opusFec: false, // Фиксит пакет лос opusFec: false, // Фиксит пакет лос
}, },
}) })
producers.value.set(micProducer.value.id, micProducer.value)
triggerRef(producers)
micProducer.value.on('transportclose', () => {
micProducer.value = undefined
})
micProducer.value.on('trackended', () => {
disableMic()
})
} }
async function disableMic() { async function disableMic() {
if (!signaling.socket.value || !micProducer.value) await disableProducer('microphone')
}
async function enableShare() {
if (!device.value)
return return
producers.value.delete(micProducer.value.id) const stream = await navigator.mediaDevices.getDisplayMedia({
triggerRef(producers) audio: false,
video: {
try { displaySurface: 'monitor',
micProducer.value.close() frameRate: { max: 30 },
},
await signaling.socket.value.emitWithAck('closeProducer', {
producerId: micProducer.value.id,
}) })
}
catch {
}
micProducer.value = undefined const track = stream.getVideoTracks()[0]
if (!track)
return
await enableProducer('share', {
track,
codec: device.value.rtpCapabilities.codecs?.find(
c => c.mimeType.toLowerCase() === 'video/h264',
),
codecOptions: {
videoGoogleStartBitrate: 1000,
},
appData: {
source: 'share',
},
})
} }
async function pauseProducer(type: ProducerType) { async function pauseProducer(type: ProducerType) {
@@ -304,21 +355,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 +383,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 +409,28 @@ 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,
preferences.echoCancellation,
preferences.autoGainControl,
preferences.noiseSuppression,
], async ([inputDeviceId]) => {
await disableMic()
if (!inputDeviceId)
return
await enableMic()
})
return { return {
init, init,
consumers, consumers,
@@ -372,5 +445,7 @@ export const useMediasoup = createSharedComposable(() => {
getClientConsumers, getClientConsumers,
pauseProducer, pauseProducer,
resumeProducer, resumeProducer,
enableShare,
disableProducer,
} }
}) })

View File

@@ -1,22 +1,65 @@
import { createGlobalState, useDevicesList } from '@vueuse/core' import chadApi from '#shared/chad-api'
import { createGlobalState, useLocalStorage, watchDebounced } from '@vueuse/core'
export interface SyncedPreferences {
toggleInputHotkey: string
toggleOutputHotkey: string
volumes: Record<Client['id'], number>
}
export const usePreferences = createGlobalState(() => { export const usePreferences = createGlobalState(() => {
const inputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>() const { videoInputs, audioInputs, audioOutputs } = useDevices()
const outputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>()
const { const synced = ref(false)
ensurePermissions,
permissionGranted, const inputDeviceId = useLocalStorage<MediaDeviceInfo['deviceId']>('INPUT_DEVICE_ID', 'default')
videoInputs, const outputDeviceId = useLocalStorage<MediaDeviceInfo['deviceId']>('OUTPUT_DEVICE_ID', 'default')
audioInputs,
audioOutputs, const autoGainControl = useLocalStorage('AUTO_GAIN_CONTROL', false)
} = useDevicesList() const noiseSuppression = useLocalStorage('NOISE_SUPPRESSION', true)
const echoCancellation = useLocalStorage('ECHO_CANCELLATION', true)
const toggleInputHotkey = ref<SyncedPreferences['toggleInputHotkey']>('')
const toggleOutputHotkey = ref<SyncedPreferences['toggleOutputHotkey']>('')
const inputDeviceExist = computed(() => {
return audioInputs.value.some(device => device.deviceId === inputDeviceId.value)
})
const outputDeviceExist = computed(() => {
return audioOutputs.value.some(device => device.deviceId === outputDeviceId.value)
})
watchDebounced(
[toggleInputHotkey, toggleOutputHotkey],
async ([toggleInputHotkey, toggleOutputHotkey]) => {
try {
await chadApi(
'/preferences',
{
method: 'PATCH',
body: {
toggleInputHotkey,
toggleOutputHotkey,
},
},
)
}
catch {}
},
{ debounce: 1000 },
)
return { return {
synced,
inputDeviceId, inputDeviceId,
outputDeviceId, outputDeviceId,
videoInputs, autoGainControl,
audioInputs, noiseSuppression,
audioOutputs, echoCancellation,
toggleInputHotkey,
toggleOutputHotkey,
inputDeviceExist,
outputDeviceExist,
} }
}) })

View File

@@ -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,

View File

@@ -22,6 +22,7 @@ export const useUpdater = createGlobalState(() => {
return { return {
lastUpdate, lastUpdate,
checking,
checkForUpdates, checkForUpdates,
} }
}) })

View File

@@ -27,7 +27,6 @@ const options = computed(() => {
{ {
label: 'Register', label: 'Register',
routeName: 'Register', routeName: 'Register',
}, },
] ]
}) })

View File

@@ -1,52 +1,116 @@
<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
icon="pi pi-microphone" size="large" :severity="inputMuted ? 'contrast' : 'secondary'"
:outlined="!inputMuted" @click="toggleInput"
/>
<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" />
</template>
</AppHeader>
<div v-auto-animate class="p-3 overflow-y-auto flex-1 bg-surface-900 overflow-hidden divide-y divide-surface-800">
<ClientRow v-for="client of clients" :key="client.id" :client="client" />
</div>
</div>
<div class="overflow-y-auto">
<slot />
</div>
</div>
<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 v-if="isTauri" class="opacity-50" severity="secondary" :value="version" size="small" />
<PrimeBadge :severity="connected ? 'success' : 'danger' " /> <PrimeBadge :severity="connected ? 'success' : 'danger' " />
</div> </div>
<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>
<PrimeButton outlined @click="toggleShare">
<template #icon>
<Component :is="sharingEnabled ? ScreenShareOff : ScreenShare" />
</template>
</PrimeButton>
</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>
</PrimeSelectButton>
</div>
<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" />
</div>
</PrimeScrollPanel>
<PrimeScrollPanel class="bg-surface-900 rounded-xl" style="min-height: 0">
<div class="p-3">
<slot />
</div>
</PrimeScrollPanel>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri } = useApp() import {
MessageCircle,
Mic,
MicOff,
ScreenShare,
ScreenShareOff,
Settings,
UserPen,
Volume2,
VolumeOff,
} from 'lucide-vue-next'
const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri, sharingEnabled, toggleShare } = 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>

View File

@@ -7,7 +7,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
if (!isTauri.value) if (!isTauri.value)
return return
if (from?.name) if (from?.name || !!to.redirectedFrom)
return return
const { checkForUpdates } = useUpdater() const { checkForUpdates } = useUpdater()
@@ -15,6 +15,6 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
const update = await checkForUpdates() const update = await checkForUpdates()
if (update) { if (update) {
return navigateTo({ name: 'Updating' }) return navigateTo({ name: 'Updater' })
} }
}) })

View File

@@ -3,9 +3,12 @@ import chadApi from '#shared/chad-api'
export default defineNuxtRouteMiddleware(async (to, from) => { export default defineNuxtRouteMiddleware(async (to, from) => {
const { me, setMe } = useAuth() const { me, setMe } = useAuth()
if (!me.value && !from?.name) { if (!me.value) {
try { try {
setMe(await chadApi('/me')) setMe(await chadApi('/me', { method: 'GET' }))
if (to.meta.auth !== false)
return navigateTo({ name: 'Index' })
} }
catch { catch {
if (to.meta.auth !== 'guest') { if (to.meta.auth !== 'guest') {

View File

@@ -0,0 +1,26 @@
import type { SyncedPreferences } from '~/composables/use-preferences'
import chadApi from '#shared/chad-api'
export default defineNuxtRouteMiddleware(async () => {
const { me } = useAuth()
if (!me.value)
return
const { synced, toggleInputHotkey, toggleOutputHotkey } = usePreferences()
if (synced.value)
return
try {
const preferences = await chadApi<SyncedPreferences>('/preferences', { method: 'GET' })
if (!preferences)
return
toggleInputHotkey.value = preferences.toggleInputHotkey ?? toggleInputHotkey.value
toggleOutputHotkey.value = preferences.toggleOutputHotkey ?? toggleOutputHotkey.value
synced.value = true
}
catch {}
})

View File

@@ -1,62 +1,49 @@
<template> <template>
<div class="flex flex-col gap-3 p-3 pt-12"> <div>
<PrimePanel header="Clients" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }"> <div class="flex items-center justify-center">
<dl v-for="client in clients" :key="client.socketId" class=""> <PrimeCard>
<div v-for="(value, key) in client" :key="key" class="py-2"> <template #content>
<dt class="font-bold"> The chat is under development.
{{ key }} </template>
</dt> </PrimeCard>
<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"> --> <video
<!-- <PrimeCard> --> v-if="!!shareConsumer"
<!-- <template #subtitle> --> ref="shareVideo"
<!-- Important information --> class="w-full aspect-video border border-surface-700 rounded mt-6 cursor-pointer"
<!-- </template> --> autoplay
playsinline
<!-- <template #content> --> @click="toFullscreen"
<!-- The chat is under development. --> />
<!-- </template> --> </div>
<!-- </PrimeCard> -->
<!-- </div> -->
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
const { clients } = useClients() import { unrefElement } from '@vueuse/core'
const { producers, consumers } = useMediasoup()
definePageMeta({ definePageMeta({
name: 'Index',
}) })
const shareVideoRef = useTemplateRef('shareVideo')
const { consumers } = useMediasoup()
const shareConsumer = computed(() => {
return consumers.value.values().find(consumer => consumer.kind === 'video' && consumer.appData?.source === 'share')
})
watchEffect(() => {
if (!shareVideoRef.value || !shareConsumer.value)
return
const stream = new MediaStream([shareConsumer.value.track])
unrefElement(shareVideoRef)!.srcObject = stream
})
function toFullscreen() {
unrefElement(shareVideoRef)?.requestFullscreen()
}
</script> </script>

View File

@@ -1,95 +1,161 @@
<template> <template>
<div> <div>
<AppHeader title="Preferences" secondary /> <PrimeDivider align="left">
Audio
</PrimeDivider>
<form class="flex flex-col gap-3 p-3" @submit.prevent="save">
<PrimeFloatLabel variant="on"> <PrimeFloatLabel variant="on">
<PrimeInputText id="username" v-model="displayName" size="large" fluid autocomplete="off" /> <PrimeSelect
<label for="username">Username</label> v-model="inputDeviceId"
:options="audioInputs"
option-label="label"
option-value="deviceId"
input-id="inputDevice"
fluid
:invalid="!inputDeviceExist"
/>
<label for="inputDevice">Input device</label>
</PrimeFloatLabel> </PrimeFloatLabel>
<PrimeButton label="Save" type="submit" :disabled="!valid" /> <div class="flex items-center gap-2 mt-3">
</form> <PrimeToggleSwitch v-model="autoGainControl" input-id="autoGainControl" />
<label for="autoGainControl">Auto Gain Control</label>
<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" />
</div> <label for="echoCancellation">Echo Cancellation</label>
</div> </div>
<PrimeToast position="bottom-center" group="updater"> <div class="flex items-center gap-2 mt-3">
<template #container="slotProps"> <PrimeToggleSwitch v-model="noiseSuppression" input-id="noiseSuppression" />
<div class="p-3"> <label for="noiseSuppression">Noise Suppression</label>
<div class="font-medium text-lg mb-4">
{{ slotProps.message.detail }}
</div>
<div class="flex gap-3">
<PrimeButton size="small" label="Update now" @click="() => {}" />
<PrimeButton size="small" label="Later" severity="secondary" outlined @click="slotProps.closeCallback()" />
</div>
</div> </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 align="left">
Hotkeys
</PrimeDivider>
<PrimeFloatLabel variant="on">
<PrimeInputText id="microphoneToggle" :model-value="toggleInputHotkey" fluid @keydown="setupToggleInputHotkey" />
<label for="microphoneToggle">Toggle microphone</label>
</PrimeFloatLabel>
<PrimeFloatLabel variant="on" class="mt-3">
<PrimeInputText id="soundToggle" :model-value="toggleOutputHotkey" fluid @keydown="setupToggleOutputHotkey" />
<label for="soundToggle">Toggle sound</label>
</PrimeFloatLabel>
</template> </template>
</PrimeToast>
<PrimeDivider align="left">
About
</PrimeDivider>
<p v-if="version" class="text-muted-color text-sm">
VERSION: {{ version }}
</p>
<p class="text-muted-color text-sm mt-2">
COMMIT_SHA: {{ commitSha }}
</p>
<template v-if="isTauri">
<PrimeButton
v-if="lastUpdate"
class="mt-3"
size="small"
label="Install new version"
fluid
severity="success"
@click="navigateTo({ name: 'Updater' })"
/>
<PrimeButton
v-else
class="mt-3"
size="small"
label="Check for Updates"
fluid
severity="info"
:loading="checking"
@click="checkForUpdates"
/>
</template>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import type { RemovableRef } from '@vueuse/core'
definePageMeta({ definePageMeta({
name: 'Preferences', name: 'Preferences',
}) })
const { isTauri, version, commitSha } = useApp()
const { checking, checkForUpdates, lastUpdate } = useUpdater()
const { audioInputs, audioOutputs } = useDevices()
const {
inputDeviceId,
outputDeviceId,
autoGainControl,
noiseSuppression,
echoCancellation,
toggleInputHotkey,
toggleOutputHotkey,
inputDeviceExist,
outputDeviceExist,
} = usePreferences()
const { isTauri } = useApp() const setupToggleInputHotkey = (event: KeyboardEvent) => setupHotkey(event, toggleInputHotkey)
const { checkForUpdates } = useUpdater() const setupToggleOutputHotkey = (event: KeyboardEvent) => setupHotkey(event, toggleOutputHotkey)
const { me, setMe, logout } = useAuth()
const signaling = useSignaling() function setupHotkey(event: KeyboardEvent, model: RemovableRef<string>) {
const toast = useToast() if (event.key === 'Tab' || event.key === 'Enter') {
return
}
const displayName = ref(me.value?.displayName || '') event.preventDefault()
const valid = computed(() => { const hotkey = []
if (!displayName.value || !me.value)
return false
if (displayName.value === me.value.displayName) if (event.ctrlKey || event.metaKey)
return false hotkey.push('CommandOrControl')
if (event.altKey)
hotkey.push('Alt')
if (event.shiftKey)
hotkey.push('Shift')
return true const modifierApplied = hotkey.length > 0
})
async function onCheckForUpdates() { if (!modifierApplied && ['Escape', 'Backspace', 'Delete'].includes(event.key)) {
const update = await checkForUpdates() model.value = ''
toast.removeGroup('updater')
if (!update) {
toast.add({ severity: 'success', summary: 'You are up to date', closable: false, life: 1000 })
return return
} }
toast.add({ if (!['Control', 'Shift', 'Alt'].includes(event.key)) {
group: 'updater', hotkey.push(event.key.toUpperCase())
severity: 'info', }
detail: `Version ${update?.version ?? '1.0.1'} is available!`,
closable: false,
})
// asdasd if (modifierApplied && hotkey.length === 1) {
} model.value = ''
async function save() {
if (!valid.value)
return return
}
const updatedMe = await signaling.socket.value?.emitWithAck('updateClient', { model.value = hotkey.join('+')
displayName: displayName.value,
})
setMe({ ...me.value, displayName: updatedMe.displayName })
toast.add({ severity: 'success', summary: 'Saved', life: 1000, closable: false })
} }
</script> </script>

View File

@@ -0,0 +1,68 @@
<template>
<form @submit.prevent="save()">
<PrimeDivider align="left">
General
</PrimeDivider>
<PrimeFloatLabel variant="on">
<PrimeInputText id="displayName" v-model="displayName" fluid autocomplete="off" />
<label for="displayName">Display name</label>
</PrimeFloatLabel>
<div class="flex items-center gap-3 mt-6">
<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 chadApi from '#shared/chad-api'
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 chadApi('/profile', {
method: 'PATCH',
body: {
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>

View File

@@ -23,7 +23,6 @@ definePageMeta({
auth: false, auth: false,
middleware: () => { middleware: () => {
const { lastUpdate } = useUpdater() const { lastUpdate } = useUpdater()
if (!lastUpdate.value) if (!lastUpdate.value)
return navigateTo('/') return navigateTo('/')
}, },

View File

@@ -0,0 +1,7 @@
export default defineNuxtPlugin({
setup() {
console.group('Build Info')
console.log(`COMMIT_SHA: ${__COMMIT_SHA__}`)
console.groupEnd()
},
})

View File

@@ -0,0 +1,45 @@
import { isRegistered, register, unregister, unregisterAll } from '@tauri-apps/plugin-global-shortcut'
export default defineNuxtPlugin({
async setup() {
const { isTauri, toggleInput, toggleOutput } = useApp()
const preferences = usePreferences()
if (!isTauri.value)
return
await unregisterAll()
watch(preferences.toggleInputHotkey, async (shortcut, prevShortcut) => {
await registerHotkey(shortcut, prevShortcut, toggleInput)
}, {
immediate: true,
})
watch(preferences.toggleOutputHotkey, async (shortcut, prevShortcut) => {
await registerHotkey(shortcut, prevShortcut, toggleOutput)
}, {
immediate: true,
})
async function registerHotkey(shortcut: string, prevShortcut: string | undefined, cb: () => void) {
if (!!prevShortcut && await isRegistered(prevShortcut)) {
await unregister(prevShortcut)
}
if (!shortcut)
return
if (await isRegistered(shortcut)) {
await unregister(shortcut)
}
await register(shortcut, ({ state }) => {
if (state !== 'Released')
return
cb()
})
}
},
})

View File

@@ -1,11 +0,0 @@
{
"pub_date": "2025-10-19T23:31:56Z",
"version": "0.2.4",
"platforms": {
"windows-x86_64": {
"url": "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/chad_0.2.4_x64-setup.exe",
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUMHdwTUN1SnhESjA5ekxpMGNPQURBSWVYekdEb3kxZ2tKVUNyMVRmcG9vckpsT1Fhcm9PTFp4ZVdDdEtvdWVDYWY0bkJBWjZOby9QNkNNWFJUT1VBY0tRZVNXUVl6eVEwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzYwOTE2NzE1CWZpbGU6Y2hhZF8wLjIuNF94NjQtc2V0dXAuZXhlCitPYjR2QjNxNk9HdjV1WmdnUFFWRWxraDJzUFZrd1p2bGwrcEpaWjEzZExaQUJvWWNjL1VWWFZlVG4yR2hIeDFSNzJTRk1MMDVtdGo4NGE0ckp0bERBPT0K"
}
},
"notes": ""
}

View File

@@ -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'),
}, },
}, },

View File

@@ -14,9 +14,12 @@
"@nuxt/fonts": "^0.11.4", "@nuxt/fonts": "^0.11.4",
"@primeuix/themes": "^1.2.5", "@primeuix/themes": "^1.2.5",
"@tailwindcss/vite": "^4.1.14", "@tailwindcss/vite": "^4.1.14",
"@tauri-apps/plugin-global-shortcut": "~2",
"@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",
"hotkeys-js": "^4.0.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",

View File

@@ -4,10 +4,13 @@ const instance = $fetch.create({
baseURL: __API_BASE_URL__, baseURL: __API_BASE_URL__,
credentials: 'include', credentials: 'include',
retry: false, retry: false,
onResponseError({ response }) { onResponseError({ request, response }) {
if (!import.meta.client) if (!import.meta.client)
return return
if (typeof request === 'string' && request.endsWith('/me'))
return
const message = response._data.error || 'Something went wrong' const message = response._data.error || 'Something went wrong'
ToastEventBus.emit('add', { severity: 'error', summary: 'Error', detail: message, closable: false, life: 3000 }) ToastEventBus.emit('add', { severity: 'error', summary: 'Error', detail: message, closable: false, life: 3000 })

View File

@@ -93,6 +93,7 @@ dependencies = [
"serde_json", "serde_json",
"tauri", "tauri",
"tauri-build", "tauri-build",
"tauri-plugin-global-shortcut",
"tauri-plugin-log", "tauri-plugin-log",
"tauri-plugin-process", "tauri-plugin-process",
"tauri-plugin-single-instance", "tauri-plugin-single-instance",
@@ -292,7 +293,7 @@ dependencies = [
"miniz_oxide", "miniz_oxide",
"object", "object",
"rustc-demangle", "rustc-demangle",
"windows-link 0.2.0", "windows-link 0.2.1",
] ]
[[package]] [[package]]
@@ -603,7 +604,7 @@ dependencies = [
"iana-time-zone", "iana-time-zone",
"num-traits", "num-traits",
"serde", "serde",
"windows-link 0.2.0", "windows-link 0.2.1",
] ]
[[package]] [[package]]
@@ -1375,6 +1376,16 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "gethostname"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
dependencies = [
"rustix",
"windows-link 0.2.1",
]
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.1.16" version = "0.1.16"
@@ -1504,6 +1515,24 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
[[package]]
name = "global-hotkey"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9247516746aa8e53411a0db9b62b0e24efbcf6a76e0ba73e5a91b512ddabed7"
dependencies = [
"crossbeam-channel",
"keyboard-types",
"objc2 0.6.2",
"objc2-app-kit",
"once_cell",
"serde",
"thiserror 2.0.17",
"windows-sys 0.59.0",
"x11rb",
"xkeysym",
]
[[package]] [[package]]
name = "gobject-sys" name = "gobject-sys"
version = "0.18.0" version = "0.18.0"
@@ -4180,6 +4209,21 @@ dependencies = [
"walkdir", "walkdir",
] ]
[[package]]
name = "tauri-plugin-global-shortcut"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "424af23c7e88d05e4a1a6fc2c7be077912f8c76bd7900fd50aa2b7cbf5a2c405"
dependencies = [
"global-hotkey",
"log",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
"thiserror 2.0.17",
]
[[package]] [[package]]
name = "tauri-plugin-log" name = "tauri-plugin-log"
version = "2.7.0" version = "2.7.0"
@@ -5227,7 +5271,7 @@ checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9"
dependencies = [ dependencies = [
"windows-implement", "windows-implement",
"windows-interface", "windows-interface",
"windows-link 0.2.0", "windows-link 0.2.1",
"windows-result 0.4.0", "windows-result 0.4.0",
"windows-strings 0.5.0", "windows-strings 0.5.0",
] ]
@@ -5273,9 +5317,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
[[package]] [[package]]
name = "windows-link" name = "windows-link"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
[[package]] [[package]]
name = "windows-numerics" name = "windows-numerics"
@@ -5302,7 +5346,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
dependencies = [ dependencies = [
"windows-link 0.2.0", "windows-link 0.2.1",
] ]
[[package]] [[package]]
@@ -5320,7 +5364,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
dependencies = [ dependencies = [
"windows-link 0.2.0", "windows-link 0.2.1",
] ]
[[package]] [[package]]
@@ -5365,7 +5409,7 @@ version = "0.61.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
dependencies = [ dependencies = [
"windows-link 0.2.0", "windows-link 0.2.1",
] ]
[[package]] [[package]]
@@ -5405,7 +5449,7 @@ version = "0.53.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b"
dependencies = [ dependencies = [
"windows-link 0.2.0", "windows-link 0.2.1",
"windows_aarch64_gnullvm 0.53.0", "windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0", "windows_aarch64_msvc 0.53.0",
"windows_i686_gnu 0.53.0", "windows_i686_gnu 0.53.0",
@@ -5431,7 +5475,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "700dad7c058606087f6fdc1f88da5841e06da40334413c6cd4367b25ef26d24e" checksum = "700dad7c058606087f6fdc1f88da5841e06da40334413c6cd4367b25ef26d24e"
dependencies = [ dependencies = [
"windows-link 0.2.0", "windows-link 0.2.1",
] ]
[[package]] [[package]]
@@ -5687,6 +5731,23 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "x11rb"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
dependencies = [
"gethostname",
"rustix",
"x11rb-protocol",
]
[[package]]
name = "x11rb-protocol"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
[[package]] [[package]]
name = "xattr" name = "xattr"
version = "1.6.1" version = "1.6.1"
@@ -5697,6 +5758,12 @@ dependencies = [
"rustix", "rustix",
] ]
[[package]]
name = "xkeysym"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
[[package]] [[package]]
name = "yoke" name = "yoke"
version = "0.8.0" version = "0.8.0"

View File

@@ -26,5 +26,6 @@ tauri-plugin-log = "2"
tauri-plugin-process = "2" tauri-plugin-process = "2"
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-global-shortcut = "2"
tauri-plugin-single-instance = "2" tauri-plugin-single-instance = "2"
tauri-plugin-updater = "2" tauri-plugin-updater = "2"

View File

@@ -9,6 +9,10 @@
"main" "main"
], ],
"permissions": [ "permissions": [
"updater:default" "updater:default",
"global-shortcut:allow-is-registered",
"global-shortcut:allow-register",
"global-shortcut:allow-unregister",
"global-shortcut:allow-unregister-all"
] ]
} }

View File

@@ -1,10 +1,10 @@
#[cfg_attr(mobile, tauri::mobile_entry_point)] #[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() { pub fn run() {
tauri::Builder::default() tauri::Builder::default()
.plugin(tauri_plugin_global_shortcut::Builder::new().build())
.plugin(tauri_plugin_process::init()) .plugin(tauri_plugin_process::init())
.plugin(tauri_plugin_updater::Builder::new().build()) .plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_single_instance::init(|_, _, _| { .plugin(tauri_plugin_single_instance::init(|_, _, _| {}))
}))
.setup(|app| { .setup(|app| {
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
app.handle().plugin( app.handle().plugin(

View File

@@ -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.6", "version": "0.2.16",
"identifier": "xyz.koptilnya.chad", "identifier": "xyz.koptilnya.chad",
"build": { "build": {
"frontendDist": "../.output/public", "frontendDist": "../.output/public",

View File

@@ -2831,6 +2831,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@tauri-apps/api@npm:^2.8.0":
version: 2.9.1
resolution: "@tauri-apps/api@npm:2.9.1"
checksum: 10c0/18c76ec58b579860bfde5cd5b5ea6c3b13019d356c17d436bf395cafdf15dd1f277364cacd24cc94e5d4aa3816f39698f231773d2a18625e98702295ab0c2c8f
languageName: node
linkType: hard
"@tauri-apps/cli-darwin-arm64@npm:2.8.4": "@tauri-apps/cli-darwin-arm64@npm:2.8.4":
version: 2.8.4 version: 2.8.4
resolution: "@tauri-apps/cli-darwin-arm64@npm:2.8.4" resolution: "@tauri-apps/cli-darwin-arm64@npm:2.8.4"
@@ -2952,6 +2959,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@tauri-apps/plugin-global-shortcut@npm:~2":
version: 2.3.1
resolution: "@tauri-apps/plugin-global-shortcut@npm:2.3.1"
dependencies:
"@tauri-apps/api": "npm:^2.8.0"
checksum: 10c0/e3833a1d0bab370aecb64396ea7e701f5342e303c6fdd3870583619b50c9e2784854b85ca24c279e9871bdcd6796de878392acd1ea4cd563fda83068939e27cd
languageName: node
linkType: hard
"@tauri-apps/plugin-process@npm:~2": "@tauri-apps/plugin-process@npm:~2":
version: 2.3.0 version: 2.3.0
resolution: "@tauri-apps/plugin-process@npm:2.3.0" resolution: "@tauri-apps/plugin-process@npm:2.3.0"
@@ -4036,11 +4052,14 @@ __metadata:
"@primevue/nuxt-module": "npm:^4.4.0" "@primevue/nuxt-module": "npm:^4.4.0"
"@tailwindcss/vite": "npm:^4.1.14" "@tailwindcss/vite": "npm:^4.1.14"
"@tauri-apps/cli": "npm:^2.8.4" "@tauri-apps/cli": "npm:^2.8.4"
"@tauri-apps/plugin-global-shortcut": "npm:~2"
"@tauri-apps/plugin-process": "npm:~2" "@tauri-apps/plugin-process": "npm:~2"
"@tauri-apps/plugin-updater": "npm:~2" "@tauri-apps/plugin-updater": "npm:~2"
"@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"
hotkeys-js: "npm:^4.0.0"
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"
@@ -6206,6 +6225,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"hotkeys-js@npm:^4.0.0":
version: 4.0.0
resolution: "hotkeys-js@npm:4.0.0"
checksum: 10c0/7cf84a0a8c20ff36e3d90de83977480a035a69335afffc41597d66930be49f69c5ad0a430ef38e953ab2ec73804b2a1635f34d096c7146fef2a2f7a45b3417c8
languageName: node
linkType: hard
"http-cache-semantics@npm:^4.1.1": "http-cache-semantics@npm:^4.1.1":
version: 4.2.0 version: 4.2.0
resolution: "http-cache-semantics@npm:4.2.0" resolution: "http-cache-semantics@npm:4.2.0"
@@ -7024,6 +7050,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"

View File

@@ -25,5 +25,50 @@ export const autoConfig: mediasoup.types.RouterOptions = {
channels: 2, channels: 2,
parameters: { useinbandfec: 1, stereo: 1 }, parameters: { useinbandfec: 1, stereo: 1 },
}, },
{
kind: 'video',
mimeType: 'video/VP8',
clockRate: 90000,
parameters: {
'x-google-start-bitrate': 1000,
},
},
{
kind: 'video',
mimeType: 'video/VP9',
clockRate: 90000,
parameters: {
'profile-id': 2,
'x-google-start-bitrate': 1000,
},
},
{
kind: 'video',
mimeType: 'video/h264',
clockRate: 90000,
parameters: {
'packetization-mode': 1,
'profile-level-id': '4d0032',
'level-asymmetry-allowed': 1,
'x-google-start-bitrate': 1000,
},
},
{
kind: 'video',
mimeType: 'video/h264',
clockRate: 90000,
parameters: {
'packetization-mode': 1,
'profile-level-id': '42e01f',
'level-asymmetry-allowed': 1,
'x-google-start-bitrate': 1000,
},
},
{
kind: 'video',
mimeType: 'video/AV1',
clockRate: 90000,
parameters: {},
},
], ],
} }

View File

@@ -0,0 +1,10 @@
-- CreateTable
CREATE TABLE "UserPreferences" (
"userId" TEXT NOT NULL PRIMARY KEY,
"toggleInputHotkey" TEXT NOT NULL,
"toggleOutputHotkey" TEXT NOT NULL,
CONSTRAINT "UserPreferences_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
-- CreateIndex
CREATE INDEX "Session_userId_idx" ON "Session"("userId");

View File

@@ -0,0 +1,21 @@
/*
Warnings:
- Added the required column `volumes` to the `UserPreferences` table without a default value. This is not possible if the table is not empty.
*/
-- RedefineTables
PRAGMA defer_foreign_keys=ON;
PRAGMA foreign_keys=OFF;
CREATE TABLE "new_UserPreferences" (
"userId" TEXT NOT NULL PRIMARY KEY,
"toggleInputHotkey" TEXT NOT NULL,
"toggleOutputHotkey" TEXT NOT NULL,
"volumes" JSONB NOT NULL,
CONSTRAINT "UserPreferences_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
INSERT INTO "new_UserPreferences" ("toggleInputHotkey", "toggleOutputHotkey", "userId") SELECT "toggleInputHotkey", "toggleOutputHotkey", "userId" FROM "UserPreferences";
DROP TABLE "UserPreferences";
ALTER TABLE "new_UserPreferences" RENAME TO "UserPreferences";
PRAGMA foreign_keys=ON;
PRAGMA defer_foreign_keys=OFF;

View File

@@ -0,0 +1,15 @@
-- RedefineTables
PRAGMA defer_foreign_keys=ON;
PRAGMA foreign_keys=OFF;
CREATE TABLE "new_UserPreferences" (
"userId" TEXT NOT NULL PRIMARY KEY,
"toggleInputHotkey" TEXT,
"toggleOutputHotkey" TEXT,
"volumes" JSONB,
CONSTRAINT "UserPreferences_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
INSERT INTO "new_UserPreferences" ("toggleInputHotkey", "toggleOutputHotkey", "userId", "volumes") SELECT "toggleInputHotkey", "toggleOutputHotkey", "userId", "volumes" FROM "UserPreferences";
DROP TABLE "UserPreferences";
ALTER TABLE "new_UserPreferences" RENAME TO "UserPreferences";
PRAGMA foreign_keys=ON;
PRAGMA defer_foreign_keys=OFF;

View File

@@ -17,6 +17,7 @@ model User {
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
Session Session[] Session Session[]
UserPreferences UserPreferences?
} }
model Session { model Session {
@@ -28,3 +29,12 @@ model Session {
@@index([userId]) @@index([userId])
} }
model UserPreferences {
userId String @id
toggleInputHotkey String? @default("")
toggleOutputHotkey String? @default("")
volumes Json? @default("{}")
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
}

97
server/routes/user.ts Normal file
View File

@@ -0,0 +1,97 @@
import type { FastifyInstance } from 'fastify'
import type { Namespace } from '../types/webrtc.ts'
import { z } from 'zod'
import prisma from '../prisma/client.ts'
import { socketToClient } from '../utils/socket-to-client.ts'
export default function (fastify: FastifyInstance) {
fastify.get('/preferences', async (req, reply) => {
if (req.user) {
return prisma.userPreferences.findFirst({ where: { userId: req.user.id } })
}
reply.code(401).send(false)
})
fastify.patch('/preferences', async (req, reply) => {
if (!req.user) {
reply.code(401).send(false)
return
}
try {
const schema = z.object({
toggleInputHotkey: z.string().optional(),
toggleOutputHotkey: z.string().optional(),
volumes: z.record(z.string(), z.number()).optional(),
})
const input = schema.parse(req.body)
return prisma.userPreferences.upsert({
where: { userId: req.user.id },
create: {
userId: req.user.id,
...input,
},
update: input,
})
}
catch (err) {
fastify.log.error(err)
reply.code(400)
if (err instanceof z.ZodError) {
reply.send({ error: z.prettifyError(err) })
}
else {
reply.send({ error: err.message })
}
}
})
fastify.patch('/profile', async (req, reply) => {
if (!req.user) {
reply.code(401).send(false)
return
}
try {
const schema = z.object({
displayName: z.string().optional(),
})
const input = schema.parse(req.body)
const updatedUser = prisma.user.update({
where: { id: req.user.id },
data: {
displayName: input.displayName,
},
})
const namespace: Namespace = fastify.io.of('/webrtc')
const sockets = await namespace.fetchSockets()
const found = sockets.find(socket => socket.data.joined && socket.data.userId === req.user!.id)
if (found) {
found.data.displayName = input.displayName
namespace.emit('clientChanged', found.id, socketToClient(found))
}
return updatedUser
}
catch (err) {
fastify.log.error(err)
reply.code(400)
if (err instanceof z.ZodError) {
reply.send({ error: z.prettifyError(err) })
}
else {
reply.send({ error: err.message })
}
}
})
}

View File

@@ -17,7 +17,10 @@ fastify.register(FastifyCors, {
origin: [ origin: [
'http://localhost:3000', 'http://localhost:3000',
'http://tauri.localhost', 'http://tauri.localhost',
'https://koptilnya.xyz',
'https://chad.koptilnya.xyz',
], ],
methods: ['PATCH', 'PUT', 'OPTIONS', 'GET', 'POST', 'DELETE'],
credentials: true, credentials: true,
}) })

View File

@@ -1,145 +1,15 @@
import type { User } from '@prisma/client'
import type { types } from 'mediasoup' import type { types } from 'mediasoup'
import type { Namespace, RemoteSocket, Socket, Server as SocketServer } from 'socket.io' import type { Server as SocketServer } from 'socket.io'
import type {
Namespace,
SomeSocket,
} from '../types/webrtc.ts'
import { consola } from 'consola' import { consola } from 'consola'
import prisma from '../prisma/client.ts' import prisma from '../prisma/client.ts'
import { socketToClient } from '../utils/socket-to-client.ts'
interface ChadClient {
socketId: string
userId: User['id']
username: User['username']
displayName: User['displayName']
inputMuted: boolean
outputMuted: boolean
}
interface ProducerShort {
producerId: types.Producer['id']
kind: types.MediaKind
}
interface ErrorCallbackResult {
error: string
}
interface SuccessCallbackResult {
ok: true
}
type EventCallback<T = SuccessCallbackResult> = (result: T | ErrorCallbackResult) => void
interface ClientToServerEvents {
join: (
options: {
rtpCapabilities: types.RtpCapabilities
},
cb: EventCallback<ChadClient[]>
) => void
getRtpCapabilities: (
cb: EventCallback<types.RtpCapabilities>
) => void
createTransport: (
options: {
producing: boolean
consuming: boolean
},
cb: EventCallback<Pick<types.WebRtcTransport, 'id' | 'iceParameters' | 'iceCandidates' | 'dtlsParameters'>>
) => void
connectTransport: (
options: {
transportId: types.WebRtcTransport['id']
dtlsParameters: types.WebRtcTransport['dtlsParameters']
},
cb: EventCallback
) => void
produce: (
options: {
transportId: types.WebRtcTransport['id']
kind: types.MediaKind
rtpParameters: types.RtpParameters
},
cb: EventCallback<{ id: types.Producer['id'] }>
) => void
closeProducer: (
options: {
producerId: types.Producer['id']
},
cb: EventCallback
) => void
pauseProducer: (
options: {
producerId: types.Producer['id']
},
cb: EventCallback
) => void
resumeProducer: (
options: {
producerId: types.Producer['id']
},
cb: EventCallback
) => void
pauseConsumer: (
options: {
consumerId: types.Consumer['id']
},
cb: EventCallback
) => void
resumeConsumer: (
options: {
consumerId: types.Consumer['id']
},
cb: EventCallback
) => void
updateClient: (
options: Partial<Omit<ChadClient, 'socketId' | 'userId'>>,
cb: EventCallback<ChadClient>
) => void
}
interface ServerToClientEvents {
authenticated: () => void
newPeer: (arg: ChadClient) => void
producers: (arg: ProducerShort[]) => void
newConsumer: (
arg: {
socketId: string
producerId: types.Producer['id']
id: types.Consumer['id']
kind: types.MediaKind
rtpParameters: types.RtpParameters
type: types.ConsumerType
appData: types.Producer['appData']
producerPaused: types.Consumer['producerPaused']
},
cb: EventCallback
) => void
peerClosed: (arg: string) => void
consumerClosed: (arg: { consumerId: string }) => void
consumerPaused: (arg: { consumerId: string }) => void
consumerResumed: (arg: { consumerId: string }) => void
consumerScore: (arg: { consumerId: string, score: types.ConsumerScore }) => void
clientChanged: (clientId: ChadClient['socketId'], client: ChadClient) => void
}
interface InterServerEvent {}
interface SocketData {
joined: boolean
userId: User['id']
username: User['username']
displayName: User['displayName']
inputMuted: boolean
outputMuted: boolean
rtpCapabilities: types.RtpCapabilities
transports: Map<types.WebRtcTransport['id'], types.WebRtcTransport>
producers: Map<types.Producer['id'], types.Producer>
consumers: Map<types.Consumer['id'], types.Consumer>
}
type SomeSocket = Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvent, SocketData> | RemoteSocket<ServerToClientEvents, SocketData>
export default function (io: SocketServer, router: types.Router) { export default function (io: SocketServer, router: types.Router) {
const namespace: Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvent, SocketData> = io.of('/webrtc') const namespace: Namespace = io.of('/webrtc')
namespace.on('connection', async (socket) => { namespace.on('connection', async (socket) => {
consola.info('[WebRtc]', 'Client connected', socket.id) consola.info('[WebRtc]', 'Client connected', socket.id)
@@ -278,7 +148,7 @@ export default function (io: SocketServer, router: types.Router) {
} }
}) })
socket.on('produce', async ({ transportId, kind, rtpParameters }, cb) => { socket.on('produce', async ({ transportId, kind, rtpParameters, appData }, cb) => {
if (!socket.data.joined) { if (!socket.data.joined) {
consola.error('Peer not joined yet') consola.error('Peer not joined yet')
cb({ error: 'Peer not joined yet' }) cb({ error: 'Peer not joined yet' })
@@ -296,7 +166,7 @@ export default function (io: SocketServer, router: types.Router) {
} }
try { try {
const producer = await transport.produce({ kind, rtpParameters, appData: { socketId: socket.id } }) const producer = await transport.produce({ kind, rtpParameters, appData: { ...appData, socketId: socket.id } })
socket.data.producers.set(producer.id, producer) socket.data.producers.set(producer.id, producer)
@@ -439,24 +309,11 @@ export default function (io: SocketServer, router: types.Router) {
}) })
socket.on('updateClient', async (updatedClient, cb) => { socket.on('updateClient', async (updatedClient, cb) => {
if (updatedClient.displayName) { if (typeof updatedClient.inputMuted === 'boolean') {
await prisma.user.update({
where: {
id: socket.data.userId,
},
data: {
displayName: updatedClient.displayName,
},
})
socket.data.displayName = updatedClient.displayName
}
if (updatedClient.inputMuted) {
socket.data.inputMuted = updatedClient.inputMuted socket.data.inputMuted = updatedClient.inputMuted
} }
if (updatedClient.outputMuted) { if (typeof updatedClient.outputMuted === 'boolean') {
socket.data.outputMuted = updatedClient.outputMuted socket.data.outputMuted = updatedClient.outputMuted
} }
@@ -583,15 +440,4 @@ export default function (io: SocketServer, router: types.Router) {
consola.error('_createConsumer() | failed:%o', error) consola.error('_createConsumer() | failed:%o', error)
} }
} }
function socketToClient(socket: SomeSocket): ChadClient {
return {
socketId: socket.id,
userId: socket.data.userId,
username: socket.data.username,
displayName: socket.data.displayName,
inputMuted: socket.data.inputMuted,
outputMuted: socket.data.outputMuted,
}
}
} }

140
server/types/webrtc.ts Normal file
View File

@@ -0,0 +1,140 @@
import type { types } from 'mediasoup'
import type { RemoteSocket, Socket, Namespace as SocketNamespace } from 'socket.io'
import type { User } from '../prisma/client'
export interface ChadClient {
socketId: string
userId: User['id']
username: User['username']
displayName: User['displayName']
inputMuted: boolean
outputMuted: boolean
}
export interface ProducerShort {
producerId: types.Producer['id']
kind: types.MediaKind
}
export interface ErrorCallbackResult {
error: string
}
export interface SuccessCallbackResult {
ok: true
}
export type EventCallback<T = SuccessCallbackResult> = (result: T | ErrorCallbackResult) => void
export interface ClientToServerEvents {
join: (
options: {
rtpCapabilities: types.RtpCapabilities
},
cb: EventCallback<ChadClient[]>
) => void
getRtpCapabilities: (
cb: EventCallback<types.RtpCapabilities>
) => void
createTransport: (
options: {
producing: boolean
consuming: boolean
},
cb: EventCallback<Pick<types.WebRtcTransport, 'id' | 'iceParameters' | 'iceCandidates' | 'dtlsParameters'>>
) => void
connectTransport: (
options: {
transportId: types.WebRtcTransport['id']
dtlsParameters: types.WebRtcTransport['dtlsParameters']
},
cb: EventCallback
) => void
produce: (
options: {
transportId: types.WebRtcTransport['id']
kind: types.MediaKind
rtpParameters: types.RtpParameters
appData: { source: 'share' | string }
},
cb: EventCallback<{ id: types.Producer['id'] }>
) => void
closeProducer: (
options: {
producerId: types.Producer['id']
},
cb: EventCallback
) => void
pauseProducer: (
options: {
producerId: types.Producer['id']
},
cb: EventCallback
) => void
resumeProducer: (
options: {
producerId: types.Producer['id']
},
cb: EventCallback
) => void
pauseConsumer: (
options: {
consumerId: types.Consumer['id']
},
cb: EventCallback
) => void
resumeConsumer: (
options: {
consumerId: types.Consumer['id']
},
cb: EventCallback
) => void
updateClient: (
options: Partial<Pick<ChadClient, 'inputMuted' | 'outputMuted'>>,
cb: EventCallback<ChadClient>
) => void
}
export interface ServerToClientEvents {
authenticated: () => void
newPeer: (arg: ChadClient) => void
producers: (arg: ProducerShort[]) => void
newConsumer: (
arg: {
socketId: string
producerId: types.Producer['id']
id: types.Consumer['id']
kind: types.MediaKind
rtpParameters: types.RtpParameters
type: types.ConsumerType
appData: types.Producer['appData']
producerPaused: types.Consumer['producerPaused']
},
cb: EventCallback
) => void
peerClosed: (arg: string) => void
consumerClosed: (arg: { consumerId: string }) => void
consumerPaused: (arg: { consumerId: string }) => void
consumerResumed: (arg: { consumerId: string }) => void
consumerScore: (arg: { consumerId: string, score: types.ConsumerScore }) => void
clientChanged: (clientId: ChadClient['socketId'], client: ChadClient) => void
}
export interface InterServerEvent {}
export interface SocketData {
joined: boolean
userId: User['id']
username: User['username']
displayName: User['displayName']
inputMuted: boolean
outputMuted: boolean
rtpCapabilities: types.RtpCapabilities
transports: Map<types.WebRtcTransport['id'], types.WebRtcTransport>
producers: Map<types.Producer['id'], types.Producer>
consumers: Map<types.Consumer['id'], types.Consumer>
}
export type SomeSocket = Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvent, SocketData> | RemoteSocket<ServerToClientEvents, SocketData>
export type Namespace = SocketNamespace<ClientToServerEvents, ServerToClientEvents, InterServerEvent, SocketData>

View File

@@ -0,0 +1,12 @@
import type { ChadClient, SomeSocket } from '../types/webrtc.ts'
export function socketToClient(socket: SomeSocket): ChadClient {
return {
socketId: socket.id,
userId: socket.data.userId,
username: socket.data.username,
displayName: socket.data.displayName,
inputMuted: socket.data.inputMuted,
outputMuted: socket.data.outputMuted,
}
}