feat: Add Pocket device support and fix conversation discard logic

yconst · yconst · commit ed04dc9af18a · 2025-11-12T14:35:41.000-08:00
- Add complete Pocket device integration with BLE communication
- Add Pocket MP3 download and WAL sync service
- Add Pocket recordings UI page
- Add ConversationSource.pocket enum value
- Fix: Skip discard check for Pocket recordings (user-initiated)
- Add pocket router endpoint for MP3 uploads
- Add Pocket device models and connection handling
- Update device detection and provider for Pocket support
diff --git a/app/lib/backend/http/api/conversations.dart b/app/lib/backend/http/api/conversations.dart
@@ -329,8 +329,14 @@ Future<List<ServerConversation>> sendStorageToBackend(File file, String sdCardDa
 
 Future<SyncLocalFilesResponse> syncLocalFiles(List<File> files) async {
   try {
+    // Check if this is a Pocket MP3 file (filename contains "pocket_mp3")
+    final isPocketMp3 = files.isNotEmpty && files.first.path.contains('pocket_mp3');
+    final endpoint = isPocketMp3 ? 'v1/pocket/upload-mp3' : 'v1/sync-local-files';
+    
+    debugPrint('Syncing ${files.length} file(s) to $endpoint (isPocketMp3: $isPocketMp3)');
+    
     var response = await makeMultipartApiCall(
-      url: '${Env.apiBaseUrl}v1/sync-local-files',
+      url: '${Env.apiBaseUrl}$endpoint',
       files: files,
     );
 
diff --git a/app/lib/backend/http/api/pocket_sync.dart b/app/lib/backend/http/api/pocket_sync.dart
@@ -0,0 +1,56 @@
+import 'dart:io';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
+import 'package:omi/backend/http/shared.dart';
+import 'package:omi/backend/preferences.dart';
+
+/// Upload Pocket MP3 file to backend for conversion
+Future<bool> uploadPocketMp3({
+  required String filePath,
+  required String deviceId,
+  required int timerStart,
+}) async {
+  try {
+    debugPrint('Uploading Pocket MP3: $filePath');
+    
+    final file = File(filePath);
+    if (!await file.exists()) {
+      debugPrint('MP3 file not found: $filePath');
+      return false;
+    }
+    
+    final fileBytes = await file.readAsBytes();
+    final fileName = filePath.split('/').last;
+    
+    final url = Uri.parse('${getApiBaseUrl()}/v1/pocket/upload-mp3');
+    
+    final request = http.MultipartRequest('POST', url);
+    request.headers['Authorization'] = await getAuthHeader();
+    
+    // Add file
+    request.files.add(http.MultipartFile.fromBytes(
+      'file',
+      fileBytes,
+      filename: fileName,
+    ));
+    
+    // Add metadata
+    request.fields['device_id'] = deviceId;
+    request.fields['timer_start'] = timerStart.toString();
+    
+    debugPrint('Sending MP3 upload request to: $url');
+    final response = await request.send();
+    final responseBody = await response.stream.bytesToString();
+    
+    if (response.statusCode == 200) {
+      debugPrint('MP3 upload successful: $fileName');
+      return true;
+    } else {
+      debugPrint('MP3 upload failed: ${response.statusCode} - $responseBody');
+      return false;
+    }
+  } catch (e) {
+    debugPrint('Error uploading MP3: $e');
+    return false;
+  }
+}
diff --git a/app/lib/pages/pocket/pocket_device_page.dart b/app/lib/pages/pocket/pocket_device_page.dart
@@ -434,31 +434,6 @@ class _PocketDevicePageState extends State<PocketDevicePage> {
           child: Row(
             children: [
               Expanded(
-                child: OutlinedButton.icon(
-                  onPressed: _isLoading || _isSyncing
-                      ? null
-                      : () {
-                          if (_selectedRecordings.isNotEmpty) {
-                            setState(() {
-                              _selectedRecordings.clear();
-                            });
-                          } else if (_recordings.isNotEmpty) {
-                            setState(() {
-                              _selectedRecordings.addAll(_recordings.map((r) => r.recordingId));
-                            });
-                          }
-                        },
-                  style: OutlinedButton.styleFrom(
-                    foregroundColor: Colors.white,
-                    side: const BorderSide(color: Colors.white54),
-                  ),
-                  icon: Icon(_selectedRecordings.isEmpty ? Icons.check_box_outline_blank : Icons.check_box),
-                  label: Text(_selectedRecordings.isEmpty ? 'Select All' : 'Deselect All'),
-                ),
-              ),
-              const SizedBox(width: 16),
-              Expanded(
-                flex: 2,
                 child: ElevatedButton.icon(
                   onPressed: _isLoading || _isDownloading || _isSyncing || _recordings.isEmpty
                       ? null
diff --git a/app/lib/services/devices/pocket_connection.dart b/app/lib/services/devices/pocket_connection.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:flutter/foundation.dart';
@@ -17,9 +18,9 @@ class PocketDeviceConnection extends DeviceConnection {
     65, 80, 80, 38, 83, 75, 38, 101, 121, 54, 114, 66, 80, 88, 80, 80, 105, 97, 86, 67, 103, 105, 84
   ]; // "APP&SK&ey6rBPXPPiaVCgiT"
 
-  // MP3 Frame marker
-  static const List<int> mp3Marker = [0xFF, 0xF3, 0x48, 0xC4];
-  static const int mp3FrameSize = 144;
+  // MP3 frame marker and size (from protocol analysis)
+  static const List<int> mp3Marker = [0xFF, 0xF3, 0x48, 0xC4]; // MP3 frame marker (4 bytes)
+  static const int mp3FrameSize = 144; // bytes per frame
 
   // Response buffers
   final List<int> _responseBuffer = [];
@@ -188,9 +189,9 @@ class PocketDeviceConnection extends DeviceConnection {
           if (parts.length >= 4) {
             final used = int.parse(parts[2]);
             final total = int.parse(parts[3]);
-            debugPrint('Pocket: Storage response - used: $used KB, total: $total KB');
-            // Convert KB to bytes
-            return (used * 1024, total * 1024);
+            debugPrint('Pocket: Storage response - used: $used MB, total: $total MB');
+            // Convert MB to bytes
+            return (used * 1024 * 1024, total * 1024 * 1024);
           }
         } catch (e) {
           debugPrint('Pocket: Error parsing storage: $e');
@@ -276,36 +277,34 @@ class PocketDeviceConnection extends DeviceConnection {
       await Future.delayed(const Duration(seconds: 30));
       
       // Find MP3 data in buffer
+      debugPrint('Pocket: Response buffer size: ${_responseBuffer.length} bytes');
+      debugPrint('Pocket: First 20 bytes of buffer: ${_responseBuffer.take(20).toList()}');
+      
       final audioStart = _findMarker(_responseBuffer, mp3Marker);
       if (audioStart < 0) {
         debugPrint('Pocket: MP3 marker not found in response');
         return null;
       }
       
+      debugPrint('Pocket: MP3 marker found at position $audioStart');
       final audioData = _responseBuffer.sublist(audioStart);
+      debugPrint('Pocket: Audio data size: ${audioData.length} bytes');
+      debugPrint('Pocket: First 20 bytes of audio data: ${audioData.take(20).toList()}');
       
-      // Verify and extract valid MP3 frames
-      int packetCount = 0;
-      int pos = 0;
-      
-      while (pos < audioData.length - mp3FrameSize) {
-        if (_matchesMarker(audioData, pos, mp3Marker)) {
-          packetCount++;
-          pos += mp3FrameSize;
-        } else {
-          break;
+      // Check if there's any non-zero data
+      int nonZeroCount = 0;
+      for (int i = 0; i < min(1000, audioData.length); i++) {
+        if (audioData[i] != 0 && audioData[i] != 0xFF && audioData[i] != 0xF3 && audioData[i] != 0x48 && audioData[i] != 0xC4) {
+          nonZeroCount++;
         }
       }
+      debugPrint('Pocket: Non-zero bytes in first 1000: $nonZeroCount');
       
-      if (packetCount == 0) {
-        debugPrint('Pocket: No valid MP3 frames found');
-        return null;
-      }
-      
-      final validData = audioData.sublist(0, packetCount * mp3FrameSize);
-      debugPrint('Pocket: Downloaded ${validData.length} bytes ($packetCount frames)');
+      // Return ALL audio data after the first marker (like Python does)
+      // Python doesn't validate frame-by-frame, it just saves everything
+      debugPrint('Pocket: Downloaded ${audioData.length} bytes of MP3 data');
       
-      return Uint8List.fromList(validData);
+      return Uint8List.fromList(audioData);
     } catch (e) {
       debugPrint('Pocket: Error downloading recording: $e');
       return null;
diff --git a/app/lib/services/pocket_wal_service.dart b/app/lib/services/pocket_wal_service.dart
@@ -7,9 +7,10 @@ import 'package:omi/services/wals.dart';
 import 'package:omi/utils/wal_file_manager.dart';
 import 'package:path_provider/path_provider.dart';
 
-/// Service to convert Pocket MP3 recordings to WAL files for processing
+/// Service to save Pocket MP3 recordings for backend conversion
 class PocketWalService {
   /// Create a WAL file from a Pocket recording's MP3 data
+  /// Saves raw MP3 file for backend conversion
   /// Returns the created WAL object
   static Future<Wal> createWalFromPocketRecording({
     required PocketRecording recording,
@@ -23,28 +24,27 @@ class PocketWalService {
     // Calculate duration in seconds
     final durationSeconds = recording.durationSeconds;
     
-    // Save MP3 file directly - backend will handle conversion
-    final directory = await getApplicationDocumentsDirectory();
+    // Save raw MP3 file (backend will convert)
     final cleanDeviceId = device.id.replaceAll(RegExp(r'[^a-zA-Z0-9]'), "").toLowerCase();
-    final mp3Filename = 'pocket_${cleanDeviceId}_$timerStart.mp3';
-    final fullPath = '${directory.path}/$mp3Filename';
+    final mp3Filename = 'audio_${cleanDeviceId}_pocket_mp3_$timerStart.mp3';
     
-    final file = File(fullPath);
-    await file.writeAsBytes(mp3Data);
+    debugPrint('Saving Pocket MP3 for backend conversion: $mp3Filename');
+    final docsDir = await getApplicationDocumentsDirectory();
+    final mp3Path = '${docsDir.path}/$mp3Filename';
+    final mp3File = File(mp3Path);
+    await mp3File.writeAsBytes(mp3Data);
     
-    debugPrint('Saved Pocket MP3: $fullPath');
+    debugPrint('Saved MP3 to: $mp3Path');
     
-    // Create WAL object
-    // Note: We use opus codec as a placeholder since the backend will handle MP3
-    // The actual audio format doesn't matter for the sync process
+    // Create WAL object with MP3 codec
     final wal = Wal(
       timerStart: timerStart,
-      codec: BleAudioCodec.opus, // Placeholder codec
+      codec: BleAudioCodec.pcm8, // Use pcm8 as placeholder for MP3 (backend will handle)
       seconds: durationSeconds,
-      sampleRate: 16000, // Standard sample rate
-      channel: 1, // Mono
-      status: WalStatus.miss, // Mark as missing/ready to sync
-      storage: WalStorage.disk, // Store as phone storage (not SD card)
+      sampleRate: 16000,
+      channel: 1,
+      status: WalStatus.miss,
+      storage: WalStorage.disk,
       filePath: mp3Filename, // Store only filename, not full path
       device: device.id,
       deviceModel: 'Pocket',
diff --git a/backend/main.py b/backend/main.py
@@ -17,6 +17,7 @@
     users,
     trends,
     sync,
+    pocket,
     apps,
     custom_auth,
     payment,
@@ -63,6 +64,7 @@
 
 app.include_router(firmware.router)
 app.include_router(sync.router)
+app.include_router(pocket.router)
 
 app.include_router(apps.router)
 app.include_router(custom_auth.router)
diff --git a/backend/models/conversation.py b/backend/models/conversation.py
@@ -228,6 +228,7 @@ class ConversationSource(str, Enum):
     workflow = 'workflow'
     sdcard = 'sdcard'
     external_integration = 'external_integration'
+    pocket = 'pocket'
 
 
 class ConversationVisibility(str, Enum):
diff --git a/backend/routers/pocket.py b/backend/routers/pocket.py
diff --git a/backend/utils/conversations/process_conversation.py b/backend/utils/conversations/process_conversation.py
