fixes in ExposedOneToManyKeyValueRepo and includeWebsocketHandling

0.9.6

.github/workflows/dokka_push.yml

@@ -15,7 +15,7 @@ jobs:
         continue-on-error: true
         run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Build
-        run: ./gradlew build && ./gradlew dokkaHtml
+        run: ./gradlew dokkaHtml
       - name: Publish KDocs
         uses: peaceiris/actions-gh-pages@v3
         with:

.github/workflows/packages_push.yml

@@ -1,14 +1,17 @@
 
-name: Build
+name: Publish package to GitHub Packages
 on: [push]
 jobs:
-  build:
+  publishing:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
           java-version: 11
+      - name: Fix android 32.0.0 dx
+        continue-on-error: true
+        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Rewrite version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
@@ -19,6 +22,7 @@ jobs:
         run: ./gradlew build
       - name: Publish
         continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGiteaRepository
+        run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signAndroidDebugPublication -x signAndroidReleasePublication -x signKotlinMultiplatformPublication
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

.space.kts

@@ -0,0 +1,8 @@
+job("Build and run tests") {
+    container(displayName = "Run gradle build", image = "openjdk:11") {
+        kotlinScript { api ->
+            // here can be your complex logic
+            api.gradlew("build")
+        }
+    }
+}

CHANGELOG.md

@@ -1,544 +1,5 @@
 # Changelog
 
-## 0.14.4
-
-* `Common`:
-    * `JVM`:
-        * New extension `downloadToTempFile`
-* `Ktor`:
-    * `Server`:
-        * Small fix in `handleUniUpload`
-        * `ApplicationCall#uniloadMultipartFile` now uses `uniloadMultipart`
-    * `Common`:
-        * New extension `downloadToTempFile`
-    * `Client`:
-        * New extensions on top of `uniUpload`
-
-## 0.14.3
-
-* `Common`:
-    * New type `Progress`
-* `Ktor`:
-    * `Client`:
-        * New universal `uniUpload` extension for `HttpClient`
-    * `Server`:
-        * New universal `handleUniUpload` extension for `ApplicationCall`
-        * Add extensions `download` and `downloadToTemporalFile`
-
-## 0.14.2
-
-* `Versions`:
-    * `Exposed`: `0.40.1` -> `0.41.1`
-
-
-## 0.14.1
-
-* `Versions`:
-    * `Klock`: `3.3.1` -> `3.4.0`
-    * `UUID`: `0.5.0` -> `0.6.0`
-
-## 0.14.0
-
-**ALL DEPRECATIONS HAVE BEEN REMOVED**
-
-* `Versions`:
-    * `Kotlin`: `1.7.10` -> `1.7.20`
-    * `Klock`: `3.3.0` -> `3.3.1`
-    * `Compose`: `1.2.0` -> `1.2.1`
-    * `Exposed`: `0.39.2` -> `0.40.1`
-
-## 0.13.2
-
-* `Versions`:
-    * `Klock`: `3.1.0` -> `3.3.0`
-    * `Ktor`: `2.1.2` -> `2.1.3`
-
-## 0.13.1
-
-* `Repos`:
-    * `Exposed`:
-      * `AbstractExposedWriteCRUDRepo#createAndInsertId` now is optional and returns nullable value
-
-## 0.13.0
-
-**ALL DEPRECATIONS HAVE BEEN REMOVED**
-**A LOT OF KTOR METHODS RELATED TO UnifierRouter/UnifiedRequester HAVE BEEN REMOVED**
-
-* `Repos`:
-  * `Exposed`:
-    * `AbstractExposedWriteCRUDRepo` got two new methods: `update` with `it` as `UpdateBuilder<Int>` and `createAndInsertId`
-      * Old `update` method has been deprecated and not recommended to override anymore in realizations
-      * Old `insert` method now is `open` instead of `abstract` and can be omitted
-    * `AbstractExposedKeyValueRepo` got two new methods: `update` with `it` as `UpdateBuilder<Int>` and `insertKey`
-      * Old `update` method has been deprecated and not recommended to override anymore
-      * Old `insert` method now is `open` instead of `abstract` and can be omitted in realizations
-
-## 0.12.17
-
-* `Versions`:
-    * `JB Compose`: `1.2.0-alpha01-dev774` -> `1.2.0-beta02`
-    * `Ktor`: `2.1.1` -> `2.1.2`
-    * `Koin`: `3.2.0` -> `3.2.2`
-
-## 0.12.16
-
-* `Coroutines`:
-  * `Android`:
-    * Add class `FlowOnHierarchyChangeListener`
-    * Add `ViewGroup#setOnHierarchyChangeListenerRecursively(OnHierarchyChangeListener)`
-
-## 0.12.15
-
-* `Common`:
-    * `applyDiff` will return `Diff` object since this release
-    * `Android`:
-      * New functions/extensions `findViewsByTag` and `findViewsByTagInActivity`
-* `Coroutines`:
-    * Add `Flow` extensions `flatMap`, `flatMapNotNull` and `flatten`
-    * Add `Flow` extensions `takeNotNull` and `filterNotNull`
-
-## 0.12.14
-
-* `Versions`:
-  * `Android CoreKTX`: `1.8.0` -> `1.9.0`
-  * `Android AppCompat`: `1.4.2` -> `1.5.1`
-  * Android Compile SDK: 32 -> 33
-  * Android Build Tools: 32.0.0 -> 33.0.0
-* `Common`:
-  * `Android`:
-    * Add `argumentOrNull`/`argumentOrThrow` delegates for fragments
-* `Coroutines`:
-  * Rewrite `awaitFirstWithDeferred` onto `CompletableDeferred` instead of coroutines suspending
-
-## 0.12.13
-
-* `Coroutines`:
-  * Add opportunity to use markers in actors (solution of [#160](https://github.com/InsanusMokrassar/MicroUtils/issues/160))
-* `Koin`:
-  * Module inited :)
-* `Repos`:
-  * `Android`:
-    * Add typealias `KeyValueSPRepo` and opportunity to create shared preferences `KeyValue` repo with `KeyValueStore(...)` (fix of [#155](https://github.com/InsanusMokrassar/MicroUtils/issues/155))
-
-## 0.12.12
-
-* `Common`:
-  * `Compose`:
-    * `JS`:
-      * Add `SkeletonAnimation` stylesheet
-
-## 0.12.11
-
-* `Repos`:
-    * `Cache`:
-        * Override `KeyValue` cache method `values`
-
-## 0.12.10
-
-* `Repos`:
-    * `Cache`:
-        * Hotfix in key values `get`
-
-## 0.12.9
-
-* `Versions`:
-  * `Klock`: `3.0.0` -> `3.1.0`
-* `Repos`:
-    * `Cache`:
-      * Fixes in key values cache
-
-## 0.12.8
-
-* `Versions`:
-    * `Ktor`: `2.1.0` -> `2.1.1`
-    * `Compose`: `1.2.0-alpha01-dev764` -> `1.2.0-alpha01-dev774`
-* `Ktor`:
-  * `Client`:
-    * New extension `HttpClient#bodyOrNull` which returns `null` in case when server responded with `No Content` (204)
-  * `Server`:
-    * New extension `ApplicationCall#respondOrNoContent` which responds `No Content` (204) when passed data is null
-
-## 0.12.7
-
-* `Repos`:
-  * `Cache`:
-    * Force `WriteCRUDCacheRepo` to subscribe on new and updated objects of parent repo
-* `Pagination`:
-  * New function `changeResultsUnchecked(Pagination)`
-
-## 0.12.6
-
-* `MimeeTypes>`:
-  * Fixed absence of `image/*` in known mime types
-
-## 0.12.5
-
-* `Repos`:
-  * `Exposed`:
-    * Fixes in `paginate` extensions
-
-## 0.12.4
-
-* `Versions`:
-    * `Kotlin`: `1.7.0` -> `1.7.10`
-    * `Compose`: `1.2.0-alpha01-dev755` -> `1.2.0-alpha01-dev764`
-
-## 0.12.3
-
-* `Repos`:
-  * `Exposed`:
-    * Add abstract exposed variants of `KeyValue` and `KeyValues` repos
-    * Add new extension `Query#selectPaginated`
-
-## 0.12.2
-
-* `Versions`:
-  * `Serialization`: `1.4.0-RC` -> `1.4.0`
-  * `Compose`: `1.2.0-alpha01-dev753` -> `1.2.0-alpha01-dev755`
-
-## 0.12.1
-
-* `Versions`:
-  * `Ktor`: `2.0.3` -> `2.1.0`
-
-## 0.12.0
-
-**OLD DEPRECATIONS HAVE BEEN REMOVED**
-
-**MINIMAL ANDROID API HAS BEEN ENLARGED UP TO API 21 (Android 5.0)**
-
-* `Versions`
-  * `Kotlin`: `1.6.21` -> `1.7.0`
-  * `Coroutines`: `1.6.3` -> `1.6.4`
-  * `Exposed`: `0.38.2` -> `0.39.2`
-  * `Compose`: `1.2.0-alpha01-dev729` -> `1.2.0-alpha01-dev753`
-  * `Klock`: `2.7.0` -> `3.0.0`
-  * `uuid`: `0.4.1` -> `0.5.0`
-  * `Android Core KTX`: `1.7.0` -> `1.8.0`
-  * `Android AppCompat`: `1.4.1` -> `1.4.2`
-* `Ktor`:
-  * All previously standard functions related to work with binary data by default have been deprecated
-
-## 0.11.14
-
-* `Pagination`:
-    * `PaginationResult` got new field `objectsNumber` which by default is a times between `pagesNumber` and `size`
-
-## 0.11.13
-
-* `Versions`:
-    * `Coroutines`: `1.6.3` -> `1.6.4`
-    * `Compose`: `1.2.0-alpha01-dev629` -> `1.2.0-alpha01-dev731`
-
-## 0.11.12
-
-* `Repos`:
-  * `Common`:
-    * `JVM`:
-      * Fixes in `ReadFileKeyValueRepo` methods (`values`/`keys`)
-
-## 0.11.11
-
-* `Crypto`:
-  * `hmacSha256` has been deprecated
-* `Ktor`:
-  * `Client`:
-    * `BodyPair` has been deprecated
-* `Repos`:
-    * `Cache`:
-      * New interface `CacheRepo`
-      * New interface `FullCacheRepo`
-      * `actualize*` methods inside of full cache repos now open for overriding
-
-## 0.11.10
-
-* `Repos`:
-  * `Cache`:
-    * `KVCache` has been replaced to the package `dev.inmo.micro_utils.repos.cache`
-    * `SimpleKVCache` has been replaced to the package `dev.inmo.micro_utils.repos.cache`
-    * New `KVCache` subtype - `FullKVCache`
-    * Add `Full*` variants of standard repos
-    * Add `cached`/`caching` (for write repos) extensions for all standard types of repos
-
-## 0.11.9
-
-* `Versions`
-    * `Coroutines`: `1.6.1` -> `1.6.3`
-    * `Ktor`: `2.0.2` -> `2.0.3`
-    * `Compose`: `1.2.0-alpha01-dev686` -> `1.2.0-alpha01-dev729`
-
-## 0.11.8
-
-* `Repos`:
-    * `Common`:
-        * Fixes in `FileKeyValueRepo`
-
-## 0.11.7
-
-* `Common`:
-  * New abstractions `SimpleMapper` and `SimpleSuspendableMapper`
-* `Repos`:
-  * `Common`:
-    * Add mappers for `CRUDRepo`
-
-## 0.11.6
-
-* `FSM`:
-  * `Common`
-    * Several fixes related to the jobs handling
-
-## 0.11.5
-
-* `Coroutines`:
-  * `Compose`:
-    * Add extension `StateFlow#asMutableComposeListState` and `StateFlow#asComposeList`
-    * Add extension `StateFlow#asMutableComposeState`/`StateFlow#asComposeState`
-
-## 0.11.4
-
-**THIS VERSION HAS BEEN BROKEN, DO NOT USE IT**
-
-## 0.11.3
-
-* `Ktor`:
-    * Support of `WebSockets` has been improved
-      * `Client`:
-        * New extensions: `HttpClient#openBaseWebSocketFlow`, `HttpClient#openWebSocketFlow`, `HttpClient#openSecureWebSocketFlow`
-
-## 0.11.2
-
-* `Ktor`:
-  * Support of `WebSockets` has been improved and added fixes inside of clients
-
-## 0.11.1
-
-* `Repos`
-  * `Ktor`
-    * In `configureReadKeyValueRepoRoutes` and `configureReadKeyValuesRepoRoutes` configurators fixed requiring of `reversed` property
-
-## 0.11.0
-
-* `Versions`
-    * `UUID`: `0.4.0` -> `0.4.1`
-* `Ktor`
-  * `Client`:
-    * New extension fun `HttpResponse#throwOnUnsuccess`
-    * All old functions, classes and extensions has been rewritten with new ktor-way with types info and keeping `ContentNegotiation` in mind
-  * `Server`:
-      * All old functions, classes and extensions has been rewritten with new ktor-way with types info and keeping `ContentNegotiation` in mind
-* `Repos`
-  * `Ktor`:
-    * Fully rewritten work with all declared repositories
-    * All old functions, classes and extensions has been rewritten with new ktor-way with types info and keeping `ContentNegotiation` in mind
-
-## 0.10.8
-
-* `Common`
-    * Add `Element.isOverflow*` extension properties
-
-## 0.10.7
-
-* `Pagination`:
-    * Now it is possible to use `doForAll*` and `getForAll` functions in non suspend places
-
-## 0.10.6
-
-* `Versions`
-    * `Ktor`: `2.0.1` -> `2.0.2`
-* `Common`
-    * `JS`:
-        * Add `ResizeObserver` functionality
-
-## 0.10.5
-
-* `Versions`
-    * `Compose`: `1.2.0-alpha01-dev683` -> `1.2.0-alpha01-dev686`
-* `Repos`
-    * `Android`:
-        * New function `SharedPreferencesKeyValueRepo`
-* `FSM`
-    * Add `StateHandlingErrorHandler` and opportunity to handle states handling errors
-
-## 0.10.4
-
-* `Versions`:
-    * `Serialization`: `1.3.2` -> `1.3.3`
-
-## 0.10.3
-
-* `Versions`:
-    * `Compose`: `1.2.0-alpha01-dev682` -> `1.2.0-alpha01-dev683`
-* `Coroutines`:
-    * Fixes in `AccumulatorFlow`
-
-## 0.10.2
-
-* `Versions`:
-    * `Compose`: `1.2.0-alpha01-dev675` -> `1.2.0-alpha01-dev682`
-
-## 0.10.1
-
-* `Versions`:
-    * `Ktor`: `2.0.0` -> `2.0.1`
-* `Crypto`:
-    * Add `hmacSha256`
-    * Add `hex`
-
-## 0.10.0
-
-* `Versions`:
-    * `Kotlin`: `1.6.10` -> `1.6.21`
-    * `Compose`: `1.1.1` -> `1.2.0-alpha01-dev675`
-    * `Exposed`: `0.37.3` -> `0.38.2`
-    * `Ktor`: `1.6.8` -> `2.0.0`
-    * `Dokka`: `1.6.10` -> `1.6.21`
-
-## 0.9.24
-
-* `Ktor`:
-    * `Common`:
-        * New extension fun `MPPFile#input`
-
-## 0.9.23
-
-* `Repos`:
-    * `Exposed`:
-        * New property `ExposedRepo#selectAll` to retrieve all the rows in the table
-
-## 0.9.22
-
-* `Ktor`:
-    * `Server`:
-        * Now `createKtorServer` fun is fully customizable
-
-## 0.9.21
-
-* `Repos`:
-    * `Exposed`:
-        * fixes in `AbstractExposedWriteCRUDRepo`
-
-## 0.9.20
-
-* `Repos`:
-    * `Common`:
-        * Fixes in `OneToManyAndroidRepo`
-        * New `CursorIterator`
-
-## 0.9.19
-
-* `Versions`:
-    * `Coroutines`: `1.6.0` -> `1.6.1`
-* `Repos`:
-    * `Exposed`:
-        * Fixes in `ExposedStandardVersionsRepoProxy`
-
-## 0.9.18
-
-* `Common`
-    * New extensions for `Element`: `Element#onActionOutside` and `Element#onClickOutside`
-
-## 0.9.17
-
-* `Common`:
-    * New extensions `Element#onVisibilityChanged`, `Element#onVisible` and `Element#onInvisible`
-* `Coroutines`:
-    * New extension `Element.visibilityFlow()`
-* `FSM`:
-    * Now it is possible to resolve conflicts on `startChain`
-
-## 0.9.16
-
-* `Versions`:
-    * `Klock`: `2.6.3` -> `2.7.0`
-* `Common`:
-    * New extension `Node#onRemoved`
-    * `Compose`:
-        * New extension `Composition#linkWithRoot` for removing of composition with root element
-* `Coroutines`:
-    * `Compose`:
-        * New function `renderComposableAndLinkToContextAndRoot` with linking of composition to root element
-
-## 0.9.15
-
-* `FSM`:
-    * Rename `DefaultUpdatableStatesMachine#compare` to `DefaultUpdatableStatesMachine#shouldReplaceJob`
-    * `DefaultStatesManager` now is extendable
-    * `DefaultStatesMachine` will stop all jobs of states which was removed from `statesManager`
-
-## 0.9.14
-
-* `Versions`:
-    * `Klock`: `2.6.2` -> `2.6.3`
-    * `Ktor`: `1.6.7` -> `1.6.8`
-* `Ktor`:
-    * Add temporal files uploading functionality (for clients to upload and for server to receive)
-
-## 0.9.13
-
-* `Versions`:
-    * `Compose`: `1.1.0` -> `1.1.1`
-
-## 0.9.12
-
-* `Common`:
-    * `JS`:
-        * New function `openLink`
-        * New function `selectFile`
-        * New function `triggerDownloadFile`
-    * `Compose`:
-        * Created :)
-        * `Common`:
-            * `DefaultDisposableEffectResult` as a default realization of `DisposableEffectResult`
-        * `JS`:
-            * `openLink` on top of `openLink` with `String` target from common
-* `Coroutines`:
-    * `Compose`:
-        * `Common`:
-            * New extension `Flow.toMutableState`
-            * New extension `StateFlow.toMutableState`
-        * `JS`:
-            * New function `selectFileOrThrow` on top of `selectFile` from `common`
-            * New function `selectFileOrNull` on top of `selectFile` from `common`
-
-## 0.9.11
-
-* `Versions`:
-    * `Klock`: `2.6.1` -> `2.6.2`
-* `Coroutines`:
-    * `Compose`:
-        * Created :)
-        * New extensions and function:
-            * `Composition#linkWithJob`
-            * `Composition#linkWithContext`
-            * `renderComposableAndLinkToContext`
-
-## 0.9.10
-
-* `Versions`:
-    * `Klock`: `2.5.2` -> `2.6.1`
-* Ktor:
-    * Client:
-        * New function `UnifiedRequester#createStandardWebsocketFlow` without `checkReconnection` arg
-    * Server:
-        * Now it is possible to filter data in `Route#includeWebsocketHandling`
-        * Callback in `Route#includeWebsocketHandling` and dependent methods is `suspend` since now
-        * Add `URLProtocol` support in `Route#includeWebsocketHandling` and dependent methods
-
-## 0.9.9
-
-* `Versions`:
-    * `Klock`: `2.5.1` -> `2.5.2`
-* `Common`:
-    * Add new diff tool - `applyDiff`
-    * Implementation of `IntersectionObserver` in JS part (copypaste of [this](https://youtrack.jetbrains.com/issue/KT-43157#focus=Comments-27-4498582.0-0) comment)
-
-## 0.9.8
-
-* `Versions`:
-    * `Exposed`: `0.37.2` -> `0.37.3`
-    * `Klock`: `2.4.13` -> `2.5.1`
-    * `AppCompat`: `1.4.0` -> `1.4.1`
-
 ## 0.9.7
 
 * `Repos`:

android/alerts/common/build.gradle

@@ -10,7 +10,7 @@ kotlin {
     sourceSets {
         androidMain {
             dependencies {
-                api libs.android.appCompat.resources
+                api "androidx.appcompat:appcompat-resources:$appcompat_version"
             }
         }
     }

android/recyclerview/build.gradle

@@ -10,13 +10,13 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api libs.kt.coroutines
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
                 api project(":micro_utils.common")
             }
         }
         androidMain {
             dependencies {
-                api libs.android.recyclerView
+                api "androidx.recyclerview:recyclerview:$androidx_recycler_version"
             }
         }
     }

build.gradle

@@ -7,12 +7,12 @@ buildscript {
     }
 
     dependencies {
-        classpath libs.buildscript.kt.gradle
-        classpath libs.buildscript.kt.serialization
-        classpath libs.buildscript.jb.dokka
-        classpath libs.buildscript.gh.release
-        classpath libs.buildscript.android.gradle
-        classpath libs.buildscript.android.dexcount
+        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
+        classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
     }
 }
 
