Compare commits

..

11 Commits

Author SHA1 Message Date
2f36d06488 session livekit token 2026-09-05 14:46:17 +06:00
95931c6976 bump 2026-07-25 16:58:25 +06:00
8c883d5481 настройки демонстрации экрана 2026-07-25 16:58:02 +06:00
fa1985c99c плавность пришла? 2026-07-25 01:43:47 +06:00
5c80277851 Update server/plugins/mediasoup-router.ts
All checks were successful
Deploy / deploy (push) Successful in 39s
2026-06-04 10:28:29 +00:00
e862703c6c server enable rtx...
All checks were successful
Deploy / deploy (push) Successful in 37s
2026-05-29 05:39:58 +06:00
81fbe447fe server log consumer rtp
All checks were successful
Deploy / deploy (push) Successful in 44s
2026-05-29 05:12:30 +06:00
f0abaaff6a server log consumer rtp
All checks were successful
Deploy / deploy (push) Successful in 41s
2026-05-29 05:04:42 +06:00
9a71f7c903 server trace
All checks were successful
Deploy / deploy (push) Successful in 43s
2026-05-29 04:43:26 +06:00
87a1f348be new stun server 2026-05-24 16:29:54 +06:00
ecb1cbbb91 opus
All checks were successful
Deploy / deploy (push) Successful in 35s
2026-05-12 00:33:17 +06:00
19 changed files with 374 additions and 104 deletions

View File

@@ -4,6 +4,7 @@
</NuxtLayout>
<PrimeToast position="bottom-center" />
<PrimeDynamicDialog />
</template>
<script setup lang="ts">

View File

