jiahua.liu преди 6 години
родител
ревизия
313f2c59f2
променени са 22 файла, в които са добавени 362 реда и са изтрити 75 реда
  1. 0 75
      build.gradle.kts
  2. 172 0
      gradlew
  3. 84 0
      gradlew.bat
  4. 19 0
      grandle.properties
  5. 61 0
      mirai-api-http/build.gradle.kts
  6. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/MiraiHttpAPIServer.kt
  7. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/Session.kt
  8. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/Exception.kt
  9. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/StateCode.kt
  10. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/BotEventDTO.kt
  11. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/ContactDTO.kt
  12. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/DTO.kt
  13. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/MessageDTO.kt
  14. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/queue/MessageQueue.kt
  15. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/AuthRouteModule.kt
  16. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/BaseRoute.kt
  17. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/EventRouteModule.kt
  18. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/GroupManageRouteModule.kt
  19. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/InfoRouteModule.kt
  20. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt
  21. 0 0
      mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/util/Json.kt
  22. 26 0
      settings.gradle

+ 0 - 75
build.gradle.kts

@@ -1,75 +0,0 @@
-@file:Suppress("UNUSED_VARIABLE")
-
-import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
-
-plugins {
-    id("kotlinx-atomicfu")
-    kotlin("jvm")
-    id("kotlinx-serialization")
-}
-
-group = "net.mamoe.mirai"
-version = rootProject.ext["mirai_version"].toString()
-
-description = "Mirai Http Api"
-
-val kotlinVersion: String by rootProject.ext
-val atomicFuVersion: String by rootProject.ext
-val coroutinesVersion: String by rootProject.ext
-val kotlinXIoVersion: String by rootProject.ext
-val coroutinesIoVersion: String by rootProject.ext
-
-val klockVersion: String by rootProject.ext
-val ktorVersion: String by rootProject.ext
-
-val serializationVersion: String by rootProject.ext
-
-fun KotlinDependencyHandler.kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version"
-
-fun KotlinDependencyHandler.ktor(id: String, version: String = ktorVersion) = "io.ktor:ktor-$id:$version"
-
-kotlin {
-
-
-    sourceSets["main"].apply {
-        dependencies {
-            implementation(project(":mirai-core-qqandroid"))
-
-            implementation(kotlin("stdlib-jdk8", kotlinVersion))
-            implementation(kotlin("stdlib-jdk7", kotlinVersion))
-            implementation(kotlin("reflect", kotlinVersion))
-
-            implementation(ktor("server-cio"))
-            implementation(kotlinx("io-jvm", kotlinXIoVersion))
-            implementation(ktor("http-jvm"))
-            implementation("org.slf4j:slf4j-simple:1.7.26")
-        }
-    }
-
-    sourceSets["test"].apply {
-        dependencies {
-        }
-        kotlin.outputDir = file("build/classes/kotlin/jvm/test")
-        kotlin.setSrcDirs(listOf("src/$name/kotlin"))
-
-    }
-
-    sourceSets.all {
-        languageSettings.enableLanguageFeature("InlineClasses")
-
-        languageSettings.useExperimentalAnnotation("kotlin.Experimental")
-
-        dependencies {
-            implementation(kotlin("stdlib", kotlinVersion))
-            implementation(kotlin("serialization", kotlinVersion))
-
-            implementation("org.jetbrains.kotlinx:atomicfu:$atomicFuVersion")
-            implementation(kotlinx("io", kotlinXIoVersion))
-            implementation(kotlinx("coroutines-io", coroutinesIoVersion))
-            implementation(kotlinx("coroutines-core", coroutinesVersion))
-            implementation(kotlinx("serialization-runtime", serializationVersion))
-            implementation(ktor("server-core"))
-            implementation(ktor("http"))
-        }
-    }
-}

+ 172 - 0
gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    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"'
+
+# 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, switch paths to Windows format before running java
+if $cygwin ; 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" "$@"

+ 84 - 0
gradlew.bat

@@ -0,0 +1,84 @@
+@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"
+
+@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

+ 19 - 0
grandle.properties

