screen sharing

Reviewed-on: #7

.gitea/workflows/deploy-client.yml

@@ -1,43 +1,83 @@
 name: Deploy
 
 on:
+  workflow_dispatch:
   push:
-    branches:
+    tags:
-      - master
+      - "v[0-9]+.[0-9]+.[0-9]+"
-    paths:
+
-      - '.gitea/workflows/deploy-client.yml'
+# paths:
-      - 'client/**'
+#   - ".gitea/workflows/deploy-client.yml"
+#   - "client/**"
 
 jobs:
-  deploy:
+#  publish-windows:
-    runs-on: ubuntu-latest
+#    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
 
-    steps:
+   publish-web:
-      - name: Keyscan
+     runs-on: ubuntu-latest
-        run: |
-          ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts
 
-      - name: Checkout
+     steps:
-        uses: actions/checkout@v4
+       - name: Keyscan
-        with:
+         run: |
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+           ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts
-          ssh-strict: false
-          persist-credentials: false
 
-      - name: Build
+       - name: Checkout
-        run: docker build -t chad-client ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }}
+         uses: actions/checkout@v4
+         with:
+           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+           ssh-strict: false
+           persist-credentials: false
 
-      - name: Stop old container
+       - name: Build
-        run: docker rm -f chad-client || true
+         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: Run
+       - name: Stop old container
-        run: |
+         run: docker rm -f chad-client || true
-          docker run -d \
+
-            --name chad-client \
+       - name: Run
-            --network traefik \
+         run: |
-            --label "traefik.enable=true" \
+           docker run -d \
-            --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \
+             --name chad-client \
-            --label "traefik.http.routers.chad-client.entrypoints=websecure" \
+             --network traefik \
-            --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \
+             --label "traefik.enable=true" \
-            --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
+             --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \
-            chad-client:latest
+             --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

client/.gitattributes

