commit 927f15270d1370e574335f3044a94c33c2fa2d63 Author: Alexander Nozik Date: Wed Oct 26 13:37:43 2022 +0300 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f3a1fa --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +build/ +.gradle/ +.idea/ +/*.iml \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6592ab3 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,81 @@ +plugins { + kotlin("multiplatform") version "1.7.10" + kotlin("plugin.serialization") version "1.7.10" + id("org.jetbrains.compose") + application +} + +group = "center.sciprog" +version = "1.0-SNAPSHOT" + +repositories { + jcenter() + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") +} + +kotlin { + jvm { + compilations.all { + kotlinOptions.jvmTarget = "11" + } + withJava() + testRuns["test"].executionTask.configure { + useJUnitPlatform() + } + } + js(IR) { + binaries.executable() + browser { + commonWebpackConfig { + cssSupport.enabled = true + bundleAnalyzerReportDir = File(buildDir, "analysis") + } + } + } + sourceSets { + val commonMain by getting { + dependencies { + implementation(compose.runtime) + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") + } + } + val commonTest by getting { + dependencies { + implementation(kotlin("test")) + } + } + val jvmMain by getting { + dependencies { + implementation("io.ktor:ktor-server-netty:2.1.2") + implementation("io.ktor:ktor-server-html-builder-jvm:2.1.2") + implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2") + implementation("io.rsocket.kotlin:rsocket-ktor-server:0.15.4") + } + } + val jvmTest by getting + val jsMain by getting { + dependencies { + implementation(compose.web.core) + implementation("io.ktor:ktor-client-js:2.1.2") + implementation("io.rsocket.kotlin:rsocket-transport-ktor-websocket-client:0.15.4") + } + } + val jsTest by getting + } +} + +application { + mainClass.set("center.sciprog.application.ServerKt") +} + +tasks.named("jvmProcessResources") { + val jsBrowserDistribution = tasks.named("jsBrowserDistribution") + from(jsBrowserDistribution) +} + +tasks.named("run") { + dependsOn(tasks.named("jvmJar")) + classpath(tasks.named("jvmJar")) +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..48ff2cf --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +kotlin.code.style=official +kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.native.enableDependencyPropagation=false +kotlin.js.generate.executable.default=false + +kotlin.js.webpack.major.version=4 +kotlin.version=1.7.10 +compose.version=1.2.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ae04661 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/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/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..bbcd99d --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,18 @@ + +rootProject.name = "full-stack-demo" + +pluginManagement { + repositories { + google() + gradlePluginPortal() + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } + + plugins { + kotlin("multiplatform").version(extra["kotlin.version"] as String) + id("org.jetbrains.compose").version(extra["compose.version"] as String) + } +} + + diff --git a/src/commonMain/kotlin/model.kt b/src/commonMain/kotlin/model.kt new file mode 100644 index 0000000..48d1f5f --- /dev/null +++ b/src/commonMain/kotlin/model.kt @@ -0,0 +1,13 @@ +import kotlinx.serialization.Serializable + +@Serializable +sealed interface ControlEvent + +@Serializable +data class IntControlEvent(val value: Int) : ControlEvent + +@Serializable +sealed interface DataEvent + +@Serializable +data class IntDataEvent(val value: Int) : DataEvent \ No newline at end of file diff --git a/src/jsMain/kotlin/client.kt b/src/jsMain/kotlin/client.kt new file mode 100644 index 0000000..9850ec9 --- /dev/null +++ b/src/jsMain/kotlin/client.kt @@ -0,0 +1,85 @@ +import androidx.compose.runtime.* +import io.ktor.client.engine.js.Js +import io.rsocket.kotlin.RSocket +import io.rsocket.kotlin.core.RSocketConnector +import io.rsocket.kotlin.payload.Payload +import io.rsocket.kotlin.payload.buildPayload +import io.rsocket.kotlin.payload.data +import io.rsocket.kotlin.transport.ktor.websocket.client.WebSocketClientTransport +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import org.jetbrains.compose.web.css.padding +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.dom.Button +import org.jetbrains.compose.web.dom.Div +import org.jetbrains.compose.web.dom.Span +import org.jetbrains.compose.web.dom.Text +import org.jetbrains.compose.web.renderComposable + + +suspend fun main() { + val transport = WebSocketClientTransport(Js, "localhost", path = "rsocket", port = 8080) + val connector = RSocketConnector() + + //initialize rsocket connection + val rsocket: RSocket = connector.connect(transport) + + //receive data events from server + val dataFlow: Flow = rsocket.requestStream(Payload.Empty).map { + Json.decodeFromString(it.data.readText()) + } + + //send control events to server + suspend fun sendEvent(event: ControlEvent) { + println("Sending $event") + rsocket.fireAndForget(buildPayload { data(Json.encodeToString(event)) }) + } + + + var count: Int by mutableStateOf(0) + + renderComposable(rootElementId = "root") { + val scope = rememberCoroutineScope() + + fun setCount(value: Int) { + count = value + scope.launch { + sendEvent(IntControlEvent(value)) + } + } + + remember { + dataFlow.onEach { event -> + println("Received $event") + if (event is IntDataEvent) { + count = event.value + } + }.launchIn(scope) + } + + Div({ style { padding(25.px) } }) { + Button(attrs = { + onClick { setCount(count - 1) } + }) { + Text("-") + } + + Span({ style { padding(15.px) } }) { + Text("$count") + } + + Button(attrs = { + onClick { setCount(count + 1) } + }) { + Text("+") + } + } + } +} + diff --git a/src/jsMain/resources/index.html b/src/jsMain/resources/index.html new file mode 100644 index 0000000..a9c55b9 --- /dev/null +++ b/src/jsMain/resources/index.html @@ -0,0 +1,11 @@ + + + + + Full stack demo + + +
+ + + \ No newline at end of file diff --git a/src/jvmMain/kotlin/center.sciprog.application/server.kt b/src/jvmMain/kotlin/center.sciprog.application/server.kt new file mode 100644 index 0000000..977e957 --- /dev/null +++ b/src/jvmMain/kotlin/center.sciprog.application/server.kt @@ -0,0 +1,91 @@ +package center.sciprog.application + +import ControlEvent +import DataEvent +import IntControlEvent +import IntDataEvent +import io.ktor.http.HttpStatusCode +import io.ktor.server.application.call +import io.ktor.server.application.install +import io.ktor.server.engine.embeddedServer +import io.ktor.server.html.respondHtml +import io.ktor.server.http.content.resources +import io.ktor.server.netty.Netty +import io.ktor.server.routing.get +import io.ktor.server.routing.routing +import io.ktor.server.websocket.WebSockets +import io.rsocket.kotlin.RSocketRequestHandler +import io.rsocket.kotlin.ktor.server.RSocketSupport +import io.rsocket.kotlin.ktor.server.rSocket +import io.rsocket.kotlin.payload.Payload +import io.rsocket.kotlin.payload.buildPayload +import io.rsocket.kotlin.payload.data +import kotlinx.coroutines.flow.* +import kotlinx.html.* +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json + +fun HTML.index() { + head { + meta { + charset = "UTF-8" + } + title("Hello from Ktor!") + } + body { + div { + id = "root" + } + script { + src = "full-stack-demo.js" + } + } +} + +fun main() { + embeddedServer(Netty, port = 8080, host = "127.0.0.1") { + install(WebSockets) //rsocket requires websockets plugin installed + install(RSocketSupport) + + val controlFlow = MutableSharedFlow() + var counterState = 0 + val dataFlow = MutableSharedFlow() + + controlFlow.onEach { event -> + println("Received $event") + if (event is IntControlEvent) { + counterState = event.value + dataFlow.emit(IntDataEvent(event.value)) + } + }.launchIn(this) + + + + routing { + get("/") { + call.respondHtml(HttpStatusCode.OK, HTML::index) + } + resources() + + rSocket("rsocket") { + println(config.setupPayload.data.readText()) //print setup payload data + + RSocketRequestHandler { + //handler for control event push + fireAndForget { payload -> + controlFlow.emit(Json.decodeFromString(payload.data.readText())) + } + //handler for request/stream + requestStream { _: Payload -> + merge(flowOf(IntDataEvent(counterState)), dataFlow).map { event -> + buildPayload { + data(Json.encodeToString(event)) + } + } + } + } + } + } + }.start(wait = true) +} \ No newline at end of file