MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

switch from timestamps to event sequence for events

Browse Source
This commit is contained in:
Fabian Freund
2026-02-10 16:20:35 +01:00
parent e0cce93ffb
commit 592c6afdc5
30 changed files with 840 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/GeckoPlatformView.kt
+2 -1
View File
@@ -11,6 +11,7 @@ import android.app.Activity
import android.content.Context
import android.view.ViewGroup
import android.widget.FrameLayout
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoStateEvents
import io.flutter.plugin.common.StandardMessageCodec
import io.flutter.plugin.platform.PlatformView
@@ -58,7 +59,7 @@ private class NativeFragmentView(
super.onFlutterViewAttached(flutterView)
components.engineReportedInitialized = false
flutterEvents.onViewReadyStateChange(System.currentTimeMillis(), true) { _ -> }
flutterEvents.onViewReadyStateChange(EventSequence.next(), true) { _ -> }
}
override fun getView(): View {
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/api/GeckoMlApiImpl.kt
+2 -1
View File
@@ -1,5 +1,6 @@
package eu.weblibre.flutter_mozilla_components.api
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.feature.MLEngineFeature
import eu.weblibre.flutter_mozilla_components.feature.ResultConsumer
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoMlApi
@@ -68,7 +69,7 @@ class GeckoMlApiImpl(
)
runOnUiThread {
stateEvents.onMlProgress(System.currentTimeMillis(), mlProgress) { result ->
stateEvents.onMlProgress(EventSequence.next(), mlProgress) { result ->
result.onFailure { error ->
android.util.Log.e("GeckoMlApi", "Failed to emit progress event: ${error.message}")
}
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/api/GeckoPrefApiImpl.kt
+2 -1
View File
@@ -7,6 +7,7 @@
package eu.weblibre.flutter_mozilla_components.api
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.feature.PrefManagerFeature
import eu.weblibre.flutter_mozilla_components.feature.ResultConsumer
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoPref
@@ -201,7 +202,7 @@ class GeckoPrefApiImpl : GeckoPrefApi, BrowserPrefObserverDelegate {
override fun onPreferenceChange(observedPreference: BrowserPreference<*>) {
components.flutterEvents.onPreferenceChange(
System.currentTimeMillis(), GeckoPref(
EventSequence.next(), GeckoPref(
name = observedPreference.pref,
value = observedPreference.value,
defaultValue = observedPreference.defaultValue,
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/api/GeckoSuggestionApiImpl.kt
+2 -1
View File
@@ -7,6 +7,7 @@
package eu.weblibre.flutter_mozilla_components.api
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.api.GeckoDeleteBrowsingDataControllerImpl.Companion
import eu.weblibre.flutter_mozilla_components.ext.toWebPBytes
import eu.weblibre.flutter_mozilla_components.pigeons.AutocompleteResult
@@ -77,7 +78,7 @@ class GeckoSuggestionApiImpl(
runOnUiThread {
suggestionEvents.onSuggestionResult(
System.currentTimeMillis(),
EventSequence.next(),
provider,
mappedResults
) { }
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/api/GeckoTabsApiImpl.kt
+14 -13
View File
@@ -17,6 +17,7 @@ import eu.weblibre.flutter_mozilla_components.pigeons.SourceValue
import eu.weblibre.flutter_mozilla_components.pigeons.WebExtensionActionType
import eu.weblibre.flutter_mozilla_components.pigeons.WebExtensionData
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.ext.toWebPBytes
import eu.weblibre.flutter_mozilla_components.pigeons.FindResultState
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoStateEvents
@@ -135,7 +136,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
withContext(Dispatchers.Main) {
components.flutterEvents.onIconChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
iconBytes
) { }
@@ -159,7 +160,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
val bytes = it.toWebPBytes()
withContext(Dispatchers.Main) {
components.flutterEvents.onThumbnailChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
bytes
) { }
@@ -191,21 +192,21 @@ class GeckoTabsApiImpl : GeckoTabsApi {
if (onSelectedTabChange) {
components.flutterEvents.onSelectedTabChange(
System.currentTimeMillis(),
EventSequence.next(),
selectedTab
) { }
}
if (onTabListChange) {
components.flutterEvents.onTabListChange(
System.currentTimeMillis(),
EventSequence.next(),
tabs.map { it.id }) { }
}
tabs.forEach { tab ->
if (onTabContentStateChange) {
components.flutterEvents.onTabContentStateChange(
System.currentTimeMillis(),
EventSequence.next(),
TabContentState(
id = tab.id,
parentId = tab.parentId,
@@ -226,7 +227,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
if (onSecurityInfoStateChange) {
components.flutterEvents.onSecurityInfoStateChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
SecurityInfoState(
tab.content.securityInfo.isSecure,
@@ -238,7 +239,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
if (onReaderableStateChange) {
components.flutterEvents.onReaderableStateChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
ReaderableState(
tab.readerState.readerable,
@@ -249,7 +250,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
if (onHistoryStateChange) {
components.flutterEvents.onHistoryStateChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
HistoryState(
items = tab.content.history.items.map { item ->
@@ -264,7 +265,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
if (onFindResults) {
components.flutterEvents.onFindResults(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
tab.content.findResults.map { result ->
FindResultState(
@@ -321,7 +322,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
badgeBackgroundColor = browserAction.badgeBackgroundColor?.toLong(),
)
components.addonEvents.onUpsertWebExtensionAction(
System.currentTimeMillis(),
EventSequence.next(),
extension.id,
WebExtensionActionType.BROWSER,
data
@@ -336,7 +337,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
val imageBytes = icon.toWebPBytes()
withContext(Dispatchers.Main) {
components.addonEvents.onUpdateWebExtensionIcon(
System.currentTimeMillis(),
EventSequence.next(),
extension.id,
WebExtensionActionType.BROWSER,
imageBytes
@@ -362,7 +363,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
badgeBackgroundColor = pageAction.badgeBackgroundColor?.toLong(),
)
components.addonEvents.onUpsertWebExtensionAction(
System.currentTimeMillis(),
EventSequence.next(),
extension.id,
WebExtensionActionType.PAGE,
data
@@ -377,7 +378,7 @@ class GeckoTabsApiImpl : GeckoTabsApi {
val imageBytes = icon.toWebPBytes()
withContext(Dispatchers.Main) {
components.addonEvents.onUpdateWebExtensionIcon(
System.currentTimeMillis(),
EventSequence.next(),
extension.id,
WebExtensionActionType.PAGE,
imageBytes
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/components/Events.kt
+8 -6
View File
@@ -6,7 +6,9 @@
package eu.weblibre.flutter_mozilla_components.components
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.api.ReaderViewEventsImpl
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.ext.toWebPBytes
import eu.weblibre.flutter_mozilla_components.pigeons.FindResultState
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoAddonEvents
@@ -44,7 +46,7 @@ class Events(
.debounce { 50 }
.collect { tabId ->
flutterEvents.onSelectedTabChange(
System.currentTimeMillis(),
EventSequence.next(),
tabId
) { _ -> }
}
@@ -70,7 +72,7 @@ class Events(
.collect { tab ->
val iconBytes = tab.content.icon?.toWebPBytes()
flutterEvents.onIconChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
iconBytes
) { _ -> }
@@ -85,7 +87,7 @@ class Events(
.debounce(15)
.collect { tab ->
flutterEvents.onSecurityInfoStateChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
SecurityInfoState(
tab.content.securityInfo.isSecure,
@@ -110,7 +112,7 @@ class Events(
.debounce(25)
.collect { tab ->
flutterEvents.onReaderableStateChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
ReaderableState(
tab.readerState.readerable,
@@ -135,7 +137,7 @@ class Events(
.debounce(15)
.collect { tab ->
flutterEvents.onHistoryStateChange(
System.currentTimeMillis(),
EventSequence.next(),
tab.id,
HistoryState(
items = tab.content.history.items.map { item ->
@@ -170,7 +172,7 @@ class Events(
.debounce(15)
.collect { tab ->
flutterEvents.onTabContentStateChange(
System.currentTimeMillis(),
EventSequence.next(),
TabContentState(
id = tab.id,
parentId = tab.parentId,
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/ext/EventSequence.kt
+22
View File
@@ -0,0 +1,22 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package eu.weblibre.flutter_mozilla_components.ext
import java.util.concurrent.atomic.AtomicLong
/**
* Thread-safe monotonic sequence counter for event ordering.
*
* Replaces System.currentTimeMillis() for event timestamps sent to Flutter,
* guaranteeing strictly increasing values regardless of wall-clock changes
* and eliminating same-millisecond collisions.
*/
object EventSequence {
private val counter = AtomicLong(0)
fun next(): Long = counter.incrementAndGet()
}
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/feature/BrowserExtensionFeature.kt
+2 -1
View File
@@ -7,6 +7,7 @@
package eu.weblibre.flutter_mozilla_components.feature
import androidx.annotation.VisibleForTesting
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.pigeons.BrowserExtensionEvents
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
@@ -86,7 +87,7 @@ object BrowserExtensionFeature {
runOnUiThread {
extensionEvents.onFeedRequested(
System.currentTimeMillis(),
EventSequence.next(),
url
) { _ -> }
}
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/feature/ContainerProxyFeature.kt
+2 -1
View File
@@ -8,6 +8,7 @@ package eu.weblibre.flutter_mozilla_components.feature
import androidx.annotation.VisibleForTesting
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.pigeons.ContainerSiteAssignment
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoStateEvents
import kotlinx.coroutines.Dispatchers
@@ -115,7 +116,7 @@ object ContainerProxyFeature {
if (status == "success") {
runOnUiThread {
events.onContainerSiteAssignment(
System.currentTimeMillis(),
EventSequence.next(),
ContainerSiteAssignment(
requestId = requestId,
tabId = components.core.store.state.selectedTabId,
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/feature/KeyboardVisibilityFeature.kt
+2 -1
View File
@@ -14,6 +14,7 @@ import androidx.core.graphics.Insets
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsAnimationCompat
import androidx.core.view.WindowInsetsCompat
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoViewportEvents
import mozilla.components.support.base.log.logger.Logger
import org.mozilla.gecko.util.ThreadUtils.runOnUiThread
@@ -185,7 +186,7 @@ class KeyboardVisibilityFeature(
lastKeyboardHeight = heightPx
lastKeyboardVisible = isVisible
val timestamp = System.currentTimeMillis()
val timestamp = EventSequence.next()
logger.debug("$TAG: Keyboard change - height=$heightPx, visible=$isVisible, animating=$isAnimating")
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/feature/ReadabilityExtractFeature.kt
+2 -1
View File
@@ -6,6 +6,7 @@
package eu.weblibre.flutter_mozilla_components.feature
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoTabContentEvents
import eu.weblibre.flutter_mozilla_components.pigeons.TabContent
import kotlinx.coroutines.CoroutineScope
@@ -50,7 +51,7 @@ class ReadabilityExtractFeature(
override fun onPortMessage(message: Any, port: Port) {
if (message is JSONObject) {
tabContentEvents.onContentUpdate(
System.currentTimeMillis(),
EventSequence.next(),
contentArg = TabContent(
tabId = tabId,
fullContentMarkdown = message.tryGetString("fullContentMarkdown"),
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/feature/WebExtensionToolbarFeature.kt
+9 -8
View File
@@ -7,6 +7,7 @@ package eu.weblibre.flutter_mozilla_components.feature
import android.os.Handler
import android.os.HandlerThread
import androidx.annotation.VisibleForTesting
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.ext.toWebPBytes
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoAddonEvents
import eu.weblibre.flutter_mozilla_components.pigeons.WebExtensionActionType
@@ -66,7 +67,7 @@ class WebExtensionToolbarFeature(
.filter { !store.state.extensions.containsKey(it) || store.state.extensions[it]?.enabled == false }
.forEach { extensionId ->
addonEvents.onRemoveWebExtensionAction(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extensionId,
actionTypeArg = WebExtensionActionType.BROWSER,
) {}
@@ -77,7 +78,7 @@ class WebExtensionToolbarFeature(
.filter { !store.state.extensions.containsKey(it) || store.state.extensions[it]?.enabled == false }
.forEach { extensionId ->
addonEvents.onRemoveWebExtensionAction(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extensionId,
actionTypeArg = WebExtensionActionType.PAGE,
) {}
@@ -106,7 +107,7 @@ class WebExtensionToolbarFeature(
webExtensionBrowserActions.keys.toList().forEach { extensionId ->
if (extensionId !in enabledExtensionIds) {
addonEvents.onRemoveWebExtensionAction(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extensionId,
actionTypeArg = WebExtensionActionType.BROWSER,
) {}
@@ -117,7 +118,7 @@ class WebExtensionToolbarFeature(
webExtensionPageActions.keys.toList().forEach { extensionId ->
if (extensionId !in enabledExtensionIds) {
addonEvents.onRemoveWebExtensionAction(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extensionId,
actionTypeArg = WebExtensionActionType.PAGE,
) {}
@@ -130,7 +131,7 @@ class WebExtensionToolbarFeature(
if (extensionNotAllowedInTab(extension, tab)) {
webExtensionPageActions[extension.id]?.let {
addonEvents.onRemoveWebExtensionAction(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extension.id,
actionTypeArg = WebExtensionActionType.PAGE,
) {}
@@ -138,7 +139,7 @@ class WebExtensionToolbarFeature(
}
webExtensionBrowserActions[extension.id]?.let {
addonEvents.onRemoveWebExtensionAction(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extension.id,
actionTypeArg = WebExtensionActionType.BROWSER,
) {}
@@ -220,7 +221,7 @@ class WebExtensionToolbarFeature(
)
addonEvents.onUpsertWebExtensionAction(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extension.id,
actionTypeArg = if (isPageAction) WebExtensionActionType.PAGE else WebExtensionActionType.BROWSER,
extensionDataArg = data
@@ -235,7 +236,7 @@ class WebExtensionToolbarFeature(
val imageBytes = icon.toWebPBytes()
runOnUiThread {
addonEvents.onUpdateWebExtensionIcon(
timestampArg = System.currentTimeMillis(),
timestampArg = EventSequence.next(),
extensionIdArg = extensionId,
actionTypeArg = if (isPageAction) WebExtensionActionType.PAGE else WebExtensionActionType.BROWSER,
iconArg = imageBytes
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/integration/ReaderViewIntegration.kt
+3 -2
View File
@@ -10,6 +10,7 @@ import android.content.Context
import android.graphics.drawable.Drawable
import androidx.core.content.ContextCompat
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.api.ReaderViewEventsImpl
import eu.weblibre.flutter_mozilla_components.api.ReaderViewControllerListener
import eu.weblibre.flutter_mozilla_components.pigeons.ReaderViewController
@@ -36,12 +37,12 @@ class ReaderViewIntegration(
if (enabled) {
feature.showReaderView()
readerViewController.appearanceButtonVisibility(System.currentTimeMillis(),true) { _ -> };
readerViewController.appearanceButtonVisibility(EventSequence.next(),true) { _ -> };
} else {
feature.hideReaderView()
feature.hideControls()
readerViewController.appearanceButtonVisibility(System.currentTimeMillis(),false) { _ -> };
readerViewController.appearanceButtonVisibility(EventSequence.next(),false) { _ -> };
}
}
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/middleware/FlutterEventMiddleware.kt
+9 -8
View File
@@ -6,6 +6,7 @@ package eu.weblibre.flutter_mozilla_components.middleware
import android.graphics.Bitmap
import android.util.Log
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.ext.EventSequence
import eu.weblibre.flutter_mozilla_components.ext.resize
import eu.weblibre.flutter_mozilla_components.ext.toWebPBytes
import eu.weblibre.flutter_mozilla_components.pigeons.AudioHitResult
@@ -55,7 +56,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
val bytes = resized.toWebPBytes()
runOnUiThread {
flutterEvents.onThumbnailChange(System.currentTimeMillis(), action.sessionId, bytes) { _ -> }
flutterEvents.onThumbnailChange(EventSequence.next(), action.sessionId, bytes) { _ -> }
}
}
//UpdateReaderConnectRequiredAction seems to be the only event that is called predictable
@@ -64,7 +65,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
if(!components.engineReportedInitialized) {
runOnUiThread {
flutterEvents.onEngineReadyStateChange(
System.currentTimeMillis(),
EventSequence.next(),
true
) { _ -> }
}
@@ -75,7 +76,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
is TabListAction.AddTabAction -> {
runOnUiThread {
flutterEvents.onTabAdded(
System.currentTimeMillis(),
EventSequence.next(),
action.tab.id
) { _ -> }
}
@@ -85,7 +86,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
runOnUiThread {
flutterEvents.onIconUpdate(
System.currentTimeMillis(),
EventSequence.next(),
action.pageUrl,
bytes
) { _ -> }
@@ -94,7 +95,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
is ContentAction.UpdateHitResultAction -> {
runOnUiThread {
flutterEvents.onLongPress(
System.currentTimeMillis(),
EventSequence.next(),
action.sessionId,
when(val result = action.hitResult) {
is HitResult.AUDIO -> AudioHitResult(result.src, result.title)
@@ -112,7 +113,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
is ContentAction.AddFindResultAction -> {
runOnUiThread {
flutterEvents.onFindResults(
System.currentTimeMillis(),
EventSequence.next(),
action.sessionId,
listOf(
FindResultState(
@@ -127,7 +128,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
is ContentAction.ClearFindResultsAction -> {
runOnUiThread {
flutterEvents.onFindResults(
System.currentTimeMillis(),
EventSequence.next(),
action.sessionId,
listOf()
) { _ -> }
@@ -136,7 +137,7 @@ class FlutterEventMiddleware(private val flutterEvents: GeckoStateEvents) : Midd
// is ReaderAction.UpdateReaderScrollYAction -> {
// runOnUiThread {
// flutterEvents.onScrollChange(
// System.currentTimeMillis(),
// EventSequence.next(),
// action.tabId,
// action.scrollY.toLong()
// ) { _ -> }
packages/flutter_mozilla_components/lib/src/domain/services/gecko_addon.dart
+9 -9
View File
@@ -51,18 +51,18 @@ class GeckoAddonService extends GeckoAddonEvents {
@override
void onRemoveWebExtensionAction(
int timestamp,
int sequence,
String extensionId,
WebExtensionActionType actionType,
) {
switch (actionType) {
case WebExtensionActionType.browser:
_browserExtensionSubject.addWhenMoreRecent(timestamp, extensionId, (
_browserExtensionSubject.addWhenMoreRecent(sequence, extensionId, (
extensionId: extensionId,
data: null,
));
case WebExtensionActionType.page:
_pageExtensionSubject.addWhenMoreRecent(timestamp, extensionId, (
_pageExtensionSubject.addWhenMoreRecent(sequence, extensionId, (
extensionId: extensionId,
data: null,
));
@@ -71,19 +71,19 @@ class GeckoAddonService extends GeckoAddonEvents {
@override
void onUpdateWebExtensionIcon(
int timestamp,
int sequence,
String extensionId,
WebExtensionActionType actionType,
Uint8List icon,
) {
switch (actionType) {
case WebExtensionActionType.browser:
_browserIconSubject.addWhenMoreRecent(timestamp, extensionId, (
_browserIconSubject.addWhenMoreRecent(sequence, extensionId, (
extensionId: extensionId,
bytes: icon,
));
case WebExtensionActionType.page:
_pageIconSubject.addWhenMoreRecent(timestamp, extensionId, (
_pageIconSubject.addWhenMoreRecent(sequence, extensionId, (
extensionId: extensionId,
bytes: icon,
));
@@ -92,19 +92,19 @@ class GeckoAddonService extends GeckoAddonEvents {
@override
void onUpsertWebExtensionAction(
int timestamp,
int sequence,
String extensionId,
WebExtensionActionType actionType,
WebExtensionData extensionData,
) {
switch (actionType) {
case WebExtensionActionType.browser:
_browserExtensionSubject.addWhenMoreRecent(timestamp, extensionId, (
_browserExtensionSubject.addWhenMoreRecent(sequence, extensionId, (
extensionId: extensionId,
data: extensionData,
));
case WebExtensionActionType.page:
_pageExtensionSubject.addWhenMoreRecent(timestamp, extensionId, (
_pageExtensionSubject.addWhenMoreRecent(sequence, extensionId, (
extensionId: extensionId,
data: extensionData,
));
packages/flutter_mozilla_components/lib/src/domain/services/gecko_browser_extension.dart
+2 -2
View File
@@ -58,8 +58,8 @@ class GeckoBrowserExtensionService extends BrowserExtensionEvents {
}
@override
void onFeedRequested(int timestamp, String url) {
_feedRequest.addWhenMoreRecent(timestamp, null, url);
void onFeedRequested(int sequence, String url) {
_feedRequest.addWhenMoreRecent(sequence, null, url);
}
void dispose() {
packages/flutter_mozilla_components/lib/src/domain/services/gecko_event.dart
+43 -42
View File
@@ -20,6 +20,7 @@ typedef ThumbnailEvent = ({String tabId, Uint8List? bytes});
typedef FindResultsEvent = ({String tabId, List<FindResultState> results});
typedef LongPressEvent = ({String tabId, HitResult hitResult});
typedef ScrollEvent = ({String tabId, int scrollY});
typedef ManifestUpdateEvent = ({String tabId, PwaManifest? manifest});
class GeckoEventService extends GeckoStateEvents {
// Stream controllers
@@ -44,6 +45,7 @@ class GeckoEventService extends GeckoStateEvents {
final _tabAddedSubject = PublishSubject<String>();
final _mlProgressSubject = PublishSubject<MlProgressData>();
final _manifestUpdateSubject = PublishSubject<ManifestUpdateEvent>();
// Event streams
ValueStream<bool> get viewReadyStateEvents => _viewStateSubject.stream;
@@ -68,52 +70,46 @@ class GeckoEventService extends GeckoStateEvents {
Stream<String> get tabAddedStream => _tabAddedSubject.stream;
Stream<MlProgressData> get mlProgressEvents => _mlProgressSubject.stream;
Stream<ManifestUpdateEvent> get manifestUpdateEvents =>
_manifestUpdateSubject.stream;
@override
void onViewReadyStateChange(int timestamp, bool state) {
_viewStateSubject.addWhenMoreRecent(timestamp, null, state);
void onViewReadyStateChange(int sequence, bool state) {
_viewStateSubject.addWhenMoreRecent(sequence, null, state);
}
@override
void onEngineReadyStateChange(int timestamp, bool state) {
_engineStateSubject.addWhenMoreRecent(timestamp, null, state);
void onEngineReadyStateChange(int sequence, bool state) {
_engineStateSubject.addWhenMoreRecent(sequence, null, state);
}
// Overridden methods
@override
void onTabListChange(int timestamp, List<String?> tabIds) {
_tabListSubject.addWhenMoreRecent(
timestamp,
null,
tabIds.nonNulls.toList(),
);
void onTabListChange(int sequence, List<String?> tabIds) {
_tabListSubject.addWhenMoreRecent(sequence, null, tabIds.nonNulls.toList());
}
@override
void onSelectedTabChange(int timestamp, String? id) {
_selectedTabSubject.addWhenMoreRecent(timestamp, id, id);
void onSelectedTabChange(int sequence, String? id) {
_selectedTabSubject.addWhenMoreRecent(sequence, id, id);
}
@override
void onTabContentStateChange(int timestamp, TabContentState state) {
_tabContentSubject.addWhenMoreRecent(timestamp, state.id, state);
void onTabContentStateChange(int sequence, TabContentState state) {
_tabContentSubject.addWhenMoreRecent(sequence, state.id, state);
}
@override
void onHistoryStateChange(int timestamp, String id, HistoryState state) {
_historySubject.addWhenMoreRecent(timestamp, id, (
void onHistoryStateChange(int sequence, String id, HistoryState state) {
_historySubject.addWhenMoreRecent(sequence, id, (
tabId: id,
history: state,
));
}
@override
void onReaderableStateChange(
int timestamp,
String id,
ReaderableState state,
) {
_readerableSubject.addWhenMoreRecent(timestamp, id, (
void onReaderableStateChange(int sequence, String id, ReaderableState state) {
_readerableSubject.addWhenMoreRecent(sequence, id, (
tabId: id,
readerable: state,
));
@@ -121,87 +117,91 @@ class GeckoEventService extends GeckoStateEvents {
@override
void onSecurityInfoStateChange(
int timestamp,
int sequence,
String id,
SecurityInfoState state,
) {
_securityInfoSubject.addWhenMoreRecent(timestamp, id, (
_securityInfoSubject.addWhenMoreRecent(sequence, id, (
tabId: id,
securityInfo: state,
));
}
@override
void onIconChange(int timestamp, String id, Uint8List? bytes) {
_iconChangeSubject.addWhenMoreRecent(timestamp, id, (
void onIconChange(int sequence, String id, Uint8List? bytes) {
_iconChangeSubject.addWhenMoreRecent(sequence, id, (
tabId: id,
bytes: bytes,
));
}
@override
void onIconUpdate(int timestamp, String url, Uint8List bytes) {
_iconUpdateSubject.addWhenMoreRecent(timestamp, url, (
void onIconUpdate(int sequence, String url, Uint8List bytes) {
_iconUpdateSubject.addWhenMoreRecent(sequence, url, (
url: url,
bytes: bytes,
));
}
@override
void onThumbnailChange(int timestamp, String id, Uint8List? bytes) {
_thumbnailSubject.addWhenMoreRecent(timestamp, id, (
void onThumbnailChange(int sequence, String id, Uint8List? bytes) {
_thumbnailSubject.addWhenMoreRecent(sequence, id, (
tabId: id,
bytes: bytes,
));
}
@override
void onFindResults(int timestamp, String id, List<FindResultState?> results) {
_findResultsSubject.addWhenMoreRecent(timestamp, id, (
void onFindResults(int sequence, String id, List<FindResultState?> results) {
_findResultsSubject.addWhenMoreRecent(sequence, id, (
tabId: id,
results: results.nonNulls.toList(),
));
}
@override
void onLongPress(int timestamp, String id, HitResult hitResult) {
_longPressSubject.addWhenMoreRecent(timestamp, id, (
void onLongPress(int sequence, String id, HitResult hitResult) {
_longPressSubject.addWhenMoreRecent(sequence, id, (
tabId: id,
hitResult: hitResult,
));
}
@override
void onTabAdded(int timestamp, String tabId) {
_tabAddedSubject.addWhenMoreRecent(timestamp, null, tabId);
void onTabAdded(int sequence, String tabId) {
_tabAddedSubject.addWhenMoreRecent(sequence, null, tabId);
}
// @override
// void onScrollChange(int timestamp, String tabId, int scrollY) {
// _scrollEventSubject.addWhenMoreRecent(timestamp, tabId, (
// void onScrollChange(int sequence, String tabId, int scrollY) {
// _scrollEventSubject.addWhenMoreRecent(sequence, tabId, (
// tabId: tabId,
// scrollY: scrollY,
// ));
// }
@override
void onPreferenceChange(int timestamp, GeckoPref value) {
_prefUpdateSubject.addWhenMoreRecent(timestamp, value.name, value);
void onPreferenceChange(int sequence, GeckoPref value) {
_prefUpdateSubject.addWhenMoreRecent(sequence, value.name, value);
}
@override
void onContainerSiteAssignment(
int timestamp,
int sequence,
ContainerSiteAssignment details,
) {
_siteAssignementSubject.addWhenMoreRecent(
timestamp,
sequence,
details.requestId,
details,
);
}
@override
void onMlProgress(int sequence, MlProgressData progress) {
_mlProgressSubject.addWhenMoreRecent(sequence, null, progress);
}
void onMlProgress(int timestamp, MlProgressData progress) {
_mlProgressSubject.addWhenMoreRecent(timestamp, null, progress);
}
@@ -236,5 +236,6 @@ class GeckoEventService extends GeckoStateEvents {
await _prefUpdateSubject.close();
await _siteAssignementSubject.close();
await _mlProgressSubject.close();
await _manifestUpdateSubject.close();
}
}
packages/flutter_mozilla_components/lib/src/domain/services/gecko_readerable.dart
+2 -2
View File
@@ -27,8 +27,8 @@ class GeckoReaderableService extends ReaderViewController {
}
@override
void appearanceButtonVisibility(int timestamp, bool visible) {
_appearanceVisibility.addWhenMoreRecent(timestamp, null, visible);
void appearanceButtonVisibility(int sequence, bool visible) {
_appearanceVisibility.addWhenMoreRecent(sequence, null, visible);
}
GeckoReaderableService.setUp({
packages/flutter_mozilla_components/lib/src/domain/services/gecko_suggestions.dart
+2 -2
View File
@@ -54,12 +54,12 @@ class GeckoSuggestionsService extends GeckoSuggestionEvents {
@override
void onSuggestionResult(
int timestamp,
int sequence,
GeckoSuggestionType suggestionType,
List<GeckoSuggestion> suggestions,
) {
_suggestionsSubject.addWhenMoreRecent(
timestamp,
sequence,
suggestionType,
suggestions,
);
packages/flutter_mozilla_components/lib/src/domain/services/gecko_tab_content.dart
+2 -2
View File
@@ -28,8 +28,8 @@ class GeckoTabContentService extends GeckoTabContentEvents {
}
@override
void onContentUpdate(int timestamp, TabContent content) {
_contentSubject.addWhenMoreRecent(timestamp, content.tabId, content);
void onContentUpdate(int sequence, TabContent content) {
_contentSubject.addWhenMoreRecent(sequence, content.tabId, content);
}
Future<void> dispose() async {
packages/flutter_mozilla_components/lib/src/domain/services/gecko_viewport.dart
+2 -2
View File
@@ -101,12 +101,12 @@ class GeckoViewportService extends GeckoViewportEvents {
@override
void onKeyboardVisibilityChanged(
int timestamp,
int sequence,
int heightPx,
bool isVisible,
bool isAnimating,
) {
_keyboardSubject.addWhenMoreRecent(timestamp, null, (
_keyboardSubject.addWhenMoreRecent(sequence, null, (
heightPx: heightPx,
isVisible: isVisible,
isAnimating: isAnimating,
packages/flutter_mozilla_components/lib/src/extensions/subject.dart
+18 -6
View File
@@ -9,17 +9,29 @@ import 'package:rxdart/rxdart.dart';
final _lastEventTimes = <Subject, Map<dynamic, int>>{};
extension SubjectAddRecent<T> on Subject<T> {
void addWhenMoreRecent(int timestamp, dynamic identifier, T value) {
/// Adds [value] to this Subject only if [sequence] is greater than
/// the last sequence number for this [identifier].
///
/// Uses atomic event sequence numbers (from native EventSequence) to ensure
/// events are processed in order and prevent out-of-order updates.
/// Sequence numbers are monotonically increasing integers (0, 1, 2, ...).
void addWhenMoreRecent(int sequence, dynamic identifier, T value) {
_lastEventTimes[this] ??= {};
if ((_lastEventTimes[this]?[identifier] ?? 0) < timestamp) {
_lastEventTimes[this]![identifier] = timestamp;
if ((_lastEventTimes[this]?[identifier] ?? 0) < sequence) {
_lastEventTimes[this]![identifier] = sequence;
add(value);
}
}
/// Updates this BehaviorSubject only if [sequence] is greater than
/// the last sequence number for this [identifier].
///
/// Uses atomic event sequence numbers (from native EventSequence) to ensure
/// events are processed in order and prevent out-of-order updates.
/// Sequence numbers are monotonically increasing integers (0, 1, 2, ...).
void updateWhenMoreRecent(
int timestamp,
int sequence,
dynamic identifier,
T Function(T? currentValue) update,
) {
@@ -27,8 +39,8 @@ extension SubjectAddRecent<T> on Subject<T> {
_lastEventTimes[this] ??= {};
if ((_lastEventTimes[this]?[identifier] ?? 0) < timestamp) {
_lastEventTimes[this]![identifier] = timestamp;
if ((_lastEventTimes[this]?[identifier] ?? 0) < sequence) {
_lastEventTimes[this]![identifier] = sequence;
add(update((this as BehaviorSubject<T>).valueOrNull));
}
}
packages/flutter_mozilla_components/lib/src/pigeons/gecko.g.dart
+637 -101
View File
File diff suppressed because it is too large Load Diff
packages/flutter_mozilla_components/pigeons/gecko.dart
+28 -29
View File
@@ -1392,36 +1392,35 @@ class ContainerSiteAssignment {
@FlutterApi()
abstract class GeckoStateEvents {
void onViewReadyStateChange(int timestamp, bool state);
void onEngineReadyStateChange(int timestamp, bool state);
void onIconUpdate(int timestamp, String url, Uint8List bytes);
void onViewReadyStateChange(int sequence, bool state);
void onEngineReadyStateChange(int sequence, bool state);
void onIconUpdate(int sequence, String url, Uint8List bytes);
void onTabAdded(int timestamp, String tabId);
void onTabAdded(int sequence, String tabId);
void onTabListChange(int timestamp, List<String> tabIds);
void onSelectedTabChange(int timestamp, String? id);
void onTabListChange(int sequence, List<String> tabIds);
void onSelectedTabChange(int sequence, String? id);
void onTabContentStateChange(int timestamp, TabContentState state);
void onHistoryStateChange(int timestamp, String id, HistoryState state);
void onReaderableStateChange(int timestamp, String id, ReaderableState state);
void onTabContentStateChange(int sequence, TabContentState state);
void onHistoryStateChange(int sequence, String id, HistoryState state);
void onReaderableStateChange(int sequence, String id, ReaderableState state);
void onSecurityInfoStateChange(
int timestamp,
int sequence,
String id,
SecurityInfoState state,
);
void onIconChange(int timestamp, String id, Uint8List? bytes);
void onThumbnailChange(int timestamp, String id, Uint8List? bytes);
void onIconChange(int sequence, String id, Uint8List? bytes);
void onThumbnailChange(int sequence, String id, Uint8List? bytes);
void onFindResults(int timestamp, String id, List<FindResultState> results);
void onLongPress(int timestamp, String id, HitResult hitResult);
void onFindResults(int sequence, String id, List<FindResultState> results);
void onLongPress(int sequence, String id, HitResult hitResult);
// void onScrollChange(int timestamp, String tabId, int scrollY);
void onPreferenceChange(int timestamp, GeckoPref value);
// void onScrollChange(int sequence, String tabId, int scrollY);
void onPreferenceChange(int sequence, GeckoPref value);
void onContainerSiteAssignment(
int timestamp,
ContainerSiteAssignment details,
);
void onContainerSiteAssignment(int sequence, ContainerSiteAssignment details);
void onMlProgress(int sequence, MlProgressData progress);
void onMlProgress(int timestamp, MlProgressData progress);
}
@@ -1439,7 +1438,7 @@ abstract class ReaderViewEvents {
@FlutterApi()
abstract class ReaderViewController {
void appearanceButtonVisibility(int timestamp, bool visible);
void appearanceButtonVisibility(int sequence, bool visible);
}
@HostApi()
@@ -1465,20 +1464,20 @@ abstract class GeckoAddonsApi {
@FlutterApi()
abstract class GeckoAddonEvents {
void onUpsertWebExtensionAction(
int timestamp,
int sequence,
String extensionId,
WebExtensionActionType actionType,
WebExtensionData extensionData,
);
void onRemoveWebExtensionAction(
int timestamp,
int sequence,
String extensionId,
WebExtensionActionType actionType,
);
void onUpdateWebExtensionIcon(
int timestamp,
int sequence,
String extensionId,
WebExtensionActionType actionType,
Uint8List icon,
@@ -1495,7 +1494,7 @@ abstract class GeckoSuggestionApi {
@FlutterApi()
abstract class GeckoSuggestionEvents {
void onSuggestionResult(
int timestamp,
int sequence,
GeckoSuggestionType suggestionType,
List<GeckoSuggestion> suggestions,
);
@@ -1503,7 +1502,7 @@ abstract class GeckoSuggestionEvents {
@FlutterApi()
abstract class GeckoTabContentEvents {
void onContentUpdate(int timestamp, TabContent content);
void onContentUpdate(int sequence, TabContent content);
}
@HostApi()
@@ -1579,7 +1578,7 @@ abstract class GeckoDownloadsApi {
@FlutterApi()
abstract class BrowserExtensionEvents {
void onFeedRequested(int timestamp, String url);
void onFeedRequested(int sequence, String url);
}
class GeckoHeader {
@@ -1737,12 +1736,12 @@ abstract class GeckoViewportEvents {
/// This is detected natively using WindowInsets API and provides
/// accurate keyboard height information.
///
/// [timestamp] Event timestamp for ordering.
/// [sequence] Event sequence number for ordering.
/// [heightPx] Keyboard height in pixels (0 when hidden).
/// [isVisible] Whether the keyboard is currently visible.
/// [isAnimating] Whether the keyboard is currently animating.
void onKeyboardVisibilityChanged(
int timestamp,
int sequence,
int heightPx,
bool isVisible,
bool isAnimating,