mirror of
				https://github.com/InsanusMokrassar/MicroUtils.git
				synced 2025-10-30 19:50:31 +00:00 
			
		
		
		
	Compare commits
	
		
			56 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 041f35ed6c | |||
| 9c463d0338 | |||
| 5ec0a46089 | |||
| 979d0ee4ca | |||
| 448686b399 | |||
|  | 0ff149a3d3 | ||
| 50a90d6e96 | |||
| 5f93706d91 | |||
| 39415550f5 | |||
|  | 4586ad65b5 | ||
| 8c5678e26f | |||
| 5dff373d5f | |||
| e17868a085 | |||
| 97bb6d0936 | |||
|  | 54576d8dec | ||
| 282bb24c71 | |||
| b1a96b6ecb | |||
| 66dac2086c | |||
| e269d0d206 | |||
| 5d95c3eb9c | |||
| 26650e9b6c | |||
| 7339dd8354 | |||
| 8ae983971a | |||
| d46cc3b09c | |||
| dfd23f8d60 | |||
| 28eb1a11e6 | |||
| 04f82a03bf | |||
| aac545074b | |||
| 87a3a925ee | |||
| 5447bf9691 | |||
| 761070b9b7 | |||
| 4c9e435df8 | |||
| 4b7d65e8b4 | |||
| 0515b49b98 | |||
| edb97215ef | |||
| 5577a24548 | |||
| cfaa2a8927 | |||
| 78494b6036 | |||
| f9ea7eca61 | |||
| d69fee1732 | |||
| 178518db5e | |||
| 6fb20fb973 | |||
| 831bf44e34 | |||
| a4c6c367e3 | |||
| bc98e59709 | |||
| ef287bc331 | |||
| 3437f4c712 | |||
| 618f2dcd79 | |||
| 6df8ad3095 | |||
| eda6221288 | |||
| a9859f6a0d | |||
| 0db88bac25 | |||
| daa3d9c0dd | |||
| b343b33594 | |||
| 46e435a448 | |||
| 7fe62b4ffa | 
							
								
								
									
										48
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,53 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## 0.25.5 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Exposed`: `0.60.0` -> `0.61.0` | ||||||
|  |   * `Serialization`: `1.8.0` -> `1.8.1` | ||||||
|  |   * `Coroutines`: `1.10.1` -> `1.10.2` | ||||||
|  | * `Common`: | ||||||
|  |   * Small performance optimization of `MutableMap.applyDiff` | ||||||
|  |  | ||||||
|  | ## 0.25.4 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Ktor`: `3.1.1` -> `3.1.2` | ||||||
|  |   * `Koin`: `4.0.2` -> `4.0.4` | ||||||
|  | * `Coroutines`: | ||||||
|  |   * Add `SmartKeyRWLocker.withWriteLocks` extension with vararg keys | ||||||
|  | * `Transactions`: | ||||||
|  |   * Fix order of rollback actions calling | ||||||
|  |  | ||||||
|  | ## 0.25.3 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |   * Add extensions `SmartRWLocker.alsoWithUnlockingOnSuccessAsync` and `SmartRWLocker.alsoWithUnlockingOnSuccess` | ||||||
|  |   * Fix of `SmartRWLocker.lockWrite` issue when it could lock write mutex without unlocking | ||||||
|  |   * Add tool `SmartKeyRWLocker` | ||||||
|  |   * `SmartSemaphore` got new property `maxPermits` | ||||||
|  |   * New extension `SmartSemaphore.waitReleaseAll()` | ||||||
|  | * `Transactions`: | ||||||
|  |   * Add `TransactionsDSL` | ||||||
|  |  | ||||||
|  | ## 0.25.2 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |   * `Exposed`: `0.59.0` -> `0.60.0` | ||||||
|  | * `Repo`: | ||||||
|  |   * `Cache`: | ||||||
|  |     * Add extensions `alsoInvalidate`, `alsoInvalidateAsync`, `alsoInvalidateSync` and `alsoInvalidateSyncLogging` | ||||||
|  | * `Koin`: | ||||||
|  |   * Add extensions `singleSuspend` and `factorySuspend` for defining of dependencies with suspendable blocks | ||||||
|  |  | ||||||
|  | ## 0.25.1 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |   * Add `SortedMapLikeBinaryTreeNode` | ||||||
|  | * `Pagination`: | ||||||
|  |   * `Compose`: | ||||||
|  |     * One more rework of `InfinityPagedComponent` and `PagedComponent` | ||||||
|  |  | ||||||
| ## 0.25.0 | ## 0.25.0 | ||||||
|  |  | ||||||
| * `Repos`: | * `Repos`: | ||||||
|   | |||||||
							
								
								
									
										48
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								README.md
									
									
									
									
									
								
							| @@ -35,3 +35,51 @@ Most of complex modules are built with next hierarchy: | |||||||
