Merge branch 'attachment-package-refactor' of github.com:powersync-ja/powersync.dart into attachment-package-refactor

Author: dean-journeyapps

demos/supabase-todolist-new-attachment/lib/attachments/photo_widget.dart

@@ -36,7 +36,6 @@ class _PhotoWidgetState extends State<PhotoWidget> {
   final log = Logger('PhotoWidget');
 
   Future<_ResolvedPhotoState> _getPhotoState(photoId) async {
-    log.info('getPhotoState: $photoId');
     if (photoId == null) {
       return _ResolvedPhotoState(photoPath: null, fileExists: false);
     }
@@ -45,25 +44,13 @@ class _PhotoWidgetState extends State<PhotoWidget> {
 
     bool fileExists = await File(photoPath).exists();
 
-    log.info('fileExists: $fileExists');
-
     final row = await attachmentQueue.db
         .getOptional('SELECT * FROM attachments_queue WHERE id = ?', [photoId]);
 
     log.info('row: $row');
 
     if (row != null) {
       Attachment attachment = Attachment.fromRow(row);
-      // Attachment attachment = Attachment.fromMap(row);
-
-      // Log as JSON using logging package
-      // ignore: avoid_print
-      attachmentQueue.logger.info({
-        'event': 'attachment_object',
-        'photoPath': photoPath,
-        'fileExists': fileExists,
-        'attachment': '',
-      });
 
       return _ResolvedPhotoState(
           photoPath: photoPath, fileExists: fileExists, attachment: attachment);

demos/supabase-todolist-new-attachment/lib/attachments/remote_storage_adapter.dart

@@ -25,7 +25,7 @@ class SupabaseStorageAdapter implements RemoteStorage {
               fileOptions: FileOptions(
                   contentType:
                       attachment.mediaType ?? 'application/octet-stream'));
-      print('uploadFile: ${attachment.filename}');
+
     } catch (error) {
       throw Exception(error);
     } finally {

demos/supabase-todolist-new-attachment/pubspec.lock

@@ -566,14 +566,14 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.14.1"
+    version: "1.15.0"
   powersync_attachments_helper:
     dependency: "direct overridden"
     description:
       path: "../../packages/powersync_attachments_helper"
       relative: true
     source: path
-    version: "0.6.18+10"
+    version: "0.6.18+11"
   powersync_attachments_stream:
     dependency: "direct main"
     description:
@@ -587,14 +587,14 @@ packages:
       path: "../../packages/powersync_core"
       relative: true
     source: path
-    version: "1.4.1"
+    version: "1.5.0"
   powersync_flutter_libs:
     dependency: "direct overridden"
     description:
       path: "../../packages/powersync_flutter_libs"
       relative: true
     source: path
-    version: "0.4.9"
+    version: "0.4.10"
   pub_semver:
     dependency: transitive
     description:

packages/powersync_attachments_stream/lib/powersync_attachments_stream.dart

@@ -1,7 +1,4 @@
 /// Default exports for native platforms (dart:io). For web, use 'common.dart'.
 export 'common.dart';
 export 'src/storage/io_local_storage.dart';
-export 'src/attachment_queue_service.dart';
-export 'src/implementations/attachment_service.dart';
-export 'src/implementations/attachment_context.dart';
-export 'src/abstractions/remote_storage.dart';
+export 'src/attachment_queue_service.dart';

packages/powersync_attachments_stream/lib/src/attachment.dart

@@ -15,10 +15,8 @@ enum AttachmentState {
   synced,
 
   /// The attachment is archived and no longer actively synchronized.
-  archived,
-}
+  archived;
 
-extension AttachmentStateX on AttachmentState {
   static AttachmentState fromInt(int value) {
     if (value < 0 || value >= AttachmentState.values.length) {
       throw ArgumentError('Invalid value for AttachmentState: $value');
@@ -54,22 +52,6 @@ class Attachment {
     this.metaData,
   });
 
-  /// Factory constructor to create an Attachment from a database map.
-  /// [map] should be a `Map<String, dynamic>` from your database query.
-  // factory Attachment.fromMap(Map<String, dynamic> map) {
-  //   return Attachment(
-  //     id: map['id'] as String,
-  //     timestamp: map['timestamp'] as int? ?? 0,
-  //     filename: map['filename'] as String,
-  //     localUri: map['local_uri'] as String?,
-  //     mediaType: map['media_type'] as String?,
-  //     size: map['size'] as int?,
-  //     state: AttachmentStateX.fromInt(map['state'] as int),
-  //     hasSynced: (map['has_synced'] as int? ?? 0) > 0,
-  //     metaData: map['meta_data'] as String?,
-  //   );
-  // }
-
   factory Attachment.fromRow(Row row) {
     return Attachment(
       id: row['id'] as String,
@@ -78,15 +60,8 @@ class Attachment {
       localUri: row['local_uri'] as String?,
       mediaType: row['media_type'] as String?,
       size: row['size'] as int?,
-      // state: AttachmentState.queuedDownload,
-      state: AttachmentStateX.fromInt(row['state'] as int),
-      // state: AttachmentStateX.fromInt(row['state'] as int? ?? AttachmentState.queuedDownload.index),
-      // state: AttachmentState.values.firstWhere(
-      //   (e) => e.index == row['state'],
-      //   orElse: () => AttachmentState.queuedDownload,
-      // ),
+      state: AttachmentState.fromInt(row['state'] as int),
       hasSynced: (row['has_synced'] as int? ?? 0) > 0,
-      // metaData: 'test',
       metaData: row['meta_data']?.toString(),
     );
   }
@@ -115,26 +90,6 @@ class Attachment {
       metaData: metaData ?? this.metaData,
     );
   }
-
-  /// Converts this Attachment to a JSON-compatible map.
-  Map<String, dynamic> toJson() {
-    try {
-      return {
-        'id': id,
-        'timestamp': timestamp,
-        'filename': filename,
-        'state': state.index,
-        'local_uri': localUri,
-        'media_type': mediaType,
-        'size': size,
-        'has_synced': hasSynced ? 1 : 0,
-        'meta_data': metaData,
-      };
-    } catch (e) {
-      print('toJson error: $e');
-      return {};
-    }
-  }
 }
 
 class AttachmentsQueueTable extends Table {

packages/powersync_attachments_stream/lib/src/attachment_queue_service.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 import 'package:logging/logging.dart';
+import 'package:powersync_core/powersync_core.dart';
 import 'package:sqlite_async/mutex.dart';
 import 'attachment.dart';
 import 'abstractions/attachment_service.dart';
@@ -33,7 +34,7 @@ class WatchedAttachmentItem {
 /// Class used to implement the attachment queue.
 /// Requires a database client, remote storage adapter, and an attachment directory name.
 class AttachmentQueue {
-  final dynamic db;
+  final PowerSyncDatabase db;
   final RemoteStorage remoteStorage;
   final String attachmentsDirectory;
   final Stream<List<WatchedAttachmentItem>> Function() watchAttachments;
@@ -43,7 +44,6 @@ class AttachmentQueue {
   final Duration syncInterval;
   final int archivedCacheLimit;
   final Duration syncThrottleDuration;
-  final List<String>? subdirectories;
   final bool downloadAttachments;
   final Logger logger;
 
@@ -66,7 +66,6 @@ class AttachmentQueue {
     this.syncInterval = const Duration(seconds: 30),
     this.archivedCacheLimit = 100,
     this.syncThrottleDuration = const Duration(seconds: 1),
-    this.subdirectories,
     this.downloadAttachments = true,
     Logger? logger,
   }) : logger = logger ?? Logger('AttachmentQueue') {
@@ -101,13 +100,8 @@ class AttachmentQueue {
 
       await _stopSyncingInternal();
 
-      logger.info('startSync attachmentsDirectory: $attachmentsDirectory');
       await localStorage.makeDir(attachmentsDirectory);
 
-      subdirectories?.forEach((subdirectory) async {
-        await localStorage.makeDir('$attachmentsDirectory/$subdirectory');
-      });
-
       await attachmentsService.withContext((context) async {
         await _verifyAttachments(context);
       });
@@ -197,8 +191,16 @@ class AttachmentQueue {
               filename: filename,
               state: AttachmentState.queuedDownload,
               metaData: item.metaData,
+              // hasSynced: existingQueueItem.hasSynced;
             ),
           );
+
+          // attachmentUpdates.add(
+          //   existingQueueItem.copyWith(
+          //     filename: filename,
+          //     state: AttachmentState.queuedDownload,
+          //   ),
+          // );
         } else if (existingQueueItem.state == AttachmentState.archived) {
           // The attachment is present again. Need to queue it for sync.
           if (existingQueueItem.hasSynced) {

packages/powersync_attachments_stream/lib/src/implementations/attachment_context.dart

@@ -47,27 +47,9 @@ class AttachmentContextImpl implements AttachmentContext {
 
   @override
   Future<Attachment> saveAttachment(Attachment attachment) async {
-    Attachment updatedRecord = attachment.copyWith(
-      timestamp: DateTime.now().millisecondsSinceEpoch,
-    );
-
-    await db.execute(
-      '''
-      INSERT OR REPLACE INTO $table
-      (id, timestamp, filename, local_uri, media_type, size, state) VALUES (?, ?, ?, ?, ?, ?, ?)
-    ''',
-      [
-        updatedRecord.id,
-        updatedRecord.timestamp,
-        updatedRecord.filename,
-        updatedRecord.localUri,
-        updatedRecord.mediaType,
-        updatedRecord.size,
-        updatedRecord.state.index,
-      ],
-    );
-
-    return updatedRecord;
+    return await db.writeLock((ctx) async {
+      return await upsertAttachment(attachment, ctx);
+    });
   }
 
   @override
@@ -76,28 +58,11 @@ class AttachmentContextImpl implements AttachmentContext {
       log.info('No attachments to save.');
       return;
     }
-
-    final updatedRecords = attachments.map((attachment) {
-      final updated = attachment.copyWith(
-        timestamp: DateTime.now().millisecondsSinceEpoch,
-      );
-      return [
-        updated.id,
-        updated.filename,
-        updated.localUri,
-        updated.mediaType,
-        updated.size,
-        updated.timestamp,
-        updated.state.index,
-      ];
-    }).toList();
-
-    log.info('Saving ${updatedRecords.length} attachments...');
-
-    await db.executeBatch('''
-      INSERT OR REPLACE INTO $table
-      (id, filename, local_uri, media_type, size, timestamp, state) VALUES (?, ?, ?, ?, ?, ?, ?)
-    ''', updatedRecords);
+    await db.writeTransaction((tx) async {
+      for (final attachment in attachments) {
+        await upsertAttachment(attachment, tx);
+      }
+    });
   }
 
   @override
@@ -181,11 +146,11 @@ class AttachmentContextImpl implements AttachmentContext {
         attachment.mediaType,
         attachment.size,
         attachment.state.index,
-        // attachment.state,
         attachment.hasSynced ? 1 : 0,
         attachment.metaData,
       ],
     );
+
     return attachment;
   }
 }

packages/powersync_attachments_stream/lib/src/sync/syncing_service.dart

@@ -172,9 +172,6 @@ class SyncingService {
       if (attachment.localUri == null) {
         throw Exception('No localUri for attachment $attachment');
       }
-      _log.info(
-        'SyncingService: Calling remoteStorage.uploadFile for ${attachment.id}',
-      );
       await remoteStorage.uploadFile(
         localStorage.readFile(attachment.localUri!),
         attachment,
@@ -211,9 +208,6 @@ class SyncingService {
     );
     final attachmentPath = await getLocalUri(attachment.filename);
     try {
-      _log.info(
-        'SyncingService: Calling remoteStorage.downloadFile for ${attachment.id}',
-      );
       final fileStream = await remoteStorage.downloadFile(attachment);
       await localStorage.saveFile(
         attachmentPath,
@@ -222,6 +216,9 @@ class SyncingService {
       _log.info(
         'SyncingService: Successfully downloaded file "${attachment.id}"',
       );
+
+      _log.info('downloadAttachmentXY $attachment');
+
       return attachment.copyWith(
         localUri: attachmentPath,
         state: AttachmentState.synced,

packages/powersync_attachments_stream/pubspec.lock

@@ -26,7 +26,7 @@ packages:
     source: hosted
     version: "2.7.0"
   async:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: async
       sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
@@ -398,10 +398,9 @@ packages:
   powersync_core:
     dependency: "direct main"
     description:
-      name: powersync_core
-      sha256: d8ae292bc77f0a96f44c6cc2911d1b781760a87a919e5045e75458cba83bb759
-      url: "https://pub.dev"
-    source: hosted
+      path: "../powersync_core"
+      relative: true
+    source: path
     version: "1.5.0"
   pub_semver:
     dependency: transitive
@@ -568,6 +567,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.8"
+  test_descriptor:
+    dependency: "direct dev"
+    description:
+      name: test_descriptor
+      sha256: "9ce468c97ae396e8440d26bb43763f84e2a2a5331813ee5a397cb4da481aaf9a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   typed_data:
     dependency: transitive
     description:

packages/powersync_attachments_stream/pubspec.yaml

@@ -12,7 +12,6 @@ dependencies:
     sdk: flutter
   path: ^1.8.0
   async: ^2.11.0
-
   powersync_core: ^1.4.1
   logging: ^1.2.0
   sqlite_async: ^0.11.0
@@ -21,5 +20,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
   test: ^1.25.15
+  test_descriptor: ^2.0.2
+  flutter_lints: ^5.0.0