From 5acd9d4863bd3e54e5c1850c78fc3ef85c3b06b2 Mon Sep 17 00:00:00 2001 From: Krzysztof kuhy Rudnicki Date: Thu, 19 Nov 2026 11:07:19 +0100 Subject: [PATCH] Bump flutter, gradle, sync pins; probe retries crdt_sync_flutter 0.9.1, sync_settings_ui 0.8.4 (data_transfer_flutter 0.2.3 lifts the file_picker 13.3.3 hold, so 13.4.0 and the exception go), Flutter 3.50.0 (.fvmrc + release-apk.yml), Gradle 9.9.1. LinuxSystemProbe.processCmdlines retried nothing when a pid exited between readdir and Dart's lstat of it, failing the whole listing (seen in the suite). It now relists up to three times. Co-Authored-By: Claude Opus 5.5 --- .fvmrc | 2 +- .github/workflows/release-apk.yml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- dependency-freshness.allowlist.yaml | 11 +---- lib/desktop/linux_system_probe.dart | 28 +++++++++-- pubspec.lock | 46 +++++++++++++------ pubspec.yaml | 8 ++-- test/port_guard_linux_probe_test.dart | 24 ++++++++++ 8 files changed, 88 insertions(+), 35 deletions(-) diff --git a/.fvmrc b/.fvmrc index a059027..14bb2a9 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.47.9" + "flutter": "3.50.0" } diff --git a/.github/workflows/release-apk.yml b/.github/workflows/release-apk.yml index 7d4fc71..a7df490 100644 --- a/.github/workflows/release-apk.yml +++ b/.github/workflows/release-apk.yml @@ -47,7 +47,7 @@ jobs: - uses: subosito/flutter-action@v2 with: - flutter-version: 3.47.9 + flutter-version: 3.50.0 channel: stable cache: true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index c0cc570..1e395d3 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-all.zip diff --git a/dependency-freshness.allowlist.yaml b/dependency-freshness.allowlist.yaml index bfaa6fe..d2113e0 100644 --- a/dependency-freshness.allowlist.yaml +++ b/dependency-freshness.allowlist.yaml @@ -1,13 +1,4 @@ # todo's own additions to the fleet-wide allowlist # (~/src/utils/dependency-freshness.allowlist.yaml). -exceptions: - - ecosystem: pub - package: file_picker - pinned: "13.3.3" - latest_known: "13.4.0" - reason: >- - sync_settings_ui 0.8.3 depends on data_transfer_flutter 0.2.2, which - exact-pins file_picker 13.3.3, so pub cannot resolve 13.4.0 here - (checked 2026-11-17). Lifts the day data_transfer_flutter bumps it. - blocked_by: "transitive:data_transfer_flutter@0.2.2" +exceptions: [] diff --git a/lib/desktop/linux_system_probe.dart b/lib/desktop/linux_system_probe.dart index 64e1726..177524d 100644 --- a/lib/desktop/linux_system_probe.dart +++ b/lib/desktop/linux_system_probe.dart @@ -21,12 +21,21 @@ class LinuxSystemProbe implements SystemProbe { /// Creates the default host probe. /// /// [ssExecutable] exists so a test can point at a missing binary and exercise - /// the "no `ss` on PATH" path. - const LinuxSystemProbe({this.ssExecutable = 'ss'}); + /// the "no `ss` on PATH" path. [listProc] lets a test fail the `/proc` + /// listing on demand. + const LinuxSystemProbe({this.ssExecutable = 'ss', this.listProc = _listProc}); /// Name of the socket-listing tool used to find the port owner. final String ssExecutable; + /// Lists `/proc`'s entries. + final List Function() listProc; + + /// How many `/proc` listings a process exiting mid-listing may spoil. + static const _listAttempts = 3; + + static List _listProc() => Directory('/proc').listSync(); + @override Future listenerPid(int port) async { try { @@ -56,7 +65,7 @@ class LinuxSystemProbe implements SystemProbe { @override Future>> processCmdlines() async { final cmdlines = >[]; - for (final entry in Directory('/proc').listSync()) { + for (final entry in _listProcRetrying()) { final pid = int.tryParse(p.basename(entry.path)); if (pid == null) continue; final cmdline = readCmdline(pid); @@ -65,6 +74,19 @@ class LinuxSystemProbe implements SystemProbe { return cmdlines; } + /// Dart's listing lstat()s some entries, so a pid that exits between + /// readdir and that lstat fails the whole listing. A fresh listing no + /// longer holds that pid; a few failures in a row mean a real error. + List _listProcRetrying() { + for (var attempt = 1; ; attempt++) { + try { + return listProc(); + } on PathNotFoundException { + if (attempt >= _listAttempts) rethrow; + } + } + } + @override Future portInUse(int port) async { try { diff --git a/pubspec.lock b/pubspec.lock index a6b8eee..0264562 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: android_file_picker - sha256: "04c1306eda42c23ecbf449c909f4fa05c5e66fc48cf5f994d8d08b9d45e5396b" + sha256: ec3cf2a2c7a9b2bd56747e85f80efdd994e563049dfb0981a23903acfdd58cb5 url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.2.0" archive: dependency: transitive description: @@ -118,11 +118,11 @@ packages: dependency: "direct main" description: path: crdt_sync_flutter - ref: "crdt_sync_flutter-v0.9.0" - resolved-ref: dfc5d07f5225ed15609f9709748ed2efd6cc4d1d + ref: "crdt_sync_flutter-v0.9.1" + resolved-ref: "48dc28ad97b97c787aba4479c3ce51aade6e86b5" url: "https://github.com/kuhyx/utils" source: git - version: "0.9.0" + version: "0.9.1" cross_file: dependency: transitive description: @@ -167,11 +167,11 @@ packages: dependency: transitive description: path: data_transfer_flutter - ref: "data_transfer_flutter-v0.2.2" - resolved-ref: eef7af4c86837ee82891493587ff3456297e5dea + ref: "data_transfer_flutter-v0.2.3" + resolved-ref: bb2f92f459283a29ad4864cf37704cc5f749cc6d url: "https://github.com/kuhyx/utils" source: git - version: "0.2.2" + version: "0.2.3" dbus: dependency: transitive description: @@ -233,10 +233,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "079dc46b753abbddb7f77cd87e6ed9ecc62902580707514568321bdf8e050a86" + sha256: c3780977700b8962c3b9b6a9aa4e2c988956893d70d4a4fa2d7adf4ec9b9eaee url: "https://pub.dev" source: hosted - version: "13.3.3" + version: "13.4.0" file_picker_darwin: dependency: transitive description: @@ -257,10 +257,10 @@ packages: dependency: transitive description: name: file_picker_platform_interface - sha256: "336e7168306834a2b68e6168ed768e00d3fabeac23154d5793e277ca9f97cf20" + sha256: a2ef71c4628f92a4471d424576e3bf7042b40a2683c9f9a0e3033a7fc7f7763c url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.3.0" file_picker_web: dependency: transitive description: @@ -763,6 +763,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.0" + package_info_plus: + dependency: transitive + description: + name: package_info_plus + sha256: "73ef2cd5c11a7548f9b7f6fc2a4f6113de2e64aa2a70de63feede95548822908" + url: "https://pub.dev" + source: hosted + version: "10.2.2" + package_info_plus_platform_interface: + dependency: transitive + description: + name: package_info_plus_platform_interface + sha256: db762cb2f4f25ee60fb6359773861b0f199e00b90d237bd85a76a1e806b46ef4 + url: "https://pub.dev" + source: hosted + version: "4.1.0" path: dependency: "direct main" description: @@ -1060,11 +1076,11 @@ packages: dependency: "direct main" description: path: sync_settings_ui - ref: "sync_settings_ui-v0.8.3" - resolved-ref: dde5566b2c6eb38a8e1e58a4252925f3baca8ad1 + ref: "sync_settings_ui-v0.8.4" + resolved-ref: "15ef5b44f186cea0ab163cc88cb8743c51d58247" url: "https://github.com/kuhyx/utils" source: git - version: "0.8.3" + version: "0.8.4" synchronized: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 911496b..49a3785 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.97+1 +version: 1.0.98+1 environment: sdk: ^3.12.2 @@ -38,7 +38,7 @@ dependencies: crdt_sync_flutter: git: url: https://github.com/kuhyx/utils - ref: crdt_sync_flutter-v0.9.0 + ref: crdt_sync_flutter-v0.9.1 path: crdt_sync_flutter # The following adds the Cupertino Icons font to your application. @@ -52,7 +52,7 @@ dependencies: url: https://github.com/kuhyx/utils ref: design_system-v0.4.1 path: design_system - file_picker: 13.3.3 + file_picker: 13.4.0 file_selector: 1.1.0 flutter: sdk: flutter @@ -106,7 +106,7 @@ dependencies: sync_settings_ui: git: url: https://github.com/kuhyx/utils - ref: sync_settings_ui-v0.8.3 + ref: sync_settings_ui-v0.8.4 path: sync_settings_ui url_launcher: 6.3.3 uuid: 4.6.0 diff --git a/test/port_guard_linux_probe_test.dart b/test/port_guard_linux_probe_test.dart index 4390f56..8b77c23 100644 --- a/test/port_guard_linux_probe_test.dart +++ b/test/port_guard_linux_probe_test.dart @@ -126,6 +126,30 @@ void main() { expect(cmdlines, isNotEmpty); }); + test('processCmdlines retries when a pid vanishes mid-listing', () async { + // Dart's readdir lstat()s some entries; a process exiting in between + // fails the whole listing (seen once in the suite on /proc/). + var calls = 0; + final probe = LinuxSystemProbe( + listProc: () { + if (++calls == 1) { + throw const PathNotFoundException('/proc/42', OSError('gone', 2)); + } + return Directory('/proc').listSync(); + }, + ); + expect(await probe.processCmdlines(), isNotEmpty); + expect(calls, 2); + }); + + test('processCmdlines gives up after repeated listing failures', () { + final probe = LinuxSystemProbe( + listProc: () => + throw const PathNotFoundException('/proc/42', OSError('gone', 2)), + ); + expect(probe.processCmdlines(), throwsA(isA())); + }); + test('signal terminates a real child process', () async { const probe = LinuxSystemProbe(); final child = await Process.start('sleep', ['30']);