💥(coreLib/db) DBApi更新

Author: way-zer

scripts/coreLibrary/DBConnector.kts

@@ -0,0 +1,29 @@
+@file:Import("com.h2database:h2:2.0.206", mavenDepends = true)
+
+import cf.wayzer.scriptAgent.util.Services
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.DatabaseConfig
+import org.jetbrains.exposed.sql.ExperimentalKeywordApi
+import java.sql.DriverManager
+
+val enable by config.key(true, "开启H2DB")
+val preserveKeywordCasing by config.key(true, "是否保留关键字大小写, 老用户请设置为false")
+val preserveKeywordCasing0 get() = preserveKeywordCasing
+
+onEnable {
+    if (!enable) {
+        ScriptManager.disableScript(this, "配置关闭")
+        return@onEnable
+    }
+    Class.forName("org.h2.Driver")
+
+    val path = Config.dataDir.resolve("h2DB.db").absolutePath
+    val db = Database.connect({
+        DriverManager.getConnection("jdbc:h2:$path")
+    }, DatabaseConfig {
+        @OptIn(ExperimentalKeywordApi::class)
+        preserveKeywordCasing = preserveKeywordCasing0
+    })
+    @OptIn(SAExperimentalApi::class)
+    Services.provide(db)
+}

scripts/coreLibrary/db/h2db.kts

@@ -1,10 +1,11 @@
-@file:Import("org.jetbrains.exposed:exposed-core:0.59.0", mavenDepends = true)
-@file:Import("org.jetbrains.exposed:exposed-dao:0.59.0", mavenDepends = true)
-@file:Import("org.jetbrains.exposed:exposed-java-time:0.59.0", mavenDepends = true)
-@file:Import("org.jetbrains.exposed:exposed-jdbc:0.59.0", mavenDepends = true)
-
-package coreLibrary
-
+package coreLib.db
+
+import cf.wayzer.scriptAgent.ScriptRegistry
+import cf.wayzer.scriptAgent.define.SAExperimentalApi
+import cf.wayzer.scriptAgent.define.Script
+import cf.wayzer.scriptAgent.util.DSLBuilder
+import cf.wayzer.scriptAgent.util.Services
+import coreLibrary.lib.getOrNull
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IdTable
 import org.jetbrains.exposed.sql.*
@@ -13,14 +14,17 @@ import org.jetbrains.exposed.sql.javatime.timestamp
 import org.jetbrains.exposed.sql.transactions.TransactionManager
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.time.Instant
-import java.util.logging.Level
 import kotlin.system.measureTimeMillis
 
