thomas/droidclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(agent): delete preprocessor.ts (replaced by parser.ts)

Browse Source
This commit is contained in:
Sanju Sivalingam
2026-02-18 00:28:50 +05:30
parent d5c3466554
commit 3769b21ed1
6 changed files with 190 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
android/app/src/main/java/com/thisux/droidclaw/accessibility/GestureExecutor.kt
View File

@@ -6,6 +6,9 @@ import android.content.Intent
import android.graphics.Path
import android.net.Uri
import android.os.Bundle
import android.provider.ContactsContract
import android.provider.CalendarContract
import android.provider.Settings
import android.util.Log
import android.view.accessibility.AccessibilityNodeInfo
import com.thisux.droidclaw.model.ServerMessage
@@ -35,16 +38,17 @@ class GestureExecutor(private val service: DroidClawAccessibilityService) {
msg.x2 ?: 0, msg.y2 ?: 0,
msg.duration ?: 300
)
"launch" -> executeLaunch(msg.packageName ?: "")
"launch" -> executeLaunch(msg)
"clear" -> executeClear()
"clipboard_set" -> executeClipboardSet(msg.text ?: "")
"clipboard_get" -> executeClipboardGet()
"paste" -> executePaste()
"open_url" -> executeOpenUrl(msg.url ?: "")
"switch_app" -> executeLaunch(msg.packageName ?: "")
"switch_app" -> executeLaunch(msg)
"keyevent" -> executeKeyEvent(msg.code ?: 0)
"open_settings" -> executeOpenSettings()
"open_settings" -> executeOpenSettings(msg.setting)
"wait" -> executeWait(msg.duration ?: 1000)
"intent" -> executeIntent(msg)
else -> ActionResult(false, "Unknown action: ${msg.type}")
}
} catch (e: Exception) {
@@ -125,10 +129,32 @@ class GestureExecutor(private val service: DroidClawAccessibilityService) {
return dispatchSwipeGesture(x1, y1, x2, y2, duration)
}
private fun executeLaunch(packageName: String): ActionResult {
private fun executeLaunch(msg: ServerMessage): ActionResult {
val packageName = msg.packageName ?: ""
val uri = msg.intentUri
val extras = msg.intentExtras
// If URI is provided, use ACTION_VIEW intent (deep link / intent with data)
if (!uri.isNullOrEmpty()) {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri)).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
if (packageName.isNotEmpty()) setPackage(packageName)
extras?.forEach { (k, v) -> putExtra(k, v) }
}
return try {
service.startActivity(intent)
ActionResult(true)
} catch (e: Exception) {
ActionResult(false, "Intent failed: ${e.message}")
}
}
// Standard package launch
if (packageName.isEmpty()) return ActionResult(false, "No package or URI provided")
val intent = service.packageManager.getLaunchIntentForPackage(packageName)
?: return ActionResult(false, "Package not found: $packageName")
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
extras?.forEach { (k, v) -> intent.putExtra(k, v) }
service.startActivity(intent)
return ActionResult(true)
}
@@ -194,12 +220,71 @@ class GestureExecutor(private val service: DroidClawAccessibilityService) {
}
}
private fun executeOpenSettings(): ActionResult {
val intent = Intent(android.provider.Settings.ACTION_SETTINGS).apply {
private fun executeIntent(msg: ServerMessage): ActionResult {
val intentAction = msg.intentAction
?: return ActionResult(false, "No intentAction provided")
val intent = Intent(intentAction).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
val uri = msg.intentUri?.let { Uri.parse(it) }
val mimeType = msg.intentType
when {
uri != null && mimeType != null -> setDataAndType(uri, mimeType)
uri != null -> data = uri
mimeType != null -> type = mimeType
}
msg.packageName?.let { setPackage(it) }
// Auto-detect numeric extras (needed for SET_ALARM HOUR/MINUTES etc.)
msg.intentExtras?.forEach { (k, v) ->
val intVal = v.toIntOrNull()
val longVal = v.toLongOrNull()
when {
intVal != null -> putExtra(k, intVal)
longVal != null -> putExtra(k, longVal)
else -> putExtra(k, v)
}
}
}
return try {
service.startActivity(intent)
ActionResult(true)
} catch (e: Exception) {
ActionResult(false, "Intent failed: ${e.message}")
}
}
private fun executeOpenSettings(setting: String?): ActionResult {
val action = when (setting) {
"wifi" -> Settings.ACTION_WIFI_SETTINGS
"bluetooth" -> Settings.ACTION_BLUETOOTH_SETTINGS
"display" -> Settings.ACTION_DISPLAY_SETTINGS
"sound" -> Settings.ACTION_SOUND_SETTINGS
"battery" -> Intent.ACTION_POWER_USAGE_SUMMARY
"location" -> Settings.ACTION_LOCATION_SOURCE_SETTINGS
"apps" -> Settings.ACTION_APPLICATION_SETTINGS
"date" -> Settings.ACTION_DATE_SETTINGS
"accessibility" -> Settings.ACTION_ACCESSIBILITY_SETTINGS
"developer" -> Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS
"dnd" -> "android.settings.ZEN_MODE_SETTINGS"
"network" -> Settings.ACTION_WIRELESS_SETTINGS
"storage" -> Settings.ACTION_INTERNAL_STORAGE_SETTINGS
"security" -> Settings.ACTION_SECURITY_SETTINGS
else -> Settings.ACTION_SETTINGS
}
val intent = Intent(action).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
service.startActivity(intent)
return ActionResult(true)
return try {
service.startActivity(intent)
ActionResult(true)
} catch (e: Exception) {
ActionResult(false, "Settings intent failed: ${e.message}")
}
}
private suspend fun executeWait(duration: Int): ActionResult {

2
android/app/src/main/java/com/thisux/droidclaw/connection/CommandRouter.kt
View File

@@ -44,7 +44,7 @@ class CommandRouter(
"tap", "type", "enter", "back", "home", "notifications",
"longpress", "swipe", "launch", "clear", "clipboard_set",
"clipboard_get", "paste", "open_url", "switch_app",
"keyevent", "open_settings", "wait" -> handleAction(msg)
"keyevent", "open_settings", "wait", "intent" -> handleAction(msg)
"goal_started" -> {
currentSessionId.value = msg.sessionId

85
android/app/src/main/java/com/thisux/droidclaw/connection/ConnectionService.kt
View File

@@ -26,6 +26,7 @@ import com.thisux.droidclaw.model.AppsMessage
import com.thisux.droidclaw.model.InstalledAppInfo
import com.thisux.droidclaw.util.DeviceInfoHelper
import android.content.pm.PackageManager
import android.net.Uri
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.first
@@ -192,11 +193,93 @@ class ConnectionService : LifecycleService() {
val pm = packageManager
val intent = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER)
val activities = pm.queryIntentActivities(intent, PackageManager.MATCH_ALL)
return activities.mapNotNull { resolveInfo ->
val apps = activities.mapNotNull { resolveInfo ->
val pkg = resolveInfo.activityInfo.packageName
val label = resolveInfo.loadLabel(pm).toString()
InstalledAppInfo(packageName = pkg, label = label)
}.distinctBy { it.packageName }.sortedBy { it.label.lowercase() }
// Discover intent capabilities per app
val intentMap = discoverIntentCapabilities()
return apps.map { app ->
val intents = intentMap[app.packageName]
if (intents != null) app.copy(intents = intents.toList()) else app
}
}
/**
* Probe installed apps to discover which URI schemes and intent actions
* each app supports. Returns a map of packageName -> list of capabilities.
* Format: "VIEW:scheme", "SENDTO:scheme", "SEND:mime", or action name.
*/
private fun discoverIntentCapabilities(): Map<String, List<String>> {
val pm = packageManager
val result = mutableMapOf<String, MutableSet<String>>()
// Probe ACTION_VIEW with common URI schemes
val viewSchemes = listOf(
"tel", "sms", "smsto", "mailto", "geo", "https", "http",
"whatsapp", "instagram", "twitter", "fb", "spotify",
"vnd.youtube", "zoomus", "upi", "phonepe", "paytm",
"gpay", "tez", "google.navigation", "uber", "skype",
"viber", "telegram", "snapchat", "linkedin", "reddit",
"swiggy", "zomato", "ola", "maps.google.com"
)
for (scheme in viewSchemes) {
try {
val probe = Intent(Intent.ACTION_VIEW, Uri.parse("$scheme://test"))
val resolvers = pm.queryIntentActivities(probe, PackageManager.MATCH_DEFAULT_ONLY)
for (info in resolvers) {
result.getOrPut(info.activityInfo.packageName) { mutableSetOf() }
.add("VIEW:$scheme")
}
} catch (_: Exception) { /* skip invalid scheme */ }
}
// Probe ACTION_SENDTO (sms, mailto)
for (scheme in listOf("sms", "mailto")) {
try {
val probe = Intent(Intent.ACTION_SENDTO, Uri.parse("$scheme:test"))
val resolvers = pm.queryIntentActivities(probe, PackageManager.MATCH_DEFAULT_ONLY)
for (info in resolvers) {
result.getOrPut(info.activityInfo.packageName) { mutableSetOf() }
.add("SENDTO:$scheme")
}
} catch (_: Exception) {}
}
// Probe ACTION_SEND (share) with common MIME types
for (mime in listOf("text/plain", "image/*")) {
try {
val probe = Intent(Intent.ACTION_SEND).apply { type = mime }
val resolvers = pm.queryIntentActivities(probe, PackageManager.MATCH_DEFAULT_ONLY)
for (info in resolvers) {
result.getOrPut(info.activityInfo.packageName) { mutableSetOf() }
.add("SEND:$mime")
}
} catch (_: Exception) {}
}
// Probe special actions
val specialActions = listOf(
"android.intent.action.SET_ALARM",
"android.intent.action.SET_TIMER",
"android.intent.action.DIAL",
"android.intent.action.INSERT",
"android.intent.action.CALL"
)
for (action in specialActions) {
try {
val probe = Intent(action)
val resolvers = pm.queryIntentActivities(probe, PackageManager.MATCH_DEFAULT_ONLY)
for (info in resolvers) {
result.getOrPut(info.activityInfo.packageName) { mutableSetOf() }
.add(action)
}
} catch (_: Exception) {}
}
return result.mapValues { it.value.toList() }
}
private fun createNotificationChannel() {

11
android/app/src/main/java/com/thisux/droidclaw/model/Protocol.kt
View File

@@ -61,7 +61,8 @@ data class HeartbeatMessage(
@Serializable
data class InstalledAppInfo(
val packageName: String,
val label: String
val label: String,
val intents: List<String> = emptyList()
)
@Serializable
@@ -94,5 +95,11 @@ data class ServerMessage(
val text: String? = null,
val packageName: String? = null,
val url: String? = null,
val code: Int? = null
val code: Int? = null,
// Intent fields
val intentAction: String? = null,
val intentUri: String? = null,
val intentType: String? = null,
val intentExtras: Map<String, String>? = null,
val setting: String? = null
)