@@ -0,0 +1,2 @@
+/.yarn/releases/** binary
+/.yarn/plugins/** binary

client/.gitignore

@@ -23,6 +23,7 @@ logs
 .env.*
 !.env.example
 
+.pnp.*
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
@@ -32,3 +33,5 @@ logs
 
 scripts/release.ps1
 .tauri
+
+updater.json

client/.yarnrc.yml

@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.12.0.cjs

client/Dockerfile.web

@@ -2,12 +2,10 @@ FROM node:lts-alpine AS builder
 
 WORKDIR /app
 
-RUN corepack enable
-RUN yarn set version stable
-
 COPY package.json yarn.lock .yarnrc.yml ./
+COPY .yarn ./.yarn
 
-RUN yarn install
+RUN yarn install --immutable
 COPY . .
 
 ARG COMMIT_SHA=unknown

client/Dockerfile.windows

@@ -0,0 +1,46 @@
+# === Build ===
+FROM node:lts AS builder
+
+WORKDIR /app
+
+COPY package.json yarn.lock .yarnrc.yml ./
+COPY .yarn ./.yarn
+
+RUN yarn install --immutable
+COPY . .
+
+ARG COMMIT_SHA=unknown
+ARG API_BASE_URL
+ARG TAURI_SIGNING_PRIVATE_KEY
+
+ENV COMMIT_SHA=$COMMIT_SHA \
+    API_BASE_URL=$API_BASE_URL \
+    TAURI_SIGNING_PRIVATE_KEY=$TAURI_SIGNING_PRIVATE_KEY \
+    TAURI_SIGNING_PRIVATE_KEY_PASSWORD=
+
+RUN apt update && apt install -y --no-install-recommends \
+    nsis \
+    clang \
+    lld \
+    llvm \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+ENV PATH=/root/.cargo/bin:$PATH
+
+RUN rustup target add x86_64-pc-windows-msvc
+
+RUN cargo install --locked cargo-xwin
+
+RUN yarn tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc
+
+RUN node scripts/generate-updater.mjs
+
+# === Artifacts ===
+FROM scratch AS artifacts
+
+COPY --from=builder /app/updater.json ./artifacts
+COPY --from=builder /app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/ ./artifacts
+
+CMD ["true"]

client/app/app.vue

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

client/app/assets/styles/main.scss

@@ -6,8 +6,42 @@ body {
 
   height: 100%;
   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 {
+  --p-scrollpanel-bar-size: 5px;
+  --p-scrollpanel-bar-background: var(--p-surface-950);
+  --p-divider-horizontal-margin: 2rem 0 1rem;
+
   height: 100%;
 }
+
+.p-divider {
+  &:first-child {
+    --p-divider-horizontal-margin: 1rem 0 1rem;
+  }
+}
+
+.p-scrollpanel-bar-y {
+  translate: -0.25rem;
+}
+
+.p-select-overlay {
+  /* Force dropdown width to match computed min-width from PrimeVue internals. */
+  width: 0;
+}
+
+.p-select-label {
+  width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.p-select-option-label {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

client/app/components.d.ts

@@ -13,15 +13,22 @@ declare module 'vue' {
     PrimeButton: typeof import('primevue/button')['default']
     PrimeButtonGroup: typeof import('primevue/buttongroup')['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']
     PrimeInputText: typeof import('primevue/inputtext')['default']
     PrimeMenu: typeof import('primevue/menu')['default']
     PrimePassword: typeof import('primevue/password')['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']
     PrimeSlider: typeof import('primevue/slider')['default']
     PrimeToast: typeof import('primevue/toast')['default']
+    PrimeToggleSwitch: typeof import('primevue/toggleswitch')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
+  export interface ComponentCustomProperties {
+    Tooltip: typeof import('primevue/tooltip')['default']
+  }
 }

client/app/components/AppHeader.vue

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

client/app/components/ClientRow.vue

@@ -1,94 +1,129 @@
 <template>
-  <div class="py-3">
+  <div
-    <div class="flex items-center gap-3 ">
+    class="overflow-hidden rounded-xl transition-[background-color]"
-      <PrimeAvatar
+    :class="{
-        icon="pi pi-user"
+      'hover:bg-surface-800 cursor-pointer': !isMe,
-        size="small"
+      'bg-surface-800': expanded,
-      />
+    }"
+  >
+    <div class="p-3 flex items-center gap-3" @click="toggleExpand">
+      <PrimeAvatar size="small">
+        <template #icon>
+          <User :size="20" />
+        </template>
+      </PrimeAvatar>
 
-      <div class="flex-1">
+      <div class="flex-1 overflow-hidden 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">
+        {{ client.displayName || client.username }}
-          {{ client.displayName }}
-        </div>
-        <div v-if="client.username !== client.displayName" class="mt-1 text-xs leading-5 text-muted-color">
-          {{ client.username }}
-        </div>
       </div>
 
-      <PrimeBadge v-if="client.inputMuted" severity="info" value="Muted" />
+      <div class="flex align-center gap-1">
-      <PrimeBadge v-if="isMe" severity="secondary" value="You" />
+        <PrimeBadge v-if="!!shareConsumer" v-tooltip.top="'Watch'" severity="success" value="Streaming" size="small" @click.stop="watchStream" />
 
-      <template v-if="!isMe">
+        <PrimeBadge v-if="premuted" severity="danger" value="Muted" size="small" />
-        <PrimeButton icon="pi pi-ellipsis-h" text size="small" severity="contrast" @click="menuRef?.toggle" />
+        <PrimeBadge v-else-if="client.outputMuted" severity="info" value="No sound" size="small" />
+        <PrimeBadge v-else-if="inputMuted" severity="info" value="Muted" size="small" />
 
-        <PrimeMenu ref="menu" popup :model="menuItems" style="translate: calc(-100% + 2rem) 0.5rem">
+        <PrimeBadge v-if="isMe" severity="secondary" value="You" size="small" class="shrink-0" />
-          <template #start>
+      </div>
-            <div class="px-4 py-3">
+
-              <div class="flex justify-between">
+      <Component :is="expanded ? ChevronUp : ChevronDown" v-if="!isMe" :size="20" />
-                <span>Volume</span>
-                <span>{{ volume }}</span>
-              </div>
-              <PrimeSlider v-model="volume" class="mt-4" :min="0" :max="1000" :step="volume < 200 ? 5 : 25" />
-            </div>
-          </template>
-        </PrimeMenu>
-      </template>
     </div>
+
+    <CollapseTransition v-if="!isMe">
+      <div v-if="expanded">
+        <div class="px-3 pb-3">
+          <div class="flex justify-between text-sm mb-3">
+            <span>Volume</span>
+            <span>{{ volume }}</span>
+          </div>
+          <PrimeSlider v-model="volume" :min="0" :max="1000" :step="volume < 200 ? 5 : 25" />
+
+          <div class="mt-3 flex gap-1 justify-end">
+            <PrimeButton size="small" variant="text" @click="premuted = !premuted">
+              {{ premuted ? 'Unmute' : 'Mute' }}
+            </PrimeButton>
+          </div>
+        </div>
+      </div>
+    </CollapseTransition>
   </div>
 </template>
 
 <script setup lang="ts">
 import type { ChadClient } from '#shared/types'
-import type { MenuItem } from 'primevue/menuitem'
+import { useLocalStorage } from '@vueuse/core'
+import { ChevronDown, ChevronUp, User } from 'lucide-vue-next'
+import CollapseTransition from '~/components/CollapseTransition.vue'
 
 const props = defineProps<{
   client: ChadClient
 }>()
 
-const { inputMuted, outputMuted } = useApp()
+const { outputMuted } = useApp()
-const { getClientConsumers } = useMediasoup()
+const { consumers: allConsumers, micProducer } = useMediasoup()
 const { me } = useClients()
+const { show } = useFullscreenVideo()
 
-const menuRef = useTemplateRef<HTMLAudioElement>('menu')
+const expanded = ref(false)
 
-const volume = ref(100)
+const volume = useLocalStorage<number>(computed(() => `CLIENT_VOLUME_${props.client.userId}`), 100, { writeDefaults: false })
-
+const premuted = useLocalStorage<boolean>(computed(() => `CLIENT_PREMUTED_${props.client.userId}`), false, { writeDefaults: false })
-const menuItems: MenuItem[] = [
-  {
-    label: 'Mute',
-    icon: 'pi pi-headphones',
-  },
-  {
-    label: 'DM',
-    icon: 'pi pi-comment',
-    disabled: true,
-  },
-]
 
 const isMe = computed(() => {
   return me.value && props.client.userId === me.value.userId
 })
 
-const audioConsumer = computed(() => {
+const consumers = computed(() => {
-  const consumers = getClientConsumers(props.client.id)
+  return allConsumers.value.values().filter(consumer => consumer.appData.socketId === props.client.socketId).toArray()
+})
 
-  return consumers.find(consumer => consumer.track.kind === 'audio')
+const audioConsumer = computed(() => {
+  return consumers.value.find(consumer => consumer.track.kind === 'audio')
+})
+
+const videoConsumers = computed(() => {
+  return consumers.value.filter(consumer => consumer.track.kind === 'video')
+})
+
+const shareConsumer = computed(() => {
+  return videoConsumers.value.find(consumer => consumer.appData.source === 'share')
 })
 
 const audioTrack = computed(() => {
   return audioConsumer.value?.track
 })
 
+const audioConsumerPaused = ref(false)
+
+const inputMuted = computed(() => {
+  if (isMe.value)
+    return micProducer.value?.paused ?? false
+
+  return premuted.value || audioConsumerPaused.value
+})
+
+watch(allConsumers, () => {
+  audioConsumerPaused.value = audioConsumer.value?.paused ?? false
+})
+
 const { setGain } = useAudioContext(audioTrack)
 
-watch(volume, (volume) => {
+watchEffect(() => {
-  if (outputMuted.value)
+  setGain((outputMuted.value || premuted.value) ? 0 : (volume.value * 0.01))
+})
+
+function toggleExpand() {
+  if (isMe.value)
     return
 
-  setGain(volume * 0.01)
+  expanded.value = !expanded.value
-})
+}
 
-watch(outputMuted, (outputMuted) => {
+function watchStream() {
-  setGain(outputMuted ? 0 : (volume.value * 0.01))
+  if (!shareConsumer.value)
-})
+    return
+
+  show(new MediaStream([shareConsumer.value.track]))
+}
 </script>

client/app/components/CollapseTransition.vue

@@ -0,0 +1,118 @@
+<template>
+  <Transition name="collapse-transition" v-on="bindings">
+    <slot />
+  </Transition>
+</template>
+
+<script lang="ts" setup>
+import type { RendererElement } from 'vue'
+
+defineOptions({
+  name: 'CollapseTransition',
+})
+
+const emit = defineEmits<{
+  expanded: []
+  collapsed: []
+}>()
+
+const bindings = {
+  beforeEnter(el: RendererElement) {
+    if (!el.dataset)
+      el.dataset = {}
+
+    el.dataset.oldPaddingTop = el.style.paddingTop
+    el.dataset.oldPaddingBottom = el.style.paddingBottom
+    el.dataset.elExistsHeight = el.style.height ?? undefined
+    el.style.maxHeight = 0
+    el.style.paddingTop = 0
+    el.style.paddingBottom = 0
+  },
+
+  enter(el: RendererElement) {
+    requestAnimationFrame(() => {
+      el.dataset.oldOverflow = el.style.overflow
+      if (el.dataset.elExistsHeight) {
+        el.style.maxHeight = el.dataset.elExistsHeight
+      }
+      else if (el.scrollHeight !== 0) {
+        el.style.maxHeight = `${el.scrollHeight}px`
+      }
+      else {
+        el.style.maxHeight = 0
+      }
+
+      el.style.paddingTop = el.dataset.oldPaddingTop
+      el.style.paddingBottom = el.dataset.oldPaddingBottom
+      el.style.overflow = 'hidden'
+    })
+  },
+
+  afterEnter(el: RendererElement) {
+    el.style.maxHeight = ''
+    el.style.overflow = el.dataset.oldOverflow
+
+    emit('expanded')
+  },
+
+  enterCancelled(el: RendererElement) {
+    reset(el)
+  },
+
+  beforeLeave(el: RendererElement) {
+    if (!el.dataset)
+      el.dataset = {}
+    el.dataset.oldPaddingTop = el.style.paddingTop
+    el.dataset.oldPaddingBottom = el.style.paddingBottom
+    el.dataset.oldOverflow = el.style.overflow
+
+    el.style.maxHeight = `${el.scrollHeight}px`
+    el.style.overflow = 'hidden'
+  },
+
+  leave(el: RendererElement) {
+    if (el.scrollHeight !== 0) {
+      el.style.maxHeight = 0
+      el.style.paddingTop = 0
+      el.style.paddingBottom = 0
+    }
+  },
+
+  afterLeave(el: RendererElement) {
+    reset(el)
+
+    emit('collapsed')
+  },
+
+  leaveCancelled(el: RendererElement) {
+    reset(el)
+  },
+}
+
+function reset(el: RendererElement) {
+  el.style.maxHeight = ''
+  el.style.overflow = el.dataset.oldOverflow
+  el.style.paddingTop = el.dataset.oldPaddingTop
+  el.style.paddingBottom = el.dataset.oldPaddingBottom
+}
+</script>
+
+<style lang="scss">
+.collapse-transition {
+  transition-property: height, padding-top, padding-bottom;
+  transition-timing-function: var(--default-transition-timing-function, cubic-bezier(0.4, 0, 0.2, 1));
+  transition-duration: var(--default-transition-duration, 150ms);
+}
+
+.collapse-transition-leave-active,
+.collapse-transition-enter-active {
+  transition-property: opacity, max-height, padding-top, padding-bottom;
+  transition-timing-function: var(--default-transition-timing-function, cubic-bezier(0.4, 0, 0.2, 1));
+  transition-duration: var(--default-transition-duration, 150ms);
+}
+
+.collapse-transition-leave-to,
+.collapse-transition-enter-from {
+  opacity: 0;
+}
+</style>

client/app/composables/use-app.ts

@@ -1,75 +1,107 @@
-import { createGlobalState } from '@vueuse/core'
+import { getVersion } from '@tauri-apps/api/app'
+
+import { computedAsync, createGlobalState } from '@vueuse/core'
 import { useClients } from '~/composables/use-clients'
 
 export const useApp = createGlobalState(() => {
   const { clients } = useClients()
   const mediasoup = useMediasoup()
+  const signaling = useSignaling()
   const toast = useToast()
 
-  const inputMuted = ref(false)
+  const ready = ref(false)
-  const outputMuted = ref(false)
+  const isTauri = computed(() => '__TAURI_INTERNALS__' in window)
+  const commitSha = __COMMIT_SHA__
+  const version = computedAsync(() => isTauri.value ? getVersion() : 'web', '-')
 
+  const inputMuted = computed(() => {
+    return !!mediasoup.micProducer.value?.paused
+  })
   const previousInputMuted = ref(inputMuted.value)
 
-  function muteInput() {
+  const outputMuted = ref(false)
-    inputMuted.value = true
-  }
 
-  function unmuteInput() {
+  const sharingEnabled = computed(() => {
-    inputMuted.value = false
+    return !!mediasoup.shareProducer.value
-  }
+  })
 
-  function toggleInput() {
+  async function muteInput() {
     if (inputMuted.value)
-      unmuteInput()
+      return
+
+    await mediasoup.pauseProducer('microphone')
+
+    toast.add({ severity: 'info', summary: 'Microphone muted', closable: false, life: 1000 })
+  }
+
+  async function unmuteInput() {
+    if (!inputMuted.value)
+      return
+
+    if (outputMuted.value) {
+      await unmuteOutput()
+    }
+
+    await mediasoup.resumeProducer('microphone')
+
+    toast.add({ severity: 'info', summary: 'Microphone activated', closable: false, life: 1000 })
+  }
+
+  async function toggleInput() {
+    if (inputMuted.value)
+      await unmuteInput()
     else
-      muteInput()
+      await muteInput()
   }
 
-  function muteOutput() {
+  async function muteOutput() {
-    outputMuted.value = true
-  }
-
-  function unmuteOutput() {
-    outputMuted.value = false
-  }
-
-  function toggleOutput() {
     if (outputMuted.value)
-      unmuteOutput()
+      return
-    else
+
-      muteOutput()
+    outputMuted.value = true
+
+    previousInputMuted.value = inputMuted.value
+
+    await muteInput()
+
+    await signaling.socket.value?.emitWithAck('updateClient', {
+      outputMuted: true,
+    })
+
+    toast.add({ severity: 'info', summary: 'Sound muted', closable: false, life: 1000 })
   }
 
-  watch(inputMuted, async (inputMuted) => {
+  async function unmuteOutput() {
-    if (inputMuted) {
+    outputMuted.value = false
-      await mediasoup.muteMic()
+
+    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 {
-      if (outputMuted.value) {
+      await mediasoup.disableProducer('share')
-        outputMuted.value = false
-      }
-      await mediasoup.unmuteMic()
     }
-
+  }
-    const toastText = inputMuted ? 'Microphone muted' : 'Microphone activated'
-    toast.add({ severity: 'info', summary: toastText, closable: false, life: 1000 })
-  })
-
-  watch(outputMuted, (outputMuted) => {
-    if (outputMuted) {
-      previousInputMuted.value = inputMuted.value
-      muteInput()
-    }
-    else {
-      inputMuted.value = previousInputMuted.value
-    }
-
-    const toastText = outputMuted ? 'Sound muted' : 'Sound resumed'
-    toast.add({ severity: 'info', summary: toastText, closable: false, life: 1000 })
-  })
 
   return {
+    ready,
     clients,
     inputMuted,
     muteInput,
@@ -79,5 +111,10 @@ export const useApp = createGlobalState(() => {
     muteOutput,
     unmuteOutput,
     toggleOutput,
+    version,
+    isTauri,
+    commitSha,
+    toggleShare,
+    sharingEnabled,
   }
 })

client/app/composables/use-audio-context.ts

@@ -4,13 +4,12 @@ export default function useAudioContext(audioTrack: Ref<MediaStreamTrack | undef
   const ctx = new (window.AudioContext || window.webkitAudioContext)()
 
   const stream = new MediaStream()
+  const audioEl = new Audio()
 
   const sourceNode = shallowRef<MediaStreamAudioSourceNode>()
   const gainNode = ctx.createGain()
 
-  let hackExecuted = false
+  watch(audioTrack, async (track, prevTrack) => {
-
-  watch(audioTrack, (track, prevTrack) => {
     if (prevTrack)
       stream.removeTrack(prevTrack)
 
@@ -19,16 +18,14 @@ export default function useAudioContext(audioTrack: Ref<MediaStreamTrack | undef
 
     stream.addTrack(track)
 
-    if (!hackExecuted) {
+    if (!audioEl.srcObject) {
-      const audioEl = new Audio()
       audioEl.srcObject = stream
       audioEl.muted = true
-      hackExecuted = true
     }
 
     sourceNode.value = ctx.createMediaStreamSource(stream)
 
-    connect()
+    await connect()
   }, { immediate: true })
 
   useEventListener(document, 'click', async () => {
@@ -36,10 +33,16 @@ export default function useAudioContext(audioTrack: Ref<MediaStreamTrack | undef
       await ctx.resume()
     }
 
-    connect()
+    await connect()
   }, { once: true })
 
-  function connect() {
+  onScopeDispose(() => {
+    audioEl.pause()
+    audioEl.srcObject = null
+    ctx.close()
+  })
+
+  async function connect() {
     if (!sourceNode.value || ctx.state === 'suspended')
       return
 

client/app/composables/use-auth.ts

@@ -16,7 +16,7 @@ export const useAuth = createGlobalState(() => {
 
   async function login(username: string, password: string): Promise<void> {
     try {
-      const result = await chadApi('/login', {
+      const result = await chadApi<Me>('/login', {
         method: 'POST',
         body: {
           username,
@@ -33,7 +33,7 @@ export const useAuth = createGlobalState(() => {
 
   async function register(username: string, password: string): Promise<void> {
     try {
-      const result = await chadApi('/register', {
+      const result = await chadApi<Me>('/register', {
         method: 'POST',
         body: {
           username,

client/app/composables/use-devices.ts

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

client/app/composables/use-fullscreen-video.ts

@@ -0,0 +1,51 @@
+import { createGlobalState, useEventListener } from '@vueuse/core'
+
+export const useFullscreenVideo = createGlobalState(() => {
+  const videoEl = shallowRef<HTMLVideoElement>()
+
+  const visible = computed(() => !!videoEl.value)
+
+  async function show(stream: MediaStream) {
+    if (videoEl.value) {
+      videoEl.value.srcObject = stream
+    }
+    else {
+      const el = document.createElement('video')
+      el.srcObject = stream
+      el.autoplay = true
+      el.playsInline = true
+      el.controls = false
+      el.muted = true
+      // el.style.position = 'fixed'
+      // el.style.top = '0'
+      // el.style.left = '0'
+      // el.style.width = '1px'
+      // el.style.height = '1px'
+      // el.style.opacity = '0'
+      // el.style.pointerEvents = 'none'
+
+      document.body.appendChild(el)
+
+      videoEl.value = el
+    }
+
+    await videoEl.value.requestFullscreen()
+  }
+
+  function hide() {
+    videoEl.value?.remove()
+  }
+
+  useEventListener(document, 'fullscreenchange', () => {
+    if (!document.fullscreenElement && videoEl.value) {
+      videoEl.value?.remove()
+      videoEl.value = undefined
+    }
+  })
+
+  return {
+    visible,
+    show,
+    hide,
+  }
+})

client/app/composables/use-mediasoup.ts

@@ -1,9 +1,12 @@
-import type { ChadClient } from '#shared/types'
+import type { MediaKind, ProducerOptions } from 'mediasoup-client/types'
 import { createSharedComposable } from '@vueuse/core'
 import * as mediasoupClient from 'mediasoup-client'
+import { useDevices } from '~/composables/use-devices'
 import { usePreferences } from '~/composables/use-preferences'
 import { useSignaling } from '~/composables/use-signaling'
 
+type ProducerType = 'microphone' | 'camera' | 'share'
+
 const ICE_SERVERS: RTCIceServer[] = [
   { urls: 'stun:stun.l.google.com:19302' },
   { urls: 'stun:stun.l.google.com:5349' },
@@ -23,7 +26,7 @@ export const useMediasoup = createSharedComposable(() => {
   const signaling = useSignaling()
   const { addClient, removeClient } = useClients()
   const preferences = usePreferences()
-  const { me } = useAuth()
+  const { getShareStream } = useDevices()
 
   const device = shallowRef<mediasoupClient.Device>()
   const rtpCapabilities = shallowRef<mediasoupClient.types.RtpCapabilities>()
@@ -31,7 +34,7 @@ export const useMediasoup = createSharedComposable(() => {
   const recvTransport = shallowRef<mediasoupClient.types.Transport>()
 
   const micProducer = shallowRef<mediasoupClient.types.Producer>()
-  const webcamProducer = shallowRef<mediasoupClient.types.Producer>()
+  const cameraProducer = shallowRef<mediasoupClient.types.Producer>()
   const shareProducer = shallowRef<mediasoupClient.types.Producer>()
 
   const consumers = shallowRef<Map<string, mediasoupClient.types.Consumer>>(new Map())
@@ -145,7 +148,7 @@ export const useMediasoup = createSharedComposable(() => {
     socket.on(
       'newConsumer',
       async (
-        { id, producerId, kind, rtpParameters, peerId: clientId, appData },
+        { id, producerId, kind, rtpParameters, socketId, appData, producerPaused },
         cb,
       ) => {
         if (!recvTransport.value)
@@ -156,13 +159,16 @@ export const useMediasoup = createSharedComposable(() => {
           producerId,
           kind,
           rtpParameters,
-          streamId: `${clientId}-${appData.share ? 'share' : 'mic-webcam'}`,
+          streamId: `${socketId}-${appData.source === 'share' ? 'share' : 'mic-webcam'}`,
-          appData: { ...appData, clientId },
+          appData: { ...appData, socketId },
         })
 
+        if (producerPaused)
+          consumer.pause()
+
         consumer.on('transportclose', () => {
-          consumers.value.delete(consumer.id)
+          if (consumers.value.delete(consumer.id))
-          triggerRef(consumers)
+            triggerRef(consumers)
         })
 
         consumers.value.set(consumer.id, consumer)
@@ -177,13 +183,8 @@ export const useMediasoup = createSharedComposable(() => {
       async (
         { consumerId },
       ) => {
-        const consumer = consumers.value.get(consumerId)
+        if (consumers.value.delete(consumerId))
-
+          triggerRef(consumers)
-        if (!consumer)
-          return
-
-        consumers.value.delete(consumer.id)
-        triggerRef(consumers)
       },
     )
 
@@ -198,42 +199,107 @@ export const useMediasoup = createSharedComposable(() => {
       recvTransport.value = undefined
 
       micProducer.value = undefined
-      webcamProducer.value = undefined
+      cameraProducer.value = undefined
       shareProducer.value = undefined
 
       consumers.value = new Map()
       producers.value = new Map()
     })
+
+    socket.on('consumerPaused', ({ consumerId }) => {
+      const consumer = consumers.value.get(consumerId)
+
+      if (!consumer)
+        return
+
+      consumer.pause()
+
+      triggerRef(consumers)
+    })
+
+    socket.on('consumerResumed', ({ consumerId }) => {
+      const consumer = consumers.value.get(consumerId)
+
+      if (!consumer)
+        return
+
+      consumer.resume()
+
+      triggerRef(consumers)
+    })
   }, { immediate: true, flush: 'sync' })
 
-  function getClientConsumers(clientId: ChadClient['socketId']) {
+  async function enableProducer(type: ProducerType, options: ProducerOptions) {
-    return consumers.value.values().filter(consumer => consumer.appData.clientId === clientId)
+    const producer = getProducerByType(type)
-  }
 
-  async function enableMic() {
+    if (producer.value)
-    if (micProducer.value)
       return
 
     if (!device.value || !sendTransport.value)
       return
 
-    if (!device.value.canProduce('audio'))
+    if (!options.track)
       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({
       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]
 
     if (!track)
       return
 
-    micProducer.value = await sendTransport.value.produce({
+    await enableProducer('microphone', {
       track,
       codecOptions: {
         opusStereo: true,
@@ -241,66 +307,87 @@ export const useMediasoup = createSharedComposable(() => {
         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() {
-    if (!signaling.socket.value || !micProducer.value)
+    await disableProducer('microphone')
-      return
-
-    producers.value.delete(micProducer.value.id)
-    triggerRef(producers)
-
-    try {
-      micProducer.value.close()
-
-      await signaling.socket.value.emitWithAck('closeProducer', {
-        producerId: micProducer.value.id,
-      })
-    }
-    catch {
-    }
-
-    micProducer.value = undefined
   }
 
-  async function muteMic() {
+  async function enableShare() {
-    if (!signaling.socket.value || !micProducer.value)
+    if (!device.value)
+      return
+
+    const stream = await getShareStream()
+
+    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) {
+    if (!signaling.socket.value)
+      return
+
+    const producer = getProducerByType(type)
+
+    if (!producer.value)
+      return
+
+    if (producer.value.paused)
       return
 
     try {
-      micProducer.value.pause()
+      producer.value.pause()
 
       await signaling.socket.value.emitWithAck('pauseProducer', {
-        producerId: micProducer.value.id,
+        producerId: producer.value.id,
       })
     }
     catch {
+      producer.value.resume()
+    }
+    finally {
+      triggerRef(producers)
+      triggerRef(producer)
     }
   }
 
-  async function unmuteMic() {
+  async function resumeProducer(type: ProducerType) {
-    if (!signaling.socket.value || !micProducer.value)
+    if (!signaling.socket.value)
+      return
+
+    const producer = getProducerByType(type)
+
+    if (!producer.value)
       return
 
     try {
-      micProducer.value.resume()
+      producer.value.resume()
 
       await signaling.socket.value.emitWithAck('resumeProducer', {
-        producerId: micProducer.value.id,
+        producerId: producer.value.id,
       })
     }
     catch {
+      producer.value.pause()
+    }
+    finally {
+      triggerRef(producers)
+      triggerRef(producer)
     }
   }
 
@@ -308,6 +395,31 @@ export const useMediasoup = createSharedComposable(() => {
     signaling.connect()
   }
 
+  function getProducerByType(type: ProducerType) {
+    switch (type) {
+      case 'microphone':
+        return micProducer
+      case 'camera':
+        return cameraProducer
+      case 'share':
+        return shareProducer
+    }
+  }
+
+  watch([
+    preferences.inputDeviceId,
+    preferences.echoCancellation,
+    preferences.autoGainControl,
+    preferences.noiseSuppression,
+  ], async ([inputDeviceId]) => {
+    await disableMic()
+
+    if (!inputDeviceId)
+      return
+
+    await enableMic()
+  })
+
   return {
     init,
     consumers,
@@ -317,10 +429,11 @@ export const useMediasoup = createSharedComposable(() => {
     rtpCapabilities,
     device,
     micProducer,
-    webcamProducer,
+    cameraProducer,
     shareProducer,
-    getClientConsumers,
+    pauseProducer,
-    muteMic,
+    resumeProducer,
-    unmuteMic,
+    enableShare,
+    disableProducer,
   }
 })

client/app/composables/use-preferences.ts

@@ -1,11 +1,65 @@
-import { createGlobalState } 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(() => {
-  const audioDevice = shallowRef()
+  const { videoInputs, audioInputs, audioOutputs } = useDevices()
-  const videoDevice = shallowRef()
+
+  const synced = ref(false)
+
+  const inputDeviceId = useLocalStorage<MediaDeviceInfo['deviceId']>('INPUT_DEVICE_ID', 'default')
+  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 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 {
-    audioDevice,
+    synced,
-    videoDevice,
+    inputDeviceId,
+    outputDeviceId,
+    autoGainControl,
+    noiseSuppression,
+    echoCancellation,
+    toggleInputHotkey,
+    toggleOutputHotkey,
+    inputDeviceExist,
+    outputDeviceExist,
   }
 })

client/app/composables/use-signaling.ts

@@ -1,6 +1,7 @@
 import type { Socket } from 'socket.io-client'
 import { createSharedComposable } from '@vueuse/core'
 import { io } from 'socket.io-client'
+import { parseURL } from 'ufo'
 
 export const useSignaling = createSharedComposable(() => {
   const toast = useToast()
@@ -58,16 +59,19 @@ export const useSignaling = createSharedComposable(() => {
   })
 
   function connect() {
-    if (socket.value)
+    if (socket.value || !me.value)
       return
 
-    socket.value = io('https://api.koptilnya.xyz/webrtc', {
+    const { protocol, host, pathname } = parseURL(__API_BASE_URL__)
-    // socket.value = io('http://localhost:4000/webrtc', {
+
-      path: '/chad/ws',
+    const uri = host ? `${protocol}//${host}` : ``
+
+    socket.value = io(`${uri}/webrtc`, {
+      path: `${pathname}/ws`,
       transports: ['websocket'],
       withCredentials: true,
       auth: {
-        userId: me.value!.id,
+        userId: me.value.id,
       },
     })
   }

client/app/composables/use-updater.ts

@@ -0,0 +1,28 @@
+import type { Update } from '@tauri-apps/plugin-updater'
+import { check } from '@tauri-apps/plugin-updater'
+import { createGlobalState } from '@vueuse/core'
+
+export const useUpdater = createGlobalState(() => {
+  const lastUpdate = shallowRef<Update>()
+
+  const checking = ref(false)
+
+  async function checkForUpdates() {
+    try {
+      checking.value = true
+
+      lastUpdate.value = (await check()) ?? undefined
+    }
+    finally {
+      checking.value = false
+    }
+
+    return lastUpdate.value
+  }
+
+  return {
+    lastUpdate,
+    checking,
+    checkForUpdates,
+  }
+})

client/app/layouts/auth.vue

@@ -10,10 +10,13 @@
       <slot />
     </div>
   </div>
+
+  <PrimeBadge class="fixed top-3 right-3 opacity-50" severity="secondary" :value="version" size="small" />
 </template>
 
 <script setup lang="ts">
 const route = useRoute()
+const { version } = useApp()
 
 const options = computed(() => {
   return [
@@ -24,7 +27,6 @@ const options = computed(() => {
     {
       label: 'Register',
       routeName: 'Register',
-
     },
   ]
 })

client/app/layouts/blank.vue

@@ -1,3 +1,3 @@
 <template>
-  UPDATER
+  <slot />
 </template>

client/app/layouts/default.vue

@@ -1,47 +1,126 @@
 <template>
-  <div v-auto-animate class="grid grid-cols-2 h-screen">
+  <div class="grid grid-cols-[1fr_1.25fr] 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="Шальные сиськи 18+">
+      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"
-            />
-            <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>
+
+      <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>
 
-    <slot />
+    <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>
 
-  <PrimeBadge class="fixed top-3 right-3" severity="success" />
+    <PrimeScrollPanel class="bg-surface-900 rounded-xl" style="min-height: 0">
+      <div v-auto-animate class="p-3 space-y-1">
+        <ClientRow v-for="client of clients" :key="client.userId" :client="client" />
+      </div>
+    </PrimeScrollPanel>
+
+    <PrimeScrollPanel class="bg-surface-900 rounded-xl" style="min-height: 0">
+      <div class="p-3">
+        <slot />
+      </div>
+    </PrimeScrollPanel>
+  </div>
 </template>
 
 <script setup lang="ts">
-const { clients, inputMuted, toggleInput, outputMuted, toggleOutput } = useApp()
+import {
-const { connect } = useSignaling()
+  MessageCircle,
+  Mic,
+  MicOff,
+  ScreenShare,
+  ScreenShareOff,
+  Settings,
+  UserPen,
+  Volume2,
+  VolumeOff,
+} from 'lucide-vue-next'
+
+const {
+  isTauri,
+  version,
+  clients,
+  inputMuted,
+  outputMuted,
+  sharingEnabled,
+  toggleInput,
+  toggleOutput,
+  toggleShare,
+} = useApp()
+const { connect, connected } = useSignaling()
+
+interface Tab {
+  id: string
+  icon: Component
+  onClick: () => void | Promise<void>
+}
 
 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()
 </script>

client/app/middleware/00.updater.global.ts

@@ -1,41 +1,20 @@
-import { relaunch } from '@tauri-apps/plugin-process'
-import { check } from '@tauri-apps/plugin-updater'
-
 export default defineNuxtRouteMiddleware(async (to, from) => {
-  if (from?.name)
+  if (import.meta.dev || import.meta.server)
     return
 
-  const update = await check()
+  const { isTauri } = useApp()
 
-  console.log(update)
+  if (!isTauri.value)
-
-  if (import.meta.dev)
     return
 
+  if (from?.name || !!to.redirectedFrom)
+    return
+
+  const { checkForUpdates } = useUpdater()
+
+  const update = await checkForUpdates()
+
   if (update) {
-    console.log(
+    return navigateTo({ name: 'Updater' })
-      `found update ${update.version} from ${update.date} with notes ${update.body}`,
-    )
-    let downloaded = 0
-    let contentLength = 0
-    // alternatively we could also call update.download() and update.install() separately
-    await update.downloadAndInstall((event) => {
-      switch (event.event) {
-        case 'Started':
-          contentLength = event.data.contentLength ?? 0
-          console.log(`started downloading ${event.data.contentLength} bytes`)
-          break
-        case 'Progress':
-          downloaded += event.data.chunkLength
-          console.log(`downloaded ${downloaded} from ${contentLength}`)
-          break
-        case 'Finished':
-          console.log('download finished')
-          break
-      }
-    })
-
-    console.log('update installed')
-    await relaunch()
   }
 })

client/app/middleware/01.auth.global.ts

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

client/app/middleware/02.user-preferences.global.ts

@@ -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 {}
+})

client/app/pages/index.vue

@@ -1,11 +1,17 @@
 <template>
-  <div class="flex items-center justify-center p-3">
+  <div>
-    <PrimeFieldset legend="Important information">
+    <div class="flex items-center justify-center">
-      The chat is under development.
+      <PrimeCard>
-    </PrimeFieldset>
+        <template #content>
+          The chat is under development.
+        </template>
+      </PrimeCard>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-const { clients, inputMuted, toggleInput, outputMuted, toggleOutput } = useApp()
+definePageMeta({
+  name: 'Index',
+})
 </script>

client/app/pages/preferences.vue

@@ -1,54 +1,161 @@
 <template>
   <div>
-    <AppHeader title="Preferences" secondary />
+    <PrimeDivider align="left">
+      Audio
+    </PrimeDivider>
+
+    <PrimeFloatLabel variant="on">
+      <PrimeSelect
+        v-model="inputDeviceId"
+        :options="audioInputs"
+        option-label="label"
+        option-value="deviceId"
+        input-id="inputDevice"
+        fluid
+        :invalid="!inputDeviceExist"
+      />
+      <label for="inputDevice">Input device</label>
+    </PrimeFloatLabel>
+
+    <div class="flex items-center gap-2 mt-3">
+      <PrimeToggleSwitch v-model="autoGainControl" input-id="autoGainControl" />
+      <label for="autoGainControl">Auto Gain Control</label>
+    </div>
+
+    <div class="flex items-center gap-2 mt-3">
+      <PrimeToggleSwitch v-model="echoCancellation" input-id="echoCancellation" />
+      <label for="echoCancellation">Echo Cancellation</label>
+    </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 align="left">
+        Hotkeys
+      </PrimeDivider>
 
-    <form class="flex flex-col gap-3 p-3" @submit.prevent="save">
       <PrimeFloatLabel variant="on">
-        <PrimeInputText id="username" v-model="displayName" size="large" fluid autocomplete="off" />
+        <PrimeInputText id="microphoneToggle" :model-value="toggleInputHotkey" fluid @keydown="setupToggleInputHotkey" />
-        <label for="username">Username</label>
+        <label for="microphoneToggle">Toggle microphone</label>
       </PrimeFloatLabel>
 
-      <PrimeButton label="Save" type="submit" :disabled="!valid" />
+      <PrimeFloatLabel variant="on" class="mt-3">
-    </form>
+        <PrimeInputText id="soundToggle" :model-value="toggleOutputHotkey" fluid @keydown="setupToggleOutputHotkey" />
+        <label for="soundToggle">Toggle sound</label>
+      </PrimeFloatLabel>
+    </template>
 
-    <div class="p-3">
+    <PrimeDivider align="left">
-      <PrimeButton label="Logout" fluid severity="danger" @click="logout" />
+      About
-    </div>
+    </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>
 
 <script setup lang="ts">
+import type { RemovableRef } from '@vueuse/core'
+
 definePageMeta({
   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 { me, setMe, logout } = useAuth()
+const setupToggleInputHotkey = (event: KeyboardEvent) => setupHotkey(event, toggleInputHotkey)
+const setupToggleOutputHotkey = (event: KeyboardEvent) => setupHotkey(event, toggleOutputHotkey)
 
-const signaling = useSignaling()
+function setupHotkey(event: KeyboardEvent, model: RemovableRef<string>) {
-const toast = useToast()
+  if (event.key === 'Tab' || event.key === 'Enter') {
-
-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 save() {
-  if (!valid.value)
     return
+  }
 
-  const updatedMe = await signaling.socket.value?.emitWithAck('updateClient', {
+  event.preventDefault()
-    displayName: displayName.value,
-  })
 
-  setMe({ ...me.value, displayName: updatedMe.displayName })
+  const hotkey = []
 
-  toast.add({ severity: 'success', summary: 'Saved', life: 1000, closable: false })
+  if (event.ctrlKey || event.metaKey)
+    hotkey.push('CommandOrControl')
+  if (event.altKey)
+    hotkey.push('Alt')
+  if (event.shiftKey)
+    hotkey.push('Shift')
+
+  const modifierApplied = hotkey.length > 0
+
+  if (!modifierApplied && ['Escape', 'Backspace', 'Delete'].includes(event.key)) {
+    model.value = ''
+
+    return
+  }
+
+  if (!['Control', 'Shift', 'Alt'].includes(event.key)) {
+    hotkey.push(event.key.toUpperCase())
+  }
+
+  if (modifierApplied && hotkey.length === 1) {
+    model.value = ''
+
+    return
+  }
+
+  model.value = hotkey.join('+')
 }
 </script>

client/app/pages/profile.vue

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

client/app/pages/updater.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="flex h-full">
+    <div class="w-80 m-auto">
+      <p class="text-center text-muted-color mb-4">
+        Updating...
+      </p>
+
+      <PrimeProgressBar mode="indeterminate" style="height: 8px;" />
+
+      <div class="flex items-center justify-center gap-2 mt-8">
+        <PrimeBadge :value="lastUpdate.currentVersion" size="small" severity="secondary" />
+        <i class="pi pi-arrow-right" style="font-size: 0.75rem;" />
+        <PrimeBadge :value="lastUpdate.version" size="small" severity="contrast" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+definePageMeta({
+  name: 'Updater',
+  layout: 'blank',
+  auth: false,
+  middleware: () => {
+    const { lastUpdate } = useUpdater()
+    if (!lastUpdate.value)
+      return navigateTo('/')
+  },
+})
+
+const lastUpdate = useUpdater().lastUpdate.value!
+
+;(async () => {
+  try {
+    await lastUpdate.downloadAndInstall()
+  }
+  catch {
+    await navigateTo('/')
+  }
+})()
+</script>

client/app/plugins/00.build-info.ts

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

client/app/plugins/01.register-hotkeys.ts

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

client/globals.d.ts

@@ -1 +1,2 @@
+declare const __API_BASE_URL__: string
 declare const __COMMIT_SHA__: string

client/latest.json

@@ -1,11 +0,0 @@
-{
-  "pub_date": "2025-10-19T18:09:51Z",
-  "version": "0.2.1",
-  "platforms": {
-    "windows-x86_64": {
-      "url": "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/chad_0.2.1_x64-setup.exe",
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUMHdwTUN1SnhESjBiY2xtakN0WW1LTHNyQ1RyQjd2YlVXRUozWHp0K003SlFYbmlreHY2UjF5RjAvdEhZKzBpL0J6NVJ1c09VaUVUa3ZCZmFUL1AxN2lCNW9pVW9MY0FvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzYwODk3MzkwCWZpbGU6Y2hhZF8wLjIuMV94NjQtc2V0dXAuZXhlCmtqcDJtSVQ0d1ZVdXpoYWxnMXVxQVlwLzM5V3BjM2Q4RGQzRXZBUlRFQzhnaDdqdjNTK0h0RW1zcjR5UFE2ZWx2dVppbWpjMlBYdG1ZUGM3NXVqT0F3PT0K"
-    }
-  },
-  "notes": ""
-}

client/nuxt.config.ts

@@ -1,3 +1,4 @@
+import { definePreset } from '@primeuix/themes'
 import Aura from '@primeuix/themes/aura'
 import tailwindcss from '@tailwindcss/vite'
 
@@ -10,10 +11,60 @@ export default defineNuxtConfig({
     '@primevue/nuxt-module',
     '@formkit/auto-animate/nuxt',
   ],
+  fonts: {
+    provider: 'google',
+  },
   primevue: {
     options: {
       theme: {
-        preset: Aura,
+        preset: definePreset(Aura, {
+          semantic: {
+            transitionDuration: '150ms',
+            primary: {
+              50: '{zinc.50}',
+              100: '{zinc.100}',
+              200: '{zinc.200}',
+              300: '{zinc.300}',
+              400: '{zinc.400}',
+              500: '{zinc.500}',
+              600: '{zinc.600}',
+              700: '{zinc.700}',
+              800: '{zinc.800}',
+              900: '{zinc.900}',
+              950: '{zinc.950}',
+            },
+          },
+          colorScheme: {
+            light: {
+              primary: {
+                color: '{zinc.950}',
+                inverseColor: '#ffffff',
+                hoverColor: '{zinc.900}',
+                activeColor: '{zinc.800}',
+              },
+              highlight: {
+                background: '{zinc.950}',
+                focusBackground: '{zinc.700}',
+                color: '#ffffff',
+                focusColor: '#ffffff',
+              },
+            },
+            dark: {
+              primary: {
+                color: '{zinc.50}',
+                inverseColor: '{zinc.950}',
+                hoverColor: '{zinc.100}',
+                activeColor: '{zinc.200}',
+              },
+              highlight: {
+                background: 'rgba(250, 250, 250, .16)',
+                focusBackground: 'rgba(250, 250, 250, .24)',
+                color: 'rgba(255,255,255,.87)',
+                focusColor: 'rgba(255,255,255,.87)',
+              },
+            },
+          },
+        }),
       },
     },
     components: {
@@ -25,9 +76,6 @@ export default defineNuxtConfig({
     '@/assets/styles/primeicons.css',
     '@/assets/styles/main.scss',
   ],
-  devServer: {
-    // host: '0',
-  },
   vite: {
     plugins: [
       tailwindcss(),
@@ -38,14 +86,18 @@ export default defineNuxtConfig({
       strictPort: true,
       proxy: {
         '/api': {
-          // target: 'http://localhost:4000',
+          target: 'http://localhost:4000/chad',
-          target: 'https://api.koptilnya.xyz',
+          // target: 'https://api.koptilnya.xyz/chad',
+          ws: true,
           changeOrigin: true,
-          rewrite: path => path.replace(/^\/api/, '/chad'),
+          rewrite: (path) => {
+            return path.replace(/^\/api/, '')
+          },
         },
       },
     },
     define: {
+      __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'),
     },
   },

client/package.json

@@ -14,21 +14,25 @@
     "@nuxt/fonts": "^0.11.4",
     "@primeuix/themes": "^1.2.5",
     "@tailwindcss/vite": "^4.1.14",
+    "@tauri-apps/plugin-global-shortcut": "~2",
     "@tauri-apps/plugin-process": "~2",
     "@tauri-apps/plugin-updater": "~2",
     "@vueuse/core": "^13.9.0",
+    "hotkeys-js": "^4.0.0",
+    "lucide-vue-next": "^0.562.0",
     "mediasoup-client": "^3.16.7",
-    "nuxt": "^4.1.2",
+    "nuxt": "^4.2.2",
     "postcss": "^8.5.6",
     "primeicons": "^7.0.0",
     "primevue": "^4.4.0",
     "socket.io-client": "^4.8.1",
     "tailwindcss": "^4.1.14",
     "tailwindcss-primeui": "^0.6.1",
+    "ufo": "^1.6.1",
     "vue": "^3.5.22",
     "vue-router": "^4.5.1"
   },
-  "packageManager": "yarn@4.10.3",
+  "packageManager": "yarn@4.12.0",
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",
     "@primevue/nuxt-module": "^4.4.0",

client/scripts/generate-updater.mjs

@@ -0,0 +1,41 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const TAURI_CONF = path.resolve(__dirname, '../src-tauri/tauri.conf.json')
+const OUTPUT = path.resolve(__dirname, '../updater.json')
+
+const PLATFORM = 'windows-x86_64'
+const BASE_URL = 'https://git.koptilnya.xyz/opti1337/chad/releases/download/latest'
+
+const tauriConfRaw = fs.readFileSync(TAURI_CONF, 'utf8')
+const tauriConf = JSON.parse(tauriConfRaw)
+const version = tauriConf.version
+
+const SIG_FILE = path.resolve(
+  __dirname,
+  `../src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
+)
+
+const signature = fs.readFileSync(SIG_FILE, 'utf8').trim()
+
+const installerName = `chad_${version}_x64-setup.exe`
+
+const updater = {
+  pub_date: new Date().toISOString(),
+  version,
+  platforms: {
+    [PLATFORM]: {
+      url: `${BASE_URL}/${installerName}`,
+      signature,
+    },
+  },
+  notes: '',
+}
+
+fs.writeFileSync(OUTPUT, JSON.stringify(updater, null, 2), 'utf8')
+
+console.log('updater.json generated')

client/server/plugins/extend-html.ts

@@ -0,0 +1,4 @@
+export default defineNitroPlugin((nitroApp) => {
+  nitroApp.hooks.hook('render:html', (html, { event }) => {
+  })
+})

client/shared/chad-api.ts

@@ -1,16 +1,64 @@
 import { ToastEventBus } from 'primevue'
 
 const instance = $fetch.create({
-  baseURL: process.env.API_BASE_URL || 'https://api.koptilnya.xyz/chad',
+  baseURL: __API_BASE_URL__,
   credentials: 'include',
-  onResponseError({ response }) {
+  retry: false,
+  onResponseError({ request, response }) {
     if (!import.meta.client)
       return
 
+    if (typeof request === 'string' && request.endsWith('/me'))
+      return
+
     const message = response._data.error || 'Something went wrong'
 
     ToastEventBus.emit('add', { severity: 'error', summary: 'Error', detail: message, closable: false, life: 3000 })
   },
 })
 
+// function instance(url: string, request: Request) {
+//   console.log(url)
+//   return fetch({
+//     url: `https://api.koptilnya.xyz${url}`,
+//     credentials: 'include',
+//     method: 'GET',
+//     headers: {
+//       'Accept': 'application/json',
+//       'Content-Type': 'application/json',
+//       ...request.headers,
+//     },
+//     ...request,
+//     body: request.body ? JSON.stringify(request.body) : undefined,
+//   })
+// }
+
+// async function instance(url: string, options: Partial<Request> = {}) {
+//   const response = await fetch(`https://api.koptilnya.xyz/chad${url}`, {
+//     method: options.method || 'GET',
+//     headers: {
+//       'Content-Type': 'application/json',
+//       ...(options.headers || {}),
+//     },
+//     body: JSON.stringify(options.body ?? {}),
+//     responseType: 2,
+//     credentials: 'include',
+//   })
+//
+//   const data = await response.json()
+//
+//   if (response.status >= 400) {
+//     if (!import.meta.client)
+//       return
+//
+//     const message = data?.error || 'Something went wrong'
+//
+//     ToastEventBus.emit('add', { severity: 'error', summary: 'Error', detail: message, closable: false, life: 3000 })
+//
+//     throw new Error(`HTTP ${response.status}: ${data?.message || 'Ошибка'}`)
+//   }
+//
+//   return data
+// }
+
 export default instance

client/src-tauri/Cargo.lock

@@ -93,6 +93,7 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-build",
+ "tauri-plugin-global-shortcut",
  "tauri-plugin-log",
  "tauri-plugin-process",
  "tauri-plugin-single-instance",
@@ -292,7 +293,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -603,7 +604,7 @@ dependencies = [
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -1375,6 +1376,16 @@ dependencies = [
  "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]]
 name = "getrandom"
 version = "0.1.16"
@@ -1504,6 +1515,24 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -4180,6 +4209,21 @@ dependencies = [
  "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]]
 name = "tauri-plugin-log"
 version = "2.7.0"
@@ -5227,7 +5271,7 @@ checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
  "windows-result 0.4.0",
  "windows-strings 0.5.0",
 ]
@@ -5273,9 +5317,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-link"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-numerics"
@@ -5302,7 +5346,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5320,7 +5364,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5365,7 +5409,7 @@ version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5405,7 +5449,7 @@ version = "0.53.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 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"
 checksum = "700dad7c058606087f6fdc1f88da5841e06da40334413c6cd4367b25ef26d24e"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5687,6 +5731,23 @@ dependencies = [
  "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]]
 name = "xattr"
 version = "1.6.1"
@@ -5697,6 +5758,12 @@ dependencies = [
  "rustix",
 ]
 
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
 [[package]]
 name = "yoke"
 version = "0.8.0"

client/src-tauri/Cargo.toml

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

client/src-tauri/capabilities/desktop.json

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

client/src-tauri/src/lib.rs

@@ -1,13 +1,10 @@
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
+        .plugin(tauri_plugin_global_shortcut::Builder::new().build())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_updater::Builder::new().build())
-        //         .plugin(tauri_plugin_single_instance::init(|app, args, cwd| {
+        .plugin(tauri_plugin_single_instance::init(|_, _, _| {}))
-        //             app.get_webview_window("main")
-        //                .expect("no main window")
-        //                .set_focus();
-        //         }))
         .setup(|app| {
             if cfg!(debug_assertions) {
                 app.handle().plugin(

client/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "chad",
-  "version": "0.2.2",
+  "version": "0.2.17",
   "identifier": "xyz.koptilnya.chad",
   "build": {
     "frontendDist": "../.output/public",
@@ -21,7 +21,8 @@
         "fullscreen": false,
         "center": true,
         "theme": "Dark",
-        "additionalBrowserArgs": "--disable-features=msWebOOUI,msPdfOOUI,msSmartScreenProtection --autoplay-policy=no-user-gesture-required"
+        "additionalBrowserArgs": "--disable-features=msWebOOUI,msPdfOOUI,msSmartScreenProtection --autoplay-policy=no-user-gesture-required",
+        "incognito": false
       }
     ],
     "security": {
@@ -43,9 +44,9 @@
   },
   "plugins": {
     "updater": {
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDI3NDM5Q0I4MDI5M0MyRjQKUldUMHdwTUN1SnhESjBoUFpuWkJxRzFqcWJxdTY4UkNvMmUzcHFnZnJtbSs3WmJoUmhxQ3R5bWYK",
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3MzkxMzM3RkQ3NTg4QUQKUldTdGlIWDlOeE01NStIak9VbmZTTm9HY2NyNUQrVXB5ZEdIN1BkK2lhYW9zWkNCQnZQSjRmelIK",
       "endpoints": [
-        "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/latest.json"
+        "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/updater.json"
       ]
     }
   }

server/auth/lucia.ts

@@ -17,6 +17,11 @@ interface DatabaseUserAttributes {
 }
 
 export const auth = new Lucia(new PrismaAdapter(prisma.session, prisma.user), {
+  sessionCookie: {
+    attributes: {
+      sameSite: 'none',
+    },
+  },
   getUserAttributes: ({ id, displayName, username }) => {
     return {
       id,

server/index.ts

@@ -1,47 +0,0 @@
-import { createServer as createHttpServer } from 'node:http'
-import { consola } from 'consola'
-import cors from 'cors'
-import express from 'express'
-import * as mediasoup from 'mediasoup'
-import { Server as SocketServer } from 'socket.io'
-import { webrtcSocket } from './sockets'
-
-(async () => {
-  const app = express()
-
-  app.use(cors())
-
-  const server = createHttpServer(app)
-
-  const worker = await mediasoup.createWorker()
-  worker.on('died', () => {
-    consola.error('[Mediasoup]', 'Worker died, exiting...')
-
-    process.exit(1)
-  })
-
-  const router = await worker.createRouter({
-    mediaCodecs: [
-      {
-        kind: 'audio',
-        mimeType: 'audio/opus',
-        clockRate: 48000,
-        channels: 2,
-        parameters: { useinbandfec: 1, stereo: 1 },
-      },
-    ],
-  })
-
-  const io = new SocketServer(server, {
-    path: '/chad/ws',
-    cors: {
-      origin: process.env.CORS_ORIGIN || '*',
-    },
-  })
-
-  webrtcSocket(io, router)
-
-  server.listen(process.env.PORT || 4000, () => {
-    consola.success('[Server]', 'Server started!')
-  })
-})()

server/plugins/auth.ts

@@ -17,15 +17,20 @@ export default fp(async (fastify) => {
     try {
       const sessionId = auth.readSessionCookie(req.headers.cookie ?? '')
 
+      if (!sessionId)
+        return
+
       const { session, user } = await auth.validateSession(sessionId ?? '')
 
       if (session && session.fresh) {
         const cookie = auth.createSessionCookie(session.id)
+
         reply.setCookie(cookie.name, cookie.value, cookie.attributes)
       }
 
       if (!session) {
         const blank = auth.createBlankSessionCookie()
+
         reply.setCookie(blank.name, blank.value, blank.attributes)
       }
 

server/plugins/mediasoup-router.ts

@@ -25,5 +25,50 @@ export const autoConfig: mediasoup.types.RouterOptions = {
       channels: 2,
       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: {},
+    },
   ],
 }

server/prisma/migrations/20251225143531_user_preferences/migration.sql

@@ -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");

server/prisma/migrations/20251225145827_user_preferences_volumes/migration.sql

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

server/prisma/migrations/20251225153018_user_preferences_optional_columns/migration.sql

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

server/prisma/schema.prisma

@@ -9,22 +9,32 @@ generator client {
 }
 
 model User {
-  id          String   @id @default(cuid())
+  id                String   @id @default(cuid())
-  username    String   @unique
+  username          String   @unique
-  password    String
+  password          String
-  displayName String
+  displayName       String
-  createdAt   DateTime @default(now())
+  createdAt         DateTime @default(now())
-  updatedAt   DateTime @updatedAt
+  updatedAt         DateTime @updatedAt
 
-  Session     Session[]
+  Session           Session[]
+  UserPreferences   UserPreferences?
 }
 
 model Session {
-  id        String    @id
+  id        String @id
   userId    String
   expiresAt DateTime
 
-  user      User      @relation(references: [id], fields: [userId], onDelete: Cascade)
+  user      User @relation(references: [id], fields: [userId], onDelete: Cascade)
 
   @@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)
+}

server/routes/auth.ts

@@ -1,5 +1,4 @@
 import type { FastifyInstance } from 'fastify'
-import type { RegisterOptions } from 'fastify/types/register.js'
 import bcrypt from 'bcrypt'
 import { z } from 'zod'
 import { auth } from '../auth/lucia.ts'
@@ -71,8 +70,6 @@ export default function (fastify: FastifyInstance) {
       const session = await auth.createSession(user.id, {})
       const cookie = auth.createSessionCookie(session.id)
 
-      cookie.attributes.secure = false
-
       reply.setCookie(cookie.name, cookie.value, cookie.attributes)
 
       return {
@@ -119,7 +116,3 @@ export default function (fastify: FastifyInstance) {
     }
   })
 }
-
-const autoConfig: RegisterOptions = {
-  prefix: '/chad',
-}

server/routes/user.ts

@@ -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 })
+      }
+    }
+  })
+}

server/server.ts

@@ -13,7 +13,16 @@ const fastify = Fastify({
   logger: true,
 })
 
-fastify.register(FastifyCors)
+fastify.register(FastifyCors, {
+  origin: [
+    'http://localhost:3000',
+    'http://tauri.localhost',
+    'https://koptilnya.xyz',
+    'https://chad.koptilnya.xyz',
+  ],
+  methods: ['PATCH', 'PUT', 'OPTIONS', 'GET', 'POST', 'DELETE'],
+  credentials: true,
+})
 
 fastify.register(FastifyCookie)
 
@@ -23,13 +32,14 @@ fastify.register(FastifyAutoLoad, {
 
 fastify.register(FastifyAutoLoad, {
   dir: join(__dirname, 'routes'),
+  options: { prefix: 'chad' },
 })
 
 ;(async () => {
   const port = process.env.PORT ? Number(process.env.PORT) : 4000
 
   try {
-    await fastify.listen({ port })
+    await fastify.listen({ port, host: '0.0.0.0' })
 
     await prisma.$connect()
     fastify.log.info('Testing DB Connection. OK')

server/socket/webrtc.ts

@@ -1,147 +1,17 @@
-import type { User } from '@prisma/client'
 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 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: {
-      peerId: 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) {
-  const namespace: Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvent, SocketData> = io.of('/webrtc')
+  const namespace: Namespace = io.of('/webrtc')
 
-  namespace.on('connection', (socket) => {
+  namespace.on('connection', async (socket) => {
     consola.info('[WebRtc]', 'Client connected', socket.id)
 
     socket.data.joined = false
@@ -153,7 +23,7 @@ export default function (io: SocketServer, router: types.Router) {
     socket.data.producers = new Map()
     socket.data.consumers = new Map()
 
-    prisma.user.findUnique({
+    const { id, username, displayName } = await prisma.user.findUnique({
       where: {
         id: socket.handshake.auth.userId,
       },
@@ -162,14 +32,14 @@ export default function (io: SocketServer, router: types.Router) {
         username: true,
         displayName: true,
       },
-    }).then(({ id, username, displayName }) => {
-      socket.data.userId = id
-      socket.data.username = username
-      socket.data.displayName = displayName
-
-      socket.emit('authenticated')
     })
 
+    socket.data.userId = id
+    socket.data.username = username
+    socket.data.displayName = displayName
+
+    socket.emit('authenticated')
+
     socket.on('join', async ({ rtpCapabilities }, cb) => {
       if (socket.data.joined) {
         consola.error('[WebRtc]', 'Already joined')
@@ -231,7 +101,7 @@ export default function (io: SocketServer, router: types.Router) {
           dtlsParameters: transport.dtlsParameters,
         })
 
-        transport.on('icestatechange', (iceState) => {
+        transport.on('icestatechange', (iceState: types.IceState) => {
           if (iceState === 'disconnected' || iceState === 'closed') {
             consola.info('[WebRtc]', '[WebRtcTransport]', `"icestatechange" event [iceState:${iceState}], closing peer`, transport.id)
 
@@ -239,7 +109,7 @@ export default function (io: SocketServer, router: types.Router) {
           }
         })
 
-        transport.on('dtlsstatechange', (dtlsState) => {
+        transport.on('dtlsstatechange', (dtlsState: types.DtlsState) => {
           if (dtlsState === 'failed' || dtlsState === 'closed') {
             consola.warn('WebRtcTransport "dtlsstatechange" event [dtlsState:%s], closing peer', dtlsState)
 
@@ -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) {
         consola.error('Peer not joined yet')
         cb({ error: 'Peer not joined yet' })
@@ -296,7 +166,7 @@ export default function (io: SocketServer, router: types.Router) {
       }
 
       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)
 
@@ -364,6 +234,9 @@ export default function (io: SocketServer, router: types.Router) {
         return
       }
 
+      if (producer.paused)
+        return
+
       await producer.pause()
 
       cb({ ok: true })
@@ -436,24 +309,11 @@ export default function (io: SocketServer, router: types.Router) {
     })
 
     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
       }
 
-      if (updatedClient.outputMuted) {
+      if (typeof updatedClient.outputMuted === 'boolean') {
         socket.data.outputMuted = updatedClient.outputMuted
       }
 
@@ -547,7 +407,7 @@ export default function (io: SocketServer, router: types.Router) {
       consumerSocket.emit('consumerResumed', { consumerId: consumer.id })
     })
 
-    consumer.on('score', (score) => {
+    consumer.on('score', (score: types.ConsumerScore) => {
       consumerSocket.emit('consumerScore', { consumerId: consumer.id, score })
     })
 
@@ -555,7 +415,7 @@ export default function (io: SocketServer, router: types.Router) {
       await consumerSocket.emitWithAck(
         'newConsumer',
         {
-          peerId: producerSocket.id,
+          socketId: producerSocket.id,
           producerId: producer.id,
           id: consumer.id,
           kind: consumer.kind,
@@ -580,15 +440,4 @@ export default function (io: SocketServer, router: types.Router) {
       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,
-    }
-  }
 }

server/types/webrtc.ts

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

server/utils/socket-to-client.ts

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

yarn.lock

@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-