cleanup attachments

Author: stevensJourney

Sources/PowerSync/Protocol/PowerSyncBackendConnector.swift

@@ -28,7 +28,7 @@ public protocol PowerSyncBackendConnectorProtocol: Sendable {
 /// 1. Creating credentials for connecting to the PowerSync service.
 /// 2. Applying local changes against the backend application server.
 ///
-@MainActor
+@MainActor // This class is non-final, we can use actor isolation to make it Sendable
 open class PowerSyncBackendConnector: PowerSyncBackendConnectorProtocol {
     public init() {}
 

Sources/PowerSync/attachments/AttachmentContext.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public protocol AttachmentContext: Sendable {
+public protocol AttachmentContextProtocol: Sendable {
     var db: any PowerSyncDatabaseProtocol { get }
     var tableName: String { get }
     var logger: any LoggerProtocol { get }
@@ -44,7 +44,7 @@ public protocol AttachmentContext: Sendable {
     func clearQueue() async throws
 }
 
-public extension AttachmentContext {
+public extension AttachmentContextProtocol {
     func deleteAttachment(id: String) async throws {
         _ = try await db.execute(
             sql: "DELETE FROM \(tableName) WHERE id = ?",
@@ -158,7 +158,7 @@ public extension AttachmentContext {
             parameters: [
                 AttachmentState.archived.rawValue,
                 limit,
-                maxArchivedCount,
+                maxArchivedCount
             ]
         ) { cursor in
             try Attachment.fromCursor(cursor)
@@ -224,7 +224,7 @@ public extension AttachmentContext {
 }
 
 /// Context which performs actions on the attachment records
-public actor AttachmentContextImpl: AttachmentContext {
+public actor AttachmentContext: AttachmentContextProtocol {
     public let db: any PowerSyncDatabaseProtocol
     public let tableName: String
     public let logger: any LoggerProtocol

Sources/PowerSync/attachments/AttachmentQueue.swift

@@ -6,9 +6,8 @@ public let defaultAttachmentsTableName = "attachments"
 
 public protocol AttachmentQueueProtocol: Sendable {
     var db: any PowerSyncDatabaseProtocol { get }
-    var attachmentsService: any AttachmentService { get }
+    var attachmentsService: any AttachmentServiceProtocol { get }
     var localStorage: any LocalStorageAdapter { get }
-    var syncingService: any SyncingService { get }
     var downloadAttachments: Bool { get }
 
     /// Starts the attachment sync process
@@ -226,15 +225,6 @@ public extension AttachmentQueueProtocol {
             }
         }
     }
-
-    func expireCache() async throws {
-        try await attachmentsService.withContext { context in
-            var done = false
-            repeat {
-                done = try await self.syncingService.deleteArchivedAttachments(context)
-            } while !done
-        }
-    }
 }
 
 /// Class used to implement the attachment queue
@@ -284,7 +274,7 @@ public actor AttachmentQueue: AttachmentQueueProtocol {
     public let logger: any LoggerProtocol
 
     /// Attachment service for interacting with attachment records
-    public let attachmentsService: AttachmentService
+    public let attachmentsService: AttachmentServiceProtocol
 
     private var syncStatusTask: Task<Void, Error>?
     private var cancellables = Set<AnyCancellable>()
@@ -337,7 +327,7 @@ public actor AttachmentQueue: AttachmentQueueProtocol {
             logger: self.logger,
             maxArchivedCount: archivedCacheLimit
         )
-        syncingService = SyncingServiceImpl(
+        syncingService = SyncingService(
             remoteStorage: self.remoteStorage,
             localStorage: self.localStorage,
             attachmentsService: attachmentsService,
@@ -448,6 +438,15 @@ public actor AttachmentQueue: AttachmentQueueProtocol {
         }
     }
 
+    public func expireCache() async throws {
+        try await attachmentsService.withContext { context in
+            var done = false
+            repeat {
+                done = try await self.syncingService.deleteArchivedAttachments(context)
+            } while !done
+        }
+    }
+
     /// Verifies attachment records are present in the filesystem
     private func verifyAttachments(context: AttachmentContext) async throws {
         let attachments = try await context.getAttachments()

Sources/PowerSync/attachments/AttachmentService.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public protocol AttachmentService: Sendable {
+public protocol AttachmentServiceProtocol: Sendable {
     /// Watches for changes to the attachments table.
     func watchActiveAttachments() async throws -> AsyncThrowingStream<[String], Error>
 
@@ -11,7 +11,7 @@ public protocol AttachmentService: Sendable {
 }
 
 /// Service which manages attachment records.
-actor AttachmentServiceImpl: AttachmentService {
+actor AttachmentServiceImpl: AttachmentServiceProtocol {
     private let db: any PowerSyncDatabaseProtocol
     private let tableName: String
     private let logger: any LoggerProtocol
@@ -29,7 +29,7 @@ actor AttachmentServiceImpl: AttachmentService {
         self.db = db
         self.tableName = tableName
         self.logger = logger
-        context = AttachmentContextImpl(
+        context = AttachmentContext(
             db: db,
             tableName: tableName,
             logger: logger,
@@ -63,7 +63,10 @@ actor AttachmentServiceImpl: AttachmentService {
         }
     }
 
-    public func withContext<R: Sendable>(callback: @Sendable @escaping (AttachmentContext) async throws -> R) async throws -> R {
+    public func withContext<R: Sendable>(
+        callback: @Sendable @escaping (AttachmentContext
+        ) async throws -> R) async throws -> R
+    {
         try await callback(context)
     }
 }

Sources/PowerSync/attachments/FileManagerLocalStorage.swift

@@ -4,9 +4,13 @@ import Foundation
  * Implementation of LocalStorageAdapter using FileManager
  */
 public actor FileManagerStorageAdapter: LocalStorageAdapter {
-    private let fileManager = FileManager.default
+    private let fileManager: FileManager
 
-    public init() {}
+    public init(
+        fileManager: FileManager? = nil
+    ) {
+        self.fileManager = fileManager ?? FileManager.default
+    }
 
     public func saveFile(filePath: String, data: Data) async throws -> Int64 {
         return try await Task {

Sources/PowerSync/attachments/SyncingService.swift

@@ -6,7 +6,7 @@ import Foundation
 /// This watches for changes to active attachments and performs queued
 /// download, upload, and delete operations. Syncs can be triggered manually,
 /// periodically, or based on database changes.
-public protocol SyncingService: Sendable {
+public protocol SyncingServiceProtocol: Sendable {
     /// Starts periodic syncing of attachments.
     ///
     /// - Parameter period: The time interval in seconds between each sync.
@@ -26,10 +26,10 @@ public protocol SyncingService: Sendable {
     func deleteArchivedAttachments(_ context: AttachmentContext) async throws -> Bool
 }
 
-actor SyncingServiceImpl: SyncingService {
+public actor SyncingService: SyncingServiceProtocol {
     private let remoteStorage: RemoteStorageAdapter
     private let localStorage: LocalStorageAdapter
-    private let attachmentsService: AttachmentService
+    private let attachmentsService: AttachmentServiceProtocol
     private let getLocalUri: @Sendable (String) async -> String
     private let errorHandler: SyncErrorHandler?
     private let syncThrottle: TimeInterval
@@ -54,7 +54,7 @@ actor SyncingServiceImpl: SyncingService {
     public init(
         remoteStorage: RemoteStorageAdapter,
         localStorage: LocalStorageAdapter,
-        attachmentsService: AttachmentService,
+        attachmentsService: AttachmentServiceProtocol,
         logger: any LoggerProtocol,
         getLocalUri: @Sendable @escaping (String) async -> String,
         errorHandler: SyncErrorHandler? = nil,
@@ -106,23 +106,23 @@ actor SyncingServiceImpl: SyncingService {
     }
 
     /// Cleans up internal resources and cancels any ongoing syncing.
-    func close() async throws {
+    public func close() async throws {
         try guardClosed()
 
         try await _stopSync()
         closed = true
     }
 
     /// Triggers a sync operation. Can be called manually.
-    func triggerSync() async throws {
+    public func triggerSync() async throws {
         try guardClosed()
         syncTriggerSubject.send(())
     }
 
     /// Deletes attachments marked as archived that exist on local storage.
     ///
     /// - Returns: `true` if any deletions occurred, `false` otherwise.
-    func deleteArchivedAttachments(_ context: AttachmentContext) async throws -> Bool {
+    public func deleteArchivedAttachments(_ context: AttachmentContext) async throws -> Bool {
         return try await context.deleteArchivedAttachments { pendingDelete in
             for attachment in pendingDelete {
                 guard let localUri = attachment.localUri else { continue }
@@ -149,7 +149,7 @@ actor SyncingServiceImpl: SyncingService {
                 .sink { _ in continuation.yield(()) }
 
             continuation.onTermination = { _ in
-                continuation.finish()
+                cancellable.cancel()
             }
             self.cancellables.insert(cancellable)
         }