From b38c262df074aa81284112bb02570aa4a55d979c Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 3 Oct 2019 19:07:03 +0800 Subject: [PATCH] Multiplatform with gradle building --- .gitignore | 9 +- build.gradle | 28 +++ dependencies.gradle | 18 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55616 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 188 +++++++++++++++ gradlew.bat | 100 ++++++++ mirai-api/build.gradle | 7 + mirai-api/pom.xml | 51 ----- .../src/main/java/net/mamoe/mirai/Bot.java | 3 - .../main/java/net/mamoe/mirai/MiraiAPI.java | 64 ------ mirai-console/build.gradle | 18 ++ mirai-console/pom.xml | 99 -------- .../main/java/net/mamoe/mirai/MiraiMain.java | 3 - .../main/java/net/mamoe/mirai/MiraiServer.kt | 26 +-- mirai-core/build.gradle | 58 +++++ mirai-core/pom.xml | 118 ---------- .../kotlin/net.mamoe.mirai/utils/Util.kt | 3 + .../kotlin}/net/mamoe/mirai/Bot.kt | 0 .../kotlin}/net/mamoe/mirai/BotHelper.kt | 3 +- .../jvmMain/kotlin/net/mamoe/mirai/Mirai.kt | 9 + .../net/mamoe/mirai/contact/Contact.kt | 3 +- .../kotlin}/net/mamoe/mirai/contact/Group.kt | 0 .../kotlin}/net/mamoe/mirai/contact/QQ.kt | 0 .../kotlin}/net/mamoe/mirai/event/Event.kt | 0 .../net/mamoe/mirai/event/Subscribers.kt | 0 .../mamoe/mirai/event/events/bot/BotEvent.kt | 0 .../mirai/event/events/group/GroupEvent.kt | 0 .../event/events/group/GroupMessageEvent.kt | 0 .../events/network/ClientPacketEvents.kt | 0 .../mirai/event/events/network/PacketEvent.kt | 0 .../events/network/ServerPacketEvents.kt | 0 .../mirai/event/events/qq/FriendEvent.kt | 0 .../event/events/qq/FriendMessageEvent.kt | 0 .../event/internal/InternalEventListenres.kt | 0 .../net/mamoe/mirai/message/FaceID.java | 0 .../net/mamoe/mirai/message/Message.kt | 0 .../net/mamoe/mirai/message/MessageId.kt | 0 .../net/mamoe/mirai/message/MessageKey.kt | 0 .../net/mamoe/mirai/message/defaults/At.kt | 0 .../net/mamoe/mirai/message/defaults/Face.kt | 0 .../net/mamoe/mirai/message/defaults/Image.kt | 0 .../mirai/message/defaults/MessageChain.kt | 0 .../mamoe/mirai/message/defaults/PlainText.kt | 0 .../mirai/message/defaults/UnsolvedImage.kt | 3 +- .../mamoe/mirai/network/BotNetworkHandler.kt | 7 +- .../net/mamoe/mirai/network/LoginSession.kt | 18 +- .../net/mamoe/mirai/network/NetworkScope.kt | 0 .../protocol/tim/TIMBotNetworkHandler.kt | 79 +++---- .../mirai/network/protocol/tim/TIMProtocol.kt | 0 .../tim/handler/ActionPacketHandler.kt | 2 +- .../protocol/tim/handler/DataPacketSocket.kt | 5 +- .../tim/handler/MessagePacketHandler.kt | 0 .../protocol/tim/handler/PacketHandler.kt | 0 .../tim/handler/TemporaryPacketHandler.kt | 5 +- .../protocol/tim/packet/ClientPacket.kt | 2 - .../network/protocol/tim/packet/GradeInfo.kt | 0 .../network/protocol/tim/packet/Heartbeat.kt | 0 .../network/protocol/tim/packet/Packet.kt | 0 .../network/protocol/tim/packet/PacketId.java | 0 .../protocol/tim/packet/ServerEvent.kt | 0 .../protocol/tim/packet/ServerPacket.kt | 2 +- .../tim/packet/UnknownServerPacket.kt | 0 .../protocol/tim/packet/action/AddContact.kt | 0 .../tim/packet/action/AddFriendResult.kt | 0 .../action/ClientSendFriendMessagePacket.kt | 0 .../action/ClientSendGroupMessagePacket.kt | 0 .../tim/packet/image/UploadGroupImage.kt | 0 .../login/ClientChangeOnlineStatusPacket.kt | 0 .../protocol/tim/packet/login/ClientLogin.kt | 0 .../protocol/tim/packet/login/LoginState.kt | 0 .../network/protocol/tim/packet/login/SKey.kt | 0 .../login/ServerLoginResponseFailedPacket.kt | 0 .../ServerLoginResponseKeyExchangePacket.kt | 0 ...rverLoginResponsePasswordVerifiedPacket.kt | 0 ...LoginResponseVerificationCodeInitPacket.kt | 0 .../packet/login/ServerLoginSuccessPacket.kt | 0 .../protocol/tim/packet/login/Session.kt | 0 .../protocol/tim/packet/login/Touch.kt | 0 .../tim/packet/login/VerificationCode.kt | 0 .../mirai/plugin/MiraiPluginManager.java | 0 .../net/mamoe/mirai/task/MiraiTaskManager.kt | 135 +++++++++++ .../net/mamoe/mirai/task/MiraiThreadPool.kt | 35 +++ .../net/mamoe/mirai/utils/BotAccount.kt | 0 .../mamoe/mirai/utils/CharImageConverter.kt | 79 +++++++ .../net/mamoe/mirai/utils/CharImageUtil.kt | 15 ++ .../mamoe/mirai/utils/ClientLoginStatus.kt | 17 ++ .../net/mamoe/mirai/utils/ContactList.kt | 0 .../net/mamoe/mirai/utils/EventException.java | 0 .../mamoe/mirai/utils/ImageNetworkUtils.kt | 31 +++ .../net/mamoe/mirai/utils/LoggerTextFormat.kt | 32 +++ .../net/mamoe/mirai/utils/MiraiLogger.kt | 0 .../utils/MiraiSynchronizedLinkedHashMap.java | 11 +- .../utils/MiraiSynchronizedLinkedList.java | 18 +- .../kotlin}/net/mamoe/mirai/utils/TEA.kt | 0 .../kotlin}/net/mamoe/mirai/utils/Tested.kt | 0 .../kotlin}/net/mamoe/mirai/utils/Utils.kt | 1 + .../kotlin}/net/mamoe/mirai/utils/Varint.kt | 0 .../mamoe/mirai/utils/config/MiraiConfig.kt | 58 +++++ .../utils/config/MiraiConfigSection.java | 2 - .../utils/setting/MiraiSettingListSection.kt | 50 ++++ .../utils/setting/MiraiSettingMapSection.kt | 88 +++++++ .../utils/setting/MiraiSettingSection.kt | 12 + .../mirai/utils/setting/MiraiSettings.kt | 101 ++++++++ .../src/main/java/net/mamoe/mirai/Mirai.kt | 21 -- .../mamoe/mirai/plugin/MiraiPluginBase.java | 16 -- .../mirai/task/MiraiTaskExceptionHandler.java | 18 -- .../mamoe/mirai/task/MiraiTaskManager.java | 132 ----------- .../net/mamoe/mirai/task/MiraiThreadPool.java | 36 --- .../mamoe/mirai/utils/CharImageConverter.java | 92 -------- .../net/mamoe/mirai/utils/CharImageUtil.java | 17 -- .../mamoe/mirai/utils/ClientLoginStatus.java | 22 -- .../mamoe/mirai/utils/ImageNetworkUtils.java | 31 --- .../mamoe/mirai/utils/LoggerTextFormat.java | 39 ---- .../mamoe/mirai/utils/config/MiraiConfig.java | 67 ------ .../setting/MiraiSettingListSection.java | 54 ----- .../utils/setting/MiraiSettingMapSection.java | 100 -------- .../utils/setting/MiraiSettingSection.java | 14 -- .../mirai/utils/setting/MiraiSettings.java | 103 --------- mirai-debug/build.gradle | 15 ++ mirai-debug/pom.xml | 101 -------- .../main/{kotlin => java}/HexComparator.java | 12 +- .../main/{kotlin => java}/PacketDebuger.kt | 6 +- mirai-demos/mirai-demo-1/build.gradle | 8 + mirai-demos/mirai-demo-1/pom.xml | 57 ----- .../mirai-demo-1/src/main/java/demo1/Main.kt | 2 +- mirai-demos/pom.xml | 30 --- mirai-ui/pom.xml | 39 ---- pom.xml | 215 ------------------ settings.gradle | 15 ++ 130 files changed, 1213 insertions(+), 1671 deletions(-) create mode 100644 build.gradle create mode 100644 dependencies.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 mirai-api/build.gradle delete mode 100644 mirai-api/pom.xml delete mode 100644 mirai-api/src/main/java/net/mamoe/mirai/MiraiAPI.java create mode 100644 mirai-console/build.gradle delete mode 100644 mirai-console/pom.xml create mode 100644 mirai-core/build.gradle delete mode 100644 mirai-core/pom.xml create mode 100644 mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Util.kt rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/Bot.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/BotHelper.kt (85%) create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Mirai.kt rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/contact/Contact.kt (94%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/contact/Group.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/contact/QQ.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/Event.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/Subscribers.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/bot/BotEvent.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/group/GroupEvent.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/group/GroupMessageEvent.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/network/ClientPacketEvents.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/network/PacketEvent.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/network/ServerPacketEvents.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/qq/FriendEvent.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/events/qq/FriendMessageEvent.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/event/internal/InternalEventListenres.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/FaceID.java (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/Message.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/MessageId.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/MessageKey.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/defaults/At.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/defaults/Face.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/defaults/Image.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/defaults/MessageChain.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/defaults/PlainText.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/message/defaults/UnsolvedImage.kt (97%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/BotNetworkHandler.kt (93%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/LoginSession.kt (86%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/NetworkScope.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt (87%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt (98%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/handler/DataPacketSocket.kt (91%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/handler/MessagePacketHandler.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/handler/PacketHandler.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/handler/TemporaryPacketHandler.kt (91%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt (99%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/GradeInfo.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/Heartbeat.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/Packet.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/PacketId.java (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/ServerEvent.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt (99%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/UnknownServerPacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/action/AddContact.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/action/AddFriendResult.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendFriendMessagePacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendGroupMessagePacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/image/UploadGroupImage.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/ClientChangeOnlineStatusPacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/LoginState.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/SKey.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseFailedPacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseKeyExchangePacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponsePasswordVerifiedPacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseVerificationCodeInitPacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginSuccessPacket.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/Session.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/Touch.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/plugin/MiraiPluginManager.java (100%) create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiTaskManager.kt create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiThreadPool.kt rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/BotAccount.kt (100%) create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageConverter.kt create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageUtil.kt create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ClientLoginStatus.kt rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/ContactList.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/EventException.java (100%) create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ImageNetworkUtils.kt create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoggerTextFormat.kt rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/MiraiLogger.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/MiraiSynchronizedLinkedHashMap.java (94%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/MiraiSynchronizedLinkedList.java (90%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/TEA.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/Tested.kt (100%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/Utils.kt (99%) rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/Varint.kt (100%) create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/config/MiraiConfig.kt rename mirai-core/src/{main/java => jvmMain/kotlin}/net/mamoe/mirai/utils/config/MiraiConfigSection.java (98%) create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingListSection.kt create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.kt create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingSection.kt create mode 100644 mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettings.kt delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/Mirai.kt delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/plugin/MiraiPluginBase.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageConverter.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageUtil.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/ClientLoginStatus.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/ImageNetworkUtils.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/config/MiraiConfig.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingListSection.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingSection.java delete mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettings.java create mode 100644 mirai-debug/build.gradle delete mode 100644 mirai-debug/pom.xml rename mirai-debug/src/main/{kotlin => java}/HexComparator.java (98%) rename mirai-debug/src/main/{kotlin => java}/PacketDebuger.kt (98%) create mode 100644 mirai-demos/mirai-demo-1/build.gradle delete mode 100644 mirai-demos/mirai-demo-1/pom.xml delete mode 100644 mirai-demos/pom.xml delete mode 100644 mirai-ui/pom.xml delete mode 100644 pom.xml create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 5c5f3d5a4..d4e87ac68 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,6 @@ # Package Files # *.war -*.jar -!/mirai-debug/lib/jpcap.jar *.nar *.ear *.zip @@ -23,6 +21,8 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +target/ +build/ .idea/ *.iml @@ -31,4 +31,7 @@ mirai.iml .idea/* /.idea/* -/test \ No newline at end of file +/test + + +.gradle/ \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..c8c1a9424 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +buildscript { + ext.kotlin_version = '1.3.50' + + repositories { + jcenter() + google() + } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + group = "net.mamoe" + version = "1.0" + + repositories { + jcenter() + mavenCentral() + google() + maven { url "https://mirrors.huaweicloud.com/repository/maven/" } + maven { url "http://repo.maven.apache.org/maven2" } + } + + apply from: rootProject.file('dependencies.gradle') +} + diff --git a/dependencies.gradle b/dependencies.gradle new file mode 100644 index 000000000..e6eb9f0cc --- /dev/null +++ b/dependencies.gradle @@ -0,0 +1,18 @@ +ext { + // dependencies + + // kotlin + kotlinJvm = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + kotlinCommon = "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlin_version" + + // coroutine + coroutine_version = "1.3.0" + coroutine = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version" + coroutineCommon = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutine_version" + coroutineNative = "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:$coroutine_version" + coroutineAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutine_version" + coroutineJs = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutine_version" + + // reflect + reflect = "org.jetbrains.kotlin:kotlin-reflect:$coroutine_version" +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..5c2d1cf016b3885f6930543d57b744ea8c220a1a GIT binary patch literal 55616 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..9618d8d96 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/mirai-api/build.gradle b/mirai-api/build.gradle new file mode 100644 index 000000000..b6f9cceb8 --- /dev/null +++ b/mirai-api/build.gradle @@ -0,0 +1,7 @@ +apply plugin: "kotlin" +apply plugin: "java" + +dependencies { + implementation project(':mirai-core') + implementation project(':mirai-console') +} diff --git a/mirai-api/pom.xml b/mirai-api/pom.xml deleted file mode 100644 index d21f6f18e..000000000 --- a/mirai-api/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - - net.mamoe - mirai - 1.0 - - - mirai-api - 1.0 - - - - - - net.mamoe - mirai-core - 1.0 - compile - - - - - net.mamoe - mirai-console - 1.0 - compile - - - - - - - /src/main/resources - - - **/*.* - - - - - - - - - - \ No newline at end of file diff --git a/mirai-api/src/main/java/net/mamoe/mirai/Bot.java b/mirai-api/src/main/java/net/mamoe/mirai/Bot.java index 5126fbd75..db9ebf9be 100644 --- a/mirai-api/src/main/java/net/mamoe/mirai/Bot.java +++ b/mirai-api/src/main/java/net/mamoe/mirai/Bot.java @@ -1,13 +1,10 @@ package net.mamoe.mirai; -import lombok.Getter; - import java.util.ArrayList; import java.util.List; public class Bot { - @Getter private final long qq; public Bot(long qq){ diff --git a/mirai-api/src/main/java/net/mamoe/mirai/MiraiAPI.java b/mirai-api/src/main/java/net/mamoe/mirai/MiraiAPI.java deleted file mode 100644 index 9562c5a6f..000000000 --- a/mirai-api/src/main/java/net/mamoe/mirai/MiraiAPI.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.mamoe.mirai; - -import java.util.ArrayList; -import java.util.List; - -/** - * MiraiAPI provides - * - the status of the Mirai-Core - * - the fundamental bot operations. - * - the plugin status. - *

- * It was designed for users, not developers, - * Web-based controller, UI controller or console is depending on Mirai-API - *

- * Mirai-API does NOT contains fancy objects, and this means there are less functions it can do compare with Mirai-Core - *

- * Again, for extending/developing Mirai, you should refer to Mirai-Core - * for only using , you should refer to Mirai-API - */ -public class MiraiAPI { - - public static void startMirai(String[] args) { - MiraiMain.main(args); - } - - public static void closeMirai() { - MiraiServer.INSTANCE.shutdown(); - } - - public static void restartMirai(String[] args) { - MiraiServer.INSTANCE.shutdown(); - MiraiMain.main(args); - } - - public static String getMiraiVersion() { - return MiraiServer.MIRAI_VERSION; - } - - public static String getQQPortocolVersion() { - return MiraiServer.QQ_VERSION; - } - - public static boolean isMiraiEnabled() { - // TODO: 2019/10/2 - return false; - } - - public static List getEnabledPluginList() { - return new ArrayList<>(); - } - - public static List getEnabledBots() { - return new ArrayList<>(); - } - - public static Bot getBot(long qq) { - return new Bot(qq); - } - - public static void addBot(long qq, String password) { - - } - -} diff --git a/mirai-console/build.gradle b/mirai-console/build.gradle new file mode 100644 index 000000000..b83a3e379 --- /dev/null +++ b/mirai-console/build.gradle @@ -0,0 +1,18 @@ +apply plugin: "kotlin" +apply plugin: "application" +apply plugin: "java" + +dependencies { + compile project(':mirai-core') + + compile rootProject.ext.kotlinCommon + compile rootProject.ext.kotlinJvm + compile rootProject.ext.reflect + compile rootProject.ext.coroutine +} + +sourceCompatibility = "11" + +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} \ No newline at end of file diff --git a/mirai-console/pom.xml b/mirai-console/pom.xml deleted file mode 100644 index 95552b1ec..000000000 --- a/mirai-console/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - 4.0.0 - - - net.mamoe - mirai - 1.0 - - - mirai-console - 1.0 - - - - net.mamoe - mirai-core - 1.0 - compile - - - org.jetbrains.kotlin - kotlin-stdlib - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - - - - - /src/main/resources - - - **/*.* - - - - - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - - - 1.8 - - - - org.apache.maven.plugins - maven-compiler-plugin - - - compile - compile - - compile - - - - testCompile - test-compile - - testCompile - - - - - - - - \ No newline at end of file diff --git a/mirai-console/src/main/java/net/mamoe/mirai/MiraiMain.java b/mirai-console/src/main/java/net/mamoe/mirai/MiraiMain.java index ad26ce338..ccb8eb44a 100644 --- a/mirai-console/src/main/java/net/mamoe/mirai/MiraiMain.java +++ b/mirai-console/src/main/java/net/mamoe/mirai/MiraiMain.java @@ -1,13 +1,10 @@ package net.mamoe.mirai; -import lombok.Getter; - /** * @author NaturalHG */ public final class MiraiMain { - @Getter private static MiraiServer server; public static void main(String[] args) { diff --git a/mirai-console/src/main/java/net/mamoe/mirai/MiraiServer.kt b/mirai-console/src/main/java/net/mamoe/mirai/MiraiServer.kt index afdd20e5b..385726e65 100644 --- a/mirai-console/src/main/java/net/mamoe/mirai/MiraiServer.kt +++ b/mirai-console/src/main/java/net/mamoe/mirai/MiraiServer.kt @@ -1,9 +1,7 @@ package net.mamoe.mirai import kotlinx.coroutines.runBlocking -import lombok.Getter import net.mamoe.mirai.network.protocol.tim.packet.login.LoginState -import net.mamoe.mirai.task.MiraiTaskManager import net.mamoe.mirai.utils.* import net.mamoe.mirai.utils.config.MiraiConfig import net.mamoe.mirai.utils.setting.MiraiSettings @@ -22,22 +20,11 @@ import java.util.concurrent.ExecutionException * @author NaturalHG */ object MiraiServer { - const val MIRAI_VERSION = "1.0.0" - - const val QQ_VERSION = "4.9.0" - - @Getter //is running under UNIX var isUnix: Boolean = false private set - @Getter var parentFolder: File = File(System.getProperty("user.dir")) - @Getter - var taskManager: MiraiTaskManager - internal set - - @Getter var logger: MiraiLogger internal set @@ -52,9 +39,8 @@ object MiraiServer { this.isUnix = !System.getProperties().getProperty("os.name").toUpperCase().contains("WINDOWS") this.logger = MiraiLogger - this.taskManager = MiraiTaskManager.getInstance() - logger.info("About to run Mirai (" + MiraiServer.MIRAI_VERSION + ") under " + if (isUnix) "unix" else "windows") + logger.info("About to run Mirai (" + Mirai.VERSION + ") under " + if (isUnix) "unix" else "windows") logger.info("Loading data under " + LoggerTextFormat.GREEN + this.parentFolder) val setting = this.parentFolder + "/Mirai.ini" @@ -117,17 +103,17 @@ object MiraiServer { this.settings = MiraiSettings(setting) val network = this.settings.getMapSection("network") - network.set("enable_proxy", "not supporting yet") + network["enable_proxy"] = "not supporting yet" val proxy = this.settings.getListSection("proxy") proxy.add("1.2.3.4:95") proxy.add("1.2.3.4:100") val worker = this.settings.getMapSection("worker") - worker.set("core_task_pool_worker_amount", 5) + worker["core_task_pool_worker_amount"] = 5 val plugin = this.settings.getMapSection("plugin") - plugin.set("debug", false) + plugin["debug"] = false this.settings.save() logger.info("initialized; changing can be made in setting file: $setting") @@ -142,7 +128,7 @@ object MiraiServer { private fun reload() { this.enabled = true MiraiLogger.info(LoggerTextFormat.GREEN.toString() + "Server enabled; Welcome to Mirai") - MiraiLogger.info("Mirai Version=" + MiraiServer.MIRAI_VERSION + " QQ Version=" + MiraiServer.QQ_VERSION) + MiraiLogger.info("Mirai Version=" + Mirai.VERSION) MiraiLogger.info("Initializing [Bot]s") @@ -189,7 +175,7 @@ object MiraiServer { val strings = it.split("----").dropLastWhile { it.isEmpty() }.toTypedArray() val bot = Bot(BotAccount(strings[0].toLong(), strings[1]), Console()) - if (runBlocking { bot.network.tryLogin(200).await() } === LoginState.SUCCESS) { + if (runBlocking { bot.network.tryLogin(200) } === LoginState.SUCCESS) { bot.green("Login succeed") return bot } diff --git a/mirai-core/build.gradle b/mirai-core/build.gradle new file mode 100644 index 000000000..6403a2f58 --- /dev/null +++ b/mirai-core/build.gradle @@ -0,0 +1,58 @@ +apply plugin: "kotlin-multiplatform" + +kotlin { + targets { + fromPreset(presets.jvm, "jvm") + } + jvm() + + sourceSets { + commonMain { + dependencies { + // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect + implementation rootProject.ext.kotlinCommon + implementation rootProject.ext.reflect + implementation rootProject.ext.coroutine + implementation rootProject.ext.kotlinJvm + } + } + jvmMain { + dependencies { + implementation rootProject.ext.kotlinJvm + implementation rootProject.ext.reflect + implementation rootProject.ext.coroutine + + + implementation 'org.yaml:snakeyaml:1.18' + implementation 'org.jsoup:jsoup:1.12.1' + implementation 'org.ini4j:ini4j:0.5.2' + + } + } + + all { + languageSettings.enableLanguageFeature("InlineClasses") + } + } +} + +compileKotlinJvm{ + +} + +configurations { + compileClasspath +} + +/* +dependencies { + compile 'com.google.protobuf:protobuf-java:3.5.0' + compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-M2' + compile 'io.netty:netty-all:4.1.38.Final' + compile 'net.java.dev.jna:jna:5.4.0' + compile 'org.apache.logging.log4j:log4j-core:2.12.1' + compile 'org.yaml:snakeyaml:1.18' + compile 'org.jetbrains.kotlin:kotlin-reflect:1.3.41' + compile 'org.jsoup:jsoup:1.12.1' + compile 'org.ini4j:ini4j:0.5.2' +}*/ \ No newline at end of file diff --git a/mirai-core/pom.xml b/mirai-core/pom.xml deleted file mode 100644 index bb5550386..000000000 --- a/mirai-core/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - - mirai-core - 1.0 - - jar - - - net.mamoe - mirai - 1.0 - ../pom.xml - - - - - - jpcap - jpcap - 0.1.18-002 - system - ../mirai-debug/lib/jpcap.jar - - - - com.google.protobuf - protobuf-java - - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - - - - io.netty - netty-all - - - - net.java.dev.jna - jna - - - - org.jetbrains.kotlin - kotlin-stdlib - - - - org.apache.logging.log4j - log4j-core - - - - org.yaml - snakeyaml - - - - org.jetbrains.kotlin - kotlin-reflect - compile - - - - org.jsoup - jsoup - compile - - - - org.ini4j - ini4j - compile - - - - - - - - /src/main/resources - - - **/*.* - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - org.projectlombok - lombok-maven-plugin - - - - org.jetbrains.kotlin - kotlin-maven-plugin - - - -XXLanguage:+InlineClasses - - - - - - - \ No newline at end of file diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Util.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Util.kt new file mode 100644 index 000000000..431a372df --- /dev/null +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Util.kt @@ -0,0 +1,3 @@ +package net.mamoe.mirai.utils + +//todo \ No newline at end of file diff --git a/mirai-core/src/main/java/net/mamoe/mirai/Bot.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/Bot.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Bot.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/BotHelper.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotHelper.kt similarity index 85% rename from mirai-core/src/main/java/net/mamoe/mirai/BotHelper.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotHelper.kt index e782004a6..9cdb2c090 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/BotHelper.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotHelper.kt @@ -1,6 +1,5 @@ package net.mamoe.mirai -import kotlinx.coroutines.CompletableDeferred import net.mamoe.mirai.contact.Group import net.mamoe.mirai.contact.QQ import net.mamoe.mirai.network.protocol.tim.packet.ClientPacket @@ -28,7 +27,7 @@ val Bot.qqs: ContactList get() = this.contacts.qqs //NetworkHandler suspend fun Bot.sendPacket(packet: ClientPacket) = this.network.socket.sendPacket(packet) -fun Bot.login(touchingTimeoutMillis: Long = 200): CompletableDeferred = this.network.tryLogin() +suspend fun Bot.login(touchingTimeoutMillis: Long = 200): LoginState = this.network.tryLogin() //BotAccount diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Mirai.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Mirai.kt new file mode 100644 index 000000000..1b379ee7c --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Mirai.kt @@ -0,0 +1,9 @@ +package net.mamoe.mirai + +//expect fun s(): String +/** + * @author Him188moe + */ +object Mirai { + const val VERSION: String = "1.0.0" +} \ No newline at end of file diff --git a/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt similarity index 94% rename from mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt index a1865b4fd..964b5672e 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt @@ -1,5 +1,6 @@ package net.mamoe.mirai.contact +import kotlinx.coroutines.CompletableDeferred import net.mamoe.mirai.Bot import net.mamoe.mirai.message.Message import net.mamoe.mirai.message.defaults.MessageChain @@ -24,7 +25,7 @@ abstract class Contact internal constructor(val bot: Bot, val number: Long) { /** * 上传图片 */ - fun uploadImage(session: LoginSession, image: UnsolvedImage): CompletableFuture { + fun uploadImage(session: LoginSession, image: UnsolvedImage): CompletableDeferred { return image.upload(session, this) } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/contact/Group.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/contact/Group.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Group.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/contact/QQ.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/contact/QQ.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/QQ.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/Event.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/Event.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/Event.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/Event.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/Subscribers.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/Subscribers.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/Subscribers.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/Subscribers.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/bot/BotEvent.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/bot/BotEvent.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/bot/BotEvent.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/bot/BotEvent.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/group/GroupEvent.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/group/GroupEvent.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/group/GroupEvent.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/group/GroupEvent.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/group/GroupMessageEvent.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/group/GroupMessageEvent.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/group/GroupMessageEvent.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/group/GroupMessageEvent.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ClientPacketEvents.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/network/ClientPacketEvents.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ClientPacketEvents.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/network/ClientPacketEvents.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/network/PacketEvent.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/network/PacketEvent.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/network/PacketEvent.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/network/PacketEvent.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ServerPacketEvents.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/network/ServerPacketEvents.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ServerPacketEvents.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/network/ServerPacketEvents.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/qq/FriendEvent.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/qq/FriendEvent.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/qq/FriendEvent.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/qq/FriendEvent.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/events/qq/FriendMessageEvent.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/qq/FriendMessageEvent.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/events/qq/FriendMessageEvent.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/events/qq/FriendMessageEvent.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/internal/InternalEventListenres.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/internal/InternalEventListenres.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/event/internal/InternalEventListenres.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/internal/InternalEventListenres.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/FaceID.java b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/FaceID.java similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/FaceID.java rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/FaceID.java diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/Message.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/Message.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/Message.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/Message.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/MessageId.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageId.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/MessageId.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageId.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/MessageKey.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageKey.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/MessageKey.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessageKey.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/defaults/At.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/At.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/defaults/At.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/At.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/defaults/Face.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/Face.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/defaults/Face.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/Face.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/defaults/Image.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/Image.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/defaults/Image.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/Image.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/defaults/MessageChain.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/MessageChain.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/defaults/MessageChain.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/MessageChain.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/defaults/PlainText.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/PlainText.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/message/defaults/PlainText.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/PlainText.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/message/defaults/UnsolvedImage.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/UnsolvedImage.kt similarity index 97% rename from mirai-core/src/main/java/net/mamoe/mirai/message/defaults/UnsolvedImage.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/UnsolvedImage.kt index 7fb5a3760..4faab7fb1 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/message/defaults/UnsolvedImage.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/defaults/UnsolvedImage.kt @@ -1,5 +1,6 @@ package net.mamoe.mirai.message.defaults +import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import net.mamoe.mirai.contact.Contact @@ -28,7 +29,7 @@ import javax.imageio.ImageIO class UnsolvedImage(filename: String, val image: BufferedImage) : Image(getImageId(filename)) { constructor(imageFile: File) : this(imageFile.name, ImageIO.read(imageFile)) constructor(url: URL) : this(File(url.file)) - fun upload(session: LoginSession, contact: Contact): CompletableFuture { + fun upload(session: LoginSession, contact: Contact): CompletableDeferred { return session.expectPacket { toSend { ClientTryGetImageIDPacket(session.bot.account.qqNumber, session.sessionKey, contact.number, image) } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/BotNetworkHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt similarity index 93% rename from mirai-core/src/main/java/net/mamoe/mirai/network/BotNetworkHandler.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt index 779de0073..f894c3de8 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/BotNetworkHandler.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt @@ -12,7 +12,6 @@ import net.mamoe.mirai.network.protocol.tim.packet.Packet import net.mamoe.mirai.network.protocol.tim.packet.ServerEventPacket import net.mamoe.mirai.network.protocol.tim.packet.ServerPacket import net.mamoe.mirai.network.protocol.tim.packet.login.LoginState -import java.io.Closeable /** * Mirai 的网络处理器, 它承担所有数据包([Packet])的处理任务. @@ -32,7 +31,7 @@ import java.io.Closeable * * @author Him188moe */ -interface BotNetworkHandler : Closeable { +interface BotNetworkHandler { /** * 网络层处理器. 用于编码/解码 [Packet], 发送/接受 [ByteArray] * @@ -59,7 +58,7 @@ interface BotNetworkHandler : Closeable { * * @param touchingTimeoutMillis 连接每个服务器的 timeout */ - fun tryLogin(touchingTimeoutMillis: Long = 200): CompletableDeferred + suspend fun tryLogin(touchingTimeoutMillis: Long = 200): LoginState /** * 添加一个临时包处理器 @@ -68,5 +67,5 @@ interface BotNetworkHandler : Closeable { */ fun addHandler(temporaryPacketHandler: TemporaryPacketHandler<*>) - override fun close() + fun close() } \ No newline at end of file diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/LoginSession.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/LoginSession.kt similarity index 86% rename from mirai-core/src/main/java/net/mamoe/mirai/network/LoginSession.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/LoginSession.kt index 26b4a24eb..18d0df69f 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/LoginSession.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/LoginSession.kt @@ -1,12 +1,12 @@ package net.mamoe.mirai.network +import kotlinx.coroutines.CompletableDeferred import net.mamoe.mirai.Bot import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocket import net.mamoe.mirai.network.protocol.tim.handler.TemporaryPacketHandler import net.mamoe.mirai.network.protocol.tim.packet.ClientPacket import net.mamoe.mirai.network.protocol.tim.packet.ServerPacket import net.mamoe.mirai.utils.getGTK -import java.util.concurrent.CompletableFuture /** * 登录会话. 当登录完成后, 客户端会拿到 sessionKey. @@ -58,10 +58,10 @@ class LoginSession( * @return future. 可进行超时处理 */ @JvmSynthetic - inline fun expectPacket(handlerTemporary: TemporaryPacketHandler

.() -> Unit): CompletableFuture { - val future = CompletableFuture() - this.bot.network.addHandler(TemporaryPacketHandler(P::class, future, this).also(handlerTemporary)) - return future + inline fun expectPacket(handlerTemporary: TemporaryPacketHandler

.() -> Unit): CompletableDeferred { + val deferred = CompletableDeferred() + this.bot.network.addHandler(TemporaryPacketHandler(P::class, deferred, this).also(handlerTemporary)) + return deferred } /** @@ -82,12 +82,12 @@ class LoginSession( * @return future. 可进行超时处理 */ @JvmSynthetic - inline fun expectPacket(toSend: ClientPacket, noinline handler: suspend (P) -> Unit): CompletableFuture { - val future = CompletableFuture() - this.bot.network.addHandler(TemporaryPacketHandler(P::class, future, this).also { + inline fun expectPacket(toSend: ClientPacket, noinline handler: suspend (P) -> Unit): CompletableDeferred { + val deferred = CompletableDeferred() + this.bot.network.addHandler(TemporaryPacketHandler(P::class, deferred, this).also { it.toSend(toSend) it.onExpect(handler) }) - return future + return deferred } } \ No newline at end of file diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/NetworkScope.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/NetworkScope.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/NetworkScope.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/NetworkScope.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt similarity index 87% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt index b7ca4eba5..e70ca4561 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt @@ -13,17 +13,12 @@ import net.mamoe.mirai.network.NetworkScope import net.mamoe.mirai.network.protocol.tim.handler.* import net.mamoe.mirai.network.protocol.tim.packet.* import net.mamoe.mirai.network.protocol.tim.packet.login.* -import net.mamoe.mirai.task.MiraiThreadPool import net.mamoe.mirai.utils.* -import java.io.Closeable import java.io.File import java.net.DatagramPacket import java.net.DatagramSocket import java.net.InetSocketAddress import java.util.* -import java.util.concurrent.CompletableFuture -import java.util.concurrent.ScheduledFuture -import java.util.concurrent.TimeUnit import javax.imageio.ImageIO /** @@ -53,28 +48,21 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { temporaryPacketHandlers.add(temporaryPacketHandler) } - override fun tryLogin(touchingTimeoutMillis: Long): CompletableDeferred { - val ipQueue: LinkedList = LinkedList(TIMProtocol.SERVER_IP) - val future = CompletableDeferred() + override suspend fun tryLogin(touchingTimeoutMillis: Long): LoginState { + return loginInternal(touchingTimeoutMillis, LinkedList(TIMProtocol.SERVER_IP)) + } - fun login() { - this.socket.close() - val ip = ipQueue.poll() - if (ip == null) { - future.complete(LoginState.UNKNOWN)//所有服务器均返回 UNKNOWN - return - } + private suspend fun loginInternal(touchingTimeoutMillis: Long, ipQueue: LinkedList): LoginState { + this.socket.close() + val ip = ipQueue.poll() ?: return LoginState.UNKNOWN//所有服务器均返回 UNKNOWN - this.socket.touch(ip, touchingTimeoutMillis).get().let { state -> - if (state == LoginState.UNKNOWN || state == LoginState.TIMEOUT) { - login()//超时或未知, 重试连接下一个服务器 - } else { - future.complete(state) - } + return this.socket.touch(ip, touchingTimeoutMillis).await().let { state -> + if (state == LoginState.UNKNOWN || state == LoginState.TIMEOUT) { + loginInternal(touchingTimeoutMillis, ipQueue)//超时或未知, 重试连接下一个服务器 + } else { + state } } - login() - return future } //private | internal @@ -97,7 +85,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { } - internal inner class BotSocket : Closeable, DataPacketSocket { + internal inner class BotSocket : DataPacketSocket { override suspend fun distributePacket(packet: ServerPacket) { try { packet.decode() @@ -156,7 +144,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { restartSocket() } - internal var loginFuture: CompletableFuture? = null + internal var loginResult: CompletableDeferred? = null @Synchronized private fun restartSocket() { @@ -186,23 +174,23 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { /** * Start network and touch the server */ - fun touch(serverAddress: String, timeoutMillis: Long): CompletableFuture { + fun touch(serverAddress: String, timeoutMillis: Long): CompletableDeferred { bot.info("Connecting server: $serverAddress") if (this@TIMBotNetworkHandler::login.isInitialized) { login.close() } login = Login() - this.loginFuture = CompletableFuture() + this.loginResult = CompletableDeferred() serverIP = serverAddress bot.waitForPacket(ServerPacket::class, timeoutMillis) { - loginFuture!!.complete(LoginState.TIMEOUT) + loginResult!!.complete(LoginState.TIMEOUT) } runBlocking { sendPacket(ClientTouchPacket(bot.account.qqNumber, serverIP)) } - return this.loginFuture!! + return this.loginResult!! } /** @@ -236,13 +224,14 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { override fun getOwner(): Bot = this@TIMBotNetworkHandler.bot + override fun close() { this.socket?.close() - if (this.loginFuture != null) { - if (!this.loginFuture!!.isDone) { - this.loginFuture!!.cancel(true) + if (this.loginResult != null) { + if (!this.loginResult!!.isCompleted) { + this.loginResult!!.cancel(CancellationException("socket closed")) } - this.loginFuture = null + this.loginResult = null } } @@ -254,7 +243,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { /** * 处理登录过程 */ - inner class Login : Closeable { + inner class Login { private lateinit var token00BA: ByteArray private lateinit var token0825: ByteArray//56 private var loginTime: Int = 0 @@ -269,7 +258,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { private var captchaSectionId: Int = 1 private var captchaCache: ByteArray? = byteArrayOf()//每次包只发一部分验证码来 - private var heartbeatFuture: ScheduledFuture<*>? = null + private var heartbeatJob: Job? = null suspend fun onPacketReceived(packet: ServerPacket) { @@ -289,7 +278,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { } is ServerLoginResponseFailedPacket -> { - socket.loginFuture?.complete(packet.loginState) + socket.loginResult?.complete(packet.loginState) bot.close() return } @@ -373,13 +362,13 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { is ServerSessionKeyResponsePacket -> { sessionKey = packet.sessionKey - heartbeatFuture = MiraiThreadPool.getInstance().scheduleWithFixedDelay({ - runBlocking { - socket.sendPacket(ClientHeartbeatPacket(bot.account.qqNumber, sessionKey)) - } - }, 90000, 90000, TimeUnit.MILLISECONDS) - socket.loginFuture!!.complete(LoginState.SUCCESS) + heartbeatJob = NetworkScope.launch { + delay(90000) + socket.sendPacket(ClientHeartbeatPacket(bot.account.qqNumber, sessionKey)) + } + + socket.loginResult!!.complete(LoginState.SUCCESS) login.changeOnlineStatus(ClientLoginStatus.ONLINE) } @@ -420,12 +409,12 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { socket.sendPacket(ClientChangeOnlineStatusPacket(bot.account.qqNumber, sessionKey, status)) } - override fun close() { + fun close() { this.captchaCache = null - this.heartbeatFuture?.cancel(true) + this.heartbeatJob?.cancel(CancellationException("handler closed")) - this.heartbeatFuture = null + this.heartbeatJob = null } } } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMProtocol.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt similarity index 98% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt index 8b06d7d56..7a1afa91b 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt @@ -66,7 +66,7 @@ class ActionPacketHandler(session: LoginSession) : PacketHandler(session) { session.sKey = packet.sKey session.cookies = "uin=o" + session.bot.account.qqNumber + ";skey=" + session.sKey + ";" - sKeyRefresherFuture = MiraiThreadPool.getInstance().scheduleWithFixedDelay({ + sKeyRefresherFuture = MiraiThreadPool.instance.scheduleWithFixedDelay({ runBlocking { session.socket.sendPacket(ClientSKeyRefreshmentRequestPacket(session.bot.account.qqNumber, session.sessionKey)) } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/DataPacketSocket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/DataPacketSocket.kt similarity index 91% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/DataPacketSocket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/DataPacketSocket.kt index 6f1de8fd9..8a0cad828 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/DataPacketSocket.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/DataPacketSocket.kt @@ -6,7 +6,6 @@ import net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler import net.mamoe.mirai.network.LoginSession import net.mamoe.mirai.network.protocol.tim.packet.ClientPacket import net.mamoe.mirai.network.protocol.tim.packet.ServerPacket -import java.io.Closeable /** * 网络接口. @@ -15,7 +14,7 @@ import java.io.Closeable * * @author Him188moe */ -interface DataPacketSocket : Closeable { +interface DataPacketSocket { fun getOwner(): Bot /** @@ -34,5 +33,5 @@ interface DataPacketSocket : Closeable { fun isClosed(): Boolean - override fun close() + fun close() } \ No newline at end of file diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/MessagePacketHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/MessagePacketHandler.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/MessagePacketHandler.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/MessagePacketHandler.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/PacketHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/PacketHandler.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/PacketHandler.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/PacketHandler.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/TemporaryPacketHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/TemporaryPacketHandler.kt similarity index 91% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/TemporaryPacketHandler.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/TemporaryPacketHandler.kt index c5cc63fe4..dcbdbde7a 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/TemporaryPacketHandler.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/handler/TemporaryPacketHandler.kt @@ -1,5 +1,6 @@ package net.mamoe.mirai.network.protocol.tim.handler +import kotlinx.coroutines.CompletableDeferred import net.mamoe.mirai.network.LoginSession import net.mamoe.mirai.network.protocol.tim.packet.ClientPacket import net.mamoe.mirai.network.protocol.tim.packet.ServerPacket @@ -21,7 +22,7 @@ import kotlin.reflect.KClass */ open class TemporaryPacketHandler

( private val expectationClass: KClass

, - private val future: CompletableFuture, + private val deferred: CompletableDeferred, private val fromSession: LoginSession ) { private lateinit var toSend: ClientPacket @@ -53,7 +54,7 @@ open class TemporaryPacketHandler

( if (expectationClass.isInstance(packet) && session === this.fromSession) { @Suppress("UNCHECKED_CAST") expect(packet as P) - future.complete(Unit) + deferred.complete(Unit) return true } return false diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt similarity index 99% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt index 17140fe09..764a68b63 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt @@ -2,7 +2,6 @@ package net.mamoe.mirai.network.protocol.tim.packet -import lombok.Getter import net.mamoe.mirai.network.protocol.tim.TIMProtocol import net.mamoe.mirai.network.protocol.tim.packet.PacketNameFormatter.adjustName import net.mamoe.mirai.utils.* @@ -16,7 +15,6 @@ import java.security.MessageDigest */ abstract class ClientPacket : ByteArrayDataOutputStream(), Packet { - @Getter val idHex: String private var encoded: Boolean = false diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/GradeInfo.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/GradeInfo.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/GradeInfo.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/GradeInfo.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/Heartbeat.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/Heartbeat.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/Heartbeat.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/Heartbeat.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/Packet.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/Packet.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/Packet.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/Packet.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/PacketId.java b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/PacketId.java similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/PacketId.java rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/PacketId.java diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerEvent.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ServerEvent.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerEvent.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ServerEvent.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt similarity index 99% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt index 69e40c8a3..e1b9cfb4c 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt @@ -347,7 +347,7 @@ internal fun

Bot.waitForPacket(packetClass: KClass

, timeou } - MiraiThreadPool.getInstance().submit { + MiraiThreadPool.instance.submit { val startingTime = System.currentTimeMillis() while (!got) { if (System.currentTimeMillis() - startingTime > timeoutMillis) { diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/UnknownServerPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/UnknownServerPacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/UnknownServerPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/UnknownServerPacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/AddContact.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/AddContact.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/AddContact.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/AddContact.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/AddFriendResult.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/AddFriendResult.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/AddFriendResult.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/AddFriendResult.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendFriendMessagePacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendFriendMessagePacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendFriendMessagePacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendFriendMessagePacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendGroupMessagePacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendGroupMessagePacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendGroupMessagePacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/action/ClientSendGroupMessagePacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/image/UploadGroupImage.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/image/UploadGroupImage.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/image/UploadGroupImage.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/image/UploadGroupImage.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ClientChangeOnlineStatusPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientChangeOnlineStatusPacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ClientChangeOnlineStatusPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientChangeOnlineStatusPacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ClientLogin.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/LoginState.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/LoginState.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/LoginState.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/LoginState.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/SKey.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/SKey.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/SKey.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/SKey.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseFailedPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseFailedPacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseFailedPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseFailedPacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseKeyExchangePacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseKeyExchangePacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseKeyExchangePacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseKeyExchangePacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponsePasswordVerifiedPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponsePasswordVerifiedPacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponsePasswordVerifiedPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponsePasswordVerifiedPacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseVerificationCodeInitPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseVerificationCodeInitPacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseVerificationCodeInitPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginResponseVerificationCodeInitPacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginSuccessPacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginSuccessPacket.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginSuccessPacket.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/ServerLoginSuccessPacket.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/Session.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/Session.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/Session.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/Session.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/Touch.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/Touch.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/Touch.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/Touch.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/plugin/MiraiPluginManager.java b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/plugin/MiraiPluginManager.java similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/plugin/MiraiPluginManager.java rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/plugin/MiraiPluginManager.java diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiTaskManager.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiTaskManager.kt new file mode 100644 index 000000000..d1da6bf23 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiTaskManager.kt @@ -0,0 +1,135 @@ +package net.mamoe.mirai.task + +import java.util.concurrent.Callable +import java.util.concurrent.Future +import java.util.concurrent.atomic.AtomicInteger +import java.util.function.Consumer +import java.util.function.Predicate + +/** + * @author NaturalHG + */ + +/* +class MiraiTaskManager private constructor() { + + private val pool: MiraiThreadPool + + init { + this.pool = MiraiThreadPool() + } + + /** + * 基础Future处理 + */ + + fun execute(runnable: Runnable) { + this.execute(runnable, MiraiTaskExceptionHandler.printing()) + } + + fun execute(runnable: Runnable, handler: MiraiTaskExceptionHandler) { + this.pool.execute { + try { + runnable.run() + } catch (e: Exception) { + handler.onHandle(e) + } + } + } + + + fun submit(callable: Callable): Future { + return this.submit(callable, MiraiTaskExceptionHandler.printing()) + } + + fun submit(callable: Callable, handler: MiraiTaskExceptionHandler): Future { + return this.pool.submit { + try { + callable.call() + } catch (e: Throwable) { + handler.onHandle(e) + null + } + } + } + + /** + * 异步任务 + */ + fun ansycTask(callable: Callable, callback: Consumer) { + this.ansycTask(callable, callback, MiraiTaskExceptionHandler.printing()) + } + + fun ansycTask(callable: Callable, callback: Consumer, handler: MiraiTaskExceptionHandler) { + this.pool.execute { + try { + callback.accept(callable.call()) + } catch (e: Throwable) { + handler.onHandle(e) + } + } + } + + /** + * 定时任务 + */ + + fun repeatingTask(runnable: Runnable, intervalMillis: Long) { + this.repeatingTask(runnable, intervalMillis, MiraiTaskExceptionHandler.printing()) + } + + fun repeatingTask(runnable: Runnable, intervalMillis: Long, handler: MiraiTaskExceptionHandler) { + this.repeatingTask(runnable, intervalMillis, { a -> true }, handler) + } + + fun repeatingTask(runnable: Runnable, intervalMillis: Long, times: Int) { + this.repeatingTask(runnable, intervalMillis, times, MiraiTaskExceptionHandler.printing()) + } + + fun repeatingTask(runnable: Runnable, intervalMillis: Long, times: Int, handler: MiraiTaskExceptionHandler) { + val integer = AtomicInteger(times - 1) + this.repeatingTask( + runnable, intervalMillis, { a -> integer.getAndDecrement() > 0 }, handler + ) + } + + + fun repeatingTask(runnable: D, intervalMillis: Long, shouldContinue: Predicate, handler: MiraiTaskExceptionHandler) { + Thread { + do { + this.pool.execute { + try { + runnable.run() + } catch (e: Exception) { + handler.onHandle(e) + } + } + try { + Thread.sleep(intervalMillis) + } catch (e: InterruptedException) { + e.printStackTrace() + } + + } while (shouldContinue.test(runnable)) + }.start() + } + + fun deletingTask(runnable: Runnable, intervalMillis: Long) { + Thread { + try { + Thread.sleep(intervalMillis) + } catch (e: InterruptedException) { + e.printStackTrace() + } + + this.pool.execute(runnable) + }.start() + } + + companion object { + + val instance = MiraiTaskManager() + } + +} +*/ \ No newline at end of file diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiThreadPool.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiThreadPool.kt new file mode 100644 index 000000000..9b295740b --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/task/MiraiThreadPool.kt @@ -0,0 +1,35 @@ +package net.mamoe.mirai.task + +import net.mamoe.mirai.Mirai + +import java.io.Closeable +import java.util.concurrent.ScheduledThreadPoolExecutor + +/** + * @author NaturalHG + */ +class MiraiThreadPool internal constructor()/*super(0, + Integer.MAX_VALUE, + 60L, + TimeUnit.SECONDS, + new SynchronousQueue<>() + );*/ : ScheduledThreadPoolExecutor(10), Closeable { + + + override fun close() { + this.shutdown() + if (!this.isShutdown) { + this.shutdownNow() + } + } + + companion object { + val instance = MiraiThreadPool() + + @JvmStatic + fun main(args: Array) { + println(Mirai.VERSION) + } + } + +} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/BotAccount.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotAccount.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/BotAccount.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotAccount.kt diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageConverter.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageConverter.kt new file mode 100644 index 000000000..278653c54 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageConverter.kt @@ -0,0 +1,79 @@ +package net.mamoe.mirai.utils + +import java.awt.* +import java.awt.image.BufferedImage +import java.util.ArrayList +import java.util.concurrent.Callable +import kotlin.math.max +import kotlin.math.min + +/** + * Convert IMAGE into Chars that could shows in terminal + * + * @author NaturalHG + */ +class CharImageConverter @JvmOverloads constructor( + /** + * width should depends on the width of the terminal + */ + private var image: BufferedImage?, private val width: Int, private val ignoreRate: Double = 0.95) : Callable { + + override fun call(): String { + /* + * resize Image + * */ + val newHeight = (this.image!!.getHeight() * (width.toDouble() / this.image!!.getWidth())).toInt() + val tmp = image!!.getScaledInstance(width, newHeight, Image.SCALE_SMOOTH) + val dimg = BufferedImage(width, newHeight, BufferedImage.TYPE_INT_ARGB) + val g2d = dimg.createGraphics() + g2d.drawImage(tmp, 0, 0, null) + this.image = dimg + + val background = gray(image!!.getRGB(0, 0)) + + val builder = StringBuilder() + + val lines = ArrayList(this.image!!.getHeight()) + + var minXPos = this.width + var maxXPos = 0 + + for (y in 0 until image!!.getHeight()) { + val builderLine = StringBuilder() + for (x in 0 until image!!.getWidth()) { + val gray = gray(image!!.getRGB(x, y)) + if (grayCompare(gray, background)) { + builderLine.append(" ") + } else { + builderLine.append("#") + if (x < minXPos) { + minXPos = x + } + if (x > maxXPos) { + maxXPos = x + } + } + } + if (builderLine.toString().isBlank()) { + continue + } + lines.add(builderLine) + } + for (line in lines) { + builder.append(line.substring(minXPos, maxXPos)).append("\n") + } + return builder.toString() + } + + private fun gray(rgb: Int): Int { + val R = rgb and 0xff0000 shr 16 + val G = rgb and 0x00ff00 shr 8 + val B = rgb and 0x0000ff + return (R * 30 + G * 59 + B * 11 + 50) / 100 + } + + fun grayCompare(g1: Int, g2: Int): Boolean { + return min(g1, g2).toDouble() / max(g1, g2) >= ignoreRate + } + +} diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageUtil.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageUtil.kt new file mode 100644 index 000000000..88effe66f --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/CharImageUtil.kt @@ -0,0 +1,15 @@ +package net.mamoe.mirai.utils + +import java.awt.image.BufferedImage + +/** + * @author NaturalHG + */ +object CharImageUtil { + + @JvmOverloads + fun createCharImg(image: BufferedImage, sizeWeight: Int = 100, sizeHeight: Int = 20): String { + return CharImageConverter(image, sizeWeight).call() + } + +} \ No newline at end of file diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ClientLoginStatus.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ClientLoginStatus.kt new file mode 100644 index 000000000..bbd11faa3 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ClientLoginStatus.kt @@ -0,0 +1,17 @@ +package net.mamoe.mirai.utils + +/** + * QQ 在线状态 + * + * @author Him188moe + * @see net.mamoe.mirai.network.protocol.tim.packet.login.ClientChangeOnlineStatusPacket + */ +enum class ClientLoginStatus( + // TODO: 2019/8/31 add more ClientLoginStatus + val id: Int//1 ubyte +) { + /** + * 我在线上 + */ + ONLINE(0x0A) +} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/ContactList.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ContactList.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/ContactList.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ContactList.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/EventException.java b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/EventException.java similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/EventException.java rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/EventException.java diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ImageNetworkUtils.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ImageNetworkUtils.kt new file mode 100644 index 000000000..3dbff4017 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/ImageNetworkUtils.kt @@ -0,0 +1,31 @@ +package net.mamoe.mirai.utils + +import java.io.IOException +import java.net.HttpURLConnection +import java.net.URL + +/** + * @author NaturalHG + */ +object ImageNetworkUtils { + @Throws(IOException::class) + fun postImage(uKeyHex: String, fileSize: Int, botNumber: Long, groupCode: Long, img: ByteArray): Boolean { + //http://htdata2.qq.com/cgi-bin/httpconn?htcmd=0x6ff0071&ver=5515&term=pc&ukey=” ＋ 删全部空 (ukey) ＋ “&filesize=” ＋ 到文本 (fileSize) ＋ “&range=0&uin=” ＋ g_uin ＋ “&groupcode=” ＋ Group + + val builder = "http://htdata2.qq.com/cgi-bin/httpconn?htcmd=0x6ff0071&ver=5515&term=pc" + + "&ukey=" + uKeyHex.replace(" ", "") + + "&filezise=" + fileSize + + "&range=" + "0" + + "&uin=" + botNumber + + "&groupcode=" + groupCode + val conn = URL(builder).openConnection() as HttpURLConnection + conn.setRequestProperty("User-Agent", "QQClient") + conn.setRequestProperty("Content-Length", "" + fileSize) + conn.requestMethod = "POST" + conn.doOutput = true + conn.outputStream.write(img) + + conn.connect() + return conn.responseCode == 200 + } +} diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoggerTextFormat.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoggerTextFormat.kt new file mode 100644 index 000000000..4541ba3e6 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoggerTextFormat.kt @@ -0,0 +1,32 @@ +package net.mamoe.mirai.utils + +/** + * @author NaturalHG + */ +enum class LoggerTextFormat(private val format: String) { + RESET("\u001b[0m"), + + BLUE("\u001b[0;34m"), + BLACK("\u001b[0;30m"), + DARK_GREY("\u001b[1;30m"), + LIGHT_BLUE("\u001b[1;34m"), + GREEN("\u001b[0;32m"), + LIGHT_GTEEN("\u001b[1;32m"), + CYAN("\u001b[0;36m"), + LIGHT_CYAN("\u001b[1;36m"), + RED("\u001b[0;31m"), + LIGHT_RED("\u001b[1;31m"), + PURPLE("\u001b[0;35m"), + LIGHT_PURPLE("\u001b[1;35m"), + BROWN("\u001b[0;33m"), + YELLOW("\u001b[1;33m"), + LIGHT_GRAY("\u001b[0;37m"), + WHITE("\u001b[1;37m"); + + override fun toString(): String { + //if(MiraiServer.getInstance().isUnix()){ + return format + // } + // return ""; + } +} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLogger.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLogger.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiSynchronizedLinkedHashMap.java b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiSynchronizedLinkedHashMap.java similarity index 94% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiSynchronizedLinkedHashMap.java rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiSynchronizedLinkedHashMap.java index 2c9b0673a..6c5795f84 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiSynchronizedLinkedHashMap.java +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiSynchronizedLinkedHashMap.java @@ -1,8 +1,5 @@ package net.mamoe.mirai.utils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import java.util.*; import java.util.function.BiConsumer; import java.util.function.BiFunction; @@ -54,7 +51,6 @@ public class MiraiSynchronizedLinkedHashMap extends AbstractMap { return sortedMap.get(key); } - @Nullable @Override public V put(K key, V value) { return sortedMap.put(key,value); @@ -66,7 +62,7 @@ public class MiraiSynchronizedLinkedHashMap extends AbstractMap { } @Override - public void putAll(@NotNull Map m) { + public void putAll(Map m) { sortedMap.putAll(m); } @@ -75,19 +71,16 @@ public class MiraiSynchronizedLinkedHashMap extends AbstractMap { sortedMap.clear(); } - @NotNull @Override public Set keySet() { return sortedMap.keySet(); } - @NotNull @Override public Collection values() { return sortedMap.values(); } - @NotNull @Override public Set> entrySet() { return sortedMap.entrySet(); @@ -113,7 +106,6 @@ public class MiraiSynchronizedLinkedHashMap extends AbstractMap { return this.sortedMap.replace(key,oldValue,newValue); } - @Nullable @Override public V replace(K key, V value) { return this.sortedMap.replace(key,value); @@ -144,7 +136,6 @@ public class MiraiSynchronizedLinkedHashMap extends AbstractMap { return this.sortedMap.hashCode(); } - @Nullable @Override public V putIfAbsent(K key, V value) { return this.sortedMap.putIfAbsent(key,value); diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiSynchronizedLinkedList.java b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiSynchronizedLinkedList.java similarity index 90% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiSynchronizedLinkedList.java rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiSynchronizedLinkedList.java index c88aefc87..10691f929 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiSynchronizedLinkedList.java +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiSynchronizedLinkedList.java @@ -1,7 +1,5 @@ package net.mamoe.mirai.utils; -import org.jetbrains.annotations.NotNull; - import java.util.*; import java.util.function.Consumer; import java.util.function.IntFunction; @@ -116,25 +114,21 @@ public class MiraiSynchronizedLinkedList extends AbstractList { return this.syncList.addAll(index, c); } - @NotNull @Override public Iterator iterator() { return this.syncList.iterator(); } - @NotNull @Override public ListIterator listIterator() { return this.syncList.listIterator(); } - @NotNull @Override public ListIterator listIterator(int index) { return this.syncList.listIterator(index); } - @NotNull @Override public List subList(int fromIndex, int toIndex) { return this.syncList.subList(fromIndex, toIndex); @@ -155,16 +149,14 @@ public class MiraiSynchronizedLinkedList extends AbstractList { return this.syncList.contains(o); } - @NotNull @Override public Object[] toArray() { return this.syncList.toArray(); } @SuppressWarnings("SuspiciousToArrayCall") - @NotNull @Override - public T[] toArray(@NotNull T[] a) { + public T[] toArray(T[] a) { return this.syncList.toArray(a); } @@ -174,22 +166,22 @@ public class MiraiSynchronizedLinkedList extends AbstractList { } @Override - public boolean containsAll(@NotNull Collection c) { + public boolean containsAll(Collection c) { return this.syncList.containsAll(c); } @Override - public boolean addAll(@NotNull Collection c) { + public boolean addAll(Collection c) { return this.syncList.addAll(c); } @Override - public boolean removeAll(@NotNull Collection c) { + public boolean removeAll(Collection c) { return this.syncList.removeAll(c); } @Override - public boolean retainAll(@NotNull Collection c) { + public boolean retainAll(Collection c) { return this.syncList.retainAll(c); } } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/TEA.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/TEA.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/TEA.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/TEA.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/Tested.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/Tested.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/Tested.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/Tested.kt diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/Utils.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/Utils.kt similarity index 99% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/Utils.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/Utils.kt index 5d69ccd17..c6d4e5e57 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/Utils.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/Utils.kt @@ -15,6 +15,7 @@ import java.util.zip.CRC32 import java.util.zip.GZIPInputStream import java.util.zip.GZIPOutputStream import javax.imageio.ImageIO +import kotlin.jvm.JvmSynthetic /** diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/Varint.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/Varint.kt similarity index 100% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/Varint.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/Varint.kt diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/config/MiraiConfig.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/config/MiraiConfig.kt new file mode 100644 index 000000000..aa8062ee3 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/config/MiraiConfig.kt @@ -0,0 +1,58 @@ +package net.mamoe.mirai.utils.config + +import org.yaml.snakeyaml.DumperOptions +import org.yaml.snakeyaml.Yaml +import java.io.ByteArrayInputStream +import java.io.File +import java.io.FileOutputStream +import java.io.IOException +import java.nio.charset.Charset +import java.util.* + +/** + * YAML-TYPE CONFIG + * Thread SAFE + * + * @author NaturalHG + */ +class MiraiConfig(private val root: File) : MiraiConfigSection(parse(Objects.requireNonNull(root))) { + + @Synchronized + fun save() { + val dumperOptions = DumperOptions() + dumperOptions.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK + val yaml = Yaml(dumperOptions) + val content = yaml.dump(this.sortedMap) + try { + ByteArrayInputStream(content.toByteArray()).transferTo(FileOutputStream(this.root)) + } catch (e: IOException) { + e.printStackTrace() + } + + } + + companion object { + @Suppress("UNCHECKED_CAST") + private fun parse(file: File): MutableMap? { + /* + if (!file.toURI().getPath().contains(MiraiServer.getInstance().getParentFolder().getPath())) { + file = new File(MiraiServer.getInstance().getParentFolder().getPath(), file.getName()); + }*/ + if (!file.exists()) { + try { + if (!file.createNewFile()) { + return linkedMapOf() + } + } catch (e: IOException) { + e.printStackTrace() + return linkedMapOf() + } + + } + val dumperOptions = DumperOptions() + dumperOptions.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK + val yaml = Yaml(dumperOptions) + return yaml.loadAs>(file.readLines(Charset.defaultCharset()).joinToString("\n"), LinkedHashMap::class.java) as MutableMap? + } + } +} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/config/MiraiConfigSection.java b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/config/MiraiConfigSection.java similarity index 98% rename from mirai-core/src/main/java/net/mamoe/mirai/utils/config/MiraiConfigSection.java rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/config/MiraiConfigSection.java index a0a6cc6f2..10a83d414 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/config/MiraiConfigSection.java +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/config/MiraiConfigSection.java @@ -1,7 +1,6 @@ package net.mamoe.mirai.utils.config; import net.mamoe.mirai.utils.MiraiSynchronizedLinkedHashMap; -import org.jetbrains.annotations.Nullable; import java.util.LinkedHashMap; import java.util.Map; @@ -138,7 +137,6 @@ public class MiraiConfigSection extends MiraiSynchronizedLinkedHashMap(), MiraiSettingSection { + private val lock = ReentrantLock() + + @Suppress("UNCHECKED_CAST") + fun getAs(index: Int): T { + return super.get(index) as T + } + + fun getInt(index: Int): Int { + return this.getAs(index) + } + + fun getDouble(index: Int): Int { + return this.getAs(index) + } + + fun getString(index: Int): Int { + return this.getAs(index) + } + + fun getFloat(index: Int): Int { + return this.getAs(index) + } + + @Synchronized + override fun saveAsSection(section: Profile.Section) { + section.clear() + val integer = AtomicInteger(0) + this.forEach { a -> section.put(integer.getAndAdd(1).toString(), a) } + } + + @Throws(IOException::class) + override fun close() { + + } + +} diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.kt new file mode 100644 index 000000000..e5db92ce0 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.kt @@ -0,0 +1,88 @@ +package net.mamoe.mirai.utils.setting + + +import org.ini4j.Profile + +import java.io.IOException +import java.util.concurrent.ConcurrentHashMap +import java.util.stream.Collectors +import kotlin.streams.toList + + +/** + * @author NaturalHG + */ +class MiraiSettingMapSection : ConcurrentHashMap(), MiraiSettingSection { + + operator fun get(key: String?, defaultValue: T): T { + if (key == null || key.isEmpty()) { + return defaultValue + } + return if (super.containsKey(key)) { + super.get(key) as T + } else defaultValue + } + + + operator fun set(key: String, value: Any) { + this[key] = value + } + + override fun remove(key: String) { + super.remove(key) + } + + fun getInt(key: String): Int { + return this.getInt(key, 0) + } + + fun getInt(key: String, defaultValue: Int): Int { + return Integer.parseInt(this[key, defaultValue].toString()) + } + + fun getDouble(key: String): Double { + return this.getDouble(key, 0.0) + } + + fun getDouble(key: String, defaultValue: Double): Double { + return java.lang.Double.parseDouble(this[key, defaultValue].toString()) + } + + fun getFloat(key: String): Float { + return this.getFloat(key, 0f) + } + + fun getFloat(key: String, defaultValue: Float): Float { + return java.lang.Float.parseFloat(this[key, defaultValue].toString()) + } + + fun getString(key: String): String { + return this.getString(key, "") + } + + fun getString(key: String, defaultValue: String): String { + return this[key, defaultValue].toString() + } + + fun getObject(key: String): Any? { + return this[key] + } + + @Suppress("UNCHECKED_CAST") + fun asList(): List { + return this.values.stream().map { a -> a as T }.toList() + } + + @Synchronized + override fun saveAsSection(section: Profile.Section) { + section.clear() + this.forEach{ key, value -> section.put(key, value) } + } + + @Throws(IOException::class) + override fun close() { + + } + +} + diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingSection.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingSection.kt new file mode 100644 index 000000000..c9c0f8cd5 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettingSection.kt @@ -0,0 +1,12 @@ +package net.mamoe.mirai.utils.setting + +import org.ini4j.Profile + +import java.io.Closeable + +/** + * @author NaturalHG + */ +interface MiraiSettingSection : Closeable { + fun saveAsSection(section: Profile.Section) +} \ No newline at end of file diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettings.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettings.kt new file mode 100644 index 000000000..480640798 --- /dev/null +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/setting/MiraiSettings.kt @@ -0,0 +1,101 @@ +package net.mamoe.mirai.utils.setting + +import org.ini4j.Config +import org.ini4j.Ini +import java.io.File +import java.io.IOException +import java.util.* +import java.util.concurrent.ConcurrentHashMap + +/** + * Thread-safe Mirai Config

+ * Only supports `INI` format

+ * Supports [Map] and [List] + * + * @author NaturalHG + */ +class MiraiSettings +/* + public MiraiSettings(MiraiPluginBase pluginBase, String filename) { + // TODO: 2019/9/6 每个插件独立文件夹存放 + this(new File(filename)); + }*/ +(file: File) { + + private val file: File + + private var ini: Ini + + private val cacheSection = ConcurrentHashMap() + + init { + var file = file + Objects.requireNonNull(file) + if (!file.name.contains(".")) { + file = File(file.path + ".ini") + } + this.file = file + if (!file.exists() && !file.createNewFile()) { + throw RuntimeException("cannot create config file $file") + } + val config = Config() + config.isMultiSection = true + ini = Ini() + ini.config = config + ini.load(this.file.toURI().toURL()) + } + + @Synchronized + fun setSection(key: String, section: MiraiSettingSection) { + cacheSection[key] = section + } + + + @Synchronized + fun getMapSection(key: String): MiraiSettingMapSection { + if (!cacheSection.containsKey(key)) { + val section = MiraiSettingMapSection() + if (ini.containsKey(key)) { + section.putAll(ini[key]!!) + } + cacheSection[key] = section + } + return cacheSection[key] as MiraiSettingMapSection + } + + @Synchronized + fun getListSection(key: String): MiraiSettingListSection { + if (!cacheSection.containsKey(key)) { + val section = MiraiSettingListSection() + if (ini.containsKey(key)) { + section.addAll(ini[key]!!.values) + } + cacheSection[key] = section + } + return cacheSection[key] as MiraiSettingListSection + } + + + @Synchronized + fun save() { + cacheSection.forEach { (k, a) -> + if (!ini.containsKey(k)) { + ini.put(k, "", HashMap()) + } + a.saveAsSection(ini[k]!!) + } + this.clearCache() + try { + ini.store(file) + } catch (e: IOException) { + e.printStackTrace() + } + + } + + @Synchronized + fun clearCache() { + cacheSection.clear() + } +} + diff --git a/mirai-core/src/main/java/net/mamoe/mirai/Mirai.kt b/mirai-core/src/main/java/net/mamoe/mirai/Mirai.kt deleted file mode 100644 index 399a03ab4..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/Mirai.kt +++ /dev/null @@ -1,21 +0,0 @@ -package net.mamoe.mirai - -import java.io.File - -/** - * @author Him188moe - */ -object Mirai { - val VERSION: String get() = internal.version - - val WORKING_DIRECTORY: File get() = internal.workingDirectory - - - internal lateinit var internal: MiraiInternal - - internal abstract class MiraiInternal { - abstract val workingDirectory: File - abstract val version: String - } -} - diff --git a/mirai-core/src/main/java/net/mamoe/mirai/plugin/MiraiPluginBase.java b/mirai-core/src/main/java/net/mamoe/mirai/plugin/MiraiPluginBase.java deleted file mode 100644 index 8bff49ac0..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/plugin/MiraiPluginBase.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.mamoe.mirai.plugin; - -import net.mamoe.mirai.Bot; - -/** - * 插件基类. - *

- * 插件属于整个 Mirai, 而不是属于单个 {@link Bot}. - * - * @see net.mamoe.mirai.event.MiraiEventManager - * @see net.mamoe.mirai.event.MiraiEventManagerKt - * @author Him188moe - * @author NaturalHG - */ -public abstract class MiraiPluginBase { -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java deleted file mode 100644 index e55985dc1..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.mamoe.mirai.task; - -/** - * @author NaturalHG - */ -@FunctionalInterface -public interface MiraiTaskExceptionHandler { - void onHandle(Throwable e); - - static MiraiTaskExceptionHandler printing() { - return Throwable::printStackTrace; - } - - static MiraiTaskExceptionHandler ignoring() { - return a -> { - }; - } -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java deleted file mode 100644 index 2ed0c9424..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java +++ /dev/null @@ -1,132 +0,0 @@ -package net.mamoe.mirai.task; - -import java.util.concurrent.Callable; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Consumer; -import java.util.function.Predicate; - -/** - * @author NaturalHG - */ -public final class MiraiTaskManager { - - private static MiraiTaskManager instance = new MiraiTaskManager(); - - public static MiraiTaskManager getInstance() { - return MiraiTaskManager.instance; - } - - private MiraiThreadPool pool; - - private MiraiTaskManager() { - this.pool = new MiraiThreadPool(); - } - - /** - * 基础Future处理 - */ - - public void execute(Runnable runnable) { - this.execute(runnable, MiraiTaskExceptionHandler.printing()); - } - - public void execute(Runnable runnable, MiraiTaskExceptionHandler handler) { - this.pool.execute(() -> - { - try { - runnable.run(); - } catch (Exception e) { - handler.onHandle(e); - } - }); - } - - - public Future submit(Callable callable) { - return this.submit(callable, MiraiTaskExceptionHandler.printing()); - } - - public Future submit(Callable callable, MiraiTaskExceptionHandler handler) { - return this.pool.submit(() -> { - try { - return callable.call(); - } catch (Throwable e) { - handler.onHandle(e); - return null; - } - }); - } - - /** - * 异步任务 - */ - public void ansycTask(Callable callable, Consumer callback) { - this.ansycTask(callable, callback, MiraiTaskExceptionHandler.printing()); - } - - public void ansycTask(Callable callable, Consumer callback, MiraiTaskExceptionHandler handler) { - this.pool.execute(() -> { - try { - callback.accept(callable.call()); - } catch (Throwable e) { - handler.onHandle(e); - } - }); - } - - /** - * 定时任务 - */ - - public void repeatingTask(Runnable runnable, long intervalMillis) { - this.repeatingTask(runnable, intervalMillis, MiraiTaskExceptionHandler.printing()); - } - - public void repeatingTask(Runnable runnable, long intervalMillis, MiraiTaskExceptionHandler handler) { - this.repeatingTask(runnable, intervalMillis, a -> true, handler); - } - - public void repeatingTask(Runnable runnable, long intervalMillis, int times) { - this.repeatingTask(runnable, intervalMillis, times, MiraiTaskExceptionHandler.printing()); - } - - public void repeatingTask(Runnable runnable, long intervalMillis, int times, MiraiTaskExceptionHandler handler) { - AtomicInteger integer = new AtomicInteger(times - 1); - this.repeatingTask( - runnable, intervalMillis, a -> integer.getAndDecrement() > 0, handler - ); - } - - - public void repeatingTask(D runnable, long intervalMillis, Predicate shouldContinue, MiraiTaskExceptionHandler handler) { - new Thread(() -> { - do { - this.pool.execute(() -> { - try { - runnable.run(); - } catch (Exception e) { - handler.onHandle(e); - } - }); - try { - Thread.sleep(intervalMillis); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } while (shouldContinue.test(runnable)); - }).start(); - } - - public void deletingTask(Runnable runnable, long intervalMillis) { - new Thread(() -> { - try { - Thread.sleep(intervalMillis); - } catch (InterruptedException e) { - e.printStackTrace(); - } - this.pool.execute(runnable); - }).start(); - } - -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java deleted file mode 100644 index a119d60a1..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiThreadPool.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.mamoe.mirai.task; - -import java.io.Closeable; -import java.util.concurrent.ScheduledThreadPoolExecutor; - -/** - * @author NaturalHG - */ -public final class MiraiThreadPool extends ScheduledThreadPoolExecutor implements Closeable { - private static MiraiThreadPool instance = new MiraiThreadPool(); - - public static MiraiThreadPool getInstance() { - return instance; - } - - MiraiThreadPool() { - super(10); - - /*super(0, - Integer.MAX_VALUE, - 60L, - TimeUnit.SECONDS, - new SynchronousQueue<>() - );*/ - } - - - @Override - public void close(){ - this.shutdown(); - if(!this.isShutdown()){ - this.shutdownNow(); - } - } - -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageConverter.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageConverter.java deleted file mode 100644 index 365b41756..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageConverter.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.mamoe.mirai.utils; - -import java.awt.*; -import java.awt.image.BufferedImage; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; - -/** - * Convert IMAGE into Chars that could shows in terminal - * - * @author NaturalHG - */ -public final class CharImageConverter implements Callable { - - /** - * width should depends on the width of the terminal - */ - private BufferedImage image; - private int width; - private double ignoreRate; - - public CharImageConverter(BufferedImage image, int width) { - this(image, width, 0.95); - } - - public CharImageConverter(BufferedImage image, int width, double ignoreRate) { - this.image = image; - this.width = width; - this.ignoreRate = ignoreRate; - } - - @Override - public String call() { - /* - * resize Image - * */ - int newHeight = (int) (this.image.getHeight() * (((double) width) / this.image.getWidth())); - Image tmp = image.getScaledInstance(width, newHeight, Image.SCALE_SMOOTH); - BufferedImage dimg = new BufferedImage(width, newHeight, BufferedImage.TYPE_INT_ARGB); - Graphics2D g2d = dimg.createGraphics(); - g2d.drawImage(tmp, 0, 0, null); - this.image = dimg; - - int background = gray(image.getRGB(0, 0)); - - StringBuilder builder = new StringBuilder(); - - List lines = new ArrayList<>(this.image.getHeight()); - - int minXPos = this.width; - int maxXPos = 0; - - for (int y = 0; y < image.getHeight(); y++) { - StringBuilder builderLine = new StringBuilder(); - for (int x = 0; x < image.getWidth(); x++) { - int gray = gray(image.getRGB(x, y)); - if (grayCompare(gray, background)) { - builderLine.append(" "); - } else { - builderLine.append("#"); - if (x < minXPos) { - minXPos = x; - } - if (x > maxXPos) { - maxXPos = x; - } - } - } - if (builderLine.toString().isBlank()) { - continue; - } - lines.add(builderLine); - } - for (StringBuilder line : lines) { - builder.append(line.substring(minXPos, maxXPos)).append("\n"); - } - return builder.toString(); - } - - private static int gray(int rgb) { - int R = (rgb & 0xff0000) >> 16; - int G = (rgb & 0x00ff00) >> 8; - int B = rgb & 0x0000ff; - return (R * 30 + G * 59 + B * 11 + 50) / 100; - } - - public boolean grayCompare(int g1, int g2) { - return ((double) Math.min(g1, g2) / Math.max(g1, g2)) >= ignoreRate; - } - -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageUtil.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageUtil.java deleted file mode 100644 index 6a1c57e5e..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/CharImageUtil.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.mamoe.mirai.utils; -import java.awt.image.BufferedImage; - -/** - * @author NaturalHG - */ -public final class CharImageUtil { - - public static String createCharImg(BufferedImage image) { - return createCharImg(image, 100, 20); - } - - public static String createCharImg(BufferedImage image, int sizeWeight, int sizeHeight) { - return new CharImageConverter(image,sizeWeight).call(); - } - -} \ No newline at end of file diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/ClientLoginStatus.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/ClientLoginStatus.java deleted file mode 100644 index 8ef6e638d..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/ClientLoginStatus.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.mamoe.mirai.utils; - -/** - * QQ 在线状态 - * - * @author Him188moe - * @see net.mamoe.mirai.network.protocol.tim.packet.login.ClientChangeOnlineStatusPacket - */ -public enum ClientLoginStatus { - /** - * 我在线上 - */ - ONLINE(0x0A); - - // TODO: 2019/8/31 add more ClientLoginStatus - - public final int id;//1 ubyte - - ClientLoginStatus(int id) { - this.id = id; - } -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/ImageNetworkUtils.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/ImageNetworkUtils.java deleted file mode 100644 index 1db1ef455..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/ImageNetworkUtils.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.mamoe.mirai.utils; - - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -/** - * @author NaturalHG - */ -public class ImageNetworkUtils { - public static boolean postImage(String uKeyHex, int fileSize, long botNumber, long groupCode, byte[] img) throws IOException { - //http://htdata2.qq.com/cgi-bin/httpconn?htcmd=0x6ff0071&ver=5515&term=pc&ukey=” ＋ 删全部空 (ukey) ＋ “&filesize=” ＋ 到文本 (fileSize) ＋ “&range=0&uin=” ＋ g_uin ＋ “&groupcode=” ＋ Group - - String builder = "http://htdata2.qq.com/cgi-bin/httpconn?htcmd=0x6ff0071&ver=5515&term=pc" + - "&ukey=" + uKeyHex.replace(" ", "") + - "&filezise=" + fileSize + - "&range=" + "0" + - "&uin=" + botNumber + - "&groupcode=" + groupCode; - HttpURLConnection conn = (HttpURLConnection) new URL(builder).openConnection(); - conn.setRequestProperty("User-Agent", "QQClient"); - conn.setRequestProperty("Content-Length", "" + fileSize); - conn.setRequestMethod("POST"); - conn.setDoOutput(true); - conn.getOutputStream().write(img); - - conn.connect(); - return conn.getResponseCode() == 200; - } -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java deleted file mode 100644 index 1e58262ed..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mamoe.mirai.utils; - -/** - * @author NaturalHG - */ -public enum LoggerTextFormat { - RESET("\33[0m"), - - BLUE("\033[0;34m"), - BLACK("\033[0;30m"), - DARK_GREY("\033[1;30m"), - LIGHT_BLUE("\033[1;34m"), - GREEN("\033[0;32m"), - LIGHT_GTEEN("\033[1;32m"), - CYAN("\033[0;36m"), - LIGHT_CYAN("\033[1;36m"), - RED("\033[0;31m"), - LIGHT_RED("\033[1;31m"), - PURPLE("\033[0;35m"), - LIGHT_PURPLE("\033[1;35m"), - BROWN("\033[0;33m"), - YELLOW("\033[1;33m"), - LIGHT_GRAY("\033[0;37m"), - WHITE("\033[1;37m"); - - private String format; - - LoggerTextFormat(String format) { - this.format = format; - } - - @Override - public String toString() { - //if(MiraiServer.getInstance().isUnix()){ - return format; - // } - // return ""; - } -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/config/MiraiConfig.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/config/MiraiConfig.java deleted file mode 100644 index d6bc415e7..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/config/MiraiConfig.java +++ /dev/null @@ -1,67 +0,0 @@ -package net.mamoe.mirai.utils.config; - -import kotlin.io.FilesKt; -import org.jetbrains.annotations.NotNull; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.LinkedHashMap; -import java.util.Objects; - -/** - * YAML-TYPE CONFIG - * Thread SAFE - * - * @author NaturalHG - */ -public class MiraiConfig extends MiraiConfigSection { - - private final File root; - - public MiraiConfig(@NotNull File file) { - super(parse(Objects.requireNonNull(file))); - this.root = file; - } - - public synchronized void save() { - DumperOptions dumperOptions = new DumperOptions(); - dumperOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - Yaml yaml = new Yaml(dumperOptions); - String content = yaml.dump(this.sortedMap); - try { - new ByteArrayInputStream(content.getBytes()).transferTo(new FileOutputStream(this.root)); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @SuppressWarnings("unchecked") - private static LinkedHashMap parse(File file) { - /* - if (!file.toURI().getPath().contains(MiraiServer.getInstance().getParentFolder().getPath())) { - file = new File(MiraiServer.getInstance().getParentFolder().getPath(), file.getName()); - }*/ - if (!file.exists()) { - try { - if (!file.createNewFile()) { - return new LinkedHashMap<>(); - } - } catch (IOException e) { - e.printStackTrace(); - return new LinkedHashMap<>(); - } - } - DumperOptions dumperOptions = new DumperOptions(); - dumperOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - Yaml yaml = new Yaml(dumperOptions); - return yaml.loadAs(String.join("\n", FilesKt.readLines(file, Charset.defaultCharset())), LinkedHashMap.class); - } - - - -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingListSection.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingListSection.java deleted file mode 100644 index 4aeaa07b4..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingListSection.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.mamoe.mirai.utils.setting; - - -import org.ini4j.Profile; - -import java.io.IOException; -import java.util.Vector; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - - -/** - * @author NaturalHG - */ -public class MiraiSettingListSection extends Vector implements MiraiSettingSection { - private Lock lock = new ReentrantLock(); - - @SuppressWarnings("unchecked") - public T getAs(int index){ - return (T)super.get(index); - } - - public int getInt(int index){ - return this.getAs(index); - } - - public int getDouble(int index){ - return this.getAs(index); - } - - public int getString(int index){ - return this.getAs(index); - } - - public int getFloat(int index) { - return this.getAs(index); - } - - @Override - public synchronized void saveAsSection(Profile.Section section) { - section.clear(); - AtomicInteger integer = new AtomicInteger(0); - this.forEach(a -> { - section.put(String.valueOf(integer.getAndAdd(1)),a); - }); - } - - @Override - public void close() throws IOException { - - } - -} diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.java deleted file mode 100644 index 4dfba7280..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingMapSection.java +++ /dev/null @@ -1,100 +0,0 @@ -package net.mamoe.mirai.utils.setting; - - -import org.ini4j.Profile; - -import java.io.IOException; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - - -/** - * @author NaturalHG - */ -public class MiraiSettingMapSection extends ConcurrentHashMap implements MiraiSettingSection { - - @SuppressWarnings("unchecked") - public T get(String key, T defaultValue) { - if (key == null || key.isEmpty()){ - return defaultValue; - } - if (super.containsKey(key)){ - return (T) super.get(key); - } - return defaultValue; - } - - @SuppressWarnings("unchecked") - public T get(String key) { - if (key == null || key.isEmpty()) { - return null; - } - if (super.containsKey(key)) { - return (T) super.get(key); - } - return null; - } - - public void set(String key, Object value){ - this.put(key,value); - } - - public void remove(String key){ - super.remove(key); - } - - public int getInt(String key) { - return this.getInt(key, 0); - } - - public int getInt(String key, int defaultValue) { - return Integer.parseInt(String.valueOf(this.get(key, defaultValue))); - } - - public double getDouble(String key) { - return this.getDouble(key, 0D); - } - - public double getDouble(String key, double defaultValue) { - return Double.parseDouble(String.valueOf(this.get(key, defaultValue))); - } - - public float getFloat(String key) { - return this.getFloat(key, 0F); - } - - public float getFloat(String key, float defaultValue) { - return Float.parseFloat(String.valueOf(this.get(key, defaultValue))); - } - - public String getString(String key) { - return this.getString(key, ""); - } - - public String getString(String key, String defaultValue) { - return String.valueOf(this.get(key, defaultValue)); - } - - public Object getObject(String key) { - return this.get(key); - } - - @SuppressWarnings("unchecked") - public List asList(){ - return this.values().stream().map(a -> (T)(a)).collect(Collectors.toList()); - } - - @Override - public synchronized void saveAsSection(Profile.Section section) { - section.clear(); - this.forEach(section::put); - } - - @Override - public void close() throws IOException { - - } - -} - diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingSection.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingSection.java deleted file mode 100644 index 19aea60b1..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettingSection.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.mamoe.mirai.utils.setting; - -import org.ini4j.Profile; - -import java.io.Closeable; - -/** - * @author NaturalHG - */ -public interface MiraiSettingSection extends Closeable { - void saveAsSection(Profile.Section section); -} - - diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettings.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettings.java deleted file mode 100644 index 30b8fbe26..000000000 --- a/mirai-core/src/main/java/net/mamoe/mirai/utils/setting/MiraiSettings.java +++ /dev/null @@ -1,103 +0,0 @@ -package net.mamoe.mirai.utils.setting; - -import net.mamoe.mirai.plugin.MiraiPluginBase; -import org.ini4j.Config; -import org.ini4j.Ini; -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Thread-safe Mirai Config
- * Only supports INI format
- * Supports {@link Map} and {@link List} - * - * @author NaturalHG - */ -public class MiraiSettings { - - private File file; - - private Ini ini; - - private volatile Map cacheSection = new ConcurrentHashMap<>(); - - public MiraiSettings(MiraiPluginBase pluginBase, String filename) { - // TODO: 2019/9/6 每个插件独立文件夹存放 - this(new File(filename)); - } - - public MiraiSettings(@NotNull File file) { - Objects.requireNonNull(file); - if (!file.getName().contains(".")) { - file = new File(file.getPath() + ".ini"); - } - this.file = file; - try { - if (!file.exists() && !file.createNewFile()) { - throw new RuntimeException("cannot create config file " + file); - } - Config config = new Config(); - config.setMultiSection(true); - ini = new Ini(); - ini.setConfig(config); - ini.load(this.file.toURI().toURL()); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public synchronized void setSection(String key, MiraiSettingSection section) { - cacheSection.put(key, section); - } - - - public synchronized MiraiSettingMapSection getMapSection(String key) { - if (!cacheSection.containsKey(key)) { - MiraiSettingMapSection section = new MiraiSettingMapSection(); - if (ini.containsKey(key)) { - section.putAll(ini.get(key)); - } - cacheSection.put(key, section); - } - return (MiraiSettingMapSection) cacheSection.get(key); - } - - public synchronized MiraiSettingListSection getListSection(String key) { - if (!cacheSection.containsKey(key)) { - MiraiSettingListSection section = new MiraiSettingListSection(); - if (ini.containsKey(key)) { - section.addAll(ini.get(key).values()); - } - cacheSection.put(key, section); - } - return (MiraiSettingListSection) cacheSection.get(key); - } - - - public synchronized void save() { - cacheSection.forEach((k, a) -> { - if (!ini.containsKey(k)) { - ini.put(k, "", new HashMap<>()); - } - a.saveAsSection(ini.get(k)); - }); - this.clearCache(); - try { - ini.store(file); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public synchronized void clearCache() { - cacheSection.clear(); - } -} - diff --git a/mirai-debug/build.gradle b/mirai-debug/build.gradle new file mode 100644 index 000000000..c1ae647ab --- /dev/null +++ b/mirai-debug/build.gradle @@ -0,0 +1,15 @@ +apply plugin: "kotlin" +apply plugin: "java" + +dependencies { + implementation project(':mirai-core') + compile 'com.google.protobuf:protobuf-java:3.5.0' + compile files('./lib/jpcap.jar') + + compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-M2' + compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.50' +} + +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} \ No newline at end of file diff --git a/mirai-debug/pom.xml b/mirai-debug/pom.xml deleted file mode 100644 index 0db64be55..000000000 --- a/mirai-debug/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - 4.0.0 - - mirai-debug - 1.0 - - jar - - - net.mamoe - mirai - 1.0 - ../pom.xml - - - - - net.mamoe - mirai-core - 1.0 - - - - - jpcap - jpcap - 0.1.18-002 - system - ${project.basedir}/lib/jpcap.jar - - - - com.google.protobuf - protobuf-java - - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - - - - org.jetbrains.kotlin - kotlin-stdlib - - - - org.jetbrains.kotlin - kotlin-reflect - compile - - - - - src/main/kotlin - - - /src/main/resources - - - **/*.* - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - org.projectlombok - lombok-maven-plugin - - - - org.jetbrains.kotlin - kotlin-maven-plugin - - - compile - compile - - compile - - - - - - -XXLanguage:+InlineClasses - - - - - - - \ No newline at end of file diff --git a/mirai-debug/src/main/kotlin/HexComparator.java b/mirai-debug/src/main/java/HexComparator.java similarity index 98% rename from mirai-debug/src/main/kotlin/HexComparator.java rename to mirai-debug/src/main/java/HexComparator.java index 57be940df..c669ca932 100644 --- a/mirai-debug/src/main/kotlin/HexComparator.java +++ b/mirai-debug/src/main/java/HexComparator.java @@ -1,7 +1,5 @@ import kotlin.ranges.IntRange; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.ToString; + import net.mamoe.mirai.network.protocol.tim.TIMProtocol; import net.mamoe.mirai.network.protocol.tim.packet.ClientPacketKt; import net.mamoe.mirai.utils.UtilsKt; @@ -108,12 +106,14 @@ public class HexComparator { }}; } - @ToString - @Getter - @AllArgsConstructor private static class Match { private IntRange range; private String constName; + + Match(IntRange range,String constName){ + this.range = range; + this.constName = constName; + } } } diff --git a/mirai-debug/src/main/kotlin/PacketDebuger.kt b/mirai-debug/src/main/java/PacketDebuger.kt similarity index 98% rename from mirai-debug/src/main/kotlin/PacketDebuger.kt rename to mirai-debug/src/main/java/PacketDebuger.kt index 129c8b236..cfa4bd29d 100644 --- a/mirai-debug/src/main/kotlin/PacketDebuger.kt +++ b/mirai-debug/src/main/java/PacketDebuger.kt @@ -1,4 +1,4 @@ -@file:Suppress("EXPERIMENTAL_API_USAGE") +@file:Suppress("EXPERIMENTAL_API_USAGE", "MemberVisibilityCanBePrivate") import jpcap.JpcapCaptor import jpcap.packet.IPPacket @@ -124,8 +124,8 @@ object Main { @Volatile private var debugStarted = false - private val qq: Int = 1994701021 - private val password: String = "xiaoqqq" + private const val qq: Int = 1994701021 + private const val password: String = "xiaoqqq" lateinit var token0825: ByteArray//56 var loginTime: Int = 0 diff --git a/mirai-demos/mirai-demo-1/build.gradle b/mirai-demos/mirai-demo-1/build.gradle new file mode 100644 index 000000000..4c80b97cc --- /dev/null +++ b/mirai-demos/mirai-demo-1/build.gradle @@ -0,0 +1,8 @@ +apply plugin: "kotlin" +apply plugin: "java" + +dependencies { + implementation project(":mirai-core") + compile rootProject.ext.coroutine + compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.50' +} diff --git a/mirai-demos/mirai-demo-1/pom.xml b/mirai-demos/mirai-demo-1/pom.xml deleted file mode 100644 index 1928168a8..000000000 --- a/mirai-demos/mirai-demo-1/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - - net.mamoe - mirai-demos - 1.0 - - - mirai-demo-1 - 1.0 - - - - - /src/main/resources - - - **/*.* - - - - - - - - org.jetbrains.kotlin - kotlin-maven-plugin - - - compile - compile - - compile - - - - - - - - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - - - - org.jetbrains.kotlin - kotlin-stdlib - - - - \ No newline at end of file diff --git a/mirai-demos/mirai-demo-1/src/main/java/demo1/Main.kt b/mirai-demos/mirai-demo-1/src/main/java/demo1/Main.kt index 22a61c163..912e85ea9 100644 --- a/mirai-demos/mirai-demo-1/src/main/java/demo1/Main.kt +++ b/mirai-demos/mirai-demo-1/src/main/java/demo1/Main.kt @@ -23,7 +23,7 @@ suspend fun main() { password = "bb22222" ), Console()) - bot.login().await().let { + bot.login().let { check(it == LoginState.SUCCESS) { "Login failed: " + it.name } } diff --git a/mirai-demos/pom.xml b/mirai-demos/pom.xml deleted file mode 100644 index b6b908d15..000000000 --- a/mirai-demos/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - net.mamoe - mirai - 1.0 - - - mirai-demos - 1.0 - - - mirai-demo-1 - mirai-demo-event - - - - - - net.mamoe - mirai-core - 1.0 - compile - - - \ No newline at end of file diff --git a/mirai-ui/pom.xml b/mirai-ui/pom.xml deleted file mode 100644 index 146dd507e..000000000 --- a/mirai-ui/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - mirai-ui - 1.0 - - jar - - - net.mamoe - mirai - 1.0 - ../pom.xml - - - - - - - - - - /src/main/resources - - - **/*.* - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 4b07288d8..000000000 --- a/pom.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - 4.0.0 - - net.mamoe - Mirai - mirai - 1.0 - - - mirai-core - mirai-ui - mirai-console - mirai-api - mirai-demos - - mirai-debug - - - - - - huawei - https://mirrors.huaweicloud.com/repository/maven/ - - - - pom - - - - 1.3.50 - 11 - 11 - UTF-8 - - - - - - com.intellij - annotations - 12.0 - compile - - - - org.projectlombok - lombok - 1.18.8 - compile - - - - - - - - - com.google.protobuf - protobuf-java - 3.5.0 - - - - org.ini4j - ini4j - 0.5.2 - - - - - net.java.dev.jna - jna - 5.4.0 - - - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - 1.3.0-M2 - - - - - io.netty - netty-all - 4.1.38.Final - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - - org.apache.logging.log4j - log4j-core - 2.12.1 - - - - org.yaml - snakeyaml - 1.18 - - - - org.jetbrains.kotlin - kotlin-reflect - 1.3.41 - compile - - - - org.jsoup - jsoup - 1.12.1 - compile - - - - - - package - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - org.ow2.asm - asm - 7.1 - - - - UTF-8 - - - - - org.projectlombok - lombok-maven-plugin - 1.18.6.0 - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - package - - shade - - - - - true - shaded - - - - - org.projectlombok - lombok-maven-plugin - 1.18.6.0 - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - process-sources - - compile - - - - test-compile - test-compile - - test-compile - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..23fa9e5a6 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,15 @@ +rootProject.name = 'mirai' +include(':mirai-core') +include(':mirai-console') +include(':mirai-api') +include(':mirai-demos:mirai-demo-1') +include(':mirai-demos') +include(':mirai-debug') +project(':mirai-demos:mirai-demo-1').projectDir = file('mirai-demos/mirai-demo-1') + + +def kotlinVersion = "1.3.50" +def coroutinesVersion = "1.3.0-M2" + +def kotlinStandardLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" +def kotlinCoroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"