@@ -14,7 +14,9 @@ declare module 'vue' {
PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
PrimeCard: typeof import('primevue/card')['default']
PrimeDivider: typeof import('primevue/divider')['default']
PrimeDynamicDialog: typeof import('primevue/dynamicdialog')['default']
PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
PrimeIftaLabel: typeof import('primevue/iftalabel')['default']
PrimeInputGroup: typeof import('primevue/inputgroup')['default']
PrimeInputText: typeof import('primevue/inputtext')['default']
PrimePassword: typeof import('primevue/password')['default']

View File

@@ -0,0 +1,139 @@
<template>
<div>
<PrimeFloatLabel class="mb-1">
Resolution
</PrimeFloatLabel>
<PrimeSelectButton
v-model="resolution"
:options="resolutionOptions"
fluid
option-label="label"
option-value="value"
:allow-empty="false"
/>
</div>
<div class="mt-4">
<PrimeFloatLabel class="mb-1">
FPS
</PrimeFloatLabel>
<PrimeSelectButton
v-model="fps"
:options="fpsOptions"
fluid
option-label="label"
option-value="value"
:allow-empty="false"
/>
</div>
<div class="mt-4">
<PrimeFloatLabel class="mb-1">
Codec
</PrimeFloatLabel>
<PrimeSelect
v-model="codecPayloadType"
:options="videoCodecs"
fluid
option-label="mimeType"
option-value="preferredPayloadType"
placeholder="Select codec"
>
<template #option="{ option }">
<div class="w-full whitespace-normal">
<p>{{ option.mimeType }}</p>
<p class="text-muted-color text-xs break-words">
{{ option.parameters }}
</p>
</div>
</template>
</PrimeSelect>
</div>
<div class="text-right mt-8">
<PrimeButton severity="success" @click="share">
Share screen
</PrimeButton>
</div>
</template>
<script setup lang="ts">
import type { RtpCodecCapability } from 'mediasoup-client/types'
import { StorageSerializers, useLocalStorage } from '@vueuse/core'
export interface ShareSettings {
resolution: number
fps: number
codec?: RtpCodecCapability
}
const emit = defineEmits<{
share: [ShareSettings]
}>()
const mediasoup = useMediasoup()
const resolutionOptions = [
{
label: '720p',
value: 720,
},
{
label: '1080p',
value: 1080,
},
{
label: '1440p',
value: 1440,
},
]
const fpsOptions = [5, 30, 60].map((value) => {
return {
label: value.toString(),
value,
}
})
const videoCodecs = computed(() => {
return (mediasoup.rtpCapabilities.value?.codecs ?? []).filter((codec) => {
return codec.kind === 'video' && codec.mimeType !== 'video/rtx'
})
})
const fps = useLocalStorage<number>(
'SHARE_FPS',
30,
{
serializer: StorageSerializers.number,
},
)
const resolution = useLocalStorage<number>(
'SHARE_RESOLUTION',
1080,
{
serializer: StorageSerializers.number,
},
)
const codecPayloadType = useLocalStorage<number>(
'SHARE_CODEC_PAYLOAD_TYPE',
(videoCodecs.value.find(codec => codec.mimeType === 'video/H264') ?? videoCodecs.value[0])?.preferredPayloadType ?? -1,
{
serializer: StorageSerializers.number,
},
)
function share() {
emit('share', {
resolution: resolution.value,
fps: fps.value,
codec: videoCodecs.value.find(codec => codec.preferredPayloadType === codecPayloadType.value),
})
}
</script>
<style lang="scss">
</style>

View File

@@ -1,3 +1,5 @@
import type { ShareSettings } from '~/components/ShareScreenDialog.vue'
import { ShareScreenDialog } from '#components'
import { getVersion } from '@tauri-apps/api/app'
import { openUrl as tauriOpenUrl } from '@tauri-apps/plugin-opener'
import { computedAsync, createGlobalState } from '@vueuse/core'
@@ -8,6 +10,7 @@ export const useApp = createGlobalState(() => {
const mediasoup = useMediasoup()
const signaling = useSignaling()
const { emit } = useEventBus()
const dialog = useDialog()
const ready = ref(false)
const isTauri = computed(() => '__TAURI_INTERNALS__' in window)
@@ -125,8 +128,25 @@ export const useApp = createGlobalState(() => {
async function toggleShare() {
if (!mediasoup.shareProducer.value) {
await mediasoup.enableShare()
emit('share:enabled')
const { close } = dialog.open(ShareScreenDialog, {
props: {
header: 'Share settings',
modal: true,
draggable: false,
closable: false,
dismissableMask: true,
style: {
width: '440px',
},
},
emits: {
onShare: async (settings: ShareSettings) => {
await mediasoup.enableShare(settings)
emit('share:enabled')
close()
},
},
})
}
else {
await mediasoup.disableProducer(mediasoup.shareProducer.value)

View File

@@ -9,12 +9,11 @@ export const useDevices = createGlobalState(() => {
audioOutputs,
} = useDevicesList()
async function getShareStream(fps = 30) {
async function getShareStream(fps = 30, resolution = 1080) {
return navigator.mediaDevices.getDisplayMedia({
audio: false,
video: {
width: { max: 2560 },
height: { max: 1080 },
height: { max: resolution },
displaySurface: 'monitor',
frameRate: { ideal: fps, max: fps },
},

View File

@@ -1,5 +1,6 @@
import type { ChadClient, Consumer, Producer } from '#shared/types'
import type { MediaKind, ProducerOptions } from 'mediasoup-client/types'
import type { ShareSettings } from '~/components/ShareScreenDialog.vue'
import { createSharedComposable } from '@vueuse/core'
import * as mediasoupClient from 'mediasoup-client'
import { shallowRef } from 'vue'
@@ -13,6 +14,7 @@ interface SpeakingClient {
}
const ICE_SERVERS: RTCIceServer[] = [
{ urls: 'stun:stunserver2025.stunprotocol.org:3478' },
{ urls: 'stun:stun.l.google.com:19302' },
{ urls: 'stun:stun.l.google.com:5349' },
{ urls: 'stun:stun1.l.google.com:3478' },
@@ -84,9 +86,11 @@ export const useMediasoup = createSharedComposable(() => {
return
device.value = new mediasoupClient.Device()
rtpCapabilities.value = await signaling.socket.value.emitWithAck('getRtpCapabilities')
const routerRtpCapabilities = await signaling.socket.value.emitWithAck('getRtpCapabilities')
await device.value.load({ routerRtpCapabilities: rtpCapabilities.value! })
await device.value.load({ routerRtpCapabilities })
rtpCapabilities.value = device.value.rtpCapabilities
// Send transport
{
@@ -383,6 +387,8 @@ export const useMediasoup = createSharedComposable(() => {
if (!track)
return
track.contentHint = 'speech'
await createProducer({
track,
streamId: 'mic-video',
@@ -427,6 +433,8 @@ export const useMediasoup = createSharedComposable(() => {
if (!track)
return
track.contentHint = 'detail'
await createProducer({
track,
streamId: 'mic-video',
@@ -442,57 +450,38 @@ export const useMediasoup = createSharedComposable(() => {
})
}
async function enableShare() {
async function enableShare(settings: ShareSettings) {
if (shareProducer.value)
return
if (!device.value)
return
const stream = await getShareStream(preferences.shareFps.value)
const stream = await getShareStream(settings.fps)
const track = stream.getVideoTracks()[0]
console.log('settings', track.getSettings())
if (!track)
return
track.contentHint = 'motion'
await createProducer({
track,
streamId: 'share',
codec: device.value.rtpCapabilities.codecs?.find(
c => c.mimeType.toLowerCase() === 'video/h264',
),
// codec: device.value.rtpCapabilities.codecs?.find(
// c => c.mimeType.toLowerCase() === 'video/av1',
// ),
// codec: device.value.rtpCapabilities.codecs?.find(
// c => c.mimeType.toLowerCase() === 'video/vp9',
// ),
// codec: {
// kind: 'video',
// mimeType: 'video/AV1',
// clockRate: 90000,
// parameters: {
// 'level-idx': 13, // Level 4.1 — 1080p60
// 'profile': 0, // Main Profile
// 'tier': 0, // Main tier (0) vs High tier (1)
// 'x-google-start-bitrate': 8000,
// },
// },
codec: settings.codec,
encodings: [
{
maxBitrate: 120_000_000,
maxFramerate: 60,
// maxBitrate: 120_000_000,
maxFramerate: settings.fps,
scalabilityMode: 'L1T1',
networkPriority: 'high',
},
],
codecOptions: {
// videoGoogleStartBitrate: 8000,
videoGoogleMaxBitrate: 120000,
videoGoogleMinBitrate: 2000,
// videoGoogleMaxBitrate: 120000,
// videoGoogleMinBitrate: 2000,
},
zeroRtpOnPause: true,
appData: {

View File

@@ -20,8 +20,6 @@ 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']>('')
@@ -65,7 +63,6 @@ export const usePreferences = createGlobalState(() => {
autoGainControl,
noiseSuppression,
echoCancellation,
shareFps,
toggleInputHotkey,
toggleOutputHotkey,
inputDeviceExist,

View File

@@ -66,24 +66,6 @@
<label for="inputDevice">Input device</label>
</PrimeFloatLabel>
<PrimeDivider align="left">
Screen sharing
</PrimeDivider>
<div>
<p class="text-sm mb-2 text-center">
FPS
</p>
<PrimeSelectButton
v-model="shareFps"
:options="shareFpsOptions"
fluid
size="small"
option-label="label"
option-value="value"
/>
</div>
<template v-if="isTauri">
<PrimeDivider align="left">
Hotkeys
@@ -156,16 +138,8 @@ const {
inputDeviceExist,
outputDeviceExist,
videoDeviceExist,
shareFps,
} = usePreferences()
const shareFpsOptions = [5, 30, 60].map((value) => {
return {
label: value.toString(),
value,
}
})
const setupToggleInputHotkey = (event: KeyboardEvent) => setupHotkey(event, toggleInputHotkey)
const setupToggleOutputHotkey = (event: KeyboardEvent) => setupHotkey(event, toggleOutputHotkey)

View File

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

View File

@@ -1,12 +1,13 @@
import { PrismaAdapter } from '@lucia-auth/adapter-prisma'
import { Lucia } from 'lucia'
import { Lucia, TimeSpan } from 'lucia'
import prisma from '../prisma/client.ts'
declare module 'lucia' {
interface Register {
Lucia: typeof Lucia
Lucia: typeof auth
UserId: string
DatabaseUserAttributes: DatabaseUserAttributes
DatabaseSessionAttributes: DatabaseSessionAttributes
}
}
@@ -16,7 +17,14 @@ interface DatabaseUserAttributes {
username: string
}
interface DatabaseSessionAttributes {
livekitToken: string | null
}
export const SESSION_EXPIRES_IN = new TimeSpan(30, 'd')
export const auth = new Lucia(new PrismaAdapter(prisma.session, prisma.user), {
sessionExpiresIn: SESSION_EXPIRES_IN,
sessionCookie: {
attributes: {
sameSite: 'none',
@@ -29,6 +37,11 @@ export const auth = new Lucia(new PrismaAdapter(prisma.session, prisma.user), {
username,
}
},
getSessionAttributes: ({ livekitToken }) => {
return {
livekitToken,
}
},
})
export type Auth = typeof auth

View File

@@ -18,6 +18,7 @@
"dotenv": "^17.2.3",
"fastify": "^5.6.1",
"fastify-plugin": "^5.1.0",
"livekit-server-sdk": "^2.18.0",
"lucia": "^3.2.2",
"mediasoup": "^3.19.3",
"prisma": "^6.17.0",

View File

@@ -23,7 +23,7 @@ export const autoConfig: mediasoup.types.RouterOptions = {
mimeType: 'audio/opus',
clockRate: 48000,
channels: 2,
parameters: { useinbandfec: 1, stereo: 1 },
parameters: { useinbandfec: 0, stereo: 1 },
},
{
kind: 'video',
@@ -42,17 +42,17 @@ export const autoConfig: mediasoup.types.RouterOptions = {
clockRate: 90000,
parameters: {},
},
{
kind: 'video',
mimeType: 'video/h264',
clockRate: 90000,
parameters: {
'packetization-mode': 1,
'profile-level-id': '640032',
'level-asymmetry-allowed': 1,
'x-google-start-bitrate': 12000,
},
},
// {
// kind: 'video',
// mimeType: 'video/h264',
// clockRate: 90000,
// parameters: {
// 'packetization-mode': 1,
// 'profile-level-id': '640032',
// 'level-asymmetry-allowed': 1,
// 'x-google-start-bitrate': 12000,
// },
// },
{
kind: 'video',
mimeType: 'video/h264',

View File

@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "Session" ADD COLUMN "livekitToken" TEXT;

View File

@@ -9,32 +9,33 @@ generator client {
}
model User {
id String @id @default(cuid())
username String @unique
password String
displayName String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
id String @id @default(cuid())
username String @unique
password String
displayName String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
Session Session[]
UserPreferences UserPreferences?
Session Session[]
UserPreferences UserPreferences?
}
model Session {
id String @id
userId String
expiresAt DateTime
id String @id
userId String
expiresAt DateTime
livekitToken String?
user User @relation(references: [id], fields: [userId], onDelete: Cascade)
user User @relation(references: [id], fields: [userId], onDelete: Cascade)
@@index([userId])
}
model UserPreferences {
userId String @id
toggleInputHotkey String? @default("")
toggleOutputHotkey String? @default("")
volumes Json? @default("{}")
userId String @id
toggleInputHotkey String? @default("")
toggleOutputHotkey String? @default("")
volumes Json? @default("{}")
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
}

View File

@@ -3,6 +3,7 @@ import bcrypt from 'bcrypt'
import { z } from 'zod'
import { auth } from '../auth/lucia.ts'
import prisma from '../prisma/client.ts'
import { createSessionLivekitToken, getSessionLivekitToken } from '../utils/livekit.ts'
export default function (fastify: FastifyInstance) {
fastify.post('/register', async (req, reply) => {
@@ -22,7 +23,9 @@ export default function (fastify: FastifyInstance) {
},
})
const session = await auth.createSession(user.id, {})
const session = await auth.createSession(user.id, {
livekitToken: await createSessionLivekitToken(user),
})
const cookie = auth.createSessionCookie(session.id)
reply.setCookie(cookie.name, cookie.value, cookie.attributes)
@@ -67,7 +70,9 @@ export default function (fastify: FastifyInstance) {
return reply.code(404).send({ error: 'Incorrect username or password' })
}
const session = await auth.createSession(user.id, {})
const session = await auth.createSession(user.id, {
livekitToken: await createSessionLivekitToken(user),
})
const cookie = auth.createSessionCookie(session.id)
reply.setCookie(cookie.name, cookie.value, cookie.attributes)
@@ -92,11 +97,22 @@ export default function (fastify: FastifyInstance) {
})
fastify.get('/me', async (req, reply) => {
if (req.user) {
return req.user
if (!req.user || !req.session) {
reply.code(401).send(false)
return
}
reply.code(401).send(false)
try {
return {
...req.user,
livekitToken: await getSessionLivekitToken(req.user, req.session),
}
}
catch (err) {
fastify.log.error(err)
reply.code(500).send({ error: err.message })
}
})
fastify.post('/logout', async (req, reply) => {

View File

@@ -1,3 +1,5 @@
/* eslint-disable perfectionist/sort-imports -- .env must be loaded before any import that reads process.env */
import 'dotenv/config'
import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
import FastifyAutoLoad from '@fastify/autoload'

View File

@@ -1,4 +1,5 @@
import type { types } from 'mediasoup'
import type { Transport } from 'mediasoup/types'
import type { Server as SocketServer } from 'socket.io'
import type {
ChadClient,
@@ -196,7 +197,7 @@ export default async function (io: SocketServer, router: types.Router) {
}
try {
const producer = await transport.produce({ kind, rtpParameters, appData: { ...appData, socketId: socket.id } })
const producer = await (transport as Transport).produce({ kind, rtpParameters, appData: { ...appData, socketId: socket.id } })
socket.data.producers.set(producer.id, producer)
@@ -404,7 +405,7 @@ export default async function (io: SocketServer, router: types.Router) {
{
producerId: producer.id,
rtpCapabilities: consumerSocket.data.rtpCapabilities,
enableRtx: false,
enableRtx: true,
paused: true,
ignoreDtx: true,
},

78
server/utils/livekit.ts Normal file
View File

@@ -0,0 +1,78 @@
import type { Session, User } from 'lucia'
import { Buffer } from 'node:buffer'
import { AccessToken } from 'livekit-server-sdk'
import { SESSION_EXPIRES_IN } from '../auth/lucia.ts'
import prisma from '../prisma/client.ts'
/**
* Re-issue the token slightly before it actually expires, so a client that
* caches the /me response for a while still gets a usable token.
*/
const REFRESH_BEFORE_EXPIRY_SECONDS = 60 * 60
export async function createLivekitToken(user: User, ttlSeconds: number) {
const apiKey = process.env.LIVEKIT_API_KEY
const apiSecret = process.env.LIVEKIT_API_SECRET
if (!apiKey || !apiSecret)
throw new Error('LIVEKIT_API_KEY and LIVEKIT_API_SECRET must be set')
const token = new AccessToken(apiKey, apiSecret, {
identity: user.id,
name: user.displayName,
ttl: ttlSeconds,
})
token.addGrant({
room: process.env.LIVEKIT_ROOM || 'chad',
roomJoin: true,
canPublish: true,
canSubscribe: true,
canPublishData: true,
canUpdateOwnMetadata: true,
})
return token.toJwt()
}
/** Mints the token that gets stored on a session at the moment it is created. */
export function createSessionLivekitToken(user: User) {
return createLivekitToken(user, SESSION_EXPIRES_IN.seconds())
}
/**
* Returns the token stored alongside the session, re-issuing and persisting it
* when it is missing (session predates the column) or about to expire (Lucia
* extends `expiresAt` on active sessions, outliving the original token).
*/
export async function getSessionLivekitToken(user: User, session: Session) {
if (session.livekitToken && !isExpiringSoon(session.livekitToken))
return session.livekitToken
const ttlSeconds = Math.max(
Math.ceil((session.expiresAt.getTime() - Date.now()) / 1000),
REFRESH_BEFORE_EXPIRY_SECONDS,
)
const livekitToken = await createLivekitToken(user, ttlSeconds)
await prisma.session.update({
where: { id: session.id },
data: { livekitToken },
})
session.livekitToken = livekitToken
return livekitToken
}
function isExpiringSoon(token: string) {
try {
const [, payload] = token.split('.')
const { exp } = JSON.parse(Buffer.from(payload, 'base64url').toString())
return typeof exp !== 'number' || exp - REFRESH_BEFORE_EXPIRY_SECONDS <= Date.now() / 1000
}
catch {
return true
}
}

View File

@@ -119,6 +119,13 @@ __metadata:
languageName: node
linkType: hard
"@bufbuild/protobuf@npm:^1.10.0, @bufbuild/protobuf@npm:^1.10.1":
version: 1.10.1
resolution: "@bufbuild/protobuf@npm:1.10.1"
checksum: 10c0/a89572ae99aa193dd232fca0cdc9ece1dfe2f3d8b061be1f966a4f88fb63410aeb0fe7de927037e970aefcb52036eec58a7f89a40fe1286eed1448ea1bd2634e
languageName: node
linkType: hard
"@clack/core@npm:0.5.0":
version: 0.5.0
resolution: "@clack/core@npm:0.5.0"
@@ -498,6 +505,15 @@ __metadata:
languageName: node
linkType: hard
"@livekit/protocol@npm:1.48.0":
version: 1.48.0
resolution: "@livekit/protocol@npm:1.48.0"
dependencies:
"@bufbuild/protobuf": "npm:^1.10.0"
checksum: 10c0/665ada6b38578f53bc2854d709f05a642cfdad8c671571bd02dc0c6d1b94028d02ce5e7dd86862a2260d6fc0647d333811ce3b85127ba40e37ef76d426547d48
languageName: node
linkType: hard
"@lucia-auth/adapter-prisma@npm:^4.0.1":
version: 4.0.1
resolution: "@lucia-auth/adapter-prisma@npm:4.0.1"
@@ -2747,6 +2763,13 @@ __metadata:
languageName: node
linkType: hard
"jose@npm:^5.1.2":
version: 5.10.0
resolution: "jose@npm:5.10.0"
checksum: 10c0/e20d9fc58d7e402f2e5f04e824b8897d5579aae60e64cb88ebdea1395311c24537bf4892f7de413fab1acf11e922797fb1b42269bc8fc65089a3749265ccb7b0
languageName: node
linkType: hard
"js-yaml@npm:^4.1.0":
version: 4.1.0
resolution: "js-yaml@npm:4.1.0"
@@ -2876,6 +2899,17 @@ __metadata:
languageName: node
linkType: hard
"livekit-server-sdk@npm:^2.18.0":
version: 2.18.0
resolution: "livekit-server-sdk@npm:2.18.0"
dependencies:
"@bufbuild/protobuf": "npm:^1.10.1"
"@livekit/protocol": "npm:1.48.0"
jose: "npm:^5.1.2"
checksum: 10c0/5150170be1302bbbcde32f558eb6104a93a6a56fc656b776db50db7eb0a35285e54c28630d993ac809ecb025626d4c7c989721bebc0d0562640b58edcdd72abe
languageName: node
linkType: hard
"local-pkg@npm:^1.1.2":
version: 1.1.2
resolution: "local-pkg@npm:1.1.2"
@@ -4303,6 +4337,7 @@ __metadata:
eslint: "npm:^9.36.0"
fastify: "npm:^5.6.1"
fastify-plugin: "npm:^5.1.0"
livekit-server-sdk: "npm:^2.18.0"
lucia: "npm:^3.2.2"
mediasoup: "npm:^3.19.3"
prisma: "npm:^6.17.0"