github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-23 22:00:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Link mirai-core in console IT, fix non-hard-linked dependencies resolving

Browse Source
This commit is contained in:
Karlatemp 2022-04-23 17:13:58 +08:00
parent e6e8f77f41
commit 35c08e8b16
No known key found for this signature in database
GPG Key ID: C6B606FF23D8FED7
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mirai-console/backend/integration-test/build.gradle.kts
View File

@ -27,6 +27,7 @@ kotlin {
dependencies {
api(project(":mirai-core-api"))
api(project(":mirai-core-utils"))
testRuntimeOnly(project(":mirai-core"))
api(project(":mirai-console-compiler-annotations"))
api(project(":mirai-console"))
api(project(":mirai-console-terminal"))

38
mirai-console/backend/mirai-console/src/internal/plugin/JvmPluginClassLoader.kt
View File

@ -104,6 +104,40 @@ internal class DynLibClassLoader(
}
}
internal fun findButNoSystem(name: String): Class<*>? {
val pt = this.parent
if (pt is DynLibClassLoader) {
pt.findButNoSystem(name)?.let { return it }
}
synchronized(getClassLoadingLock(name)) {
findLoadedClass(name)?.let { return it }
try {
findClass(name)?.let { return it }
} catch (ignored: ClassNotFoundException) {
}
}
return null
}
override fun loadClass(name: String, resolve: Boolean): Class<*> {
if (name.startsWith("java.")) return Class.forName(name, false, null)
val pt = this.parent
val topPt: ClassLoader? = if (pt is DynLibClassLoader) {
pt.findButNoSystem(name)?.let { return it }
generateSequence<ClassLoader>(pt) { it.parent }.firstOrNull { it !is DynLibClassLoader }
} else pt
synchronized(getClassLoadingLock(name)) {
findLoadedClass(name)?.let { return it }
try {
return findClass(name)
} catch (ignored: ClassNotFoundException) {
}
return Class.forName(name, false, topPt)
}
}
}
@Suppress("JoinDeclarationAndAssignment")
@ -134,6 +168,7 @@ internal class JvmPluginClassLoaderN : URLClassLoader {
init0()
}
@Suppress("Since15")
private constructor(file: File, ctx: JvmPluginsLoadingCtx) : super(
file.name,
arrayOf(), ctx.sharedLibrariesLoader
@ -223,7 +258,7 @@ internal class JvmPluginClassLoaderN : URLClassLoader {
} else {
pluginIndependentCL.addLib(lib)
}
logger.debug { "Linked $artifact $linkType" }
logger.debug { "Linked $artifact $linkType <${if (shared) pluginSharedCL else pluginIndependentCL}>" }
}
}
@ -268,6 +303,7 @@ internal class JvmPluginClassLoaderN : URLClassLoader {
override fun loadClass(name: String, resolve: Boolean): Class<*> = loadClass(name)
override fun loadClass(name: String): Class<*> {
if (name.startsWith("java.")) return Class.forName(name, false, null)
if (name.startsWith("io.netty") || name in AllDependenciesClassesHolder.allclasses) {
return AllDependenciesClassesHolder.appClassLoader.loadClass(name)
}