🐛 [kmp] 修复android 16kb page size异常

kingsword09 · kingsword09 · commit 9b8f774406d3 · 2025-03-18T18:04:58.000+08:00
diff --git a/next/kmp/browser/src/iosMain/kotlin/org/dweb_browser/browser/zip/ZipApi.ios.kt b/next/kmp/browser/src/iosMain/kotlin/org/dweb_browser/browser/zip/ZipApi.ios.kt
@@ -1,6 +1,6 @@
 package org.dweb_browser.browser.zip
 
-import ziplib.decompress as decompressByRust
+import org.dweb_browser.ziplib.decompress as decompressByRust
 
 actual fun decompress(zipFilePath: String, destPath: String) =
   decompressByRust(zipFilePath, destPath).toLong() == 0L
diff --git a/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/std/file/ext/MicroModuleBlob.kt b/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/std/file/ext/MicroModuleBlob.kt
@@ -32,7 +32,7 @@ private suspend fun MicroModule.Runtime.createBlobFromUrl(
   val data = response.binary()
   val mime = response.headers.get("Content-Type")
     ?.let { ct -> ContentType.parse(ct).mime }
-  val ext = url.pathSegments.lastOrNull()?.run {
+  val ext = url.segments.lastOrNull()?.run {
     when (val index = lastIndexOf('.')) {
       -1 -> null
       else -> substring(index + 1, length)
diff --git a/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/std/http/MultipartNMM.kt b/next/kmp/core/src/commonMain/kotlin/org/dweb_browser/core/std/http/MultipartNMM.kt
@@ -8,10 +8,10 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.cbor.Cbor
 import kotlinx.serialization.encodeToByteArray
-import multipart.MultipartConsumer
-import multipart.getBoundary
-import multipart.processMultipartOpen
-import multipart.processMultipartWrite
+import org.dweb_browser.multipart.MultipartConsumer
+import org.dweb_browser.multipart.getBoundary
+import org.dweb_browser.multipart.processMultipartOpen
+import org.dweb_browser.multipart.processMultipartWrite
 import org.dweb_browser.core.http.router.ResponseException
 import org.dweb_browser.core.http.router.bind
 import org.dweb_browser.core.module.BootstrapContext
diff --git a/next/kmp/core/src/mobileMain/kotlin/org/dweb_browser/core/http/dwebProxyService.mobile.kt b/next/kmp/core/src/mobileMain/kotlin/org/dweb_browser/core/http/dwebProxyService.mobile.kt
@@ -14,7 +14,7 @@ import org.dweb_browser.core.std.http.debugHttp
 import org.dweb_browser.helper.eprintln
 import org.dweb_browser.helper.globalIoScope
 import org.dweb_browser.pure.http.onPortChange
-import reverse_proxy.VoidCallback
+import org.dweb_browser.reverse_proxy.VoidCallback
 
 actual class DwebProxyService actual constructor() {
   private val lock = Mutex()
@@ -52,13 +52,13 @@ actual class DwebProxyService actual constructor() {
                 }
                 if (backendServerPort != newPort) {
                   backendServerPort = newPort
-                  reverse_proxy.forward(newPort)
+                  org.dweb_browser.reverse_proxy.forward(newPort)
                   debugHttp("DwebViewProxy/onPortChange", "ReverseProxySetForward done")
                 }
               }
             }
           }
-          reverse_proxy.start(DWEB_SSL_PEM, backendServerPort, proxyReadyCallback)
+          org.dweb_browser.reverse_proxy.start(DWEB_SSL_PEM, backendServerPort, proxyReadyCallback)
           debugHttp("reverse_proxy", "stopped")
         } catch (e: Throwable) {
           debugHttp("reverse_proxy", "error", e)
diff --git a/next/kmp/dwebview/src/androidMain/kotlin/org/dweb_browser/dwebview/engine/DWebDownloadListener.kt b/next/kmp/dwebview/src/androidMain/kotlin/org/dweb_browser/dwebview/engine/DWebDownloadListener.kt
@@ -37,7 +37,7 @@ class DWebDownloadListener(val engine: DWebViewEngine) : DownloadListener {
   ) {
     val suggestedFilename = contentDisposition?.substringAfter("filename=")?.ifEmpty { null }
     // 否则使用链接的最后一部分作为文件名
-      ?: Url(url).pathSegments.lastOrNull()
+      ?: Url(url).segments.lastOrNull()
       // 否则使用随机文件名
       ?: (randomUUID() + (ContentType.parse(mimetype).fileExtensions().firstOrNull() ?: ""))
 
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
@@ -107,8 +107,8 @@ class DWebViewEngine(
   val preferences = WKPreferences()
   preferences.javaScriptEnabled = true
   preferences.javaScriptCanOpenWindowsAutomatically = false
-  // @see: https://developer.apple.com/documentation/webkit/wkpreferences/inactiveschedulingpolicy-swift.enum/none
-  preferences.inactiveSchedulingPolicy = WKInactiveSchedulingPolicy.WKInactiveSchedulingPolicyNone
+  // // @see: https://developer.apple.com/documentation/webkit/wkpreferences/inactiveschedulingpolicy-swift.enum/none
+  // preferences.inactiveSchedulingPolicy = WKInactiveSchedulingPolicy.WKInactiveSchedulingPolicyNone
   configuration.preferences = preferences
   configuration.allowsInlineMediaPlayback = true
   configuration.allowsAirPlayForMediaPlayback = true
diff --git a/next/kmp/gradle/libs.versions.toml b/next/kmp/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ jvmTarget = "17"
 javaVersion = "VERSION_17" # JavaVersion.VERSION_17
 ksp = "2.1.20-Beta2-1.0.30"
 
-agp = "8.8.1"
+agp = "8.8.2"
 androidx-baselineprofile-version = "1.3.3"
 kotlin-version = "2.1.20-Beta2"
 kotlin-serialization-gradle = "2.1.20-Beta2"
@@ -35,7 +35,7 @@ androidx-biometric = "1.4.0-alpha02"
 ktor-version = "3.1.0"
 
 kotlinx-coroutines-version = "1.10.1"
-kotlinx-datetime-version = "0.6.1"
+kotlinx-datetime-version = "0.6.2"
 kotlinx-atomicfu-version = "0.27.0"
 kotlinx-io-version = "0.6.0"
 kotlinx-html-version = "0.11.0"
@@ -66,7 +66,7 @@ jxbrowser-version = "8.4.0"
 jxbrowser-gradle = "1.2.1"
 
 # jna
-java-jna-version = "5.16.0"
+java-jna-version = "5.17.0"
 webkit = "1.12.1"
 
 junit = "1.2.1"
@@ -78,7 +78,7 @@ log4j12 = "2.0.12"
 
 filekit = "0.8.0"
 
-dweb-version = "1.1.2"
+dweb-version = "1.2.0"
 
 [libraries]
 
diff --git a/next/kmp/pureHttp/src/mobileMain/kotlin/org/dweb_browser/pure/http/pureProxyService.mobile.kt b/next/kmp/pureHttp/src/mobileMain/kotlin/org/dweb_browser/pure/http/pureProxyService.mobile.kt
@@ -14,7 +14,7 @@ import org.dweb_browser.dwebview.debugDWebView
 import org.dweb_browser.helper.eprintln
 import org.dweb_browser.helper.globalIoScope
 import org.dweb_browser.pure.http.onPortChange
-import reverse_proxy.VoidCallback
+import org.dweb_browser.reverse_proxy.VoidCallback
 
 
 actual class DwebProxyService actual constructor() {
@@ -53,13 +53,13 @@ actual class DwebProxyService actual constructor() {
                 }
                 if (backendServerPort != newPort) {
                   backendServerPort = newPort
-                  reverse_proxy.forward(newPort)
+                  org.dweb_browser.reverse_proxy.forward(newPort)
                   debugDWebView("DwebViewProxy/onPortChange", "ReverseProxySetForward done")
                 }
               }
             }
           }
-          reverse_proxy.start(backendServerPort, proxyReadyCallback)
+          org.dweb_browser.reverse_proxy.start(backendServerPort, proxyReadyCallback)
           debugDWebView("reverse_proxy", "stopped")
         } catch (e: Throwable) {
           debugDWebView("reverse_proxy", "error", e)
diff --git a/next/kmp/pureImage/src/commonMain/kotlin/org/dweb_browser/pure/image/compose/ResvgImageLoader.kt b/next/kmp/pureImage/src/commonMain/kotlin/org/dweb_browser/pure/image/compose/ResvgImageLoader.kt
@@ -18,9 +18,9 @@ import org.dweb_browser.pure.http.PureServerRequest
 import org.dweb_browser.pure.http.defaultHttpPureClient
 import org.dweb_browser.pure.http.ext.FetchHookContext
 import org.dweb_browser.pure.http.fetch
-import resvg_render.FitMode
-import resvg_render.RenderOptions
-import resvg_render.svgToPng
+import org.dweb_browser.resvg_render.FitMode
+import org.dweb_browser.resvg_render.RenderOptions
+import org.dweb_browser.resvg_render.svgToPng
 
 val LocalResvgImageLoader = compositionLocalOf { ResvgImageLoader.defaultInstance }
 val debugResvg = Debugger("resvg")
diff --git a/next/kmp/window/src/commonMain/kotlin/org/dweb_browser/sys/window/ext/FileSystemIcons.kt b/next/kmp/window/src/commonMain/kotlin/org/dweb_browser/sys/window/ext/FileSystemIcons.kt
@@ -13,13 +13,13 @@ import dweb_browser_kmp.window.generated.resources.Res
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlinx.serialization.json.Json
-import mix_compression.zstdDecompress
 import org.dweb_browser.core.module.MicroModule
 import org.dweb_browser.helper.SafeHashMap
 import org.dweb_browser.helper.SuspendOnce
 import org.dweb_browser.helper.base64String
 import org.dweb_browser.helper.utf8Binary
 import org.dweb_browser.helper.utf8String
+import org.dweb_browser.mix_compression.zstdDecompress
 import org.dweb_browser.pure.image.compose.ImageLoadResult
 import org.dweb_browser.pure.image.compose.PureImageLoader
 import org.dweb_browser.pure.image.compose.SmartLoad
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import org.dweb_browser.core.std.http.debugHttp`
`14`	`14`	`import org.dweb_browser.helper.eprintln`
`15`	`15`	`import org.dweb_browser.helper.globalIoScope`
`16`	`16`	`import org.dweb_browser.pure.http.onPortChange`
`17`		`-import reverse_proxy.VoidCallback`
	`17`	`+import org.dweb_browser.reverse_proxy.VoidCallback`
`18`	`18`
`19`	`19`	`actual class DwebProxyService actual constructor() {`
`20`	`20`	`private val lock = Mutex()`
`@@ -52,13 +52,13 @@ actual class DwebProxyService actual constructor() {`
`52`	`52`	`}`
`53`	`53`	`if (backendServerPort != newPort) {`
`54`	`54`	`backendServerPort = newPort`
`55`		`- reverse_proxy.forward(newPort)`
	`55`	`+ org.dweb_browser.reverse_proxy.forward(newPort)`
`56`	`56`	`debugHttp("DwebViewProxy/onPortChange", "ReverseProxySetForward done")`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- reverse_proxy.start(DWEB_SSL_PEM, backendServerPort, proxyReadyCallback)`
	`61`	`+ org.dweb_browser.reverse_proxy.start(DWEB_SSL_PEM, backendServerPort, proxyReadyCallback)`
`62`	`62`	`debugHttp("reverse_proxy", "stopped")`
`63`	`63`	`} catch (e: Throwable) {`
`64`	`64`	`debugHttp("reverse_proxy", "error", e)`