Merge pull request 'shareFps' (#9) from shareFps into master

Reviewed-on: #9

client/app/assets/styles/main.scss

@@ -31,17 +31,17 @@ body {
 
 .p-select-overlay {
   /* Force dropdown width to match computed min-width from PrimeVue internals. */
-  width: 0;
+  width: 0 !important;
 }
 
 .p-select-label {
-  width: 0;
+  width: 0 !important;
-  overflow: hidden;
+  overflow: hidden !important;
-  text-overflow: ellipsis;
+  text-overflow: ellipsis !important;
 }
 
 .p-select-option-label {
-  min-width: 0;
+  min-width: 0 !important;
-  overflow: hidden;
+  overflow: hidden !important;
-  text-overflow: ellipsis;
+  text-overflow: ellipsis !important;
 }

client/app/components.d.ts

@@ -16,9 +16,7 @@ declare module 'vue' {
     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']

client/app/components/ClientRow.vue

@@ -27,7 +27,7 @@
         <PrimeBadge v-if="isMe" severity="secondary" value="You" size="small" class="shrink-0" />
       </div>
 
-      <Component :is="expanded ? ChevronUp : ChevronDown" v-if="!isMe" :size="20" />
+      <Component :is="expanded ? ChevronUp : ChevronDown" v-if="!isMe" :size="20" class="text-muted-color" />
     </div>
 
     <CollapseTransition v-if="!isMe">

client/app/composables/use-app.ts

@@ -12,7 +12,17 @@ export const useApp = createGlobalState(() => {
   const ready = ref(false)
   const isTauri = computed(() => '__TAURI_INTERNALS__' in window)
   const commitSha = __COMMIT_SHA__
-  const version = computedAsync(() => isTauri.value ? getVersion() : 'web', '-')
+  const version = computedAsync(() => {
+    if (import.meta.dev) {
+      return 'dev'
+    }
+    else if (isTauri.value) {
+      return getVersion()
+    }
+    else {
+      return 'web'
+    }
+  }, '-')
 
   const inputMuted = computed(() => {
     return !!mediasoup.micProducer.value?.paused

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

@@ -29,11 +29,25 @@ export const useFullscreenVideo = createGlobalState(() => {
       videoEl.value = el
     }
 
+    stream.getTracks().forEach(t =>
+      t.addEventListener('ended', hide),
+    )
+    videoEl.value.addEventListener('ended', hide)
+
     await videoEl.value.requestFullscreen()
   }
 
   function hide() {
+    if (!videoEl.value)
+      return
+
+    (videoEl.value.srcObject as MediaStream).getTracks().forEach(t =>
+      t.removeEventListener('ended', hide),
+    )
+    videoEl.value.removeEventListener('ended', hide)
+
     videoEl.value?.remove()
+    videoEl.value = undefined
   }
 
   useEventListener(document, 'fullscreenchange', () => {

client/app/composables/use-mediasoup.ts

@@ -317,7 +317,7 @@ export const useMediasoup = createSharedComposable(() => {
     if (!device.value)
       return
 
-    const stream = await getShareStream()
+    const stream = await getShareStream(preferences.shareFps.value)
 
     const track = stream.getVideoTracks()[0]
 

client/app/composables/use-preferences.ts

@@ -19,6 +19,8 @@ export const usePreferences = createGlobalState(() => {
   const noiseSuppression = useLocalStorage('NOISE_SUPPRESSION', true)
   const echoCancellation = useLocalStorage('ECHO_CANCELLATION', true)
 
+  const shareFps = useLocalStorage('SHARE_FPS', 30)
+
   const toggleInputHotkey = ref<SyncedPreferences['toggleInputHotkey']>('')
   const toggleOutputHotkey = ref<SyncedPreferences['toggleOutputHotkey']>('')
 
@@ -57,6 +59,7 @@ export const usePreferences = createGlobalState(() => {
     autoGainControl,
     noiseSuppression,
     echoCancellation,
+    shareFps,
     toggleInputHotkey,
     toggleOutputHotkey,
     inputDeviceExist,

client/app/layouts/default.vue

@@ -4,24 +4,24 @@
       class="flex items-center justify-between gap-2 rounded-xl p-3 bg-surface-950"
     >
       <div class="inline-flex items-center gap-3">
-        <PrimeBadge v-if="isTauri" class="opacity-50" severity="secondary" :value="version" size="small" />
+        <PrimeBadge class="opacity-50" severity="secondary" :value="version" size="small" />
         <PrimeBadge :severity="connected ? 'success' : 'danger' " />
       </div>
 
       <PrimeButtonGroup class="ml-auto">
-        <PrimeButton outlined @click="toggleInput">
+        <PrimeButton :severity="inputMuted ? 'info' : undefined" outlined @click="toggleInput">
           <template #icon>
             <Component :is="inputMuted ? MicOff : Mic" />
           </template>
         </PrimeButton>
-        <PrimeButton outlined @click="toggleOutput">
+        <PrimeButton :severity="outputMuted ? 'info' : undefined" outlined @click="toggleOutput">
           <template #icon>
             <Component :is="outputMuted ? VolumeOff : Volume2" />
           </template>
         </PrimeButton>
       </PrimeButtonGroup>
 
-      <PrimeButton outlined @click="toggleShare">
+      <PrimeButton :severity="sharingEnabled ? 'success' : undefined" outlined @click="toggleShare">
         <template #icon>
           <Component :is="sharingEnabled ? ScreenShareOff : ScreenShare" />
         </template>
@@ -72,7 +72,6 @@ import {
 } from 'lucide-vue-next'
 
 const {
-  isTauri,
   version,
   clients,
   inputMuted,

client/app/pages/preferences.vue

@@ -47,6 +47,18 @@
     <!--      <label for="outputDevice">Output device</label> -->
     <!--    </PrimeFloatLabel> -->
 
+    <PrimeDivider align="left">
+      Video
+    </PrimeDivider>
+
+    <div>
+      <div class="flex justify-between text-sm mb-3">
+        <span>FPS</span>
+        <span>{{ shareFps }}</span>
+      </div>
+      <PrimeSlider v-model="shareFps" class="mx-[10px]" :min="30" :max="60" :step="5" />
+    </div>
+
     <template v-if="isTauri">
       <PrimeDivider align="left">
         Hotkeys
@@ -117,6 +129,7 @@ const {
   toggleOutputHotkey,
   inputDeviceExist,
   outputDeviceExist,
+  shareFps,
 } = usePreferences()
 
 const setupToggleInputHotkey = (event: KeyboardEvent) => setupHotkey(event, toggleInputHotkey)

client/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "chad",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "identifier": "xyz.koptilnya.chad",
   "build": {
     "frontendDist": "../.output/public",