Merge pull request #9 from lemo-nade-room/feature/change-di-swift-dependencies

swift-dependencies移行

Author: lemo-nade-room

Package.resolved

@@ -26,6 +26,7 @@ let package = Package(
         .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.0.0"),
         .package(url: "https://github.com/Zollerboy1/SwiftCommand.git", from: "1.4.0"),
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.0.0"),
+        .package(url: "https://github.com/pointfreeco/swift-dependencies.git", from: "1.0.0"),
     ],
     targets: [
         .target(
@@ -36,6 +37,7 @@ let package = Package(
                 .product(name: "FluentSQLiteDriver", package: "fluent-sqlite-driver"),
                 .product(name: "SwiftCommand", package: "SwiftCommand"),
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
+                .product(name: "Dependencies", package: "swift-dependencies"),
             ],
             swiftSettings: swiftSettings,
             plugins: swiftLintPlugins

Package.swift

@@ -1,7 +1,10 @@
 import ConsoleKit
+import Dependencies
 import Fluent
 import Foundation
 import Logging
+import NIOCore
+import NIOPosix
 
 /// `ConsoleKit`で作成した`AsyncCommand`を実行するサービス
 ///
@@ -55,24 +58,41 @@ public struct CLI: Sendable {
     }
 
     /// CLIを実行する
-    public func run() async {
+    public func run() async throws {
         let context = CommandContext(console: console, input: input)
+        let eventLoopGroup = MultiThreadedEventLoopGroup.singleton
+        let threadPool = try await prepareThreadPool()
+        let logger = Logger(label: "CLIKit")
+        let databases = Databases(threadPool: threadPool, on: eventLoopGroup)
+
+        if let sqliteURL {
+            databases.use(.sqlite(.file(sqliteURL.absoluteString)), as: .sqlite)
+            try await autoMigrate(
+                databases: databases,
+                on: eventLoopGroup.any(),
+                logger: logger,
+                migrations: migrations,
+                migrationLogLevel: migrationLogLevel
+            )
+        }
+
         do {
-            if let sqliteURL {
-                try await context.initDatabase(
-                    sqliteURL: sqliteURL,
-                    migrations: migrations,
-                    migrationLogLevel: migrationLogLevel
-                )
+            try await withDependencies {
+                $0.databases = databases
+                $0.eventLoopGroup = eventLoopGroup
+                $0.threadPool = threadPool
+                $0.logger = logger
+                $0.httpClient = .shared
+            } operation: {
+                try await console.run(asyncCommandGroup, with: context)
             }
-            try await console.run(asyncCommandGroup, with: context)
         } catch let error {
             console.error("\(error)")
         }
+
         do {
-            try await context.shutdown()
-        } catch let error {
-            console.error("\(error)")
+            await databases.shutdownAsync()
+            try await threadPool.shutdownGracefully()
         }
     }
 

Sources/CLIKit/CLI.swift

@@ -0,0 +1,64 @@
+import AsyncHTTPClient
+import Dependencies
+import Fluent
+import NIOPosix
+
+extension DependencyValues {
+    /// Fluent Database
+    ///
+    /// データベースが設定されている場合のみ使用可能
+    public var db: any Fluent.Database {
+        databases.database(logger: logger, on: eventLoopGroup.any())!
+    }
+
+    /// CLIKitのlogger
+    public var logger: Logger {
+        get { self[LoggerKey.self] }
+        set { self[LoggerKey.self] = newValue }
+    }
+    private enum LoggerKey: DependencyKey {
+        static var liveValue: Logger {
+            fatalError("Value of type \(Value.self) is not registered in this context")
+        }
+    }
+
+    public var databases: Databases {
+        get { self[DatabasesKey.self] }
+        set { self[DatabasesKey.self] = newValue }
+    }
+    private enum DatabasesKey: DependencyKey {
+        static var liveValue: Databases {
+            fatalError("Value of type \(Value.self) is not registered in this context")
+        }
+    }
+
+    public var eventLoopGroup: MultiThreadedEventLoopGroup {
+        get { self[EventLoopGroupKey.self] }
+        set { self[EventLoopGroupKey.self] = newValue }
+    }
+    private enum EventLoopGroupKey: DependencyKey {
+        static var liveValue: MultiThreadedEventLoopGroup {
+            fatalError("Value of type \(Value.self) is not registered in this context")
+        }
+    }
+
+    public var threadPool: NIOThreadPool {
+        get { self[ThreadPoolKey.self] }
+        set { self[ThreadPoolKey.self] = newValue }
+    }
+    private enum ThreadPoolKey: DependencyKey {
+        static var liveValue: NIOThreadPool {
+            fatalError("Value of type \(Value.self) is not registered in this context")
+        }
+    }
+
+    public var httpClient: HTTPClient {
+        get { self[HTTPClientKey.self] }
+        set { self[HTTPClientKey.self] = newValue }
+    }
+    private enum HTTPClientKey: DependencyKey {
+        static var liveValue: HTTPClient {
+            fatalError("Value of type \(Value.self) is not registered in this context")
+        }
+    }
+}