@@ -21,7 +21,6 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
     }
 
     // temporal crutch until legacy tests will be stabled or legacy target will be removed

common/build.gradle

@@ -16,7 +16,6 @@ kotlin {
         androidMain {
             dependencies {
                 api project(":micro_utils.coroutines")
-                api libs.android.fragment
             }
         }
     }

common/compose/build.gradle

@@ -1,18 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-    alias(libs.plugins.jb.compose)
-}
-
-apply from: "$mppProjectWithSerializationAndComposePresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api project(":micro_utils.common")
-            }
-        }
-    }
-}

common/compose/src/commonMain/kotlin/dev/inmo/micro_utils/common/compose/DefaultDisposableEffectResult.kt

@@ -1,16 +0,0 @@
-package dev.inmo.micro_utils.common.compose
-
-import androidx.compose.runtime.DisposableEffectResult
-
-class DefaultDisposableEffectResult(
-    private val onDispose: () -> Unit
-) : DisposableEffectResult {
-    override fun dispose() {
-        onDispose()
-    }
-
-    companion object {
-        val DoNothing = DefaultDisposableEffectResult {}
-    }
-}
-

common/compose/src/jsMain/kotlin/dev/inmo/micro_utils/common/compose/AttachCompositionToElementRemoving.kt

@@ -1,9 +0,0 @@
-package dev.inmo.micro_utils.common.compose
-
-import androidx.compose.runtime.Composition
-import dev.inmo.micro_utils.common.onRemoved
-import org.w3c.dom.Element
-
-fun Composition.linkWithElement(element: Element) {
-    element.onRemoved { dispose() }
-}

common/compose/src/jsMain/kotlin/dev/inmo/micro_utils/common/compose/OpenLink.kt

@@ -1,10 +0,0 @@
-package dev.inmo.micro_utils.common.compose
-
-import org.jetbrains.compose.web.attributes.ATarget
-
-fun openLink(link: String, mode: ATarget = ATarget.Blank, features: String = "") = dev.inmo.micro_utils.common.openLink(
-    link,
-    mode.targetStr,
-    features
-)
-

common/compose/src/jsMain/kotlin/dev/inmo/micro_utils/common/compose/RenderComposableAndLinkToRoot.kt

@@ -1,13 +0,0 @@
-package dev.inmo.micro_utils.common.compose
-
-import androidx.compose.runtime.*
-import org.jetbrains.compose.web.dom.DOMScope
-import org.w3c.dom.Element
-
-fun <TElement : Element> renderComposableAndLinkToRoot(
-    root: TElement,
-    monotonicFrameClock: MonotonicFrameClock = DefaultMonotonicFrameClock,
-    content: @Composable DOMScope<TElement>.() -> Unit
-): Composition = org.jetbrains.compose.web.renderComposable(root, monotonicFrameClock, content).apply {
-    linkWithElement(root)
-}

common/compose/src/jsMain/kotlin/dev/inmo/micro_utils/common/compose/SkeletonAnimation.kt

@@ -1,43 +0,0 @@
-package dev.inmo.micro_utils.common.compose
-
-import org.jetbrains.compose.web.css.*
-
-object SkeletonAnimation : StyleSheet() {
-    val skeletonKeyFrames: CSSNamedKeyframes by keyframes {
-        to { backgroundPosition("-20% 0") }
-    }
-
-    fun CSSBuilder.includeSkeletonStyle(
-        duration: CSSSizeValue<out CSSUnitTime> = 2.s,
-        timingFunction: AnimationTimingFunction = AnimationTimingFunction.EaseInOut,
-        iterationCount: Int? = null,
-        direction: AnimationDirection = AnimationDirection.Normal,
-        keyFrames: CSSNamedKeyframes = skeletonKeyFrames,
-        hideChildren: Boolean = true,
-        hideText: Boolean = hideChildren
-    ) {
-        backgroundImage("linear-gradient(110deg, rgb(236, 236, 236) 40%, rgb(245, 245, 245) 50%, rgb(236, 236, 236) 65%)")
-        backgroundSize("200% 100%")
-        backgroundPosition("180% 0")
-        animation(keyFrames) {
-            duration(duration)
-            timingFunction(timingFunction)
-            iterationCount(iterationCount)
-            direction(direction)
-        }
-        if (hideText) {
-            property("color", "${Color.transparent} !important")
-        }
-
-        if (hideChildren) {
-            child(self, universal) style {
-                property("visibility", "hidden")
-            }
-        }
-    }
-
-    val skeleton by style {
-        includeSkeletonStyle()
-    }
-}
-

common/compose/src/main/AndroidManifest.xml

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

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Annotations.kt

