Merge remote-tracking branch 'origin/master'

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/MiraiHttpAPIServer.kt

@@ -11,10 +11,15 @@ package net.mamoe.mirai.api.http
 
 import io.ktor.application.Application
 import io.ktor.server.cio.CIO
+import io.ktor.server.engine.applicationEngineEnvironment
+import io.ktor.server.engine.connector
 import io.ktor.server.engine.embeddedServer
 import io.ktor.util.KtorExperimentalAPI
 import net.mamoe.mirai.api.http.route.mirai
 import net.mamoe.mirai.utils.DefaultLogger
+import org.slf4j.LoggerFactory
+import org.slf4j.helpers.NOPLogger
+import org.slf4j.helpers.NOPLoggerFactory
 
 object MiraiHttpAPIServer {
 
@@ -39,7 +44,14 @@ object MiraiHttpAPIServer {
 
         // TODO: start是无阻塞的，理应获取启动状态后再执行后续代码
         try {
-            embeddedServer(CIO, port, module = Application::mirai).start()
+            embeddedServer(CIO, environment = applicationEngineEnvironment {
+                this.log = NOPLoggerFactory().getLogger("NMYSL")
+                this.module(Application::mirai)
+
+                connector {
+                    this.port = port
+                }
+            }).start()
 
             logger.info("Http api server is running with authKey: ${SessionManager.authKey}")
             callback?.invoke()

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/BaseRoute.kt

@@ -35,11 +35,18 @@ import net.mamoe.mirai.api.http.data.common.DTO
 import net.mamoe.mirai.api.http.data.common.VerifyDTO
 import net.mamoe.mirai.api.http.util.jsonParseOrNull
 import net.mamoe.mirai.api.http.util.toJson
+import org.slf4j.Logger
+import org.slf4j.helpers.NOPLogger
+import org.slf4j.helpers.NOPLoggerFactory
+import org.slf4j.impl.SimpleLogger
+import org.slf4j.impl.SimpleLoggerFactory
 
 fun Application.mirai() {
     install(DefaultHeaders)
-    install(CallLogging)
+    install(CallLogging) {
+        logger = NOPLoggerFactory().getLogger("NMSL")
 
+    }
     authModule()
     messageModule()
     infoModule()

mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt

@@ -19,6 +19,7 @@ import net.mamoe.mirai.api.http.generateSessionKey
 import net.mamoe.mirai.contact.sendMessage
 import net.mamoe.mirai.utils.MiraiLogger
 import java.io.File
+import java.io.PrintStream
 import kotlin.concurrent.thread
 
 object MiraiConsole {
@@ -37,8 +38,7 @@ object MiraiConsole {
     val pluginManager: PluginManager
         get() = PluginManager
 
-    var logger: MiraiConsoleLogger =
-        UIPushLogger()
+    var logger = UIPushLogger(0)
 
     var path: String = System.getProperty("user.dir")
 
@@ -255,11 +255,11 @@ object MiraiConsole {
         }
     }
 
-    class UIPushLogger(override val identity: String?, override var follower: MiraiLogger?) : MiraiLogger {
-        override fun invoke(any: Any?) {
+    class UIPushLogger(val identity: Long) {
+        operator fun invoke(any: Any? = null) {
             MiraiConsoleUI.start()
             if (any != null) {
-                MiraiConsoleUI.pushLog(0, "[Mirai$version $build]: $any")
+                MiraiConsoleUI.pushLog(identity, "[Mirai$version $build]: $any")
             }
         }
     }
@@ -281,6 +281,7 @@ class MiraiConsoleLoader {
     companion object {
         @JvmStatic
         fun main(args: Array<String>) {
+
             MiraiConsole.start()
             Runtime.getRuntime().addShutdownHook(thread(start = false) {
                 MiraiConsole.stop()

mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt

@@ -11,6 +11,8 @@ import com.googlecode.lanterna.terminal.Terminal
 import com.googlecode.lanterna.terminal.TerminalResizeListener
 import com.googlecode.lanterna.terminal.swing.SwingTerminal
 import com.googlecode.lanterna.terminal.swing.SwingTerminalFrame
+import java.io.OutputStream
+import java.io.PrintStream
 import java.lang.StringBuilder
 import java.util.*
 import kotlin.concurrent.thread
@@ -29,9 +31,9 @@ object MiraiConsoleUI {
         log[uin] = LimitLinkedQueue()
     }
 
-    fun pushLog(uin: Long, str: String) {
-        log[uin]!!.push(str)
-    }
+
+    lateinit var terminal: Terminal
+    lateinit var textGraphics: TextGraphics
 
     var hasStart = false
     fun start() {
@@ -40,275 +42,274 @@ object MiraiConsoleUI {
         }
         hasStart = true
         val defaultTerminalFactory = DefaultTerminalFactory()
-        var terminal: Terminal? = null
         try {
             terminal = defaultTerminalFactory.createTerminal()
             terminal.enterPrivateMode()
             terminal.clearScreen()
             terminal.setCursorVisible(false)
         } catch (e: Exception) {
-            terminal = SwingTerminalFrame("Mirai Console")
-            terminal.enterPrivateMode()
-            terminal.clearScreen()
-            terminal.setCursorVisible(false)
-        }
-        if (terminal == null) {
-            error("can not create terminal")
+            try {
+                terminal = SwingTerminalFrame("Mirai Console")
+                terminal.enterPrivateMode()
+                terminal.clearScreen()
+                terminal.setCursorVisible(false)
+            } catch (e: Exception) {
+                error("can not create terminal")
+            }
         }
+        textGraphics = terminal.newTextGraphics()
 
-        val textGraphics: TextGraphics = terminal.newTextGraphics()
+        terminal.addResizeListener(TerminalResizeListener { terminal1: Terminal, newSize: TerminalSize ->
+            terminal.clearScreen()
+            inited = false
+            update()
+            redrawCommand()
+        })
 
-        try {
-            fun getLeftScreenId(): Int {
-                var newId = currentScreenId - 1
-                if (newId < 0) {
-                    newId = screens.size - 1
-                }
-                return newId
-            }
+        update()
 
-            fun getRightScreenId(): Int {
-                var newId = 1 + currentScreenId
-                if (newId >= screens.size) {
-                    newId = 0
-                }
-                return newId
-            }
+        val charList = listOf(',', '.', '/', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '=', '+', '!', ' ')
+        thread {
+            while (true) {
+                var keyStroke: KeyStroke = terminal.readInput()
 
-            fun getScreenName(id: Int): String {
-                return when (screens[id]) {
-                    0L -> {
-                        "Console Screen"
+                when (keyStroke.keyType) {
+                    KeyType.ArrowLeft -> {
+                        currentScreenId = getLeftScreenId()
+                        update()
+                    }
+                    KeyType.ArrowRight -> {
+                        currentScreenId = getRightScreenId()
+                        update()
+                    }
+                    KeyType.Enter -> {
+                        emptyCommand()
                     }
                     else -> {
-                        "Bot: ${screens[id]}"
+                        if (keyStroke.character != null) {
+                            if (keyStroke.character.toInt() == 8) {
+                                deleteCommandChar()
+                            }
+                            if (keyStroke.character.isLetterOrDigit() || charList.contains(keyStroke.character)) {
+                                addCommandChar(keyStroke.character)
+                            }
+                        }
                     }
                 }
             }
+        }
+    }
 
+    fun getLeftScreenId(): Int {
+        var newId = currentScreenId - 1
+        if (newId < 0) {
+            newId = screens.size - 1
+        }
+        return newId
+    }
 
-            var inited = false
-            fun clearRows(row: Int) {
-                textGraphics.putString(0, row, " ".repeat(terminal.terminalSize.columns))
-            }
+    fun getRightScreenId(): Int {
+        var newId = 1 + currentScreenId
+        if (newId >= screens.size) {
+            newId = 0
+        }
+        return newId
+    }
 
-            fun drawFrame(
-                title: String
-            ) {
-                val width = terminal.terminalSize.columns
-                val height = terminal.terminalSize.rows
-                terminal.setBackgroundColor(TextColor.ANSI.DEFAULT)
-                if (!inited) {
-                    val mainTitle = "Mirai Console v0.01 Core v0.14"
-                    textGraphics.foregroundColor = TextColor.ANSI.WHITE
-                    textGraphics.backgroundColor = TextColor.ANSI.GREEN
-                    textGraphics.putString((width - mainTitle.length) / 2, 1, mainTitle, SGR.BOLD)
-                    textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
-                    textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
-                    textGraphics.putString(2, 3, "-".repeat(width - 4))
-                    textGraphics.putString(2, 5, "-".repeat(width - 4))
-                    textGraphics.putString(2, height - 4, "-".repeat(width - 4))
-                    textGraphics.putString(2, height - 3, "|>>>")
-                    textGraphics.putString(width - 3, height - 3, "|")
-                    textGraphics.putString(2, height - 2, "-".repeat(width - 4))
-                    inited = true
-                }
-                textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
-                textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
-                val leftName = getScreenName(getLeftScreenId())
-                clearRows(2)
-                textGraphics.putString((width - title.length) / 2 - "$leftName << ".length, 2, "$leftName << ")
-                textGraphics.foregroundColor = TextColor.ANSI.WHITE
-                textGraphics.backgroundColor = TextColor.ANSI.YELLOW
-                textGraphics.putString((width - title.length) / 2, 2, title, SGR.BOLD)
-                textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
-                textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
-                val rightName = getScreenName(getRightScreenId())
-                textGraphics.putString((width + title.length) / 2 + 1, 2, ">> $rightName")
+    fun getScreenName(id: Int): String {
+        return when (screens[id]) {
+            0L -> {
+                "Console Screen"
             }
-
-            fun drawMainFrame(
-                onlineBotCount: Number
-            ) {
-                drawFrame("Console Screen")
-                val width = terminal.terminalSize.columns
-                textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
-                textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
-                clearRows(4)
-                textGraphics.putString(2, 4, "|Online Bots: $onlineBotCount")
-                textGraphics.putString(
-                    width - 2 - "Powered By Mamoe Technologies|".length,
-                    4,
-                    "Powered By Mamoe Technologies|"
-                )
+            else -> {
+                "Bot: ${screens[id]}"
             }
+        }
+    }
 
-            fun drawBotFrame(
-                qq: Long,
-                adminCount: Number
-            ) {
-                drawFrame("Bot: $qq")
-                val width = terminal.terminalSize.columns
-                textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
-                textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
-                clearRows(4)
-                textGraphics.putString(2, 4, "|Admins: $adminCount")
-                textGraphics.putString(width - 2 - "Add admins via commands|".length, 4, "Add admins via commands|")
-            }
 
-            fun drawLogs(values: List<String>) {
-                val width = terminal.terminalSize.columns - 6
-                val heightMin = 5
+    var inited = false
+    fun clearRows(row: Int) {
+        textGraphics.putString(0, row, " ".repeat(terminal.terminalSize.columns))
+    }
 
-                var currentHeight = terminal.terminalSize.rows - 5
+    fun drawFrame(
+        title: String
+    ) {
+        val width = terminal.terminalSize.columns
+        val height = terminal.terminalSize.rows
+        terminal.setBackgroundColor(TextColor.ANSI.DEFAULT)
+        if (!inited) {
+            val mainTitle = "Mirai Console v0.01 Core v0.15"
+            textGraphics.foregroundColor = TextColor.ANSI.WHITE
+            textGraphics.backgroundColor = TextColor.ANSI.GREEN
+            textGraphics.putString((width - mainTitle.length) / 2, 1, mainTitle, SGR.BOLD)
+            textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
+            textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
+            textGraphics.putString(2, 3, "-".repeat(width - 4))
+            textGraphics.putString(2, 5, "-".repeat(width - 4))
+            textGraphics.putString(2, height - 4, "-".repeat(width - 4))
+            textGraphics.putString(2, height - 3, "|>>>")
+            textGraphics.putString(width - 3, height - 3, "|")
+            textGraphics.putString(2, height - 2, "-".repeat(width - 4))
+            inited = true
+        }
+        textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
+        textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
+        val leftName = getScreenName(getLeftScreenId())
+        clearRows(2)
+        textGraphics.putString((width - title.length) / 2 - "$leftName << ".length, 2, "$leftName << ")
+        textGraphics.foregroundColor = TextColor.ANSI.WHITE
+        textGraphics.backgroundColor = TextColor.ANSI.YELLOW
+        textGraphics.putString((width - title.length) / 2, 2, title, SGR.BOLD)
+        textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
+        textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
+        val rightName = getScreenName(getRightScreenId())
+        textGraphics.putString((width + title.length) / 2 + 1, 2, ">> $rightName")
+    }
 
-                for (index in heightMin until currentHeight) {
-                    clearRows(index)
-                }
+    fun drawMainFrame(
+        onlineBotCount: Number
+    ) {
+        drawFrame("Console Screen")
+        val width = terminal.terminalSize.columns
+        textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
+        textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
+        clearRows(4)
+        textGraphics.putString(2, 4, "|Online Bots: $onlineBotCount")
+        textGraphics.putString(
+            width - 2 - "Powered By Mamoe Technologies|".length,
+            4,
+            "Powered By Mamoe Technologies|"
+        )
+    }
 
-                values.forEach {
-                    if (currentHeight > heightMin) {
-                        var x = it
-                        while (currentHeight > heightMin) {
-                            if (x.isEmpty() || x.isBlank()) break
-                            textGraphics.foregroundColor = TextColor.ANSI.GREEN
-                            textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
-                            val towrite = if (x.length > width) {
-                                x.substring(0, width).also {
-                                    x = x.substring(width)
-                                }
-                            } else {
-                                x.also {
-                                    x = ""
-                                }
-                            }
-                            textGraphics.putString(3, currentHeight, towrite, SGR.ITALIC)
-                            --currentHeight
-                        }
-                    }
-                }
+    fun drawBotFrame(
+        qq: Long,
+        adminCount: Number
+    ) {
+        drawFrame("Bot: $qq")
+        val width = terminal.terminalSize.columns
+        textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
+        textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
+        clearRows(4)
+        textGraphics.putString(2, 4, "|Admins: $adminCount")
+        textGraphics.putString(width - 2 - "Add admins via commands|".length, 4, "Add admins via commands|")
+    }
 
-                if (terminal is SwingTerminalFrame) {
-                    terminal.flush()
-                }
-            }
+    fun drawLogs(values: List<String>) {
+        val width = terminal.terminalSize.columns - 6
+        val heightMin = 5
 
+        var currentHeight = terminal.terminalSize.rows - 5
 
-            var commandBuilder = StringBuilder()
+        for (index in heightMin until currentHeight) {
+            clearRows(index)
+        }
 
-            fun redrawCommand() {
-                val height = terminal.terminalSize.rows
-                val width = terminal.terminalSize.columns
-                clearRows(height - 3)
-                textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
-                textGraphics.putString(2, height - 3, "|>>>")
-                textGraphics.putString(width - 3, height - 3, "|")
-                textGraphics.foregroundColor = TextColor.ANSI.BLUE
-                textGraphics.putString(7, height - 3, commandBuilder.toString())
-                if (terminal is SwingTerminalFrame) {
-                    terminal.flush()
+        values.forEach {
+            if (currentHeight > heightMin) {
+                var x = it
+                while (currentHeight > heightMin) {
+                    if (x.isEmpty() || x.isBlank()) break
+                    textGraphics.foregroundColor = TextColor.ANSI.GREEN
+                    textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
+                    val towrite = if (x.length > width) {
+                        x.substring(0, width).also {
+                            x = x.substring(width)
+                        }
+                    } else {
+                        x.also {
+                            x = ""
+                        }
+                    }
+                    textGraphics.putString(3, currentHeight, towrite, SGR.ITALIC)
+                    --currentHeight
                 }
             }
+        }
 
-            fun addCommandChar(
-                c: Char
-            ) {
-                if (commandBuilder.isEmpty() && c != '/') {
-                    addCommandChar('/')
-                }
-                textGraphics.foregroundColor = TextColor.ANSI.BLUE
-                val height = terminal.terminalSize.rows
-                commandBuilder.append(c)
-                if (terminal is SwingTerminalFrame) {
-                    redrawCommand()
-                } else {
-                    textGraphics.putString(6 + commandBuilder.length, height - 3, c.toString())
-                }
-            }
+        textGraphics.putString(3, 9, "AAAAAAAAAAAAAAAAAAAAAAa", SGR.ITALIC)
+        terminal.flush()
+    }
 
-            fun deleteCommandChar() {
-                if (!commandBuilder.isEmpty()) {
-                    commandBuilder = StringBuilder(commandBuilder.toString().substring(0, commandBuilder.length - 1))
-                }
-                val height = terminal.terminalSize.rows
-                if (terminal is SwingTerminalFrame) {
-                    redrawCommand()
-                } else {
-                    textGraphics.putString(7 + commandBuilder.length, height - 3, " ")
-                }
-            }
+    fun pushLog(uin: Long, str: String) {
+        log[uin]!!.push(str)
+        if (uin == screens[currentScreenId]) {
+            drawLogs(log[screens[currentScreenId]]!!)
+        }
+    }
 
 
-            fun emptyCommand() {
-                commandBuilder = StringBuilder()
-                redrawCommand()
-                if (terminal is SwingTerminal) {
-                    terminal.flush()
-                }
-            }
+    var commandBuilder = StringBuilder()
 
-            fun update() {
-                when (screens[currentScreenId]) {
-                    0L -> {
-                        drawMainFrame(screens.size - 1)
-                    }
-                    else -> {
-                        drawBotFrame(screens[currentScreenId], 0)
-                    }
-                }
-                terminal.flush()
+    fun redrawCommand() {
+        val height = terminal.terminalSize.rows
+        val width = terminal.terminalSize.columns
+        clearRows(height - 3)
+        textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
+        textGraphics.putString(2, height - 3, "|>>>")
+        textGraphics.putString(width - 3, height - 3, "|")
+        textGraphics.foregroundColor = TextColor.ANSI.BLUE
+        textGraphics.putString(7, height - 3, commandBuilder.toString())
+        if (terminal is SwingTerminalFrame) {
+            terminal.flush()
+        }
+    }
 
-            }
+    fun addCommandChar(
+        c: Char
+    ) {
+        if (commandBuilder.isEmpty() && c != '/') {
+            addCommandChar('/')
+        }
+        textGraphics.foregroundColor = TextColor.ANSI.BLUE
+        val height = terminal.terminalSize.rows
+        commandBuilder.append(c)
+        if (terminal is SwingTerminalFrame) {
+            redrawCommand()
+        } else {
+            textGraphics.putString(6 + commandBuilder.length, height - 3, c.toString())
+        }
+    }
 
-            terminal.addResizeListener(TerminalResizeListener { terminal1: Terminal, newSize: TerminalSize ->
-                terminal.clearScreen()
-                inited = false
-                update()
-                redrawCommand()
-            })
+    fun deleteCommandChar() {
+        if (!commandBuilder.isEmpty()) {
+            commandBuilder = StringBuilder(commandBuilder.toString().substring(0, commandBuilder.length - 1))
+        }
+        val height = terminal.terminalSize.rows
+        if (terminal is SwingTerminalFrame) {
+            redrawCommand()
+        } else {
+            textGraphics.putString(7 + commandBuilder.length, height - 3, " ")
+        }
+    }
 
-            update()
 
-            val charList = listOf(',', '.', '/', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '=', '+', '!', ' ')
-            thread {
-                while (true) {
-                    var keyStroke: KeyStroke = terminal.readInput()
+    fun emptyCommand() {
+        commandBuilder = StringBuilder()
+        redrawCommand()
+        if (terminal is SwingTerminal) {
+            terminal.flush()
+        }
+    }
 
-                    when (keyStroke.keyType) {
-                        KeyType.ArrowLeft -> {
-                            currentScreenId = getLeftScreenId()
-                            update()
-                        }
-                        KeyType.ArrowRight -> {
-                            currentScreenId = getRightScreenId()
-                            update()
-                        }
-                        KeyType.Enter -> {
-                            emptyCommand()
-                        }
-                        else -> {
-                            if (keyStroke.character != null) {
-                                if (keyStroke.character.toInt() == 8) {
-                                    deleteCommandChar()
-                                }
-                                if (keyStroke.character.isLetterOrDigit() || charList.contains(keyStroke.character)) {
-                                    addCommandChar(keyStroke.character)
-                                }
-                            }
-                        }
-                    }
-                }
+    fun update() {
+        when (screens[currentScreenId]) {
+            0L -> {
+                drawMainFrame(screens.size - 1)
+            }
+            else -> {
+                drawBotFrame(screens[currentScreenId], 0)
             }
-
-        } catch (e: Exception) {
-            e.printStackTrace()
         }
+        terminal.flush()
     }
 }
 
 class LimitLinkedQueue<T>(
     val limit: Int = 50
-) : LinkedList<T>() {
+) : LinkedList<T>(), List<T> {
     override fun push(e: T) {
         if (size >= limit) {
             pollLast()