💪 [kmp] 一些错别字的更正

Author: Gaubee

next/kmp/app/iosApp/DwebBrowser/DwebBrowser/Desktop/DwebDeskVCStore.swift

@@ -23,10 +23,10 @@ class DwebVCData {
 
 @Observable class DwebDeskVCStore {
     var vcs = [DwebVCData]()
-    var navgationBarVisible: Visibility = .visible
+    var navigationBarVisible: Visibility = .visible
     var shouldEnableEdgeSwipe: Bool = false
     init() {
-        regiserDeskEvent()
+        registryDeskEvent()
     }
 
     class func startUpNMMs(_ app: UIApplication) {
@@ -38,7 +38,7 @@ class DwebVCData {
         Main_iosKt.startDwebBrowser(app: app, debugMode: debugMode, debugTags: ["/.+/"]) { Log("Main_iosKt.startDwebBrowser launch: \($1?.localizedDescription ?? "Success")") }
     }
 
-    private func regiserDeskEvent() {
+    private func registryDeskEvent() {
         Main_iosKt.dwebViewController.setNavigationBarHook(hook: navigationBarHok(visible:))
         Main_iosKt.dwebViewController.setAddHook(hook: addHook(vc:prop:))
         Main_iosKt.dwebViewController.setUpdateHook(hook: updateHook(prop:))
@@ -51,7 +51,7 @@ class DwebVCData {
     }
 
     private func navigationBarHok(visible: KotlinBoolean) {
-        navgationBarVisible = visible.boolValue ? .visible : .hidden
+        navigationBarVisible = visible.boolValue ? .visible : .hidden
     }
 
     private func addHook(vc: UIViewController, prop: HelperComposeDwebUIViewControllerProperty) {

next/kmp/app/iosApp/DwebBrowser/DwebBrowser/DwebBrowserApp.swift

@@ -20,7 +20,7 @@ struct DwebBrowserApp: App {
         ZStack(alignment: .center, content: {
             DwebFrameworkContentView()
                 .ignoresSafeArea(.all, edges: .all)
-                .persistentSystemOverlays(deskVCStore.navgationBarVisible)
+                .persistentSystemOverlays(deskVCStore.navigationBarVisible)
                 .environment(deskVCStore)
                 .onChange(of: deskVCStore.shouldEnableEdgeSwipe) { _, enable in
 

next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/Ipc.kt

@@ -4,6 +4,7 @@ import io.ktor.http.Url
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
@@ -69,11 +70,17 @@ class Ipc internal constructor(
     private val reqIdAcc = atomic(0)
   }
 
-  private val job = SupervisorJob()
-  val scope = endpoint.scope + job
-
   override fun toString() = "Ipc@$debugId"
 
+  private val job = SupervisorJob() // 使用独立的 SupervisorJob，基于 endpoint.onClosed 去做关闭关联
+  val scope = endpoint.scope + job + CoroutineName("$this")
+
+  init {
+    endpoint.onClosed {
+      tryClose(CancellationException("endpoint closed", it))
+    }
+  }
+
   /**
    * 这部分得放最前面，因为有些地方需要立刻使用 onClosed
    */
@@ -445,11 +452,6 @@ class Ipc internal constructor(
   }
   //#endregion
 
-  init {
-    endpoint.onClosed {
-      tryClose(CancellationException("endpoint closed", it))
-    }
-  }
 }
 
 data class IpcRequestInit(

next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/NativeEndpoint.kt

@@ -3,6 +3,7 @@ package org.dweb_browser.core.ipc
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -97,7 +98,7 @@ class NativeEndpoint(
 ) : IpcEndpoint() {
   override fun toString() = "NativeEndpoint@$debugId"
 
-  override val scope = parentScope + SupervisorJob() + CoroutineName("$this")
+  override val scope = parentScope + SupervisorJob(parentScope.coroutineContext[Job]) + CoroutineName("$this")
 
   /**
    * 发送消息