51 Commits

Author SHA1 Message Date
43a8b98a6a update 2025-12-25 07:21:45 +06:00
0f9a7e39ce update 2025-12-25 07:21:30 +06:00
8265e2d719 update 2025-12-25 03:51:29 +06:00
4f91309f7f update 2025-12-24 06:29:44 +06:00
bcd457e2d6 update 2025-12-24 06:20:11 +06:00
8eef4fc477 update 2025-12-24 04:39:46 +06:00
614867bd12 update 2025-12-24 04:35:41 +06:00
cdf2bf5952 update 2025-12-24 04:35:13 +06:00
a4bd6705b6 Merge branch 'master' of git.koptilnya.xyz:opti1337/chad
Some checks failed
Deploy / publish-windows (push) Has been cancelled
2025-12-24 04:03:07 +06:00
723048c72a update 2025-12-24 04:02:53 +06:00
06ea0cd488 Обновить .gitea/workflows/deploy-client.yml
Some checks failed
Deploy / publish-windows (push) Failing after 6m3s
2025-12-23 19:52:47 +00:00
007d3ddda7 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Has been cancelled
2025-12-24 00:42:07 +06:00
33cdaebada Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 3m0s
2025-12-24 00:25:30 +06:00
9650ea63fc update
Some checks failed
Deploy / publish-windows (push) Failing after 18s
2025-12-24 00:23:29 +06:00
db59b85bd2 udpate
All checks were successful
Deploy / publish-windows (push) Successful in 3m22s
2025-12-24 00:11:03 +06:00
3f6f3b739e Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 9m54s
2025-12-23 23:43:14 +06:00
b33a896117 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 4m17s
2025-12-23 23:14:44 +06:00
01ae1b5011 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 24s
2025-12-23 22:53:46 +06:00
0ac69610f2 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 26s
2025-12-23 22:52:38 +06:00
c4489b58c9 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 23s
2025-12-23 22:50:37 +06:00
c19bef73e0 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Has been cancelled
2025-12-23 22:44:24 +06:00
c573d2277a update
Some checks failed
Deploy / publish-windows (push) Failing after 23s
2025-12-23 22:42:04 +06:00
3006a82a0f update
Some checks failed
Deploy / publish-windows (push) Failing after 19m11s
2025-12-23 22:03:09 +06:00
a68aa78ae1 update
Some checks failed
Deploy / publish-windows (push) Failing after 16m16s
2025-12-23 21:45:21 +06:00
ba9f51bd5e Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 18m59s
2025-12-23 21:21:44 +06:00
89a3eac2b9 Update deploy-client.yml
Some checks failed
Deploy / publish-windows (push) Failing after 18s
2025-12-23 20:55:14 +06:00
01de23a036 Merge pull request 'release test' (#7) from release into master
Reviewed-on: #7
2025-12-23 14:51:49 +00:00
aef93ef821 update 2025-12-23 20:50:13 +06:00
72f46df4d1 update
All checks were successful
Deploy / publish-windows (push) Successful in 19s
2025-12-23 00:59:01 +06:00
50c56e87ff Update Dockerfile.windows
All checks were successful
Deploy / publish-windows (push) Successful in 6m11s
2025-12-23 00:37:41 +06:00
a7d65f0e3c Update deploy-client.yml
Some checks failed
Deploy / publish-windows (push) Failing after 5m37s
2025-12-23 00:27:43 +06:00
649b49a732 update
Some checks failed
Deploy / publish-windows (push) Failing after 9s
2025-12-23 00:27:01 +06:00
b887b69997 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 2m45s
2025-12-23 00:07:40 +06:00
687a2958c0 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 1m52s
2025-12-22 23:35:59 +06:00
a7fe94abec Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 3m13s
2025-12-22 22:40:13 +06:00
adb539350f Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 27s
2025-12-22 22:37:41 +06:00
d870b7c1f1 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 9m31s
2025-12-22 22:27:02 +06:00
edd5a69cd4 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 35s
2025-12-22 22:24:34 +06:00
6343f1de4d Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 2m21s
2025-12-22 22:19:14 +06:00
3f581ea8e9 Update deploy-client.yml
Some checks failed
Deploy / publish-windows (push) Failing after 2m34s
2025-12-22 22:15:37 +06:00
10bfcf0727 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 21s
2025-12-22 22:14:24 +06:00
6b5383ba24 Update Dockerfile.windows
Some checks failed
Deploy / publish-windows (push) Failing after 19s
2025-12-22 22:01:30 +06:00
6b5d669f64 update
Some checks failed
Deploy / publish-windows (push) Failing after 27s
2025-12-22 21:55:12 +06:00
40d66d356b update
Some checks failed
Deploy / publish-tauri (push) Failing after 15s
Deploy / publish-web (push) Successful in 40s
2025-12-22 21:50:33 +06:00
c665c19cf3 update
Some checks failed
Deploy / publish-web (push) Failing after 33s
Deploy / publish-tauri (push) Failing after 50s
2025-12-22 21:47:24 +06:00
b05a7324d6 update
Some checks failed
Deploy / publish-web (push) Successful in 41s
Deploy / publish-tauri (push) Failing after 52s
2025-12-22 21:45:17 +06:00
e8cbf6e146 update
Some checks failed
Deploy / publish-tauri (push) Has been cancelled
Deploy / publish-web (push) Has been cancelled
2025-12-22 21:44:36 +06:00
472fa8d907 update
Some checks failed
Deploy / publish-web (push) Failing after 20s
Deploy / publish-tauri (push) Failing after 18s
2025-12-22 21:40:38 +06:00
ddc43e4b42 update
Some checks failed
Deploy / publish-web (push) Failing after 41s
Deploy / publish-tauri (push) Failing after 25s
2025-12-22 21:36:12 +06:00
8d02eb380d update
Some checks failed
Deploy / publish-web (push) Failing after 13s
Deploy / publish-tauri (push) Failing after 12s
2025-12-22 21:17:29 +06:00
4c70dce568 build
Some checks failed
Deploy / publish-web (push) Failing after 25s
Deploy / publish-tauri (push) Failing after 10s
2025-12-22 21:07:20 +06:00
30 changed files with 1448 additions and 257 deletions

View File

@@ -1,17 +1,16 @@
name: Deploy name: Deploy
on: # on:
push: # push:
branches: # tags:
- release # - "v[0-9]+.[0-9]+.[0-9]+"
# tags:
# - "v[0-9]+.[0-9]+.[0-9]+" # paths:
paths: # - ".gitea/workflows/deploy-client.yml"
- ".gitea/workflows/deploy-client.yml" # - "client/**"
- "client/**"
jobs: jobs:
publish-web: publish-windows:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@@ -27,48 +26,57 @@ jobs:
persist-credentials: false persist-credentials: false
- name: Build - name: Build
run: docker build -t chad-client ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }}
- name: Stop old container
run: docker rm -f chad-client || true
- name: Run
run: | run: |
docker run -d \ docker build \
--name chad-client \ -t chad-client-windows-builder \
--network traefik \ -f ./client/Dockerfile.windows \
--label "traefik.enable=true" \ ./client \
--label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \ --build-arg COMMIT_SHA=${{ gitea.sha }} \
--label "traefik.http.routers.chad-client.entrypoints=websecure" \ --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} \
--label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \ --build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
--label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
chad-client:latest
publish-tauri: docker create --name chad-client-windows-container chad-client-windows-builder
runs-on: windows-latest mkdir -p artifacts
steps: docker cp chad-client-windows-container:/artifacts artifacts/
- uses: actions/checkout@v4 docker rm chad-client-windows-container
ls -la artifacts
- name: setup node - name: Publish
uses: actions/setup-node@v4 uses: akkuman/gitea-release-action@v1
with: with:
node-version: lts/* files: |
artifacts/**
draft: true
- name: install Rust stable # publish-web:
uses: dtolnay/rust-toolchain@stable # runs-on: ubuntu-latest
- name: install frontend dependencies # steps:
run: yarn install # - name: Keyscan
# run: |
# ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts
- uses: tauri-apps/tauri-action@v1 # - name: Checkout
env: # uses: actions/checkout@v4
GITHUB_TOKEN: ${{ secrets.TOKEN }} # with:
with: # ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
tagName: app-v__VERSION__ # ssh-strict: false
releaseName: "App v__VERSION__" # persist-credentials: false
releaseBody: "See the assets to download this version and install."
releaseDraft: true # - name: Build
projectPath: "./client" # 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 }}
githubBaseUrl: "https://git.koptilnya.xyz/api/v1"
isGitea: true # - name: Stop old container
prerelease: false # run: docker rm -f chad-client || true
# - name: Run
# run: |
# docker run -d \
# --name chad-client \
# --network traefik \
# --label "traefik.enable=true" \
# --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \
# --label "traefik.http.routers.chad-client.entrypoints=websecure" \
# --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \
# --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
# chad-client:latest

2
client/.gitattributes vendored Normal file
View File

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

5
client/.gitignore vendored
View File

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

Binary file not shown.

942
client/.yarn/releases/yarn-4.12.0.cjs vendored Normal file

File diff suppressed because one or more lines are too long

View File

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

48
client/Dockerfile.windows Normal file
View File

@@ -0,0 +1,48 @@
# === Build ===
FROM node:lts AS builder
WORKDIR /app
# RUN corepack enable yarn && yarn set version stable
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"]

View File

@@ -13,16 +13,20 @@ declare module 'vue' {
PrimeButton: typeof import('primevue/button')['default'] PrimeButton: typeof import('primevue/button')['default']
PrimeButtonGroup: typeof import('primevue/buttongroup')['default'] PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
PrimeCard: typeof import('primevue/card')['default'] PrimeCard: typeof import('primevue/card')['default']
PrimeFieldset: typeof import('primevue/fieldset')['default'] PrimeCheckbox: typeof import('primevue/checkbox')['default']
PrimeDivider: typeof import('primevue/divider')['default']
PrimeFloatLabel: typeof import('primevue/floatlabel')['default'] PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
PrimeInputText: typeof import('primevue/inputtext')['default'] PrimeInputText: typeof import('primevue/inputtext')['default']
PrimeMenu: typeof import('primevue/menu')['default'] PrimeMenu: typeof import('primevue/menu')['default']
PrimePanel: typeof import('primevue/panel')['default'] PrimePanel: typeof import('primevue/panel')['default']
PrimePassword: typeof import('primevue/password')['default'] PrimePassword: typeof import('primevue/password')['default']
PrimeProgressBar: typeof import('primevue/progressbar')['default'] PrimeProgressBar: typeof import('primevue/progressbar')['default']
PrimeScrollPanel: typeof import('primevue/scrollpanel')['default']
PrimeSelect: typeof import('primevue/select')['default']
PrimeSelectButton: typeof import('primevue/selectbutton')['default'] PrimeSelectButton: typeof import('primevue/selectbutton')['default']
PrimeSlider: typeof import('primevue/slider')['default'] PrimeSlider: typeof import('primevue/slider')['default']
PrimeToast: typeof import('primevue/toast')['default'] PrimeToast: typeof import('primevue/toast')['default']
PrimeToggleSwitch: typeof import('primevue/toggleswitch')['default']
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView'] RouterView: typeof import('vue-router')['RouterView']
} }

View File

@@ -8,7 +8,7 @@
style="height: 75px;" style="height: 75px;"
> >
<slot name="left"> <slot name="left">
<h1> <h1 v-if="!!title">
{{ title }} {{ title }}
</h1> </h1>
</slot> </slot>
@@ -19,7 +19,12 @@
<script setup lang="ts"> <script setup lang="ts">
defineProps<{ defineProps<{
title: string title?: string
secondary?: boolean secondary?: boolean
}>() }>()
defineSlots<{
left: () => unknown
right: () => unknown
}>()
</script> </script>

View File

@@ -1,10 +1,11 @@
<template> <template>
<div class="py-3"> <div class="py-3">
<div class="flex items-center gap-3 "> <div class="flex items-center gap-3 ">
<PrimeAvatar <PrimeAvatar size="small">
icon="pi pi-user" <template #icon>
size="small" <User :size="20" />
/> </template>
</PrimeAvatar>
<div class="flex-1"> <div class="flex-1">
<div class="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">
@@ -15,7 +16,8 @@
</div> </div>
</div> </div>
<PrimeBadge v-if="audioConsumerPaused" severity="info" value="Muted" /> <PrimeBadge v-if="inputMuted" severity="info" value="Muted" />
<!-- <PrimeBadge v-if="outputMuted" severity="info" value="No sound" /> -->
<PrimeBadge v-if="isMe" severity="secondary" value="You" /> <PrimeBadge v-if="isMe" severity="secondary" value="You" />
<template v-if="!isMe"> <template v-if="!isMe">
@@ -40,13 +42,14 @@
<script setup lang="ts"> <script setup lang="ts">
import type { ChadClient } from '#shared/types' import type { ChadClient } from '#shared/types'
import type { MenuItem } from 'primevue/menuitem' import type { MenuItem } from 'primevue/menuitem'
import { User } from 'lucide-vue-next'
const props = defineProps<{ const props = defineProps<{
client: ChadClient client: ChadClient
}>() }>()
const { inputMuted, outputMuted } = useApp() const { outputMuted } = useApp()
const { getClientConsumers } = useMediasoup() const { getClientConsumers, micProducer } = useMediasoup()
const { me } = useClients() const { me } = useClients()
const menuRef = useTemplateRef<HTMLAudioElement>('menu') const menuRef = useTemplateRef<HTMLAudioElement>('menu')
@@ -78,9 +81,9 @@ const audioConsumer = computed(() => {
return consumers.find(consumer => consumer.track.kind === 'audio') return consumers.find(consumer => consumer.track.kind === 'audio')
}) })
const audioConsumerPaused = computed(() => { const inputMuted = computed(() => {
if (isMe.value) if (isMe.value)
return false return micProducer.value?.paused ?? false
const consumers = getClientConsumers(props.client.socketId) const consumers = getClientConsumers(props.client.socketId)
@@ -94,13 +97,13 @@ const audioTrack = computed(() => {
const { setGain } = useAudioContext(audioTrack) const { setGain } = useAudioContext(audioTrack)
watch(volume, (volume) => { watch(volume, (volume) => {
if (outputMuted.value) // if (outputMuted.value)
return // return
setGain(volume * 0.01) setGain(volume * 0.01)
}) })
watch(outputMuted, (outputMuted) => { // watch(outputMuted, (outputMuted) => {
setGain(outputMuted ? 0 : (volume.value * 0.01)) // setGain(outputMuted ? 0 : (volume.value * 0.01))
}) // })
</script> </script>

View File

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

View File

@@ -246,12 +246,13 @@ export const useMediasoup = createSharedComposable(() => {
const stream = await navigator.mediaDevices.getUserMedia({ const stream = await navigator.mediaDevices.getUserMedia({
audio: { audio: {
autoGainControl: false, deviceId: { exact: preferences.inputDeviceId.value },
noiseSuppression: true, autoGainControl: { exact: preferences.autoGainControl.value },
echoCancellation: false, echoCancellation: { exact: preferences.echoCancellation.value },
channelCount: 2, noiseSuppression: { exact: preferences.noiseSuppression.value },
}, },
}) })
const track = stream.getAudioTracks()[0] const track = stream.getAudioTracks()[0]
if (!track) if (!track)
@@ -268,6 +269,7 @@ export const useMediasoup = createSharedComposable(() => {
producers.value.set(micProducer.value.id, micProducer.value) producers.value.set(micProducer.value.id, micProducer.value)
triggerRef(producers) triggerRef(producers)
triggerRef(micProducer)
micProducer.value.on('transportclose', () => { micProducer.value.on('transportclose', () => {
micProducer.value = undefined micProducer.value = undefined
@@ -283,7 +285,6 @@ export const useMediasoup = createSharedComposable(() => {
return return
producers.value.delete(micProducer.value.id) producers.value.delete(micProducer.value.id)
triggerRef(producers)
try { try {
micProducer.value.close() micProducer.value.close()
@@ -294,6 +295,10 @@ export const useMediasoup = createSharedComposable(() => {
} }
catch { catch {
} }
finally {
triggerRef(producers)
triggerRef(micProducer)
}
micProducer.value = undefined micProducer.value = undefined
} }
@@ -304,21 +309,25 @@ export const useMediasoup = createSharedComposable(() => {
const producer = getProducerByType(type) const producer = getProducerByType(type)
if (!producer) if (!producer.value)
return return
if (producer.paused) if (producer.value.paused)
return return
try { try {
producer.pause() producer.value.pause()
await signaling.socket.value.emitWithAck('pauseProducer', { await signaling.socket.value.emitWithAck('pauseProducer', {
producerId: producer.id, producerId: producer.value.id,
}) })
} }
catch { catch {
producer.resume() producer.value.resume()
}
finally {
triggerRef(producers)
triggerRef(producer)
} }
} }
@@ -328,18 +337,22 @@ export const useMediasoup = createSharedComposable(() => {
const producer = getProducerByType(type) const producer = getProducerByType(type)
if (!producer) if (!producer.value)
return return
try { try {
producer.resume() producer.value.resume()
await signaling.socket.value.emitWithAck('resumeProducer', { await signaling.socket.value.emitWithAck('resumeProducer', {
producerId: producer.id, producerId: producer.value.id,
}) })
} }
catch { catch {
producer.pause() producer.value.pause()
}
finally {
triggerRef(producers)
triggerRef(producer)
} }
} }
@@ -350,14 +363,40 @@ export const useMediasoup = createSharedComposable(() => {
function getProducerByType(type: ProducerType) { function getProducerByType(type: ProducerType) {
switch (type) { switch (type) {
case 'microphone': case 'microphone':
return micProducer.value return micProducer
case 'camera': case 'camera':
return cameraProducer.value return cameraProducer
case 'share': case 'share':
return shareProducer.value return shareProducer
} }
} }
watch(
preferences.inputDeviceId,
async (inputDeviceId) => {
await disableMic()
if (!inputDeviceId)
return
await enableMic()
},
)
watch([
preferences.inputDeviceId,
preferences.echoCancellation,
preferences.autoGainControl,
preferences.noiseSuppression,
], async ([inputDeviceId]) => {
await disableMic()
if (!inputDeviceId)
return
await enableMic()
})
return { return {
init, init,
consumers, consumers,

View File

@@ -1,8 +1,12 @@
import { createGlobalState, useDevicesList } from '@vueuse/core' import { createGlobalState, useDevicesList, useLocalStorage } from '@vueuse/core'
export const usePreferences = createGlobalState(() => { export const usePreferences = createGlobalState(() => {
const inputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>() const inputDeviceId = useLocalStorage<MediaDeviceInfo['deviceId']>('INPUT_DEVICE_ID', 'default')
const outputDeviceId = shallowRef<MediaDeviceInfo['deviceId']>() 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 { const {
ensurePermissions, ensurePermissions,
@@ -12,11 +16,24 @@ export const usePreferences = createGlobalState(() => {
audioOutputs, audioOutputs,
} = useDevicesList() } = useDevicesList()
const inputDeviceExist = computed(() => {
return audioInputs.value.some(device => device.deviceId === inputDeviceId.value)
})
const outputDeviceExist = computed(() => {
return audioOutputs.value.some(device => device.deviceId === outputDeviceId.value)
})
return { return {
inputDeviceId, inputDeviceId,
outputDeviceId, outputDeviceId,
videoInputs, autoGainControl,
audioInputs, noiseSuppression,
audioOutputs, echoCancellation,
inputDeviceExist,
outputDeviceExist,
videoInputs: computed(() => JSON.parse(JSON.stringify(videoInputs.value))),
audioInputs: computed(() => JSON.parse(JSON.stringify(audioInputs.value))),
audioOutputs: computed(() => JSON.parse(JSON.stringify(audioOutputs.value))),
} }
}) })

View File

@@ -66,11 +66,9 @@ export const useSignaling = createSharedComposable(() => {
const uri = host ? `${protocol}//${host}` : `` const uri = host ? `${protocol}//${host}` : ``
socket.value = io(`http://localhost:4000/webrtc`, { socket.value = io(`${uri}/webrtc`, {
path: `/chad/ws`, path: `${pathname}/ws`,
transports: ['websocket'], transports: ['websocket'],
// socket.value = io(`${uri}/webrtc`, {
// path: `${pathname}/ws`,
withCredentials: true, withCredentials: true,
auth: { auth: {
userId: me.value.id, userId: me.value.id,

View File

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

View File

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

View File

@@ -1,52 +1,100 @@
<template> <template>
<div class="grid grid-cols-2 h-screen"> <div class="grid grid-cols-2 gap-2 p-2 h-screen grid-rows-[auto_1fr]">
<div class="flex flex-col shadow-xl shadow-surface-950 overflow-y-hidden"> <div
<AppHeader title="Сиськи отвалились"> class="flex items-center justify-between gap-2 rounded-xl p-3 bg-surface-950"
<template #right> >
<PrimeButtonGroup class="ml-auto"> <div class="inline-flex items-center gap-3">
<PrimeButton <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" </div>
/>
<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" /> <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>
</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> </template>
</AppHeader> </PrimeSelectButton>
</div>
<div v-auto-animate class="p-3 overflow-y-auto flex-1 bg-surface-900 overflow-hidden divide-y divide-surface-800"> <PrimeScrollPanel class="bg-surface-900 rounded-xl" style="min-height: 0">
<div v-auto-animate class="p-3 divide-y divide-surface-800">
<ClientRow v-for="client of clients" :key="client.id" :client="client" /> <ClientRow v-for="client of clients" :key="client.id" :client="client" />
</div> </div>
</div> </PrimeScrollPanel>
<div class="overflow-y-auto"> <PrimeScrollPanel class="bg-surface-900 rounded-xl" style="min-height: 0">
<slot /> <div class="p-3">
</div> <slot />
</div> </div>
</PrimeScrollPanel>
<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> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { MessageCircle, Mic, MicOff, Settings, UserPen, Volume2, VolumeOff } from 'lucide-vue-next'
const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri } = useApp() const { clients, inputMuted, toggleInput, outputMuted, toggleOutput, version, isTauri } = useApp()
const { connect, connected } = useSignaling() const { connect, connected } = useSignaling()
interface Tab {
id: string
icon: Component
onClick: () => void | Promise<void>
}
const route = useRoute() const route = useRoute()
const inPreferences = computed(() => { const tabs: Tab[] = [
return route.name === 'Preferences' {
}) id: 'Index',
icon: MessageCircle,
onClick: () => {
navigateTo({ name: 'Index' })
},
},
{
id: 'Profile',
icon: UserPen,
onClick: () => {
navigateTo({ name: 'Profile' })
},
},
{
id: 'Preferences',
icon: Settings,
onClick: () => {
navigateTo({ name: 'Preferences' })
},
},
]
function onClickPreferences() { const activeTab = ref<Tab>(tabs.find(tab => tab.id === route.name) ?? tabs[0]!)
navigateTo(!inPreferences.value ? { name: 'Preferences' } : '/')
} watch(activeTab, (activeTab) => {
activeTab.onClick()
})
connect() connect()
</script> </script>

View File

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

View File

@@ -1,62 +1,15 @@
<template> <template>
<div class="flex flex-col gap-3 p-3 pt-12"> <div class="flex items-center justify-center">
<PrimePanel header="Clients" toggleable collapsed :pt="{ content: { class: 'divide-y divide-surface-800 py-4' } }"> <PrimeCard>
<dl v-for="client in clients" :key="client.socketId" class=""> <template #content>
<div v-for="(value, key) in client" :key="key" class="py-2"> The chat is under development.
<dt class="font-bold"> </template>
{{ key }} </PrimeCard>
</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>
<!-- <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> </template>
<script setup lang="ts"> <script setup lang="ts">
const { clients } = useClients()
const { producers, consumers } = useMediasoup()
definePageMeta({ definePageMeta({
name: 'Index',
}) })
</script> </script>

View File

@@ -1,23 +1,60 @@
<template> <template>
<div> <div>
<AppHeader title="Preferences" secondary /> <PrimeFloatLabel variant="on">
<PrimeSelect
v-model="inputDeviceId"
:options="audioInputs"
option-label="label"
option-value="deviceId"
fluid
input-id="inputDevice"
:invalid="!inputDeviceExist"
/>
<label for="inputDevice">Input device</label>
</PrimeFloatLabel>
<form class="flex flex-col gap-3 p-3" @submit.prevent="save"> <div class="flex items-center gap-2 mt-3">
<PrimeFloatLabel variant="on"> <PrimeToggleSwitch v-model="autoGainControl" input-id="autoGainControl" />
<PrimeInputText id="username" v-model="displayName" size="large" fluid autocomplete="off" /> <label for="autoGainControl">Auto Gain Control</label>
<label for="username">Username</label>
</PrimeFloatLabel>
<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>
<div class="p-3"> <div class="flex items-center gap-2 mt-3">
<PrimeButton label="Logout" fluid severity="danger" @click="logout()" /> <PrimeToggleSwitch v-model="echoCancellation" input-id="echoCancellation" />
<label for="echoCancellation">Echo Cancellation</label>
</div> </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 />
<PrimeButton
size="small"
label="Check for Updates"
fluid
severity="info"
:loading="checking"
@click="onCheckForUpdates"
/>
</template>
</div> </div>
<PrimeToast position="bottom-center" group="updater"> <PrimeToast position="bottom-center" group="updater">
@@ -39,26 +76,22 @@
definePageMeta({ definePageMeta({
name: 'Preferences', name: 'Preferences',
}) })
const { isTauri } = useApp() const { isTauri } = useApp()
const { checkForUpdates } = useUpdater() const { checking, checkForUpdates } = useUpdater()
const { me, setMe, logout } = useAuth() const {
inputDeviceId,
outputDeviceId,
autoGainControl,
noiseSuppression,
echoCancellation,
inputDeviceExist,
outputDeviceExist,
audioInputs,
audioOutputs,
} = usePreferences()
const signaling = useSignaling()
const toast = useToast() const toast = useToast()
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 onCheckForUpdates() { async function onCheckForUpdates() {
const update = await checkForUpdates() const update = await checkForUpdates()
@@ -76,20 +109,5 @@ async function onCheckForUpdates() {
detail: `Version ${update?.version ?? '1.0.1'} is available!`, detail: `Version ${update?.version ?? '1.0.1'} is available!`,
closable: false, closable: false,
}) })
// asdasd
}
async function save() {
if (!valid.value)
return
const updatedMe = await signaling.socket.value?.emitWithAck('updateClient', {
displayName: displayName.value,
})
setMe({ ...me.value, displayName: updatedMe.displayName })
toast.add({ severity: 'success', summary: 'Saved', life: 1000, closable: false })
} }
</script> </script>

View File

@@ -0,0 +1,62 @@
<template>
<form @submit.prevent="save()">
<PrimeFloatLabel variant="on">
<PrimeInputText id="displayName" v-model="displayName" fluid autocomplete="off" />
<label for="displayName">Display name</label>
</PrimeFloatLabel>
<PrimeDivider />
<div class="flex items-center gap-3">
<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 { 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 signaling.socket.value?.emitWithAck('updateClient', {
displayName: displayName.value,
})
setMe({ ...me.value!, displayName: (updatedMe.displayName as string) })
toast.add({ severity: 'success', summary: 'Saved', life: 1000, closable: false })
saving.value = false
}
</script>

View File

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

View File

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

View File

@@ -97,7 +97,7 @@ export default defineNuxtConfig({
}, },
}, },
define: { define: {
__API_BASE_URL__: JSON.stringify(import.meta.env.API_BASE_URL || '/api'), __API_BASE_URL__: JSON.stringify(import.meta.env.API_BASE_URL || 'http://localhost:4000/chad'),
__COMMIT_SHA__: JSON.stringify(import.meta.env.COMMIT_SHA || 'local'), __COMMIT_SHA__: JSON.stringify(import.meta.env.COMMIT_SHA || 'local'),
}, },
}, },

View File

@@ -17,6 +17,7 @@
"@tauri-apps/plugin-process": "~2", "@tauri-apps/plugin-process": "~2",
"@tauri-apps/plugin-updater": "~2", "@tauri-apps/plugin-updater": "~2",
"@vueuse/core": "^13.9.0", "@vueuse/core": "^13.9.0",
"lucide-vue-next": "^0.562.0",
"mediasoup-client": "^3.16.7", "mediasoup-client": "^3.16.7",
"nuxt": "^4.2.2", "nuxt": "^4.2.2",
"postcss": "^8.5.6", "postcss": "^8.5.6",
@@ -29,7 +30,7 @@
"vue": "^3.5.22", "vue": "^3.5.22",
"vue-router": "^4.5.1" "vue-router": "^4.5.1"
}, },
"packageManager": "yarn@4.10.3", "packageManager": "yarn@4.12.0",
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",
"@primevue/nuxt-module": "^4.4.0", "@primevue/nuxt-module": "^4.4.0",

View File

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

View File

@@ -1,7 +1,7 @@
{ {
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "chad", "productName": "chad",
"version": "0.2.5-rc.2", "version": "0.2.12",
"identifier": "xyz.koptilnya.chad", "identifier": "xyz.koptilnya.chad",
"build": { "build": {
"frontendDist": "../.output/public", "frontendDist": "../.output/public",
@@ -44,9 +44,9 @@
}, },
"plugins": { "plugins": {
"updater": { "updater": {
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDI3NDM5Q0I4MDI5M0MyRjQKUldUMHdwTUN1SnhESjBoUFpuWkJxRzFqcWJxdTY4UkNvMmUzcHFnZnJtbSs3WmJoUmhxQ3R5bWYK", "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3MzkxMzM3RkQ3NTg4QUQKUldTdGlIWDlOeE01NStIak9VbmZTTm9HY2NyNUQrVXB5ZEdIN1BkK2lhYW9zWkNCQnZQSjRmelIK",
"endpoints": [ "endpoints": [
"https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/latest.json" "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/updater.json"
] ]
} }
} }

View File

@@ -4041,6 +4041,7 @@ __metadata:
"@vueuse/core": "npm:^13.9.0" "@vueuse/core": "npm:^13.9.0"
eslint: "npm:^9.36.0" eslint: "npm:^9.36.0"
eslint-plugin-format: "npm:^1.0.2" eslint-plugin-format: "npm:^1.0.2"
lucide-vue-next: "npm:^0.562.0"
mediasoup-client: "npm:^3.16.7" mediasoup-client: "npm:^3.16.7"
nuxt: "npm:^4.2.2" nuxt: "npm:^4.2.2"
postcss: "npm:^8.5.6" postcss: "npm:^8.5.6"
@@ -7024,6 +7025,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"lucide-vue-next@npm:^0.562.0":
version: 0.562.0
resolution: "lucide-vue-next@npm:0.562.0"
peerDependencies:
vue: ">=3.0.1"
checksum: 10c0/5ba792ea5e48d01fc99a3c5ae4a59d9767e5d4c7826901800831cf051cf85eb4a680b3564d2910ed4d17dc1d35223c37d006bdbcdb291d90a9491b9c6a20ae14
languageName: node
linkType: hard
"magic-regexp@npm:^0.10.0": "magic-regexp@npm:^0.10.0":
version: 0.10.0 version: 0.10.0
resolution: "magic-regexp@npm:0.10.0" resolution: "magic-regexp@npm:0.10.0"

View File

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