@@ -0,0 +1,19 @@
+# style guide
+kotlin.code.style=official
+# config
+mirai_japt_version=1.1.1
+kotlin.incremental.multiplatform=true
+kotlin.parallel.tasks.in.project=true
+# kotlin
+kotlinVersion=1.3.61
+# kotlin libraries
+serializationVersion=0.14.0
+coroutinesVersion=1.3.3
+atomicFuVersion=0.14.1
+kotlinXIoVersion=0.1.16
+coroutinesIoVersion=0.1.16
+# utility
+ktorVersion=1.3.1
+klockVersion=1.7.0
+# gradle plugin
+protobufJavaVersion=3.10.0

+ 61 - 0
mirai-api-http/build.gradle.kts

@@ -0,0 +1,61 @@
+import java.util.*
+
+plugins {
+    id("kotlinx-serialization")
+    id("kotlin")
+    id("java")
+    id("com.jfrog.bintray")
+}
+
+
+apply(plugin = "com.github.johnrengelman.shadow")
+
+val kotlinVersion: String by rootProject.ext
+val atomicFuVersion: String by rootProject.ext
+val coroutinesVersion: String by rootProject.ext
+val kotlinXIoVersion: String by rootProject.ext
+val coroutinesIoVersion: String by rootProject.ext
+
+val klockVersion: String by rootProject.ext
+val ktorVersion: String by rootProject.ext
+
+val serializationVersion: String by rootProject.ext
+
+fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version"
+
+fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
+
+tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>() {
+    manifest {
+        attributes["Main-Class"] = "net.mamoe.mirai.console.pure.MiraiConsolePureLoader"
+    }
+}
+
+
+val mirai_version: String by rootProject.ext
+
+dependencies {
+    implementation("net.mamoe:mirai-core-jvm:$mirai_version")
+    implementation("net.mamoe:mirai-core-qqandroid-jvm:$mirai_version")
+
+
+    api(kotlin("serialization"))
+    api(group = "com.alibaba", name = "fastjson", version = "1.2.62")
+    api(group = "org.yaml", name = "snakeyaml", version = "1.25")
+    api(group = "com.moandjiezana.toml", name = "toml4j", version = "0.7.2")
+    api("org.bouncycastle:bcprov-jdk15on:1.64")
+
+    implementation("no.tornado:tornadofx:1.7.19")
+    // classpath is not set correctly by IDE
+}
+
+val mirai_console_version: String by project.ext
+version = mirai_console_version
+
+description = "Mirai HTTPAPI plugin"
+
+@Suppress("DEPRECATION")
+val sourcesJar by tasks.registering(Jar::class) {
+    classifier = "sources"
+    from(sourceSets.main.get().allSource)
+}

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


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/Session.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/Session.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/data/Exception.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/Exception.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/data/StateCode.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/StateCode.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/data/common/BotEventDTO.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/BotEventDTO.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/data/common/ContactDTO.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/ContactDTO.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/data/common/DTO.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/DTO.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/data/common/MessageDTO.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/MessageDTO.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/queue/MessageQueue.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/queue/MessageQueue.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/route/AuthRouteModule.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/AuthRouteModule.kt


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


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/route/EventRouteModule.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/EventRouteModule.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/route/GroupManageRouteModule.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/GroupManageRouteModule.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/route/InfoRouteModule.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/InfoRouteModule.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt


+ 0 - 0
src/main/kotlin/net/mamoe/mirai/api/http/util/Json.kt → mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/util/Json.kt


+ 26 - 0
settings.gradle

@@ -0,0 +1,26 @@
+pluginManagement {
+    resolutionStrategy {
+        eachPlugin {
+            switch (requested.id.id) {
+                case "org.jetbrains.kotlin.multiplatform": useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}"); break
+                case "com.android.library": useModule("com.android.tools.build:gradle:${requested.version}"); break
+                case "com.jfrog.bintray": useModule("com.jfrog.bintray.gradle:gradle-bintray-plugin:${requested.version}")
+            }
+        }
+    }
+
+    repositories {
+        mavenLocal()
+        jcenter()
+        google()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" }
+    }
+}
+
+rootProject.name = 'mirai-api-http'
+
+include(':mirai-api-http')
+
+enableFeaturePreview('GRADLE_METADATA')