Load the RuleDatabase separately from the service

Author: t895

app/src/main/kotlin/dev/clombardo/dnsnet/Intents.kt

@@ -28,6 +28,9 @@ object Intents {
     fun getRestartVpnIntent(): Intent = Intent(applicationContext, AdVpnService::class.java)
         .putExtra(AdVpnService.COMMAND_TAG, Command.RESTART.ordinal)
 
+    fun getReloadDatabaseIntent(): Intent = Intent(applicationContext, AdVpnService::class.java)
+        .putExtra(AdVpnService.COMMAND_TAG, Command.RELOAD_DATABASE.ordinal)
+
     fun getMainActivityPendingIntent(): PendingIntent = PendingIntent.getActivity(
         applicationContext,
         0,

app/src/main/kotlin/dev/clombardo/dnsnet/db/RuleDatabaseUpdateWorker.kt

@@ -94,7 +94,7 @@ class RuleDatabaseUpdateWorker(
         val end = System.currentTimeMillis()
         logd("doWork: end after ${end - start} milliseconds")
 
-        AdVpnService.restart(context)
+        AdVpnService.reloadDatabase(context)
 
         postExecute()
 

app/src/main/kotlin/dev/clombardo/dnsnet/vpn/AdVpnService.kt

@@ -34,6 +34,7 @@ import androidx.annotation.StringRes
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import dev.clombardo.dnsnet.DnsNetApplication.Companion.applicationContext
+import dev.clombardo.dnsnet.FileHelper
 import dev.clombardo.dnsnet.Intents
 import dev.clombardo.dnsnet.MainActivity
 import dev.clombardo.dnsnet.NotificationChannels
@@ -44,10 +45,15 @@ import dev.clombardo.dnsnet.logd
 import dev.clombardo.dnsnet.logi
 import dev.clombardo.dnsnet.logw
 import dev.clombardo.dnsnet.vpn.VpnStatus.Companion.toVpnStatus
+import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
 import uniffi.net.AdVpnCallback
 import uniffi.net.RuleDatabase
+import uniffi.net.RuleDatabaseController
 
 enum class VpnStatus {
     STARTING,
@@ -81,6 +87,7 @@ enum class Command {
     PAUSE,
     RESUME,
     RESTART,
+    RELOAD_DATABASE,
 }
 
 class AdVpnService : VpnService(), Handler.Callback, AdVpnCallback {
@@ -147,6 +154,15 @@ class AdVpnService : VpnService(), Handler.Callback, AdVpnCallback {
             ContextCompat.startForegroundService(context, Intents.getRestartVpnIntent())
         }
 
+        fun reloadDatabase(context: Context) {
+            if (!isRunning()) {
+                logw("VPN is stopped, cannot reload database")
+                return
+            }
+
+            context.startService(Intents.getReloadDatabaseIntent())
+        }
+
         private fun getOpenMainActivityPendingIntent() = PendingIntent.getActivity(
             applicationContext,
             0,
@@ -176,7 +192,28 @@ class AdVpnService : VpnService(), Handler.Callback, AdVpnCallback {
 
     private val handler = Handler(Looper.myLooper()!!, this)
 
-    private val ruleDatabase = RuleDatabase()
+    // Guard against multiple coroutines waiting to reload the database
+    private val reloadPending = atomic(false)
+    private val ruleDatabaseController = RuleDatabaseController()
+    private val ruleDatabase = RuleDatabase(controller = ruleDatabaseController).also {
+        it.reload()
+    }
+
+    fun RuleDatabase.reload() {
+        if (reloadPending.getAndSet(true)) {
+            return
+        }
+
+        CoroutineScope(Dispatchers.IO).launch {
+            waitOnInit()
+            reloadPending.getAndSet(false)
+            initialize(
+                androidFileHelper = FileHelper,
+                hostItems = config.hosts.items.map { it.toNative() },
+                hostExceptions = config.hosts.exceptions.map { it.toNative() },
+            )
+        }
+    }
 
     private val vpnThread = AdVpnThread(
         adVpnService = this,
@@ -457,6 +494,10 @@ class AdVpnService : VpnService(), Handler.Callback, AdVpnCallback {
             Command.PAUSE -> pauseVpn()
 
             Command.RESTART -> restartVpnThread()
+
+            Command.RELOAD_DATABASE -> {
+                ruleDatabase.reload()
+            }
         }
 
         return START_STICKY
@@ -618,6 +659,7 @@ class AdVpnService : VpnService(), Handler.Callback, AdVpnCallback {
 
     override fun onDestroy() {
         logi("Destroyed, shutting down")
+        ruleDatabaseController.setShouldStop(true)
         stopVpn()
     }
 

app/src/main/kotlin/dev/clombardo/dnsnet/vpn/AdVpnThread.kt

@@ -34,19 +34,14 @@ import android.os.ParcelFileDescriptor
 import android.system.OsConstants
 import dev.clombardo.dnsnet.Configuration
 import dev.clombardo.dnsnet.DnsNetApplication.Companion.applicationContext
-import dev.clombardo.dnsnet.FileHelper
 import dev.clombardo.dnsnet.MainActivity
 import dev.clombardo.dnsnet.R
 import dev.clombardo.dnsnet.config
 import dev.clombardo.dnsnet.logd
 import dev.clombardo.dnsnet.loge
 import dev.clombardo.dnsnet.logi
 import dev.clombardo.dnsnet.logw
-import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import uniffi.net.BlockLoggerCallback
-import uniffi.net.NativeHost
 import uniffi.net.RuleDatabase
 import uniffi.net.VpnController
 import uniffi.net.VpnException
@@ -158,12 +153,7 @@ class AdVpnThread(
     override fun run() {
         logi("Starting")
 
-        ruleDatabase.initialize(
-            androidFileHelper = FileHelper,
-            vpnController = threadData?.vpnController ?: throw IllegalStateException(),
-            hostItems = config.hosts.items.map { it.toNative() },
-            hostExceptions = config.hosts.exceptions.map { it.toNative() },
-        )
+        ruleDatabase.waitOnInit()
 
         var retryTimeout = MIN_RETRY_TIME
         // Try connecting the vpn continuously