Replace Discord Social SDK (C++/JNI) with OAuth2 Gateway RPC (Kotlin) — removes proprietary SDK dependency by sang765 · Pull Request #27 · sang765/AT

sang765 · 2026-06-03T22:19:10Z

Summary

Eliminates the dependency on Discord's proprietary Social SDK (C++ native library + JNI bridge) by replacing it with a pure Kotlin implementation that connects directly to the Discord Gateway WebSocket using an OAuth2 bearer token. The Discord-OAuth2-RPC library handles the WebSocket lifecycle, heartbeats, and presence updates without any native code.

Motivation

No proprietary SDK required — removes the need for discord_partner_sdk.aar, which is partner-only and requires manual approval from Discord
Simpler build — eliminates CMake, C++ compilation, and per-architecture native library builds
Same OAuth flow — reuses the existing PKCE-based OAuth2 authorization; no changes to the user's authorization experience
All-Kotlin stack — leverages Ktor WebSocket client and kotlinx-serialization already in the project

Changes

Added

com.discord.oauth2rpc library package (Gateway WebSocket client, RichPresence builder, bitfield utilities)
DiscordOAuth2RPCClient — singleton gateway client mapping DiscordPresenceActivity → Gateway PRESENCE_UPDATE (opcode 3)

Modified

DiscordRPC.kt — delegates to DiscordOAuth2RPCClient instead of DiscordSocialPresenceClient
DiscordPresenceManager.kt — removed callbacksJob loop (no longer needed; Gateway handles heartbeats internally)
MainActivity.kt — removed DiscordSocialSdkAndroidInitializer.setEngineActivity() calls
app/build.gradle.kts — removed CMake/native build config, removed discord_partner_sdk.aar dependency

Removed

DiscordSocialNativeBridge.kt — JNI external fun declarations and native library loader
DiscordSocialPresenceClient.kt — mutex-guarded presence client wrapping the native bridge
DiscordSocialSdkAndroidInitializer.kt — reflection-based setEngineActivity() for Social SDK
discord_social_bridge.cpp — 461-line C++ JNI implementation
app/src/main/cpp/CMakeLists.txt — CMake build definition

Unchanged

DiscordPresenceModels.kt, DiscordOAuthRepository.kt, DiscordOAuthCallbackActivity.kt — same data models and OAuth flow
DiscordImageResolver.kt, DiscordSettings.kt, DiscordExperimental.kt — UI and image caching unchanged

Architecture Comparison

Layer	Before (Social SDK)	After (Gateway RPC)
Transport	Discord Social SDK (C++) + JNI	Discord Gateway WebSocket
Auth	OAuth2 + SDK token	OAuth2 bearer token (same flow)
Build	CMake + C++ + proprietary .aar	Pure Kotlin, no native build
Heartbeat	Manual `runCallbacks()` loop	Automatic (GatewayClient internal)
Images	SDK handles asset resolution	URLs passed as-is (Discord CDN / external supported)

…otlin) Replace Discord Social SDK native C++/JNI integration with the Discord-OAuth2-RPC Kotlin library that connects to Discord Gateway WebSocket directly via OAuth2 bearer token. Changes: - Add GatewayClient, RichPresence builder, and supporting utils from Discord-OAuth2-RPC library (com.discord.oauth2rpc package) - Create DiscordOAuth2RPCClient replacing DiscordSocialPresenceClient and DiscordSocialNativeBridge JNI layer - Remove native C++ bridge (discord_social_bridge.cpp, CMakeLists.txt) - Remove DiscordSocialSdkAndroidInitializer (reflection-based SDK init) - Remove discord_partner_sdk.aar dependency and CMake build config - Keep existing DiscordRPC.kt high-level logic, DiscordPresenceModels, DiscordOAuthRepository, and OAuth callback unchanged

…blic/private methods - updatePresence() held mutex then called connect() which tried to re-acquire the same non-reentrant Mutex — caused JobCancellationException - Split into connect() (public, with lock) → connectInternal() (private, no lock) - Removed superfluous scope.launch + CompletableDeferred wrapper; gws.connect() already suspends until READY - Removed unused scope/connectJob members

