continue reborn :(

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.kotlin
 out/*
 *.iml
 target

README.md

@@ -1,12 +1,14 @@
 ## Структура проекта
 
 * **Features** - набор **законченных** фич проекта. Считается, что любая фича, находящаяся в мастере может быть добавлена в
-  клиент и использована в нем. Исключением является `common` - это набор вещей, используемых везде. В подпунктах представлены
+  клиент и использована в нем. Исключением является `common` - это набор вещей, используемых везде.
-  части, на которые *обычно* разделяется фича
+  * Части, на которые *обычно* разделяется фича
-  * Common - общая для фичи часть. Тут, как правило, хранятся конвенции путей для сетевых соединений, общие типы и пр.
+    * Common - общая для фичи часть. Тут, как правило, хранятся конвенции путей для сетевых соединений, общие типы и пр.
-  * Server - часть, включаемая в сервер для подключения фичи. Обычно содержит работу с бд, определение модулей сервера и пр.
+    * Server - часть, включаемая в сервер для подключения фичи. Обычно содержит работу с бд, определение модулей сервера и пр.
-  * Client - часть с клиентским кодом. В большинстве своём включает работу с сервером, MVVM часть (View при этом должны
+    * Client - часть с клиентским кодом. В большинстве своём включает работу с сервером, MVVM часть (View при этом должны
-    находиться в платформенной части, если их нельзя вынести в сommon часть клиента)
+      находиться в платформенной части, если их нельзя вынести в сommon часть клиента)
+  * Также существует фича `client`, которая не является фичей самой по-себе. Фактически, это набор разных фич, который системно
+    отсутствуют в бэке и используются в основном для пробрасывания удобных `API` и `View` для клиента
 * **Services** - модули, отвечающие за клиент-серверную работу фич с точки зрения их взаимодействия. Например, в рамках сервисов
   должен быть добавлен модуль для постов - именно через сервисы будет происходить создание поста, его редактирование и удаление
 * **Client** - итоговый клиент. На момент написания этой доки (`Пн окт 25 12:56:41 +06 2021`) предполагается два варианта:

build.gradle

@@ -23,6 +23,7 @@ allprojects {
         mavenCentral()
         google()
         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
     }
 }
 

client/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
     id "com.android.library"
     alias(libs.plugins.compose)
+    alias(libs.plugins.kt.jb.compose)
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

client/uikit/package.json

@@ -58,5 +58,6 @@
     "semver": "^7.3.2",
     "svgo": "^2.8.0",
     "watch-run": "^1.2.5"
-  }
+  },
+  "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
 }

defaultAndroidSettings.gradle

@@ -1,39 +1,16 @@
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
-    ext {
-        jvmKotlinFolderFile = {
-            String sep = File.separator
-            return new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
-        }
-
-        enableIncludingJvmCodeInAndroidPart = {
-            File jvmKotlinFolder = jvmKotlinFolderFile()
-            if (jvmKotlinFolder.exists()) {
-                android.sourceSets.main.java.srcDirs += jvmKotlinFolder.path
-            }
-        }
-
-        disableIncludingJvmCodeInAndroidPart = {
-            File jvmKotlinFolder = jvmKotlinFolderFile()
-            String[] oldDirs = android.sourceSets.main.java.srcDirs
-            android.sourceSets.main.java.srcDirs = []
-            for (oldDir in oldDirs) {
-                if (oldDir != jvmKotlinFolder.path) {
-                    android.sourceSets.main.java.srcDirs += oldDir
-                }
-            }
-        }
-    }
-
     compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
     buildToolsVersion libs.versions.android.props.buildTools.get()
 
     defaultConfig {
         minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
+        compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
         targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
         versionCode "${android_code_version}".toInteger()
         versionName "$version"
+        namespace "${project.group}.${project.name}"
     }
     buildTypes {
         release {
@@ -51,18 +28,7 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    sourceSets {
-        String sep = File.separator
-        main.java.srcDirs += "src${sep}main${sep}kotlin"
-    }
-
-    enableIncludingJvmCodeInAndroidPart()
 }

extensions.gradle

@@ -13,21 +13,6 @@ allprojects {
             projectByName(name)
         }
 
-        allTargetsConfiguration = { ->
-            kotlin {
-                targets.all {
-                    compilations.all {
-                        kotlinOptions {
-                            freeCompilerArgs += [
-                                "-P",
-                                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
-                            ]
-                        }
-                    }
-                }
-            }
-        }
-
         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
         mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"

features/auth/client/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
     id "com.android.library"
     alias(libs.plugins.compose)
+    alias(libs.plugins.kt.jb.compose)
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

features/auth/client/src/commonMain/kotlin/dev/inmo/postssystem/features/auth/client/AuthorizedFeaturesModules.kt

@@ -1,7 +1,6 @@
 package dev.inmo.postssystem.features.auth.client
 
 import dev.inmo.micro_utils.common.Either
-import dev.inmo.micro_utils.ktor.client.UnifiedRequester
 import dev.inmo.postssystem.features.auth.common.AuthKey
 import dev.inmo.postssystem.features.auth.common.AuthTokenInfo
 import dev.inmo.postssystem.features.common.common.AdditionalModules
@@ -27,7 +26,6 @@ fun createAuthorizedFeaturesDIModule(
                 installClientAuthenticator(serverUrl, get(), get(AuthorizedQualifiers.CredsQualifier), onAuthKeyUpdated, onUserRetrieved, onAuthKeyInvalidated)
             }
         }
-        single { UnifiedRequester(get(), get()) }
         single { StatusFeatureClient(get(AuthorizedQualifiers.ServerUrlQualifier), get()) }
 
         AdditionalModules.Authorized.modules.forEach {

features/auth/client/src/commonMain/kotlin/dev/inmo/postssystem/features/auth/client/ClientAuthFeature.kt

@@ -2,14 +2,14 @@ package dev.inmo.postssystem.features.auth.client
 
 import dev.inmo.postssystem.features.auth.common.*
 import dev.inmo.postssystem.features.users.common.User
-import dev.inmo.micro_utils.ktor.client.UnifiedRequester
+import dev.inmo.micro_utils.ktor.client.bodyOrNull
 import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import io.ktor.client.HttpClient
-import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.client.request.*
 import kotlinx.serialization.builtins.nullable
 
 class ClientAuthFeature(
-    private val requester: UnifiedRequester,
+    private val client: HttpClient,
     baseUrl: String
 ) : AuthFeature {
     private val rootUrl = buildStandardUrl(baseUrl.dropLastWhile { it == '/' }, authRootPathPart)
@@ -26,28 +26,23 @@ class ClientAuthFeature(
         authGetMePathPart
     )
 
-    constructor(client: HttpClient, rootUrl: String): this(
+    override suspend fun auth(creds: AuthCreds): AuthTokenInfo? = client.post(
-        UnifiedRequester(client),
+        fullAuthPath
-        rootUrl
+    ) {
-    )
+        setBody(creds)
+    }.bodyOrNull()
 
-    override suspend fun auth(creds: AuthCreds): AuthTokenInfo? = requester.unipost(
+    override suspend fun refresh(refresh: RefreshToken): AuthTokenInfo? = client.post(
-        fullAuthPath,
+        fullRefreshPath
-        AuthCreds.serializer() to creds,
+    ) {
-        AuthTokenInfo.serializer().nullable
+        setBody(refresh)
-    )
+    }.bodyOrNull()
 
-    override suspend fun refresh(refresh: RefreshToken): AuthTokenInfo? = requester.unipost(
+    override suspend fun getMe(authToken: AuthToken): User? = client.post(
-        fullRefreshPath,
+        fullGetMePath
-        RefreshToken.serializer() to refresh,
+    ) {
-        AuthTokenInfo.serializer().nullable
+        setBody(authToken)
-    )
+    }.bodyOrNull()
-
-    override suspend fun getMe(authToken: AuthToken): User? = requester.unipost(
-        fullGetMePath,
-        AuthToken.serializer() to authToken,
-        User.serializer().nullable
-    )
 
     fun isAuthRequest(builder: HttpRequestBuilder): Boolean = builder.url.buildString().let {
         it == fullAuthPath || it == fullRefreshPath

features/auth/client/src/commonMain/kotlin/dev/inmo/postssystem/features/auth/client/ClientCookiesConfigurator.kt

@@ -37,7 +37,7 @@ fun HttpClientConfig<*>.installClientAuthenticator(
     }.onSecond {
         currentRefreshToken = it.refresh
     }
-    val creds = initialAuthKey.t1 as? AuthCreds
+    val creds = initialAuthKey.t1OrNull as? AuthCreds
     var userRefreshJob: Job? = null
 
     install("Auth Token Refresher") {

features/auth/client/src/commonMain/kotlin/dev/inmo/postssystem/features/auth/client/ModuleLoader.kt

@@ -8,8 +8,9 @@ import dev.inmo.postssystem.features.auth.client.ui.*
 import dev.inmo.postssystem.features.common.common.*
 import dev.inmo.postssystem.features.common.common.ui.fsm.UIFSMExceptionHandler
 import dev.inmo.postssystem.features.common.common.ui.fsm.UIFSMState
+import kotlin.js.JsExport
 
-val defaultModuleLoader = DefaultModuleLoader {
+internal fun CommonAuthModuleLoader() = DefaultModuleLoader {
     single<AuthSettings> { DefaultAuthSettings(get(DefaultQualifiers.SettingsQualifier), get(), getKoin(), get()) }
 
     singleWithRandomQualifier {

features/auth/client/src/jsMain/kotlin/dev/inmo/postssystem/features/auth/client/AuthView.kt

@@ -29,7 +29,7 @@ val loader = DefaultModuleLoader {
             strictlyOn(get<AuthView>())
         }
     }
-}
+} + CommonAuthModuleLoader()
 
 class AuthView(
     private val viewModel: AuthUIViewModel,

features/auth/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.auth.client"/>

features/auth/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.auth.common"/>

features/auth/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/auth/server/AuthenticationRoutingConfigurator.kt

@@ -2,7 +2,7 @@ package dev.inmo.postssystem.features.auth.server
 
 import dev.inmo.postssystem.features.auth.common.*
 import dev.inmo.postssystem.features.auth.server.tokens.AuthTokensService
-import dev.inmo.postssystem.features.common.server.sessions.ApplicationAuthenticationConfigurator
+import dev.inmo.postssystem.features.common.server.ApplicationAuthenticationConfigurator
 import dev.inmo.postssystem.features.users.common.User
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.micro_utils.ktor.server.*
@@ -10,6 +10,7 @@ import dev.inmo.micro_utils.ktor.server.configurators.*
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.call
 import io.ktor.server.auth.*
+import io.ktor.server.request.receive
 import io.ktor.server.response.respond
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.sessions
@@ -24,84 +25,72 @@ fun User.principal() = AuthUserPrincipal(this)
 
 class AuthenticationRoutingConfigurator(
     private val authFeature: AuthFeature,
-    private val authTokensService: AuthTokensService,
+    private val authTokensService: AuthTokensService
-    private val unifiedRouter: UnifiedRouter
 ) : ApplicationRoutingConfigurator.Element, ApplicationAuthenticationConfigurator.Element {
     override fun Route.invoke() {
-        unifiedRouter.apply {
+        route(authRootPathPart) {
-            route(authRootPathPart) {
+            post(authAuthPathPart) {
-                post(authAuthPathPart) {
+                safely(
-                    safely(
+                    {
-                        {
+                        // TODO:: add error info
-                            // TODO:: add error info
+                        it.printStackTrace()
-                            it.printStackTrace()
+                        call.respond(
-                            call.respond(
+                            HttpStatusCode.InternalServerError,
-                                HttpStatusCode.InternalServerError,
+                            "Something went wrong"
-                                "Something went wrong"
-                            )
-                        }
-                    ) {
-                        val creds = uniload(AuthCreds.serializer())
-
-                        val tokenInfo = authFeature.auth(creds)
-
-                        if (tokenInfo == null) {
-                            if (call.response.status() == null) {
-                                call.respond(HttpStatusCode.Forbidden)
-                            }
-                        } else {
-                            call.sessions.set(tokenSessionKey, tokenInfo.token)
-                            unianswer(
-                                AuthTokenInfo.serializer().nullable,
-                                tokenInfo
-                            )
-                        }
-                    }
-                }
-                post (authRefreshPathPart) {
-                    safely(
-                        {
-                            // TODO:: add error info
-                            call.respond(
-                                HttpStatusCode.InternalServerError,
-                                "Something went wrong"
-                            )
-                        }
-                    ) {
-                        val refreshToken = uniload(RefreshToken.serializer())
-
-                        val tokenInfo = authFeature.refresh(refreshToken)
-
-                        if (tokenInfo == null) {
-                            if (call.response.status() == null) {
-                                call.respond(HttpStatusCode.Forbidden)
-                            }
-                        } else {
-                            call.sessions.set(tokenSessionKey, tokenInfo.token)
-                            unianswer(
-                                AuthTokenInfo.serializer().nullable,
-                                tokenInfo
-                            )
-                        }
-                    }
-                }
-                post(authGetMePathPart) {
-                    safely(
-                        {
-                            // TODO:: add error info
-                            call.respond(
-                                HttpStatusCode.InternalServerError,
-                                "Something went wrong"
-                            )
-                        }
-                    ) {
-                        unianswer(
-                            User.serializer().nullable,
-                            authFeature.getMe(
-                                uniload(AuthToken.serializer())
-                            )
                         )
                     }
+                ) {
+                    val creds = call.receive<AuthCreds>()
+
+                    val tokenInfo = authFeature.auth(creds)
+
+                    if (tokenInfo == null) {
+                        if (call.response.status() == null) {
+                            call.respond(HttpStatusCode.Forbidden)
+                        }
+                    } else {
+                        call.sessions.set(tokenSessionKey, tokenInfo.token)
+                        call.respond(tokenInfo)
+                    }
+                }
+            }
+            post (authRefreshPathPart) {
+                safely(
+                    {
+                        // TODO:: add error info
+                        call.respond(
+                            HttpStatusCode.InternalServerError,
+                            "Something went wrong"
+                        )
+                    }
+                ) {
+                    val refreshToken = call.receive<RefreshToken>()
+
+                    val tokenInfo = authFeature.refresh(refreshToken)
+
+                    if (tokenInfo == null) {
+                        if (call.response.status() == null) {
+                            call.respond(HttpStatusCode.Forbidden)
+                        }
+                    } else {
+                        call.sessions.set(tokenSessionKey, tokenInfo.token)
+                        call.respond(tokenInfo)
+                    }
+                }
+            }
+            post(authGetMePathPart) {
+                safely(
+                    {
+                        // TODO:: add error info
+                        call.respond(
+                            HttpStatusCode.InternalServerError,
+                            "Something went wrong"
+                        )
+                    }
+                ) {
+                    call.respond(
+                        authFeature.getMe(call.receive()) ?: HttpStatusCode.NoContent
+                    )
                 }
             }
         }

features/auth/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/auth/server/tokens/AuthTokensRepo.kt

@@ -1,6 +1,6 @@
 package dev.inmo.postssystem.features.auth.server.tokens
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import dev.inmo.postssystem.features.auth.common.AuthToken
 import dev.inmo.postssystem.features.auth.common.RefreshToken
 import dev.inmo.postssystem.features.users.common.UserId

features/auth/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/auth/server/tokens/DefaultAuthTokensService.kt

@@ -1,7 +1,7 @@
 package dev.inmo.postssystem.features.auth.server.tokens
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.milliseconds
+import korlibs.time.milliseconds
 import dev.inmo.postssystem.features.auth.common.*
 import dev.inmo.postssystem.features.common.common.Milliseconds
 import dev.inmo.postssystem.features.users.common.*

features/client/template/client/build.gradle

@@ -0,0 +1,18 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+    id "com.android.library"
+}
+
+apply from: "$mppProjectWithSerializationPresetPath"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api project(":postssystem.features.client.template.common")
+                api project(":postssystem.features.common.client")
+            }
+        }
+    }
+}

features/client/template/common/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+    id "com.android.library"
+}
+
+apply from: "$mppProjectWithSerializationPresetPath"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api project(":postssystem.features.common.common")
+            }
+        }
+    }
+}

features/client/template/server/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+}
+
+apply from: "$mppJavaProjectPresetPath"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api project(":postssystem.features.client.template.common")
+                api project(":postssystem.features.common.server")
+            }
+        }
+    }
+}

features/common/client/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
     id "com.android.library"
     alias(libs.plugins.compose)
+    alias(libs.plugins.kt.jb.compose)
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

features/common/client/src/commonMain/kotlin/dev/inmo/postssystem/features/common/common/DefaultModules.kt

@@ -49,12 +49,16 @@ fun baseKoin(
             single { repoFactory() }
             single { defaultScope }
             single(DefaultQualifiers.UIScopeQualifier) { get<CoroutineScope>().LinkedSupervisorScope(Dispatchers.Main) }
-            single<StatesMachine<UIFSMState>>(UIFSMQualifier) { UIFSM(get()) { (this@single to this@UIFSM).apply(get(
+            single<StatesMachine<UIFSMState>>(DefaultQualifiers.UIFSMQualifier) {
-                DefaultQualifiers.FSMHandlersBuilderQualifier
+                UIFSM(get()) {
-            )) } }
+                    (this@single to this@UIFSM).apply(get(DefaultQualifiers.FSMHandlersBuilderQualifier))
-
+                }
-            AdditionalModules.Default.modules.forEach {
+            }
-                it.apply { load() }
+        } + AdditionalModules.Default.modules.map {
+            module {
+                with(it) {
+                    load()
+                }
             }
         }
     )

features/common/client/src/commonMain/kotlin/dev/inmo/postssystem/features/common/common/DefaultQualifiers.kt

@@ -6,5 +6,5 @@ object DefaultQualifiers {
     val SettingsQualifier = StringQualifier("Settings")
     val FSMHandlersBuilderQualifier = StringQualifier("FSMHandlersBuilder")
     val UIScopeQualifier = StringQualifier("CoroutineScopeUI")
-    val UIFSMQualifier = StringQualifier("FSM")
+    val UIFSMQualifier = StringQualifier("UIFSM")
 }

features/common/client/src/commonMain/kotlin/dev/inmo/postssystem/features/common/common/ModuleLoader.kt

@@ -12,6 +12,15 @@ interface ModuleLoader {
     }
 }
 
+operator fun ModuleLoader.plus(other: ModuleLoader) = ModuleLoader.ByCallback {
+    with(this@plus) {
+        load()
+    }
+    with (other) {
+        load()
+    }
+}
+
 fun DefaultModuleLoader(loadingBlock: Module.() -> Unit): ModuleLoader.ByCallback {
     val newModuleLoader = ModuleLoader.ByCallback(loadingBlock)
     AdditionalModules.Default.addModule(newModuleLoader)

features/common/client/src/commonMain/kotlin/dev/inmo/postssystem/features/common/common/ui/fsm/UIFSM.kt

@@ -6,8 +6,6 @@ import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManager
 import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManagerRepo
 import org.koin.core.qualifier.StringQualifier
 
-val UIFSMQualifier = StringQualifier("UIFSM")
-
 fun UIFSM(
     repo: DefaultStatesManagerRepo<UIFSMState>,
     handlersSetter: FSMBuilder<UIFSMState>.() -> Unit

features/common/client/src/jsMain/kotlin/dev/inmo/postssystem/features/common/common/ui/DateTimeView.kt

@@ -1,8 +1,8 @@
 package dev.inmo.postssystem.features.common.common.ui
 
 import androidx.compose.runtime.Composable
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.ISO8601
+import korlibs.time.ISO8601
 import org.jetbrains.compose.web.dom.Text
 
 object DateTimeView {

features/common/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.common.client"/>

features/common/common/src/commonMain/kotlin/dev/inmo/postssystem/features/common/common/DateTimeSerializer.kt

@@ -1,6 +1,6 @@
 package dev.inmo.postssystem.features.common.common
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializer
 import kotlinx.serialization.builtins.serializer

features/common/common/src/commonMain/kotlin/dev/inmo/postssystem/features/common/common/SimpleInputProvider.kt

@@ -1,6 +1,7 @@
 package dev.inmo.postssystem.features.common.common
 
 import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.filesize
 import io.ktor.utils.io.core.*
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ByteArraySerializer
@@ -27,9 +28,18 @@ class BytesBasedInputProvider(
     }
 }
 
-@Serializable(SimpleInputProviderSerializer::class)
+internal interface FileInputProvider : SimpleInputProvider {
-expect class FileBasedInputProvider : SimpleInputProvider {
     val file: MPPFile
+
+    override val contentBytes: Long?
+        get() = file.filesize
+}
+
+@Serializable(SimpleInputProviderSerializer::class)
+expect class FileBasedInputProvider : FileInputProvider {
+    override val file: MPPFile
+
+    override fun invoke(): Input
 }
 
 @Serializable(SimpleInputProviderSerializer::class)

features/common/common/src/jsMain/kotlin/dev/inmo/postssystem/features/common/common/FileBasedInputProvider.kt

@@ -7,12 +7,9 @@ import kotlinx.serialization.Serializable
 
 @Serializable(SimpleInputProviderSerializer::class)
 actual class FileBasedInputProvider internal constructor(
-    actual val file: MPPFile
+    actual override val file: MPPFile
-) : SimpleInputProvider {
+) : FileInputProvider {
-    override val contentBytes: Long
+    actual override fun invoke(): Input = error("Files inputs must not be used directly")
-        get() = file.filesize
-
-    override fun invoke(): Input = error("Files inputs must not be used directly")
 }
 
 fun MPPFile.inputProvider() = FileBasedInputProvider(this)

features/common/common/src/jvmMain/kotlin/dev/inmo/postssystem/features/common/common/FileBasedInputProvider.kt

@@ -8,10 +8,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable(SimpleInputProviderSerializer::class)
 actual class FileBasedInputProvider(
-    actual val file: MPPFile
+    actual override val file: MPPFile
-) : SimpleInputProvider {
+) : FileInputProvider {
-    override val contentBytes: Long?
-        get() = file.filesize
 
-    override fun invoke(): Input = file.inputStream().asInput()
+    actual override fun invoke(): Input = file.inputStream().asInput()
 }

features/common/common/src/jvmMain/kotlin/dev/inmo/postssystem/features/common/common/KoinSingleWithBinds.kt

@@ -1,6 +1,7 @@
 package dev.inmo.postssystem.features.common.common
 
 import org.koin.core.definition.Definition
+import org.koin.core.definition.KoinDefinition
 import org.koin.core.instance.InstanceFactory
 import org.koin.core.module.Module
 import org.koin.core.qualifier.Qualifier
@@ -11,6 +12,6 @@ inline fun <reified T : Any> Module.singleWithBinds(
     qualifier: Qualifier? = null,
     createdAtStart: Boolean = false,
     noinline definition: Definition<T>
-): Pair<Module, InstanceFactory<*>> {
+): KoinDefinition<*> {
     return single(qualifier, createdAtStart, definition) binds (T::class.allSuperclasses.toTypedArray())
 }

features/common/common/src/linuxX64Main/kotlin/dev/inmo/postssystem/features/common/common/FileMimeType.linuxX64.kt

@@ -0,0 +1,10 @@
+package dev.inmo.postssystem.features.common.common
+
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.filename
+import dev.inmo.micro_utils.mime_types.*
+
+actual val MPPFile.mimeType: MimeType
+    get() {
+        return getMimeTypeOrAny(filename.extension)
+    }

features/common/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.common.common"/>

features/common/common/src/mingwX64Main/kotlin/dev/inmo/postssystem/features/common/common/FileMimeType.mingwX64.kt

@@ -0,0 +1,11 @@
+package dev.inmo.postssystem.features.common.common
+
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.filename
+import dev.inmo.micro_utils.mime_types.MimeType
+import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
+
+actual val MPPFile.mimeType: MimeType
+    get() {
+        return getMimeTypeOrAny(filename.extension)
+    }

features/common/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/common/server/ApplicationAuthenticationConfigurator.kt

@@ -1,4 +1,4 @@
-package dev.inmo.postssystem.features.common.server.sessions
+package dev.inmo.postssystem.features.common.server
 
 import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator
 import io.ktor.server.application.Application

features/common/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/common/server/Qualifiers.kt

@@ -1,8 +1,9 @@
-package dev.inmo.postssystem.features.common.server.sessions
+package dev.inmo.postssystem.features.common.server
 
 import org.koin.core.qualifier.StringQualifier
 
 object Qualifiers {
     val filesFolderQualifier = StringQualifier("filesFolder")
+    val commonFilesFolderQualifier = StringQualifier("commonFilesFolder")
     val usersRolesKeyValueFactoryQualifier = StringQualifier("usersRolesKeyValueFactory")
 }

features/common/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/common/server/ServerModuleLoader.kt

@@ -1,4 +1,4 @@
-package dev.inmo.postssystem.features.common.server.sessions
+package dev.inmo.postssystem.features.common.server
 
 import kotlinx.serialization.json.JsonObject
 import org.koin.core.module.Module

features/content/binary/client/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
     id "com.android.library"
     alias(libs.plugins.compose)
+    alias(libs.plugins.kt.jb.compose)
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

features/content/binary/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.content.binary.client"/>

features/content/binary/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.content.binary.common"/>

features/content/binary/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/content/binary/server/BinaryContentServerModuleLoader.kt

@@ -3,8 +3,8 @@ package dev.inmo.postssystem.features.content.binary.server
 import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
 import dev.inmo.postssystem.features.common.common.singleWithBinds
 import dev.inmo.postssystem.features.common.common.singleWithRandomQualifier
-import dev.inmo.postssystem.features.common.server.sessions.Qualifiers
+import dev.inmo.postssystem.features.common.server.Qualifiers
-import dev.inmo.postssystem.features.common.server.sessions.ServerModuleLoader
+import dev.inmo.postssystem.features.common.server.ServerModuleLoader
 import dev.inmo.postssystem.features.content.common.BinaryContent
 import dev.inmo.postssystem.features.content.server.ServerContentStorageWrapper
 import dev.inmo.postssystem.features.files.common.*

features/content/binary/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/content/binary/server/BinaryServerContentStorage.kt

@@ -6,7 +6,6 @@ import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.mime_types.KnownMimeTypes
 import dev.inmo.micro_utils.pagination.*
 import dev.inmo.micro_utils.repos.*
-import dev.inmo.postssystem.features.common.common.FileBasedInputProvider
 import dev.inmo.postssystem.features.content.common.*
 import dev.inmo.postssystem.features.content.server.storage.ServerContentStorage
 import dev.inmo.postssystem.features.files.common.*

features/content/client/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
     id "com.android.library"
     alias(libs.plugins.compose)
+    alias(libs.plugins.kt.jb.compose)
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

features/content/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.content.client"/>

features/content/common/src/commonMain/kotlin/dev/inmo/postssystem/features/content/common/Content.kt

@@ -1,7 +1,6 @@
 package dev.inmo.postssystem.features.content.common
 
-import dev.inmo.micro_utils.common.FileName
+import dev.inmo.micro_utils.common.*
-import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.mime_types.MimeType
 import dev.inmo.postssystem.features.common.common.SimpleInputProvider
 import kotlinx.serialization.PolymorphicSerializer
@@ -30,6 +29,18 @@ data class BinaryContent(
 ) : Content
 
 val ContentSerializer = PolymorphicSerializer(Content::class)
+@Serializable
+data class ContentWrapper(
+    val content: Content
+)
+@Serializable
+data class ContentsWrapper(
+    val content: List<Content>
+)
+@Serializable
+data class ContentsEithersWrapper(
+    val content: List<Either<ContentId, Content>>
+)
 
 /**
  * Content which is already registered in database. Using its [id] you can retrieve all known

features/content/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.content.common"/>

features/content/text/client/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
     id "com.android.library"
     alias(libs.plugins.compose)
+    alias(libs.plugins.kt.jb.compose)
 }
 
 apply from: "$mppProjectWithSerializationPresetPath"

features/content/text/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.content.content.text.client"/>

features/content/text/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.content.content.text.common"/>

features/content/text/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/content/text/server/TextContentServerModuleLoader.kt

@@ -1,7 +1,7 @@
 package dev.inmo.postssystem.features.content.text.server
 
 import dev.inmo.postssystem.features.common.common.singleWithRandomQualifier
-import dev.inmo.postssystem.features.common.server.sessions.ServerModuleLoader
+import dev.inmo.postssystem.features.common.server.ServerModuleLoader
 import dev.inmo.postssystem.features.content.common.ContentSerializersModuleConfigurator
 import dev.inmo.postssystem.features.content.server.ServerContentStorageWrapper
 import dev.inmo.postssystem.features.content.text.common.TextContent

features/files/client/src/commonMain/kotlin/dev/inmo/postssystem/features/files/client/ClientReadFilesStorage.kt

@@ -2,30 +2,29 @@ package dev.inmo.postssystem.features.files.client
 
 import dev.inmo.postssystem.features.files.common.*
 import dev.inmo.postssystem.features.files.common.storage.ReadFilesStorage
-import dev.inmo.micro_utils.ktor.client.UnifiedRequester
+import dev.inmo.micro_utils.ktor.client.bodyOrNull
 import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import dev.inmo.micro_utils.repos.ReadCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.client.crud.KtorReadStandardCrudRepo
+import dev.inmo.micro_utils.repos.ktor.client.crud.KtorReadCRUDRepoClient
 import io.ktor.client.HttpClient
-import io.ktor.client.request.post
+import io.ktor.client.request.*
-import io.ktor.client.request.setBody
-import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.readBytes
+import io.ktor.http.ContentType
+import io.ktor.http.encodeURLQueryComponent
 import kotlinx.serialization.BinaryFormat
 import kotlinx.serialization.builtins.nullable
 
 class ClientReadFilesStorage(
     baseUrl: String,
     private val client: HttpClient,
-    private val serialFormat: BinaryFormat
+    private val serialFormat: BinaryFormat,
-) : ReadFilesStorage, ReadCRUDRepo<MetaFileInfoStorageWrapper, FileId> by KtorReadStandardCrudRepo(
+    contentType: ContentType
+) : ReadFilesStorage, ReadCRUDRepo<MetaFileInfoStorageWrapper, FileId> by KtorReadCRUDRepoClient<MetaFileInfoStorageWrapper, FileId>(
     buildStandardUrl(baseUrl, filesRootPathPart),
-    UnifiedRequester(client, serialFormat),
+    client,
-    MetaFileInfoStorageWrapper.serializer(),
+    contentType,
-    MetaFileInfoStorageWrapper.serializer().nullable,
+    { it.string.encodeURLQueryComponent() }
-    FileId.serializer()
 ) {
-    private val unifiedRequester = UnifiedRequester(client, serialFormat)
     private val fullFilesPath = buildStandardUrl(baseUrl, filesRootPathPart)
     private val fullFilesGetBytesPath = buildStandardUrl(
         fullFilesPath,
@@ -38,12 +37,11 @@ class ClientReadFilesStorage(
 
     override suspend fun getFullFileInfo(
         id: FileId
-    ): FullFileInfoStorageWrapper? = unifiedRequester.uniget(
+    ): FullFileInfoStorageWrapper? = client.get(
         buildStandardUrl(
             fullFilesPath,
             filesGetFullFileInfoPathPart,
-            filesFileIdParameter to unifiedRequester.encodeUrlQueryValue(FileId.serializer(), id)
+            filesFileIdParameter to id.string.encodeURLQueryComponent()
-        ),
+        )
-        FullFileInfoStorageWrapper.serializer().nullable
+    ).bodyOrNull()
-    )
 }

features/files/client/src/commonMain/kotlin/dev/inmo/postssystem/features/files/client/ModuleLoader.kt

@@ -5,5 +5,5 @@ import dev.inmo.postssystem.features.auth.client.AuthorizedQualifiers
 import dev.inmo.postssystem.features.files.common.storage.ReadFilesStorage
 
 val loader = AuthorizedModuleLoader {
-    single<ReadFilesStorage> { ClientReadFilesStorage(get(AuthorizedQualifiers.ServerUrlQualifier), get(), get()) }
+    single<ReadFilesStorage> { ClientReadFilesStorage(get(AuthorizedQualifiers.ServerUrlQualifier), get(), get(), get()) }
 }

features/files/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.files.client"/>

features/files/common/src/jvmMain/kotlin/dev/inmo/postssystem/features/files/common/DiskReadFilesStorage.kt

@@ -61,4 +61,8 @@ class DiskReadFilesStorage(
             }
         )
     }
+
+    override suspend fun getIdsByPagination(pagination: Pagination): PaginationResult<FileId> {
+        return metasKeyValueRepo.keys(pagination)
+    }
 }

features/files/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.files.common"/>

features/files/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/files/server/FilesRoutingConfigurator.kt

@@ -4,10 +4,13 @@ import dev.inmo.postssystem.features.files.common.*
 import dev.inmo.postssystem.features.files.common.storage.*
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
-import dev.inmo.micro_utils.repos.ktor.server.crud.configureReadStandardCrudRepoRoutes
+import dev.inmo.micro_utils.repos.ktor.server.crud.*
-import dev.inmo.micro_utils.repos.ktor.server.crud.configureWriteStandardCrudRepoRoutes
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.decodeURLQueryComponent
 import io.ktor.server.application.call
 import io.ktor.server.auth.authenticate
+import io.ktor.server.request.receive
+import io.ktor.server.response.respond
 import io.ktor.server.response.respondBytes
 import io.ktor.server.routing.*
 import kotlinx.serialization.builtins.nullable
@@ -15,47 +18,33 @@ import kotlinx.serialization.builtins.nullable
 class FilesRoutingConfigurator(
     private val filesStorage: ReadFilesStorage,
     private val writeFilesStorage: WriteFilesStorage?,
-    private val unifierRouter: UnifiedRouter
 ) : ApplicationRoutingConfigurator.Element {
-    constructor(filesStorage: FilesStorage, unifierRouter: UnifiedRouter) : this(filesStorage, filesStorage, unifierRouter)
+    constructor(filesStorage: FilesStorage) : this(filesStorage, filesStorage)
 
     override fun Route.invoke() {
         authenticate {
             route(filesRootPathPart) {
-                configureReadStandardCrudRepoRoutes(
+                configureReadCRUDRepoRoutes(
                     filesStorage,
-                    MetaFileInfoStorageWrapper.serializer(),
+                    ::FileId
-                    MetaFileInfoStorageWrapper.serializer().nullable,
-                    FileId.serializer(),
-                    unifierRouter
                 )
                 writeFilesStorage ?.let {
-                    configureWriteStandardCrudRepoRoutes(
+                    configureWriteCRUDRepoRoutes(writeFilesStorage)
-                        writeFilesStorage,
-                        FullFileInfoStorageWrapper.serializer(),
-                        FullFileInfoStorageWrapper.serializer().nullable,
-                        FullFileInfo.serializer(),
-                        FileId.serializer(),
-                        unifierRouter
-                    )
                 }
 
-                unifierRouter.apply {
+                post(filesGetFilesPathPart) {
-                    post(filesGetFilesPathPart) {
+                    call.respondBytes(
-                        call.respondBytes(
+                        filesStorage.getBytes(
-                            filesStorage.getBytes(
+                            call.receive()
-                                uniload(FileId.serializer())
-                            )
                         )
-                    }
+                    )
-                    get(filesGetFullFileInfoPathPart) {
+                }
-                        unianswer(
+                get(filesGetFullFileInfoPathPart) {
-                            FullFileInfoStorageWrapper.serializer().nullable,
+                    call.respond(
-                            filesStorage.getFullFileInfo(
+                        filesStorage.getFullFileInfo(
-                                decodeUrlQueryValueOrSendError(filesFileIdParameter, FileId.serializer()) ?: return@get
+                            FileId(call.getParameterOrSendError(filesFileIdParameter) ?.decodeURLQueryComponent() ?: return@get)
-                            )
+                        ) ?: HttpStatusCode.NoContent
-                        )
+                    )
-                    }
                 }
             }
         }

features/posts/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.posts.client"/>

features/posts/common/src/commonMain/kotlin/dev/inmo/postssystem/features/posts/common/Post.kt

@@ -1,6 +1,6 @@
 package dev.inmo.postssystem.features.posts.common
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import dev.inmo.postssystem.features.common.common.DateTimeSerializer
 import dev.inmo.postssystem.features.content.common.Content
 import dev.inmo.postssystem.features.content.common.ContentId

features/posts/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.posts.common"/>

features/posts/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/posts/server/ExposedServerPostsStorage.kt

@@ -1,6 +1,6 @@
 package dev.inmo.postssystem.features.posts.server
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import dev.inmo.micro_utils.repos.exposed.*
 import dev.inmo.postssystem.features.content.common.ContentId
 import dev.inmo.postssystem.features.posts.common.*

features/publication/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.publication.client"/>

features/publication/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.publication.common"/>

features/roles/client/src/commonMain/kotlin/dev/inmo/postssystem/features/roles/client/ClientUsersRolesStorage.kt

@@ -1,17 +1,17 @@
 package dev.inmo.postssystem.features.roles.client
 
 import dev.inmo.postssystem.features.roles.common.*
-import dev.inmo.micro_utils.ktor.client.UnifiedRequester
+import io.ktor.client.*
 import kotlinx.serialization.KSerializer
 
 class ClientRolesStorage<T : Role>(
     private val baseUrl: String,
-    private val unifiedRequester: UnifiedRequester,
+    private val client: HttpClient,
     private val serializer: KSerializer<T>
 ) : RolesStorage<T>,
     ReadRolesStorage<T> by ReadClientRolesStorage(
-        baseUrl, unifiedRequester, serializer
+        baseUrl, client, serializer
     ),
     WriteRolesStorage<T> by WriteClientRolesStorage(
-        baseUrl, unifiedRequester, serializer
+        baseUrl, client, serializer
     )

features/roles/client/src/commonMain/kotlin/dev/inmo/postssystem/features/roles/client/ReadClientUsersRolesStorage.kt

@@ -3,13 +3,15 @@ package dev.inmo.postssystem.features.roles.client
 import dev.inmo.postssystem.features.roles.common.*
 import dev.inmo.micro_utils.ktor.client.UnifiedRequester
 import dev.inmo.micro_utils.ktor.common.buildStandardUrl
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 
 class ReadClientRolesStorage<T : Role>(
     private val baseUrl: String,
-    private val unifiedRequester: UnifiedRequester,
+    private val client: HttpClient,
     private val serializer: KSerializer<T>
 ) : ReadRolesStorage<T> {
     private val userRolesSerializer = ListSerializer(serializer)
@@ -21,14 +23,13 @@ class ReadClientRolesStorage<T : Role>(
 
     override suspend fun getSubjects(
         role: T
-    ): List<RoleSubject> = unifiedRequester.uniget(
+    ): List<RoleSubject> = client.get(
         buildStandardUrl(
             userRolesFullUrl,
             usersRolesGetSubjectsPathPart,
-            usersRolesRoleQueryParameterName to unifiedRequester.encodeUrlQueryValue(serializer, role)
+            usersRolesRoleQueryParameterName to role
-        ),
+        )
-        RoleSubjectsSerializer
+    ).body()
-    )
 
     override suspend fun getRoles(
         subject: RoleSubject

features/roles/client/src/commonMain/kotlin/dev/inmo/postssystem/features/roles/client/WriteClientUsersRolesStorage.kt

@@ -8,7 +8,7 @@ import kotlinx.serialization.builtins.serializer
 
 class WriteClientRolesStorage<T : Role>(
     private val baseUrl: String,
-    private val unifiedRequester: UnifiedRequester,
+    private val client: HttpClient,
     private val serializer: KSerializer<T>
 ) : WriteRolesStorage<T> {
     private val wrapperSerializer = RolesStorageIncludeExcludeWrapper.serializer(

features/roles/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.roles.client"/>

features/roles/common/src/commonMain/kotlin/dev/inmo/postssystem/features/roles/common/Role.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.*
 import kotlinx.serialization.json.*
 
-@Serializable(RoleSerializer::class)
+@Polymorphic
 interface Role {
     companion object {
         fun serializer(): KSerializer<Role> = RoleSerializer

features/roles/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.roles.common"/>

features/roles/manager/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.roles.manager.client"/>

features/roles/manager/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.roles.manager.common"/>

features/roles/manager/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/roles/manager/server/RolesManagerUsersRolesStorageServerRoutesConfigurator.kt

@@ -1,17 +1,14 @@
 package dev.inmo.postssystem.features.roles.manager.server
 
-import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.postssystem.features.roles.common.RolesStorage
 import dev.inmo.postssystem.features.roles.manager.common.RolesManagerRole
 import dev.inmo.postssystem.features.roles.server.RolesStorageWriteServerRoutesConfigurator
 import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
 
 class RolesManagerRolesStorageServerRoutesConfigurator(
-    storage: RolesStorage<RolesManagerRole>,
+    storage: RolesStorage<RolesManagerRole>
-    unifiedRouter: UnifiedRouter
 ) : ApplicationRoutingConfigurator.Element by RolesStorageWriteServerRoutesConfigurator(
     storage,
     RolesManagerRole.serializer(),
-    RolesManagerRolesChecker.key,
+    RolesManagerRolesChecker.key
-    unifiedRouter = unifiedRouter
 )

features/roles/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/roles/server/RolesStorageWriteServerRoutesConfigurator.kt

@@ -12,8 +12,7 @@ class RolesStorageWriteServerRoutesConfigurator<T : Role>(
     private val storage: WriteRolesStorage<T>,
     private val serializer: KSerializer<T>,
     private val includeAuthKey: String,
-    private val excludeAuthKey: String = includeAuthKey,
+    private val excludeAuthKey: String = includeAuthKey
-    private val unifiedRouter: UnifiedRouter
 ) : ApplicationRoutingConfigurator.Element {
     override fun Route.invoke() {
         route(usersRolesRootPathPart) {

features/roles/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/roles/server/UsersRolesAuthenticationConfigurator.kt

@@ -3,7 +3,7 @@ package dev.inmo.postssystem.features.roles.server
 import dev.inmo.postssystem.features.auth.common.AuthToken
 import dev.inmo.postssystem.features.auth.server.principal
 import dev.inmo.postssystem.features.auth.server.tokens.AuthTokensService
-import dev.inmo.postssystem.features.common.server.sessions.ApplicationAuthenticationConfigurator
+import dev.inmo.postssystem.features.common.server.ApplicationAuthenticationConfigurator
 import dev.inmo.postssystem.features.roles.common.Role
 import dev.inmo.postssystem.features.roles.common.RolesStorage
 import io.ktor.http.HttpStatusCode

features/roles/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/roles/server/UsersRolesStorageReadServerRoutesConfigurator.kt

@@ -11,8 +11,7 @@ import kotlinx.serialization.builtins.serializer
 
 class RolesStorageReadServerRoutesConfigurator<T : Role>(
     private val storage: ReadRolesStorage<T>,
-    private val serializer: KSerializer<T>,
+    private val serializer: KSerializer<T>
-    private val unifiedRouter: UnifiedRouter
 ) : ApplicationRoutingConfigurator.Element {
     private val userRolesSerializer = ListSerializer(serializer)
     override fun Route.invoke() {

features/status/client/src/commonMain/kotlin/dev/inmo/postssystem/features/status/client/StatusFeatureClient.kt

@@ -2,11 +2,9 @@ package dev.inmo.postssystem.features.status.client
 
 import dev.inmo.postssystem.features.status.common.statusAuthorisedPathPart
 import dev.inmo.postssystem.features.status.common.statusRootPart
-import dev.inmo.micro_utils.ktor.client.UnifiedRequester
 import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
-import io.ktor.client.statement.HttpResponse
 import io.ktor.http.HttpStatusCode
 
 class StatusFeatureClient(

features/status/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.status.client"/>

features/status/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.status.common"/>

features/template/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.template.client"/>

features/template/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.template.common"/>

features/users/client/src/commonMain/kotlin/dev/inmo/postssystem/features/users/client/ModuleLoader.kt

@@ -5,5 +5,5 @@ import dev.inmo.postssystem.features.auth.client.AuthorizedQualifiers
 import dev.inmo.postssystem.features.users.common.ReadUsersStorage
 
 val loader = AuthorizedModuleLoader {
-    single<ReadUsersStorage> { UsersStorageKtorClient(get(AuthorizedQualifiers.ServerUrlQualifier), get()) }
+    single<ReadUsersStorage> { UsersStorageKtorClient(get(AuthorizedQualifiers.ServerUrlQualifier), get(), get()) }
 }

features/users/client/src/commonMain/kotlin/dev/inmo/postssystem/features/users/client/UsersStorageKtorClient.kt

@@ -1,19 +1,19 @@
 package dev.inmo.postssystem.features.users.client
 
 import dev.inmo.postssystem.features.users.common.*
-import dev.inmo.micro_utils.ktor.client.UnifiedRequester
 import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import dev.inmo.micro_utils.repos.ReadCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.client.crud.KtorReadStandardCrudRepo
+import dev.inmo.micro_utils.repos.ktor.client.crud.KtorReadCRUDRepoClient
-import kotlinx.serialization.builtins.nullable
+import io.ktor.client.*
+import io.ktor.http.*
 
 class UsersStorageKtorClient(
     baseUrl: String,
-    unifiedRequester: UnifiedRequester
+    client: HttpClient,
-) : ReadUsersStorage, ReadCRUDRepo<User, UserId> by KtorReadStandardCrudRepo(
+    contentType: ContentType
+) : ReadUsersStorage, ReadCRUDRepo<User, UserId> by KtorReadCRUDRepoClient(
     buildStandardUrl(baseUrl, usersServerPathPart),
-    unifiedRequester,
+    client,
-    User.serializer(),
+    contentType,
-    User.serializer().nullable,
+    { it.long.toString() }
-    UserId.serializer()
 )

features/users/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.users.client"/>

features/users/common/build.gradle

@@ -21,7 +21,3 @@ kotlin {
         }
     }
 }
-
-android {
-    disableIncludingJvmCodeInAndroidPart()
-}

features/users/common/src/commonMain/kotlin/dev/inmo/postssystem/features/users/common/User.kt

@@ -31,7 +31,7 @@ sealed class User : NewUser {
 }
 
 @Serializable
-data class DefaultUser(
+data class RegisteredUser(
     override val id: UserId,
     override val firstName: String,
     override val lastName: String,

features/users/common/src/jvmMain/kotlin/dev/inmo/postssystem/features/users/common/ExposedUsersStorage.kt

@@ -3,8 +3,7 @@ package dev.inmo.postssystem.features.users.common
 import dev.inmo.micro_utils.repos.exposed.AbstractExposedCRUDRepo
 import dev.inmo.micro_utils.repos.exposed.initTable
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.statements.InsertStatement
+import org.jetbrains.exposed.sql.statements.*
-import org.jetbrains.exposed.sql.statements.UpdateStatement
 
 class ExposedUsersStorage(override val database: Database) : UsersStorage, AbstractExposedCRUDRepo<User, UserId, NewUser>(
     tableName = "Users"
@@ -15,11 +14,12 @@ class ExposedUsersStorage(override val database: Database) : UsersStorage, Abstr
     private val lastNameColumn = text("lastName")
 
     override val primaryKey: PrimaryKey = PrimaryKey(userIdColumn)
+    override val selectById: ISqlExpressionBuilder.(UserId) -> Op<Boolean> = { userIdColumn.eq(it.long) }
+    override val ResultRow.asId: UserId
+        get() = UserId(get(userIdColumn))
 
-    override val selectByIds: SqlExpressionBuilder.(List<UserId>) -> Op<Boolean> = { userIdColumn.inList(it.map { it.long }) }
-    override val selectById: SqlExpressionBuilder.(UserId) -> Op<Boolean> = { userIdColumn.eq(it.long) }
     override val ResultRow.asObject: User
-        get() = DefaultUser(
+        get() = RegisteredUser(
             get(userIdColumn).userId,
             get(firstNameColumn),
             get(lastNameColumn),
@@ -30,19 +30,19 @@ class ExposedUsersStorage(override val database: Database) : UsersStorage, Abstr
         initTable()
     }
 
-    override fun insert(value: NewUser, it: InsertStatement<Number>) {
+    override fun insert(value: NewUser, it: UpdateBuilder<Int>) {
         it[usernameColumn] = value.username.string
         it[firstNameColumn] = value.firstName
         it[lastNameColumn] = value.lastName
     }
 
-    override fun update(id: UserId, value: NewUser, it: UpdateStatement) {
+    override fun update(id: UserId?, value: NewUser, it: UpdateBuilder<Int>) {
         it[usernameColumn] = value.username.string
         it[firstNameColumn] = value.firstName
         it[lastNameColumn] = value.lastName
     }
 
-    override fun InsertStatement<Number>.asObject(value: NewUser): User = DefaultUser(
+    override fun InsertStatement<Number>.asObject(value: NewUser): User = RegisteredUser(
         get(userIdColumn).userId,
         get(firstNameColumn),
         get(lastNameColumn),

features/users/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.users.common"/>

features/users/server/src/jvmMain/kotlin/dev/inmo/postssystem/features/users/server/UsersStorageServerRoutesConfigurator.kt

@@ -1,28 +1,21 @@
 package dev.inmo.postssystem.features.users.server
 
-import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.postssystem.features.users.common.*
 import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
-import dev.inmo.micro_utils.repos.ktor.server.crud.configureReadStandardCrudRepoRoutes
+import dev.inmo.micro_utils.repos.ktor.server.crud.configureReadCRUDRepoRoutes
 import io.ktor.server.auth.authenticate
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.route
-import kotlinx.serialization.builtins.nullable
 
 class UsersStorageServerRoutesConfigurator(
-    private val usersStorage: ReadUsersStorage,
+    private val usersStorage: ReadUsersStorage
-    private val unifiedRouter: UnifiedRouter
 ) : ApplicationRoutingConfigurator.Element {
     override fun Route.invoke() {
         authenticate {
             route(usersServerPathPart) {
-                configureReadStandardCrudRepoRoutes(
+                configureReadCRUDRepoRoutes(
-                    usersStorage,
+                    usersStorage
-                    User.serializer(),
+                ) { UserId(it.toLong()) }
-                    User.serializer().nullable,
-                    UserId.serializer(),
-                    unifiedRouter
-                )
             }
         }
     }

gradle/libs.versions.toml

@@ -1,39 +1,42 @@
 [versions]
 
-kotlin = "1.6.21"
+kotlin = "2.0.10"
-kotlin-serialization = "1.3.3"
+kotlin-serialization = "1.7.1"
-jsuikit = "0.1.1"
+kotlin-coroutines = "1.8.1"
-compose = "1.2.0-alpha01-dev686"
+jsuikit = "0.7.6"
-microutils = "0.10.4"
+compose = "1.7.0-alpha02"
-tgbotapi = "1.1.1"
+microutils = "0.22.0"
-ktor = "2.0.1"
+tgbotapi = "17.0.0"
-klock = "2.7.0"
+ktor = "2.3.11"
-koin = "3.2.0"
+korlibs = "5.4.0"
-exposed = "0.38.2"
+koin = "3.5.6"
-psql = "42.3.0"
+exposed = "0.53.0"
-scrimage = "4.0.31"
+psql = "42.3.6"
-dokka = "1.6.21"
+scrimage = "4.1.1"
+dokka = "1.9.20"
 logback = "1.2.10"
-uuid = "0.4.0"
+uuid = "0.8.4"
 
 android-junit = "4.12"
 android-test-junit = "1.1.2"
 android-espresso-core = "3.3.0"
 
-gh-release = "2.3.7"
+gh-release = "2.5.1"
 
-android-gradle = "7.0.4"
+android-gradle = "8.2.2"
 dexcount = "3.1.0"
 
-android-coreKtx = "1.7.0"
+android-coreKtx = "1.12.0"
 android-recyclerView = "1.2.1"
 android-appCompat = "1.4.1"
+android-fragment = "1.6.2"
+android-compose-material3 = "1.1.2"
 android-espresso = "3.3.0"
 android-test = "1.1.2"
 
-android-props-minSdk = "19"
+android-props-minSdk = "21"
-android-props-compileSdk = "32"
+android-props-compileSdk = "35"
-android-props-buildTools = "32.0.0"
+android-props-buildTools = "35.0.0"
 
 [libraries]
 
@@ -42,6 +45,10 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
 kotlin-serialization-properties = { module = "org.jetbrains.kotlinx:kotlinx-serialization-properties", version.ref = "kotlin-serialization" }
 
+kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
+kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlin-coroutines" }
+kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutines" }
+
 jsuikit = { module = "dev.inmo:kjsuikit", version.ref = "jsuikit" }
 
 postgresql = { module = "org.postgresql:postgresql", version.ref = "psql" }
@@ -81,12 +88,18 @@ microutils-serialization-typedserializer = { module = "dev.inmo:micro_utils.seri
 
 tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
 
-klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
+klock = { module = "com.soywiz.korge:korlibs-time", version.ref = "korlibs" }
+krypto = { module = "com.soywiz.korge:korlibs-crypto", version.ref = "korlibs" }
 
 scrimage = { module = "com.sksamuel.scrimage:scrimage-core", version.ref = "scrimage" }
 
-androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test-junit" }
+android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" }
-androidx-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso-core" }
+android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
+android-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "android-appCompat" }
+android-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "android-compose-material3" }
+android-fragment = { module = "androidx.fragment:fragment", version.ref = "android-fragment" }
+android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" }
+android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" }
 
 # classpaths
 
@@ -100,3 +113,4 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra
 [plugins]
 
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME

mppAndroidProject.gradle

@@ -1,11 +1,16 @@
 project.version = "$version"
 project.group = "$group"
 
-// apply from: "$publishGradlePath"
+apply from: "$publishGradlePath"
 
 kotlin {
-    android {
+    androidTarget {
         publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
     }
 
     sourceSets {
@@ -18,18 +23,15 @@ kotlin {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
-            }
+                implementation libs.kt.coroutines.test
-        }
-        androidTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation libs.androidx.test.junit
-                implementation libs.androidx.espresso
             }
         }
     }
-
-    allTargetsConfiguration()
 }
 
 apply from: "$defaultAndroidSettingsPresetPath"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}

mppJavaProject.gradle

@@ -4,7 +4,13 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
 
     sourceSets {
         commonMain {
@@ -16,6 +22,7 @@ kotlin {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.coroutines.test
             }
         }
 
@@ -25,11 +32,9 @@ kotlin {
             }
         }
     }
-
-    allTargetsConfiguration()
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
 }

mppJsProject.gradle

@@ -13,21 +13,25 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
+                api libs.kotlin.serialization
             }
         }
         commonTest {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.coroutines.test
             }
         }
         jsTest {
             dependencies {
                 implementation kotlin('test-js')
-                implementation kotlin('test-junit')
             }
         }
     }
-
+}
-    allTargetsConfiguration()
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

mppProjectWithSerialization.gradle

@@ -4,19 +4,30 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
     js (IR) {
         browser()
         nodejs()
     }
-    android {
+    androidTarget {
         publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
     }
 
     sourceSets {
         commonMain {
             dependencies {
-                implementation libs.kotlin.std
+                implementation kotlin('stdlib')
                 api libs.kotlin.serialization
             }
         }
@@ -24,6 +35,7 @@ kotlin {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
+                implementation libs.kotlin.coroutines.test
             }
         }
         jvmTest {
@@ -34,24 +46,23 @@ kotlin {
         jsTest {
             dependencies {
                 implementation kotlin('test-js')
-                implementation kotlin('test-junit')
             }
         }
-        androidTest {
+        androidUnitTest {
             dependencies {
                 implementation kotlin('test-junit')
-                implementation libs.androidx.test.junit
+                implementation libs.android.test.junit
-                implementation libs.androidx.espresso
+                implementation libs.android.espresso
             }
         }
-    }
 
-    allTargetsConfiguration()
+        androidMain.dependsOn jvmMain
+    }
 }
 
 apply from: "$defaultAndroidSettingsPresetPath"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
 }