|     * `common` part contains routes which are common for clients and servers |     * `common` part contains routes which are common for clients and servers | ||||||
|     * `client` submodule contains clients which are usually using `UnifiedRequester` to make requests using routes from `ktor/common` module and some internal logic of requests |     * `client` submodule contains clients which are usually using `UnifiedRequester` to make requests using routes from `ktor/common` module and some internal logic of requests | ||||||
|     * `server` submodule (in most cases `JVM`-only) contains some extensions for `Route` instances which usually will give opportunity to proxy internet requests from `ktor/client` realization to some proxy object |     * `server` submodule (in most cases `JVM`-only) contains some extensions for `Route` instances which usually will give opportunity to proxy internet requests from `ktor/client` realization to some proxy object | ||||||
|  |  | ||||||
|  | ## Gradle Templates | ||||||
|  |  | ||||||
|  | All templates can be used by applying them in your project's build.gradle files using the `apply from` directive. For example: | ||||||
|  |  | ||||||
|  | ```gradle | ||||||
|  | apply from: "$defaultProject" | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | In the sample has been used `defaultProject.gradle` as a basic template. | ||||||
|  |  | ||||||
|  | The project includes a collection of Gradle templates to simplify project setup and configuration. These templates are located in the `gradle/templates` directory and can be used to quickly set up different types of projects: | ||||||
|  |  | ||||||
|  | ### Project Setup Templates | ||||||
|  |  | ||||||
|  | * `defaultProject.gradle` (usage `apply from: "$defaultProject"`) - Basic project configuration | ||||||
|  | * `defaultProjectWithSerialization.gradle` (usage `apply from: "$defaultProjectWithSerialization"`) - Project configuration with Kotlin Serialization support | ||||||
|  | * `mppJavaProject.gradle` (usage `apply from: "$mppJavaProject"`) - Multiplatform project with Java support | ||||||
|  | * `mppAndroidProject.gradle` (usage `apply from: "$mppAndroidProject"`) - Multiplatform project with Android support | ||||||
|  |  | ||||||
|  | ### Multiplatform Configuration Templates | ||||||
|  |  | ||||||
|  | * `enableMPPAndroid.gradle` (usage `apply from: "$enableMPPAndroid"`) - Enable Android target in multiplatform project | ||||||
|  | * `enableMPPJs.gradle` (usage `apply from: "$enableMPPJs"`) - Enable JavaScript target in multiplatform project | ||||||
|  | * `enableMPPJvm.gradle` (usage `apply from: "$enableMPPJvm"`) - Enable JVM target in multiplatform project | ||||||
|  | * `enableMPPNativeArm64.gradle` (usage `apply from: "$enableMPPNativeArm64"`) - Enable ARM64 native target | ||||||
|  | * `enableMPPNativeX64.gradle` (usage `apply from: "$enableMPPNativeX64"`) - Enable x64 native target | ||||||
|  | * `enableMPPWasmJs.gradle` (usage `apply from: "$enableMPPWasmJs"`) - Enable WebAssembly JavaScript target | ||||||
|  |  | ||||||
|  | ### Compose Integration Templates | ||||||
|  |  | ||||||
|  | * `addCompose.gradle` (usage `apply from: "$addCompose"`) - Basic Compose configuration | ||||||
|  | * `addComposeForAndroid.gradle` (usage `apply from: "$addComposeForAndroid"`) - Compose configuration for Android | ||||||
|  | * `addComposeForDesktop.gradle` (usage `apply from: "$addComposeForDesktop"`) - Compose configuration for Desktop | ||||||
|  | * `addComposeForJs.gradle` (usage `apply from: "$addComposeForJs"`) - Compose configuration for JavaScript | ||||||
|  |  | ||||||
|  | ### Publishing Templates | ||||||
|  |  | ||||||
|  | * `publish.gradle` (usage `apply from: "$publish"`) - General publishing configuration | ||||||
|  | * `publish_jvm.gradle` (usage `apply from: "$publish_jvm"`) - JVM-specific publishing configuration | ||||||
|  | * `publish.kpsb` and `publish_jvm.kpsb` (usage `apply from: "$publish_kpsb"` and `apply from: "$publish_jvm_kpsb"`) - Publishing configuration for Kotlin Multiplatform and JVM | ||||||
|  |  | ||||||
|  | ### Combined Project Templates | ||||||
|  |  | ||||||
|  | * `mppJvmJsWasmJsLinuxMingwProject.gradle` (usage `apply from: "$mppJvmJsWasmJsLinuxMingwProject"`) - Multiplatform project for JVM, JS, Wasm, Linux, and MinGW | ||||||
|  | * `mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle` (usage `apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"`) - Multiplatform project with additional Android and ARM64 support | ||||||
|  | * `mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle` (usage `apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"`) - Multiplatform project with Compose support | ||||||
|  | * `mppProjectWithSerializationAndCompose.gradle` (usage `apply from: "$mppProjectWithSerializationAndCompose"`) - Multiplatform project with both Serialization and Compose support | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import kotlin.math.floor | |||||||
|  * |  * | ||||||
|  * Anyway it is recommended to use |  * Anyway it is recommended to use | ||||||
|  * |  * | ||||||
|  * @param hexaUInt rgba [UInt] in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha |  * @param hexaUInt rgba [UInt] in format `0xRRGGBBAA` where RR - red, GG - green, BB - blue` and AA - alpha | ||||||
|  */ |  */ | ||||||
| @Serializable | @Serializable | ||||||
| @JvmInline | @JvmInline | ||||||
| @@ -21,18 +21,18 @@ value class HEXAColor ( | |||||||
|     val hexaUInt: UInt |     val hexaUInt: UInt | ||||||
| ) : Comparable<HEXAColor> { | ) : Comparable<HEXAColor> { | ||||||
|     /** |     /** | ||||||
|      * @returns [hexaUInt] as a string with format `#FFEEBBAA` where FF - red, EE - green, BB - blue and AA - alpha |      * @returns [hexaUInt] as a string with format `#RRGGBBAA` where RR - red, GG - green, BB - blue and AA - alpha | ||||||
|      */ |      */ | ||||||
|     val hexa: String |     val hexa: String | ||||||
|         get() = "#${hexaUInt.toString(16).padStart(8, '0')}" |         get() = "#${hexaUInt.toString(16).padStart(8, '0')}" | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @returns [hexaUInt] as a string with format `#FFEEBB` where FF - red, EE - green and BB - blue |      * @returns [hexaUInt] as a string with format `#RRGGBB` where RR - red, GG - green and BB - blue | ||||||
|      */ |      */ | ||||||
|     val hex: String |     val hex: String | ||||||
|         get() = hexa.take(7) |         get() = hexa.take(7) | ||||||
|     /** |     /** | ||||||
|      * @returns [hexaUInt] as a string with format `#AAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue |      * @returns [hexaUInt] as a string with format `#AARRGGBB` where AA - alpha, RR - red, GG - green and BB - blue | ||||||
|      */ |      */ | ||||||
|     val ahex: String |     val ahex: String | ||||||
|         get() = "#${a.toString(16).padStart(2, '2')}${hex.drop(1)}" |         get() = "#${a.toString(16).padStart(2, '2')}${hex.drop(1)}" | ||||||
| @@ -140,12 +140,12 @@ value class HEXAColor ( | |||||||
|         }.lowercase().toUInt(16).let(::HEXAColor) |         }.lowercase().toUInt(16).let(::HEXAColor) | ||||||
|  |  | ||||||
|         /** |         /** | ||||||
|          * Creates [HEXAColor] from [uint] presume it is in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha |          * Creates [HEXAColor] from [uint] presume it is in format `0xRRGGBBAA` where RR - red, GG - green, BB - blue` and AA - alpha | ||||||
|          */ |          */ | ||||||
|         fun fromHexa(uint: UInt) = HEXAColor(uint) |         fun fromHexa(uint: UInt) = HEXAColor(uint) | ||||||
|  |  | ||||||
|         /** |         /** | ||||||
|          * Creates [HEXAColor] from [uint] presume it is in format `0xAAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue` |          * Creates [HEXAColor] from [uint] presume it is in format `0xAARRGGBB` where AA - alpha, RR - red, GG - green and BB - blue` | ||||||
|          */ |          */ | ||||||
|         fun fromAhex(uint: UInt) = HEXAColor( |         fun fromAhex(uint: UInt) = HEXAColor( | ||||||
|             a = ((uint and 0xff000000u) / 0x1000000u).toInt(), |             a = ((uint and 0xff000000u) / 0x1000000u).toInt(), | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -29,5 +29,12 @@ kotlin { | |||||||
|                 api libs.okio |                 api libs.okio | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         wasmJsMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.kotlinx.browser | ||||||
|  |                 api libs.kt.coroutines | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ plugins { | |||||||
|     alias(libs.plugins.kt.jb.compose) |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -82,13 +82,11 @@ fun <K, V> MutableMap<K, V>.applyDiff( | |||||||
|     mapDiff: MapDiff<K, V> |     mapDiff: MapDiff<K, V> | ||||||
| ) { | ) { | ||||||
|     mapDiff.apply { |     mapDiff.apply { | ||||||
|         removed.keys.forEach { remove(it) } |         keys.removeAll(removed.keys) | ||||||
|         changed.forEach { (k, oldNew) -> |         changed.forEach { (k, oldNew) -> | ||||||
|             put(k, oldNew.second) |             put(k, oldNew.second) | ||||||
|         } |         } | ||||||
|         added.forEach { (k, new) -> |         putAll(added) | ||||||
|             put(k, new) |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -0,0 +1,15 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import org.khronos.webgl.* | ||||||
|  |  | ||||||
|  | fun DataView.toByteArray() = ByteArray(this.byteLength) { | ||||||
|  |     getInt8(it) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun ArrayBuffer.toByteArray() = Int8Array(this).toByteArray() | ||||||
|  |  | ||||||
|  | fun ByteArray.toDataView() = DataView(ArrayBuffer(size)).also { | ||||||
|  |     forEachIndexed { i, byte -> it.setInt8(i, byte) } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun ByteArray.toArrayBuffer() = toDataView().buffer | ||||||
| @@ -0,0 +1,13 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  |  | ||||||
|  | fun copyToClipboard(text: String): Boolean { | ||||||
|  |     return runCatching { | ||||||
|  |         window.navigator.clipboard.writeText( | ||||||
|  |             text | ||||||
|  |         ) | ||||||
|  |     }.onFailure { | ||||||
|  |         it.printStackTrace() | ||||||
|  |     }.isSuccess | ||||||
|  | } | ||||||
| @@ -0,0 +1,31 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  | import kotlinx.coroutines.await | ||||||
|  | import org.w3c.fetch.Response | ||||||
|  | import org.w3c.files.Blob | ||||||
|  | import org.w3c.files.BlobPropertyBag | ||||||
|  |  | ||||||
|  | external class ClipboardItem(data: JsAny?) : JsAny | ||||||
|  |  | ||||||
|  | fun createBlobData(blob: Blob): JsAny = js("""({[blob.type]: blob})""") | ||||||
|  |  | ||||||
|  | inline fun Blob.convertToClipboardItem(): ClipboardItem { | ||||||
|  |     return ClipboardItem(createBlobData(this)) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun copyImageURLToClipboard(imageUrl: String): Boolean { | ||||||
|  |     return runCatching { | ||||||
|  |         val response = window.fetch(imageUrl).await<Response>() | ||||||
|  |         val blob = response.blob().await<Blob>() | ||||||
|  |         val data = arrayOf( | ||||||
|  |             Blob( | ||||||
|  |                 arrayOf(blob).toJsArray().unsafeCast(), | ||||||
|  |                 BlobPropertyBag("image/png") | ||||||
|  |             ).convertToClipboardItem() | ||||||
|  |         ).toJsArray() | ||||||
|  |         window.navigator.clipboard.write(data.unsafeCast()) | ||||||
|  |     }.onFailure { | ||||||
|  |         it.printStackTrace() | ||||||
|  |     }.isSuccess | ||||||
|  | } | ||||||
| @@ -0,0 +1,63 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.document | ||||||
|  | import org.w3c.dom.* | ||||||
|  |  | ||||||
|  | private fun createMutationObserverInit(childList: Boolean, subtree: Boolean): JsAny = js("({childList, subtree})") | ||||||
|  |  | ||||||
|  | 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, createMutationObserverInit(childList = true, subtree = true).unsafeCast()) | ||||||
|  |     return observer | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Element.onVisibilityChanged(block: IntersectionObserverEntry.(Float, IntersectionObserver) -> Unit): IntersectionObserver { | ||||||
|  |     var previousIntersectionRatio = -1f | ||||||
|  |     val observer = IntersectionObserver { entries, observer -> | ||||||
|  |         entries.toArray().forEach { | ||||||
|  |             if (previousIntersectionRatio.toDouble() != it.intersectionRatio.toDouble()) { | ||||||
|  |                 previousIntersectionRatio = it.intersectionRatio.toDouble().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 | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,43 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  | import org.w3c.dom.DOMRect | ||||||
|  | import org.w3c.dom.Element | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByLeftEdge: Boolean | ||||||
|  |     get() = left >= 0 && left <= window.innerWidth | ||||||
|  | inline val Element.isOnScreenByLeftEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByLeftEdge | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByRightEdge: Boolean | ||||||
|  |     get() = right >= 0 && right <= window.innerWidth | ||||||
|  | inline val Element.isOnScreenByRightEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByRightEdge | ||||||
|  |  | ||||||
|  | internal val DOMRect.isOnScreenHorizontally: Boolean | ||||||
|  |     get() = isOnScreenByLeftEdge || isOnScreenByRightEdge | ||||||
|  |  | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByTopEdge: Boolean | ||||||
|  |     get() = top >= 0 && top <= window.innerHeight | ||||||
|  | inline val Element.isOnScreenByTopEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByTopEdge | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenByBottomEdge: Boolean | ||||||
|  |     get() = bottom >= 0 && bottom <= window.innerHeight | ||||||
|  | inline val Element.isOnScreenByBottomEdge | ||||||
|  |     get() = getBoundingClientRect().isOnScreenByBottomEdge | ||||||
|  |  | ||||||
|  | internal val DOMRect.isOnScreenVertically: Boolean | ||||||
|  |     get() = isOnScreenByLeftEdge || isOnScreenByRightEdge | ||||||
|  |  | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreenFully: Boolean | ||||||
|  |     get() = isOnScreenByLeftEdge && isOnScreenByTopEdge && isOnScreenByRightEdge && isOnScreenByBottomEdge | ||||||
|  | val Element.isOnScreenFully: Boolean | ||||||
|  |     get() = getBoundingClientRect().isOnScreenFully | ||||||
|  |  | ||||||
|  | val DOMRect.isOnScreen: Boolean | ||||||
|  |     get() = isOnScreenFully || (isOnScreenHorizontally && isOnScreenVertically) | ||||||
|  | inline val Element.isOnScreen: Boolean | ||||||
|  |     get() = getBoundingClientRect().isOnScreen | ||||||
| @@ -0,0 +1,127 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import org.w3c.dom.DOMRectReadOnly | ||||||
|  | import org.w3c.dom.Element | ||||||
|  |  | ||||||
|  | external interface IntersectionObserverOptions: JsAny { | ||||||
|  |     /** | ||||||
|  |      * 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: JsArray<JsNumber>? | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private fun createEmptyJsObject(): JsAny = js("{}") | ||||||
|  |  | ||||||
|  | fun IntersectionObserverOptions( | ||||||
|  |     block: IntersectionObserverOptions.() -> Unit = {} | ||||||
|  | ): IntersectionObserverOptions = createEmptyJsObject().unsafeCast<IntersectionObserverOptions>().apply(block) | ||||||
|  |  | ||||||
|  | external interface IntersectionObserverEntry: JsAny { | ||||||
|  |     /** | ||||||
|  |      * 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: JsNumber | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * 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: JsArray<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): JsAny { | ||||||
|  |     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: JsArray<JsNumber> | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * 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(): JsArray<IntersectionObserverEntry> | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Tells the IntersectionObserver to stop observing a particular target element. | ||||||
|  |      */ | ||||||
|  |     fun unobserve(targetElement: Element) | ||||||
|  | } | ||||||
| @@ -0,0 +1,12 @@ | |||||||
|  | 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 | ||||||
| @@ -0,0 +1,58 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.await | ||||||
|  | import org.khronos.webgl.ArrayBuffer | ||||||
|  | import org.w3c.dom.ErrorEvent | ||||||
|  | import org.w3c.files.* | ||||||
|  | import kotlin.js.Promise | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual typealias MPPFile = File | ||||||
|  |  | ||||||
|  | private fun createJsError(message: String): JsAny = js("Error(message)") | ||||||
|  |  | ||||||
|  | fun MPPFile.readBytesPromise() = Promise { success, failure -> | ||||||
|  |     val reader = FileReader() | ||||||
|  |     reader.onload = { | ||||||
|  |         success((reader.result as ArrayBuffer)) | ||||||
|  |     } | ||||||
|  |     reader.onerror = { | ||||||
|  |         val message = (it as ErrorEvent).message | ||||||
|  |         failure(createJsError(message)) | ||||||
|  |     } | ||||||
|  |     reader.readAsArrayBuffer(this) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun MPPFile.readBytes(): ByteArray { | ||||||
|  |     val reader = FileReaderSync() | ||||||
|  |     return reader.readAsArrayBuffer(this).toByteArray() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private suspend fun MPPFile.dirtyReadBytes(): ByteArray = readBytesPromise().await<ArrayBuffer>().toByteArray() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filename: FileName | ||||||
|  |     get() = FileName(name) | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filesize: Long | ||||||
|  |     get() = jsNumberToBigInt(size).toLong() | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | @Warning("That is not optimized version of bytes allocator. Use asyncBytesAllocator everywhere you can") | ||||||
|  | actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator | ||||||
|  |     get() = ::readBytes | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | @Warning("That is not optimized version of bytes allocator. Use asyncBytesAllocator everywhere you can") | ||||||
|  | actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator | ||||||
|  |     get() = ::dirtyReadBytes | ||||||
|  |  | ||||||
|  | private fun jsNumberToBigInt(number: JsNumber): JsBigInt = js("BigInt(number)") | ||||||
| @@ -0,0 +1,41 @@ | |||||||
|  | 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 | ||||||
|  |  | ||||||
|  | private fun createEventListener(listener: (Event) -> Unit): JsAny = js("({handleEvent: listener})") | ||||||
|  |  | ||||||
|  | fun Element.onActionOutside(type: String, options: AddEventListenerOptions? = null, callback: (Event) -> Unit): EventListener { | ||||||
|  |     lateinit var observer: MutationObserver | ||||||
|  |     val listener = createEventListener { it: Event -> | ||||||
|  |         val elementsToCheck = mutableListOf(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) | ||||||
|  |         } | ||||||
|  |     }.unsafeCast<EventListener>() | ||||||
|  |  | ||||||
|  |     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: AddEventListenerOptions? = null, callback: (Event) -> Unit) = onActionOutside("click", options, callback) | ||||||
| @@ -0,0 +1,8 @@ | |||||||
|  | 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() | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,56 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import org.w3c.dom.* | ||||||
|  |  | ||||||
|  | external class ResizeObserver( | ||||||
|  |     callback: (JsArray<ResizeObserverEntry>, ResizeObserver) -> Unit | ||||||
|  | ): JsAny { | ||||||
|  |     fun observe(target: Element, options: JsAny = definedExternally) | ||||||
|  |  | ||||||
|  |     fun unobserve(target: Element) | ||||||
|  |  | ||||||
|  |     fun disconnect() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private fun createObserveOptions(jsBox: JsString?): JsAny = js("({box: jsBox})") | ||||||
|  |  | ||||||
|  | external interface ResizeObserverSize: JsAny { | ||||||
|  |     val blockSize: Float | ||||||
|  |     val inlineSize: Float | ||||||
|  | } | ||||||
|  |  | ||||||
|  | external interface ResizeObserverEntry: JsAny { | ||||||
|  |     val borderBoxSize: JsArray<ResizeObserverSize> | ||||||
|  |     val contentBoxSize: JsArray<ResizeObserverSize> | ||||||
|  |     val devicePixelContentBoxSize: JsArray<ResizeObserverSize> | ||||||
|  |     val contentRect: DOMRectReadOnly | ||||||
|  |     val target: Element | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun ResizeObserver.observe(target: Element, options: ResizeObserverObserveOptions) = observe( | ||||||
|  |     target, | ||||||
|  |     createObserveOptions(options.box?.name?.toJsString()) | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | 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" | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,30 @@ | |||||||
|  | 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() | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,14 @@ | |||||||
|  | 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() | ||||||
|  | } | ||||||
|  |  | ||||||
| @@ -0,0 +1,48 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.browser.window | ||||||
|  | import org.w3c.dom.Element | ||||||
|  | import org.w3c.dom.css.CSSStyleDeclaration | ||||||
|  |  | ||||||
|  | sealed class Visibility | ||||||
|  | data object Visible : Visibility() | ||||||
|  | data object Invisible : Visibility() | ||||||
|  | data object Gone : Visibility() | ||||||
|  |  | ||||||
|  | var CSSStyleDeclaration.visibilityState: Visibility | ||||||
|  |     get() = when { | ||||||
|  |         display == "none" -> Gone | ||||||
|  |         visibility == "hidden" -> Invisible | ||||||
|  |         else -> Visible | ||||||
|  |     } | ||||||
|  |     set(value) { | ||||||
|  |         when (value) { | ||||||
|  |             Visible -> { | ||||||
|  |                 if (display == "none") { | ||||||
|  |                     display = "initial" | ||||||
|  |                 } | ||||||
|  |                 visibility = "visible" | ||||||
|  |             } | ||||||
|  |             Invisible -> { | ||||||
|  |                 if (display == "none") { | ||||||
|  |                     display = "initial" | ||||||
|  |                 } | ||||||
|  |                 visibility = "hidden" | ||||||
|  |             } | ||||||
|  |             Gone -> { | ||||||
|  |                 display = "none" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | inline var Element.visibilityState: Visibility | ||||||
|  |     get() = window.getComputedStyle(this).visibilityState | ||||||
|  |     set(value) { | ||||||
|  |         window.getComputedStyle(this).visibilityState = value | ||||||
|  |     } | ||||||
|  |  | ||||||
|  | inline val Element.isVisible: Boolean | ||||||
|  |     get() = visibilityState == Visible | ||||||
|  | inline val Element.isInvisible: Boolean | ||||||
|  |     get() = visibilityState == Invisible | ||||||
|  | inline val Element.isGone: Boolean | ||||||
|  |     get() = visibilityState == Gone | ||||||
| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float { | ||||||
|  |     return jsToFixed(toDouble().toJsNumber(), signs.coerceIn(FixedSignsRange)).toString().toFloat() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | actual fun Double.fixed(signs: Int): Double { | ||||||
|  |     return jsToFixed(toJsNumber(), signs.coerceIn(FixedSignsRange)).toString().toDouble() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private fun jsToFixed(number: JsNumber, signs: Int): JsString = js("number.toFixed(signs)") | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ plugins { | |||||||
|     alias(libs.plugins.kt.jb.compose) |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,6 +4,15 @@ import kotlinx.coroutines.* | |||||||
| import kotlinx.coroutines.channels.Channel | import kotlinx.coroutines.channels.Channel | ||||||
| import kotlinx.coroutines.flow.consumeAsFlow | import kotlinx.coroutines.flow.consumeAsFlow | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates an actor using coroutines that processes incoming messages of type [T]. | ||||||
|  |  * An actor is a computational entity that processes messages sequentially in response to messages it receives. | ||||||
|  |  * | ||||||
|  |  * @param T The type of messages this actor will process | ||||||
|  |  * @param channelCapacity The capacity of the [Channel] used for message delibery to the actor. Defaults to [Channel.UNLIMITED] | ||||||
|  |  * @param block The processing logic to be applied to each received message | ||||||
|  |  * @return A [Channel] that can be used to send messages to this actor or cancel it | ||||||
|  |  */ | ||||||
| fun <T> CoroutineScope.actor( | fun <T> CoroutineScope.actor( | ||||||
|     channelCapacity: Int = Channel.UNLIMITED, |     channelCapacity: Int = Channel.UNLIMITED, | ||||||
|     block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| @@ -13,6 +22,16 @@ fun <T> CoroutineScope.actor( | |||||||
|     return channel |     return channel | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates a safe actor that catches and handles exceptions during message processing. | ||||||
|  |  * This variant wraps the processing logic in a safety mechanism to prevent actor failure due to exceptions. | ||||||
|  |  * | ||||||
|  |  * @param T The type of messages this actor will process | ||||||
|  |  * @param channelCapacity The capacity of the [Channel] used for message processing. Defaults to [Channel.UNLIMITED] | ||||||
|  |  * @param onException Handler for exceptions that occur during message processing. Defaults to [defaultSafelyExceptionHandler] | ||||||
|  |  * @param block The processing logic to be applied to each received message | ||||||
|  |  * @return A [Channel] that can be used to send messages to this actor | ||||||
|  |  */ | ||||||
| inline fun <T> CoroutineScope.safeActor( | inline fun <T> CoroutineScope.safeActor( | ||||||
|     channelCapacity: Int = Channel.UNLIMITED, |     channelCapacity: Int = Channel.UNLIMITED, | ||||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, |     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||||
|   | |||||||
| @@ -71,7 +71,7 @@ fun <T, M> Flow<T>.subscribeAsync( | |||||||
|         it.invoke(markersMap) |         it.invoke(markersMap) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     val job = subscribeSafelyWithoutExceptions(subscope) { data -> |     val job = subscribeLoggingDropExceptions(subscope) { data -> | ||||||
|         val dataCommand = AsyncSubscriptionCommandData(data, subscope, markerFactory, block) { marker -> |         val dataCommand = AsyncSubscriptionCommandData(data, subscope, markerFactory, block) { marker -> | ||||||
|             actor.send( |             actor.send( | ||||||
|                 AsyncSubscriptionCommandClearReceiver(marker) |                 AsyncSubscriptionCommandClearReceiver(marker) | ||||||
|   | |||||||
| @@ -0,0 +1,226 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CancellationException | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  | import kotlin.contracts.ExperimentalContracts | ||||||
|  | import kotlin.contracts.InvocationKind | ||||||
|  | import kotlin.contracts.contract | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Combining [globalRWLocker] and internal map of [SmartRWLocker] associated by [T] to provide next logic: | ||||||
|  |  * | ||||||
|  |  * * Locker by key, for reading: waiting for [globalRWLocker] unlock write by acquiring read permit in it and then | ||||||
|  |  * taking or creating locker for key [T] and lock its reading too | ||||||
|  |  * * Locker by key, for writing: waiting for [globalRWLocker] unlock write by acquiring read permit in it and then | ||||||
|  |  * taking or creating locker for key [T] and lock its writing | ||||||
|  |  * * [globalRWLocker], for reading: using [SmartRWLocker.acquireRead], will be suspended until its | ||||||
|  |  * [SmartRWLocker.lockWrite] will not be unlocked | ||||||
|  |  * * [globalRWLocker], for writing: using [SmartRWLocker.lockWrite], will be paused by other reading and writing | ||||||
|  |  * operations and will pause other operations until the end of operation (calling of [unlockWrite]) | ||||||
|  |  * | ||||||
|  |  * You may see, that lockers by key still will use global locker permits - it is required to prevent [globalRWLocker] | ||||||
|  |  * write locking during all other operations are not done. In fact, all the keys works like a simple [SmartRWLocker] as | ||||||
|  |  * well, as [globalRWLocker], but they are linked with [globalRWLocker] [SmartRWLocker.acquireRead] permissions | ||||||
|  |  */ | ||||||
|  | class SmartKeyRWLocker<T>( | ||||||
|  |     globalLockerReadPermits: Int = Int.MAX_VALUE, | ||||||
|  |     globalLockerWriteIsLocked: Boolean = false, | ||||||
|  |     private val perKeyReadPermits: Int = Int.MAX_VALUE | ||||||
|  | ) { | ||||||
|  |     private val globalRWLocker: SmartRWLocker = SmartRWLocker( | ||||||
|  |         readPermits = globalLockerReadPermits, | ||||||
|  |         writeIsLocked = globalLockerWriteIsLocked | ||||||
|  |     ) | ||||||
|  |     private val lockers = mutableMapOf<T, SmartRWLocker>() | ||||||
|  |     private val lockersMutex = Mutex() | ||||||
|  |     private val lockersWritingLocker = SmartSemaphore.Mutable(Int.MAX_VALUE) | ||||||
|  |     private val globalWritingLocker = SmartSemaphore.Mutable(Int.MAX_VALUE) | ||||||
|  |  | ||||||
|  |     private fun allocateLockerWithoutLock(key: T) = lockers.getOrPut(key) { | ||||||
|  |         SmartRWLocker(perKeyReadPermits) | ||||||
|  |     } | ||||||
|  |     private suspend fun allocateLocker(key: T) = lockersMutex.withLock { | ||||||
|  |         lockers.getOrPut(key) { | ||||||
|  |             SmartRWLocker(perKeyReadPermits) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun writeMutex(key: T): SmartMutex.Immutable = globalRWLocker.withReadAcquire { | ||||||
|  |         allocateLockerWithoutLock(key).writeMutex | ||||||
|  |     } | ||||||
|  |     suspend fun readSemaphore(key: T): SmartSemaphore.Immutable = globalRWLocker.withReadAcquire { | ||||||
|  |         allocateLockerWithoutLock(key).readSemaphore | ||||||
|  |     } | ||||||
|  |     fun writeMutexOrNull(key: T): SmartMutex.Immutable? = lockers[key] ?.writeMutex | ||||||
|  |     fun readSemaphoreOrNull(key: T): SmartSemaphore.Immutable? = lockers[key] ?.readSemaphore | ||||||
|  |  | ||||||
|  |     fun writeMutex(): SmartMutex.Immutable = globalRWLocker.writeMutex | ||||||
|  |     fun readSemaphore(): SmartSemaphore.Immutable = globalRWLocker.readSemaphore | ||||||
|  |  | ||||||
|  |     suspend fun acquireRead() { | ||||||
|  |         globalWritingLocker.acquire() | ||||||
|  |         try { | ||||||
|  |             lockersWritingLocker.waitReleaseAll() | ||||||
|  |             globalRWLocker.acquireRead() | ||||||
|  |         } catch (e: CancellationException) { | ||||||
|  |             globalWritingLocker.release() | ||||||
|  |             throw e | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     suspend fun releaseRead(): Boolean { | ||||||
|  |         globalWritingLocker.release() | ||||||
|  |         return globalRWLocker.releaseRead() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun lockWrite() { | ||||||
|  |         globalRWLocker.lockWrite() | ||||||
|  |     } | ||||||
|  |     suspend fun unlockWrite(): Boolean { | ||||||
|  |         return globalRWLocker.unlockWrite() | ||||||
|  |     } | ||||||
|  |     fun isWriteLocked(): Boolean = globalRWLocker.writeMutex.isLocked == true | ||||||
|  |  | ||||||
|  |  | ||||||
|  |     suspend fun acquireRead(key: T) { | ||||||
|  |         globalRWLocker.acquireRead() | ||||||
|  |         val locker = allocateLocker(key) | ||||||
|  |         try { | ||||||
|  |             locker.acquireRead() | ||||||
|  |         } catch (e: CancellationException) { | ||||||
|  |             globalRWLocker.releaseRead() | ||||||
|  |             throw e | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     suspend fun releaseRead(key: T): Boolean { | ||||||
|  |         val locker = allocateLocker(key) | ||||||
|  |         return locker.releaseRead() && globalRWLocker.releaseRead() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun lockWrite(key: T) { | ||||||
|  |         globalWritingLocker.withAcquire(globalWritingLocker.maxPermits) { | ||||||
|  |             lockersWritingLocker.acquire() | ||||||
|  |         } | ||||||
|  |         try { | ||||||
|  |             globalRWLocker.acquireRead() | ||||||
|  |             try { | ||||||
|  |                 val locker = allocateLocker(key) | ||||||
|  |                 locker.lockWrite() | ||||||
|  |             } catch (e: CancellationException) { | ||||||
|  |                 globalRWLocker.releaseRead() | ||||||
|  |                 throw e | ||||||
|  |             } | ||||||
|  |         } catch (e: CancellationException) { | ||||||
|  |             lockersWritingLocker.release() | ||||||
|  |             throw e | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     suspend fun unlockWrite(key: T): Boolean { | ||||||
|  |         val locker = allocateLocker(key) | ||||||
|  |         return (locker.unlockWrite() && globalRWLocker.releaseRead()).also { | ||||||
|  |             if (it) { | ||||||
|  |                 lockersWritingLocker.release() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     fun isWriteLocked(key: T): Boolean = lockers[key] ?.writeMutex ?.isLocked == true | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withReadAcquire(action: () -> R): R { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     acquireRead() | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         releaseRead() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withWriteLock(action: () -> R): R { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     lockWrite() | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         unlockWrite() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withReadAcquire(key: T, action: () -> R): R { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     acquireRead(key) | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         releaseRead(key) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withReadAcquires(keys: Iterable<T>, action: () -> R): R { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val acquired = mutableSetOf<T>() | ||||||
|  |     try { | ||||||
|  |         keys.forEach { | ||||||
|  |             acquireRead(it) | ||||||
|  |             acquired.add(it) | ||||||
|  |         } | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         acquired.forEach { | ||||||
|  |             releaseRead(it) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withReadAcquires(vararg keys: T, action: () -> R): R = withReadAcquires(keys.asIterable(), action) | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withWriteLock(key: T, action: () -> R): R { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     lockWrite(key) | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         unlockWrite(key) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withWriteLocks(keys: Iterable<T>, action: () -> R): R { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val locked = mutableSetOf<T>() | ||||||
|  |     try { | ||||||
|  |         keys.forEach { | ||||||
|  |             lockWrite(it) | ||||||
|  |             locked.add(it) | ||||||
|  |         } | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         locked.forEach { | ||||||
|  |             unlockWrite(it) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend inline fun <T, R> SmartKeyRWLocker<T>.withWriteLocks(vararg keys: T, action: () -> R): R = withWriteLocks(keys.asIterable(), action) | ||||||
| @@ -1,5 +1,6 @@ | |||||||
| package dev.inmo.micro_utils.coroutines | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CancellationException | ||||||
| import kotlin.contracts.ExperimentalContracts | import kotlin.contracts.ExperimentalContracts | ||||||
| import kotlin.contracts.InvocationKind | import kotlin.contracts.InvocationKind | ||||||
| import kotlin.contracts.contract | import kotlin.contracts.contract | ||||||
| @@ -7,9 +8,10 @@ import kotlin.contracts.contract | |||||||
| /** | /** | ||||||
|  * Composite mutex which works with next rules: |  * Composite mutex which works with next rules: | ||||||
|  * |  * | ||||||
|  * * [acquireRead] require to [writeMutex] be free. Then it will take one lock from [readSemaphore] |  * * [acquireRead] require to [writeMutex] to be free. Then it will take one lock from [readSemaphore] | ||||||
|  * * [releaseRead] will just free up one permit in [readSemaphore] |  * * [releaseRead] will just free up one permit in [readSemaphore] | ||||||
|  * * [lockWrite] will lock [writeMutex] and then await while all [readSemaphore] will be freed |  * * [lockWrite] will lock [writeMutex] and then await while all [readSemaphore] will be freed. If coroutine will be | ||||||
|  |  * cancelled during read semaphore freeing, locking will be cancelled too with [SmartMutex.Mutable.unlock]ing of [writeMutex] | ||||||
|  * * [unlockWrite] will just unlock [writeMutex] |  * * [unlockWrite] will just unlock [writeMutex] | ||||||
|  */ |  */ | ||||||
| class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) { | class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) { | ||||||
| @@ -39,7 +41,12 @@ class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: | |||||||
|      */ |      */ | ||||||
|     suspend fun lockWrite() { |     suspend fun lockWrite() { | ||||||
|         _writeMutex.lock() |         _writeMutex.lock() | ||||||
|  |         try { | ||||||
|             _readSemaphore.acquire(readPermits) |             _readSemaphore.acquire(readPermits) | ||||||
|  |         } catch (e: CancellationException) { | ||||||
|  |             _writeMutex.unlock() | ||||||
|  |             throw e | ||||||
|  |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -0,0 +1,23 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  |  | ||||||
|  | suspend inline fun alsoWithUnlockingOnSuccess( | ||||||
|  |     vararg lockers: SmartRWLocker, | ||||||
|  |     block: suspend () -> Unit | ||||||
|  | ): Result<Unit> { | ||||||
|  |     return runCatching { | ||||||
|  |         block() | ||||||
|  |     }.onSuccess { | ||||||
|  |         lockers.forEach { it.unlockWrite() } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun alsoWithUnlockingOnSuccessAsync( | ||||||
|  |     scope: CoroutineScope, | ||||||
|  |     vararg lockers: SmartRWLocker, | ||||||
|  |     block: suspend () -> Unit | ||||||
|  | ): Job = scope.launchLoggingDropExceptions { | ||||||
|  |     alsoWithUnlockingOnSuccess(*lockers, block = block) | ||||||
|  | } | ||||||
| @@ -24,6 +24,7 @@ import kotlin.contracts.contract | |||||||
|  * [Mutable] creator |  * [Mutable] creator | ||||||
|  */ |  */ | ||||||
| sealed interface SmartSemaphore { | sealed interface SmartSemaphore { | ||||||
|  |     val maxPermits: Int | ||||||
|     val permitsStateFlow: StateFlow<Int> |     val permitsStateFlow: StateFlow<Int> | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
| @@ -36,7 +37,7 @@ sealed interface SmartSemaphore { | |||||||
|     /** |     /** | ||||||
|      * Immutable variant of [SmartSemaphore]. In fact will depend on the owner of [permitsStateFlow] |      * Immutable variant of [SmartSemaphore]. In fact will depend on the owner of [permitsStateFlow] | ||||||
|      */ |      */ | ||||||
|     class Immutable(override val permitsStateFlow: StateFlow<Int>) : SmartSemaphore |     class Immutable(override val permitsStateFlow: StateFlow<Int>, override val maxPermits: Int) : SmartSemaphore | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Mutable variant of [SmartSemaphore]. With that variant you may [lock] and [unlock]. Besides, you may create |      * Mutable variant of [SmartSemaphore]. With that variant you may [lock] and [unlock]. Besides, you may create | ||||||
| @@ -44,15 +45,16 @@ sealed interface SmartSemaphore { | |||||||
|      * |      * | ||||||
|      * @param locked Preset state of [freePermits] and its internal [_freePermitsStateFlow] |      * @param locked Preset state of [freePermits] and its internal [_freePermitsStateFlow] | ||||||
|      */ |      */ | ||||||
|     class Mutable(private val permits: Int, acquiredPermits: Int = 0) : SmartSemaphore { |     class Mutable(permits: Int, acquiredPermits: Int = 0) : SmartSemaphore { | ||||||
|  |         override val maxPermits: Int = permits | ||||||
|         private val _freePermitsStateFlow = SpecialMutableStateFlow<Int>(permits - acquiredPermits) |         private val _freePermitsStateFlow = SpecialMutableStateFlow<Int>(permits - acquiredPermits) | ||||||
|         override val permitsStateFlow: StateFlow<Int> = _freePermitsStateFlow.asStateFlow() |         override val permitsStateFlow: StateFlow<Int> = _freePermitsStateFlow.asStateFlow() | ||||||
|  |  | ||||||
|         private val internalChangesMutex = Mutex(false) |         private val internalChangesMutex = Mutex(false) | ||||||
|  |  | ||||||
|         fun immutable() = Immutable(permitsStateFlow) |         fun immutable() = Immutable(permitsStateFlow, maxPermits) | ||||||
|  |  | ||||||
|         private fun checkedPermits(permits: Int) = permits.coerceIn(1 .. this.permits) |         private fun checkedPermits(permits: Int) = permits.coerceIn(1 .. this.maxPermits) | ||||||
|  |  | ||||||
|         /** |         /** | ||||||
|          * Holds call until this [SmartSemaphore] will be re-locked. That means that current method will |          * Holds call until this [SmartSemaphore] will be re-locked. That means that current method will | ||||||
| @@ -126,10 +128,10 @@ sealed interface SmartSemaphore { | |||||||
|          */ |          */ | ||||||
|         suspend fun release(permits: Int = 1): Boolean { |         suspend fun release(permits: Int = 1): Boolean { | ||||||
|             val checkedPermits = checkedPermits(permits) |             val checkedPermits = checkedPermits(permits) | ||||||
|             return if (_freePermitsStateFlow.value < this.permits) { |             return if (_freePermitsStateFlow.value < this.maxPermits) { | ||||||
|                 internalChangesMutex.withLock { |                 internalChangesMutex.withLock { | ||||||
|                     if (_freePermitsStateFlow.value < this.permits) { |                     if (_freePermitsStateFlow.value < this.maxPermits) { | ||||||
|                         _freePermitsStateFlow.value = minOf(_freePermitsStateFlow.value + checkedPermits, this.permits) |                         _freePermitsStateFlow.value = minOf(_freePermitsStateFlow.value + checkedPermits, this.maxPermits) | ||||||
|                         true |                         true | ||||||
|                     } else { |                     } else { | ||||||
|                         false |                         false | ||||||
| @@ -166,3 +168,4 @@ suspend inline fun <T> SmartSemaphore.Mutable.withAcquire(permits: Int = 1, acti | |||||||
|  * the fact that some other parties may lock it again |  * the fact that some other parties may lock it again | ||||||
|  */ |  */ | ||||||
| suspend fun SmartSemaphore.waitRelease(permits: Int = 1) = permitsStateFlow.first { it >= permits } | suspend fun SmartSemaphore.waitRelease(permits: Int = 1) = permitsStateFlow.first { it >= permits } | ||||||
|  | suspend fun SmartSemaphore.waitReleaseAll() = permitsStateFlow.first { it == maxPermits } | ||||||
|   | |||||||
| @@ -1,7 +1,6 @@ | |||||||
| package dev.inmo.micro_utils.coroutines.collections | package dev.inmo.micro_utils.coroutines.collections | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.coroutines.SmartRWLocker | import dev.inmo.micro_utils.coroutines.SmartRWLocker | ||||||
| import dev.inmo.micro_utils.coroutines.waitReadRelease |  | ||||||
| import dev.inmo.micro_utils.coroutines.withReadAcquire | import dev.inmo.micro_utils.coroutines.withReadAcquire | ||||||
| import dev.inmo.micro_utils.coroutines.withWriteLock | import dev.inmo.micro_utils.coroutines.withWriteLock | ||||||
| import kotlinx.coroutines.job | import kotlinx.coroutines.job | ||||||
| @@ -93,7 +92,7 @@ class SortedBinaryTreeNode<T>( | |||||||
|  * This process will continue until function will not find place to put [SortedBinaryTreeNode] with data or |  * This process will continue until function will not find place to put [SortedBinaryTreeNode] with data or | ||||||
|  * [SortedBinaryTreeNode] with [SortedBinaryTreeNode.data] same as [newData] will be found |  * [SortedBinaryTreeNode] with [SortedBinaryTreeNode.data] same as [newData] will be found | ||||||
|  */ |  */ | ||||||
| private suspend fun <T> SortedBinaryTreeNode<T>.addSubNode( | private suspend fun <T> SortedBinaryTreeNode<T>.upsertSubNode( | ||||||
|     subNode: SortedBinaryTreeNode<T>, |     subNode: SortedBinaryTreeNode<T>, | ||||||
|     skipLockers: Set<SmartRWLocker> = emptySet() |     skipLockers: Set<SmartRWLocker> = emptySet() | ||||||
| ): SortedBinaryTreeNode<T> { | ): SortedBinaryTreeNode<T> { | ||||||
| @@ -149,7 +148,7 @@ private suspend fun <T> SortedBinaryTreeNode<T>.addSubNode( | |||||||
|  * [SortedBinaryTreeNode] with [SortedBinaryTreeNode.data] same as [newData] will be found |  * [SortedBinaryTreeNode] with [SortedBinaryTreeNode.data] same as [newData] will be found | ||||||
|  */ |  */ | ||||||
| suspend fun <T> SortedBinaryTreeNode<T>.addSubNode(newData: T): SortedBinaryTreeNode<T> { | suspend fun <T> SortedBinaryTreeNode<T>.addSubNode(newData: T): SortedBinaryTreeNode<T> { | ||||||
|     return addSubNode( |     return upsertSubNode( | ||||||
|         SortedBinaryTreeNode(newData, comparator) |         SortedBinaryTreeNode(newData, comparator) | ||||||
|     ) |     ) | ||||||
| } | } | ||||||
| @@ -198,8 +197,8 @@ suspend fun <T> SortedBinaryTreeNode<T>.findParentNode(data: T): SortedBinaryTre | |||||||
|  */ |  */ | ||||||
| suspend fun <T> SortedBinaryTreeNode<T>.removeSubNode(data: T): Pair<SortedBinaryTreeNode<T>, SortedBinaryTreeNode<T>>? { | suspend fun <T> SortedBinaryTreeNode<T>.removeSubNode(data: T): Pair<SortedBinaryTreeNode<T>, SortedBinaryTreeNode<T>>? { | ||||||
|     val onFoundToRemoveCallback: suspend SortedBinaryTreeNode<T>.(left: SortedBinaryTreeNode<T>?, right: SortedBinaryTreeNode<T>?) -> Unit = { left, right -> |     val onFoundToRemoveCallback: suspend SortedBinaryTreeNode<T>.(left: SortedBinaryTreeNode<T>?, right: SortedBinaryTreeNode<T>?) -> Unit = { left, right -> | ||||||
|         left ?.also { leftNode -> addSubNode(leftNode, setOf(locker)) } |         left ?.also { leftNode -> upsertSubNode(leftNode, setOf(locker)) } | ||||||
|         right ?.also { rightNode -> addSubNode(rightNode, setOf(locker)) } |         right ?.also { rightNode -> upsertSubNode(rightNode, setOf(locker)) } | ||||||
|     } |     } | ||||||
|     while (coroutineContext.job.isActive) { |     while (coroutineContext.job.isActive) { | ||||||
|         val foundParentNode = findParentNode(data) ?: return null |         val foundParentNode = findParentNode(data) ?: return null | ||||||
|   | |||||||
| @@ -0,0 +1,401 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines.collections | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.coroutines.SmartRWLocker | ||||||
|  | import dev.inmo.micro_utils.coroutines.withReadAcquire | ||||||
|  | import dev.inmo.micro_utils.coroutines.withWriteLock | ||||||
|  | import kotlinx.coroutines.job | ||||||
|  | import kotlinx.serialization.Serializable | ||||||
|  | import kotlin.coroutines.coroutineContext | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates simple [Comparator] which will use [compareTo] of [T] for both objects | ||||||
|  |  */ | ||||||
|  | private fun <T : Comparable<C>, C : T> T.createComparator() = Comparator<C> { o1, o2 -> o1.compareTo(o2) } | ||||||
|  |  | ||||||
|  | @Serializable | ||||||
|  | class SortedMapLikeBinaryTreeNode<K, V>( | ||||||
|  |     val key: K, | ||||||
|  |     val value: V, | ||||||
|  |     internal val comparator: Comparator<K>, | ||||||
|  | ) : Iterable<SortedMapLikeBinaryTreeNode<K, V>> { | ||||||
|  |     internal var leftNode: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||||
|  |     internal var rightNode: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||||
|  |     internal val locker: SmartRWLocker by lazy { | ||||||
|  |         SmartRWLocker() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun getLeftNode() = locker.withReadAcquire { | ||||||
|  |         leftNode | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun getRightNode() = locker.withReadAcquire { | ||||||
|  |         rightNode | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun getLeftKey() = getLeftNode() ?.key | ||||||
|  |     suspend fun getLeftValue() = getLeftNode() ?.value | ||||||
|  |  | ||||||
|  |     suspend fun getRightKey() = getRightNode() ?.value | ||||||
|  |     suspend fun getRightValue() = getRightNode() ?.value | ||||||
|  |  | ||||||
|  |     override fun equals(other: Any?): Boolean { | ||||||
|  |         return other === this || (other is SortedMapLikeBinaryTreeNode<*, *> && other.key == key && other.rightNode == rightNode && other.leftNode == leftNode) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun hashCode(): Int { | ||||||
|  |         return key.hashCode() * 31 + rightNode.hashCode() + leftNode.hashCode() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     suspend fun size(): Int { | ||||||
|  |         return locker.withReadAcquire { | ||||||
|  |             1 + (leftNode ?.size() ?: 0) + (rightNode ?.size() ?: 0) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * This [Iterator] will run from less to greater values of nodes starting the | ||||||
|  |      * [dev.inmo.micro_utils.coroutines.collections.SortedMapLikeBinaryTreeNode]-receiver. Due to non-suspending | ||||||
|  |      * nature of [iterator] builder, this [Iterator] **DO NOT** guarantee consistent content due to iterations. It | ||||||
|  |      * means, that tree can be changed during to iteration process | ||||||
|  |      */ | ||||||
|  |     override fun iterator(): Iterator<SortedMapLikeBinaryTreeNode<K, V>> = iterator { | ||||||
|  |         leftNode ?.let { | ||||||
|  |             it.iterator().forEach { yield(it) } | ||||||
|  |         } | ||||||
|  |         yield(this@SortedMapLikeBinaryTreeNode) | ||||||
|  |         rightNode ?.let { | ||||||
|  |             it.iterator().forEach { yield(it) } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun toString(): String { | ||||||
|  |         return "$key($leftNode;$rightNode)" | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         operator fun <K : Comparable<K>, V> invoke( | ||||||
|  |             key: K, | ||||||
|  |             value: V | ||||||
|  |         ) = SortedMapLikeBinaryTreeNode( | ||||||
|  |             key, | ||||||
|  |             value, | ||||||
|  |             key.createComparator() | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will add subnode in tree if there are no any node with [newData] | ||||||
|  |  * | ||||||
|  |  * * If [newData] is greater than [SortedMapLikeBinaryTreeNode.key] of currently checking node, | ||||||
|  |  * will be used [SortedMapLikeBinaryTreeNode.rightNode] | ||||||
|  |  * * If [newData] is equal to [SortedMapLikeBinaryTreeNode.key] of currently | ||||||
|  |  * checking node - will be returned currently checking node | ||||||
|  |  * * If [newData] is less than [SortedMapLikeBinaryTreeNode.key] of currently | ||||||
|  |  * checking node - will be used [SortedMapLikeBinaryTreeNode.leftNode] | ||||||
|  |  * | ||||||
|  |  * This process will continue until function will not find place to put [SortedMapLikeBinaryTreeNode] with data or | ||||||
|  |  * [SortedMapLikeBinaryTreeNode] with [SortedMapLikeBinaryTreeNode.key] same as [newData] will be found | ||||||
|  |  * | ||||||
|  |  * @param replaceMode Will replace only value if node already exists | ||||||
|  |  */ | ||||||
|  | private suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.upsertSubNode( | ||||||
|  |     subNode: SortedMapLikeBinaryTreeNode<K, V>, | ||||||
|  |     skipLockers: Set<SmartRWLocker> = emptySet(), | ||||||
|  |     replaceMode: Boolean | ||||||
|  | ): SortedMapLikeBinaryTreeNode<K, V> { | ||||||
|  |     var currentlyChecking = this | ||||||
|  |     var latestParent: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||||
|  |     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||||
|  |     try { | ||||||
|  |         while (coroutineContext.job.isActive) { | ||||||
|  |             if (currentlyChecking.locker !in lockedLockers && currentlyChecking.locker !in skipLockers) { | ||||||
|  |                 currentlyChecking.locker.lockWrite() | ||||||
|  |                 lockedLockers.add(currentlyChecking.locker) | ||||||
|  |             } | ||||||
|  |             val left = currentlyChecking.leftNode | ||||||
|  |             val right = currentlyChecking.rightNode | ||||||
|  |             val comparingResult = currentlyChecking.comparator.compare(subNode.key, currentlyChecking.key) | ||||||
|  |             val isGreater = comparingResult > 0 | ||||||
|  |             when { | ||||||
|  |                 comparingResult == 0 -> { | ||||||
|  |                     val resultNode = if (replaceMode) { | ||||||
|  |                         subNode | ||||||
|  |                     } else { | ||||||
|  |                         val newNode = SortedMapLikeBinaryTreeNode( | ||||||
|  |                             subNode.key, | ||||||
|  |                             subNode.value, | ||||||
|  |                             currentlyChecking.comparator, | ||||||
|  |                         ) | ||||||
|  |                         newNode.leftNode = currentlyChecking.leftNode | ||||||
|  |                         newNode.rightNode = currentlyChecking.rightNode | ||||||
|  |                         newNode | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     latestParent ?.let { | ||||||
|  |                         when { | ||||||
|  |                             it.leftNode === currentlyChecking -> it.leftNode = resultNode | ||||||
|  |                             it.rightNode === currentlyChecking -> it.rightNode = resultNode | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |  | ||||||
|  |                     return resultNode | ||||||
|  |                 } | ||||||
|  |                 isGreater && right == null -> { | ||||||
|  |                     currentlyChecking.rightNode = subNode | ||||||
|  |                     return subNode | ||||||
|  |                 } | ||||||
|  |                 isGreater && right != null -> { | ||||||
|  |                     latestParent = currentlyChecking | ||||||
|  |                     currentlyChecking = right | ||||||
|  |                 } | ||||||
|  |                 left == null -> { | ||||||
|  |                     currentlyChecking.leftNode = subNode | ||||||
|  |                     return subNode | ||||||
|  |                 } | ||||||
|  |                 else -> { | ||||||
|  |                     latestParent = currentlyChecking | ||||||
|  |                     currentlyChecking = left | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } finally { | ||||||
|  |         lockedLockers.forEach { | ||||||
|  |             runCatching { it.unlockWrite() } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     error("Unable to add node") | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will add subnode in tree if there are no any node with [key] | ||||||
|  |  * | ||||||
|  |  * * If [key] is greater than [SortedMapLikeBinaryTreeNode.key] of currently checking node, | ||||||
|  |  * will be used [SortedMapLikeBinaryTreeNode.rightNode] | ||||||
|  |  * * If [key] is equal to [SortedMapLikeBinaryTreeNode.key] of currently | ||||||
|  |  * checking node - will be returned currently checking node | ||||||
|  |  * * If [key] is less than [SortedMapLikeBinaryTreeNode.key] of currently | ||||||
|  |  * checking node - will be used [SortedMapLikeBinaryTreeNode.leftNode] | ||||||
|  |  * | ||||||
|  |  * This process will continue until function will not find place to put [SortedMapLikeBinaryTreeNode] with data or | ||||||
|  |  * [SortedMapLikeBinaryTreeNode] with [SortedMapLikeBinaryTreeNode.key] same as [key] will be found | ||||||
|  |  */ | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.upsertSubNode( | ||||||
|  |     key: K, | ||||||
|  |     value: V | ||||||
|  | ): SortedMapLikeBinaryTreeNode<K, V> { | ||||||
|  |     return upsertSubNode( | ||||||
|  |         SortedMapLikeBinaryTreeNode(key, value, comparator), | ||||||
|  |         replaceMode = false | ||||||
|  |     ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findParentNode(data: K): SortedMapLikeBinaryTreeNode<K, V>? { | ||||||
|  |     var currentParent: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||||
|  |     var currentlyChecking: SortedMapLikeBinaryTreeNode<K, V>? = this | ||||||
|  |     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||||
|  |     try { | ||||||
|  |         while (coroutineContext.job.isActive) { | ||||||
|  |             if (currentlyChecking == null) { | ||||||
|  |                 return null | ||||||
|  |             } | ||||||
|  |             if (currentlyChecking.locker !in lockedLockers) { | ||||||
|  |                 currentlyChecking.locker.acquireRead() | ||||||
|  |                 lockedLockers.add(currentlyChecking.locker) | ||||||
|  |             } | ||||||
|  |             val comparingResult = currentlyChecking.comparator.compare(data, currentlyChecking.key) | ||||||
|  |             when { | ||||||
|  |                 comparingResult > 0 -> { | ||||||
|  |                     currentParent = currentlyChecking | ||||||
|  |                     currentlyChecking = currentlyChecking.rightNode | ||||||
|  |                     continue | ||||||
|  |                 } | ||||||
|  |                 comparingResult < 0 -> { | ||||||
|  |                     currentParent = currentlyChecking | ||||||
|  |                     currentlyChecking = currentlyChecking.leftNode | ||||||
|  |                     continue | ||||||
|  |                 } | ||||||
|  |                 else -> return currentParent | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } finally { | ||||||
|  |         lockedLockers.forEach { | ||||||
|  |             runCatching { it.releaseRead() } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     error("Unable to find node") | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will remove (detach) node from tree starting with [this] [SortedMapLikeBinaryTreeNode] | ||||||
|  |  * | ||||||
|  |  * @return If data were found, [Pair] where [Pair.first] is the parent node where from [Pair.second] has been detached; | ||||||
|  |  *         null otherwise | ||||||
|  |  */ | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.removeSubNode(data: K): Pair<SortedMapLikeBinaryTreeNode<K, V>, SortedMapLikeBinaryTreeNode<K, V>>? { | ||||||
|  |     val onFoundToRemoveCallback: suspend SortedMapLikeBinaryTreeNode<K, V>.(left: SortedMapLikeBinaryTreeNode<K, V>?, right: SortedMapLikeBinaryTreeNode<K, V>?) -> Unit = { left, right -> | ||||||
|  |         left ?.also { leftNode -> upsertSubNode(leftNode, setOf(locker), replaceMode = true) } | ||||||
|  |         right ?.also { rightNode -> upsertSubNode(rightNode, setOf(locker), replaceMode = true) } | ||||||
|  |     } | ||||||
|  |     while (coroutineContext.job.isActive) { | ||||||
|  |         val foundParentNode = findParentNode(data) ?: return null | ||||||
|  |         foundParentNode.locker.withWriteLock { | ||||||
|  |             val left = foundParentNode.leftNode | ||||||
|  |             val right = foundParentNode.rightNode | ||||||
|  |             when { | ||||||
|  |                 left != null && left.comparator.compare(data, left.key) == 0 -> { | ||||||
|  |                     foundParentNode.leftNode = null | ||||||
|  |                     foundParentNode.onFoundToRemoveCallback(left.leftNode, left.rightNode) | ||||||
|  |                     return foundParentNode to left | ||||||
|  |                 } | ||||||
|  |                 right != null && right.comparator.compare(data, right.key) == 0 -> { | ||||||
|  |                     foundParentNode.rightNode = null | ||||||
|  |                     foundParentNode.onFoundToRemoveCallback(right.leftNode, right.rightNode) | ||||||
|  |                     return foundParentNode to right | ||||||
|  |                 } | ||||||
|  |                 else -> { | ||||||
|  |                     return@withWriteLock // data has been changed, new search required | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     error("Unable to remove node") | ||||||
|  | } | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNode(key: K): SortedMapLikeBinaryTreeNode<K, V>? { | ||||||
|  |     var currentlyChecking: SortedMapLikeBinaryTreeNode<K, V>? = this | ||||||
|  |     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||||
|  |     try { | ||||||
|  |         while (coroutineContext.job.isActive) { | ||||||
|  |             if (currentlyChecking == null) { | ||||||
|  |                 return null | ||||||
|  |             } | ||||||
|  |             if (currentlyChecking.locker !in lockedLockers) { | ||||||
|  |                 currentlyChecking.locker.acquireRead() | ||||||
|  |                 lockedLockers.add(currentlyChecking.locker) | ||||||
|  |             } | ||||||
|  |             val comparingResult = currentlyChecking.comparator.compare(key, currentlyChecking.key) | ||||||
|  |             when { | ||||||
|  |                 comparingResult > 0 -> { | ||||||
|  |                     currentlyChecking = currentlyChecking.rightNode | ||||||
|  |                     continue | ||||||
|  |                 } | ||||||
|  |                 comparingResult < 0 -> { | ||||||
|  |                     currentlyChecking = currentlyChecking.leftNode | ||||||
|  |                     continue | ||||||
|  |                 } | ||||||
|  |                 else -> return currentlyChecking | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } finally { | ||||||
|  |         lockedLockers.forEach { | ||||||
|  |             runCatching { it.releaseRead() } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     error("Unable to find node") | ||||||
|  | } | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.contains(data: K): Boolean = findNode(data) != null | ||||||
|  |  | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRange(from: K, to: K, fromInclusiveMode: Boolean, toInclusiveMode: Boolean): Set<SortedMapLikeBinaryTreeNode<K, V>> { | ||||||
|  |     val results = mutableSetOf<SortedMapLikeBinaryTreeNode<K, V>>() | ||||||
|  |     val leftToCheck = mutableSetOf(this) | ||||||
|  |     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||||
|  |     val fromComparingFun: (SortedMapLikeBinaryTreeNode<K, V>) -> Boolean = if (fromInclusiveMode) { | ||||||
|  |         { it.comparator.compare(from, it.key) <= 0 } | ||||||
|  |     } else { | ||||||
|  |         { it.comparator.compare(from, it.key) < 0 } | ||||||
|  |     } | ||||||
|  |     val toComparingFun: (SortedMapLikeBinaryTreeNode<K, V>) -> Boolean = if (toInclusiveMode) { | ||||||
|  |         { it.comparator.compare(to, it.key) >= 0 } | ||||||
|  |     } else { | ||||||
|  |         { it.comparator.compare(to, it.key) > 0 } | ||||||
|  |     } | ||||||
|  |     try { | ||||||
|  |         while (coroutineContext.job.isActive && leftToCheck.isNotEmpty()) { | ||||||
|  |             val currentlyChecking = leftToCheck.first() | ||||||
|  |             leftToCheck.remove(currentlyChecking) | ||||||
|  |             if (currentlyChecking in results) { | ||||||
|  |                 continue | ||||||
|  |             } | ||||||
|  |             currentlyChecking.locker.acquireRead() | ||||||
|  |             lockedLockers.add(currentlyChecking.locker) | ||||||
|  |             if (fromComparingFun(currentlyChecking) && toComparingFun(currentlyChecking)) { | ||||||
|  |                 results.add(currentlyChecking) | ||||||
|  |                 currentlyChecking.leftNode ?.let { leftToCheck.add(it) } | ||||||
|  |                 currentlyChecking.rightNode ?.let { leftToCheck.add(it) } | ||||||
|  |                 continue | ||||||
|  |             } | ||||||
|  |             when { | ||||||
|  |                 currentlyChecking.comparator.compare(to, currentlyChecking.key) < 0 -> currentlyChecking.leftNode ?.let { leftToCheck.add(it) } | ||||||
|  |                 currentlyChecking.comparator.compare(from, currentlyChecking.key) > 0 -> currentlyChecking.rightNode ?.let { leftToCheck.add(it) } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         return results.toSet() | ||||||
|  |     } finally { | ||||||
|  |         lockedLockers.forEach { | ||||||
|  |             runCatching { it.releaseRead() } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     error("Unable to find nodes range") | ||||||
|  | } | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.deepEquals(other: SortedMapLikeBinaryTreeNode<K, V>): Boolean { | ||||||
|  |     val leftToCheck = mutableSetOf(this) | ||||||
|  |     val othersToCheck = mutableSetOf(other) | ||||||
|  |     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||||
|  |     try { | ||||||
|  |         while (leftToCheck.isNotEmpty() && othersToCheck.isNotEmpty()) { | ||||||
|  |             val thisToCheck = leftToCheck.first() | ||||||
|  |             leftToCheck.remove(thisToCheck) | ||||||
|  |  | ||||||
|  |             val otherToCheck = othersToCheck.first() | ||||||
|  |             othersToCheck.remove(otherToCheck) | ||||||
|  |  | ||||||
|  |             if (thisToCheck.locker !in lockedLockers) { | ||||||
|  |                 thisToCheck.locker.acquireRead() | ||||||
|  |                 lockedLockers.add(thisToCheck.locker) | ||||||
|  |             } | ||||||
|  |             if (otherToCheck.locker !in lockedLockers) { | ||||||
|  |                 otherToCheck.locker.acquireRead() | ||||||
|  |                 lockedLockers.add(otherToCheck.locker) | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             if (thisToCheck.key != otherToCheck.key || thisToCheck.value != otherToCheck.value) { | ||||||
|  |                 return false | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             if ((thisToCheck.leftNode == null).xor(otherToCheck.leftNode == null)) { | ||||||
|  |                 return false | ||||||
|  |             } | ||||||
|  |             if ((thisToCheck.rightNode == null).xor(otherToCheck.rightNode == null)) { | ||||||
|  |                 return false | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             thisToCheck.leftNode?.let { leftToCheck.add(it) } | ||||||
|  |             thisToCheck.rightNode?.let { leftToCheck.add(it) } | ||||||
|  |  | ||||||
|  |             otherToCheck.leftNode?.let { othersToCheck.add(it) } | ||||||
|  |             otherToCheck.rightNode?.let { othersToCheck.add(it) } | ||||||
|  |         } | ||||||
|  |     } finally { | ||||||
|  |         lockedLockers.forEach { | ||||||
|  |             runCatching { it.releaseRead() } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     return leftToCheck.isEmpty() && othersToCheck.isEmpty() | ||||||
|  | } | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRange(from: K, to: K): Set<SortedMapLikeBinaryTreeNode<K, V>> = findNodesInRange( | ||||||
|  |     from = from, | ||||||
|  |     to = to, | ||||||
|  |     fromInclusiveMode = true, | ||||||
|  |     toInclusiveMode = true | ||||||
|  | ) | ||||||
|  | suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRangeExcluding(from: K, to: K): Set<SortedMapLikeBinaryTreeNode<K, V>> = findNodesInRange( | ||||||
|  |     from = from, | ||||||
|  |     to = to, | ||||||
|  |     fromInclusiveMode = false, | ||||||
|  |     toInclusiveMode = false | ||||||
|  | ) | ||||||
|  | suspend fun <K : Comparable<K>, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRange(range: ClosedRange<K>): Set<SortedMapLikeBinaryTreeNode<K, V>> = findNodesInRange( | ||||||
|  |     from = range.start, | ||||||
|  |     to = range.endInclusive, | ||||||
|  | ) | ||||||
							
								
								
									
										12
									
								
								coroutines/src/commonTest/kotlin/RealTimeOut.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								coroutines/src/commonTest/kotlin/RealTimeOut.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | |||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
|  | import kotlinx.coroutines.withContext | ||||||
|  | import kotlinx.coroutines.withTimeout | ||||||
|  | import kotlin.time.Duration | ||||||
|  |  | ||||||
|  | suspend fun <T> realWithTimeout(time: Duration, block: suspend () -> T): T { | ||||||
|  |     return withContext(Dispatchers.Default.limitedParallelism(1)) { | ||||||
|  |         withTimeout(time) { | ||||||
|  |             block() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										196
									
								
								coroutines/src/commonTest/kotlin/SmartKeyRWLockerTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										196
									
								
								coroutines/src/commonTest/kotlin/SmartKeyRWLockerTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,196 @@ | |||||||
|  | import dev.inmo.micro_utils.coroutines.* | ||||||
|  | import kotlinx.coroutines.* | ||||||
|  | import kotlinx.coroutines.flow.first | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertFails | ||||||
|  | import kotlin.test.assertFalse | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  | import kotlin.time.Duration.Companion.milliseconds | ||||||
|  | import kotlin.time.Duration.Companion.seconds | ||||||
|  |  | ||||||
|  | class SmartKeyRWLockerTests { | ||||||
|  |     @Test | ||||||
|  |     fun writeLockKeyFailedOnGlobalWriteLockTest() = runTest { | ||||||
|  |         val locker = SmartKeyRWLocker<String>() | ||||||
|  |         val testKey = "test" | ||||||
|  |         locker.lockWrite() | ||||||
|  |  | ||||||
|  |         assertTrue { locker.isWriteLocked() } | ||||||
|  |  | ||||||
|  |         assertFails { | ||||||
|  |             realWithTimeout(1.seconds) { | ||||||
|  |                 locker.lockWrite(testKey) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         assertFalse { locker.isWriteLocked(testKey) } | ||||||
|  |  | ||||||
|  |         locker.unlockWrite() | ||||||
|  |         assertFalse { locker.isWriteLocked() } | ||||||
|  |  | ||||||
|  |         realWithTimeout(1.seconds) { | ||||||
|  |             locker.lockWrite(testKey) | ||||||
|  |         } | ||||||
|  |         assertTrue { locker.isWriteLocked(testKey) } | ||||||
|  |         assertTrue { locker.unlockWrite(testKey) } | ||||||
|  |         assertFalse { locker.isWriteLocked(testKey) } | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun writeLockKeyFailedOnGlobalReadLockTest() = runTest { | ||||||
|  |         val locker = SmartKeyRWLocker<String>() | ||||||
|  |         val testKey = "test" | ||||||
|  |         locker.acquireRead() | ||||||
|  |  | ||||||
|  |         assertEquals(Int.MAX_VALUE - 1, locker.readSemaphore().freePermits) | ||||||
|  |  | ||||||
|  |         assertFails { | ||||||
|  |             realWithTimeout(1.seconds) { | ||||||
|  |                 locker.lockWrite(testKey) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         assertFalse { locker.isWriteLocked(testKey) } | ||||||
|  |  | ||||||
|  |         locker.releaseRead() | ||||||
|  |         assertEquals(Int.MAX_VALUE, locker.readSemaphore().freePermits) | ||||||
|  |  | ||||||
|  |         realWithTimeout(1.seconds) { | ||||||
|  |             locker.lockWrite(testKey) | ||||||
|  |         } | ||||||
|  |         assertTrue { locker.isWriteLocked(testKey) } | ||||||
|  |         assertTrue { locker.unlockWrite(testKey) } | ||||||
|  |         assertFalse { locker.isWriteLocked(testKey) } | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun readLockFailedOnWriteLockKeyTest() = runTest { | ||||||
|  |         val locker = SmartKeyRWLocker<String>() | ||||||
|  |         val testKey = "test" | ||||||
|  |         locker.lockWrite(testKey) | ||||||
|  |  | ||||||
|  |         assertTrue { locker.isWriteLocked(testKey) } | ||||||
|  |  | ||||||
|  |         assertFails { | ||||||
|  |             realWithTimeout(1.seconds) { | ||||||
|  |                 locker.acquireRead() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits) | ||||||
|  |  | ||||||
|  |         locker.unlockWrite(testKey) | ||||||
|  |         assertFalse { locker.isWriteLocked(testKey) } | ||||||
|  |  | ||||||
|  |         realWithTimeout(1.seconds) { | ||||||
|  |             locker.acquireRead() | ||||||
|  |         } | ||||||
|  |         assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits) | ||||||
|  |         assertTrue { locker.releaseRead() } | ||||||
|  |         assertEquals(locker.readSemaphore().maxPermits, locker.readSemaphore().freePermits) | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun writeLockFailedOnWriteLockKeyTest() = runTest { | ||||||
|  |         val locker = SmartKeyRWLocker<String>() | ||||||
|  |         val testKey = "test" | ||||||
|  |         locker.lockWrite(testKey) | ||||||
|  |  | ||||||
|  |         assertTrue { locker.isWriteLocked(testKey) } | ||||||
|  |  | ||||||
|  |         assertFails { | ||||||
|  |             realWithTimeout(1.seconds) { | ||||||
|  |                 locker.lockWrite() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         assertFalse(locker.isWriteLocked()) | ||||||
|  |  | ||||||
|  |         locker.unlockWrite(testKey) | ||||||
|  |         assertFalse { locker.isWriteLocked(testKey) } | ||||||
|  |  | ||||||
|  |         realWithTimeout(1.seconds) { | ||||||
|  |             locker.lockWrite() | ||||||
|  |         } | ||||||
|  |         assertTrue(locker.isWriteLocked()) | ||||||
|  |         assertTrue { locker.unlockWrite() } | ||||||
|  |         assertFalse(locker.isWriteLocked()) | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun readsBlockingGlobalWrite() = runTest { | ||||||
|  |         val locker = SmartKeyRWLocker<String>() | ||||||
|  |  | ||||||
|  |         val testKeys = (0 until 100).map { "test$it" } | ||||||
|  |  | ||||||
|  |         for (i in testKeys.indices) { | ||||||
|  |             val it = testKeys[i] | ||||||
|  |             locker.acquireRead(it) | ||||||
|  |             val previous = testKeys.take(i) | ||||||
|  |             val next = testKeys.drop(i + 1) | ||||||
|  |  | ||||||
|  |             previous.forEach { | ||||||
|  |                 assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == Int.MAX_VALUE - 1 } | ||||||
|  |             } | ||||||
|  |             next.forEach { | ||||||
|  |                 assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == null } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         for (i in testKeys.indices) { | ||||||
|  |             val it = testKeys[i] | ||||||
|  |             assertFails { | ||||||
|  |                 realWithTimeout(13.milliseconds) { locker.lockWrite() } | ||||||
|  |             } | ||||||
|  |             val readPermitsBeforeLock = locker.readSemaphore().freePermits | ||||||
|  |             realWithTimeout(1.seconds) { locker.acquireRead() } | ||||||
|  |             locker.releaseRead() | ||||||
|  |             assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits) | ||||||
|  |  | ||||||
|  |             locker.releaseRead(it) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE } | ||||||
|  |         realWithTimeout(1.seconds) { locker.lockWrite() } | ||||||
|  |         assertFails { | ||||||
|  |             realWithTimeout(13.milliseconds) { locker.acquireRead() } | ||||||
|  |         } | ||||||
|  |         assertTrue { locker.unlockWrite() } | ||||||
|  |         assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE } | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun writesBlockingGlobalWrite() = runTest { | ||||||
|  |         val locker = SmartKeyRWLocker<String>() | ||||||
|  |  | ||||||
|  |         val testKeys = (0 until 100).map { "test$it" } | ||||||
|  |  | ||||||
|  |         for (i in testKeys.indices) { | ||||||
|  |             val it = testKeys[i] | ||||||
|  |             locker.lockWrite(it) | ||||||
|  |             val previous = testKeys.take(i) | ||||||
|  |             val next = testKeys.drop(i + 1) | ||||||
|  |  | ||||||
|  |             previous.forEach { | ||||||
|  |                 assertTrue { locker.writeMutexOrNull(it) ?.isLocked == true } | ||||||
|  |             } | ||||||
|  |             next.forEach { | ||||||
|  |                 assertTrue { locker.writeMutexOrNull(it) ?.isLocked != true } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         for (i in testKeys.indices) { | ||||||
|  |             val it = testKeys[i] | ||||||
|  |             assertFails { realWithTimeout(13.milliseconds) { locker.lockWrite() } } | ||||||
|  |  | ||||||
|  |             val readPermitsBeforeLock = locker.readSemaphore().freePermits | ||||||
|  |             assertFails { realWithTimeout(13.milliseconds) { locker.acquireRead() } } | ||||||
|  |             assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits) | ||||||
|  |  | ||||||
|  |             locker.unlockWrite(it) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE } | ||||||
|  |         realWithTimeout(1.seconds) { locker.lockWrite() } | ||||||
|  |         assertFails { | ||||||
|  |             realWithTimeout(13.milliseconds) { locker.acquireRead() } | ||||||
|  |         } | ||||||
|  |         assertTrue { locker.unlockWrite() } | ||||||
|  |         assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -6,7 +6,10 @@ import kotlinx.coroutines.sync.withLock | |||||||
| import kotlinx.coroutines.test.runTest | import kotlinx.coroutines.test.runTest | ||||||
| import kotlin.test.Test | import kotlin.test.Test | ||||||
| import kotlin.test.assertEquals | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertFails | ||||||
|  | import kotlin.test.assertFalse | ||||||
| import kotlin.test.assertTrue | import kotlin.test.assertTrue | ||||||
|  | import kotlin.time.Duration.Companion.seconds | ||||||
|  |  | ||||||
| class SmartRWLockerTests { | class SmartRWLockerTests { | ||||||
|     @Test |     @Test | ||||||
| @@ -148,4 +151,17 @@ class SmartRWLockerTests { | |||||||
|             assertEquals(false, locker.writeMutex.isLocked) |             assertEquals(false, locker.writeMutex.isLocked) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun exceptionOnLockingWillNotLockLocker() = runTest { | ||||||
|  |         val locker = SmartRWLocker() | ||||||
|  |  | ||||||
|  |         locker.acquireRead() | ||||||
|  |         assertFails { | ||||||
|  |             realWithTimeout(1.seconds) { | ||||||
|  |                 locker.lockWrite() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         assertFalse { locker.writeMutex.isLocked } | ||||||
|  |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -7,7 +7,9 @@ fun <T> CoroutineScope.launchSynchronously(block: suspend CoroutineScope.() -> T | |||||||
|     val objectToSynchronize = Object() |     val objectToSynchronize = Object() | ||||||
|     synchronized(objectToSynchronize) { |     synchronized(objectToSynchronize) { | ||||||
|         launch(start = CoroutineStart.UNDISPATCHED) { |         launch(start = CoroutineStart.UNDISPATCHED) { | ||||||
|             result = safelyWithResult(block) |             result = runCatching { | ||||||
|  |                 block() | ||||||
|  |             } | ||||||
|         }.invokeOnCompletion { |         }.invokeOnCompletion { | ||||||
|             synchronized(objectToSynchronize) { |             synchronized(objectToSynchronize) { | ||||||
|                 objectToSynchronize.notifyAll() |                 objectToSynchronize.notifyAll() | ||||||
|   | |||||||
| @@ -0,0 +1,118 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.coroutines.collections.* | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  | import kotlin.time.Duration.Companion.seconds | ||||||
|  |  | ||||||
|  | class SortedMapLikeBinaryTreeNodeTests { | ||||||
|  |     @Test | ||||||
|  |     fun insertOnZeroLevelWorks() = runTest { | ||||||
|  |         val zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||||
|  |         zeroNode.upsertSubNode(1, 1) | ||||||
|  |         zeroNode.upsertSubNode(-1, -1) | ||||||
|  |  | ||||||
|  |         assertEquals(0, zeroNode.key) | ||||||
|  |         assertEquals(1, zeroNode.getRightNode() ?.key) | ||||||
|  |         assertEquals(-1, zeroNode.getLeftNode() ?.key) | ||||||
|  |  | ||||||
|  |         assertEquals(0, zeroNode.findNode(0) ?.value) | ||||||
|  |         assertEquals(1, zeroNode.findNode(1) ?.value) | ||||||
|  |         assertEquals(-1, zeroNode.findNode(-1) ?.value) | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun searchOnZeroLevelWorks() = runTest { | ||||||
|  |         val zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||||
|  |         val oneNode = zeroNode.upsertSubNode(1, 1) | ||||||
|  |         val minusOneNode = zeroNode.upsertSubNode(-1, -1) | ||||||
|  |  | ||||||
|  |         val assertingNodesToSearchQuery = mapOf( | ||||||
|  |             setOf(oneNode) to (1 .. 1), | ||||||
|  |             setOf(zeroNode, oneNode) to (0 .. 1), | ||||||
|  |             setOf(minusOneNode, zeroNode, oneNode) to (-1 .. 1), | ||||||
|  |             setOf(minusOneNode, zeroNode) to (-1 .. 0), | ||||||
|  |             setOf(minusOneNode) to (-1 .. -1), | ||||||
|  |             setOf(zeroNode) to (0 .. 0), | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         assertingNodesToSearchQuery.forEach { | ||||||
|  |             val foundData = zeroNode.findNodesInRange(it.value) | ||||||
|  |             assertTrue(foundData.containsAll(it.key)) | ||||||
|  |             assertTrue(it.key.containsAll(foundData)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun deepReInsertOnWorks() = runTest(timeout = 300.seconds) { | ||||||
|  |         var zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||||
|  |         val rangeRadius = 500 | ||||||
|  |         val nodes = mutableMapOf<Int, SortedMapLikeBinaryTreeNode<Int, Int>>() | ||||||
|  |         for (i in -rangeRadius .. rangeRadius) { | ||||||
|  |             nodes[i] = zeroNode.upsertSubNode(i, i) | ||||||
|  |             if (i == zeroNode.key) { | ||||||
|  |                 zeroNode = nodes.getValue(i) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         for (i in -rangeRadius .. rangeRadius) { | ||||||
|  |             val expectedNode = nodes.getValue(i) | ||||||
|  |             val foundNode = zeroNode.findNode(i) | ||||||
|  |  | ||||||
|  |             assertEquals(expectedNode, foundNode) | ||||||
|  |  | ||||||
|  |             if (expectedNode === zeroNode) continue | ||||||
|  |  | ||||||
|  |             val parentNode = zeroNode.findParentNode(i) | ||||||
|  |             assertTrue( | ||||||
|  |                 parentNode ?.getLeftNode() === expectedNode || parentNode ?.getRightNode() === expectedNode, | ||||||
|  |                 "It is expected, that parent node with data ${parentNode ?.key} will be parent of ${expectedNode.key}, but its left subnode is ${parentNode ?.getLeftNode() ?.key} and right one is ${parentNode ?.getRightNode() ?.key}" | ||||||
|  |             ) | ||||||
|  |             assertTrue( | ||||||
|  |                 foundNode != null && expectedNode.deepEquals(foundNode) | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |             zeroNode.upsertSubNode(i, -i) | ||||||
|  |             val foundModifiedNode = zeroNode.findNode(i) | ||||||
|  |             assertEquals(foundNode ?.value, foundModifiedNode ?.value ?.times(-1)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun deepInsertOnWorks() = runTest(timeout = 240.seconds) { | ||||||
|  |         val zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||||
|  |         val rangeRadius = 500 | ||||||
|  |         val nodes = mutableMapOf<Int, SortedMapLikeBinaryTreeNode<Int, Int>>() | ||||||
|  |         for (i in -rangeRadius .. rangeRadius) { | ||||||
|  |             if (zeroNode.key != i) { | ||||||
|  |                 nodes[i] = zeroNode.upsertSubNode(i, i) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         nodes[zeroNode.key] = zeroNode | ||||||
|  |  | ||||||
|  |         for (i in -rangeRadius .. rangeRadius) { | ||||||
|  |             val expectedNode = nodes.getValue(i) | ||||||
|  |             val foundNode = zeroNode.findNode(i) | ||||||
|  |  | ||||||
|  |             assertTrue(expectedNode === foundNode) | ||||||
|  |  | ||||||
|  |             if (expectedNode === zeroNode) continue | ||||||
|  |  | ||||||
|  |             val parentNode = zeroNode.findParentNode(i) | ||||||
|  |             assertTrue( | ||||||
|  |                 parentNode ?.getLeftNode() === expectedNode || parentNode ?.getRightNode() === expectedNode, | ||||||
|  |                 "It is expected, that parent node with data ${parentNode ?.key} will be parent of ${expectedNode.key}, but its left subnode is ${parentNode ?.getLeftNode() ?.key} and right one is ${parentNode ?.getRightNode() ?.key}" | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         val sourceTreeSize = zeroNode.size() | ||||||
|  |  | ||||||
|  |         var previousData = -rangeRadius - 1 | ||||||
|  |         for (node in zeroNode) { | ||||||
|  |             assertTrue(nodes[node.key] === node) | ||||||
|  |             assertTrue(previousData == node.key - 1) | ||||||
|  |             previousData = node.key | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         assertTrue(sourceTreeSize == zeroNode.size()) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 | |||||||
| # Project data | # Project data | ||||||
|  |  | ||||||
| group=dev.inmo | group=dev.inmo | ||||||
| version=0.25.0 | version=0.25.5 | ||||||
| android_code_version=290 | android_code_version=295 | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								gradle/karma.config.d/timeout.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								gradle/karma.config.d/timeout.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | config.set({ | ||||||
|  |     client: { | ||||||
|  |         mocha: { | ||||||
|  |             timeout: 240000 | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | }); | ||||||
| @@ -1,13 +1,15 @@ | |||||||
| [versions] | [versions] | ||||||
|  |  | ||||||
| kt = "2.1.10" | kt = "2.1.20" | ||||||
| kt-serialization = "1.8.0" | kt-serialization = "1.8.1" | ||||||
| kt-coroutines = "1.10.1" | kt-coroutines = "1.10.2" | ||||||
|  |  | ||||||
|  | kotlinx-browser = "0.3" | ||||||
|  |  | ||||||
| kslog = "1.4.1" | kslog = "1.4.1" | ||||||
|  |  | ||||||
| jb-compose = "1.7.3" | jb-compose = "1.7.3" | ||||||
| jb-exposed = "0.59.0" | jb-exposed = "0.61.0" | ||||||
| jb-dokka = "2.0.0" | jb-dokka = "2.0.0" | ||||||
|  |  | ||||||
| sqlite = "3.49.1.0" | sqlite = "3.49.1.0" | ||||||
| @@ -15,15 +17,15 @@ sqlite = "3.49.1.0" | |||||||
| korlibs = "5.4.0" | korlibs = "5.4.0" | ||||||
| uuid = "0.8.4" | uuid = "0.8.4" | ||||||
|  |  | ||||||
| ktor = "3.1.1" | ktor = "3.1.2" | ||||||
|  |  | ||||||
| gh-release = "2.5.2" | gh-release = "2.5.2" | ||||||
|  |  | ||||||
| koin = "4.0.2" | koin = "4.0.4" | ||||||
|  |  | ||||||
| okio = "3.10.2" | okio = "3.10.2" | ||||||
|  |  | ||||||
| ksp = "2.1.10-1.0.31" | ksp = "2.1.20-1.0.31" | ||||||
| kotlin-poet = "1.18.1" | kotlin-poet = "1.18.1" | ||||||
|  |  | ||||||
| versions = "0.51.0" | versions = "0.51.0" | ||||||
| @@ -31,7 +33,7 @@ versions = "0.51.0" | |||||||
| android-gradle = "8.7.+" | android-gradle = "8.7.+" | ||||||
| dexcount = "4.0.0" | dexcount = "4.0.0" | ||||||
|  |  | ||||||
| android-coreKtx = "1.15.0" | android-coreKtx = "1.16.0" | ||||||
| android-recyclerView = "1.4.0" | android-recyclerView = "1.4.0" | ||||||
| android-appCompat = "1.7.0" | android-appCompat = "1.7.0" | ||||||
| android-fragment = "1.8.6" | android-fragment = "1.8.6" | ||||||
| @@ -39,8 +41,8 @@ android-espresso = "3.6.1" | |||||||
| android-test = "1.2.1" | android-test = "1.2.1" | ||||||
|  |  | ||||||
| android-props-minSdk = "21" | android-props-minSdk = "21" | ||||||
| android-props-compileSdk = "35" | android-props-compileSdk = "36" | ||||||
| android-props-buildTools = "35.0.0" | android-props-buildTools = "36.0.0" | ||||||
|  |  | ||||||
| [libraries] | [libraries] | ||||||
|  |  | ||||||
| @@ -55,6 +57,7 @@ kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-and | |||||||
| kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" } | kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" } | ||||||
| kt-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kt-coroutines" } | kt-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kt-coroutines" } | ||||||
|  |  | ||||||
|  | kotlinx-browser = { module = "org.jetbrains.kotlinx:kotlinx-browser-wasm-js", version.ref = "kotlinx-browser" } | ||||||
|  |  | ||||||
| ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" } | 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-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } | ||||||
|   | |||||||
							
								
								
									
										9
									
								
								gradle/templates/addCompose.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								gradle/templates/addCompose.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.runtime | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										9
									
								
								gradle/templates/addComposeForAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								gradle/templates/addComposeForAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         androidUnitTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.uiTest | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										15
									
								
								gradle/templates/addComposeForDesktop.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								gradle/templates/addComposeForDesktop.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         jvmMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.desktop.currentOs | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         jvmTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation compose.uiTest | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										9
									
								
								gradle/templates/addComposeForJs.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								gradle/templates/addComposeForJs.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         jsMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation compose.web.core | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										24
									
								
								gradle/templates/defaultProject.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								gradle/templates/defaultProject.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,24 @@ | |||||||
|  | project.version = "$version" | ||||||
|  | project.group = "$group" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('stdlib') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         commonTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-common') | ||||||
|  |                 implementation kotlin('test-annotations-common') | ||||||
|  |                 implementation libs.kt.coroutines.test | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|  | } | ||||||
							
								
								
									
										25
									
								
								gradle/templates/defaultProjectWithSerialization.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								gradle/templates/defaultProjectWithSerialization.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | |||||||
|  | project.version = "$version" | ||||||
|  | project.group = "$group" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('stdlib') | ||||||
|  |                 api libs.kt.serialization | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         commonTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-common') | ||||||
|  |                 implementation kotlin('test-annotations-common') | ||||||
|  |                 implementation libs.kt.coroutines.test | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_17 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_17 | ||||||
|  | } | ||||||
							
								
								
									
										31
									
								
								gradle/templates/enableMPPAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								gradle/templates/enableMPPAndroid.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,31 @@ | |||||||
|  | kotlin { | ||||||
|  |     androidTarget { | ||||||
|  |         publishAllLibraryVariants() | ||||||
|  |         compilations.all { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         androidUnitTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation libs.android.test.junit | ||||||
|  |                 implementation libs.android.espresso | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         androidInstrumentedTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |                 implementation libs.android.test.junit | ||||||
|  |                 implementation libs.android.espresso | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         androidMain.dependsOn jvmMain | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$defaultAndroidSettings" | ||||||
							
								
								
									
										30
									
								
								gradle/templates/enableMPPJs.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								gradle/templates/enableMPPJs.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  | kotlin { | ||||||
|  |     js (IR) { | ||||||
|  |         browser { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "240000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 useMocha { | ||||||
|  |                     timeout = "240000" | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         jsMain { | ||||||
|  |             dependencies { | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         jsTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-js') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										21
									
								
								gradle/templates/enableMPPJvm.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								gradle/templates/enableMPPJvm.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | kotlin { | ||||||
|  |     jvm { | ||||||
|  |         compilations.main { | ||||||
|  |             kotlinOptions { | ||||||
|  |                 jvmTarget = "17" | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         jvmMain { | ||||||
|  |             dependencies { | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         jvmTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-junit') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										8
									
								
								gradle/templates/enableMPPNativeArm64.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								gradle/templates/enableMPPNativeArm64.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | |||||||
|  | kotlin { | ||||||
|  |     linuxArm64() | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         nativeMain.dependsOn commonMain | ||||||
|  |         linuxArm64Main.dependsOn nativeMain | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										10
									
								
								gradle/templates/enableMPPNativeX64.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								gradle/templates/enableMPPNativeX64.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | kotlin { | ||||||
|  |     linuxX64() | ||||||
|  |     mingwX64() | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         nativeMain.dependsOn commonMain | ||||||
|  |         linuxX64Main.dependsOn nativeMain | ||||||
|  |         mingwX64Main.dependsOn nativeMain | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										27
									
								
								gradle/templates/enableMPPWasmJs.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								gradle/templates/enableMPPWasmJs.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | kotlin { | ||||||
|  |     wasmJs { | ||||||
|  |         browser { | ||||||
|  |             testTask { | ||||||
|  |                 useKarma { | ||||||
|  |                     useChromeHeadless() | ||||||
|  |                     useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d")) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         nodejs { | ||||||
|  |             testTask { | ||||||
|  |                 timeout = Duration.ofSeconds(240) | ||||||
|  |                 nodeJsArgs.add("--unhandled-rejections=warn") | ||||||
|  |                 nodeJsArgs.add("--trace-warnings") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     sourceSets { | ||||||
|  |         wasmJsTest { | ||||||
|  |             dependencies { | ||||||
|  |                 implementation kotlin('test-wasm-js') | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,37 +1,6 @@ | |||||||
| project.version = "$version" | apply from: "$defaultProject" | ||||||
| project.group = "$group" | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
| apply from: "$publish" | apply from: "$publish" | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -1,108 +0,0 @@ | |||||||
| project.version = "$version" |  | ||||||
| project.group = "$group" |  | ||||||
|  |  | ||||||
| apply from: "$publish" |  | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     linuxX64() |  | ||||||
|     mingwX64() |  | ||||||
|     linuxArm64() |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 implementation compose.runtime |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         androidUnitTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         androidInstrumentedTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.desktop.currentOs |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.web.core |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nativeMain.dependsOn commonMain |  | ||||||
|         linuxX64Main.dependsOn nativeMain |  | ||||||
|         mingwX64Main.dependsOn nativeMain |  | ||||||
|         linuxArm64Main.dependsOn nativeMain |  | ||||||
|  |  | ||||||
|         androidMain.dependsOn jvmMain |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
| @@ -0,0 +1,12 @@ | |||||||
|  | apply from: "$defaultProjectWithSerialization" | ||||||
|  | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
|  | apply from: "$enableMPPNativeX64" | ||||||
|  | apply from: "$enableMPPNativeArm64" | ||||||
|  | apply from: "$addCompose" | ||||||
|  | apply from: "$addComposeForAndroid" | ||||||
|  | apply from: "$addComposeForDesktop" | ||||||
|  | apply from: "$addComposeForJs" | ||||||
|  | apply from: "$publish" | ||||||
| @@ -1,40 +1,3 @@ | |||||||
| project.version = "$version" | apply from: "$defaultProject" | ||||||
| project.group = "$group" | apply from: "$enableMPPJvm" | ||||||
|  |  | ||||||
| apply from: "$publish" | apply from: "$publish" | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -1,88 +0,0 @@ | |||||||
| project.version = "$version" |  | ||||||
| project.group = "$group" |  | ||||||
|  |  | ||||||
| apply from: "$publish" |  | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     linuxX64() |  | ||||||
|     mingwX64() |  | ||||||
|     linuxArm64() |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         androidUnitTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nativeMain.dependsOn commonMain |  | ||||||
|         linuxX64Main.dependsOn nativeMain |  | ||||||
|         mingwX64Main.dependsOn nativeMain |  | ||||||
|         linuxArm64Main.dependsOn nativeMain |  | ||||||
|  |  | ||||||
|         androidMain.dependsOn jvmMain |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
| @@ -1,70 +0,0 @@ | |||||||
| project.version = "$version" |  | ||||||
| project.group = "$group" |  | ||||||
|  |  | ||||||
| apply from: "$publish" |  | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     linuxX64() |  | ||||||
|     mingwX64() |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         nativeMain.dependsOn commonMain |  | ||||||
|         linuxX64Main.dependsOn nativeMain |  | ||||||
|         mingwX64Main.dependsOn nativeMain |  | ||||||
|  |  | ||||||
|         androidMain.dependsOn jvmMain |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
| @@ -0,0 +1,8 @@ | |||||||
|  | apply from: "$defaultProjectWithSerialization" | ||||||
|  | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
|  | apply from: "$enableMPPNativeX64" | ||||||
|  | apply from: "$enableMPPNativeArm64" | ||||||
|  | apply from: "$publish" | ||||||
							
								
								
									
										6
									
								
								gradle/templates/mppJvmJsWasmJsLinuxMingwProject.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								gradle/templates/mppJvmJsWasmJsLinuxMingwProject.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | |||||||
|  | apply from: "$defaultProjectWithSerialization" | ||||||
|  | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPNativeX64" | ||||||
|  | apply from: "$publish" | ||||||
| @@ -1,98 +1,10 @@ | |||||||
| project.version = "$version" | apply from: "$defaultProjectWithSerialization" | ||||||
| project.group = "$group" | apply from: "$enableMPPJvm" | ||||||
|  | apply from: "$enableMPPJs" | ||||||
|  | apply from: "$enableMPPWasmJs" | ||||||
|  | apply from: "$enableMPPAndroid" | ||||||
|  | apply from: "$addCompose" | ||||||
|  | apply from: "$addComposeForAndroid" | ||||||
|  | apply from: "$addComposeForDesktop" | ||||||
|  | apply from: "$addComposeForJs" | ||||||
| apply from: "$publish" | apply from: "$publish" | ||||||
|  |  | ||||||
| kotlin { |  | ||||||
|     jvm { |  | ||||||
|         compilations.main { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     js (IR) { |  | ||||||
|         browser { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         nodejs { |  | ||||||
|             testTask { |  | ||||||
|                 useMocha { |  | ||||||
|                     timeout = "240000" |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|     androidTarget { |  | ||||||
|         publishAllLibraryVariants() |  | ||||||
|         compilations.all { |  | ||||||
|             kotlinOptions { |  | ||||||
|                 jvmTarget = "17" |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         commonMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('stdlib') |  | ||||||
|                 implementation compose.runtime |  | ||||||
|                 api libs.kt.serialization |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         commonTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-common') |  | ||||||
|                 implementation kotlin('test-annotations-common') |  | ||||||
|                 implementation libs.kt.coroutines.test |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.desktop.currentOs |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jvmTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsMain { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation compose.web.core |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         jsTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-js') |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|         androidUnitTest { |  | ||||||
|             dependencies { |  | ||||||
|                 implementation kotlin('test-junit') |  | ||||||
|                 implementation libs.android.test.junit |  | ||||||
|                 implementation libs.android.espresso |  | ||||||
|                 implementation compose.uiTest |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| apply from: "$defaultAndroidSettings" |  | ||||||
|  |  | ||||||
| java { |  | ||||||
|     sourceCompatibility = JavaVersion.VERSION_17 |  | ||||||
|     targetCompatibility = JavaVersion.VERSION_17 |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| //compose { |  | ||||||
| //    if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { |  | ||||||
| //        kotlinCompilerPlugin.set(composePluginKotlinVersion) |  | ||||||
| //    } |  | ||||||
| //} |  | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -17,11 +17,13 @@ kotlin { | |||||||
|         jvmMain { |         jvmMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api libs.kt.reflect |                 api libs.kt.reflect | ||||||
|  |                 api project(":micro_utils.coroutines") | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         androidMain { |         androidMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api libs.kt.reflect |                 api libs.kt.reflect | ||||||
|  |                 api project(":micro_utils.coroutines") | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ plugins { | |||||||
|     id "com.google.devtools.ksp" |     id "com.google.devtools.ksp" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,8 +4,14 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | 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 |  * Declares a factory with a random qualifier in the Koin module. | ||||||
|  * not care about how :) |  * This is useful when you need to declare multiple factory definitions of the same type | ||||||
|  |  * but want them to be uniquely identifiable without manually specifying qualifiers. | ||||||
|  |  * Unlike singles, factories create a new instance each time they are requested. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created by the factory | ||||||
|  |  * @param definition The definition function that creates new instances | ||||||
|  |  * @return A Koin definition for the factory with a random qualifier | ||||||
|  */ |  */ | ||||||
| inline fun <reified T : Any> Module.factoryWithRandomQualifier( | inline fun <reified T : Any> Module.factoryWithRandomQualifier( | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
|   | |||||||
| @@ -4,6 +4,16 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import org.koin.core.qualifier.StringQualifier | import org.koin.core.qualifier.StringQualifier | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Declares a factory with a string qualifier in the Koin module. | ||||||
|  |  * This is a convenience function that wraps the string qualifier in a [StringQualifier]. | ||||||
|  |  * Unlike singles, factories create a new instance each time they are requested. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created by the factory | ||||||
|  |  * @param qualifier The string value to be used as a qualifier | ||||||
|  |  * @param definition The definition function that creates new instances | ||||||
|  |  * @return A Koin definition for the factory with the specified string qualifier | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Module.factory( | inline fun <reified T : Any> Module.factory( | ||||||
|     qualifier: String, |     qualifier: String, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
|   | |||||||
| @@ -3,6 +3,21 @@ package dev.inmo.micro_utils.koin | |||||||
| import org.koin.core.Koin | import org.koin.core.Koin | ||||||
| import org.koin.core.scope.Scope | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves all instances of type [T] from the current [Scope] and returns them as a distinct list. | ||||||
|  |  * This function is useful when you want to avoid duplicate instances of the same type. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instances to retrieve | ||||||
|  |  * @return A list of distinct instances of type [T] | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Scope.getAllDistinct() = getAll<T>().distinct() | inline fun <reified T : Any> Scope.getAllDistinct() = getAll<T>().distinct() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves all instances of type [T] from the [Koin] container and returns them as a distinct list. | ||||||
|  |  * This function is useful when you want to avoid duplicate instances of the same type. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instances to retrieve | ||||||
|  |  * @return A list of distinct instances of type [T] | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Koin.getAllDistinct() = getAll<T>().distinct() | inline fun <reified T : Any> Koin.getAllDistinct() = getAll<T>().distinct() | ||||||
|  |  | ||||||
|   | |||||||
| @@ -3,6 +3,23 @@ package dev.inmo.micro_utils.koin | |||||||
| import org.koin.core.Koin | import org.koin.core.Koin | ||||||
| import org.koin.core.scope.Scope | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves the first available instance of type [T] from the current scope. | ||||||
|  |  * This is useful when you need any instance of a type and don't care which one. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @return The first available instance of type [T] | ||||||
|  |  * @throws NoSuchElementException if no instances of type [T] are available | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Scope.getAny() = getAll<T>().first() | inline fun <reified T : Any> Scope.getAny() = getAll<T>().first() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves the first available instance of type [T] from the Koin container. | ||||||
|  |  * This is useful when you need any instance of a type and don't care which one. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @return The first available instance of type [T] | ||||||
|  |  * @throws NoSuchElementException if no instances of type [T] are available | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Koin.getAny() = getAll<T>().first() | inline fun <reified T : Any> Koin.getAny() = getAll<T>().first() | ||||||
|  |  | ||||||
|   | |||||||
| @@ -7,33 +7,81 @@ import org.koin.core.instance.InstanceFactory | |||||||
| import org.koin.core.parameter.ParametersDefinition | import org.koin.core.parameter.ParametersDefinition | ||||||
| import org.koin.core.scope.Scope | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the Koin container using a [BeanDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The bean definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Koin.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Koin.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.primaryType, |     definition.primaryType, | ||||||
|     definition.qualifier, |     definition.qualifier, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the Koin container using an [InstanceFactory]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The instance factory to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Koin.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Koin.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.beanDefinition, |     definition.beanDefinition, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the Koin container using a [KoinDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The Koin definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Koin.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Koin.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.factory, |     definition.factory, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the current scope using a [BeanDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The bean definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Scope.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Scope.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.primaryType, |     definition.primaryType, | ||||||
|     definition.qualifier, |     definition.qualifier, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the current scope using an [InstanceFactory]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The instance factory to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Scope.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Scope.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.beanDefinition, |     definition.beanDefinition, | ||||||
|     parameters |     parameters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Retrieves an instance of type [T] from the current scope using a [KoinDefinition]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to retrieve | ||||||
|  |  * @param definition The Koin definition to use for instance retrieval | ||||||
|  |  * @param parameters Optional parameters to pass to the instance constructor | ||||||
|  |  * @return An instance of type [T] | ||||||
|  |  */ | ||||||
| fun <T> Scope.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | fun <T> Scope.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|     definition.factory, |     definition.factory, | ||||||
|     parameters |     parameters | ||||||
|   | |||||||
| @@ -3,4 +3,10 @@ package dev.inmo.micro_utils.koin | |||||||
| import com.benasher44.uuid.uuid4 | import com.benasher44.uuid.uuid4 | ||||||
| import org.koin.core.qualifier.StringQualifier | import org.koin.core.qualifier.StringQualifier | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Creates a [StringQualifier] with a random string value. | ||||||
|  |  * | ||||||
|  |  * @param randomFun A function that generates a random string. By default, it uses UUID4 string representation. | ||||||
|  |  * @return A [StringQualifier] with a randomly generated string value | ||||||
|  |  */ | ||||||
| fun RandomQualifier(randomFun: () -> String = { uuid4().toString() }) = StringQualifier(randomFun()) | fun RandomQualifier(randomFun: () -> String = { uuid4().toString() }) = StringQualifier(randomFun()) | ||||||
|   | |||||||
| @@ -4,8 +4,14 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | 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 |  * Declares a single instance with a random qualifier in the Koin module. | ||||||
|  * not care about how :) |  * This is useful when you need to declare multiple instances of the same type | ||||||
|  |  * but want them to be uniquely identifiable without manually specifying qualifiers. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created | ||||||
|  |  * @param createdAtStart Whether the instance should be created when the Koin module starts (default: false) | ||||||
|  |  * @param definition The definition function that creates the instance | ||||||
|  |  * @return A Koin definition for the single instance with a random qualifier | ||||||
|  */ |  */ | ||||||
| inline fun <reified T : Any> Module.singleWithRandomQualifier( | inline fun <reified T : Any> Module.singleWithRandomQualifier( | ||||||
|     createdAtStart: Boolean = false, |     createdAtStart: Boolean = false, | ||||||
|   | |||||||
| @@ -4,6 +4,16 @@ import org.koin.core.definition.Definition | |||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import org.koin.core.qualifier.StringQualifier | import org.koin.core.qualifier.StringQualifier | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Declares a single instance with a string qualifier in the Koin module. | ||||||
|  |  * This is a convenience function that wraps the string qualifier in a [StringQualifier]. | ||||||
|  |  * | ||||||
|  |  * @param T The type of instance to be created | ||||||
|  |  * @param qualifier The string value to be used as a qualifier | ||||||
|  |  * @param createdAtStart Whether the instance should be created when the Koin module starts (default: false) | ||||||
|  |  * @param definition The definition function that creates the instance | ||||||
|  |  * @return A Koin definition for the single instance with the specified string qualifier | ||||||
|  |  */ | ||||||
| inline fun <reified T : Any> Module.single( | inline fun <reified T : Any> Module.single( | ||||||
|     qualifier: String, |     qualifier: String, | ||||||
|     createdAtStart: Boolean = false, |     createdAtStart: Boolean = false, | ||||||
|   | |||||||
							
								
								
									
										32
									
								
								koin/src/jvmMain/kotlin/FactorySuspend.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								koin/src/jvmMain/kotlin/FactorySuspend.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,32 @@ | |||||||
|  | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.coroutines.doSynchronously | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import org.koin.core.module.Module | ||||||
|  | import org.koin.core.parameter.ParametersHolder | ||||||
|  | import org.koin.core.qualifier.Qualifier | ||||||
|  | import org.koin.core.qualifier.StringQualifier | ||||||
|  | import org.koin.core.scope.Scope | ||||||
|  | import kotlin.reflect.KClass | ||||||
|  |  | ||||||
|  | inline fun <reified T : Any> Module.factorySuspend( | ||||||
|  |     qualifier: Qualifier? = null, | ||||||
|  |     coroutineScope: CoroutineScope? = null, | ||||||
|  |     noinline definition: suspend Scope.(ParametersHolder) -> T | ||||||
|  | ) = factory( | ||||||
|  |     qualifier, | ||||||
|  |     if (coroutineScope == null) { | ||||||
|  |         { | ||||||
|  |             doSynchronously { | ||||||
|  |                 definition(it) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } else { | ||||||
|  |         { | ||||||
|  |             coroutineScope.doSynchronously { | ||||||
|  |                 definition(it) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | ) | ||||||
|  |  | ||||||
							
								
								
									
										32
									
								
								koin/src/jvmMain/kotlin/SingleSuspend.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								koin/src/jvmMain/kotlin/SingleSuspend.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,32 @@ | |||||||
|  | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.coroutines.doSynchronously | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import org.koin.core.module.Module | ||||||
|  | import org.koin.core.parameter.ParametersHolder | ||||||
|  | import org.koin.core.qualifier.StringQualifier | ||||||
|  | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | inline fun <reified T : Any> Module.singleSuspend( | ||||||
|  |     qualifier: StringQualifier, | ||||||
|  |     createdAtStart: Boolean = false, | ||||||
|  |     coroutineScope: CoroutineScope? = null, | ||||||
|  |     noinline definition: suspend Scope.(ParametersHolder) -> T | ||||||
|  | ) = single( | ||||||
|  |     qualifier, | ||||||
|  |     createdAtStart, | ||||||
|  |     if (coroutineScope == null) { | ||||||
|  |         { | ||||||
|  |             doSynchronously { | ||||||
|  |                 definition(it) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } else { | ||||||
|  |         { | ||||||
|  |             coroutineScope.doSynchronously { | ||||||
|  |                 definition(it) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | ) | ||||||
|  |  | ||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ plugins { | |||||||
|  |  | ||||||
| ext.do_publish = false | ext.do_publish = false | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ plugins { | |||||||
|  |  | ||||||
| ext.do_publish = false | ext.do_publish = false | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ plugins { | |||||||
|  |  | ||||||
| ext.do_publish = false | ext.do_publish = false | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -0,0 +1,63 @@ | |||||||
|  | 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.launchLoggingDropExceptions | ||||||
|  | import dev.inmo.micro_utils.ktor.common.TemporalFileId | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.content.* | ||||||
|  | import kotlinx.coroutines.* | ||||||
|  | import org.w3c.xhr.* | ||||||
|  | import org.w3c.xhr.XMLHttpRequest.Companion.DONE | ||||||
|  |  | ||||||
|  | suspend fun tempUpload( | ||||||
|  |     fullTempUploadDraftPath: String, | ||||||
|  |     file: MPPFile, | ||||||
|  |     onUpload: ProgressListener | ||||||
|  | ): 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.launchLoggingDropExceptions { onUpload.onProgress(it.loaded.toString().toLong(), it.total.toString().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: ProgressListener | ||||||
|  | ): TemporalFileId = dev.inmo.micro_utils.ktor.client.tempUpload(fullTempUploadDraftPath, file, onUpload) | ||||||
| @@ -0,0 +1,97 @@ | |||||||
|  | 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.launchLoggingDropExceptions | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.content.* | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import kotlinx.coroutines.CompletableDeferred | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.cancel | ||||||
|  | import kotlinx.coroutines.currentCoroutineContext | ||||||
|  | import kotlinx.coroutines.job | ||||||
|  | import kotlinx.io.readByteArray | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
|  | import kotlinx.serialization.StringFormat | ||||||
|  | import kotlinx.serialization.encodeToString | ||||||
|  | import org.khronos.webgl.toInt8Array | ||||||
|  | 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 | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     data: Map<String, Any>, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     headers: Headers, | ||||||
|  |     stringFormat: StringFormat, | ||||||
|  |     onUpload: ProgressListener | ||||||
|  | ): 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(v.inputAllocator().readByteArray().toInt8Array()).toJsArray().unsafeCast()), | ||||||
|  |                 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.launchLoggingDropExceptions { onUpload.onProgress(it.loaded.toString().toLong(), it.total.toString().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() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -0,0 +1,7 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.common | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.* | ||||||
|  | import io.ktor.utils.io.core.ByteReadPacket | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | actual fun MPPFile.input(): Input = ByteReadPacket(readBytes()) | ||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -4,4 +4,4 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ plugins { | |||||||
|     alias(libs.plugins.kt.jb.compose) |     alias(libs.plugins.kt.jb.compose) | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -2,7 +2,13 @@ package dev.inmo.micro_utils.pagination.compose | |||||||
|  |  | ||||||
| import androidx.compose.runtime.* | import androidx.compose.runtime.* | ||||||
| import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions | ||||||
|  | import dev.inmo.micro_utils.coroutines.runCatchingLogging | ||||||
| import dev.inmo.micro_utils.pagination.* | import dev.inmo.micro_utils.pagination.* | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Context for managing infinite pagination in a Compose UI. |  * Context for managing infinite pagination in a Compose UI. | ||||||
| @@ -16,30 +22,46 @@ import dev.inmo.micro_utils.pagination.* | |||||||
|  */ |  */ | ||||||
| class InfinityPagedComponentContext<T> internal constructor( | class InfinityPagedComponentContext<T> internal constructor( | ||||||
|     page: Int, |     page: Int, | ||||||
|     size: Int |     size: Int, | ||||||
|  |     private val scope: CoroutineScope, | ||||||
|  |     private val loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T> | ||||||
| ) { | ) { | ||||||
|     internal val startPage = SimplePagination(page, size) |     internal val startPage = SimplePagination(page, size) | ||||||
|     internal val currentlyLoadingPage = SpecialMutableStateFlow<Pagination?>(startPage) |  | ||||||
|     internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null) |     internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null) | ||||||
|     internal val dataState = SpecialMutableStateFlow<List<T>?>(null) |     internal val dataState = SpecialMutableStateFlow<List<T>?>(null) | ||||||
|  |     internal var loadingJob: Job? = null | ||||||
|  |     internal val loadingMutex = Mutex() | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Loads the next page of data. If the current page is the last one, the function returns early. |      * Loads the next page of data. If the current page is the last one, the function returns early. | ||||||
|      */ |      */ | ||||||
|     fun loadNext() { |     fun loadNext(): Job { | ||||||
|         if (latestLoadedPage.value ?.isLastPage == true) return |         return scope.launchLoggingDropExceptions { | ||||||
|         if (currentlyLoadingPage.value != null) return // Data loading has been inited but not loaded yet |             loadingMutex.withLock { | ||||||
|  |                 if (latestLoadedPage.value ?.isLastPage == true) return@launchLoggingDropExceptions | ||||||
|         currentlyLoadingPage.value = latestLoadedPage.value ?.nextPage() ?: startPage |                 loadingJob = loadingJob ?: scope.launchLoggingDropExceptions { | ||||||
|  |                     runCatching { | ||||||
|  |                         loader(latestLoadedPage.value ?.nextPage() ?: startPage) | ||||||
|  |                     }.onSuccess { | ||||||
|  |                         latestLoadedPage.value = it | ||||||
|  |                         dataState.value = (dataState.value ?: emptyList()) + it.results | ||||||
|  |                     } | ||||||
|  |                     loadingMutex.withLock { | ||||||
|  |                         loadingJob = null | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 loadingJob | ||||||
|  |             } ?.join() | ||||||
|  |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Reloads the pagination from the first page, clearing previously loaded data. |      * Reloads the pagination from the first page, clearing previously loaded data. | ||||||
|      */ |      */ | ||||||
|     fun reload() { |     fun reload(): Job { | ||||||
|         latestLoadedPage.value = null |         latestLoadedPage.value = null | ||||||
|         currentlyLoadingPage.value = null |         dataState.value = null | ||||||
|         loadNext() |         return loadNext() | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -58,17 +80,13 @@ internal fun <T> InfinityPagedComponent( | |||||||
|     page: Int, |     page: Int, | ||||||
|     size: Int, |     size: Int, | ||||||
|     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>, |     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>, | ||||||
|  |     predefinedScope: CoroutineScope? = null, | ||||||
|     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit |     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit | ||||||
| ) { | ) { | ||||||
|     val context = remember { InfinityPagedComponentContext<T>(page, size) } |     val scope = predefinedScope ?: rememberCoroutineScope() | ||||||
|  |     val context = remember { InfinityPagedComponentContext<T>(page, size, scope, loader) } | ||||||
|     val currentlyLoadingState = context.currentlyLoadingPage.collectAsState() |     remember { | ||||||
|     LaunchedEffect(currentlyLoadingState.value) { |         context.reload() | ||||||
|         val paginationResult = loader(context, currentlyLoadingState.value ?: return@LaunchedEffect) |  | ||||||
|         context.latestLoadedPage.value = paginationResult |  | ||||||
|         context.currentlyLoadingPage.value = null |  | ||||||
|  |  | ||||||
|         context.dataState.value = (context.dataState.value ?: emptyList()) + paginationResult.results |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     val dataState = context.dataState.collectAsState() |     val dataState = context.dataState.collectAsState() | ||||||
| @@ -88,12 +106,14 @@ internal fun <T> InfinityPagedComponent( | |||||||
| fun <T> InfinityPagedComponent( | fun <T> InfinityPagedComponent( | ||||||
|     pageInfo: Pagination, |     pageInfo: Pagination, | ||||||
|     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>, |     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>, | ||||||
|  |     predefinedScope: CoroutineScope? = null, | ||||||
|     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit |     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit | ||||||
| ) { | ) { | ||||||
|     InfinityPagedComponent( |     InfinityPagedComponent( | ||||||
|         pageInfo.page, |         pageInfo.page, | ||||||
|         pageInfo.size, |         pageInfo.size, | ||||||
|         loader, |         loader, | ||||||
|  |         predefinedScope, | ||||||
|         block |         block | ||||||
|     ) |     ) | ||||||
| } | } | ||||||
| @@ -111,7 +131,8 @@ fun <T> InfinityPagedComponent( | |||||||
| fun <T> InfinityPagedComponent( | fun <T> InfinityPagedComponent( | ||||||
|     size: Int, |     size: Int, | ||||||
|     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>, |     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>, | ||||||
|  |     predefinedScope: CoroutineScope? = null, | ||||||
|     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit |     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit | ||||||
| ) { | ) { | ||||||
|     InfinityPagedComponent(0, size, loader, block) |     InfinityPagedComponent(0, size, loader, predefinedScope, block) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -2,7 +2,12 @@ package dev.inmo.micro_utils.pagination.compose | |||||||
|  |  | ||||||
| import androidx.compose.runtime.* | import androidx.compose.runtime.* | ||||||
| import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions | ||||||
| import dev.inmo.micro_utils.pagination.* | import dev.inmo.micro_utils.pagination.* | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Context for managing paginated data in a Compose UI. |  * Context for managing paginated data in a Compose UI. | ||||||
| @@ -18,39 +23,73 @@ import dev.inmo.micro_utils.pagination.* | |||||||
|  */ |  */ | ||||||
| class PagedComponentContext<T> internal constructor( | class PagedComponentContext<T> internal constructor( | ||||||
|     initialPage: Int, |     initialPage: Int, | ||||||
|     size: Int |     size: Int, | ||||||
|  |     private val scope: CoroutineScope, | ||||||
|  |     private val loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T> | ||||||
| ) { | ) { | ||||||
|     internal val startPage = SimplePagination(initialPage, size) |     internal val startPage = SimplePagination(initialPage, size) | ||||||
|     internal val currentlyLoadingPageState = SpecialMutableStateFlow<Pagination?>(startPage) |  | ||||||
|     internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null) |     internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null) | ||||||
|  |     internal val dataState = SpecialMutableStateFlow<PaginationResult<T>?>(null) | ||||||
|  |     internal var loadingJob: Job? = null | ||||||
|  |     internal val loadingMutex = Mutex() | ||||||
|  |  | ||||||
|  |     private fun initLoadingJob( | ||||||
|  |         skipCheckerInLock: () -> Boolean, | ||||||
|  |         pageGetter: () -> Pagination | ||||||
|  |     ): Job { | ||||||
|  |         return scope.launchLoggingDropExceptions { | ||||||
|  |             loadingMutex.withLock { | ||||||
|  |                 if (skipCheckerInLock()) return@launchLoggingDropExceptions | ||||||
|  |                 loadingJob = loadingJob ?: scope.launchLoggingDropExceptions { | ||||||
|  |                     runCatching { | ||||||
|  |                         loader(pageGetter()) | ||||||
|  |                     }.onSuccess { | ||||||
|  |                         latestLoadedPage.value = it | ||||||
|  |                         dataState.value = it | ||||||
|  |                     } | ||||||
|  |                     loadingMutex.withLock { | ||||||
|  |                         loadingJob = null | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 loadingJob | ||||||
|  |             } ?.join() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Loads the next page of data. If the last page is reached, this function returns early. |      * Loads the next page of data. If the last page is reached, this function returns early. | ||||||
|      */ |      */ | ||||||
|     fun loadNext() { |     fun loadNext(): Job { | ||||||
|         when { |         return initLoadingJob( | ||||||
|             currentlyLoadingPageState.value != null -> return |             { latestLoadedPage.value ?.isLastPage == true } | ||||||
|             latestLoadedPage.value ?.isLastPage == true -> return |         ) { | ||||||
|             else -> currentlyLoadingPageState.value = (latestLoadedPage.value ?.nextPage()) ?: startPage |             latestLoadedPage.value ?.nextPage() ?: startPage | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Loads the previous page of data if available. |      * Loads the previous page of data if available. | ||||||
|      */ |      */ | ||||||
|     fun loadPrevious() { |     fun loadPrevious(): Job { | ||||||
|         when { |         return initLoadingJob( | ||||||
|             currentlyLoadingPageState.value != null -> return |             { latestLoadedPage.value ?.isFirstPage == true } | ||||||
|             latestLoadedPage.value ?.isFirstPage == true -> return |         ) { | ||||||
|             else -> currentlyLoadingPageState.value = (latestLoadedPage.value ?.previousPage()) ?: startPage |             latestLoadedPage.value ?.previousPage() ?: startPage | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Reloads the current page, refreshing the data. |      * Reloads the current page, refreshing the data. | ||||||
|      */ |      */ | ||||||
|     fun reload() { |     fun reload(): Job { | ||||||
|         currentlyLoadingPageState.value = latestLoadedPage.value |         return initLoadingJob( | ||||||
|  |             { | ||||||
|  |                 latestLoadedPage.value = null | ||||||
|  |                 true | ||||||
|  |             } | ||||||
|  |         ) { | ||||||
|  |             startPage | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -69,18 +108,16 @@ internal fun <T> PagedComponent( | |||||||
|     initialPage: Int, |     initialPage: Int, | ||||||
|     size: Int, |     size: Int, | ||||||
|     loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>, |     loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>, | ||||||
|  |     predefinedScope: CoroutineScope? = null, | ||||||
|     block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit |     block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit | ||||||
| ) { | ) { | ||||||
|     val context = remember { PagedComponentContext<T>(initialPage, size) } |     val scope = predefinedScope ?: rememberCoroutineScope() | ||||||
|  |     val context = remember { PagedComponentContext<T>(initialPage, size, scope, loader) } | ||||||
|     val currentlyLoadingState = context.currentlyLoadingPageState.collectAsState() |     remember { | ||||||
|     LaunchedEffect(currentlyLoadingState.value) { |         context.reload() | ||||||
|         val paginationResult = loader(context, currentlyLoadingState.value ?: return@LaunchedEffect) |  | ||||||
|         context.latestLoadedPage.value = paginationResult |  | ||||||
|         context.currentlyLoadingPageState.value = null |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     val pageState = context.latestLoadedPage.collectAsState() |     val pageState = context.dataState.collectAsState() | ||||||
|     pageState.value ?.let { |     pageState.value ?.let { | ||||||
|         context.block(it) |         context.block(it) | ||||||
|     } |     } | ||||||
| @@ -98,12 +135,14 @@ internal fun <T> PagedComponent( | |||||||
| fun <T> PagedComponent( | fun <T> PagedComponent( | ||||||
|     pageInfo: Pagination, |     pageInfo: Pagination, | ||||||
|     loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>, |     loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>, | ||||||
|  |     predefinedScope: CoroutineScope? = null, | ||||||
|     block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit |     block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit | ||||||
| ) { | ) { | ||||||
|     PagedComponent( |     PagedComponent( | ||||||
|         pageInfo.page, |         pageInfo.page, | ||||||
|         pageInfo.size, |         pageInfo.size, | ||||||
|         loader, |         loader, | ||||||
|  |         predefinedScope, | ||||||
|         block |         block | ||||||
|     ) |     ) | ||||||
| } | } | ||||||
| @@ -120,7 +159,8 @@ fun <T> PagedComponent( | |||||||
| fun <T> PagedComponent( | fun <T> PagedComponent( | ||||||
|     size: Int, |     size: Int, | ||||||
|     loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>, |     loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>, | ||||||
|  |     predefinedScope: CoroutineScope? = null, | ||||||
|     block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit |     block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit | ||||||
| ) { | ) { | ||||||
|     PagedComponent(0, size, loader, block) |     PagedComponent(0, size, loader, predefinedScope, block) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -30,13 +30,13 @@ class InfinityPagedComponentTests { | |||||||
|                 } |                 } | ||||||
|             ) { |             ) { | ||||||
|                 if (it == null) { |                 if (it == null) { | ||||||
|                     assertEquals(0, this.currentlyLoadingPage.value ?.page) |                     assertEquals(null, it) | ||||||
|                 } else { |                 } else { | ||||||
|                     assertEquals(expectedList, it) |                     assertEquals(expectedList, it) | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|                 LaunchedEffect(it ?.size) { |                 LaunchedEffect(it ?.size) { | ||||||
|                     loadNext() |                     loadNext().join() | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								repos/cache/build.gradle
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								repos/cache/build.gradle
									
									
									
									
										vendored
									
									
								
							| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
| @@ -0,0 +1,14 @@ | |||||||
|  | package dev.inmo.micro_utils.repos.annotations | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @RequiresOptIn( | ||||||
|  |     "Overriding of this invalidate message requires manual launching of invalidation on class initialization process", | ||||||
|  |     RequiresOptIn.Level.WARNING | ||||||
|  | ) | ||||||
|  | @Target( | ||||||
|  |     AnnotationTarget.CONSTRUCTOR, | ||||||
|  |     AnnotationTarget.FIELD, | ||||||
|  |     AnnotationTarget.PROPERTY, | ||||||
|  |     AnnotationTarget.FUNCTION, | ||||||
|  | ) | ||||||
|  | annotation class OverrideRequireManualInvalidation | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user