[green] fence editor transfers by revision and connection session

Signed-off-by: Viwat Vchirawongkwin <viwat.v@chula.ac.th>

Author: yyods

app/lib/editor/program_actions.dart

@@ -133,8 +133,16 @@ class ProgramActions {
     required String source,
     ProgressCb? onProgress,
   }) async {
+    final Connection connection = _ref.read(connectionProvider);
+    final Object stamp = connectionSessionStampOf(connection);
     await saveSource(path: path, source: source, onProgress: onProgress);
-    await _ref.read(connectionProvider).runFile(path);
+    if (!identical(_ref.read(connectionProvider), connection) ||
+        !identical(connectionSessionStampOf(connection), stamp)) {
+      // The upload may have completed on the previous attachment. Do not send
+      // the second verb to a replacement board.
+      throw const NotConnectedException();
+    }
+    await connection.runFile(path);
   }
 
   /// Writes a Python file and then its raw JSON companion commit record.

app/lib/editor/run_controller.dart

@@ -117,10 +117,15 @@ class RunController {
     }
     final EditorDocument uploadedDocument = _ref.read(editorDocumentProvider);
     final String path = boardPathForDocument(uploadedDocument);
+    final int epoch = _ref.read(editorDocumentEpochProvider);
+    final Connection connection = _connection;
+    final Object stamp = connectionSessionStampOf(connection);
     await _ref
         .read(programActionsProvider)
         .runSourceFile(path: path, source: cleaned);
-    if (_ref.read(editorDocumentProvider) == uploadedDocument) {
+    if (_ref.read(editorDocumentEpochProvider) == epoch &&
+        identical(_connection, connection) &&
+        identical(connectionSessionStampOf(connection), stamp)) {
       _ref.read(editorDocumentProvider.notifier).markSaved(boardPath: path);
     }
   }

app/lib/editor/save_controller.dart

@@ -25,6 +25,7 @@ library;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pyble/pble/pble.dart';
+import 'package:pyble/app/providers.dart';
 
 import 'editor_document.dart';
 import 'program_actions.dart';
@@ -73,14 +74,19 @@ class SaveController {
       doc = _ref.read(editorDocumentProvider);
     }
 
+    final int epoch = _ref.read(editorDocumentEpochProvider);
+    final Connection connection = _ref.read(connectionProvider);
+    final Object stamp = connectionSessionStampOf(connection);
     await _ref
         .read(programActionsProvider)
         .saveSource(path: path, source: cleaned, onProgress: onProgress);
 
     // Only after CRC-verified success, and only if this is still the document
     // whose bytes were uploaded: clear dirty and adopt the path. A user may edit
     // or open another document while a BLE transfer is in flight.
-    if (_ref.read(editorDocumentProvider) == doc) {
+    if (_ref.read(editorDocumentEpochProvider) == epoch &&
+        identical(_ref.read(connectionProvider), connection) &&
+        identical(connectionSessionStampOf(connection), stamp)) {
       _ref.read(editorDocumentProvider.notifier).markSaved(boardPath: path);
     }
     return path;

app/lib/files/file_explorer_controller.dart

@@ -493,15 +493,20 @@ class FileExplorerController extends Notifier<FileExplorerState> {
   Future<void> openInEditor(String fileName) async {
     final String path = _join(state.cwd, fileName);
     final int epoch = ++_openEpoch;
-    final EditorDocument before = ref.read(editorDocumentProvider);
+    final int documentEpoch = ref.read(editorDocumentEpochProvider);
+    final Connection connection = _conn;
+    final Object stamp = connectionSessionStampOf(connection);
     try {
-      final Uint8List bytes = await _conn.getFile(
+      final Uint8List bytes = await connection.getFile(
         path,
         onProgress: (TransferProgress progress) {
           if (epoch == _openEpoch) _onProgress(progress);
         },
       );
-      if (epoch != _openEpoch || ref.read(editorDocumentProvider) != before) {
+      if (_disposed ||
+          epoch != _openEpoch ||
+          ref.read(editorDocumentEpochProvider) != documentEpoch ||
+          !_isCapturedSessionCurrent(connection: connection, stamp: stamp)) {
         return;
       }
       state = state.copyWith(clearProgress: true);
@@ -562,14 +567,18 @@ class FileExplorerController extends Notifier<FileExplorerState> {
   Future<void> uploadCurrentBuffer() async {
     final EditorDocument doc = ref.read(editorDocumentProvider);
     final String path = _join(state.cwd, doc.name);
+    final int epoch = ref.read(editorDocumentEpochProvider);
+    final Connection connection = _conn;
+    final Object stamp = connectionSessionStampOf(connection);
     try {
-      await _conn.putFile(
+      await connection.putFile(
         path,
         Uint8List.fromList(utf8.encode(doc.content)),
         onProgress: _onProgress,
       );
       state = state.copyWith(clearProgress: true);
-      if (ref.read(editorDocumentProvider) == doc) {
+      if (ref.read(editorDocumentEpochProvider) == epoch &&
+          _isCapturedSessionCurrent(connection: connection, stamp: stamp)) {
         ref.read(editorDocumentProvider.notifier).markSaved(boardPath: path);
       }
       await refresh();