test publish

.gitea/workflows/deploy-client.yml

@@ -3,13 +3,15 @@ name: Deploy
 on:
   push:
     branches:
-      - master
+      - release
+    # tags:
+    # - "v[0-9]+.[0-9]+.[0-9]+"
     paths:
-      - '.gitea/workflows/deploy-client.yml'
+      - ".gitea/workflows/deploy-client.yml"
-      - 'client/**'
+      - "client/**"
 
 jobs:
-  deploy:
+  publish-web:
     runs-on: ubuntu-latest
 
     steps:
@@ -41,3 +43,32 @@ jobs:
             --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \
             --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
             chad-client:latest
+
+  publish-tauri:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: install frontend dependencies
+        run: yarn install
+
+      - uses: tauri-apps/tauri-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.TOKEN }}
+        with:
+          tagName: app-v__VERSION__
+          releaseName: "App v__VERSION__"
+          releaseBody: "See the assets to download this version and install."
+          releaseDraft: true
+          projectPath: "./client"
+          githubBaseUrl: "https://git.koptilnya.xyz/api/v1"
+          isGitea: true
+          prerelease: false

client/app/components.d.ts

@@ -17,7 +17,9 @@ declare module 'vue' {
     PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
     PrimeInputText: typeof import('primevue/inputtext')['default']
     PrimeMenu: typeof import('primevue/menu')['default']
+    PrimePanel: typeof import('primevue/panel')['default']
     PrimePassword: typeof import('primevue/password')['default']
+    PrimeProgressBar: typeof import('primevue/progressbar')['default']
     PrimeSelectButton: typeof import('primevue/selectbutton')['default']
     PrimeSlider: typeof import('primevue/slider')['default']
     PrimeToast: typeof import('primevue/toast')['default']

client/app/components/ClientRow.vue

@@ -15,7 +15,7 @@
         </div>
       </div>
 
-      <PrimeBadge v-if="client.inputMuted" severity="info" value="Muted" />
+      <PrimeBadge v-if="audioConsumerPaused" severity="info" value="Muted" />
       <PrimeBadge v-if="isMe" severity="secondary" value="You" />
 
       <template v-if="!isMe">
@@ -70,11 +70,23 @@ const isMe = computed(() => {
 })
 
 const audioConsumer = computed(() => {
-  const consumers = getClientConsumers(props.client.id)
+  if (isMe.value)
+    return undefined
+
+  const consumers = getClientConsumers(props.client.socketId)
 
   return consumers.find(consumer => consumer.track.kind === 'audio')
 })
 
+const audioConsumerPaused = computed(() => {
+  if (isMe.value)
+    return false
+
+  const consumers = getClientConsumers(props.client.socketId)
+
+  return consumers.find(consumer => consumer.track.kind === 'audio')?.paused
+})
+
 const audioTrack = computed(() => {
   return audioConsumer.value?.track
 })

client/app/composables/use-app.ts

@@ -1,4 +1,6 @@
-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(() => {
@@ -11,6 +13,10 @@ export const useApp = createGlobalState(() => {
 
   const previousInputMuted = ref(inputMuted.value)
 
+  const isTauri = computed(() => '__TAURI_INTERNALS__' in window)
+
+  const version = computedAsync(() => isTauri.value ? getVersion() : 'web', '-')
+
   function muteInput() {
     inputMuted.value = true
   }
@@ -43,13 +49,13 @@ export const useApp = createGlobalState(() => {
 
   watch(inputMuted, async (inputMuted) => {
     if (inputMuted) {
-      await mediasoup.muteMic()
+      await mediasoup.pauseProducer('microphone')
     }
     else {
       if (outputMuted.value) {
         outputMuted.value = false
       }
-      await mediasoup.unmuteMic()
+      await mediasoup.resumeProducer('microphone')
     }
 
     const toastText = inputMuted ? 'Microphone muted' : 'Microphone activated'
@@ -79,5 +85,7 @@ export const useApp = createGlobalState(() => {
     muteOutput,
     unmuteOutput,
     toggleOutput,
+    version,
+    isTauri,
   }
 })

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-mediasoup.ts

@@ -4,6 +4,8 @@ import * as mediasoupClient from 'mediasoup-client'
 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' },
@@ -31,7 +33,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 +147,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 +158,16 @@ export const useMediasoup = createSharedComposable(() => {
           producerId,
           kind,
           rtpParameters,
-          streamId: `${clientId}-${appData.share ? 'share' : 'mic-webcam'}`,
+          streamId: `${socketId}-${appData.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 +182,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,16 +198,40 @@ 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()
+
+      console.log(consumerId)
+
+      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']) {
+  function getClientConsumers(socketId: ChadClient['socketId']) {
-    return consumers.value.values().filter(consumer => consumer.appData.clientId === clientId)
+    return consumers.value.values().filter(consumer => consumer.appData.socketId === socketId)
   }
 
   async function enableMic() {
@@ -274,33 +298,48 @@ export const useMediasoup = createSharedComposable(() => {
     micProducer.value = undefined
   }
 
-  async function muteMic() {
+  async function pauseProducer(type: ProducerType) {
-    if (!signaling.socket.value || !micProducer.value)
+    if (!signaling.socket.value)
+      return
+
+    const producer = getProducerByType(type)
+
+    if (!producer)
+      return
+
+    if (producer.paused)
       return
 
     try {
-      micProducer.value.pause()
+      producer.pause()
 
       await signaling.socket.value.emitWithAck('pauseProducer', {
-        producerId: micProducer.value.id,
+        producerId: producer.id,
       })
     }
     catch {
+      producer.resume()
     }
   }
 
-  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)
       return
 
     try {
-      micProducer.value.resume()
+      producer.resume()
 
       await signaling.socket.value.emitWithAck('resumeProducer', {
-        producerId: micProducer.value.id,
+        producerId: producer.id,
       })
     }
     catch {
+      producer.pause()
     }
   }
 
@@ -308,6 +347,17 @@ export const useMediasoup = createSharedComposable(() => {
     signaling.connect()
   }
 
+  function getProducerByType(type: ProducerType) {
+    switch (type) {
+      case 'microphone':
+        return micProducer.value
+      case 'camera':
+        return cameraProducer.value
+      case 'share':
+        return shareProducer.value
+    }
+  }
+
   return {
     init,
     consumers,
@@ -317,10 +367,10 @@ export const useMediasoup = createSharedComposable(() => {
     rtpCapabilities,
     device,
     micProducer,
-    webcamProducer,
+    cameraProducer,
     shareProducer,
     getClientConsumers,
-    muteMic,
+    pauseProducer,
-    unmuteMic,
+    resumeProducer,
   }
 })

client/app/composables/use-preferences.ts

@@ -1,11 +1,22 @@
-import { createGlobalState } from '@vueuse/core'
+import { createGlobalState, useDevicesList } from '@vueuse/core'
 
 export const usePreferences = createGlobalState(() => {
-  const audioDevice = shallowRef()
+  const inputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>()
-  const videoDevice = shallowRef()
+  const outputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>()
+
+  const {
+    ensurePermissions,
+    permissionGranted,
+    videoInputs,
+    audioInputs,
+    audioOutputs,
+  } = useDevicesList()
 
   return {
-    audioDevice,
+    inputDeviceId,
-    videoDevice,
+    outputDeviceId,
+    videoInputs,
+    audioInputs,
+    audioOutputs,
   }
 })

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,21 @@ 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(`http://localhost:4000/webrtc`, {
+      path: `/chad/ws`,
       transports: ['websocket'],
+      // socket.value = io(`${uri}/webrtc`, {
+      //   path: `${pathname}/ws`,
       withCredentials: true,
       auth: {
-        userId: me.value!.id,
+        userId: me.value.id,
       },
     })
   }

client/app/composables/use-updater.ts

@@ -0,0 +1,27 @@
+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,
+    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 [

client/app/layouts/blank.vue

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

client/app/layouts/default.vue

@@ -1,7 +1,7 @@
 <template>
-  <div v-auto-animate class="grid grid-cols-2 h-screen">
+  <div class="grid grid-cols-2 h-screen">
     <div class="flex flex-col shadow-xl shadow-surface-950 overflow-y-hidden">
-      <AppHeader title="Шальные сиськи 18+">
+      <AppHeader title="Сиськи отвалились">
         <template #right>
           <PrimeButtonGroup class="ml-auto">
             <PrimeButton
@@ -23,15 +23,20 @@
       </div>
     </div>
 
-    <slot />
+    <div class="overflow-y-auto">
+      <slot />
+    </div>
   </div>
 
-  <PrimeBadge class="fixed top-3 right-3" severity="success" />
+  <div class="fixed top-3 right-3 inline-flex items-center gap-3">
+    <PrimeBadge v-if="isTauri" class="opacity-50" severity="secondary" :value="version" size="small" />
+    <PrimeBadge :severity="connected ? 'success' : 'danger' " />
+  </div>
 </template>
 
 <script setup lang="ts">
-const { clients, inputMuted, toggleInput, outputMuted, toggleOutput } = useApp()
+const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri } = useApp()
-const { connect } = useSignaling()
+const { connect, connected } = useSignaling()
 
 const route = useRoute()
 

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 (import.meta.dev || import.meta.server)
+    return
+
+  const { isTauri } = useApp()
+
+  if (!isTauri.value)
+    return
+
   if (from?.name)
     return
 
-  const update = await check()
+  const { checkForUpdates } = useUpdater()
 
-  console.log(update)
+  const update = await checkForUpdates()
-
-  if (import.meta.dev)
-    return
 
   if (update) {
-    console.log(
+    return navigateTo({ name: 'Updating' })
-      `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/pages/index.vue

@@ -1,11 +1,62 @@
 <template>
-  <div class="flex items-center justify-center p-3">
+  <div class="flex flex-col gap-3 p-3 pt-12">
-    <PrimeFieldset legend="Important information">
+    <PrimePanel header="Clients" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }">
-      The chat is under development.
+      <dl v-for="client in clients" :key="client.socketId" class="">
-    </PrimeFieldset>
+        <div v-for="(value, key) in client" :key="key" class="py-2">
+          <dt class="font-bold">
+            {{ key }}
+          </dt>
+          <dd class="pl-8">
+            {{ value }}
+          </dd>
+        </div>
+      </dl>
+    </PrimePanel>
+
+    <PrimePanel header="Producers" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }">
+      <dl v-for="[_, producer] in Array.from(producers)" :key="producer.id" class="">
+        <div v-for="key in ['id', 'paused']" :key="key" class="py-2">
+          <dt class="font-bold">
+            {{ key }}
+          </dt>
+          <dd class="pl-8">
+            {{ producer[key] }}
+          </dd>
+        </div>
+      </dl>
+    </PrimePanel>
+
+    <PrimePanel header="Consumers" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }">
+      <dl v-for="[_, consumer] in Array.from(consumers)" :key="consumer.id" class="">
+        <div v-for="key in ['id', 'paused']" :key="key" class="py-2">
+          <dt class="font-bold">
+            {{ key }}
+          </dt>
+          <dd class="pl-8">
+            {{ consumer[key] }}
+          </dd>
+        </div>
+      </dl>
+    </PrimePanel>
   </div>
+
+<!--  <div class="flex items-center justify-center p-3"> -->
+<!--    <PrimeCard> -->
+<!--      <template #subtitle> -->
+<!--        Important information -->
+<!--      </template> -->
+
+<!--      <template #content> -->
+<!--        The chat is under development. -->
+<!--      </template> -->
+<!--    </PrimeCard> -->
+<!--  </div> -->
 </template>
 
 <script setup lang="ts">
-const { clients, inputMuted, toggleInput, outputMuted, toggleOutput } = useApp()
+const { clients } = useClients()
+const { producers, consumers } = useMediasoup()
+
+definePageMeta({
+})
 </script>

client/app/pages/preferences.vue

@@ -11,10 +11,28 @@
       <PrimeButton label="Save" type="submit" :disabled="!valid" />
     </form>
 
+    <div v-if="isTauri" class="p-3">
+      <PrimeButton label="Check for Updates" fluid severity="info" @click="onCheckForUpdates" />
+    </div>
+
     <div class="p-3">
-      <PrimeButton label="Logout" fluid severity="danger" @click="logout" />
+      <PrimeButton label="Logout" fluid severity="danger" @click="logout()" />
     </div>
   </div>
+
+  <PrimeToast position="bottom-center" group="updater">
+    <template #container="slotProps">
+      <div class="p-3">
+        <div class="font-medium text-lg mb-4">
+          {{ slotProps.message.detail }}
+        </div>
+        <div class="flex gap-3">
+          <PrimeButton size="small" label="Update now" @click="() => {}" />
+          <PrimeButton size="small" label="Later" severity="secondary" outlined @click="slotProps.closeCallback()" />
+        </div>
+      </div>
+    </template>
+  </PrimeToast>
 </template>
 
 <script setup lang="ts">
@@ -22,6 +40,8 @@ definePageMeta({
   name: 'Preferences',
 })
 
+const { isTauri } = useApp()
+const { checkForUpdates } = useUpdater()
 const { me, setMe, logout } = useAuth()
 
 const signaling = useSignaling()
@@ -39,6 +59,27 @@ const valid = computed(() => {
   return true
 })
 
+async function onCheckForUpdates() {
+  const update = await checkForUpdates()
+
+  toast.removeGroup('updater')
+
+  if (!update) {
+    toast.add({ severity: 'success', summary: 'You are up to date', closable: false, life: 1000 })
+
+    return
+  }
+
+  toast.add({
+    group: 'updater',
+    severity: 'info',
+    detail: `Version ${update?.version ?? '1.0.1'} is available!`,
+    closable: false,
+  })
+
+  // asdasd
+}
+
 async function save() {
   if (!valid.value)
     return

client/app/pages/updater.vue

@@ -0,0 +1,42 @@
+<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/globals.d.ts

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

client/latest.json

@@ -1,10 +1,10 @@
 {
-  "pub_date": "2025-10-19T18:09:51Z",
+  "pub_date": "2025-10-19T23:31:56Z",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "platforms": {
     "windows-x86_64": {
-      "url": "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/chad_0.2.1_x64-setup.exe",
+      "url": "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/chad_0.2.4_x64-setup.exe",
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUMHdwTUN1SnhESjBiY2xtakN0WW1LTHNyQ1RyQjd2YlVXRUozWHp0K003SlFYbmlreHY2UjF5RjAvdEhZKzBpL0J6NVJ1c09VaUVUa3ZCZmFUL1AxN2lCNW9pVW9MY0FvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzYwODk3MzkwCWZpbGU6Y2hhZF8wLjIuMV94NjQtc2V0dXAuZXhlCmtqcDJtSVQ0d1ZVdXpoYWxnMXVxQVlwLzM5V3BjM2Q4RGQzRXZBUlRFQzhnaDdqdjNTK0h0RW1zcjR5UFE2ZWx2dVppbWpjMlBYdG1ZUGM3NXVqT0F3PT0K"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUMHdwTUN1SnhESjA5ekxpMGNPQURBSWVYekdEb3kxZ2tKVUNyMVRmcG9vckpsT1Fhcm9PTFp4ZVdDdEtvdWVDYWY0bkJBWjZOby9QNkNNWFJUT1VBY0tRZVNXUVl6eVEwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzYwOTE2NzE1CWZpbGU6Y2hhZF8wLjIuNF94NjQtc2V0dXAuZXhlCitPYjR2QjNxNk9HdjV1WmdnUFFWRWxraDJzUFZrd1p2bGwrcEpaWjEzZExaQUJvWWNjL1VWWFZlVG4yR2hIeDFSNzJTRk1MMDVtdGo4NGE0ckp0bERBPT0K"
     }
   },
   "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 || '/api'),
       __COMMIT_SHA__: JSON.stringify(import.meta.env.COMMIT_SHA || 'local'),
     },
   },

client/package.json

@@ -18,13 +18,14 @@
     "@tauri-apps/plugin-updater": "~2",
     "@vueuse/core": "^13.9.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"
   },

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,8 +1,9 @@
 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',
+  retry: false,
   onResponseError({ response }) {
     if (!import.meta.client)
       return
@@ -13,4 +14,48 @@ const instance = $fetch.create({
   },
 })
 
+// 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/src/lib.rs

@@ -3,11 +3,8 @@ pub fn run() {
     tauri::Builder::default()
         .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.5-rc.2",
   "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": {

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/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/server.ts

@@ -13,7 +13,13 @@ const fastify = Fastify({
   logger: true,
 })
 
-fastify.register(FastifyCors)
+fastify.register(FastifyCors, {
+  origin: [
+    'http://localhost:3000',
+    'http://tauri.localhost',
+  ],
+  credentials: true,
+})
 
 fastify.register(FastifyCookie)
 
@@ -23,13 +29,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

@@ -102,7 +102,7 @@ interface ServerToClientEvents {
   producers: (arg: ProducerShort[]) => void
   newConsumer: (
     arg: {
-      peerId: string
+      socketId: string
       producerId: types.Producer['id']
       id: types.Consumer['id']
       kind: types.MediaKind
@@ -141,7 +141,7 @@ type SomeSocket = Socket<ClientToServerEvents, ServerToClientEvents, InterServer
 export default function (io: SocketServer, router: types.Router) {
   const namespace: Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvent, SocketData> = 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 +153,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 +162,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 +231,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 +239,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)
 
@@ -364,6 +364,9 @@ export default function (io: SocketServer, router: types.Router) {
         return
       }
 
+      if (producer.paused)
+        return
+
       await producer.pause()
 
       cb({ ok: true })
@@ -547,7 +550,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 +558,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,