test publish

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'}`,
-          appData: { ...appData, clientId },
+          streamId: `${socketId}-${appData.share ? 'share' : 'mic-webcam'}`,
+          appData: { ...appData, socketId },
         })
 
+        if (producerPaused)
+          consumer.pause()
+
         consumer.on('transportclose', () => {
-          consumers.value.delete(consumer.id)
-          triggerRef(consumers)
+          if (consumers.value.delete(consumer.id))
+            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 (!consumer)
-          return
-
-        consumers.value.delete(consumer.id)
-        triggerRef(consumers)
+        if (consumers.value.delete(consumerId))
+          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']) {
-    return consumers.value.values().filter(consumer => consumer.appData.clientId === clientId)
+  function getClientConsumers(socketId: ChadClient['socketId']) {
+    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() {
-    if (!signaling.socket.value || !micProducer.value)
+  async function pauseProducer(type: ProducerType) {
+    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() {
-    if (!signaling.socket.value || !micProducer.value)
+  async function resumeProducer(type: ProducerType) {
+    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,
-    unmuteMic,
+    pauseProducer,
+    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 videoDevice = shallowRef()
+  const inputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>()
+  const outputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>()
+
+  const {
+    ensurePermissions,
+    permissionGranted,
+    videoInputs,
+    audioInputs,
+    audioOutputs,
+  } = useDevicesList()
 
   return {
-    audioDevice,
-    videoDevice,
+    inputDeviceId,
+    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', {
-    // socket.value = io('http://localhost:4000/webrtc', {
-      path: '/chad/ws',
+    const { protocol, host, pathname } = parseURL(__API_BASE_URL__)
+
+    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 { connect } = useSignaling()
+const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri } = useApp()
+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)
-
-  if (import.meta.dev)
-    return
+  const update = await checkForUpdates()
 
   if (update) {
-    console.log(
-      `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()
+    return navigateTo({ name: 'Updating' })
   }
 })

client/app/pages/index.vue

@@ -1,11 +1,62 @@
 <template>
-  <div class="flex items-center justify-center p-3">
-    <PrimeFieldset legend="Important information">
-      The chat is under development.
-    </PrimeFieldset>
+  <div class="flex flex-col gap-3 p-3 pt-12">
+    <PrimePanel header="Clients" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }">
+      <dl v-for="client in clients" :key="client.socketId" class="">
+        <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>