- Removed -keep rules for com.discord.socialsdk.** and DiscordSocialNativeBridge - Removed -dontwarn for com.discord.socialsdk.** These classes no longer exist after the Social SDK→Gateway RPC migration

…oes not hang forever

…g to connect flow

…with log filtering

…e stops the loop instead of retrying

kilo-code-bot · 2026-06-04T00:25:05Z

Code Review Summary

Status: Issues Found | Recommendation: Address before merge

Overview

Severity	Count
CRITICAL	1
WARNING	2
SUGGESTION	0

Issue Details (click to expand)

CRITICAL

File	Line	Issue
`app/src/gms/kotlin/com/discord/oauth2rpc/utils/JsonObjectMapper.kt`	15-19	String `replace()` calls have no effect - the result is discarded without assignment. Strings are immutable in Kotlin.

WARNING

File	Line	Issue
`app/src/gms/kotlin/com/discord/oauth2rpc/Gateway.kt`	196	INVALID_SESSION payload parsing uses `jsonPrimitive.boolean` but should verify `d` is a `JsonPrimitive` first.
`app/src/gms/kotlin/com/discord/oauth2rpc/Gateway.kt`	49	`connect()` method is not thread-safe - multiple concurrent calls could race before the `wsSession != null` check.

Other Observations (not in diff)

No issues found in unchanged code.

Files Reviewed (11 files)

app/build.gradle.kts - No issues (build config changes)
app/proguard-rules.pro - No issues (removed rules for deleted SDK)
app/src/gms/kotlin/com/discord/oauth2rpc/Gateway.kt - 2 issues
app/src/gms/kotlin/com/discord/oauth2rpc/Interface.kt - No issues
app/src/gms/kotlin/com/discord/oauth2rpc/structures/Presence.kt - No issues
app/src/gms/kotlin/com/discord/oauth2rpc/utils/BitField.kt - No issues
app/src/gms/kotlin/com/discord/oauth2rpc/utils/Constants.kt - No issues
app/src/gms/kotlin/com/discord/oauth2rpc/utils/GatewayCapabilities.kt - No issues
app/src/gms/kotlin/com/discord/oauth2rpc/utils/Intents.kt - No issues
app/src/gms/kotlin/com/discord/oauth2rpc/utils/JsonObjectMapper.kt - 1 issue
app/src/gms/kotlin/moe/koiverse/archivetune/discord/DiscordOAuth2RPCClient.kt - No issues
app/src/gms/kotlin/moe/koiverse/archivetune/utils/DiscordRPC.kt - No issues

kilo-code-bot · 2026-06-04T00:26:28Z

