From 00ac95df014167796784eeeac433476efcf82d3b Mon Sep 17 00:00:00 2001
From: Christoph Hagen <github@christophhagen.de>
Date: Sun, 1 Oct 2023 19:26:31 +0200
Subject: [PATCH] Update clairvoyant

---
 Sources/App/DeviceManager.swift      |  6 ++---
 Sources/App/EventLoopScheduler.swift | 34 ++++++++++++++++++++++++++++
 Sources/App/configure.swift          | 11 ++++++---
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 Sources/App/EventLoopScheduler.swift

diff --git a/Sources/App/DeviceManager.swift b/Sources/App/DeviceManager.swift
index 6aa8c9d..b7e4c84 100644
--- a/Sources/App/DeviceManager.swift
+++ b/Sources/App/DeviceManager.swift
@@ -33,15 +33,15 @@ final class DeviceManager {
     /// A promise to finish the request once the device responds or times out
     private var requestInProgress: EventLoopPromise<Data>?
     
-    init(deviceKey: Data, remoteKey: Data, deviceTimeout: Int64) async {
+    init(deviceKey: Data, remoteKey: Data, deviceTimeout: Int64) {
         self.deviceKey = deviceKey
         self.remoteKey = remoteKey
         self.deviceTimeout = deviceTimeout
-        self.deviceConnectedMetric = try! await .init(
+        self.deviceConnectedMetric = .init(
             "sesame.connected",
             name: "Device connected",
             description: "Shows if the device is connected via WebSocket")
-        self.messagesToDeviceMetric = try! await .init(
+        self.messagesToDeviceMetric = .init(
             "sesame.messages",
             name: "Forwarded Messages",
             description: "The number of messages transmitted to the device")
diff --git a/Sources/App/EventLoopScheduler.swift b/Sources/App/EventLoopScheduler.swift
new file mode 100644
index 0000000..593b5d8
--- /dev/null
+++ b/Sources/App/EventLoopScheduler.swift
@@ -0,0 +1,34 @@
+import Foundation
+import Vapor
+import NIOCore
+import ClairvoyantVapor
+
+final class EventLoopScheduler {
+
+    private let backgroundGroup: EventLoopGroup
+
+    init() {
+        backgroundGroup = MultiThreadedEventLoopGroup(numberOfThreads: 2)
+    }
+
+    func next() -> EventLoop {
+        backgroundGroup.next()
+    }
+
+    func provider() -> NIOEventLoopGroupProvider {
+        return .shared(backgroundGroup)
+    }
+
+    func shutdown() {
+        backgroundGroup.shutdownGracefully { _ in
+
+        }
+    }
+}
+
+extension EventLoopScheduler: ClairvoyantVapor.AsyncScheduler {
+
+    func schedule(asyncJob: @escaping @Sendable () async throws -> Void) {
+        _ = backgroundGroup.any().makeFutureWithTask(asyncJob)
+    }
+}
diff --git a/Sources/App/configure.swift b/Sources/App/configure.swift
index 5b7f230..b5747b5 100755
--- a/Sources/App/configure.swift
+++ b/Sources/App/configure.swift
@@ -7,6 +7,8 @@ var deviceManager: DeviceManager!
 
 private var provider: VaporMetricProvider!
 
+private var asyncScheduler = EventLoopScheduler()
+
 enum ServerError: Error {
     case invalidAuthenticationFileContent
     case invalidAuthenticationToken
@@ -27,7 +29,7 @@ public func configure(_ app: Application) async throws {
     let monitor = MetricObserver(logFileFolder: logFolder, logMetricId: "sesame.log")
     MetricObserver.standard = monitor
 
-    let status = try await Metric<ServerStatus>("sesame.status")
+    let status = Metric<ServerStatus>("sesame.status")
     _ = try await status.update(.initializing)
 
     let configUrl = storageFolder.appendingPathComponent("config.json")
@@ -38,7 +40,7 @@ public func configure(_ app: Application) async throws {
     let keyFile = storageFolder.appendingPathComponent(config.keyFileName)
 
     let (deviceKey, remoteKey) = try loadKeys(at: keyFile)
-    deviceManager = await DeviceManager(
+    deviceManager = DeviceManager(
         deviceKey: deviceKey,
         remoteKey: remoteKey,
         deviceTimeout: config.deviceTimeout)
@@ -46,6 +48,7 @@ public func configure(_ app: Application) async throws {
     try routes(app)
 
     provider = .init(observer: monitor, accessManager: config.authenticationTokens)
+    provider.asyncScheduler = asyncScheduler
     provider.registerRoutes(app)
     
     // Gracefully shut down by closing potentially open socket
@@ -84,5 +87,7 @@ func log(_ message: String) {
         print(message)
         return
     }
-    observer.log(message)
+    asyncScheduler.schedule {
+        await observer.log(message)
+    }
 }