@@ -1,5 +1,3 @@
-@file:Suppress("OPT_IN_IS_NOT_ENABLED")
-
 package dev.inmo.micro_utils.common
 
 @RequiresOptIn(

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/DiffUtils.kt

@@ -14,14 +14,6 @@ private inline fun <T> getObject(
 /**
  * Diff object which contains information about differences between two [Iterable]s
  *
- * See tests for more info
- *
- * @param removed The objects which has been presented in the old collection but absent in new one. Index here is the index in the old collection
- * @param added The object which appear in new collection only. Indexes here show the index in the new collection
- * @param replaced Pair of old-new changes. First object has been presented in the old collection on its
- * [IndexedValue.index] place, the second one is the object in new collection. Both have indexes due to the fact that in
- * case when some value has been replaced after adds or removes in original collection the object index will be changed
- *
  * @see calculateDiff
  */
 data class Diff<T> internal constructor(
@@ -51,7 +43,6 @@ private inline fun <T> performChanges(
         if (oldOneEqualToNewObject || newOneEqualToOldObject) {
             changedList.addAll(
                 potentialChanges.take(i).mapNotNull {
-                    @Suppress("UNCHECKED_CAST")
                     if (it.first != null && it.second != null) it as Pair<IndexedValue<T>, IndexedValue<T>> else null
                 }
             )
@@ -130,10 +121,7 @@ fun <T> Iterable<T>.calculateDiff(
 
         when {
             oldObject === newObject || (oldObject == newObject && !strictComparison) -> {
-                changedObjects.addAll(potentiallyChangedObjects.map {
-                    @Suppress("UNCHECKED_CAST")
-                    it as Pair<IndexedValue<T>, IndexedValue<T>>
-                })
+                changedObjects.addAll(potentiallyChangedObjects.map { it as Pair<IndexedValue<T>, IndexedValue<T>> })
                 potentiallyChangedObjects.clear()
             }
             else -> {
@@ -165,22 +153,3 @@ inline fun <T> StrictDiff(old: Iterable<T>, new: Iterable<T>) = old.calculateDif
 inline fun <T> Iterable<T>.calculateStrictDiff(
     other: Iterable<T>
 ) = calculateDiff(other, strictComparison = true)
-
-/**
- * This method call [calculateDiff] with strict mode [strictComparison] and then apply differences to [this]
- * mutable list
- */
-fun <T> MutableList<T>.applyDiff(
-    source: Iterable<T>,
-    strictComparison: Boolean = false
-): Diff<T> = calculateDiff(source, strictComparison).also {
-    for (i in it.removed.indices.sortedDescending()) {
-        removeAt(it.removed[i].index)
-    }
-    it.added.forEach { (i, t) ->
-        add(i, t)
-    }
-    it.replaced.forEach { (_, new) ->
-        set(new.index, new.value)
-    }
-}

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt

@@ -1,5 +1,3 @@
-@file:Suppress("unused", "NOTHING_TO_INLINE")
-
 package dev.inmo.micro_utils.common
 
 import kotlinx.serialization.*
@@ -23,18 +21,26 @@ import kotlinx.serialization.encoding.*
 sealed interface Either<T1, T2> {
     val optionalT1: Optional<T1>
     val optionalT2: Optional<T2>
-
-    val t1OrNull: T1?
+    @Deprecated("Use optionalT1 instead", ReplaceWith("optionalT1"))
+    val t1: T1?
         get() = optionalT1.dataOrNull()
-    val t2OrNull: T2?
+    @Deprecated("Use optionalT2 instead", ReplaceWith("optionalT2"))
+    val t2: T2?
         get() = optionalT2.dataOrNull()
+
+    companion object {
+        fun <T1, T2> serializer(
+            t1Serializer: KSerializer<T1>,
+            t2Serializer: KSerializer<T2>,
+        ): KSerializer<Either<T1, T2>> = EitherSerializer(t1Serializer, t2Serializer)
+    }
 }
 
 class EitherSerializer<T1, T2>(
     t1Serializer: KSerializer<T1>,
     t2Serializer: KSerializer<T2>,
 ) : KSerializer<Either<T1, T2>> {
-    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
+    @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class)
     override val descriptor: SerialDescriptor = buildSerialDescriptor(
         "TypedSerializer",
         SerialKind.CONTEXTUAL
@@ -45,6 +51,7 @@ class EitherSerializer<T1, T2>(
     private val t1EitherSerializer = EitherFirst.serializer(t1Serializer, t2Serializer)
     private val t2EitherSerializer = EitherSecond.serializer(t1Serializer, t2Serializer)
 
+    @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class)
     override fun deserialize(decoder: Decoder): Either<T1, T2> {
         return decoder.decodeStructure(descriptor) {
             var type: String? = null
@@ -76,6 +83,7 @@ class EitherSerializer<T1, T2>(
     }
 
 
+    @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class)
     override fun serialize(encoder: Encoder, value: Either<T1, T2>) {
         encoder.encodeStructure(descriptor) {
             when (value) {
@@ -97,7 +105,7 @@ class EitherSerializer<T1, T2>(
  */
 @Serializable
 data class EitherFirst<T1, T2>(
-    val t1: T1
+    override val t1: T1
 ) : Either<T1, T2> {
     override val optionalT1: Optional<T1> = t1.optional
     override val optionalT2: Optional<T2> = Optional.absent()
@@ -108,7 +116,7 @@ data class EitherFirst<T1, T2>(
  */
 @Serializable
 data class EitherSecond<T1, T2>(
-    val t2: T2
+    override val t2: T2
 ) : Either<T1, T2> {
     override val optionalT1: Optional<T1> = Optional.absent()
     override val optionalT2: Optional<T2> = t2.optional

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Mapper.kt

@@ -1,53 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import kotlin.jvm.JvmName
-
-interface SimpleMapper<T1, T2> {
-    fun convertToT1(from: T2): T1
-    fun convertToT2(from: T1): T2
-}
-
-@JvmName("convertFromT2")
-fun <T1, T2> SimpleMapper<T1, T2>.convert(from: T2) = convertToT1(from)
-@JvmName("convertFromT1")
-fun <T1, T2> SimpleMapper<T1, T2>.convert(from: T1) = convertToT2(from)
-
-class SimpleMapperImpl<T1, T2>(
-    private val t1: (T2) -> T1,
-    private val t2: (T1) -> T2,
-) : SimpleMapper<T1, T2> {
-    override fun convertToT1(from: T2): T1 = t1.invoke(from)
-
-    override fun convertToT2(from: T1): T2 = t2.invoke(from)
-}
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T1, T2> simpleMapper(
-    noinline t1: (T2) -> T1,
-    noinline t2: (T1) -> T2,
-) = SimpleMapperImpl(t1, t2)
-
-interface SimpleSuspendableMapper<T1, T2> {
-    suspend fun convertToT1(from: T2): T1
-    suspend fun convertToT2(from: T1): T2
-}
-
-@JvmName("convertFromT2")
-suspend fun <T1, T2> SimpleSuspendableMapper<T1, T2>.convert(from: T2) = convertToT1(from)
-@JvmName("convertFromT1")
-suspend fun <T1, T2> SimpleSuspendableMapper<T1, T2>.convert(from: T1) = convertToT2(from)
-
-class SimpleSuspendableMapperImpl<T1, T2>(
-    private val t1: suspend (T2) -> T1,
-    private val t2: suspend (T1) -> T2,
-) : SimpleSuspendableMapper<T1, T2> {
-    override suspend fun convertToT1(from: T2): T1 = t1.invoke(from)
-
-    override suspend fun convertToT2(from: T1): T2 = t2.invoke(from)
-}
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T1, T2> simpleSuspendableMapper(
-    noinline t1: suspend (T2) -> T1,
-    noinline t2: suspend (T1) -> T2,
-) = SimpleSuspendableMapperImpl(t1, t2)

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Optional.kt

@@ -41,18 +41,10 @@ data class Optional<T> internal constructor(
 inline val <T> T.optional
     get() = Optional.presented(this)
 
-inline val <T : Any> T?.optionalOrAbsentIfNull
-    get() = if (this == null) {
-        Optional.absent<T>()
-    } else {
-        Optional.presented(this)
-    }
-
 /**
  * Will call [block] when data presented ([Optional.dataPresented] == true)
  */
 inline fun <T> Optional<T>.onPresented(block: (T) -> Unit): Optional<T> = apply {
-    @OptIn(Warning::class)
     if (dataPresented) { @Suppress("UNCHECKED_CAST") block(data as T) }
 }
 
@@ -60,7 +52,6 @@ inline fun <T> Optional<T>.onPresented(block: (T) -> Unit): Optional<T> = apply
  * Will call [block] when data presented ([Optional.dataPresented] == true)
  */
 inline fun <T, R> Optional<T>.mapOnPresented(block: (T) -> R): R? = run {
-    @OptIn(Warning::class)
     if (dataPresented) { @Suppress("UNCHECKED_CAST") block(data as T) } else null
 }
 
@@ -68,7 +59,6 @@ inline fun <T, R> Optional<T>.mapOnPresented(block: (T) -> R): R? = run {
  * Will call [block] when data absent ([Optional.dataPresented] == false)
  */
 inline fun <T> Optional<T>.onAbsent(block: () -> Unit): Optional<T> = apply {
-    @OptIn(Warning::class)
     if (!dataPresented) { block() }
 }
 
@@ -76,22 +66,27 @@ inline fun <T> Optional<T>.onAbsent(block: () -> Unit): Optional<T> = apply {
  * Will call [block] when data presented ([Optional.dataPresented] == true)
  */
 inline fun <T, R> Optional<T>.mapOnAbsent(block: () -> R): R? = run {
-    @OptIn(Warning::class)
-    if (!dataPresented) { block() } else null
+    if (!dataPresented) { @Suppress("UNCHECKED_CAST") block() } else null
 }
 
 /**
  * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or null otherwise
  */
-fun <T> Optional<T>.dataOrNull() = @OptIn(Warning::class) if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else null
+fun <T> Optional<T>.dataOrNull() = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else null
 
 /**
  * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or throw [throwable] otherwise
  */
-fun <T> Optional<T>.dataOrThrow(throwable: Throwable) = @OptIn(Warning::class) if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else throw throwable
+fun <T> Optional<T>.dataOrThrow(throwable: Throwable) = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else throw throwable
 
 
 /**
  * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or call [block] and returns the result of it
  */
-inline fun <T> Optional<T>.dataOrElse(block: () -> T) = @OptIn(Warning::class) if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else block()
+inline fun <T> Optional<T>.dataOrElse(block: () -> T) = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else block()
+
+/**
+ * Returns [Optional.data] if [Optional.dataPresented] of [this] is true, or call [block] and returns the result of it
+ */
+@Deprecated("dataOrElse now is inline", ReplaceWith("dataOrElse", "dev.inmo.micro_utils.common.dataOrElse"))
+suspend fun <T> Optional<T>.dataOrElseSuspendable(block: suspend () -> T) = if (dataPresented) @Suppress("UNCHECKED_CAST") (data as T) else block()

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Progress.kt

@@ -1,37 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import kotlinx.serialization.Serializable
-import kotlin.jvm.JvmInline
-
-@Serializable
-@JvmInline
-value class Progress private constructor(
-    val of1: Double
-) {
-    val of1Float
-        get() = of1.toFloat()
-    val of100
-        get() = of1 * 100
-    val of100Float
-        get() = of100.toFloat()
-    val of100Int
-        get() = of100.toInt()
-
-    init {
-        require(of1 in rangeOfValues) {
-            "Progress main value should be in $rangeOfValues, but incoming value is $of1"
-        }
-    }
-
-    companion object {
-        val rangeOfValues = 0.0 .. 1.0
-
-        val START = Progress(rangeOfValues.start)
-        val COMPLETED = Progress(rangeOfValues.endInclusive)
-
-        operator fun invoke(of1: Double) = Progress(of1.coerceIn(rangeOfValues))
-        operator fun invoke(part: Number, total: Number) = Progress(
-            part.toDouble() / total.toDouble()
-        )
-    }
-}

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/ProgressOperations.kt

@@ -1,80 +0,0 @@
-@file:Suppress(
-  "RemoveRedundantCallsOfConversionMethods",
-  "RedundantVisibilityModifier",
-)
-
-package dev.inmo.micro_utils.common
-
-import kotlin.Byte
-import kotlin.Double
-import kotlin.Float
-import kotlin.Int
-import kotlin.Long
-import kotlin.Short
-import kotlin.Suppress
-
-public operator fun Progress.plus(other: Progress): Progress = Progress(of1 + other.of1)
-
-public operator fun Progress.minus(other: Progress): Progress = Progress(of1 - other.of1)
-
-public operator fun Progress.plus(i: Byte): Progress = Progress((of1 + i).toDouble())
-
-public operator fun Progress.minus(i: Byte): Progress = Progress((of1 - i).toDouble())
-
-public operator fun Progress.times(i: Byte): Progress = Progress((of1 * i).toDouble())
-
-public operator fun Progress.div(i: Byte): Progress = Progress((of1 / i).toDouble())
-
-public operator fun Progress.rem(i: Byte): Progress = Progress((of1 % i).toDouble())
-
-public operator fun Progress.plus(i: Short): Progress = Progress((of1 + i).toDouble())
-
-public operator fun Progress.minus(i: Short): Progress = Progress((of1 - i).toDouble())
-
-public operator fun Progress.times(i: Short): Progress = Progress((of1 * i).toDouble())
-
-public operator fun Progress.div(i: Short): Progress = Progress((of1 / i).toDouble())
-
-public operator fun Progress.rem(i: Short): Progress = Progress((of1 % i).toDouble())
-
-public operator fun Progress.plus(i: Int): Progress = Progress((of1 + i).toDouble())
-
-public operator fun Progress.minus(i: Int): Progress = Progress((of1 - i).toDouble())
-
-public operator fun Progress.times(i: Int): Progress = Progress((of1 * i).toDouble())
-
-public operator fun Progress.div(i: Int): Progress = Progress((of1 / i).toDouble())
-
-public operator fun Progress.rem(i: Int): Progress = Progress((of1 % i).toDouble())
-
-public operator fun Progress.plus(i: Long): Progress = Progress((of1 + i).toDouble())
-
-public operator fun Progress.minus(i: Long): Progress = Progress((of1 - i).toDouble())
-
-public operator fun Progress.times(i: Long): Progress = Progress((of1 * i).toDouble())
-
-public operator fun Progress.div(i: Long): Progress = Progress((of1 / i).toDouble())
-
-public operator fun Progress.rem(i: Long): Progress = Progress((of1 % i).toDouble())
-
-public operator fun Progress.plus(i: Float): Progress = Progress((of1 + i).toDouble())
-
-public operator fun Progress.minus(i: Float): Progress = Progress((of1 - i).toDouble())
-
-public operator fun Progress.times(i: Float): Progress = Progress((of1 * i).toDouble())
-
-public operator fun Progress.div(i: Float): Progress = Progress((of1 / i).toDouble())
-
-public operator fun Progress.rem(i: Float): Progress = Progress((of1 % i).toDouble())
-
-public operator fun Progress.plus(i: Double): Progress = Progress((of1 + i).toDouble())
-
-public operator fun Progress.minus(i: Double): Progress = Progress((of1 - i).toDouble())
-
-public operator fun Progress.times(i: Double): Progress = Progress((of1 * i).toDouble())
-
-public operator fun Progress.div(i: Double): Progress = Progress((of1 / i).toDouble())
-
-public operator fun Progress.rem(i: Double): Progress = Progress((of1 % i).toDouble())
-
-public operator fun Progress.compareTo(other: Progress): Int = (of1 - other.of1).toInt()

common/src/commonTest/kotlin/dev/inmo/micro_utils/common/DiffUtilsTests.kt

@@ -32,7 +32,7 @@ class DiffUtilsTests {
         val withIndex = oldList.withIndex()
 
         for (count in 1 .. (floor(oldList.size.toFloat() / 2).toInt())) {
-            for ((i, _) in withIndex) {
+            for ((i, v) in withIndex) {
                 if (i + count > oldList.lastIndex) {
                     continue
                 }
@@ -54,8 +54,8 @@ class DiffUtilsTests {
         val oldList = (0 until 10).map { it.toString() }
         val withIndex = oldList.withIndex()
 
-        for (step in oldList.indices) {
-            for ((i, _) in withIndex) {
+        for (step in 0 until oldList.size) {
+            for ((i, v) in withIndex) {
                 val mutable = oldList.toMutableList()
                 val changes = (
                     if (step == 0) i until oldList.size else (i until oldList.size step step)
@@ -73,83 +73,4 @@ class DiffUtilsTests {
             }
         }
     }
-
-    @Test
-    fun testThatSimpleRemoveApplyWorks() {
-        val oldList = (0 until 10).toList()
-        val withIndex = oldList.withIndex()
-
-        for (count in 1 .. (floor(oldList.size.toFloat() / 2).toInt())) {
-            for ((i, _) in withIndex) {
-                if (i + count > oldList.lastIndex) {
-                    continue
-                }
-                val removedSublist = oldList.subList(i, i + count)
-                val mutableOldList = oldList.toMutableList()
-                val targetList = oldList - removedSublist
-
-                mutableOldList.applyDiff(targetList)
-
-                assertEquals(
-                    targetList,
-                    mutableOldList
-                )
-            }
-        }
-    }
-
-    @Test
-    fun testThatSimpleAddApplyWorks() {
-        val oldList = (0 until 10).map { it.toString() }
-        val withIndex = oldList.withIndex()
-
-        for (count in 1 .. (floor(oldList.size.toFloat() / 2).toInt())) {
-            for ((i, _) in withIndex) {
-                if (i + count > oldList.lastIndex) {
-                    continue
-                }
-                val addedSublist = oldList.subList(i, i + count).map { "added$it" }
-                val mutable = oldList.toMutableList()
-                mutable.addAll(i, addedSublist)
-                val mutableOldList = oldList.toMutableList()
-
-                mutableOldList.applyDiff(mutable)
-
-                assertEquals(
-                    mutable,
-                    mutableOldList
-                )
-            }
-        }
-    }
-
-    @Test
-    fun testThatSimpleChangesApplyWorks() {
-        val oldList = (0 until 10).map { it.toString() }
-        val withIndex = oldList.withIndex()
-
-        for (step in oldList.indices) {
-            for ((i, _) in withIndex) {
-                val mutable = oldList.toMutableList()
-
-                val newList = if (step == 0) {
-                    i until oldList.size
-                } else {
-                    i until oldList.size step step
-                }
-                newList.forEach { index ->
-                    IndexedValue(index, mutable[index]) to IndexedValue(index, "changed$index").also {
-                        mutable[index] = it.value
-                    }
-                }
-
-                val mutableOldList = oldList.toMutableList()
-                mutableOldList.applyDiff(mutable)
-                assertEquals(
-                    mutable,
-                    mutableOldList
-                )
-            }
-        }
-    }
 }

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/HTMLElementDomChanged.kt

@@ -1,61 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import kotlinx.browser.document
-import org.w3c.dom.*
-
-fun Node.onRemoved(block: () -> Unit): MutationObserver {
-    lateinit var observer: MutationObserver
-
-    observer = MutationObserver { _, _ ->
-        fun checkIfRemoved(node: Node): Boolean {
-            return node.parentNode != document && (node.parentNode ?.let { checkIfRemoved(it) } ?: true)
-        }
-
-        if (checkIfRemoved(this)) {
-            observer.disconnect()
-            block()
-        }
-    }
-
-    observer.observe(document, MutationObserverInit(childList = true, subtree = true))
-    return observer
-}
-
-fun Element.onVisibilityChanged(block: IntersectionObserverEntry.(Float, IntersectionObserver) -> Unit): IntersectionObserver {
-    var previousIntersectionRatio = -1f
-    val observer = IntersectionObserver { entries, observer ->
-        entries.forEach {
-            if (previousIntersectionRatio != it.intersectionRatio) {
-                previousIntersectionRatio = it.intersectionRatio.toFloat()
-                it.block(previousIntersectionRatio, observer)
-            }
-        }
-    }
-
-    observer.observe(this)
-    return observer
-}
-
-fun Element.onVisible(block: Element.(IntersectionObserver) -> Unit) {
-    var previous = -1f
-    onVisibilityChanged { intersectionRatio, observer ->
-        if (previous != intersectionRatio) {
-            if (intersectionRatio > 0 && previous == 0f) {
-                block(observer)
-            }
-            previous = intersectionRatio
-        }
-    }
-}
-
-fun Element.onInvisible(block: Element.(IntersectionObserver) -> Unit): IntersectionObserver {
-    var previous = -1f
-    return onVisibilityChanged { intersectionRatio, observer ->
-        if (previous != intersectionRatio) {
-            if (intersectionRatio == 0f && previous != 0f) {
-                block(observer)
-            }
-            previous = intersectionRatio
-        }
-    }
-}

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/IntersectionObserver.kt

@@ -1,124 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import org.w3c.dom.DOMRectReadOnly
-import org.w3c.dom.Element
-
-external interface IntersectionObserverOptions {
-    /**
-     * An Element or Document object which is an ancestor of the intended target, whose bounding rectangle will be
-     * considered the viewport. Any part of the target not visible in the visible area of the root is not considered
-     * visible.
-     */
-    var root: Element?
-
-    /**
-     * A string which specifies a set of offsets to add to the root's bounding_box when calculating intersections,
-     * effectively shrinking or growing the root for calculation purposes. The syntax is approximately the same as that
-     * for the CSS margin property; see The root element and root margin in Intersection Observer API for more
-     * information on how the margin works and the syntax. The default is "0px 0px 0px 0px".
-     */
-    var rootMargin: String?
-
-    /**
-     * Either a single number or an array of numbers between 0.0 and 1.0, specifying a ratio of intersection area to
-     * total bounding box area for the observed target. A value of 0.0 means that even a single visible pixel counts as
-     * the target being visible. 1.0 means that the entire target element is visible. See Thresholds in Intersection
-     * Observer API for a more in-depth description of how thresholds are used. The default is a threshold of 0.0.
-     */
-    var threshold: Array<Number>?
-}
-fun IntersectionObserverOptions(
-    block: IntersectionObserverOptions.() -> Unit = {}
-): IntersectionObserverOptions = js("{}").unsafeCast<IntersectionObserverOptions>().apply(block)
-
-external interface IntersectionObserverEntry {
-    /**
-     * Returns the bounds rectangle of the target element as a DOMRectReadOnly. The bounds are computed as described in
-     * the documentation for Element.getBoundingClientRect().
-     */
-    val boundingClientRect: DOMRectReadOnly
-
-    /**
-     * Returns the ratio of the intersectionRect to the boundingClientRect.
-     */
-    val intersectionRatio: Number
-
-    /**
-     * Returns a DOMRectReadOnly representing the target's visible area.
-     */
-    val intersectionRect: DOMRectReadOnly
-
-    /**
-     * A Boolean value which is true if the target element intersects with the intersection observer's root. If this is
-     * true, then, the IntersectionObserverEntry describes a transition into a state of intersection; if it's false,
-     * then you know the transition is from intersecting to not-intersecting.
-     */
-    val isIntersecting: Boolean
-
-    /**
-     * Returns a DOMRectReadOnly for the intersection observer's root.
-     */
-    val rootBounds: DOMRectReadOnly
-
-    /**
-     * The Element whose intersection with the root changed.
-     */
-    val target: Element
-
-    /**
-     * A DOMHighResTimeStamp indicating the time at which the intersection was recorded, relative to the
-     * IntersectionObserver's time origin.
-     */
-    val time: Double
-}
-
-typealias IntersectionObserverCallback = (entries: Array<IntersectionObserverEntry>, observer: IntersectionObserver) -> Unit
-
-/**
- * This is just an implementation from [this commentary](https://youtrack.jetbrains.com/issue/KT-43157#focus=Comments-27-4498582.0-0)
- * of Kotlin JS issue related to the absence of [Intersection Observer API](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver)
- */
-external class IntersectionObserver(callback: IntersectionObserverCallback) {
-    constructor(callback: IntersectionObserverCallback, options: IntersectionObserverOptions)
-
-    /**
-     * The Element or Document whose bounds are used as the bounding box when testing for intersection. If no root value
-     * was passed to the constructor or its value is null, the top-level document's viewport is used.
-     */
-    val root: Element
-
-    /**
-     * An offset rectangle applied to the root's bounding box when calculating intersections, effectively shrinking or
-     * growing the root for calculation purposes. The value returned by this property may not be the same as the one
-     * specified when calling the constructor as it may be changed to match internal requirements. Each offset can be
-     * expressed in pixels (px) or as a percentage (%). The default is "0px 0px 0px 0px".
-     */
-    val rootMargin: String
-
-    /**
-     * A list of thresholds, sorted in increasing numeric order, where each threshold is a ratio of intersection area to
-     * bounding box area of an observed target. Notifications for a target are generated when any of the thresholds are
-     * crossed for that target. If no value was passed to the constructor, 0 is used.
-     */
-    val thresholds: Array<Number>
-
-    /**
-     * Stops the IntersectionObserver object from observing any target.
-     */
-    fun disconnect()
-
-    /**
-     * Tells the IntersectionObserver a target element to observe.
-     */
-    fun observe(targetElement: Element)
-
-    /**
-     * Returns an array of IntersectionObserverEntry objects for all observed targets.
-     */
-    fun takeRecords(): Array<IntersectionObserverEntry>
-
-    /**
-     * Tells the IntersectionObserver to stop observing a particular target element.
-     */
-    fun unobserve(targetElement: Element)
-}

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/IsOverflow.kt

@@ -1,12 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import org.w3c.dom.Element
-
-inline val Element.isOverflowWidth
-    get() = scrollWidth > clientWidth
-
-inline val Element.isOverflowHeight
-    get() = scrollHeight > clientHeight
-
-inline val Element.isOverflow
-    get() = isOverflowHeight || isOverflowWidth

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/OnClickOutside.kt

@@ -1,38 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import kotlinx.browser.document
-import org.w3c.dom.*
-import org.w3c.dom.events.Event
-import org.w3c.dom.events.EventListener
-
-fun Element.onActionOutside(type: String, options: dynamic = null, callback: (Event) -> Unit): EventListener {
-    lateinit var observer: MutationObserver
-    val listener = EventListener {
-        val elementsToCheck = mutableListOf<Element>(this@onActionOutside)
-        while (it.target != this@onActionOutside && elementsToCheck.isNotEmpty()) {
-            val childrenGettingElement = elementsToCheck.removeFirst()
-            for (i in 0 until childrenGettingElement.childElementCount) {
-                elementsToCheck.add(childrenGettingElement.children[i] ?: continue)
-            }
-        }
-        if (elementsToCheck.isEmpty()) {
-            callback(it)
-        }
-    }
-    if (options == null) {
-        document.addEventListener(type, listener)
-    } else {
-        document.addEventListener(type, listener, options)
-    }
-    observer = onRemoved {
-        if (options == null) {
-            document.removeEventListener(type, listener)
-        } else {
-            document.removeEventListener(type, listener, options)
-        }
-        observer.disconnect()
-    }
-    return listener
-}
-
-fun Element.onClickOutside(options: dynamic = null, callback: (Event) -> Unit) = onActionOutside("click", options, callback)

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/OpenLink.kt

@@ -1,8 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import kotlinx.browser.window
-
-fun openLink(link: String, target: String = "_blank", features: String = "") {
-    window.open(link, target, features) ?.focus()
-}
-

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt

@@ -1,58 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import org.w3c.dom.*
-import kotlin.js.Json
-import kotlin.js.json
-
-external class ResizeObserver(
-    callback: (Array<ResizeObserverEntry>, ResizeObserver) -> Unit
-) {
-    fun observe(target: Element, options: Json = definedExternally)
-
-    fun unobserve(target: Element)
-
-    fun disconnect()
-}
-
-external interface ResizeObserverSize {
-    val blockSize: Float
-    val inlineSize: Float
-}
-
-external interface ResizeObserverEntry {
-    val borderBoxSize: Array<ResizeObserverSize>
-    val contentBoxSize: Array<ResizeObserverSize>
-    val devicePixelContentBoxSize: Array<ResizeObserverSize>
-    val contentRect: DOMRectReadOnly
-    val target: Element
-}
-
-fun ResizeObserver.observe(target: Element, options: ResizeObserverObserveOptions) = observe(
-    target,
-    json(
-        "box" to options.box ?.name
-    )
-)
-
-class ResizeObserverObserveOptions(
-    val box: Box? = null
-) {
-    sealed interface Box {
-        val name: String
-
-        object Content : Box {
-            override val name: String
-                get() = "content-box"
-        }
-
-        object Border : Box {
-            override val name: String
-                get() = "border-box"
-        }
-
-        object DevicePixelContent : Box {
-            override val name: String
-                get() = "device-pixel-content-box"
-        }
-    }
-}

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/SelectFile.kt

@@ -1,30 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import kotlinx.browser.document
-import kotlinx.dom.createElement
-import org.w3c.dom.HTMLElement
-import org.w3c.dom.HTMLInputElement
-import org.w3c.files.get
-
-fun selectFile(
-    inputSetup: (HTMLInputElement) -> Unit = {},
-    onFailure: (Throwable) -> Unit = {},
-    onFile: (MPPFile) -> Unit
-) {
-    (document.createElement("input") {
-        (this as HTMLInputElement).apply {
-            type = "file"
-            onchange = {
-                runCatching {
-                    files ?.get(0) ?: error("File must not be null")
-                }.onSuccess {
-                    onFile(it)
-                }.onFailure {
-                    onFailure(it)
-                }
-            }
-            inputSetup(this)
-        }
-    } as HTMLElement).click()
-}
-

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/TriggerDownload.kt

@@ -1,14 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import kotlinx.browser.document
-import org.w3c.dom.HTMLAnchorElement
-
-fun triggerDownloadFile(filename: String, fileLink: String) {
-    val hiddenElement = document.createElement("a") as HTMLAnchorElement
-
-    hiddenElement.href = fileLink
-    hiddenElement.target = "_blank"
-    hiddenElement.download = filename
-    hiddenElement.click()
-}
-

common/src/jvmMain/kotlin/dev/inmo/micro_utils/common/CreateTempFileFromInput.kt

@@ -1,20 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import java.io.File
-import java.io.InputStream
-import java.util.UUID
-
-fun InputStream.downloadToTempFile(
-    fileName: String = UUID.randomUUID().toString(),
-    fileExtension: String? = ".temp",
-    folder: File? = null
-) = File.createTempFile(
-    fileName,
-    fileExtension,
-    folder
-).apply {
-    outputStream().use {
-        copyTo(it)
-    }
-    deleteOnExit()
-}

common/src/main/kotlin/dev/inmo/micro_utils/common/ArgumentPropertyNullableDelegate.kt

@@ -1,76 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import android.os.Bundle
-import android.os.Parcelable
-import androidx.fragment.app.Fragment
-import java.io.Serializable
-import kotlin.reflect.KProperty
-
-object ArgumentPropertyNullableDelegate {
-    operator fun <T: Any> getValue(thisRef: Fragment, property: KProperty<*>): T? {
-        val arguments = thisRef.arguments ?: return null
-        val key = property.name
-        return when (property.getter.returnType.classifier) {
-            // Scalars
-            String::class -> arguments.getString(key)
-            Boolean::class -> arguments.getBoolean(key)
-            Byte::class -> arguments.getByte(key)
-            Char::class -> arguments.getChar(key)
-            Double::class -> arguments.getDouble(key)
-            Float::class -> arguments.getFloat(key)
-            Int::class -> arguments.getInt(key)
-            Long::class -> arguments.getLong(key)
-            Short::class -> arguments.getShort(key)
-
-            // References
-            Bundle::class -> arguments.getBundle(key)
-            CharSequence::class -> arguments.getCharSequence(key)
-            Parcelable::class -> arguments.getParcelable(key)
-
-            // Scalar arrays
-            BooleanArray::class -> arguments.getBooleanArray(key)
-            ByteArray::class -> arguments.getByteArray(key)
-            CharArray::class -> arguments.getCharArray(key)
-            DoubleArray::class -> arguments.getDoubleArray(key)
-            FloatArray::class -> arguments.getFloatArray(key)
-            IntArray::class -> arguments.getIntArray(key)
-            LongArray::class -> arguments.getLongArray(key)
-            ShortArray::class -> arguments.getShortArray(key)
-            Array::class -> {
-                val componentType = property.returnType.classifier ?.javaClass ?.componentType!!
-                @Suppress("UNCHECKED_CAST") // Checked by reflection.
-                when {
-                    Parcelable::class.java.isAssignableFrom(componentType) -> {
-                        arguments.getParcelableArray(key)
-                    }
-                    String::class.java.isAssignableFrom(componentType) -> {
-                        arguments.getStringArray(key)
-                    }
-                    CharSequence::class.java.isAssignableFrom(componentType) -> {
-                        arguments.getCharSequenceArray(key)
-                    }
-                    Serializable::class.java.isAssignableFrom(componentType) -> {
-                        arguments.getSerializable(key)
-                    }
-                    else -> {
-                        val valueType = componentType.canonicalName
-                        throw IllegalArgumentException(
-                            "Illegal value array type $valueType for key \"$key\""
-                        )
-                    }
-                }
-            }
-            Serializable::class -> arguments.getSerializable(key)
-            else -> null
-        } as? T
-    }
-}
-
-object ArgumentPropertyNonNullableDelegate {
-    operator fun <T: Any> getValue(thisRef: Fragment, property: KProperty<*>): T {
-        return ArgumentPropertyNullableDelegate.getValue<T>(thisRef, property)!!
-    }
-}
-
-fun argumentOrNull() = ArgumentPropertyNullableDelegate
-fun argumentOrThrow() = ArgumentPropertyNonNullableDelegate

common/src/main/kotlin/dev/inmo/micro_utils/common/FindViewsByTag.kt

@@ -1,61 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import android.app.Activity
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.children
-import androidx.fragment.app.Fragment
-
-fun findViewsByTag(viewGroup: ViewGroup, tag: Any?): List<View> {
-    return viewGroup.children.flatMap {
-        findViewsByTag(it, tag)
-    }.toList()
-}
-
-fun findViewsByTag(viewGroup: ViewGroup, key: Int, tag: Any?): List<View> {
-    return viewGroup.children.flatMap {
-        findViewsByTag(it, key, tag)
-    }.toList()
-}
-
-fun findViewsByTag(view: View, tag: Any?): List<View> {
-    val result = mutableListOf<View>()
-    if (view.tag == tag) {
-        result.add(view)
-    }
-    if (view is ViewGroup) {
-        result.addAll(findViewsByTag(view, tag))
-    }
-    return result.toList()
-}
-
-fun findViewsByTag(view: View, key: Int, tag: Any?): List<View> {
-    val result = mutableListOf<View>()
-    if (view.getTag(key) == tag) {
-        result.add(view)
-    }
-    if (view is ViewGroup) {
-        result.addAll(findViewsByTag(view, key, tag))
-    }
-    return result.toList()
-}
-
-fun Activity.findViewsByTag(tag: Any?) = rootView ?.let {
-    findViewsByTag(it, tag)
-}
-
-fun Activity.findViewsByTag(key: Int, tag: Any?) = rootView ?.let {
-    findViewsByTag(it, key, tag)
-}
-
-fun Fragment.findViewsByTag(tag: Any?) = view ?.let {
-    findViewsByTag(it, tag)
-}
-
-fun Fragment.findViewsByTag(key: Int, tag: Any?) = view ?.let {
-    findViewsByTag(it, key, tag)
-}
-
-fun Fragment.findViewsByTagInActivity(tag: Any?) = activity ?.findViewsByTag(tag)
-
-fun Fragment.findViewsByTagInActivity(key: Int, tag: Any?) = activity ?.findViewsByTag(key, tag)

common/src/main/kotlin/dev/inmo/micro_utils/common/RootView.kt

@@ -1,7 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import android.app.Activity
-import android.view.View
-
-val Activity.rootView: View?
-    get() = findViewById<View?>(android.R.id.content) ?.rootView ?: window.decorView.findViewById<View?>(android.R.id.content) ?.rootView

coroutines/build.gradle

@@ -10,17 +10,12 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api libs.kt.coroutines
-            }
-        }
-        jsMain {
-            dependencies {
-                api project(":micro_utils.common")
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
             }
         }
         androidMain {
             dependencies {
-                api libs.kt.coroutines.android
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
             }
         }
     }

coroutines/compose/build.gradle

@@ -1,20 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-    alias(libs.plugins.jb.compose)
-}
-
-apply from: "$mppProjectWithSerializationAndComposePresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api libs.kt.coroutines
-                api project(":micro_utils.coroutines")
-                api project(":micro_utils.common.compose")
-            }
-        }
-    }
-}

coroutines/compose/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/compose/FlowAsListState.kt

@@ -1,26 +0,0 @@
-package dev.inmo.micro_utils.coroutines.compose
-
-import androidx.compose.runtime.*
-import androidx.compose.runtime.snapshots.SnapshotStateList
-import dev.inmo.micro_utils.common.applyDiff
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <reified T> Flow<List<T>>.asMutableComposeListState(
-    scope: CoroutineScope
-): SnapshotStateList<T> {
-    val state = mutableStateListOf<T>()
-    subscribeSafelyWithoutExceptions(scope) {
-        state.applyDiff(it)
-    }
-    return state
-}
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <reified T> Flow<List<T>>.asComposeList(
-    scope: CoroutineScope
-): List<T> = asMutableComposeListState(scope)
-

coroutines/compose/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/compose/FlowAsState.kt

@@ -1,35 +0,0 @@
-package dev.inmo.micro_utils.coroutines.compose
-
-import androidx.compose.runtime.*
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
-fun <T> Flow<T>.asMutableComposeState(
-    initial: T,
-    scope: CoroutineScope
-): MutableState<T> {
-    val state = mutableStateOf(initial)
-    subscribeSafelyWithoutExceptions(scope) { state.value = it }
-    return state
-}
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T> StateFlow<T>.asMutableComposeState(
-    scope: CoroutineScope
-): MutableState<T> = asMutableComposeState(value, scope)
-
-fun <T> Flow<T>.asComposeState(
-    initial: T,
-    scope: CoroutineScope
-): State<T> {
-    val state = asMutableComposeState(initial, scope)
-    return derivedStateOf { state.value }
-}
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T> StateFlow<T>.asComposeState(
-    scope: CoroutineScope
-): State<T> = asComposeState(value, scope)
-

coroutines/compose/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/compose/FlowToMutableState.kt

@@ -1,23 +0,0 @@
-package dev.inmo.micro_utils.coroutines.compose
-
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
-fun <T> Flow<T>.toMutableState(
-    initial: T,
-    scope: CoroutineScope
-): MutableState<T> {
-    val state = mutableStateOf(initial)
-    subscribeSafelyWithoutExceptions(scope) { state.value = it }
-    return state
-}
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T> StateFlow<T>.toMutableState(
-    scope: CoroutineScope
-): MutableState<T> = toMutableState(value, scope)
-

coroutines/compose/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/compose/LinkCompositionToJob.kt

@@ -1,14 +0,0 @@
-package dev.inmo.micro_utils.coroutines.compose
-
-import androidx.compose.runtime.*
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.job
-import kotlin.coroutines.CoroutineContext
-
-fun Composition.linkWithJob(job: Job) {
-    job.invokeOnCompletion {
-        this@linkWithJob.dispose()
-    }
-}
-
-fun Composition.linkWithContext(coroutineContext: CoroutineContext) = linkWithJob(coroutineContext.job)

coroutines/compose/src/jsMain/kotlin/dev/inmo/micro_utils/coroutines/compose/RenderComposableWithLinkToContext.kt

@@ -1,26 +0,0 @@
-package dev.inmo.micro_utils.coroutines.compose
-
-import androidx.compose.runtime.*
-import dev.inmo.micro_utils.common.compose.linkWithElement
-import kotlinx.coroutines.*
-import org.jetbrains.compose.web.dom.DOMScope
-import org.w3c.dom.Element
-
-suspend fun <TElement : Element> renderComposableAndLinkToContext(
-    root: TElement,
-    monotonicFrameClock: MonotonicFrameClock = DefaultMonotonicFrameClock,
-    content: @Composable DOMScope<TElement>.() -> Unit
-): Composition = org.jetbrains.compose.web.renderComposable(root, monotonicFrameClock, content).apply {
-    linkWithContext(
-        currentCoroutineContext()
-    )
-}
-
-suspend fun <TElement : Element> renderComposableAndLinkToContextAndRoot(
-    root: TElement,
-    monotonicFrameClock: MonotonicFrameClock = DefaultMonotonicFrameClock,
-    content: @Composable DOMScope<TElement>.() -> Unit
-): Composition = org.jetbrains.compose.web.renderComposable(root, monotonicFrameClock, content).apply {
-    linkWithContext(currentCoroutineContext())
-    linkWithElement(root)
-}

coroutines/compose/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.micro_utils.coroutines.compose"/>

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/AccumulatorFlow.kt

@@ -6,12 +6,11 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlin.coroutines.cancellation.CancellationException
 
-private sealed interface AccumulatorFlowStep<T>
-private data class DataRetrievedAccumulatorFlowStep<T>(val data: T) : AccumulatorFlowStep<T>
-private data class SubscribeAccumulatorFlowStep<T>(val channel: Channel<T>) : AccumulatorFlowStep<T>
-private data class UnsubscribeAccumulatorFlowStep<T>(val channel: Channel<T>) : AccumulatorFlowStep<T>
+private sealed interface AccumulatorFlowStep
+private data class DataRetrievedAccumulatorFlowStep(val data: Any) : AccumulatorFlowStep
+private data class SubscribeAccumulatorFlowStep(val channel: Channel<Any>) : AccumulatorFlowStep
+private data class UnsubscribeAccumulatorFlowStep(val channel: Channel<Any>) : AccumulatorFlowStep
 
 /**
  * This [Flow] will have behaviour very similar to [SharedFlow], but there are several differences:
@@ -27,12 +26,12 @@ class AccumulatorFlow<T>(
     private val subscope = scope.LinkedSupervisorScope()
     private val activeData = ArrayDeque<T>()
     private val dataMutex = Mutex()
-    private val channelsForBroadcast = mutableListOf<Channel<T>>()
+    private val channelsForBroadcast = mutableListOf<Channel<Any>>()
     private val channelsMutex = Mutex()
-    private val steps = subscope.actor<AccumulatorFlowStep<T>> { step ->
+    private val steps = subscope.actor<AccumulatorFlowStep> { step ->
         when (step) {
             is DataRetrievedAccumulatorFlowStep -> {
-                if (activeData.firstOrNull() === step.data) {
+                if (activeData.first() === step.data) {
                     dataMutex.withLock {
                         activeData.removeFirst()
                     }
@@ -43,7 +42,7 @@ class AccumulatorFlow<T>(
                 dataMutex.withLock {
                     val dataToSend = activeData.toList()
                     safelyWithoutExceptions {
-                        dataToSend.forEach { step.channel.send(it) }
+                        dataToSend.forEach { step.channel.send(it as Any) }
                     }
                 }
             }
@@ -59,29 +58,24 @@ class AccumulatorFlow<T>(
         channelsMutex.withLock {
             channelsForBroadcast.forEach { channel ->
                 safelyWithResult {
-                    channel.send(it)
+                    channel.send(it as Any)
                 }
             }
         }
     }
 
     override suspend fun collectSafely(collector: FlowCollector<T>) {
-        val channel = Channel<T>(Channel.UNLIMITED, BufferOverflow.SUSPEND)
+        val channel = Channel<Any>(Channel.UNLIMITED, BufferOverflow.SUSPEND)
         steps.send(SubscribeAccumulatorFlowStep(channel))
-        val result = runCatchingSafely {
-            for (data in channel) {
-                val emitResult = runCatchingSafely {
-                    collector.emit(data)
-                }
-                if (emitResult.isSuccess || emitResult.exceptionOrNull() is CancellationException) {
-                    steps.send(DataRetrievedAccumulatorFlowStep(data))
-                }
-                emitResult.getOrThrow()
+        for (data in channel) {
+            try {
+                collector.emit(data as T)
+                steps.send(DataRetrievedAccumulatorFlowStep(data))
+            } finally {
+                channel.cancel()
+                steps.send(UnsubscribeAccumulatorFlowStep(channel))
             }
         }
-        channel.cancel()
-        steps.send(UnsubscribeAccumulatorFlowStep(channel))
-        result.getOrThrow()
     }
 }
 

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/Actor.kt

@@ -1,15 +1,19 @@
 package dev.inmo.micro_utils.coroutines
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.launch
 
 fun <T> CoroutineScope.actor(
     channelCapacity: Int = Channel.UNLIMITED,
     block: suspend (T) -> Unit
 ): Channel<T> {
     val channel = Channel<T>(channelCapacity)
-    channel.consumeAsFlow().subscribe(this, block)
+    launch {
+        for (data in channel) {
+            block(data)
+        }
+    }
     return channel
 }
 

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/ActorAsync.kt

@@ -1,30 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.consumeAsFlow
-
-fun <T> CoroutineScope.actorAsync(
-    channelCapacity: Int = Channel.UNLIMITED,
-    markerFactory: suspend (T) -> Any? = { null },
-    block: suspend (T) -> Unit
-): Channel<T> {
-    val channel = Channel<T>(channelCapacity)
-    channel.consumeAsFlow().subscribeAsync(this, markerFactory, block)
-    return channel
-}
-
-inline fun <T> CoroutineScope.safeActorAsync(
-    channelCapacity: Int = Channel.UNLIMITED,
-    noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler,
-    noinline markerFactory: suspend (T) -> Any? = { null },
-    crossinline block: suspend (T) -> Unit
-): Channel<T> = actorAsync(
-    channelCapacity,
-    markerFactory
-) {
-    safely(onException) {
-        block(it)
-    }
-}
-

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/AwaitFirst.kt

@@ -6,19 +6,23 @@ import kotlin.coroutines.*
 suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred(
     scope: CoroutineScope,
     cancelOnResult: Boolean = true
-): Pair<Deferred<T>, T> {
-    val resultDeferred = CompletableDeferred<Pair<Deferred<T>, T>>()
-    val scope = scope.LinkedSupervisorScope()
-    forEach {
-        scope.launch {
-            resultDeferred.complete(it to it.await())
-            scope.cancel()
+): Pair<Deferred<T>, T> = suspendCoroutine<Pair<Deferred<T>, T>> { continuation ->
+    scope.launch(SupervisorJob()) {
+        val scope = this
+        forEach {
+            scope.launch {
+                continuation.resume(it to it.await())
+                scope.cancel()
+            }
         }
     }
-    return resultDeferred.await().also {
-        if (cancelOnResult) {
-            forEach {
-                runCatchingSafely { it.cancel() }
+}.also {
+    if (cancelOnResult) {
+        forEach {
+            try {
+                it.cancel()
+            } catch (e: IllegalStateException) {
+                e.printStackTrace()
             }
         }
     }

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/FlowFlatten.kt

@@ -1,39 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import kotlinx.coroutines.flow.*
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-
-inline fun <T, R> Flow<Flow<T>>.flatMap(
-    crossinline mapper: suspend (T) -> R
-) = flow {
-    collect {
-        it.collect {
-            emit(mapper(it))
-        }
-    }
-}
-
-@JsName("flatMapIterable")
-@JvmName("flatMapIterable")
-inline fun <T, R> Flow<Iterable<T>>.flatMap(
-    crossinline mapper: suspend (T) -> R
-) = map {
-    it.asFlow()
-}.flatMap(mapper)
-
-inline fun <T, R> Flow<Flow<T>>.flatMapNotNull(
-    crossinline mapper: suspend (T) -> R
-) = flatMap(mapper).takeNotNull()
-
-@JsName("flatMapNotNullIterable")
-@JvmName("flatMapNotNullIterable")
-inline fun <T, R> Flow<Iterable<T>>.flatMapNotNull(
-    crossinline mapper: suspend (T) -> R
-) = flatMap(mapper).takeNotNull()
-
-fun <T> Flow<Flow<T>>.flatten() = flatMap { it }
-
-@JsName("flattenIterable")
-@JvmName("flattenIterable")
-fun <T> Flow<Iterable<T>>.flatten() = flatMap { it }

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/FlowNullables.kt

@@ -1,6 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import kotlinx.coroutines.flow.*
-
-fun <T> Flow<T>.takeNotNull() = mapNotNull { it }
-fun <T> Flow<T>.filterNotNull() = takeNotNull()

coroutines/src/jsMain/kotlin/dev.inmo.micro_utils.coroutines/ElementVisibilityFlow.kt

@@ -1,28 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import dev.inmo.micro_utils.common.onRemoved
-import dev.inmo.micro_utils.common.onVisibilityChanged
-import kotlinx.coroutines.flow.*
-import org.w3c.dom.Element
-
-fun Element.visibilityFlow(): Flow<Boolean> = channelFlow {
-    var previousData: Boolean? = null
-
-    val observer = onVisibilityChanged { intersectionRatio, _ ->
-        val currentData = intersectionRatio > 0
-        if (currentData != previousData) {
-            trySend(currentData)
-        }
-        previousData = currentData
-    }
-
-    val removeObserver = onRemoved {
-        observer.disconnect()
-        close()
-    }
-
-    invokeOnClose {
-        observer.disconnect()
-        removeObserver.disconnect()
-    }
-}

coroutines/src/jsMain/kotlin/dev.inmo.micro_utils.coroutines/SelectFile.kt

@@ -1,42 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.common.selectFile
-import kotlinx.coroutines.CompletableDeferred
-import org.w3c.dom.HTMLInputElement
-
-suspend fun selectFileOrThrow(
-    inputSetup: (HTMLInputElement) -> Unit = {}
-): MPPFile {
-    val result = CompletableDeferred<MPPFile>()
-
-    selectFile(
-        inputSetup,
-        {
-            result.completeExceptionally(it)
-        }
-    ) {
-        result.complete(it)
-    }
-
-    return result.await()
-}
-
-suspend fun selectFileOrNull(
-    inputSetup: (HTMLInputElement) -> Unit = {},
-    onFailure: (Throwable) -> Unit = {}
-): MPPFile? {
-    val result = CompletableDeferred<MPPFile?>()
-
-    selectFile(
-        inputSetup,
-        {
-            result.complete(null)
-            onFailure(it)
-        }
-    ) {
-        result.complete(it)
-    }
-
-    return result.await()
-}

coroutines/src/main/kotlin/FlowOnHierarchyChangeListener.kt

@@ -1,50 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import android.view.View
-import android.view.ViewGroup
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-
-/**
- * [kotlinx.coroutines.flow.Flow]-based [android.view.ViewGroup.OnHierarchyChangeListener]
- *
- * @param recursive If set, any call of [onChildViewAdded] will check if child [View] is [ViewGroup] and subscribe to this
- * [ViewGroup] too
- * @param [_onChildViewAdded] Internal [MutableSharedFlow] which will be used to pass data to [onChildViewAdded] flow
- * @param [_onChildViewRemoved] Internal [MutableSharedFlow] which will be used to pass data to [onChildViewRemoved] flow
- */
-class FlowOnHierarchyChangeListener(
-    private val recursive: Boolean = false,
-    private val _onChildViewAdded: MutableSharedFlow<Pair<View, View>> = MutableSharedFlow(extraBufferCapacity = Int.MAX_VALUE),
-    private val _onChildViewRemoved: MutableSharedFlow<Pair<View, View>> = MutableSharedFlow(extraBufferCapacity = Int.MAX_VALUE)
-) : ViewGroup.OnHierarchyChangeListener {
-    val onChildViewAdded = _onChildViewAdded.asSharedFlow()
-    val onChildViewRemoved = _onChildViewRemoved.asSharedFlow()
-
-    /**
-     * Will emit data into [onChildViewAdded] flow. If [recursive] is true and [child] is [ViewGroup] will also
-     * subscribe to [child] hierarchy changes.
-     *
-     * Due to the fact that this method is not suspendable, [FlowOnHierarchyChangeListener] will use
-     * [MutableSharedFlow.tryEmit] to send data into [_onChildViewAdded]. That is why its default extraBufferCapacity is
-     * [Int.MAX_VALUE]
-     */
-    override fun onChildViewAdded(parent: View, child: View) {
-        _onChildViewAdded.tryEmit(parent to child)
-
-        if (recursive && child is ViewGroup) {
-            child.setOnHierarchyChangeListener(this)
-        }
-    }
-
-    /**
-     * Just emit data into [onChildViewRemoved]
-     *
-     * Due to the fact that this method is not suspendable, [FlowOnHierarchyChangeListener] will use
-     * [MutableSharedFlow.tryEmit] to send data into [_onChildViewRemoved]. That is why its default extraBufferCapacity is
-     * [Int.MAX_VALUE]
-     */
-    override fun onChildViewRemoved(parent: View, child: View) {
-        _onChildViewRemoved.tryEmit(parent to child)
-    }
-}

coroutines/src/main/kotlin/RecursiveHierarchySubscriber.kt

@@ -1,17 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import android.view.ViewGroup
-import android.view.ViewGroup.OnHierarchyChangeListener
-
-/**
- * Use [ViewGroup.setOnHierarchyChangeListener] recursively for all available [ViewGroup]s starting with [this].
- * This extension DO NOT guarantee that recursive subscription will happen after this method call
- */
-fun ViewGroup.setOnHierarchyChangeListenerRecursively(
-    listener: OnHierarchyChangeListener
-) {
-    setOnHierarchyChangeListener(listener)
-    (0 until childCount).forEach {
-        (getChildAt(it) as? ViewGroup) ?.setOnHierarchyChangeListenerRecursively(listener)
-    }
-}

crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Hex.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.crypto
-
-val HEX_ARRAY = "0123456789abcdef".toCharArray()
-
-fun SourceBytes.hex(): String {
-    val hexChars = CharArray(size * 2)
-    for (j in indices) {
-        val v: Int = this[j].toInt() and 0xFF
-        hexChars[j * 2] = HEX_ARRAY[v ushr 4]
-        hexChars[j * 2 + 1] = HEX_ARRAY[v and 0x0F]
-    }
-    return hexChars.concatToString()
-}
-
-fun SourceString.hex(): String = encodeToByteArray().hex()

crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Hex.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.crypto
-
-import kotlin.test.*
-
-class Hex {
-    @Test
-    fun testSimpleHmacSHA256Message() {
-        val text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-        val resultHex = text.hex()
-        assertEquals(
-            "4c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e73656374657475722061646970697363696e6720656c69742c2073656420646f20656975736d6f642074656d706f7220696e6369646964756e74207574206c61626f726520657420646f6c6f7265206d61676e6120616c697175612e20557420656e696d206164206d696e696d2076656e69616d2c2071756973206e6f737472756420657865726369746174696f6e20756c6c616d636f206c61626f726973206e69736920757420616c697175697020657820656120636f6d6d6f646f20636f6e7365717561742e2044756973206175746520697275726520646f6c6f7220696e20726570726568656e646572697420696e20766f6c7570746174652076656c697420657373652063696c6c756d20646f6c6f726520657520667567696174206e756c6c612070617269617475722e204578636570746575722073696e74206f6363616563617420637570696461746174206e6f6e2070726f6964656e742c2073756e7420696e2063756c706120717569206f666669636961206465736572756e74206d6f6c6c697420616e696d20696420657374206c61626f72756d2e",
-            resultHex
-        )
-    }
-}

defaultAndroidSettings.gradle

@@ -26,12 +26,12 @@ ext {
 }
 
 android {
-    compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
-    buildToolsVersion libs.versions.android.props.buildTools.get()
+    compileSdkVersion "$android_compileSdkVersion".toInteger()
+    buildToolsVersion "$android_buildToolsVersion"
 
     defaultConfig {
-        minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
-        targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
+        minSdkVersion "$android_minSdkVersion".toInteger()
+        targetSdkVersion "$android_compileSdkVersion".toInteger()
         versionCode "${android_code_version}".toInteger()
         versionName "$version"
     }

extensions.gradle

@@ -21,7 +21,6 @@ allprojects {
         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
 
         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
-        mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle"
         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
         mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
 

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/CheckableHandlerHolder.kt

@@ -47,11 +47,24 @@ fun <I : O, O : State> CheckableHandlerHolder(
     }
 )
 
+@Deprecated("Renamed", ReplaceWith("CheckableHandlerHolder"))
+fun <I : O, O : State> StateHandlerHolder(
+    inputKlass: KClass<I>,
+    strict: Boolean = false,
+    delegateTo: StatesHandler<I, O>
+) = CheckableHandlerHolder(inputKlass, strict, delegateTo)
+
 inline fun <reified I : O, O : State> CheckableHandlerHolder(
     strict: Boolean = false,
     delegateTo: StatesHandler<I, O>
 ) = CheckableHandlerHolder(I::class, strict, delegateTo)
 
+@Deprecated("Renamed", ReplaceWith("CheckableHandlerHolder"))
+inline fun <reified I : O, O : State> StateHandlerHolder(
+    strict: Boolean = false,
+    delegateTo: StatesHandler<I, O>
+) = CheckableHandlerHolder(strict, delegateTo)
+
 inline fun <reified I : O, O: State> StatesHandler<I, O>.holder(
     strict: Boolean = true
 ) = CheckableHandlerHolder<I, O>(

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesMachine.kt

@@ -3,10 +3,7 @@ package dev.inmo.micro_utils.fsm.common
 import dev.inmo.micro_utils.common.Optional
 import dev.inmo.micro_utils.common.onPresented
 import dev.inmo.micro_utils.coroutines.*
-import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
-import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
@@ -16,24 +13,13 @@ import kotlinx.coroutines.sync.withLock
  * handling until [start] method will be called
  */
 interface StatesMachine<T : State> : StatesHandler<T, T> {
-    suspend fun launchStateHandling(
-        state: T,
-        handlers: List<CheckableHandlerHolder<in T, T>>,
-        onStateHandlingErrorHandler: StateHandlingErrorHandler<T>
-    ): T? {
-        return runCatchingSafely {
-            handlers.firstOrNull { it.checkHandleable(state) } ?.run {
-                handleState(state)
-            }
-        }.getOrElse {
-            onStateHandlingErrorHandler(state, it)
-        }
-    }
     suspend fun launchStateHandling(
         state: T,
         handlers: List<CheckableHandlerHolder<in T, T>>
     ): T? {
-        return launchStateHandling(state, handlers, defaultStateHandlingErrorHandler())
+        return handlers.firstOrNull { it.checkHandleable(state) } ?.run {
+            handleState(state)
+        }
     }
 
     /**
@@ -52,9 +38,8 @@ interface StatesMachine<T : State> : StatesHandler<T, T> {
          */
         operator fun <T: State> invoke(
             statesManager: StatesManager<T>,
-            handlers: List<CheckableHandlerHolder<in T, T>>,
-            onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
-        ) = DefaultStatesMachine(statesManager, handlers, onStateHandlingErrorHandler)
+            handlers: List<CheckableHandlerHolder<in T, T>>
+        ) = DefaultStatesMachine(statesManager, handlers)
     }
 }
 
@@ -67,17 +52,12 @@ interface StatesMachine<T : State> : StatesHandler<T, T> {
 open class DefaultStatesMachine <T: State>(
     protected val statesManager: StatesManager<T>,
     protected val handlers: List<CheckableHandlerHolder<in T, T>>,
-    protected val onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
 ) : StatesMachine<T> {
     /**
      * Will call [launchStateHandling] for state handling
      */
     override suspend fun StatesMachine<in T>.handleState(state: T): T? = launchStateHandling(state, handlers)
 
-    override suspend fun launchStateHandling(state: T, handlers: List<CheckableHandlerHolder<in T, T>>): T? {
-        return launchStateHandling(state, handlers, onStateHandlingErrorHandler)
-    }
-
     /**
      * This
      */
@@ -86,10 +66,10 @@ open class DefaultStatesMachine <T: State>(
 
     protected open suspend fun performUpdate(state: T) {
         val newState = launchStateHandling(state, handlers)
-        if (newState == null) {
-            statesManager.endChain(state)
-        } else {
+        if (newState != null) {
             statesManager.update(state, newState)
+        } else {
+            statesManager.endChain(state)
         }
     }
 
@@ -119,21 +99,15 @@ open class DefaultStatesMachine <T: State>(
      * [StatesManager.endChain].
      */
     override fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions {
-        (statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(this) {
+        statesManager.onStartChain.subscribeSafelyWithoutExceptions(this) {
             launch { performStateUpdate(Optional.absent(), it, scope.LinkedSupervisorScope()) }
         }
         statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) {
             launch { performStateUpdate(Optional.presented(it.first), it.second, scope.LinkedSupervisorScope()) }
         }
-        statesManager.onEndChain.subscribeSafelyWithoutExceptions(this) { removedState ->
-            launch {
-                statesJobsMutex.withLock {
-                    val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState }
-                    if (stateInMap === removedState) {
-                        statesJobs[stateInMap] ?.cancel()
-                    }
-                }
-            }
+
+        statesManager.getActiveStates().forEach {
+            launch { performStateUpdate(Optional.absent(), it, scope.LinkedSupervisorScope()) }
         }
     }
 

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/UpdatableStatesMachine.kt

@@ -1,8 +1,6 @@
 package dev.inmo.micro_utils.fsm.common
 
 import dev.inmo.micro_utils.common.*
-import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
-import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.withLock
 
@@ -22,23 +20,15 @@ interface UpdatableStatesMachine<T : State> : StatesMachine<T> {
 open class DefaultUpdatableStatesMachine<T : State>(
     statesManager: StatesManager<T>,
     handlers: List<CheckableHandlerHolder<in T, T>>,
-    onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
 ) : DefaultStatesMachine<T>(
     statesManager,
-    handlers,
-    onStateHandlingErrorHandler
+    handlers
 ), UpdatableStatesMachine<T> {
     protected val jobsStates = mutableMapOf<Job, T>()
 
-    /**
-     * Realization of this update will use the [Job] of [previousState] in [statesJobs] and [jobsStates] if
-     * [previousState] is [Optional.presented] and [shouldReplaceJob] has returned true for [previousState] and [actualState]. In
-     * other words, [Job] of [previousState] WILL NOT be replaced with the new one if they are "equal". Equality of
-     * states is solved in [shouldReplaceJob] and can be rewritten in subclasses
-     */
     override suspend fun performStateUpdate(previousState: Optional<T>, actualState: T, scope: CoroutineScope) {
         statesJobsMutex.withLock {
-            if (shouldReplaceJob(previousState, actualState)) {
+            if (compare(previousState, actualState)) {
                 statesJobs[actualState] ?.cancel()
             }
             val job = previousState.mapOnPresented {
@@ -52,7 +42,6 @@ open class DefaultUpdatableStatesMachine<T : State>(
                             statesJobs.remove(
                                 jobsStates[job] ?: return@withLock
                             )
-                            jobsStates.remove(job)
                         }
                     }
                 }
@@ -63,10 +52,7 @@ open class DefaultUpdatableStatesMachine<T : State>(
         }
     }
 
-    /**
-     * Compare if [previous] potentially lead to the same behaviour with [new]
-     */
-    protected open suspend fun shouldReplaceJob(previous: Optional<T>, new: T): Boolean = previous.dataOrNull() != new
+    protected open suspend fun compare(previous: Optional<T>, new: T): Boolean = previous.dataOrNull() != new
 
     override suspend fun updateChain(currentState: T, newState: T) {
         statesManager.update(currentState, newState)

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/DefaultStatesManager.kt

@@ -37,49 +37,36 @@ interface DefaultStatesManagerRepo<T : State> {
 
 /**
  * @param repo This repo will be used as repository for storing states. All operations with this repo will happen BEFORE
- * any event will be sent to [onChainStateUpdated], [onStartChain] or [onEndChain]. By default, will be used
+ * any event will be sent to [onChainStateUpdated], [onStartChain] or [onEndChain]. By default will be used
  * [InMemoryDefaultStatesManagerRepo] or you may create custom [DefaultStatesManagerRepo] and pass as [repo] parameter
- * @param onStartContextsConflictResolver Receive current [State] and the state passed with [startChain]. In case when
- * this callback will return true, currently placed on the [State.context] [State] will be replaced by new state
- * with [endChain] with current state
- * @param onUpdateContextsConflictResolver Receive old [State], new one and the state currently placed on new [State.context]
+ * @param onContextsConflictResolver Receive old [State], new one and the state currently placed on new [State.context]
  * key. In case when this callback will returns true, the state placed on [State.context] of new will be replaced by
  * new state by using [endChain] with that state
  */
-open class DefaultStatesManager<T : State>(
-    protected val repo: DefaultStatesManagerRepo<T> = InMemoryDefaultStatesManagerRepo(),
-    protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> true },
-    protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> true }
+class DefaultStatesManager<T : State>(
+    private val repo: DefaultStatesManagerRepo<T> = InMemoryDefaultStatesManagerRepo(),
+    private val onContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> true }
 ) : StatesManager<T> {
-    protected val _onChainStateUpdated = MutableSharedFlow<Pair<T, T>>(0)
+    private val _onChainStateUpdated = MutableSharedFlow<Pair<T, T>>(0)
     override val onChainStateUpdated: Flow<Pair<T, T>> = _onChainStateUpdated.asSharedFlow()
-    protected val _onStartChain = MutableSharedFlow<T>(0)
+    private val _onStartChain = MutableSharedFlow<T>(0)
     override val onStartChain: Flow<T> = _onStartChain.asSharedFlow()
-    protected val _onEndChain = MutableSharedFlow<T>(0)
+    private val _onEndChain = MutableSharedFlow<T>(0)
     override val onEndChain: Flow<T> = _onEndChain.asSharedFlow()
 
-    protected val mapMutex = Mutex()
-
-    constructor(
-        repo: DefaultStatesManagerRepo<T>,
-        onContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean
-    ) : this (
-        repo,
-        onUpdateContextsConflictResolver = onContextsConflictResolver
-    )
+    private val mapMutex = Mutex()
 
     override suspend fun update(old: T, new: T) = mapMutex.withLock {
         val stateByOldContext: T? = repo.getContextState(old.context)
         when {
             stateByOldContext != old -> return@withLock
             stateByOldContext == null || old.context == new.context -> {
-                repo.removeState(old)
                 repo.set(new)
                 _onChainStateUpdated.emit(old to new)
             }
             else -> {
                 val stateOnNewOneContext = repo.getContextState(new.context)
-                if (stateOnNewOneContext == null || onUpdateContextsConflictResolver(old, new, stateOnNewOneContext)) {
+                if (stateOnNewOneContext == null || onContextsConflictResolver(old, new, stateOnNewOneContext)) {
                     stateOnNewOneContext ?.let { endChainWithoutLock(it) }
                     repo.removeState(old)
                     repo.set(new)
@@ -90,17 +77,13 @@ open class DefaultStatesManager<T : State>(
     }
 
     override suspend fun startChain(state: T) = mapMutex.withLock {
-        val stateOnContext = repo.getContextState(state.context)
-        if (stateOnContext == null || onStartContextsConflictResolver(stateOnContext, state)) {
-            stateOnContext ?.let {
-                endChainWithoutLock(it)
-            }
+        if (!repo.contains(state.context)) {
             repo.set(state)
             _onStartChain.emit(state)
         }
     }
 
-    protected open suspend fun endChainWithoutLock(state: T) {
+    private suspend fun endChainWithoutLock(state: T) {
         if (repo.getContextState(state.context) == state) {
             repo.removeState(state)
             _onEndChain.emit(state)

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/managers/InMemoryStatesManager.kt

@@ -0,0 +1,16 @@
+package dev.inmo.micro_utils.fsm.common.managers
+
+import dev.inmo.micro_utils.fsm.common.State
+import kotlinx.coroutines.flow.*
+
+/**
+ * Creates [DefaultStatesManager] with [InMemoryDefaultStatesManagerRepo]
+ *
+ * @param onContextsConflictResolver Receive old [State], new one and the state currently placed on new [State.context]
+ * key. In case when this callback will returns true, the state placed on [State.context] of new will be replaced by
+ * new state by using [endChain] with that state
+ */
+@Deprecated("Use DefaultStatesManager instead", ReplaceWith("DefaultStatesManager"))
+fun <T: State> InMemoryStatesManager(
+    onContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> true }
+) = DefaultStatesManager(onContextsConflictResolver = onContextsConflictResolver)

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/utils/StateHandlingErrorHandler.kt

@@ -1,6 +0,0 @@
-package dev.inmo.micro_utils.fsm.common.utils
-
-typealias StateHandlingErrorHandler<T> = suspend (T, Throwable) -> T?
-val DefaultStateHandlingErrorHandler: StateHandlingErrorHandler<*> = { _, _ -> null }
-inline fun <T> defaultStateHandlingErrorHandler(): StateHandlingErrorHandler<T> = DefaultStateHandlingErrorHandler as StateHandlingErrorHandler<T>
-

fsm/common/src/jvmTest/kotlin/PlayableMain.kt

@@ -1,6 +1,7 @@
 import dev.inmo.micro_utils.fsm.common.*
 import dev.inmo.micro_utils.fsm.common.dsl.buildFSM
 import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManager
+import dev.inmo.micro_utils.fsm.common.managers.InMemoryStatesManager
 import kotlinx.coroutines.*
 
 sealed interface TrafficLightState : State {

github_release.gradle

@@ -21,7 +21,7 @@ if (new File(projectDir, "secret.gradle").exists()) {
         owner "InsanusMokrassar"
         repo "MicroUtils"
 
-        tagName "v${project.version}"
+        tagName "${project.version}"
         releaseName "${project.version}"
         targetCommitish "${project.version}"
 

gradle.properties

@@ -7,12 +7,43 @@ android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2g
 
+kotlin_version=1.6.10
+kotlin_coroutines_version=1.6.0
+kotlin_serialisation_core_version=1.3.2
+kotlin_exposed_version=0.37.2
+
+ktor_version=1.6.7
+
+klockVersion=2.4.13
+
+github_release_plugin_version=2.2.12
+
+uuidVersion=0.4.0
+
+# ANDROID
+
+core_ktx_version=1.7.0
+androidx_recycler_version=1.2.1
+appcompat_version=1.4.0
+
+android_minSdkVersion=19
+android_compileSdkVersion=32
+android_buildToolsVersion=32.0.0
+dexcount_version=3.0.1
+junit_version=4.12
+test_ext_junit_version=1.1.2
+espresso_core=3.3.0
+
 # JS NPM
 
 crypto_js_version=4.1.1
 
+# Dokka
+
+dokka_version=1.6.10
+
 # Project data
 
 group=dev.inmo
-version=0.14.4
-android_code_version=165
+version=0.9.7
+android_code_version=97

gradle/libs.versions.toml

@@ -1,93 +0,0 @@
-[versions]
-
-kt = "1.7.20"
-kt-serialization = "1.4.1"
-kt-coroutines = "1.6.4"
-
-jb-compose = "1.2.1"
-jb-exposed = "0.41.1"
-jb-dokka = "1.7.20"
-
-klock = "3.4.0"
-uuid = "0.6.0"
-
-ktor = "2.1.3"
-
-gh-release = "2.4.1"
-
-koin = "3.2.2"
-
-android-gradle = "7.2.2"
-dexcount = "3.1.0"
-
-android-coreKtx = "1.9.0"
-android-recyclerView = "1.2.1"
-android-appCompat = "1.5.1"
-android-fragment = "1.5.3"
-android-espresso = "3.4.0"
-android-test = "1.1.3"
-
-android-props-minSdk = "21"
-android-props-compileSdk = "33"
-android-props-buildTools = "33.0.0"
-
-[libraries]
-
-kt-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kt" }
-kt-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kt" }
-
-kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kt-serialization" }
-kt-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cbor", version.ref = "kt-serialization" }
-
-kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" }
-kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kt-coroutines" }
-kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" }
-
-
-ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
-ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
-ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
-ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
-ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
-ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
-ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" }
-ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
-ktor-websockets = { module = "io.ktor:ktor-websockets", version.ref = "ktor" }
-ktor-server-websockets = { module = "io.ktor:ktor-server-websockets", version.ref = "ktor" }
-ktor-server-statusPages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
-ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
-
-
-klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
-uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
-koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
-
-
-jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-exposed" }
-
-
-android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" }
-android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
-android-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "android-appCompat" }
-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" }
-
-
-kt-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kt" }
-kt-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kt" }
-
-
-buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" }
-buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
-buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" }
-buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
-buildscript-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle" }
-buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
-
-[plugins]
-
-jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

koin/build.gradle

@@ -1,28 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-}
-
-apply from: "$mppProjectWithSerializationPresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api libs.koin
-                api libs.uuid
-            }
-        }
-        jvmMain {
-            dependencies {
-                api libs.kt.reflect
-            }
-        }
-        androidMain {
-            dependencies {
-                api libs.kt.reflect
-            }
-        }
-    }
-}

koin/src/commonMain/kotlin/FactoryWithRandomQualifier.kt

@@ -1,12 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.module.Module
-
-/**
- * Will be useful in case you need to declare some singles with one type several types, but need to separate them and do
- * not care about how :)
- */
-inline fun <reified T : Any> Module.factoryWithRandomQualifier(
-    noinline definition: Definition<T>
-) = factory(RandomQualifier(), definition)

koin/src/commonMain/kotlin/FactoryWithStringQualifier.kt

@@ -1,12 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.module.Module
-import org.koin.core.qualifier.StringQualifier
-
-inline fun <reified T : Any> Module.factory(
-    qualifier: String,
-    noinline definition: Definition<T>
-) = factory(StringQualifier(qualifier), definition)
-
-

koin/src/commonMain/kotlin/GetAllDistinct.kt

@@ -1,8 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.Koin
-import org.koin.core.scope.Scope
-
-inline fun <reified T : Any> Scope.getAllDistinct() = getAll<T>().distinct()
-inline fun <reified T : Any> Koin.getAllDistinct() = getAll<T>().distinct()
-

koin/src/commonMain/kotlin/GetAny.kt

@@ -1,8 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.Koin
-import org.koin.core.scope.Scope
-
-inline fun <reified T : Any> Scope.getAny() = getAll<T>().first()
-inline fun <reified T : Any> Koin.getAny() = getAll<T>().first()
-

koin/src/commonMain/kotlin/RandomQualifier.kt

@@ -1,6 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import com.benasher44.uuid.uuid4
-import org.koin.core.qualifier.StringQualifier
-
-fun RandomQualifier(randomFun: () -> String = { uuid4().toString() }) = StringQualifier(randomFun())

koin/src/commonMain/kotlin/SingleWithRandomQualifier.kt

@@ -1,13 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.module.Module
-
-/**
- * Will be useful in case you need to declare some singles with one type several types, but need to separate them and do
- * not care about how :)
- */
-inline fun <reified T : Any> Module.singleWithRandomQualifier(
-    createdAtStart: Boolean = false,
-    noinline definition: Definition<T>
-) = single(RandomQualifier(), createdAtStart, definition)

koin/src/commonMain/kotlin/SingleWithStringQualifier.kt

@@ -1,12 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.module.Module
-import org.koin.core.qualifier.StringQualifier
-
-inline fun <reified T : Any> Module.single(
-    qualifier: String,
-    createdAtStart: Boolean = false,
-    noinline definition: Definition<T>
-) = single(StringQualifier(qualifier), createdAtStart, definition)
-

koin/src/jvmMain/kotlin/FactoryWithBinds.kt

@@ -1,27 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.instance.InstanceFactory
-import org.koin.core.module.Module
-import org.koin.core.qualifier.Qualifier
-import org.koin.dsl.binds
-import kotlin.reflect.KClass
-import kotlin.reflect.full.allSuperclasses
-
-
-inline fun <reified T : Any> Module.factoryWithBinds(
-    qualifier: Qualifier? = null,
-    bindFilter: (KClass<*>) -> Boolean = { true },
-    noinline definition: Definition<T>
-): Pair<Module, InstanceFactory<*>> {
-    return factory(qualifier, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray())
-}
-
-inline fun <reified T : Any> Module.factoryWithBinds(
-    qualifier: String,
-    bindFilter: (KClass<*>) -> Boolean = { true },
-    noinline definition: Definition<T>
-): Pair<Module, InstanceFactory<*>> {
-    return factory(qualifier, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray())
-}
-

koin/src/jvmMain/kotlin/FactoryWithBindsAndRandomQualifier.kt

@@ -1,13 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.instance.InstanceFactory
-import org.koin.core.module.Module
-import kotlin.reflect.KClass
-
-inline fun <reified T : Any> Module.factoryWithRandomQualifierAndBinds(
-    bindFilter: (KClass<*>) -> Boolean = { true },
-    noinline definition: Definition<T>
-): Pair<Module, InstanceFactory<*>> {
-    return factoryWithBinds(RandomQualifier(), bindFilter, definition)
-}

koin/src/jvmMain/kotlin/SignleWithBinds.kt

@@ -1,30 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.instance.InstanceFactory
-import org.koin.core.module.Module
-import org.koin.core.qualifier.Qualifier
-import org.koin.dsl.binds
-import kotlin.reflect.KClass
-import kotlin.reflect.full.allSuperclasses
-
-
-inline fun <reified T : Any> Module.singleWithBinds(
-    qualifier: Qualifier? = null,
-    createdAtStart: Boolean = false,
-    bindFilter: (KClass<*>) -> Boolean = { true },
-    noinline definition: Definition<T>
-): Pair<Module, InstanceFactory<*>> {
-    return single(qualifier, createdAtStart, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray())
-}
-
-
-inline fun <reified T : Any> Module.singleWithBinds(
-    qualifier: String,
-    createdAtStart: Boolean = false,
-    bindFilter: (KClass<*>) -> Boolean = { true },
-    noinline definition: Definition<T>
-): Pair<Module, InstanceFactory<*>> {
-    return single(qualifier, createdAtStart, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray())
-}
-

koin/src/jvmMain/kotlin/SingleWithBindsAndRandomQualifier.kt

@@ -1,14 +0,0 @@
-package dev.inmo.micro_utils.koin
-
-import org.koin.core.definition.Definition
-import org.koin.core.instance.InstanceFactory
-import org.koin.core.module.Module
-import kotlin.reflect.KClass
-
-inline fun <reified T : Any> Module.singleWithRandomQualifierAndBinds(
-    createdAtStart: Boolean = false,
-    bindFilter: (KClass<*>) -> Boolean = { true },
-    noinline definition: Definition<T>
-): Pair<Module, InstanceFactory<*>> {
-    return singleWithBinds(RandomQualifier(), createdAtStart, bindFilter, definition)
-}

koin/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.micro_utils.koin"/>

ktor/client/build.gradle

@@ -12,12 +12,8 @@ kotlin {
             dependencies {
                 api internalProject("micro_utils.ktor.common")
                 api internalProject("micro_utils.coroutines")
-                api libs.ktor.client
+                api "io.ktor:ktor-client-core:$ktor_version"
             }
         }
-
-        androidMain {
-            dependsOn jvmMain
-        }
     }
 }

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/BodyOrNull.kt

@@ -1,9 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import io.ktor.client.call.body
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.HttpStatusCode
-
-suspend inline fun <reified T : Any> HttpResponse.bodyOrNull() = takeIf {
-    status == HttpStatusCode.OK
-} ?.body<T>()

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/FlowsWebsockets.kt

@@ -0,0 +1,74 @@
+package dev.inmo.micro_utils.ktor.client
+
+import dev.inmo.micro_utils.coroutines.safely
+import dev.inmo.micro_utils.ktor.common.*
+import io.ktor.client.HttpClient
+import io.ktor.client.features.websocket.ws
+import io.ktor.http.cio.websocket.Frame
+import io.ktor.http.cio.websocket.readBytes
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.serialization.DeserializationStrategy
+
+/**
+ * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
+ * connection. Must return true in case if must be reconnected. By default always reconnecting
+ */
+inline fun <T> HttpClient.createStandardWebsocketFlow(
+    url: String,
+    crossinline checkReconnection: (Throwable?) -> Boolean = { true },
+    crossinline conversation: suspend (StandardKtorSerialInputData) -> T
+): Flow<T> {
+    val correctedUrl = url.asCorrectWebSocketUrl
+
+    return channelFlow {
+        val producerScope = this@channelFlow
+        do {
+            val reconnect = try {
+                safely {
+                    ws(correctedUrl) {
+                        for (received in incoming) {
+                            when (received) {
+                                is Frame.Binary -> producerScope.send(conversation(received.readBytes()))
+                                else -> {
+                                    producerScope.close()
+                                    return@ws
+                                }
+                            }
+                        }
+                    }
+                }
+                checkReconnection(null)
+            } catch (e: Throwable) {
+                checkReconnection(e).also {
+                    if (!it) {
+                        producerScope.close(e)
+                    }
+                }
+            }
+        } while (reconnect)
+        if (!producerScope.isClosedForSend) {
+            safely(
+                { it.printStackTrace() }
+            ) {
+                producerScope.close()
+            }
+        }
+    }
+}
+
+/**
+ * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
+ * connection. Must return true in case if must be reconnected. By default always reconnecting
+ */
+inline fun <T> HttpClient.createStandardWebsocketFlow(
+    url: String,
+    crossinline checkReconnection: (Throwable?) -> Boolean = { true },
+    deserializer: DeserializationStrategy<T>,
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) = createStandardWebsocketFlow(
+    url,
+    checkReconnection
+) {
+    serialFormat.decodeDefault(deserializer, it)
+}

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/HttpStatusCodeAsThrowable.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import io.ktor.client.plugins.ClientRequestException
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.isSuccess
-
-inline fun HttpResponse.throwOnUnsuccess(
-    unsuccessMessage: () -> String
-) {
-    if (status.isSuccess()) {
-        return
-    }
-
-    throw ClientRequestException(this, unsuccessMessage())
-}

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/NewFlowsWebsockets.kt

@@ -1,103 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.common.Warning
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
-import dev.inmo.micro_utils.coroutines.safely
-import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.pluginOrNull
-import io.ktor.client.plugins.websocket.*
-import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.http.URLProtocol
-import kotlinx.coroutines.channels.SendChannel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.isActive
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-@Warning("This feature is internal and should not be used directly. It is can be changed without any notification and warranty on compile-time or other guaranties")
-inline fun <reified T : Any> openBaseWebSocketFlow(
-    noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
-    noinline webSocketSessionRequest: suspend SendChannel<T>.() -> Unit
-): Flow<T> {
-    return channelFlow {
-        do {
-            val reconnect = runCatchingSafely {
-                webSocketSessionRequest()
-                checkReconnection(null)
-            }.getOrElse { e ->
-                checkReconnection(e).also {
-                    if (!it) {
-                        close(e)
-                    }
-                }
-            }
-        } while (reconnect && isActive)
-
-        if (isActive) {
-            safely {
-                close()
-            }
-        }
-    }
-}
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <reified T : Any> HttpClient.openWebSocketFlow(
-    url: String,
-    useSecureConnection: Boolean,
-    noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
-    noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}
-): Flow<T> {
-    pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow")
-
-    return openBaseWebSocketFlow<T>(checkReconnection) {
-        val block: suspend DefaultClientWebSocketSession.() -> Unit = {
-            while (isActive) {
-                send(receiveDeserialized<T>())
-            }
-        }
-
-        if (useSecureConnection) {
-            wss(url, requestBuilder, block)
-        } else {
-            ws(url, requestBuilder, block)
-        }
-    }
-}
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <reified T : Any> HttpClient.openWebSocketFlow(
-    url: String,
-    noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
-    noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}
-): Flow<T> = openWebSocketFlow(url, false, checkReconnection, requestBuilder)
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <reified T : Any> HttpClient.openSecureWebSocketFlow(
-    url: String,
-    noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
-    noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}
-): Flow<T> = openWebSocketFlow(url, true, checkReconnection, requestBuilder)
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <reified T : Any> HttpClient.createStandardWebsocketFlow(
-    url: String,
-    noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
-    noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}
-): Flow<T> = openWebSocketFlow(url, checkReconnection, requestBuilder)

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/OnUploadCallback.kt

@@ -1,3 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-typealias OnUploadCallback = suspend (uploaded: Long, count: Long) -> Unit

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt

@@ -0,0 +1,244 @@
+package dev.inmo.micro_utils.ktor.client
+
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.filename
+import dev.inmo.micro_utils.ktor.common.*
+import io.ktor.client.HttpClient
+import io.ktor.client.request.*
+import io.ktor.client.request.forms.*
+import io.ktor.http.*
+import io.ktor.utils.io.core.ByteReadPacket
+import kotlinx.serialization.*
+
+typealias BodyPair<T> = Pair<SerializationStrategy<T>, T>
+
+class UnifiedRequester(
+    val client: HttpClient = HttpClient(),
+    val serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) {
+    suspend fun <ResultType> uniget(
+        url: String,
+        resultDeserializer: DeserializationStrategy<ResultType>
+    ): ResultType = client.uniget(url, resultDeserializer, serialFormat)
+
+    fun <T> encodeUrlQueryValue(
+        serializationStrategy: SerializationStrategy<T>,
+        value: T
+    ) = serializationStrategy.encodeUrlQueryValue(
+        value,
+        serialFormat
+    )
+
+    suspend fun <BodyType, ResultType> unipost(
+        url: String,
+        bodyInfo: BodyPair<BodyType>,
+        resultDeserializer: DeserializationStrategy<ResultType>
+    ) = client.unipost(url, bodyInfo, resultDeserializer, serialFormat)
+
+    suspend fun <ResultType> unimultipart(
+        url: String,
+        filename: String,
+        inputProvider: InputProvider,
+        resultDeserializer: DeserializationStrategy<ResultType>,
+        mimetype: String = "*/*",
+        additionalParametersBuilder: FormBuilder.() -> Unit = {},
+        dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+        requestBuilder: HttpRequestBuilder.() -> Unit = {},
+    ): ResultType = client.unimultipart(url, filename, inputProvider, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat)
+
+    suspend fun <BodyType, ResultType> unimultipart(
+        url: String,
+        filename: String,
+        inputProvider: InputProvider,
+        otherData: BodyPair<BodyType>,
+        resultDeserializer: DeserializationStrategy<ResultType>,
+        mimetype: String = "*/*",
+        additionalParametersBuilder: FormBuilder.() -> Unit = {},
+        dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+        requestBuilder: HttpRequestBuilder.() -> Unit = {},
+    ): ResultType = client.unimultipart(url, filename, otherData, inputProvider, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat)
+
+    suspend fun <ResultType> unimultipart(
+        url: String,
+        mppFile: MPPFile,
+        resultDeserializer: DeserializationStrategy<ResultType>,
+        mimetype: String = "*/*",
+        additionalParametersBuilder: FormBuilder.() -> Unit = {},
+        dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+        requestBuilder: HttpRequestBuilder.() -> Unit = {}
+    ): ResultType = client.unimultipart(
+        url, mppFile, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat
+    )
+
+    suspend fun <BodyType, ResultType> unimultipart(
+        url: String,
+        mppFile: MPPFile,
+        otherData: BodyPair<BodyType>,
+        resultDeserializer: DeserializationStrategy<ResultType>,
+        mimetype: String = "*/*",
+        additionalParametersBuilder: FormBuilder.() -> Unit = {},
+        dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+        requestBuilder: HttpRequestBuilder.() -> Unit = {}
+    ): ResultType = client.unimultipart(
+        url, mppFile, otherData, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat
+    )
+
+    fun <T> createStandardWebsocketFlow(
+        url: String,
+        checkReconnection: (Throwable?) -> Boolean = { true },
+        deserializer: DeserializationStrategy<T>
+    ) = client.createStandardWebsocketFlow(url, checkReconnection, deserializer, serialFormat)
+}
+
+val defaultRequester = UnifiedRequester()
+
+suspend fun <ResultType> HttpClient.uniget(
+    url: String,
+    resultDeserializer: DeserializationStrategy<ResultType>,
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) = get<StandardKtorSerialInputData>(
+    url
+).let {
+    serialFormat.decodeDefault(resultDeserializer, it)
+}
+
+
+fun <T> SerializationStrategy<T>.encodeUrlQueryValue(
+    value: T,
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) = serialFormat.encodeHex(
+    this,
+    value
+)
+
+suspend fun <BodyType, ResultType> HttpClient.unipost(
+    url: String,
+    bodyInfo: BodyPair<BodyType>,
+    resultDeserializer: DeserializationStrategy<ResultType>,
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) = post<StandardKtorSerialInputData>(url) {
+    body = serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
+}.let {
+    serialFormat.decodeDefault(resultDeserializer, it)
+}
+
+suspend fun <ResultType> HttpClient.unimultipart(
+    url: String,
+    filename: String,
+    inputProvider: InputProvider,
+    resultDeserializer: DeserializationStrategy<ResultType>,
+    mimetype: String = "*/*",
+    additionalParametersBuilder: FormBuilder.() -> Unit = {},
+    dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+    requestBuilder: HttpRequestBuilder.() -> Unit = {},
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+): ResultType = submitFormWithBinaryData<StandardKtorSerialInputData>(
+    url,
+    formData = formData {
+        append(
+            "bytes",
+            inputProvider,
+            Headers.build {
+                append(HttpHeaders.ContentType, mimetype)
+                append(HttpHeaders.ContentDisposition, "filename=\"$filename\"")
+                dataHeadersBuilder()
+            }
+        )
+        additionalParametersBuilder()
+    }
+) {
+    requestBuilder()
+}.let { serialFormat.decodeDefault(resultDeserializer, it) }
+
+suspend fun <BodyType, ResultType> HttpClient.unimultipart(
+    url: String,
+    filename: String,
+    otherData: BodyPair<BodyType>,
+    inputProvider: InputProvider,
+    resultDeserializer: DeserializationStrategy<ResultType>,
+    mimetype: String = "*/*",
+    additionalParametersBuilder: FormBuilder.() -> Unit = {},
+    dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+    requestBuilder: HttpRequestBuilder.() -> Unit = {},
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+): ResultType = unimultipart(
+    url,
+    filename,
+    inputProvider,
+    resultDeserializer,
+    mimetype,
+    additionalParametersBuilder = {
+        val serialized = serialFormat.encodeDefault(otherData.first, otherData.second)
+        append(
+            "data",
+            InputProvider(serialized.size.toLong()) {
+                ByteReadPacket(serialized)
+            },
+            Headers.build {
+                append(HttpHeaders.ContentType, ContentType.Application.Cbor.contentType)
+                append(HttpHeaders.ContentDisposition, "filename=data.bytes")
+                dataHeadersBuilder()
+            }
+        )
+        additionalParametersBuilder()
+    },
+    dataHeadersBuilder,
+    requestBuilder,
+    serialFormat
+)
+
+suspend fun <ResultType> HttpClient.unimultipart(
+    url: String,
+    mppFile: MPPFile,
+    resultDeserializer: DeserializationStrategy<ResultType>,
+    mimetype: String = "*/*",
+    additionalParametersBuilder: FormBuilder.() -> Unit = {},
+    dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+    requestBuilder: HttpRequestBuilder.() -> Unit = {},
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+): ResultType = unimultipart(
+    url,
+    mppFile.filename.string,
+    mppFile.inputProvider(),
+    resultDeserializer,
+    mimetype,
+    additionalParametersBuilder,
+    dataHeadersBuilder,
+    requestBuilder,
+    serialFormat
+)
+
+suspend fun <BodyType, ResultType> HttpClient.unimultipart(
+    url: String,
+    mppFile: MPPFile,
+    otherData: BodyPair<BodyType>,
+    resultDeserializer: DeserializationStrategy<ResultType>,
+    mimetype: String = "*/*",
+    additionalParametersBuilder: FormBuilder.() -> Unit = {},
+    dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
+    requestBuilder: HttpRequestBuilder.() -> Unit = {},
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+): ResultType = unimultipart(
+    url,
+    mppFile,
+    resultDeserializer,
+    mimetype,
+    additionalParametersBuilder = {
+        val serialized = serialFormat.encodeDefault(otherData.first, otherData.second)
+        append(
+            "data",
+            InputProvider(serialized.size.toLong()) {
+                ByteReadPacket(serialized)
+            },
+            Headers.build {
+                append(HttpHeaders.ContentType, ContentType.Application.Cbor.contentType)
+                append(HttpHeaders.ContentDisposition, "filename=data.bytes")
+                dataHeadersBuilder()
+            }
+        )
+        additionalParametersBuilder()
+    },
+    dataHeadersBuilder,
+    requestBuilder,
+    serialFormat
+)

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/TemporalUpload.kt

@@ -1,11 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.client.HttpClient
-
-expect suspend fun HttpClient.tempUpload(
-    fullTempUploadDraftPath: String,
-    file: MPPFile,
-    onUpload: OnUploadCallback = { _, _ -> }
-): TemporalFileId

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/UniUpload.kt

@@ -1,105 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.common.FileName
-import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.ktor.common.LambdaInputProvider
-import io.ktor.client.HttpClient
-import io.ktor.http.Headers
-import io.ktor.utils.io.core.Input
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.StringFormat
-import kotlinx.serialization.json.Json
-
-data class UniUploadFileInfo(
-    val fileName: FileName,
-    val mimeType: String,
-    val inputAllocator: LambdaInputProvider
-)
-
-/**
- * Will execute submitting of multipart data request
- *
- * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass
- * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value
- * in case you wish to pass other source of multipart binary data than regular file
- *
- * @see dev.inmo.micro_utils.ktor.server.handleUniUpload
- */
-expect suspend fun <T> HttpClient.uniUpload(
-    url: String,
-    data: Map<String, Any>,
-    resultDeserializer: DeserializationStrategy<T>,
-    headers: Headers = Headers.Empty,
-    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
-): T?
-
-/**
- * Additional variant of [uniUpload] which will unify sending of some [MPPFile] with the server
- *
- * @see dev.inmo.micro_utils.ktor.server.uniloadMultipartFile
- */
-suspend fun <T> HttpClient.uniUpload(
-    url: String,
-    file: MPPFile,
-    resultDeserializer: DeserializationStrategy<T>,
-    additionalData: Map<String, Any> = emptyMap(),
-    headers: Headers = Headers.Empty,
-    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
-): T? = uniUpload(
-    url,
-    additionalData + ("bytes" to file),
-    resultDeserializer,
-    headers,
-    stringFormat,
-    onUpload
-)
-
-/**
- * Additional variant of [uniUpload] which will unify sending of some [UniUploadFileInfo] with the server
- *
- * @see dev.inmo.micro_utils.ktor.server.uniloadMultipartFile
- */
-suspend fun <T> HttpClient.uniUpload(
-    url: String,
-    info: UniUploadFileInfo,
-    resultDeserializer: DeserializationStrategy<T>,
-    additionalData: Map<String, Any> = emptyMap(),
-    headers: Headers = Headers.Empty,
-    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
-): T? = uniUpload(
-    url,
-    additionalData + ("bytes" to info),
-    resultDeserializer,
-    headers,
-    stringFormat,
-    onUpload
-)
-
-/**
- * Additional variant of [uniUpload] which will unify sending of some [UniUploadFileInfo] (built from [fileName],
- * [mimeType] and [inputAllocator]) with the server
- *
- * @see dev.inmo.micro_utils.ktor.server.uniloadMultipartFile
- */
-suspend fun <T> HttpClient.uniUpload(
-    url: String,
-    fileName: FileName,
-    mimeType: String,
-    inputAllocator: LambdaInputProvider,
-    resultDeserializer: DeserializationStrategy<T>,
-    additionalData: Map<String, Any> = emptyMap(),
-    headers: Headers = Headers.Empty,
-    stringFormat: StringFormat = Json,
-    onUpload: OnUploadCallback = { _, _ -> }
-): T? = uniUpload(
-    url,
-    UniUploadFileInfo(fileName, mimeType, inputAllocator),
-    resultDeserializer,
-    additionalData,
-    headers,
-    stringFormat,
-    onUpload
-)

ktor/client/src/jsMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualTemporalUpload.kt

@@ -1,64 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.micro_utils.ktor.common.TemporalFileId
-import io.ktor.client.HttpClient
-import kotlinx.coroutines.*
-import org.w3c.dom.mediasource.ENDED
-import org.w3c.dom.mediasource.ReadyState
-import org.w3c.xhr.*
-import org.w3c.xhr.XMLHttpRequest.Companion.DONE
-
-suspend fun tempUpload(
-    fullTempUploadDraftPath: String,
-    file: MPPFile,
-    onUpload: OnUploadCallback
-): TemporalFileId {
-    val formData = FormData()
-    val answer = CompletableDeferred<TemporalFileId>(currentCoroutineContext().job)
-    val subscope = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob())
-
-    formData.append(
-        "data",
-        file
-    )
-
-    val request = XMLHttpRequest()
-    request.responseType = XMLHttpRequestResponseType.TEXT
-    request.upload.onprogress = {
-        subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) }
-    }
-    request.onload = {
-        if (request.status == 200.toShort()) {
-            answer.complete(TemporalFileId(request.responseText))
-        } else {
-            answer.completeExceptionally(Exception("Something went wrong: $it"))
-        }
-    }
-    request.onerror = {
-        answer.completeExceptionally(Exception("Something went wrong: $it"))
-    }
-    request.open("POST", fullTempUploadDraftPath, true)
-    request.send(formData)
-
-    answer.invokeOnCompletion {
-        runCatching {
-            if (request.readyState != DONE) {
-                request.abort()
-            }
-        }
-    }
-
-    return answer.await().also {
-        subscope.cancel()
-    }
-}
-
-
-actual suspend fun HttpClient.tempUpload(
-    fullTempUploadDraftPath: String,
-    file: MPPFile,
-    onUpload: OnUploadCallback
-): TemporalFileId = dev.inmo.micro_utils.ktor.client.tempUpload(fullTempUploadDraftPath, file, onUpload)

ktor/client/src/jsMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt

@@ -1,96 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.common.Progress
-import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import io.ktor.client.HttpClient
-import io.ktor.http.Headers
-import io.ktor.utils.io.core.readBytes
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.job
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.StringFormat
-import kotlinx.serialization.encodeToString
-import org.khronos.webgl.Int8Array
-import org.w3c.files.Blob
-import org.w3c.xhr.FormData
-import org.w3c.xhr.TEXT
-import org.w3c.xhr.XMLHttpRequest
-import org.w3c.xhr.XMLHttpRequestResponseType
-
-/**
- * Will execute submitting of multipart data request
- *
- * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass
- * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value
- * in case you wish to pass other source of multipart binary data than regular file
- */
-actual suspend fun <T> HttpClient.uniUpload(
-    url: String,
-    data: Map<String, Any>,
-    resultDeserializer: DeserializationStrategy<T>,
-    headers: Headers,
-    stringFormat: StringFormat,
-    onUpload: OnUploadCallback
-): T? {
-    val formData = FormData()
-    val answer = CompletableDeferred<T?>(currentCoroutineContext().job)
-    val subscope = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob())
-
-    data.forEach { (k, v) ->
-        when (v) {
-            is MPPFile -> formData.append(
-                k,
-                v
-            )
-            is UniUploadFileInfo -> formData.append(
-                k,
-                Blob(arrayOf(Int8Array(v.inputAllocator().readBytes().toTypedArray()))),
-                v.fileName.name
-            )
-            else -> formData.append(
-                k,
-                stringFormat.encodeToString(v)
-            )
-        }
-    }
-
-    val request = XMLHttpRequest()
-    headers.forEach { s, strings ->
-        request.setRequestHeader(s, strings.joinToString())
-    }
-    request.responseType = XMLHttpRequestResponseType.TEXT
-    request.upload.onprogress = {
-        subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) }
-    }
-    request.onload = {
-        if (request.status == 200.toShort()) {
-            answer.complete(
-                stringFormat.decodeFromString(resultDeserializer, request.responseText)
-            )
-        } else {
-            answer.completeExceptionally(Exception("Something went wrong: $it"))
-        }
-    }
-    request.onerror = {
-        answer.completeExceptionally(Exception("Something went wrong: $it"))
-    }
-    request.open("POST", url, true)
-    request.send(formData)
-
-    answer.invokeOnCompletion {
-        runCatching {
-            if (request.readyState != XMLHttpRequest.DONE) {
-                request.abort()
-            }
-        }
-    }
-
-    return answer.await().also {
-        subscope.cancel()
-    }
-}

ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualMPPFileInputProvider.kt

@@ -4,8 +4,6 @@ import dev.inmo.micro_utils.common.MPPFile
 import io.ktor.client.request.forms.InputProvider
 import io.ktor.utils.io.streams.asInput
 
-fun MPPFile.inputProviderSync(): InputProvider = InputProvider(length()) {
+actual suspend fun MPPFile.inputProvider(): InputProvider = InputProvider(length()) {
     inputStream().asInput()
 }
-
-actual suspend fun MPPFile.inputProvider(): InputProvider = inputProviderSync()

ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualTemporalUpload.kt

@@ -1,40 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.common.MPPFile
-import dev.inmo.micro_utils.common.filename
-import dev.inmo.micro_utils.ktor.common.TemporalFileId
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.onUpload
-import io.ktor.client.request.forms.formData
-import io.ktor.client.request.forms.submitFormWithBinaryData
-import io.ktor.client.statement.bodyAsText
-import io.ktor.http.Headers
-import io.ktor.http.HttpHeaders
-import java.net.URLConnection
-
-internal val MPPFile.mimeType: String
-    get() = URLConnection.getFileNameMap().getContentTypeFor(filename.name) ?: "*/*"
-
-actual suspend fun HttpClient.tempUpload(
-    fullTempUploadDraftPath: String,
-    file: MPPFile,
-    onUpload: OnUploadCallback
-): TemporalFileId {
-    val inputProvider = file.inputProvider()
-    val fileId = submitFormWithBinaryData(
-        fullTempUploadDraftPath,
-        formData = formData {
-            append(
-                "data",
-                inputProvider,
-                Headers.build {
-                    append(HttpHeaders.ContentType, file.mimeType)
-                    append(HttpHeaders.ContentDisposition, "filename=\"${file.filename.string}\"")
-                }
-            )
-        }
-    ) {
-        onUpload(onUpload)
-    }.bodyAsText()
-    return TemporalFileId(fileId)
-}

ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt

@@ -1,101 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.common.Progress
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.mergeHeaders
-import io.ktor.client.plugins.onUpload
-import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.client.request.forms.InputProvider
-import io.ktor.client.request.forms.formData
-import io.ktor.client.request.forms.submitForm
-import io.ktor.client.request.forms.submitFormWithBinaryData
-import io.ktor.client.request.headers
-import io.ktor.client.statement.bodyAsText
-import io.ktor.http.Headers
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.Parameters
-import io.ktor.http.content.PartData
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.StringFormat
-import kotlinx.serialization.encodeToString
-import java.io.File
-
-/**
- * Will execute submitting of multipart data request
- *
- * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass
- * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value
- * in case you wish to pass other source of multipart binary data than regular file
- */
-actual suspend fun <T> HttpClient.uniUpload(
-    url: String,
-    data: Map<String, Any>,
-    resultDeserializer: DeserializationStrategy<T>,
-    headers: Headers,
-    stringFormat: StringFormat,
-    onUpload: OnUploadCallback
-): T? {
-    val withBinary = data.values.any { it is File || it is UniUploadFileInfo }
-
-    val formData = formData {
-        data.forEach { (k, v) ->
-            when (v) {
-                is File -> append(
-                    k,
-                    v.inputProviderSync(),
-                    Headers.build {
-                        append(HttpHeaders.ContentType, v.mimeType)
-                        append(HttpHeaders.ContentDisposition, "filename=\"${v.name}\"")
-                    }
-                )
-                is UniUploadFileInfo -> append(
-                    k,
-                    InputProvider(block = v.inputAllocator),
-                    Headers.build {
-                        append(HttpHeaders.ContentType, v.mimeType)
-                        append(HttpHeaders.ContentDisposition, "filename=\"${v.fileName.name}\"")
-                    }
-                )
-                else -> append(
-                    k,
-                    stringFormat.encodeToString(v)
-                )
-            }
-        }
-    }
-
-    val requestBuilder: HttpRequestBuilder.() -> Unit = {
-        headers {
-            appendAll(headers)
-        }
-        onUpload { bytesSentTotal, contentLength ->
-            onUpload(bytesSentTotal, contentLength)
-        }
-    }
-
-    val response = if (withBinary) {
-        submitFormWithBinaryData(
-            url,
-            formData,
-            block = requestBuilder
-        )
-    } else {
-        submitForm(
-            url,
-            Parameters.build {
-                formData.forEach {
-                    val formItem = (it as PartData.FormItem)
-                    append(it.name!!, it.value)
-                }
-            },
-            block = requestBuilder
-        )
-    }
-
-    return if (response.status == HttpStatusCode.OK) {
-        stringFormat.decodeFromString(resultDeserializer, response.bodyAsText())
-    } else {
-        null
-    }
-}

ktor/common/build.gradle

@@ -11,10 +11,8 @@ kotlin {
         commonMain {
             dependencies {
                 api internalProject("micro_utils.common")
-                api libs.kt.serialization.cbor
-                api libs.klock
-                api libs.uuid
-                api libs.ktor.io
+                api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_core_version"
+                api "com.soywiz.korlibs.klock:klock:$klockVersion"
             }
         }
     }

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/InputProvider.kt

@@ -1,5 +0,0 @@
-package dev.inmo.micro_utils.ktor.common
-
-import io.ktor.utils.io.core.Input
-
-typealias LambdaInputProvider = () -> Input

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/MPPFileInput.kt

@@ -1,6 +0,0 @@
-package dev.inmo.micro_utils.ktor.common
-
-import dev.inmo.micro_utils.common.MPPFile
-import io.ktor.utils.io.core.Input
-
-expect fun MPPFile.input(): Input

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/StandardSerializer.kt

@@ -1,5 +1,3 @@
-@file:Suppress("NOTHING_TO_INLINE")
-
 package dev.inmo.micro_utils.ktor.common
 
 import kotlinx.serialization.*

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/TemporalFiles.kt

@@ -1,10 +0,0 @@
-package dev.inmo.micro_utils.ktor.common
-
-import kotlin.jvm.JvmInline
-import kotlinx.serialization.Serializable
-
-const val DefaultTemporalFilesSubPath = "temp_upload"
-
-@Serializable
-@JvmInline
-value class TemporalFileId(val string: String)