Middleware lifting

GameApp.swift

@@ -0,0 +1,45 @@
+//
+//  GameApp.swift
+//  WildWestOnline
+//
+//  Created by Hugues Telolahy on 02/04/2023.
+//
+
+import SwiftUI
+import Redux
+import Screen
+import Game
+
+private let store = Store<AppState>(
+    initial: .init(),
+    reducer: AppState.reducer,
+    middlewares: [
+        LoggerMiddleware(),
+        ComposedMiddleware(middlewares: [
+            CardEffectsMiddleware(),
+            NextActionMiddleware(),
+            ActivateCardsMiddleware()
+        ])
+        .lift(stateMap: extractGameState),
+    ]
+)
+
+@main
+struct GameApp: App {
+    var body: some Scene {
+        WindowGroup {
+            AppView()
+                .environmentObject(store)
+        }
+    }
+}
+
+private var extractGameState: (AppState) -> GameState? = { state in
+    guard let lastScreen = state.screens.last,
+          case let .game(gamePlayState) = lastScreen,
+          let gameState = gamePlayState.gameState else {
+        return nil
+    }
+
+    return gameState
+}

GameKit/Package.swift

@@ -5,8 +5,9 @@ import PackageDescription
 
 let package = Package(
     name: "GameKit",
+    defaultLocalization: "fr",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
         .macOS(.v13)
     ],
     products: [

GameKit/Sources/Game/DSL/Modifiers/CardEffect+Modifiers.swift

@@ -6,6 +6,8 @@
 //
 
 public extension CardEffect {
+    static let nothing: Self = .group([])
+
     static func group(@CardEffectsBuilder content: () -> [Self]) -> Self {
         .group(content())
     }

GameKit/Sources/Game/DSL/Modifiers/GameAction+Modifiers.swift

@@ -6,6 +6,8 @@
 //
 
 public extension GameAction {
+    static let nothing: Self = .group([])
+
     static func group(@GameActionBuilder content: () -> [Self]) -> Self {
         .group(content())
     }

GameKit/Sources/Game/GameStore.swift

@@ -11,8 +11,12 @@ public func createGameStore(initial: GameState) -> Store<GameState> {
         initial: initial,
         reducer: GameState.reducer,
         middlewares: [
-            gameLoopMiddleware,
-            eventLoggerMiddleware
+            ComposedMiddleware(middlewares: [
+                CardEffectsMiddleware(),
+                NextActionMiddleware(),
+                ActivateCardsMiddleware()
+            ]),
+            EventLoggerMiddleware()
         ]
     )
 }

GameKit/Sources/Game/Middleware/AIAgentMiddleware.swift

@@ -0,0 +1,36 @@
+//  AIAgentMiddleware.swift
+//
+//
+//  Created by Hugues Telolahy on 14/07/2023.
+//
+
+import Combine
+import Redux
+
+public final class AIAgentMiddleware: Middleware<GameState> {
+    override public func handle(action: Action, state: GameState) -> AnyPublisher<Action, Never>? {
+        guard let move = evaluateAIMove(state: state) else {
+            return nil
+        }
+
+        return Just(move).eraseToAnyPublisher()
+    }
+
+    private func evaluateAIMove(state: GameState) -> GameAction? {
+        guard state.isOver == nil else {
+            return nil
+        }
+
+        if let active = state.active,
+           let randomCard = active.cards.randomElement() {
+            return GameAction.play(randomCard, player: active.player)
+        }
+
+        if let chooseOne = state.chooseOne,
+           let randomAction = chooseOne.options.values.randomElement() {
+            return randomAction
+        }
+
+        return nil
+    }
+}

GameKit/Sources/Game/Middleware/GameLoop/HandlerActivateCards.swift → GameKit/Sources/Game/Middleware/ActivateCardsMiddleware.swift

@@ -1,12 +1,14 @@
 //
-//  HandlerActivateCards.swift
+//  ActivateCardsMiddleware.swift
 //  
 //
-//  Created by Hugues Telolahy on 03/11/2023.
+//  Created by Hugues Stephano TELOLAHY on 27/11/2023.
 //
+import Combine
+import Redux
 
-struct HandlerActivateCards: GameActionHandler {
-    func handle(action: GameAction, state: GameState) -> GameAction? {
+public final class ActivateCardsMiddleware: Middleware<GameState> {
+    override public func handle(action: Action, state: GameState) -> AnyPublisher<Action, Never>? {
         guard state.sequence.isEmpty,
               state.isOver == nil,
               state.chooseOne == nil,
@@ -27,7 +29,8 @@ struct HandlerActivateCards: GameActionHandler {
             return nil
         }
 
-        return .activate(activeCards, player: player)
+        let activateAction = GameAction.activate(activeCards, player: player)
+        return Just(activateAction).eraseToAnyPublisher()
     }
 
     private func activableCardsOfPlayer(_ playerObj: Player) -> [String] {

GameKit/Sources/Game/Middleware/GameLoop/HandlerTriggeredEffects.swift → GameKit/Sources/Game/Middleware/CardEffectsMiddleware.swift

@@ -1,12 +1,18 @@
 //
-//  HandlerTriggeredEffects.swift
+//  CardEffectsMiddleware.swift
 //
 //
-//  Created by Hugues Telolahy on 03/11/2023.
+//  Created by Hugues Stephano TELOLAHY on 27/11/2023.
 //
+import Combine
+import Redux
+
+public final class CardEffectsMiddleware: Middleware<GameState> {
+    override public func handle(action: Action, state: GameState) -> AnyPublisher<Action, Never>? {
+        guard let action = action as? GameAction else {
+            return nil
+        }
 
-struct HandlerTriggeredEffects: GameActionHandler {
-    func handle(action: GameAction, state: GameState) -> GameAction? {
         var triggered: [GameAction] = []
 
         // active players
@@ -48,7 +54,8 @@ struct HandlerTriggeredEffects: GameActionHandler {
         }
         // </sort triggered by priority>
 
-        return .group(triggered)
+        let cardEffects = GameAction.group(triggered)
+        return Just(cardEffects).eraseToAnyPublisher()
     }
 
     private func triggeredEffect(

GameKit/Sources/Game/Middleware/EventLoggerMiddleware.swift

@@ -1,32 +1,35 @@
-// swiftlint:disable:this file_name
 //
 //  EventLoggerMiddleware.swift
 //
 //
 //  Created by Hugues Telolahy on 03/06/2023.
 //
-// swiftlint:disable prefixed_toplevel_constant
 
 import Combine
 import Redux
 
-public let eventLoggerMiddleware: Middleware<GameState> = { state, action in
-    if let error = state.error {
-        print("❌ \(error) on \(action)".removingNamespace())
-    } else if let event = action as? GameAction {
-        print("\(event.image) \(event)".removingNamespace())
+public final class EventLoggerMiddleware: Middleware<GameState> {
+    override public init() {
+        super.init()
     }
 
-    return nil
-}
+    override public func handle(action: Action, state: GameState) -> AnyPublisher<Action, Never>? {
+        guard let action = action as? GameAction else {
+            return nil
+        }
 
-private extension GameAction {
-    var image: String {
-        if isRenderable {
-            "✅"
+        if let error = state.error {
+            print("❌ \(error) on \(action)".removingNamespace())
         } else {
-            "➡️"
+            let image: String = if action.isRenderable {
+                "✅"
+            } else {
+                "➡️"
+            }
+            print("\(image) \(action)".removingNamespace())
         }
+
+        return nil
     }
 }