Adds support for registering middleware after construction and removing that middleware

Author: toadzky

Reactor.xcodeproj/project.pbxproj

@@ -28,7 +28,7 @@
 		OBJ_15 /* Reactor.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Reactor.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		OBJ_16 /* ReactorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = ReactorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
-		OBJ_9 /* Reactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reactor.swift; sourceTree = "<group>"; };
+		OBJ_9 /* Reactor.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = Reactor.swift; sourceTree = "<group>"; tabWidth = 4; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

Sources/Reactor.swift

@@ -41,6 +41,7 @@ extension Middleware {
 }
 
 public struct Middlewares<StateType: State> {
+    let id: UInt64
     private(set) var middleware: AnyMiddleware
 }
 
@@ -80,16 +81,33 @@ public struct Subscription<StateType: State> {
     }
 }
 
+extension String {
+    static func random(length: Int = 20) -> String {
+        let base = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        return String((0..<length).map{ _ in base.randomElement()! })
+    }
+}
+
+class Counter {
+    private var queue = DispatchQueue(label: String.random())
+    private (set) var value: UInt64 = 0
 
+    func increment() -> UInt64 {
+        queue.sync {
+            value += 1
+            return value
+        }
+    }
+}
 
 // MARK: - Core
 
 public class Core<StateType: State> {
 
     private let jobQueue: DispatchQueue
     private var subscriptions = [Subscription<StateType>]()
-
-    private let middlewares: [Middlewares<StateType>]
+    private var middlewareCounter = Counter()
+    private var middlewares: [Middlewares<StateType>]
 
     public private (set) var state: StateType {
         didSet {
@@ -101,7 +119,11 @@ public class Core<StateType: State> {
 
     public init(state: StateType, middlewares: [AnyMiddleware] = []) {
         self.state = state
-        self.middlewares = middlewares.map(Middlewares.init)
+        var tempMiddlewares = [Middlewares<StateType>]()
+        for m in middlewares {
+          tempMiddlewares.append(Middlewares(id: middlewareCounter.increment(), middleware: m))
+        }
+        self.middlewares = tempMiddlewares
         let qos: DispatchQoS
         if #available(macOS 10.10, *) {
             qos = .userInitiated
@@ -145,5 +167,19 @@ public class Core<StateType: State> {
             command.execute(state: self.state, core: self)
         }
     }
+
+    public func observe(with middleware: AnyMiddleware) -> () -> () {
+      let wrapper = Middlewares<StateType>(id: middlewareCounter.increment(), middleware: middleware)
+      jobQueue.async {
+          self.middlewares.append(wrapper)
+      }
+      return {
+          self.jobQueue.sync {
+              if let index = self.middlewares.firstIndex(where: { $0.id == wrapper.id }) {
+                self.middlewares.remove(at: index)
+              }
+          }
+      }
+    }
 
 }