refactor

Examples/SlackClone/AppView.swift

@@ -17,7 +17,15 @@ final class AppViewModel {
 
   var realtimeConnectionStatus: RealtimeClientStatus?
 
+  let channelStore = ChannelStore()
+  let messageStore = MessageStore()
+  let userStore = UserStore()
+
   init() {
+    channelStore.messages = messageStore
+    messageStore.channel = channelStore
+    messageStore.users = userStore
+
     Task {
       for await (event, session) in supabase.auth.authStateChanges {
         Logger.main.debug("AuthStateChange: \(event.rawValue)")
@@ -27,15 +35,15 @@ final class AppViewModel {
         self.session = session
 
         if session == nil {
-          for subscription in supabase.channels {
+          for subscription in await supabase.channels {
             await subscription.unsubscribe()
           }
         }
       }
     }
 
     Task {
-      for await status in supabase.realtimeV2.statusChange {
+      for await status in await supabase.realtimeV2.statusChange {
         realtimeConnectionStatus = status
       }
     }
@@ -56,6 +64,9 @@ struct AppView: View {
           MessagesView(channel: channel).id(channel.id)
         }
       }
+      .environment(model.channelStore)
+      .environment(model.messageStore)
+      .environment(model.userStore)
     } else {
       AuthView()
     }

Examples/SlackClone/ChannelListView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct ChannelListView: View {
-  @Bindable var store = Dependencies.shared.channel
+  @Environment(ChannelStore.self) var store
   @Binding var channel: Channel?
 
   @State private var addChannelPresented = false
@@ -35,7 +35,6 @@ struct ChannelListView: View {
         }
       }
     }
-    .toast(state: $store.toast)
   }
 
   private var addChannelView: some View {

Examples/SlackClone/ChannelStore.swift

@@ -11,21 +11,18 @@ import Supabase
 @MainActor
 @Observable
 final class ChannelStore {
-  static let shared = ChannelStore()
-
   private(set) var channels: [Channel] = []
-  var toast: ToastState?
 
-  var messages: MessageStore { Dependencies.shared.messages }
+  var messages: MessageStore!
 
-  private init() {
+  init() {
     Task {
       channels = await fetchChannels()
 
-      let channel = supabase.channel("public:channels")
+      let channel = await supabase.channel("public:channels")
 
-      let insertions = channel.postgresChange(InsertAction.self, table: "channels")
-      let deletions = channel.postgresChange(DeleteAction.self, table: "channels")
+      let insertions = await channel.postgresChange(InsertAction.self, table: "channels")
+      let deletions = await channel.postgresChange(DeleteAction.self, table: "channels")
 
       await channel.subscribe()
 
@@ -53,7 +50,6 @@ final class ChannelStore {
         .execute()
     } catch {
       dump(error)
-      toast = .init(status: .error, title: "Error", description: error.localizedDescription)
     }
   }
 
@@ -78,22 +74,20 @@ final class ChannelStore {
       channels.append(channel)
     } catch {
       dump(error)
-      toast = .init(status: .error, title: "Error", description: error.localizedDescription)
     }
   }
 
   private func handleDeletedChannel(_ action: DeleteAction) {
     guard let id = action.oldRecord["id"]?.intValue else { return }
     channels.removeAll { $0.id == id }
-    messages.removeMessages(for: id)
+    messages?.removeMessages(for: id)
   }
 
   private func fetchChannels() async -> [Channel] {
     do {
       return try await supabase.from("channels").select().execute().value
     } catch {
       dump(error)
-      toast = .init(status: .error, title: "Error", description: error.localizedDescription)
       return []
     }
   }

Examples/SlackClone/Dependencies.swift

@@ -12,9 +12,6 @@ import Supabase
 class Dependencies {
   static let shared = Dependencies()
 
-  let channel = ChannelStore.shared
-  let users = UserStore.shared
-  let messages = MessageStore.shared
 }
 
 struct User: Codable, Identifiable, Hashable {

Examples/SlackClone/MessageStore.swift

@@ -89,25 +89,23 @@ extension Messages {
 @MainActor
 @Observable
 final class MessageStore {
-  static let shared = MessageStore()
-
   private(set) var messages: [Channel.ID: Messages] = [:]
 
   struct Section {
     var author: User
     var messages: [Message]
   }
 
-  var users: UserStore { Dependencies.shared.users }
-  var channel: ChannelStore { Dependencies.shared.channel }
+  var users: UserStore!
+  weak var channel: ChannelStore!
 
-  private init() {
+  init() {
     Task {
-      let channel = supabase.channel("public:messages")
+      let channel = await supabase.channel("public:messages")
 
-      let insertions = channel.postgresChange(InsertAction.self, table: "messages")
-      let updates = channel.postgresChange(UpdateAction.self, table: "messages")
-      let deletions = channel.postgresChange(DeleteAction.self, table: "messages")
+      let insertions = await channel.postgresChange(InsertAction.self, table: "messages")
+      let updates = await channel.postgresChange(UpdateAction.self, table: "messages")
+      let deletions = await channel.postgresChange(DeleteAction.self, table: "messages")
 
       await channel.subscribe()
 

Examples/SlackClone/MessagesView.swift

@@ -10,8 +10,8 @@ import Supabase
 import SwiftUI
 
 struct MessagesView: View {
-  let store = Dependencies.shared.messages
-  let userStore = Dependencies.shared.users
+  @Environment(MessageStore.self) var store
+  @Environment(UserStore.self) var userStore
 
   let channel: Channel
   @State private var newMessage = ""

Examples/SlackClone/UserStore.swift

@@ -12,22 +12,20 @@ import Supabase
 @MainActor
 @Observable
 final class UserStore {
-  static let shared = UserStore()
-
   private(set) var users: [User.ID: User] = [:]
   private(set) var presences: [User.ID: UserPresence] = [:]
 
-  private init() {
+  init() {
     Task {
-      let channel = supabase.channel("public:users")
-      let changes = channel.postgresChange(AnyAction.self, table: "users")
+      let channel = await supabase.channel("public:users")
+      let changes = await channel.postgresChange(AnyAction.self, table: "users")
 
-      let presences = channel.presenceChange()
+      let presences = await channel.presenceChange()
 
       await channel.subscribe()
 
       Task {
-        let statusChange = channel.statusChange
+        let statusChange = await channel.statusChange
         for await _ in statusChange.filter({ $0 == .subscribed }) {
           let userId = try await supabase.auth.session.user.id
           try await channel.track(UserPresence(userId: userId, onlineAt: Date()))

Package.swift

@@ -28,6 +28,8 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
     .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.2"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.2.2"),
+
+      .package(url: "https://github.com/grdsdev/swift-websocket", branch: "main"),
   ],
   targets: [
     .target(
@@ -122,6 +124,9 @@ let package = Package(
         .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
         "Helpers",
+
+          .product(name: "WebSocket", package: "swift-websocket"),
+          .product(name: "WebSocketFoundation", package: "swift-websocket"),
       ]
     ),
     .testTarget(

Sources/Realtime/V2/PushV2.swift

@@ -40,7 +40,7 @@ actor PushV2 {
     }
 
     do {
-      return try await withTimeout(interval: channel.socket.options().timeoutInterval) {
+      return try await withTimeout(interval: channel.socket.options.timeoutInterval) {
         await withCheckedContinuation { continuation in
           self.receivedContinuation = continuation
         }