Cache AppInfo and DeviceInfo to avoid redundant computation

Author: kean

Sources/Pulse/LoggerStore/LoggerStore+Info.swift

@@ -79,15 +79,13 @@ enum AppInfo {
 }
 
 extension LoggerStore.Info.AppInfo {
-    static func make() -> LoggerStore.Info.AppInfo {
-        LoggerStore.Info.AppInfo(
-            bundleIdentifier: AppInfo.bundleIdentifier,
-            name: AppInfo.appName,
-            version: AppInfo.appVersion,
-            build: AppInfo.appBuild,
-            icon: getAppIcon()?.base64EncodedString()
-        )
-    }
+    static let current = LoggerStore.Info.AppInfo(
+        bundleIdentifier: AppInfo.bundleIdentifier,
+        name: AppInfo.appName,
+        version: AppInfo.appVersion,
+        build: AppInfo.appBuild,
+        icon: getAppIcon()?.base64EncodedString()
+    )
 }
 
 private func getAppIcon() -> Data? {
@@ -110,7 +108,7 @@ func getDeviceId() -> UUID? {
 
 extension LoggerStore.Info.DeviceInfo {
     @MainActor
-static func make() -> LoggerStore.Info.DeviceInfo {
+    static let current: LoggerStore.Info.DeviceInfo = {
         let device = UIDevice.current
         return LoggerStore.Info.DeviceInfo(
             name: device.name,
@@ -119,7 +117,7 @@ static func make() -> LoggerStore.Info.DeviceInfo {
             systemName: device.systemName,
             systemVersion: device.systemVersion
         )
-    }
+    }()
 }
 #elseif os(watchOS)
 import WatchKit
@@ -131,7 +129,7 @@ func getDeviceId() -> UUID? {
 
 extension LoggerStore.Info.DeviceInfo {
     @MainActor
-static func make() -> LoggerStore.Info.DeviceInfo {
+    static let current: LoggerStore.Info.DeviceInfo = {
         let device = WKInterfaceDevice.current()
         return LoggerStore.Info.DeviceInfo(
             name: device.name,
@@ -140,22 +138,22 @@ static func make() -> LoggerStore.Info.DeviceInfo {
             systemName: device.systemName,
             systemVersion: device.systemVersion
         )
-    }
+    }()
 }
 #else
 import AppKit
 
 extension LoggerStore.Info.DeviceInfo {
     @MainActor
-static func make() -> LoggerStore.Info.DeviceInfo {
+    static let current: LoggerStore.Info.DeviceInfo = {
         return LoggerStore.Info.DeviceInfo(
             name: Host.current().name ?? "unknown",
             model: "unknown",
             localizedModel: "unknown",
             systemName: "macOS",
             systemVersion: ProcessInfo().operatingSystemVersionString
         )
-    }
+    }()
 }
 
 @MainActor

Sources/Pulse/LoggerStore/LoggerStore.swift

@@ -178,7 +178,7 @@ public final class LoggerStore: @unchecked Sendable, Identifiable {
         var createSession = false
         if options.contains(.create) && !options.contains(.readonly) && configuration.isAutoStartingSession {
             perform { _ in
-                self.saveEntity(for: self.session, info: .make())
+                self.saveEntity(for: self.session, info: .current)
             }
             createSession = true
         }
@@ -791,7 +791,7 @@ extension LoggerStore {
         try? deleteEntities(for: LoggerMessageEntity.fetchRequest())
         try? deleteEntities(for: LoggerBlobHandleEntity.fetchRequest())
         try? deleteEntities(for: LoggerSessionEntity.fetchRequest())
-        saveEntity(for: session, info: .make())
+        saveEntity(for: session, info: .current)
 
         try? Files.removeItem(at: blobsURL)
         Files.createDirectoryIfNeeded(at: blobsURL)
@@ -1133,7 +1133,7 @@ extension LoggerStore {
     ///
     /// - important Thread-safe. But must NOT be called inside the `backgroundContext` queue.
     public func info() async throws -> Info {
-        let deviceInfo = await LoggerStore.Info.DeviceInfo.make()
+        let deviceInfo = await LoggerStore.Info.DeviceInfo.current
         return try await container.performBackgroundTask { context in
             return try self._info(in: context, deviceInfo: deviceInfo)
         }
@@ -1157,7 +1157,7 @@ extension LoggerStore {
             totalStoreSize: try storeURL.directoryTotalSize(),
             blobsSize: try getBlobsSize(),
             blobsDecompressedSize: try getBlobsSize(isDecompressed: true),
-            appInfo: .make(),
+            appInfo: .current,
             deviceInfo: deviceInfo
         )
     }

Sources/Pulse/RemoteLogger/RemoteLogger.swift

@@ -450,8 +450,8 @@ public final class RemoteLogger: ObservableObject, RemoteLoggerConnectionDelegat
         let body = PacketClientHello(
             version: Version.currentProtocolVersion.description,
             deviceId: getDeviceId() ?? getFallbackDeviceId(),
-            deviceInfo: .make(),
-            appInfo: .make(),
+            deviceInfo: .current,
+            appInfo: .current,
             session: store?.session
         )
         connection?.send(code: .clientHello, entity: body)