+@OptIn(SAExperimentalApi::class)
+object DBApi {
+    val db = Services.get<Database>()
+
+    private var Script.registeredTable: List<Table>? by DSLBuilder.dataKey()
 
-@Suppress("unused", "MemberVisibilityCanBePrivate")
-object DB : ServiceRegistry<Database>() {
     object TableVersion : IdTable<String>("TableVersion") {
         // can't use `text` as h2db don't support for primaryKey
+
         override val id: Column<EntityID<String>> = varchar("table", 64).entityId()
         override val primaryKey: PrimaryKey = PrimaryKey(id) // h2database#2191
 
@@ -65,9 +69,6 @@ object DB : ServiceRegistry<Database>() {
         }
     }
 
-    private val key = DataKeyWithDefault("DB_registeredTable") { mutableSetOf<Table>() }
-    private val Script.registeredTable by key
-
     interface WithUpgrade {
         val version: Int
 
@@ -80,24 +81,24 @@ object DB : ServiceRegistry<Database>() {
     /**
      * 为模块注册表格
      * 注册时不一定立刻运行
-     * 会等[DB]初始化后统一注册
+     * 会等[db]初始化后统一注册
      * 如果DB有版本变化,请实现[WithUpgrade]，未实现默认版本号1
      */
-    @Synchronized
-    @ScriptDsl
-    fun Script.registerTable(vararg t: Table) {
-        registeredTable.addAll(t)
-        if (provided)
-            transaction {
+    context(script: Script)
+    fun registerTable(vararg t: Table) {
+        script.registeredTable = script.registeredTable.orEmpty() + t
+        db.getOrNull()?.let {
+            transaction(it) {
                 withDataBaseLock { initTable(t.asIterable()) }
             }
+        }
     }
 
     @Synchronized
-    internal fun initDB(db: Database) {
+    fun initDB(db: Database) {
         TransactionManager.defaultDatabase = db
-        val allTable = ScriptRegistry.allScripts { it.inst?.dslExists(key) == true }
-            .flatMapTo(mutableSetOf()) { it.inst!!.registeredTable }
+        val allTable = ScriptRegistry.allScripts { it.inst != null }
+            .flatMapTo(mutableSetOf()) { it.inst?.registeredTable.orEmpty() }
 
         transaction {
             withDataBaseLock {
@@ -114,12 +115,4 @@ object DB : ServiceRegistry<Database>() {
         }
         exposedLogger.info("Finish check upgrade for ${tables.size} tables, costs $time ms")
     }
-}
-
-DB.subscribe(this) {
-    try {
-        DB.initDB(it)
-    } catch (e: Exception) {
-        logger.log(Level.SEVERE, "Error when initDB", e)
-    }
 }

scripts/coreLibrary/DBApi.kts scripts/coreLibrary/db/lib/DBApi.ktscripts/coreLibrary/DBApi.kts renamed to scripts/coreLibrary/db/lib/DBApi.kt

@@ -0,0 +1,25 @@
+@file:Depends("coreLibrary")
+@file:Import("org.jetbrains.exposed:exposed-core:0.59.0", mavenDepends = true)
+@file:Import("org.jetbrains.exposed:exposed-dao:0.59.0", mavenDepends = true)
+@file:Import("org.jetbrains.exposed:exposed-java-time:0.59.0", mavenDepends = true)
+@file:Import("org.jetbrains.exposed:exposed-jdbc:0.59.0", mavenDepends = true)
+
+import coreLib.db.DBApi
+import java.util.logging.Level
+
+onEnable {
+    launch {
+        @OptIn(SAExperimentalApi::class)
+        DBApi.db.observe().collect {
+            if (it.size > 1) {
+                logger.warning("More than one database registered: $it")
+            }
+            val db = it.firstOrNull() ?: return@collect
+            try {
+                DBApi.initDB(db)
+            } catch (e: Exception) {
+                logger.log(Level.SEVERE, "Error when initDB", e)
+            }
+        }
+    }
+}

scripts/coreLibrary/db/module.kts

@@ -0,0 +1,29 @@
+@file:Import("org.postgresql:postgresql:42.7.5", mavenDepends = true)
+
+import cf.wayzer.scriptAgent.util.Services
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.DatabaseConfig
+import org.jetbrains.exposed.sql.ExperimentalKeywordApi
+
+val url by config.key("postgresql://db:5432/postgres", "数据库连接uri")
+val user by config.key("", "用户名")
+val password by config.key("", "密码")
+val preserveKeywordCasing by config.key(true, "是否保留关键字大小写, 老用户请设置为false")
+val preserveKeywordCasing0 get() = preserveKeywordCasing
+
+onEnable {
+    if (user.isEmpty() || password.isEmpty()) {
+        ScriptManager.disableScript(this, "配置无效，请先通过sa config设置user/password.")
+        return@onEnable
+    }
+
+    Class.forName("org.postgresql.Driver")
+    val db = Database.connect({
+        java.sql.DriverManager.getConnection("jdbc:$url", user, password)
+    }, DatabaseConfig {
+        @OptIn(ExperimentalKeywordApi::class)
+        preserveKeywordCasing = preserveKeywordCasing0
+    })
+    @OptIn(SAExperimentalApi::class)
+    Services.provide(db)
+}