+                    forceClose(4000, "server reconnect")
+                }
+                GatewayOp.INVALID_SESSION -> {
+                    val resumable = d?.jsonPrimitive?.boolean ?: false


WARNING: INVALID_SESSION payload parsing could fail silently

Discord sends d as a boolean primitive (true/false) for INVALID_SESSION, but the code uses d?.jsonPrimitive?.boolean. If d is not a JsonPrimitive (e.g., null or malformed), this could throw or return incorrect values. Consider adding explicit type checking: d?.jsonPrimitive?.booleanOrNull ?: false

kilo-code-bot · 2026-06-04T00:26:28Z

+    fun getSession(): SessionState? = sessionState?.copy()
+
+    suspend fun connect(opts: GatewayConnectOptions) {
+        if (wsSession != null) throw IllegalStateException("GatewayClient already connected")


WARNING: Potential race condition in connect()

While connect() checks wsSession != null at the start, multiple coroutine contexts could pass this check before either sets wsSession, potentially creating duplicate WebSocket sessions. Though the mutex in DiscordOAuth2RPCClient.connectInternal provides some protection, consider adding synchronization within GatewayClient.connect() itself for robustness.

kilo-code-bot · 2026-06-04T00:27:54Z

Code Review Summary

Status: No Issues Found | Recommendation: Merge

All previously reported issues have been addressed in this incremental diff:

Thread-safety race condition in connect() - Fixed with synchronized block
INVALID_SESSION parsing - Fixed with booleanOrNull
JsonObjectMapper string escaping - Fixed improper StringBuilder usage

Files Reviewed (2 files)

app/src/gms/kotlin/com/discord/oauth2rpc/Gateway.kt - No issues (previous issues resolved)
app/src/gms/kotlin/com/discord/oauth2rpc/utils/JsonObjectMapper.kt - No issues (previous issue resolved)

_{Reviewed by laguna-m.1-20260312:free · 147,080 tokens}

… flow — kills scope mid-Gateway-connect when player is briefly not READY

…ing, discarded replace results

sang765 self-assigned this Jun 3, 2026

sang765 added enhancement New feature or request good first issue Good for newcomers labels Jun 3, 2026

sang765 changed the title ~~refactor: replace Discord Social SDK (C++) with OAuth2 Gateway RPC (Kotlin)~~ Replace Discord Social SDK (C++/JNI) with OAuth2 Gateway RPC (Kotlin) — removes proprietary SDK dependency Jun 3, 2026

Repository owner deleted a comment from qodo-code-review Bot Jun 3, 2026

sang765 added 7 commits June 4, 2026 05:41

fix: remove stale ProGuard rules for deleted Social SDK and NativeBridge

0c9a725

- Removed -keep rules for com.discord.socialsdk.** and DiscordSocialNativeBridge - Removed -dontwarn for com.discord.socialsdk.** These classes no longer exist after the Social SDK→Gateway RPC migration

fix: complete ready deferred on READY/RESUMED dispatch so connect() d…

ca486fd

…oes not hang forever

feat: add verbose debug logging to DiscordRPC.updateSong

dea4ea6

feat: promote Gateway debug logs to d-level, add detailed step loggin…

0fbc6ac

…g to connect flow

fix: log updateSong failure reason at w/e level so it's visible even …

3351815

…with log filtering

fix: rethrow CancellationException from runCatching so cancelled scop…

5f93006

…e stops the loop instead of retrying

kilo-code-bot Bot reviewed Jun 4, 2026

View reviewed changes

sang765 added 3 commits June 4, 2026 07:29

fix: add missing import for CancellationException

d3ee8bd

fix: remove aggressive DiscordPresenceManager.stop() from currentSong…

7b5a158

… flow — kills scope mid-Gateway-connect when player is briefly not READY

fix: address code review issues — race condition, unsafe boolean pars…

4652c3c

…ing, discarded replace results

sang765 closed this Jun 4, 2026

sang765 deleted the refactor/discord-rpc-replacement branch June 4, 2026 01:48

Navigation Menu

Replace Discord Social SDK (C++/JNI) with OAuth2 Gateway RPC (Kotlin) — removes proprietary SDK dependency - #27

Replace Discord Social SDK (C++/JNI) with OAuth2 Gateway RPC (Kotlin) — removes proprietary SDK dependency#27
sang765 wants to merge 11 commits into
devfrom
refactor/discord-rpc-replacement

sang765 commented Jun 3, 2026 •

edited

Loading

Uh oh!

kilo-code-bot Bot commented Jun 4, 2026

CRITICAL

WARNING

Uh oh!

kilo-code-bot Bot Jun 4, 2026

Uh oh!

kilo-code-bot Bot Jun 4, 2026

Uh oh!

kilo-code-bot Bot commented Jun 4, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

sang765 commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Motivation

Changes

Added

Modified

Removed

Unchanged

Architecture Comparison

Uh oh!

kilo-code-bot Bot commented Jun 4, 2026

Code Review Summary

Overview

CRITICAL

WARNING

Uh oh!

kilo-code-bot Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

kilo-code-bot Bot Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

kilo-code-bot Bot commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Summary

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

sang765 commented Jun 3, 2026 •

edited

Loading

kilo-code-bot Bot commented Jun 4, 2026 •

edited

Loading