💪 [kmp/ios] 一些稳定性的提升

Gaubee · Gaubee · commit d14a65def176 · 2025-03-11T18:45:10.000+08:00
diff --git a/deno.jsonc b/deno.jsonc
@@ -27,6 +27,7 @@
   "workspace": [
     "./toolkit/dweb-core",
     "./toolkit/dweb-helper",
+    "./toolkit/dweb-polyfill",
     "./toolkit/plaoc/server",
     "./toolkit/plaoc/plugins",
     "./toolkit/plaoc/cli",
diff --git a/next/kmp/app/iosApp/DwebBrowser/DwebBrowser/Desktop/DwebDeskVCStore.swift b/next/kmp/app/iosApp/DwebBrowser/DwebBrowser/Desktop/DwebDeskVCStore.swift
@@ -31,7 +31,7 @@ class DwebVCData {
 
     class func startUpNMMs(_ app: UIApplication) {
         #if DEBUG
-            let debugMode = true
+            let debugMode = true//,":verbose:/.+/"
         #else
             let debugMode = false
         #endif
diff --git a/next/kmp/browser/src/commonMain/kotlin/org/dweb_browser/browser/jsProcess/ext/createJsProcess.kt b/next/kmp/browser/src/commonMain/kotlin/org/dweb_browser/browser/jsProcess/ext/createJsProcess.kt
@@ -3,7 +3,6 @@ package org.dweb_browser.browser.jsProcess.ext
 import io.ktor.http.URLBuilder
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.launch
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.dweb_browser.browser.jmm.debugJsMM
 import org.dweb_browser.browser.jsProcess.CreateProcessReturn
@@ -38,6 +37,7 @@ suspend fun MicroModule.Runtime.createJsProcess(
     locale = microModule.manifest,
     remote = microModule.manifest,
     autoStart = true,
+    startReason = "create-fetch-ipc"
   )
   codeIpc.onClosed {
     codeIpc.launchJobs += codeIpc.scope.launch(start = CoroutineStart.UNDISPATCHED) { fetchIpc.close() }
@@ -94,6 +94,7 @@ class JsProcess(
       locale = remoteMM,
       // 不自动开始，等到web-worker中它自己去握手
       autoStart = false,
+      startReason = "create-ipc-endpoint",
     )
   }
 
diff --git a/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/Ipc.kt b/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/Ipc.kt
@@ -185,12 +185,14 @@ class Ipc internal constructor(
   suspend fun start(await: Boolean = true, reason: String = "") {
     if (await) {
       withScope(scope) {
+        debugIpc.verbose("start-begin", reason)
         endpoint.start(true)
         startOnce()
         awaitOpen("from-start $reason")
       }
     } else {
       scope.launch {
+        debugIpc.verbose("start-begin", reason)
         endpoint.start(true)
         startOnce()
       }
diff --git a/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/IpcPool.kt b/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/IpcPool.kt
@@ -4,7 +4,6 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import org.dweb_browser.core.help.types.MicroModuleManifest
 import org.dweb_browser.helper.Debugger
@@ -62,13 +61,13 @@ open class IpcPool {
     startReason: String?,
   ) {
     /// 保存ipc，并且根据它的生命周期做自动删除
-    debugIpcPool("createIpc", ipc)
+    debugIpcPool("createIpc") {
+      "ipc=$ipc start=$autoStart reason=$startReason"
+    }
     ipcSet.add(ipc)
     /// 自动启动
     if (autoStart) {
-      scope.launch {
-        ipc.start(reason = startReason ?: "autoStart")
-      }
+      ipc.start(await = false, reason = startReason ?: "autoStart")
     }
     ipc.onClosed {
       ipcSet.remove(ipc)
diff --git a/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/NativeEndpoint.kt b/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/NativeEndpoint.kt
@@ -105,15 +105,15 @@ class NativeEndpoint(
   override suspend fun postIpcMessage(msg: EndpointIpcMessage) {
     awaitOpen("then-postIpcMessage")
     withScope(scope) {
-      debugEndpoint.verbose("message-out", msg)
+      debugEndpoint.verbose("message-out") { "pid=${msg.pid} ipcMessage=${msg.ipcMessage}" }
       messageOut.send(msg)
     }
   }
 
   override suspend fun doStart() {
     scope.launch {
       for ((pid, ipcMessage) in messageIn) {
-        debugEndpoint.verbose("message-in", "pid=$pid ipcMessage=$ipcMessage")
+        debugEndpoint.verbose("message-in") { "pid=$pid ipcMessage=$ipcMessage" }
         /**
          * UNDISPATCHED 能确保 orderBy 的顺序
          */
diff --git a/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/helper/IpcFork.kt b/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/ipc/helper/IpcFork.kt
@@ -10,7 +10,7 @@ import org.dweb_browser.core.help.types.CommonAppManifest
  */
 @Serializable
 @SerialName(IPC_MESSAGE_TYPE_FORK)
-class IpcFork(
+data class IpcFork(
   val pid: Int,
   val autoStart: Boolean,
   val startReason: String? = null,
diff --git a/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/module/NativeMicroModule.kt b/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/module/NativeMicroModule.kt
@@ -8,7 +8,6 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.cbor.Cbor
 import kotlinx.serialization.encodeToByteArray
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import org.dweb_browser.core.help.types.DWEB_PROTOCOL
@@ -59,10 +58,20 @@ abstract class NativeMicroModule(manifest: MicroModuleManifest) : MicroModule(ma
         if (toMM is NativeMicroModule.NativeRuntime) {
           fromMM.debugMM("NMM/connectAdapter", "fromMM: ${fromMM.mmid} => toMM: ${toMM.mmid}")
           val channel = NativeMessageChannel(kotlinIpcPool.scope, fromMM.id, toMM.id)
-          val fromNativeIpc =
-            kotlinIpcPool.createIpc(channel.port1, 0, fromMM.manifest, toMM.microModule.manifest)
-          val toNativeIpc =
-            kotlinIpcPool.createIpc(channel.port2, 0, toMM.microModule.manifest, fromMM.manifest)
+          val fromNativeIpc = kotlinIpcPool.createIpc(
+            endpoint = channel.port1,
+            pid = 0,
+            locale = fromMM.manifest,
+            remote = toMM.microModule.manifest,
+            startReason = "NMM-connectAdapter"
+          )
+          val toNativeIpc = kotlinIpcPool.createIpc(
+            endpoint = channel.port2,
+            pid = 0,
+            locale = toMM.microModule.manifest,
+            remote = fromMM.manifest,
+            startReason = "NMM-connectAdapter"
+          )
           // fromMM.beConnect(fromNativeIpc, reason) // 通知发起连接者作为Client
           toMM.beConnect(toNativeIpc, reason) // 通知接收者作为Server
           fromNativeIpc
diff --git a/next/kmp/dwebview/src/iosMain/kotlin/org/dweb_browser/dwebview/engine/DWebViewEngine.ios.kt b/next/kmp/dwebview/src/iosMain/kotlin/org/dweb_browser/dwebview/engine/DWebViewEngine.ios.kt
@@ -38,6 +38,7 @@ import org.dweb_browser.dwebview.polyfill.FaviconPolyfill
 import org.dweb_browser.dwebview.wkWebsiteDataStore
 import org.dweb_browser.helper.JsonLoose
 import org.dweb_browser.helper.PureBounds
+import org.dweb_browser.helper.SafeHashSet
 import org.dweb_browser.helper.Signal
 import org.dweb_browser.helper.SimpleSignal
 import org.dweb_browser.helper.collectIn
@@ -76,6 +77,8 @@ import platform.WebKit.javaScriptEnabled
 @OptIn(ExperimentalForeignApi::class)
 internal val dwebHelper = DwebHelper()
 
+typealias CompletionHandler = (Any?, platform.Foundation.NSError?) -> Unit
+
 @Suppress("CONFLICTING_OVERLOADS")
 @OptIn(ExperimentalForeignApi::class, ExperimentalResourceApi::class)
 class DWebViewEngine(
@@ -224,18 +227,19 @@ class DWebViewEngine(
               httpLocalhostGatewaySuffix
             )
           ) {
-            "dweb+" + inputUrl.replace(inputHostWithPort, inputHostWithPort.substring(
-              0, inputHostWithPort.length - httpLocalhostGatewaySuffix.length
-            ).let { dwebHost ->
-              val hostInfo = dwebHost.split('-')
-              val port = hostInfo.last().toUShortOrNull()
-              if (port != null) {
-                hostInfo.toMutableList().run {
-                  removeLast()
-                  joinToString("-")
-                } + ":$port"
-              } else dwebHost
-            })
+            "dweb+" + inputUrl.replace(
+              inputHostWithPort, inputHostWithPort.substring(
+                0, inputHostWithPort.length - httpLocalhostGatewaySuffix.length
+              ).let { dwebHost ->
+                val hostInfo = dwebHost.split('-')
+                val port = hostInfo.last().toUShortOrNull()
+                if (port != null) {
+                  hostInfo.toMutableList().run {
+                    removeLast()
+                    joinToString("-")
+                  } + ":$port"
+                } else dwebHost
+              })
           } else inputUrl
         }
       }
@@ -258,8 +262,7 @@ class DWebViewEngine(
   internal val urlObserver = DWebUrlObserver(this)
   val loadStateFlow =
     setupLoadStateFlow(this, dwebNavigationDelegate, urlObserver, configuration, options.url)
-  val beforeUnloadSignal =
-    setupBeforeUnloadSignal(this, dwebNavigationDelegate, loadStateFlow)
+  val beforeUnloadSignal = setupBeforeUnloadSignal(this, dwebNavigationDelegate, loadStateFlow)
   val overrideUrlLoadingHooks by lazy { setupOverrideUrlLoadingHooks(this, dwebNavigationDelegate) }
 
   init {
@@ -372,8 +375,8 @@ class DWebViewEngine(
   override fun setFrame(frame: CValue<CGRect>) {
     super.setFrame(frame)
     scrollView.contentInset = cValue { UIEdgeInsetsZero };
-    if (!UIEdgeInsetsEqualToEdgeInsets(scrollView.adjustedContentInset,
-        cValue { UIEdgeInsetsZero })
+    if (!UIEdgeInsetsEqualToEdgeInsets(
+        scrollView.adjustedContentInset, cValue { UIEdgeInsetsZero })
     ) {
       val insetToAdjust = scrollView.adjustedContentInset;
       scrollView.contentInset =
@@ -411,6 +414,11 @@ class DWebViewEngine(
     return deferred
   }
 
+  /**
+   * 因为函数倒挂给 WKWebView，所以存在内存问题，这里强制存储回调，避免被 kotlin 回收。
+   */
+  private val completionHandlers = SafeHashSet<CompletionHandler>()
+
   suspend fun <T> awaitAsyncJavaScript(
     functionBody: String,
     arguments: Map<Any?, *>? = null,
@@ -419,7 +427,7 @@ class DWebViewEngine(
     afterEval: (suspend () -> Unit)? = null,
   ): T {
     val deferred = CompletableDeferred<T>()
-    callAsyncJavaScript(functionBody, arguments, inFrame, inContentWorld) { result, error ->
+    val ch: CompletionHandler = { result, error ->
       if (error == null) {
         deferred.complete(result as T)
       } else {
@@ -437,9 +445,19 @@ class DWebViewEngine(
         )
       }
     }
+    callAsyncJavaScript(
+      functionBody = functionBody,
+      arguments = arguments,
+      inFrame = inFrame,
+      inContentWorld = inContentWorld,
+      completionHandler = ch,
+    )
     afterEval?.invoke()
 
-    return deferred.await()
+    completionHandlers.add(ch)
+    return deferred.await().also {
+      completionHandlers.remove(ch)
+    }
   }
 
   /**
diff --git a/next/kmp/dwebview/src/iosMain/kotlin/org/dweb_browser/dwebview/messagePort/DWebMessagePort.ios.kt b/next/kmp/dwebview/src/iosMain/kotlin/org/dweb_browser/dwebview/messagePort/DWebMessagePort.ios.kt
@@ -8,6 +8,7 @@ import kotlinx.serialization.json.Json
 import org.dweb_browser.core.ipc.helper.DWebMessage
 import org.dweb_browser.core.ipc.helper.IWebMessagePort
 import org.dweb_browser.dwebview.DWebView
+import org.dweb_browser.helper.hexString
 import org.dweb_browser.helper.launchWithMain
 import org.dweb_browser.helper.withMainContext
 import platform.Foundation.NSNumber
@@ -24,9 +25,7 @@ class DWebMessagePort(val portId: Int, private val webview: DWebView, parentScop
     val channel = Channel<DWebMessage>(capacity = Channel.UNLIMITED)
     webview.lifecycleScope.launchWithMain {
       webview.engine.evalAsyncJavascript<Unit>(
-        "nativeStart($portId)",
-        null,
-        DWebViewWebMessage.webMessagePortContentWorld
+        "nativeStart($portId)", null, DWebViewWebMessage.webMessagePortContentWorld
       ).await()
     }
     channel
@@ -63,9 +62,9 @@ class DWebMessagePort(val portId: Int, private val webview: DWebView, parentScop
       }.joinToString(",")
       if (event is DWebMessage.DWebMessageBytes) {
         webview.engine.evalAsyncJavascript<Unit>(
-          "nativePortPostMessage($portId, ${
-            Json.encodeToString(event.text)
-          }, [$ports])", null, DWebViewWebMessage.webMessagePortContentWorld
+          "nativePortPostMessage($portId, str_to_hex_binary(\"${
+            event.binary.hexString
+          }\"), [$ports])", null, DWebViewWebMessage.webMessagePortContentWorld
         ).await()
       } else if (event is DWebMessage.DWebMessageString) {
         webview.engine.evalAsyncJavascript<Unit>(
diff --git a/next/kmp/gradle.properties b/next/kmp/gradle.properties
@@ -7,6 +7,7 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 #iOS
 org.jetbrains.compose.experimental.uikit.enabled=true
+kotlin.native.cacheKind.iosSimulatorArm64=none
 #Js
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 #MPP
diff --git a/next/kmp/helper/src/commonMain/kotlin/org/dweb_browser/helper/SafeHashMap.kt b/next/kmp/helper/src/commonMain/kotlin/org/dweb_browser/helper/SafeHashMap.kt
@@ -10,9 +10,12 @@ public class SafeHashMap<K, V>(public val origin: MutableMap<K, V> = mutableMapO
     synchronized(lock) { origin.block() }
 
   override val size: Int get() = sync { size }
-  override val entries: MutableSet<MutableMap.MutableEntry<K, V>> get() = sync { entries.toMutableSet() }
-  override val keys: MutableSet<K> get() = sync { keys.toMutableSet() }
-  override val values: MutableSet<V> get() = sync { values.toMutableSet() }
+  override val entries: MutableSet<MutableMap.MutableEntry<K, V>>
+    get() = sync {
+      entries.toSet().toMutableSet()
+    }
+  override val keys: MutableSet<K> get() = sync { keys.toSet().toMutableSet() }
+  override val values: MutableSet<V> get() = sync { values.toSet().toMutableSet() }
   override fun clear(): Unit = sync { clear() }
 
   override fun isEmpty(): Boolean = sync { isEmpty() }
diff --git a/next/kmp/pureImage/src/commonMain/kotlin/org/dweb_browser/pure/image/compose/LoaderCacheMap.kt b/next/kmp/pureImage/src/commonMain/kotlin/org/dweb_browser/pure/image/compose/LoaderCacheMap.kt
@@ -25,14 +25,14 @@ class LoaderCacheMap<T : Any>(scope: CoroutineScope, cacheSize: Int = 10) {
           return@launch
         }
         val willRemoves = mutableListOf<MutableMap.MutableEntry<String, CacheItem<T>>>()
-        for (item in map) {
-          item.value.hot -= 5f
-          if (item.value.hot <= 0) {
-            willRemoves.add(item)
-          }
-        }
-        willRemoves.sortBy { it.value.hot }
         map.sync {
+          for (item in map) {
+            item.value.hot -= 5f
+            if (item.value.hot <= 0) {
+              willRemoves.add(item)
+            }
+          }
+          willRemoves.sortBy { it.value.hot }
           for ((key) in willRemoves) {
             this.remove(key)
             if (this.size <= cacheSize) {
@@ -44,11 +44,10 @@ class LoaderCacheMap<T : Any>(scope: CoroutineScope, cacheSize: Int = 10) {
     }
   }
 
-  fun get(task: LoaderTask): T? = map.sync {
+  fun get(task: LoaderTask): T? =
     map[task.key]?.result
-  }
 
-  fun save(cache: CacheItem<T>) = map.sync {
+  fun save(cache: CacheItem<T>) {
     map[cache.key] = cache
   }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/toolkit/dweb-polyfill/package.json b/toolkit/dweb-polyfill/package.json
diff --git a/toolkit/dweb-polyfill/src/web-message.ios.ts b/toolkit/dweb-polyfill/src/web-message.ios.ts
