diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 2d0127d..0000000 --- a/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -ktor_version=2.3.8 -kotlin_version=1.9.22 -logback_version=1.4.14 -kotlin.code.style=official -exposed_version=0.41.1 -h2_version=2.1.214 diff --git a/illust-crud/build.gradle.kts b/illust-crud/build.gradle.kts index 8227650..d3c053a 100644 --- a/illust-crud/build.gradle.kts +++ b/illust-crud/build.gradle.kts @@ -1,5 +1,6 @@ plugins { - kotlin("jvm") + kotlin("jvm") version "1.9.22" + id("com.google.protobuf") version "0.9.4" } group = "dev.usbharu" @@ -10,12 +11,12 @@ repositories { } dependencies { - implementation(rootProject) implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-protobuf:1.61.1") implementation("com.google.protobuf:protobuf-kotlin:3.25.3") implementation("io.grpc:grpc-netty:1.61.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") + protobuf(files("../unos-proto/src/main/proto")) testImplementation("org.jetbrains.kotlin:kotlin-test") } @@ -26,3 +27,27 @@ kotlin { jvmToolchain(11) } +protobuf { + protoc { + artifact = "com.google.protobuf:protoc:3.25.3" + } + plugins { + create("grpc") { + artifact = "io.grpc:protoc-gen-grpc-java:1.61.1" + } + create("grpckt") { + artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" + } + } + generateProtoTasks { + all().forEach { + it.plugins { + create("grpc") + create("grpckt") + } + it.builtins { + create("kotlin") + } + } + } +} \ No newline at end of file diff --git a/illust-crud/gradle/wrapper/gradle-wrapper.jar b/illust-crud/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7f93135 Binary files /dev/null and b/illust-crud/gradle/wrapper/gradle-wrapper.jar differ diff --git a/illust-crud/gradle/wrapper/gradle-wrapper.properties b/illust-crud/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3fa8f86 --- /dev/null +++ b/illust-crud/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/illust-crud/gradlew b/illust-crud/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/illust-crud/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/illust-crud/gradlew.bat b/illust-crud/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/illust-crud/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/illust-crud/settings.gradle.kts similarity index 57% rename from settings.gradle.kts rename to illust-crud/settings.gradle.kts index a574498..701c532 100644 --- a/settings.gradle.kts +++ b/illust-crud/settings.gradle.kts @@ -1,5 +1,4 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" } -rootProject.name = "unos" -include("illust-crud","illust-front") +rootProject.name = "unos-illust-crud" diff --git a/illust-front/build.gradle.kts b/illust-front/build.gradle.kts index 1752022..001d537 100644 --- a/illust-front/build.gradle.kts +++ b/illust-front/build.gradle.kts @@ -7,6 +7,7 @@ plugins { kotlin("jvm") version "1.9.22" id("io.ktor.plugin") version "2.3.8" id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22" + id("com.google.protobuf") version "0.9.4" } group = "dev.usbharu" @@ -34,7 +35,6 @@ dependencies { implementation("org.jetbrains.exposed:exposed-jdbc:0.48.0") implementation("com.h2database:h2:2.2.224") implementation("io.ktor:ktor-server-netty-jvm") - implementation(rootProject) implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-protobuf:1.61.1") implementation("com.google.protobuf:protobuf-kotlin:3.25.3") @@ -42,4 +42,5 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") testImplementation("io.ktor:ktor-server-tests-jvm") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.9.22") + protobuf(files("../unos-proto/src/main/proto")) } diff --git a/illust-front/gradle/wrapper/gradle-wrapper.jar b/illust-front/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7f93135 Binary files /dev/null and b/illust-front/gradle/wrapper/gradle-wrapper.jar differ diff --git a/illust-front/gradle/wrapper/gradle-wrapper.properties b/illust-front/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3fa8f86 --- /dev/null +++ b/illust-front/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/illust-front/gradlew b/illust-front/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/illust-front/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/illust-front/gradlew.bat b/illust-front/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/illust-front/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/illust-front/settings.gradle.kts b/illust-front/settings.gradle.kts new file mode 100644 index 0000000..3da522f --- /dev/null +++ b/illust-front/settings.gradle.kts @@ -0,0 +1,4 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} +rootProject.name = "unos-illust-front" \ No newline at end of file diff --git a/illust-front/src/main/kotlin/dev/usbharu/illust/front/Application.kt b/illust-front/src/main/kotlin/dev/usbharu/illust/front/Application.kt deleted file mode 100644 index 086fa13..0000000 --- a/illust-front/src/main/kotlin/dev/usbharu/illust/front/Application.kt +++ /dev/null @@ -1,18 +0,0 @@ -package dev.usbharu.illust.front - -import dev.usbharu.illust.front.plugins.configureHTTP -import dev.usbharu.illust.front.plugins.configureMonitoring -import dev.usbharu.illust.front.plugins.configureRouting -import dev.usbharu.illust.front.plugins.configureSerialization -import io.ktor.server.application.* - -fun main(args: Array) { - io.ktor.server.netty.EngineMain.main(args) -} - -fun Application.module() { - configureHTTP() - configureMonitoring() - configureSerialization() - configureRouting() -} diff --git a/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/Application.kt b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/Application.kt new file mode 100644 index 0000000..8fc42dc --- /dev/null +++ b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/Application.kt @@ -0,0 +1,18 @@ +package dev.usbharu.unos.illust.front + +import dev.usbharu.unos.illust.front.plugins.configureHTTP +import dev.usbharu.unos.illust.front.plugins.configureMonitoring +import dev.usbharu.unos.illust.front.plugins.configureRouting +import dev.usbharu.unos.illust.front.plugins.configureSerialization +import io.ktor.server.application.* + +fun main(args: Array) { + io.ktor.server.netty.EngineMain.main(args) +} + +fun Application.module() { + configureHTTP() + configureMonitoring() + configureSerialization() + configureRouting() +} diff --git a/illust-front/src/main/kotlin/dev/usbharu/illust/front/controller/IllustController.kt b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/controller/IllustController.kt similarity index 84% rename from illust-front/src/main/kotlin/dev/usbharu/illust/front/controller/IllustController.kt rename to illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/controller/IllustController.kt index 8519c9b..292c8e7 100644 --- a/illust-front/src/main/kotlin/dev/usbharu/illust/front/controller/IllustController.kt +++ b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/controller/IllustController.kt @@ -1,4 +1,4 @@ -package dev.usbharu.illust.front.controller +package dev.usbharu.unos.illust.front.controller import illust.crud.IllustCRUDServiceGrpcKt import illust.crud.createIllust diff --git a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/HTTP.kt b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/HTTP.kt similarity index 88% rename from illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/HTTP.kt rename to illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/HTTP.kt index 08189a0..2e9d812 100644 --- a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/HTTP.kt +++ b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/HTTP.kt @@ -1,4 +1,4 @@ -package dev.usbharu.illust.front.plugins +package dev.usbharu.unos.illust.front.plugins import io.ktor.server.application.* import io.ktor.server.plugins.partialcontent.* diff --git a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Monitoring.kt b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Monitoring.kt similarity index 92% rename from illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Monitoring.kt rename to illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Monitoring.kt index cd04139..32513ae 100644 --- a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Monitoring.kt +++ b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Monitoring.kt @@ -1,4 +1,4 @@ -package dev.usbharu.illust.front.plugins +package dev.usbharu.unos.illust.front.plugins import io.ktor.server.application.* import io.ktor.server.metrics.micrometer.* diff --git a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Routing.kt b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Routing.kt similarity index 83% rename from illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Routing.kt rename to illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Routing.kt index 056ee8b..f9c8bfe 100644 --- a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Routing.kt +++ b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Routing.kt @@ -1,4 +1,4 @@ -package dev.usbharu.illust.front.plugins +package dev.usbharu.unos.illust.front.plugins import io.ktor.server.application.* import io.ktor.server.response.* diff --git a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Serialization.kt b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Serialization.kt similarity index 83% rename from illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Serialization.kt rename to illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Serialization.kt index 5363c76..b3c8da8 100644 --- a/illust-front/src/main/kotlin/dev/usbharu/illust/front/plugins/Serialization.kt +++ b/illust-front/src/main/kotlin/dev/usbharu/unos/illust/front/plugins/Serialization.kt @@ -1,4 +1,4 @@ -package dev.usbharu.illust.front.plugins +package dev.usbharu.unos.illust.front.plugins import io.ktor.serialization.kotlinx.json.* import io.ktor.server.application.* diff --git a/illust-front/src/main/resources/application.conf b/illust-front/src/main/resources/application.conf index 0562dfc..2cede92 100644 --- a/illust-front/src/main/resources/application.conf +++ b/illust-front/src/main/resources/application.conf @@ -4,6 +4,6 @@ ktor { port = ${?PORT} } application { - modules = [ dev.usbharu.illust.front.ApplicationKt.module ] + modules = [ dev.usbharu.unos.illust.front.ApplicationKt.module ] } } diff --git a/illust-front/src/test/kotlin/dev/usbharu/ApplicationTest.kt b/illust-front/src/test/kotlin/dev/usbharu/ApplicationTest.kt index 0be5b8a..f8a421b 100644 --- a/illust-front/src/test/kotlin/dev/usbharu/ApplicationTest.kt +++ b/illust-front/src/test/kotlin/dev/usbharu/ApplicationTest.kt @@ -1,6 +1,6 @@ package dev.usbharu -import dev.usbharu.illust.front.plugins.configureRouting +import dev.usbharu.unos.illust.front.plugins.configureRouting import io.ktor.client.request.* import io.ktor.client.statement.* import io.ktor.http.* diff --git a/src/main/proto/illust/crud/illust_crud.proto b/unos-proto/src/main/proto/illust/crud/illust_crud.proto similarity index 100% rename from src/main/proto/illust/crud/illust_crud.proto rename to unos-proto/src/main/proto/illust/crud/illust_crud.proto diff --git a/src/main/proto/illust/illust.proto b/unos-proto/src/main/proto/illust/illust.proto similarity index 100% rename from src/main/proto/illust/illust.proto rename to unos-proto/src/main/proto/illust/illust.proto diff --git a/unos-proto/src/main/proto/watchdog/push_metrics.proto b/unos-proto/src/main/proto/watchdog/push_metrics.proto new file mode 100644 index 0000000..c2a225a --- /dev/null +++ b/unos-proto/src/main/proto/watchdog/push_metrics.proto @@ -0,0 +1,26 @@ +syntax = "proto3"; + +import "google/protobuf/empty.proto"; +import "google/protobuf/timestamp.proto"; + +package watchdog; + +enum Status { + OK = 0; + DEAD = 1; + UNKNOWN = 2; + NOT_GOOD = 3; +} + +message Metric { + string name = 1; + string object_id = 2; + string domain = 3; + Status status = 4; + string value = 5; + google.protobuf.Timestamp timestamp = 6; +} + +service PushMetricsService { + rpc Push(Metric)returns(google.protobuf.Empty); +} \ No newline at end of file diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts new file mode 100644 index 0000000..cc6ae86 --- /dev/null +++ b/utils/build.gradle.kts @@ -0,0 +1,38 @@ +plugins { + kotlin("jvm") version "1.9.22" + id("com.google.protobuf") version "0.9.4" +} + +group = "dev.usbharu.unos" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation("org.jetbrains.kotlin:kotlin-test") + compileOnly("io.grpc:grpc-protobuf:1.61.1") + compileOnly("com.google.protobuf:protobuf-kotlin:3.25.3") + protobuf(files("../unos-proto/src/main/proto")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} + +protobuf { + protoc { + artifact = "com.google.protobuf:protoc:3.25.3" + } + generateProtoTasks { + all().forEach { + it.builtins { + create("kotlin") + } + } + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/utils/gradle/wrapper/gradle-wrapper.jar similarity index 79% rename from gradle/wrapper/gradle-wrapper.jar rename to utils/gradle/wrapper/gradle-wrapper.jar index 7454180..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/utils/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/utils/gradle/wrapper/gradle-wrapper.properties similarity index 86% rename from gradle/wrapper/gradle-wrapper.properties rename to utils/gradle/wrapper/gradle-wrapper.properties index e411586..8a14f78 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/utils/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,4 @@ +#Sat Mar 09 17:53:16 JST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip diff --git a/gradlew b/utils/gradlew similarity index 100% rename from gradlew rename to utils/gradlew diff --git a/gradlew.bat b/utils/gradlew.bat similarity index 100% rename from gradlew.bat rename to utils/gradlew.bat diff --git a/utils/settings.gradle.kts b/utils/settings.gradle.kts new file mode 100644 index 0000000..4e0d3d2 --- /dev/null +++ b/utils/settings.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} +rootProject.name = "utils" + diff --git a/utils/src/main/kotlin/dev/usbharu/unos/utils/ProtobufUtils.kt b/utils/src/main/kotlin/dev/usbharu/unos/utils/ProtobufUtils.kt new file mode 100644 index 0000000..76eb447 --- /dev/null +++ b/utils/src/main/kotlin/dev/usbharu/unos/utils/ProtobufUtils.kt @@ -0,0 +1,6 @@ +package dev.usbharu.unos.utils + +import com.google.protobuf.Timestamp +import java.time.Instant + +fun Timestamp.toInstant():Instant = Instant.ofEpochSecond(seconds,nanos.toLong()) \ No newline at end of file diff --git a/build.gradle.kts b/watch-dog-be/build.gradle.kts similarity index 66% rename from build.gradle.kts rename to watch-dog-be/build.gradle.kts index dd83008..3bf10d2 100644 --- a/build.gradle.kts +++ b/watch-dog-be/build.gradle.kts @@ -1,18 +1,12 @@ -val ktor_version: String by project -val kotlin_version: String by project -val logback_version: String by project - -val exposed_version: String by project -val h2_version: String by project plugins { kotlin("jvm") version "1.9.22" - id("io.ktor.plugin") version "2.3.8" - id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22" id("com.google.protobuf") version "0.9.4" + kotlin("plugin.serialization") version "1.9.22" + id("io.ktor.plugin") version "2.3.8" } group = "dev.usbharu" -version = "0.0.1" +version = "1.0-SNAPSHOT" application { mainClass.set("io.ktor.server.netty.EngineMain") @@ -26,22 +20,29 @@ repositories { } dependencies { - implementation("io.ktor:ktor-server-core-jvm") - implementation("io.ktor:ktor-server-content-negotiation-jvm") - implementation("io.ktor:ktor-serialization-jackson-jvm") - implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") - implementation("org.jetbrains.exposed:exposed-core:$exposed_version") - implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version") - implementation("com.h2database:h2:$h2_version") - implementation("io.ktor:ktor-server-netty-jvm") - implementation("ch.qos.logback:logback-classic:$logback_version") implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-protobuf:1.61.1") implementation("com.google.protobuf:protobuf-kotlin:3.25.3") implementation("io.grpc:grpc-netty:1.61.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") - testImplementation("io.ktor:ktor-server-tests-jvm") - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") + protobuf(files("../unos-proto/src/main/proto/watchdog")) + testImplementation("org.jetbrains.kotlin:kotlin-test") + implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3") + implementation("org.mongodb:bson-kotlinx:5.0.0") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0") + implementation("dev.usbharu.unos:utils") + implementation("io.ktor:ktor-server-core-jvm") + implementation("io.ktor:ktor-server-content-negotiation-jvm") + implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") + implementation("io.ktor:ktor-server-netty-jvm") +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) } protobuf { diff --git a/watch-dog-be/gradle/wrapper/gradle-wrapper.jar b/watch-dog-be/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/watch-dog-be/gradle/wrapper/gradle-wrapper.jar differ diff --git a/watch-dog-be/gradle/wrapper/gradle-wrapper.properties b/watch-dog-be/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e89d8f2 --- /dev/null +++ b/watch-dog-be/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Mar 09 15:50:07 JST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/watch-dog-be/gradlew b/watch-dog-be/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/watch-dog-be/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${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 "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/watch-dog-be/gradlew.bat b/watch-dog-be/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/watch-dog-be/gradlew.bat @@ -0,0 +1,89 @@ +@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 Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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 execute + +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 execute + +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 + +: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 %* + +: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/watch-dog-be/settings.gradle.kts b/watch-dog-be/settings.gradle.kts new file mode 100644 index 0000000..2a87a54 --- /dev/null +++ b/watch-dog-be/settings.gradle.kts @@ -0,0 +1,6 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} +rootProject.name = "watch-dog-be" + +includeBuild("../utils") \ No newline at end of file diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/ApiController.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/ApiController.kt new file mode 100644 index 0000000..c7ab6ab --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/ApiController.kt @@ -0,0 +1,22 @@ +package dev.usbharu.unos.watchdog.be + +import dev.usbharu.unos.watchdog.be.domain.MetricsRepository +import io.ktor.http.* +import io.ktor.server.application.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import kotlinx.coroutines.flow.Flow + +fun Route.api(apiController: ApiController){ + route("/api/v1"){ + get("/{object-id}/metrics"){ + call.respond(HttpStatusCode.OK,apiController.getMetrics(call.parameters["object-id"].orEmpty())) + } + } +} + +class ApiController(private val metricsRepository: MetricsRepository) { + fun getMetrics(objectId:String):Flow{ + return metricsRepository.findByObjectId(objectId) + } +} \ No newline at end of file diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/GrpcServer.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/GrpcServer.kt new file mode 100644 index 0000000..60af29b --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/GrpcServer.kt @@ -0,0 +1,17 @@ +package dev.usbharu.unos.watchdog.be + +import io.grpc.ServerBuilder +import io.ktor.server.application.* + +fun Application.grpc(pushMetricsService: PushMetricsService){ + val server = ServerBuilder.forPort(50051) + .addService(pushMetricsService) + .build() + + server.start() + Runtime.getRuntime().addShutdownHook( + Thread { + server.shutdown() + } + ) +} \ No newline at end of file diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/Main.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/Main.kt new file mode 100644 index 0000000..d513809 --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/Main.kt @@ -0,0 +1,40 @@ +package dev.usbharu.unos.watchdog.be + +import com.mongodb.ConnectionString +import com.mongodb.MongoClientSettings +import com.mongodb.kotlin.client.coroutine.MongoClient +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import dev.usbharu.unos.watchdog.be.domain.MongoMetricsRepository +import io.grpc.ServerBuilder +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.routing.* + +fun main(args: Array) { + io.ktor.server.netty.EngineMain.main(args) +} + +fun Application.module() { + install(ContentNegotiation) { + json() + } + + val url = environment.config.property("watchdog.db.url").getString() + val databaseName = environment.config.property("watchdog.db.database").getString() + val database = + MongoClient + .create( + MongoClientSettings.builder() + .applyConnectionString(ConnectionString(url)) + .build() + ) + .getDatabase(databaseName) + + val mongoMetricsRepository = MongoMetricsRepository(database) + + grpc(PushMetricsService(mongoMetricsRepository)) + routing { + api(ApiController(mongoMetricsRepository)) + } +} \ No newline at end of file diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/PushMetricsService.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/PushMetricsService.kt new file mode 100644 index 0000000..26d0df5 --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/PushMetricsService.kt @@ -0,0 +1,34 @@ +package dev.usbharu.unos.watchdog.be + +import com.google.protobuf.Empty +import dev.usbharu.unos.utils.toInstant +import dev.usbharu.unos.watchdog.be.domain.Metric +import dev.usbharu.unos.watchdog.be.domain.MetricsRepository +import dev.usbharu.unos.watchdog.be.domain.Status +import kotlinx.datetime.toKotlinInstant +import watchdog.PushMetrics +import watchdog.PushMetricsServiceGrpcKt +import java.util.* +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +class PushMetricsService( + private val metricsRepository: MetricsRepository, + coroutineContext: CoroutineContext = EmptyCoroutineContext +) : + PushMetricsServiceGrpcKt.PushMetricsServiceCoroutineImplBase(coroutineContext) { + override suspend fun push(request: PushMetrics.Metric): Empty { + metricsRepository.save( + Metric( + id = UUID.randomUUID().toString(), + name = request.name, + objectId = request.objectId, + domain = request.domain, + status = Status.of(request.status), + value = request.value, + timestamp = request.timestamp.toInstant().toKotlinInstant() + ) + ) + return Empty.getDefaultInstance() + } +} \ No newline at end of file diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/Metric.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/Metric.kt new file mode 100644 index 0000000..208428b --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/Metric.kt @@ -0,0 +1,17 @@ +package dev.usbharu.unos.watchdog.be.domain + +import kotlinx.datetime.Instant +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Metric( + @SerialName("_id") + val id: String, + val name: String, + val objectId: String, + val domain: String, + val status: Status, + val value: String, + val timestamp: Instant +) diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/MetricsRepository.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/MetricsRepository.kt new file mode 100644 index 0000000..c74e893 --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/MetricsRepository.kt @@ -0,0 +1,9 @@ +package dev.usbharu.unos.watchdog.be.domain + +import kotlinx.coroutines.flow.Flow +import watchdog.PushMetrics + +interface MetricsRepository { + suspend fun save(metric: Metric):Metric + fun findByObjectId(objectId:String): Flow +} \ No newline at end of file diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/MongoMetricsRepository.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/MongoMetricsRepository.kt new file mode 100644 index 0000000..26b0abf --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/MongoMetricsRepository.kt @@ -0,0 +1,22 @@ +package dev.usbharu.unos.watchdog.be.domain + +import com.mongodb.client.model.Filters +import com.mongodb.client.model.ReplaceOptions +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.withContext + +class MongoMetricsRepository(database: MongoDatabase) : MetricsRepository { + + private val collection = database.getCollection("metrics") + override suspend fun save(metric: Metric): Metric = withContext(Dispatchers.IO) { + collection.replaceOne(Filters.eq(metric.id), metric, ReplaceOptions().upsert(true)) + metric + } + + override fun findByObjectId(objectId:String): Flow { + return collection.find(Filters.eq(Metric::objectId.name, objectId)).limit(20).flowOn(Dispatchers.IO) + } +} \ No newline at end of file diff --git a/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/Status.kt b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/Status.kt new file mode 100644 index 0000000..523eee4 --- /dev/null +++ b/watch-dog-be/src/main/kotlin/dev/usbharu/unos/watchdog/be/domain/Status.kt @@ -0,0 +1,19 @@ +package dev.usbharu.unos.watchdog.be.domain + +import watchdog.PushMetrics + +enum class Status { + OK, + DEAD, + UNKNOWN, + NOT_GOOD; + companion object{ + fun of(status: PushMetrics.Status):Status = when (status) { + PushMetrics.Status.OK -> OK + PushMetrics.Status.DEAD -> DEAD + PushMetrics.Status.UNKNOWN -> UNKNOWN + PushMetrics.Status.NOT_GOOD -> NOT_GOOD + PushMetrics.Status.UNRECOGNIZED -> UNKNOWN + } + } +} diff --git a/watch-dog-be/src/main/resources/application.conf b/watch-dog-be/src/main/resources/application.conf new file mode 100644 index 0000000..3a2f778 --- /dev/null +++ b/watch-dog-be/src/main/resources/application.conf @@ -0,0 +1,18 @@ +ktor { + deployment { + port = 8080 + port = ${?PORT} + } + application { + modules = [ dev.usbharu.unos.watchdog.be.MainKt.module ] + } +} + +watchdog { + db { + url = "mongodb://localhost:27017" + database = "watchdog" + } + + +} \ No newline at end of file