🐛 [kmp/browser] 修复Jmm打开dweb-deeplink会错误创建图层的问题

BioforestChain · May 28, 2024 · 2017733 · 2017733
1 parent 6a1a7be
commit 2017733
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/...browser/src/commonMain/kotlin/org/dweb_browser/browser/mwebview/MultiWebViewController.kt b/...browser/src/commonMain/kotlin/org/dweb_browser/browser/mwebview/MultiWebViewController.kt
@@ -9,6 +9,7 @@ import kotlinx.serialization.json.JsonPrimitive
 import org.dweb_browser.browser.common.createDwebView
 import org.dweb_browser.core.ipc.Ipc
 import org.dweb_browser.core.module.MicroModule
+import org.dweb_browser.core.std.dns.nativeFetch
 import org.dweb_browser.dwebview.IDWebView
 import org.dweb_browser.dwebview.base.ViewItem
 import org.dweb_browser.helper.ChangeableList
@@ -95,7 +96,12 @@ class MultiWebViewController(
     ).also { viewItem ->
       webViewList.add(viewItem)
       dWebView.onCreateWindow {
-        appendWebViewAsItem(it)
+        val url = it.getUrl()
+        if (url.startsWith("dweb://")) {
+          dWebView.remoteMM.nativeFetch(url)
+        } else {
+          appendWebViewAsItem(it)
+        }
       }
       dWebView.onDestroy {
         closeWebView(webviewId)

diff --git a/next/kmp/dwebview/src/androidMain/kotlin/org/dweb_browser/dwebview/DWebView.android.kt b/next/kmp/dwebview/src/androidMain/kotlin/org/dweb_browser/dwebview/DWebView.android.kt
@@ -93,7 +93,7 @@ class DWebView private constructor(internal val engine: DWebViewEngine, initUrl:
       }
   }
 
-
+  override val remoteMM get() = engine.remoteMM
   override val ioScope get() = engine.ioScope
   override suspend fun startLoadUrl(url: String) = withMainContext {
     engine.loadUrl(url)

diff --git a/next/kmp/dwebview/src/commonMain/kotlin/org/dweb_browser/dwebview/DWebView.kt b/next/kmp/dwebview/src/commonMain/kotlin/org/dweb_browser/dwebview/DWebView.kt
@@ -38,6 +38,7 @@ expect suspend fun IDWebView.Companion.create(
 ): IDWebView
 
 abstract class IDWebView(initUrl: String?) {
+  abstract val remoteMM: MicroModule.Runtime
   abstract val ioScope: CoroutineScope
 
   @Serializable

diff --git a/next/kmp/dwebview/src/desktopMain/kotlin/org/dweb_browser/dwebview/DWebView.desktop.kt b/next/kmp/dwebview/src/desktopMain/kotlin/org/dweb_browser/dwebview/DWebView.desktop.kt
@@ -52,6 +52,7 @@ class DWebView(
     }
   }
 
+  override val remoteMM get() = viewEngine.remoteMM
   override val ioScope: CoroutineScope
     get() = viewEngine.ioScope
 

diff --git a/next/kmp/dwebview/src/iosMain/kotlin/org/dweb_browser/dwebview/DWebView.ios.kt b/next/kmp/dwebview/src/iosMain/kotlin/org/dweb_browser/dwebview/DWebView.ios.kt
@@ -103,6 +103,7 @@ class DWebView private constructor(
   }
 
 
+  override val remoteMM get() = engine.remoteMM
   private var _engine: DWebViewEngine? = viewEngine
   internal val engine get() = _engine ?: throw NullPointerException("dwebview already been destroy")
   private val _engineLazy = RememberLazy(viewEngine) { _engine }