Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c72508a
ADFA-7139 Add DebuggerEndpointService and the debugger.endpoints perm…
davidschachterADFA Nov 16, 2026
a84d59b
ADFA-7139 Implement DebuggerEndpointService in plugin-manager
davidschachterADFA Nov 16, 2026
030c678
ADFA-7139 Serve the stored debugger endpoints to plugins
davidschachterADFA Nov 16, 2026
4181e7c
ADFA-7139 Docs: describe DebuggerEndpointService in the sqlite-debugg…
davidschachterADFA Nov 16, 2026
6a99814
ADFA-7139 Leave uninstalled apps out of the endpoints and rethrow int…
davidschachterADFA Nov 16, 2026
cbe541a
ADFA-7139 Docs: DebuggerEndpointService ships in 26.47, not 26.43
davidschachterADFA Nov 16, 2026
aa86aa1
ADFA-7139: Merge ADFA-7137 (with #2244's sqlite-js 1.4.3) up the stack
davidschachterADFA Nov 16, 2026
2007193
ADFA-7139: Merge ADFA-7137 (README corrections) up the stack
davidschachterADFA Nov 16, 2026
7374a39
ADFA-7139: Merge ADFA-7137 (F18 one-statement check, F19 tool deadlin…
davidschachterADFA Nov 17, 2026
e7be1a9
ADFA-7139: Merge ADFA-7137 (F37 backstop rollback, F38 get_schema tru…
davidschachterADFA Nov 17, 2026
7d53ea7
ADFA-7139: Merge ADFA-7137 (F51 app functions, F52 get_schema limits)…
davidschachterADFA Nov 17, 2026
f2aae36
ADFA-7139: Merge ADFA-7137 (F108 integrity_check app functions, F109 …
davidschachterADFA Nov 17, 2026
238edfb
ADFA-7139 Inject the SQLite debugger endpoint source through Koin
davidschachterADFA Nov 17, 2026
89b5c7e
ADFA-7139 Require the installed-app check of DebuggerEndpointRepository
davidschachterADFA Nov 17, 2026
ce08883
ADFA-7139 Test two projects and a symlinked path against the real DAO
davidschachterADFA Nov 17, 2026
f7a7497
ADFA-7139 Return no SQLite debugger endpoints when no project is open
davidschachterADFA Nov 17, 2026
e6880dd
ADFA-7139 Keep the SQLite debugger endpoint source out of plugins' reach
davidschachterADFA Nov 17, 2026
a754c2b
ADFA-7139 Test the DebuggerEndpointService each loaded plugin gets
davidschachterADFA Nov 17, 2026
b4d682b
ADFA-7139 Refuse SQLite debugger endpoints to a disabled plugin
davidschachterADFA Nov 17, 2026
e651f95
ADFA-7139 Docs: list DebuggerEndpointService in the plugin API surface
davidschachterADFA Nov 17, 2026
d7a9b08
ADFA-7139 Return the SQLite debugger endpoints in an unmodifiable list
davidschachterADFA Nov 17, 2026
4f1230a
ADFA-7139 Declare the InterruptedException getEndpoints() can throw
davidschachterADFA Nov 17, 2026
46bc104
ADFA-7139 Docs: say what the debugger.endpoints permission gives a pl…
davidschachterADFA Nov 17, 2026
0bd8ab1
ADFA-7139 Pin DebuggerEndpointService.CONTRACT_VERSION at 1
davidschachterADFA Nov 17, 2026
ad91c84
ADFA-7139 Drop the empty-list case from the unmodifiable-list test
davidschachterADFA Nov 17, 2026
6ed99d7
ADFA-7139 style: spotless reformat of DebuggerEndpointRepositoryTest,…
davidschachterADFA Nov 17, 2026
5120581
Merge sqlite-debugger/ADFA-7137 into sqlite-debugger/ADFA-7139
davidschachterADFA Nov 17, 2026
a32d288
ADFA-7139 Say which public paths still reach another plugin's Debugge…
davidschachterADFA Nov 17, 2026
24453ed
ADFA-7139 Keep the DebuggerEndpointService closed for a plugin saved …
davidschachterADFA Nov 17, 2026
14067c0
ADFA-7139 Test that a failed activation closes the DebuggerEndpointSe…
davidschachterADFA Nov 17, 2026
cff9d24
ADFA-7139 style: spotless format of PluginManagerDebuggerEndpointTest…
davidschachterADFA Nov 17, 2026
61902dd
ADFA-7139: Merge ADFA-7137 (carrying ADFA-7135 F149, F151, F154) up t…
davidschachterADFA Nov 17, 2026
73ae97c
ADFA-7139: Merge ADFA-7137 (F168 batch bound KDoc, F169 README batch …
davidschachterADFA Nov 17, 2026
99fb7a2
ADFA-7139: Merge ADFA-7137 (F172 first-row exception to the 4 MiB cap…
davidschachterADFA Nov 17, 2026
0ece6a8
ADFA-7139: Merge ADFA-7137 (F181 half-deadline KDoc, and stage with #…
davidschachterADFA Nov 17, 2026
85ba2f4
ADFA-7139: Merge ADFA-7137 (endpoint announce, slow-install pairing) …
davidschachterADFA Nov 18, 2026
9149b58
ADFA-7139 Let a retried plugin start install the same endpoint source
davidschachterADFA Nov 18, 2026
d51c88f
ADFA-7139 Delete the unused createPluginContext overload
davidschachterADFA Nov 18, 2026
e7223f3
ADFA-7139: Merge ADFA-7137 (session-keyed install pairing in the app-…
davidschachterADFA Nov 18, 2026
dc4c095
ADFA-7139 Docs: DebuggerEndpointService ships in 26.48, not 26.47
davidschachterADFA Nov 18, 2026
94e4620
ADFA-7139: Merge ADFA-7137 (A2 failed-commit note, A3 result without …
davidschachterADFA Nov 18, 2026
300bf93
ADFA-7139 One endpoint-service helper; drop the close startOpen alrea…
davidschachterADFA Nov 19, 2026
d1626c9
ADFA-7139 Close the endpoint service only once a disable has happened
davidschachterADFA Nov 19, 2026
6793181
ADFA-7139 Close the endpoint service on every way a load fails
davidschachterADFA Nov 19, 2026
4c98e4e
ADFA-7139 Ask the endpoint source by the canonical project path
davidschachterADFA Nov 19, 2026
7f717ef
ADFA-7139 Start the plugin system when the endpoint source can't be s…
davidschachterADFA Nov 19, 2026
33cdf50
ADFA-7139 Docs: name reportedEndpoints as the repository read that th…
davidschachterADFA Nov 19, 2026
da6a0e3
ADFA-7139 Check token and port before asking whether an app is installed
davidschachterADFA Nov 19, 2026
3406a95
ADFA-7139 Style: wrap an overlong line in PluginSystemStartTest
davidschachterADFA Nov 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.itsaky.androidide.app

import android.content.Context
import android.content.Intent
import android.os.Handler
import android.os.Looper
import android.os.UserManager
import androidx.annotation.VisibleForTesting
import androidx.appcompat.app.AppCompatDelegate
import androidx.core.os.LocaleListCompat
import androidx.work.WorkManager
Expand All @@ -21,6 +23,7 @@ import com.itsaky.androidide.managers.ToolsManager
import com.itsaky.androidide.plugins.PluginLogger
import com.itsaky.androidide.plugins.base.PluginFragmentHelper
import com.itsaky.androidide.plugins.manager.core.PluginManager
import com.itsaky.androidide.plugins.manager.services.DebuggerEndpointSource
import com.itsaky.androidide.plugins.manager.services.IdeBuildServiceImpl
import com.itsaky.androidide.plugins.manager.services.IdeLogServiceImpl
import com.itsaky.androidide.plugins.manager.services.IdeTerminalServiceImpl
Expand All @@ -45,6 +48,8 @@ import kotlinx.coroutines.withContext
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import org.slf4j.LoggerFactory
import java.io.File
import java.util.concurrent.atomic.AtomicBoolean
Expand All @@ -59,7 +64,9 @@ import kotlin.system.exitProcess
*
* @author Akash Yadav
*/
internal object CredentialProtectedApplicationLoader : ApplicationLoader {
internal object CredentialProtectedApplicationLoader :
ApplicationLoader,
KoinComponent {
private val logger = LoggerFactory.getLogger(CredentialProtectedApplicationLoader::class.java)

private val _isLoaded = AtomicBoolean(false)
Expand Down Expand Up @@ -327,8 +334,13 @@ internal object CredentialProtectedApplicationLoader : ApplicationLoader {
ideLogcatReader = null
}

/** [context] and [endpointSource] are parameters only so a test can start the plugin system without the app. */
@VisibleForTesting
@OptIn(DelicateCoroutinesApi::class)
private fun initializePluginSystem() {
internal fun initializePluginSystem(
context: Context = application,
endpointSource: () -> DebuggerEndpointSource = { get() },
) {
try {
logger.info("Initializing plugin system...")

Expand Down Expand Up @@ -368,15 +380,15 @@ internal object CredentialProtectedApplicationLoader : ApplicationLoader {

pluginManager =
PluginManager.getInstance(
context = application,
context = context,
eventBus = EventBus.getDefault(),
logger = pluginLogger,
)

pluginManager?.setLanguageContributionsListener(PluginLanguageSupport::refresh)

// Set up plugin service providers
setupPluginServices()
setupPluginServices(endpointSource)
setupPluginInflationErrorHandler()

// Load plugins asynchronously
Expand All @@ -398,17 +410,35 @@ internal object CredentialProtectedApplicationLoader : ApplicationLoader {
/**
* Sets up the plugin service providers to integrate with AndroidIDE's actual systems.
*/
private fun setupPluginServices() {
private fun setupPluginServices(endpointSource: () -> DebuggerEndpointSource) {
pluginManager?.let { manager ->
manager.setActivityProvider { application.foregroundActivity }
setupBuildServiceProviders()
setupProjectManipulationProviders()
IdeLogServiceImpl.getInstance().setLogReader(LogsProvider::read)
installDebuggerEndpointSource(manager, endpointSource)
IdeTerminalServiceImpl.setSessionLauncher(PluginTerminalLauncher { application.foregroundActivity })
logger.info("Plugin services configured successfully")
}
}

/**
* Installs where every plugin's DebuggerEndpointService reads the SQLite debugger endpoints. The
* SQLite debugger is optional, so a failure here, such as a binding that cannot be built or a
* different source already installed, is reported and the plugin system starts anyway: plugins load,
* and getEndpoints() throws IllegalStateException saying the endpoints are unavailable.
*/
private fun installDebuggerEndpointSource(
manager: PluginManager,
endpointSource: () -> DebuggerEndpointSource,
) {
runCatching { manager.installDebuggerEndpointSource(endpointSource()) }
.onFailure { e ->
Sentry.captureException(e)
logger.error("Could not set up the SQLite debugger endpoints for plugins; plugins load without them", e)
}
}

@OptIn(DelicateCoroutinesApi::class)
private fun setupBuildServiceProviders() {
val buildServiceImpl = IdeBuildServiceImpl.getInstance()
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/java/com/itsaky/androidide/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.itsaky.androidide.deeplink.PendingDeepLinkOpen
import com.itsaky.androidide.editor.language.outline.OutlineProvider
import com.itsaky.androidide.editor.language.outline.TreeSitterOutlineProvider
import com.itsaky.androidide.git.core.GitCredentialsManager
import com.itsaky.androidide.plugins.manager.services.DebuggerEndpointSource
import com.itsaky.androidide.repositories.DebuggerEndpointRepository
import com.itsaky.androidide.repositories.RecentProjectRepository
import com.itsaky.androidide.repositories.RecentProjectRepositoryImpl
Expand All @@ -19,11 +20,13 @@ import com.itsaky.androidide.viewmodel.OutlineViewModel
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.runBlocking
import org.koin.android.ext.koin.androidApplication
import org.koin.android.ext.koin.androidContext
import org.koin.core.module.dsl.viewModel
import org.koin.core.qualifier.named
import org.koin.dsl.module
import java.io.File

/** Qualifier for the process-lifetime [CoroutineScope]; see the binding for why it is named. */
const val APPLICATION_SCOPE = "applicationScope"
Expand Down Expand Up @@ -65,13 +68,21 @@ val coreModule =

single {
val context = androidContext()
val packageManager = context.packageManager
DebuggerEndpointRepository(
get(),
get(named(APPLICATION_SCOPE)),
isInstalled = { DebuggerEndpointRepository.isPackageInstalled(packageManager, it) },
Comment thread
davidschachterADFA marked this conversation as resolved.
Resolved
announce = { DebuggerEndpointAnnounce.send(context, it) },
)
}

// What DebuggerEndpointService reads. Plugins call it off the main thread, so blocking on Room is fine.
single<DebuggerEndpointSource> {
val repository = get<DebuggerEndpointRepository>()
DebuggerEndpointSource { location -> runBlocking { repository.reportedEndpoints(File(location)) } }
}

single<RecentProjectRepository> {
RecentProjectRepositoryImpl(get())
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.itsaky.androidide.repositories

import android.content.pm.PackageManager
import com.itsaky.androidide.roomData.recentproject.DebuggerEndpointDao
import com.itsaky.androidide.sqlitedebugger.DebuggerEndpointValidation
import com.itsaky.androidide.utils.canonicalProjectLocation
Expand All @@ -12,17 +13,22 @@ import kotlinx.coroutines.withContext
import org.slf4j.LoggerFactory
import java.io.File
import java.util.concurrent.ConcurrentHashMap
import com.itsaky.androidide.plugins.services.DebuggerEndpoint as PluginDebuggerEndpoint

/**
* Which app each project builds, and the SQLite debugger endpoint the app last reported (ADFA-7137).
* Nothing here throws except [CancellationException]: any other failure is logged and reported as
* false, because none of the callers can do anything about it, and they run on the application scope,
* which has no CoroutineExceptionHandler (an escaping exception would crash the process).
* The writes throw nothing but [CancellationException]: any other failure is logged and reported as
* false, because none of their callers can do anything about it, and they run on the application
* scope, which has no CoroutineExceptionHandler (an escaping exception would crash the process).
* [reportedEndpoints], the read behind the plugin API, is the exception: it throws on a read failure,
* so call it where a failure is handled, not on the application scope.
*/
class DebuggerEndpointRepository(
private val dao: DebuggerEndpointDao,
private val scope: CoroutineScope,
private val clock: () -> Long = System::currentTimeMillis,
/** Required, with no default: one that answered true would serve an uninstalled app's port and token as live. */
private val isInstalled: (String) -> Boolean,
/**
* Asks the app to report its endpoint again, after each pairing; see DebuggerEndpointAnnounce. Required, with no
* default: one that did nothing would leave an app that was already running unknown until its process restarts.
Expand Down Expand Up @@ -152,7 +158,39 @@ class DebuggerEndpointRepository(
false
}

private companion object {
/**
* The endpoints the apps of [projectDir] have reported, for the plugin API (ADFA-7139). Looked
* up by the canonical path, as the pairing stores it; apps that have not reported yet are left
* out, and so are apps that are no longer installed: their stored port and token would otherwise
* come back as live. An endpoint can still be stale when the app's process has died. Unlike the
* writes, a read failure is thrown: the plugin API reports it rather than answering "no apps".
*/
suspend fun reportedEndpoints(projectDir: File): List<PluginDebuggerEndpoint> =

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MINOR: this method throws on a read failure, as its own KDoc says, but the class KDoc (line 20) still says "Nothing here throws except [CancellationException]". A future caller who trusts the class contract and calls this on the application scope, which has no handler, would crash the process on a database or IO failure.

Possible fix: change the class KDoc to name reportedEndpoints as the exception.

Found by code review; not yet reproduced on a device.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 33cdf50. The class KDoc now limits the no-throw rule to the writes, and names reportedEndpoints as the exception, to be called only where a failure is handled. KDoc only.


Generated by Claude Code

dao.getByProjectLocation(projectDir.canonicalProjectLocation()).mapNotNull { row ->
Comment thread
davidschachterADFA marked this conversation as resolved.
Resolved
val token = row.token ?: return@mapNotNull null
val port = row.port ?: return@mapNotNull null
// Last: a binder call per app, which an app that has not reported need not cost.
if (!isInstalled(row.applicationId)) return@mapNotNull null
PluginDebuggerEndpoint(row.applicationId, port, token, row.updatedAt ?: 0L)
}

companion object {
/**
* Whether [applicationId] is installed. Every package is visible because Code on the Go targets SDK 28; at a
* target of 30 or later, package visibility filtering would make every endpoint look uninstalled unless the
* manifest declares a matching `<queries>`.
*/
fun isPackageInstalled(
packageManager: PackageManager,
applicationId: String,
): Boolean =
try {
packageManager.getPackageInfo(applicationId, 0)
true
} catch (e: PackageManager.NameNotFoundException) {
false
}

private val log = LoggerFactory.getLogger(DebuggerEndpointRepository::class.java)
}
}
Loading
Loading