bootstrap 启动when时机

Sources/DFService/core/ServiceProvider.swift

@@ -1,3 +1,4 @@
+import Foundation
 /// 应用内服务提供者
 /// 在应用不同时机启动服务
 open class ServiceProvider {
@@ -24,6 +25,10 @@ open class ServiceProvider {
         return .splash
     }
 
+    open var sortIndex: Int {
+        return 1_000
+    }
+
     var name: String {
         return Self.name
     }
@@ -39,7 +44,13 @@ extension ServiceProvider: Equatable {
     }
 }
 
-extension ServiceProvider: Identifiable {
+//extension ServiceProvider: Identifiable {
+//
+//}
+extension ServiceProvider: Comparable {
+    public static func < (lhs: ServiceProvider, rhs: ServiceProvider) -> Bool {
+        return lhs.sortIndex < rhs.sortIndex
+    }
 
 }
 

Sources/DFService/extension/app.string.swift

@@ -0,0 +1,12 @@
+extension String: AppCompatible {}
+
+public extension Space where Base == String {
+    var url: URL? {
+        if let url = URL(string: base) {
+            return url
+        } else if let str = base.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed), let url = URL(string: str) {
+            return url
+        }
+        return nil
+    }
+}

Sources/DFService/service/LogService.swift

@@ -81,3 +81,10 @@ extension MockApiServiceImpl: DFLogHandle {
         .debug
     }
 }
+
+
+public extension Application {
+    var log: DFLogHandle {
+        return self[LogService.self]
+    }
+}

Sources/DFService/service/RuntimeService.swift

@@ -1,7 +1,12 @@
+#if canImport(UIKit)
+import UIKit
+#endif
 public struct RuntimeService: DFServiceKey {
     public static var defaultValue: Value = Value()
 
     public struct Value {}
+
+    private static var uuid: String?
 }
 
 public extension RuntimeService.Value {
@@ -15,4 +20,32 @@ public extension RuntimeService.Value {
         return false
         #endif
     }
+
+    var deviceName: String {
+        #if canImport(UIKit)
+        return UIDevice.current.model
+        #else
+        return "unkown"
+        #endif
+    }
+    /// 设备id
+    var genDeviceId: String {
+        if let value = RuntimeService.uuid {
+            return value
+        }
+#if canImport(UIKit)
+        let value = UIDevice.current.identifierForVendor?.uuidString ?? UUID().uuidString
+#else
+        let value = UUID().uuidString
+#endif
+        RuntimeService.uuid = value
+        return value
+
+    }
+}
+
+public extension Application {
+    var runtime: RuntimeService.Value {
+        return self[RuntimeService.self]
+    }
 }

Sources/DFService/service/provider/BootstrapServiceProvider.swift

@@ -11,7 +11,9 @@ actor Bootstrap {
     }
 
     func bootstrap(_ when: ServiceProvider.ProviderWhen) async {
-        target = when
+        if(target < when) {
+            target = when
+        }
         await bootIfNeed()
     }
 
@@ -21,7 +23,7 @@ actor Bootstrap {
         }
         let currentProviders = app.loadProviders.filter { provider in
             return !provider.isBooted && provider.when <= current
-        }
+        }.sorted()
 
         guard !currentProviders.isEmpty else {
             if current < target {
@@ -83,6 +85,10 @@ class BootstrapServiceProvider: ServiceProvider {
     override var when: ServiceProvider.ProviderWhen {
         return .eager
     }
+
+    override var sortIndex: Int {
+        return 0
+    }
 }
 
 

Sources/DFService/service/router/RouteRequest.swift

@@ -37,6 +37,12 @@ public extension RouteRequest {
             return .page404
         }
     }
+
+    var copy: RouteRequest {
+        let new = RouteRequest(action: routeAction, url: url)
+        new.param = param
+        return new
+    }
 }
 public extension Router.RoutePath {
     var request: RouteRequest {

Sources/DFService/service/router/Router.swift

@@ -57,7 +57,7 @@ public extension Router {
         pageBuilderMap[path] = builder
         if path == .root {
             Thread.app.mainTask {
-                self.rootPath = RouteRequest(action: rootPath.routeAction, url: rootPath.url)
+                self.rootPath = self.rootPath.copy
             }
 
         }
@@ -79,12 +79,10 @@ public extension Router {
         guard let builder = pageBuilderMap[pid] else {
             return AnyView(
                 page404(request)
-                .environmentObject(self)
             )
         }
         return AnyView(
             builder(request)
-                .environmentObject(self)
         )
     }
 }