Skip to content

Commit

Permalink
Connection service for new API (#1000)
Browse files Browse the repository at this point in the history
**Background**

Device connection service for new API

**Changes**

- Add new connection service
- Start it in application

**Test plan**

- Install flipper from branch, open int
- See it now bottom bar display connection state and synchronization
  • Loading branch information
makeevrserg authored Dec 15, 2024
1 parent 2ff30b5 commit d7793ea
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 0 deletions.
13 changes: 13 additions & 0 deletions components/bridge/connection/service/api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
plugins {
id("flipper.multiplatform")
id("flipper.multiplatform-dependencies")
}

android.namespace = "com.flipperdevices.bridge.connection.service.api"

commonDependencies {
implementation(projects.components.bridge.connection.orchestrator.api)
implementation(projects.components.bridge.connection.config.api)

implementation(libs.kotlin.coroutines)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.flipperdevices.bridge.connection.service.api

/**
* This service handle connection for current flipper device
*/
interface FConnectionService {
/**
* Should be called once on application start
*/
fun onApplicationInit()

/**
* Reconnect to last known device after being force disconnected
*/
fun forceReconnect()

/**
* Disconnect current device
* @param force if true, will not reconnect until [forceReconnect]
*/
fun disconnect(force: Boolean = false)
}
19 changes: 19 additions & 0 deletions components/bridge/connection/service/impl/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
plugins {
id("flipper.multiplatform")
id("flipper.multiplatform-dependencies")
id("flipper.anvil-multiplatform")
}

android.namespace = "com.flipperdevices.bridge.connection.service.impl"

commonDependencies {
implementation(projects.components.core.ktx)
implementation(projects.components.core.log)
implementation(projects.components.core.di)

implementation(projects.components.bridge.connection.service.api)
implementation(projects.components.bridge.connection.orchestrator.api)
implementation(projects.components.bridge.connection.config.api)

implementation(libs.kotlin.coroutines)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package com.flipperdevices.bridge.connection.service.impl

import com.flipperdevices.bridge.connection.config.api.FDevicePersistedStorage
import com.flipperdevices.bridge.connection.orchestrator.api.FDeviceOrchestrator
import com.flipperdevices.bridge.connection.service.api.FConnectionService
import com.flipperdevices.core.di.AppGraph
import com.flipperdevices.core.ktx.jre.FlipperDispatchers
import com.flipperdevices.core.log.LogTagProvider
import com.flipperdevices.core.log.warn
import com.flipperdevices.core.ui.lifecycle.DecomposeViewModel
import com.squareup.anvil.annotations.ContributesBinding
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
@ContributesBinding(AppGraph::class, FConnectionService::class)
class FConnectionServiceImpl @Inject constructor(
private val orchestrator: FDeviceOrchestrator,
private val fDevicePersistedStorage: FDevicePersistedStorage
) : FConnectionService, LogTagProvider {
override val TAG: String = "FConnectionService"

private val scope = CoroutineScope(SupervisorJob() + FlipperDispatchers.workStealingDispatcher)
private val mutex = Mutex()
private val isForceDisconnected = MutableStateFlow(false)

override fun onApplicationInit() {
scope.launch {
if (mutex.isLocked) {
warn { "#onApplicationInit tried to init connection service again" }
return@launch
}
mutex.withLock {
val connectionJob = combine(
flow = fDevicePersistedStorage.getCurrentDevice(),
flow2 = isForceDisconnected,
transform = { currentDevice, isForceDisconnected ->
when {
isForceDisconnected -> orchestrator.disconnectCurrent()
currentDevice == null -> orchestrator.disconnectCurrent()
else -> orchestrator.connect(currentDevice)
}
}
).launchIn(this)
connectionJob.invokeOnCompletion { warn { "#onApplicationInit connection job cancelled" } }
connectionJob.join()
}
}
}

override fun forceReconnect() {
scope.launch { isForceDisconnected.emit(false) }
}

override fun disconnect(force: Boolean) {
scope.launch {
isForceDisconnected.emit(force)
orchestrator.disconnectCurrent()
}
}
}
2 changes: 2 additions & 0 deletions instances/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ dependencies {
implementation(projects.components.bridge.connection.transport.common.impl)
implementation(projects.components.bridge.connection.orchestrator.api)
implementation(projects.components.bridge.connection.orchestrator.impl)
implementation(projects.components.bridge.connection.service.api)
implementation(projects.components.bridge.connection.service.impl)
implementation(projects.components.bridge.connection.connectionbuilder.api)
implementation(projects.components.bridge.connection.connectionbuilder.impl)
implementation(projects.components.bridge.connection.config.api)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class FlipperApplication : Application(), SingletonImageLoader.Factory, LogTagPr
error(e) { "Failed init notification api" }
}
component.permissionRequestHandlerImpl.get().register(this)
component.fConnectionService.get().onApplicationInit()
}

override fun newImageLoader(context: PlatformContext): ImageLoader {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.flipperdevices.app.di

import com.flipperdevices.bridge.connection.service.api.FConnectionService
import com.flipperdevices.bridge.synchronization.api.SynchronizationApi
import com.flipperdevices.core.di.AppGraph
import com.flipperdevices.core.permission.impl.PermissionRequestHandlerImpl
Expand All @@ -14,4 +15,5 @@ interface MainComponent {
val synchronizationApi: Provider<SynchronizationApi>
val notificationApi: Provider<FlipperAppNotificationApi>
val permissionRequestHandlerImpl: Provider<PermissionRequestHandlerImpl>
val fConnectionService: Provider<FConnectionService>
}
2 changes: 2 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ include(
":components:bridge:connection:transport:common:impl",
":components:bridge:connection:orchestrator:api",
":components:bridge:connection:orchestrator:impl",
":components:bridge:connection:service:api",
":components:bridge:connection:service:impl",
":components:bridge:connection:connectionbuilder:api",
":components:bridge:connection:connectionbuilder:impl",
":components:bridge:connection:sample",
Expand Down

0 comments on commit d7793ea

Please sign in to comment.