-
-
Notifications
You must be signed in to change notification settings - Fork 11
Voice support #33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
llsc12
wants to merge
59
commits into
main
Choose a base branch
from
voice
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Voice support #33
Changes from 13 commits
Commits
Show all changes
59 commits
Select commit
Hold shift + click to select a range
4b66a39
add voice module, deps, wip models
llsc12 d49fcc1
more voice models
llsc12 f942d4d
clean up
llsc12 a820da1
added gateway actor, not ready yet tho
llsc12 4cf68cb
more work
llsc12 61a4263
Merge branch 'main' into voice
llsc12 8d412d3
test
llsc12 c9e96ae
fix builds
llsc12 15d959a
Squashed commit of the following:
llsc12 ef52d96
fix ios builds
llsc12 753c916
clean up, add dave work, tests
llsc12 5075107
max dave version
llsc12 1cf1c9a
more udp work
llsc12 2917dc6
add dave session handling
llsc12 8a767b5
i think my outbound code is wrong
llsc12 0e66982
wip app side voice stuff
llsc12 5645ece
dont forget to identify
llsc12 d4da406
connection doesnt always work
llsc12 368e7e4
voice gateway working
llsc12 d5aea9d
temporary leave button
llsc12 5be2f71
fix udp stuff, fix ip discovery
llsc12 bfe23ed
weird crash with libdave
llsc12 bf98f17
the crypto stuff is fixed
llsc12 9e6664f
Update VoiceGatewayManager.swift
llsc12 35a5599
forgot to encode opcode, works now
llsc12 6299376
fix a bunch of logical issues, fix sending audio packets, send silent…
llsc12 b8bcdf2
fix crypto
llsc12 dc7a63c
wip voice working
llsc12 8b20bbc
dont schedule buffers on main thread
llsc12 e3fade7
emit opus packets directly, emit fake speaking events
llsc12 56d79fa
voice states
llsc12 88aa05d
Update VoiceGatewayManager.swift
llsc12 6001c74
init decoder and player node per ssrc
llsc12 12ab4de
fix missing sendable payload
llsc12 3b6303f
add audio receive buffer
llsc12 e990997
fix encryption nonce, add additional data to chacha
llsc12 34f7ee4
paicordlib add dave ssrc codec info, better buffering impl, get rid o…
llsc12 c182f07
working bidirectional audio
llsc12 bde09a4
buffer per incoming stream
llsc12 5fe71f9
fix changing channels whilst in a channel
llsc12 7f7623f
Update VoiceConnectionStore.swift
llsc12 42ca30e
disconnect on another client connecting
llsc12 8b1e6ff
fix member row popout
llsc12 6f758a5
add voice states to guild
llsc12 7cdc426
expose guild and channel stores, voice channel members, call bar
llsc12 ddd4160
request member data
llsc12 d42b3d5
fix disconnection bug, fix weird voice channel spacing
llsc12 0525f9d
make call bar nicer
llsc12 65aaef7
change how navigation works
llsc12 90514e0
wip voice ui
llsc12 11f2c62
permissions
llsc12 a3d771a
fixes
llsc12 81e7b2c
fix dms button
llsc12 e7ccd8c
point links away from discordbm's issues
llsc12 ad0a4fb
discord can send no name for connected accounts
llsc12 de68d6c
Update VoiceGatewayManager.swift
llsc12 3c58754
ringing
llsc12 50a9be0
calls (dm vc) support, wip call ui
llsc12 ee443c1
fixes to channel order, dms ui wip
llsc12 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // | ||
| // VoiceConnectionStore.swift | ||
| // Paicord | ||
| // | ||
| // Created by Lakhan Lothiyi on 23/02/2026. | ||
| // Copyright © 2026 Lakhan Lothiyi. | ||
| // | ||
|
|
||
| import PaicordLib | ||
|
|
||
| final class VoiceConnectionStore: DiscordDataStore { | ||
| var gateway: GatewayStore? | ||
| var voiceGateway: VoiceGatewayManager? | ||
|
|
||
| var eventTask: Task<Void, Never>? | ||
|
|
||
| func setupEventHandling() { | ||
| guard let gateway = gateway?.gateway else { return } | ||
|
|
||
| eventTask = Task { @MainActor in | ||
| for await event in await gateway.events { | ||
| switch event.data { | ||
| // capture and store voice events | ||
| default: | ||
| break | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| func cancelEventHandling() { | ||
| // overrides default impl of protocol | ||
| eventTask?.cancel() | ||
| eventTask = nil | ||
|
|
||
| // end networking session etc. | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,11 @@ | |
| <key>orderHint</key> | ||
| <integer>6</integer> | ||
| </dict> | ||
| <key>DiscordVoice.xcscheme_^#shared#^_</key> | ||
| <dict> | ||
| <key>orderHint</key> | ||
| <integer>3</integer> | ||
| </dict> | ||
|
||
| <key>GenerateAPIEndpointsExec.xcscheme_^#shared#^_</key> | ||
| <dict> | ||
| <key>orderHint</key> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,10 @@ let package = Package( | |
| name: "DiscordGateway", | ||
| targets: ["DiscordGateway"] | ||
| ), | ||
| .library( | ||
| name: "DiscordVoice", | ||
| targets: ["DiscordVoice"] | ||
| ), | ||
| .library( | ||
| name: "DiscordModels", | ||
| targets: ["DiscordModels"] | ||
|
|
@@ -74,6 +78,14 @@ let package = Package( | |
| url: "https://github.com/apple/swift-crypto.git", | ||
| "1.0.0"..<"5.0.0" | ||
| ), | ||
| .package( | ||
| url: "https://github.com/alta/swift-opus.git", | ||
| branch: "main" | ||
| ), | ||
|
||
| .package( | ||
| url: "https://github.com/llsc12/DaveKit.git", | ||
| branch: "main" | ||
|
Comment on lines
+81
to
+83
|
||
| ), | ||
| ], | ||
| targets: [ | ||
| .target( | ||
|
|
@@ -82,6 +94,7 @@ let package = Package( | |
| .target(name: "DiscordAuth"), | ||
| .target(name: "DiscordHTTP"), | ||
| .target(name: "DiscordCore"), | ||
| .target(name: "DiscordVoice"), | ||
| .target(name: "DiscordGateway"), | ||
| .target(name: "DiscordModels"), | ||
| .target(name: "DiscordUtilities"), | ||
|
|
@@ -111,9 +124,22 @@ let package = Package( | |
| .product(name: "AsyncHTTPClient", package: "async-http-client"), | ||
| .product(name: "WSClient", package: "swift-websocket"), | ||
| .product(name: "libzstd", package: "zstd"), | ||
| .target(name: "DiscordHTTP"), | ||
| .product(name: "Crypto", package: "swift-crypto"), | ||
| .product(name: "_CryptoExtras", package: "swift-crypto"), | ||
| .target(name: "DiscordHTTP"), | ||
| ], | ||
| swiftSettings: swiftSettings | ||
| ), | ||
| .target( | ||
| name: "DiscordVoice", | ||
| dependencies: [ | ||
| .product(name: "NIOCore", package: "swift-nio"), | ||
| .product(name: "AsyncHTTPClient", package: "async-http-client"), | ||
| .product(name: "WSClient", package: "swift-websocket"), | ||
| .product(name: "libzstd", package: "zstd"), | ||
| .product(name: "Opus", package: "swift-opus"), | ||
| .product(name: "DaveKit", package: "DaveKit"), | ||
| .target(name: "DiscordGateway"), | ||
| ], | ||
| swiftSettings: swiftSettings | ||
| ), | ||
|
|
@@ -122,10 +148,11 @@ let package = Package( | |
| dependencies: [ | ||
| .product(name: "NIOFoundationCompat", package: "swift-nio"), | ||
| .product(name: "MultipartKit", package: "multipart-kit"), | ||
| .target(name: "DiscordCore"), | ||
| .target(name: "UnstableEnumMacro"), | ||
| .product(name: "SwiftProtobuf", package: "swift-protobuf"), | ||
| .product(name: "UInt128", package: "UInt128"), | ||
| .product(name: "DaveKit", package: "DaveKit"), | ||
| .target(name: "DiscordCore"), | ||
| .target(name: "UnstableEnumMacro"), | ||
| ], | ||
| swiftSettings: swiftSettings | ||
| ), | ||
|
|
@@ -139,7 +166,12 @@ let package = Package( | |
| .target( | ||
| name: "DiscordAuth", | ||
| dependencies: [ | ||
| .target(name: "DiscordModels") | ||
| .product(name: "NIOCore", package: "swift-nio"), | ||
| .product(name: "AsyncHTTPClient", package: "async-http-client"), | ||
| .product(name: "WSClient", package: "swift-websocket"), | ||
| .product(name: "Crypto", package: "swift-crypto"), | ||
| .product(name: "_CryptoExtras", package: "swift-crypto"), | ||
| .target(name: "DiscordGateway"), | ||
| ], | ||
| swiftSettings: swiftSettings | ||
| ), | ||
|
|
@@ -211,9 +243,10 @@ let package = Package( | |
|
|
||
| var featureFlags: [SwiftSetting] { | ||
| [ | ||
| .interoperabilityMode(.Cxx), | ||
| /// https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md | ||
| /// Require `any` for existential types. | ||
| .enableUpcomingFeature("ExistentialAny") | ||
| .enableUpcomingFeature("ExistentialAny"), | ||
| // .define("DISCORDBM_ENABLE_LOGGING_DURING_DECODE", .when(configuration: .debug)), | ||
| ] | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Setting SWIFT_OBJC_INTEROP_MODE to objcxx enables C++ interoperability which is required for some dependencies (likely DaveKit). However, this is a significant compiler mode change that affects the entire project. Ensure this is intentional and documented, as it may have implications for build times and compatibility with other dependencies.