mirror of
				https://github.com/InsanusMokrassar/MicroUtils.git
				synced 2025-10-31 12:10:29 +00:00 
			
		
		
		
	Compare commits
	
		
			350 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4d155d0505 | |||
| a169e733d9 | |||
| f081e237c8 | |||
| f412d387fa | |||
| 67354b43e2 | |||
| 39135a4000 | |||
| eaa014cebd | |||
| 856e657f81 | |||
| 3a609e5b66 | |||
| d0022dd599 | |||
| 7ba6eed453 | |||
| beeb6ecc0a | |||
| 7cdc17a714 | |||
| 4765a950a9 | |||
| 65e8137e08 | |||
| ae546dd9ad | |||
| 8110c42be0 | |||
| bd2b5ae5fc | |||
| 2ddfffa6a9 | |||
| a4b54e861d | |||
| c6785f1a4f | |||
| 83fe621c56 | |||
| b3a93e17eb | |||
| 546a391af3 | |||
| 786cf9bd8b | |||
| dfd6fe062d | |||
| b6ef818613 | |||
| b0f9e9c30a | |||
| 7e5c88ddc3 | |||
| 9824c3e00f | |||
| 9171d5ed11 | |||
| a1830ebb82 | |||
| 22d2a3d9bf | |||
| c9b97fc965 | |||
| 51f85becd5 | |||
| a8a281cfb4 | |||
| ddd1304949 | |||
| 86d70b6c02 | |||
| a22bdb39e7 | |||
| 7ae4d5ef95 | |||
| a2038cbefa | |||
| 992091eade | |||
| e3bfead0c5 | |||
| 0de96141fd | |||
| fa18d15c3c | |||
| ea9dbf2371 | |||
| d34e3ec7a9 | |||
| c8833a36af | |||
| a067cb0c0f | |||
| 999c8327bd | |||
| c2ec73c70a | |||
| 702f782fc1 | |||
| 25dbcaaf83 | |||
| b00d454a24 | |||
| dbc921d56d | |||
| 438fefa7a3 | |||
| 5d74eac814 | |||
| 9fb62e1e25 | |||
| 3e366ea73b | |||
| 0ff895bffa | |||
| c5bb120280 | |||
| 4b26a92b37 | |||
| 0a8453b4d2 | |||
| c9872a61b6 | |||
| 149a1aa278 | |||
| 13d0e1b682 | |||
| 6f9be2a9f8 | |||
| 93ba98d993 | |||
| 940ee3df06 | |||
| 2e7bab10fd | |||
|  | 3ed70a37ea | ||
| fe8f80b9d9 | |||
| d81fb32fb9 | |||
| 2877b5532c | |||
| b938b21395 | |||
| 58836359cc | |||
| 5edb0e1331 | |||
| 0f0d0b5d58 | |||
| 46c1887cbe | |||
| 5f231c2212 | |||
| 4e97ce86aa | |||
| 315a7cb29e | |||
| aa7cc503f2 | |||
| 4bbe7e5a80 | |||
| d9c05f38d2 | |||
| cd0c4c9650 | |||
| fc3407f104 | |||
| 3a5544206b | |||
| e17e2f7fb8 | |||
|  | d32c95f143 | ||
| 6d8a8ab018 | |||
| a7dce8fa78 | |||
| ca73ff8e19 | |||
| d01ad10d7d | |||
| 81041ee43c | |||
|  | 6e004c2ae4 | ||
| 0e2fac5b22 | |||
| 269da7f155 | |||
| 3cb6b73ee0 | |||
| a938ee1efb | |||
| 6ea5e2e5a6 | |||
| 617dfb54e0 | |||
| d23e005985 | |||
| e5207f5bc5 | |||
| c96cea8db0 | |||
| 0a8e71d76a | |||
| cf1fd32b08 | |||
| cc4224ea1f | |||
| f4c148bc58 | |||
| 022297ad3f | |||
| 5180d6fc3e | |||
| eeebbff70d | |||
| afc6aeea15 | |||
| 486515eddd | |||
| 0e21699cd1 | |||
| f1678ef7cf | |||
| cea65fc76e | |||
| c9e320b72a | |||
| 555956087d | |||
| b3f468f901 | |||
| f5f7511781 | |||
| 4be1d93f60 | |||
| 7d684608ef | |||
| 2c7fd320eb | |||
| 88ee82e1c6 | |||
| d6402c624e | |||
| 8b9c93bc10 | |||
| 4f5e261d01 | |||
| cf455aebe6 | |||
| 1380d5f8e1 | |||
| 5f65260bfe | |||
| 11f0dcfc01 | |||
| 555b7886a4 | |||
| 3707a6c0ce | |||
| 4c8d92b4c3 | |||
| 8bbd33c896 | |||
| ac33a3580f | |||
| a64a32fbe6 | |||
| 9493e97a38 | |||
| 88bd770260 | |||
| a7bd33b7bf | |||
| 73c724a2e5 | |||
| d8cf3c6726 | |||
| 15dee238b5 | |||
| c70626734e | |||
| 5a765ea1bc | |||
| 8215f9d2c6 | |||
| d2e6d2ec80 | |||
| 3718181e8f | |||
| 0d825cf424 | |||
| 28a804d988 | |||
| 9e4bb9d678 | |||
| 9c40d7da3d | |||
| 2b76ad0aa9 | |||
| e4b619e050 | |||
| 36c09feaf2 | |||
| 2d68321503 | |||
| 85455ab21c | |||
| 18d63eb980 | |||
| 2e429e9704 | |||
| f4af28059b | |||
| c1476bd075 | |||
| 16c720fddd | |||
| 8b4b4a5eca | |||
| 32e6e5b7e2 | |||
| a9f7fd8e32 | |||
| 95be1a26f2 | |||
| ef9b31aee0 | |||
| df3c01ff0a | |||
| 4704c5a33d | |||
| 225c06550a | |||
| f0987614c6 | |||
| 269c2876f3 | |||
| 168d6acf7c | |||
| a5f718e257 | |||
| 4f68459582 | |||
| 442db122cf | |||
| 580d757be2 | |||
| 47b0f6d2d8 | |||
| 3f6f6ebc2b | |||
| 2645ea29d6 | |||
| 79f2041565 | |||
| 4a7567f288 | |||
| 8a890ed6ed | |||
| 3d90df6897 | |||
| 681c13144a | |||
| b64f2e6d32 | |||
| 428eabb1bd | |||
| 2162e83bce | |||
| 6142022283 | |||
| e6d9c8250f | |||
| 46178e723b | |||
| 605f55acd2 | |||
| 0f8b69aa60 | |||
| 551d8ec480 | |||
| fc48446ec4 | |||
| 3644b83ac6 | |||
| cd73791b6f | |||
| 03de71df2e | |||
| 83d5d3faf4 | |||
| 0c8bec4c89 | |||
| 7fc93817c1 | |||
| d0a00031a1 | |||
| 6ebc5aa0c2 | |||
| 8a6b4bb49e | |||
| 20799b9a3e | |||
| ec3afc615c | |||
| da692ccfc3 | |||
| 53b89f3a18 | |||
| 58cded28d3 | |||
| 592c5f3732 | |||
| f44a78a5f5 | |||
| e0bdd5dfdc | |||
| 99c0f06b72 | |||
| 66fc6df3d7 | |||
| a36425a905 | |||
| d920fee6d4 | |||
| 23590be5de | |||
| 94acc3c93b | |||
| 5616326a3b | |||
| 7601860c5c | |||
| 8b43d785cc | |||
| b62d3a0b7d | |||
| fad73c7213 | |||
| 2403c7c2b0 | |||
| fa090bf920 | |||
| a83ee86340 | |||
| 204955bcce | |||
| ee56e9543a | |||
| 96fdff6ffd | |||
| 58b007cbb3 | |||
| 4f0c139889 | |||
| c584c24fce | |||
| 85e5cee154 | |||
| 5af91981f1 | |||
| 2fe4f08059 | |||
| 83796f345a | |||
| c1e21364a6 | |||
| 067d9d0d3b | |||
| 03f527d83e | |||
| ced05a4586 | |||
| 43fe06206a | |||
| 023657558e | |||
| 9b0b726c80 | |||
| 4ee67321c4 | |||
| 59f1f2e59b | |||
| 0766d48b7c | |||
| e18903b9e9 | |||
| d0eecdead2 | |||
| cc4a83a033 | |||
| 1cf911bbde | |||
| 36d73d5023 | |||
| c395242e3e | |||
| cd9cd7cc5d | |||
| acbb8a0c07 | |||
| b9d8528599 | |||
| 4971326eca | |||
| 09d1047260 | |||
| 02dbd493c2 | |||
| b17931e7bd | |||
| 2a4570eafc | |||
| c9514d3a6d | |||
| 072805efc7 | |||
| 369ff26627 | |||
| c5abbbbd2d | |||
| d974639f1e | |||
| 26efde316b | |||
| fafe50f80a | |||
| 41504469db | |||
| 03b3ddd98b | |||
| 89d919f2be | |||
| b53cfd5504 | |||
| 31022733ac | |||
| f9a8c39879 | |||
| a812c2dd2f | |||
| 217e977f0d | |||
| 04c301d1ac | |||
| 7f0c425389 | |||
| 1ede1c423b | |||
| 7cb064896a | |||
| 0c5e2862ca | |||
| 30d4507f54 | |||
| b6c6d89455 | |||
| 9d218ee534 | |||
| 11116d8cab | |||
| 58d754bbde | |||
| 8f25c123dd | |||
| 76e214fc08 | |||
| 2b5380f8d6 | |||
| 844a129094 | |||
| a3090cca9d | |||
| b7b5159e9c | |||
| 0f8bc2c950 | |||
| 69f5c49f45 | |||
| 9b308e6fb8 | |||
| 3e3f91128b | |||
| 0d1aae0ef7 | |||
| 4d022f0480 | |||
| 153e20d00e | |||
| a9a8171dd6 | |||
| bf5c3b59b2 | |||
| 607c432bdb | |||
| ae5c010770 | |||
| d5e432437f | |||
| 9f99ebce01 | |||
| 64ee899b84 | |||
| e0e0c1658b | |||
| 2c586f667c | |||
| 64164ef6c1 | |||
| 22343c0731 | |||
| f4ec1a4c60 | |||
| c1c33cceb1 | |||
| a3e975b2ba | |||
| 06e705a687 | |||
| d56eb6c867 | |||
| 9cbca864e3 | |||
| abb4378694 | |||
| 0eb698d9a4 | |||
| 15ea9f2093 | |||
| d47aca0923 | |||
| 1ac50e9959 | |||
| 6adfbe3a96 | |||
| 59f36e62e9 | |||
| 54af116009 | |||
| 38fbec8e3b | |||
| babbfc55e4 | |||
| 2511e18d69 | |||
| 29658c70a0 | |||
| 96311ee43d | |||
| bd33b09052 | |||
| 8055003b47 | |||
| 1257492f85 | |||
| 1107b7f4ef | |||
| a1a1171240 | |||
| 46c02e5df1 | |||
| 2e9efc57de | |||
| acecadef17 | |||
| 19394b5e69 | |||
| de999e197f | |||
| 9d95687d3c | |||
| aa9dfb4ab8 | |||
| 9c5b44efb3 | |||
| ac587a67e6 | |||
| 59428140a8 | |||
| 60bdb59d71 | |||
| be52871de8 | |||
| b7934cf357 | |||
| dbfbeef90a | |||
| 00943c9cdf | |||
| 8745c6a16a | 
							
								
								
									
										14
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -9,9 +9,6 @@ jobs: | |||||||
|       - uses: actions/setup-java@v1 |       - uses: actions/setup-java@v1 | ||||||
|         with: |         with: | ||||||
|           java-version: 11 |           java-version: 11 | ||||||
|       - name: Fix android 32.0.0 dx |  | ||||||
|         continue-on-error: true |  | ||||||
|         run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar |  | ||||||
|       - name: Rewrite version |       - name: Rewrite version | ||||||
|         run: | |         run: | | ||||||
|           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" |           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" | ||||||
| @@ -20,9 +17,8 @@ jobs: | |||||||
|           mv gradle.properties.tmp gradle.properties |           mv gradle.properties.tmp gradle.properties | ||||||
|       - name: Build |       - name: Build | ||||||
|         run: ./gradlew build |         run: ./gradlew build | ||||||
| #      - name: Publish |       - name: Publish | ||||||
| #        continue-on-error: true |         continue-on-error: true | ||||||
| #        run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository |         run: ./gradlew publishAllPublicationsToGiteaRepository | ||||||
| #        env: |         env: | ||||||
| #          GITHUBPACKAGES_USER: ${{ github.actor }} |           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||||
| #          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }} |  | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								.github/workflows/dokka_push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/dokka_push.yml
									
									
									
									
										vendored
									
									
								
							| @@ -11,9 +11,6 @@ jobs: | |||||||
|       - uses: actions/setup-java@v1 |       - uses: actions/setup-java@v1 | ||||||
|         with: |         with: | ||||||
|           java-version: 11 |           java-version: 11 | ||||||
|       - name: Fix android 32.0.0 dx |  | ||||||
|         continue-on-error: true |  | ||||||
|         run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar |  | ||||||
|       - name: Build |       - name: Build | ||||||
|         run: ./gradlew build && ./gradlew dokkaHtml |         run: ./gradlew build && ./gradlew dokkaHtml | ||||||
|       - name: Publish KDocs |       - name: Publish KDocs | ||||||
|   | |||||||
| @@ -1,8 +0,0 @@ | |||||||
| job("Build and run tests") { |  | ||||||
|     container(displayName = "Run gradle build", image = "openjdk:11") { |  | ||||||
|         kotlinScript { api -> |  | ||||||
|             // here can be your complex logic |  | ||||||
|             api.gradlew("build") |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
							
								
								
									
										434
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										434
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,439 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## 0.19.9 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.4.2` -> `3.4.3` | ||||||
|  | * `Startup`: | ||||||
|  |     * Now it is possible to start application in synchronous way | ||||||
|  |  | ||||||
|  | ## 0.19.8 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.7.2` -> `1.7.3` | ||||||
|  |     * `Kotlin`: `1.8.20` -> `1.8.22` | ||||||
|  |     * `Compose`: `1.4.1` -> `1.4.3` | ||||||
|  |     * `Okio`: `3.3.0` -> `3.4.0` | ||||||
|  |     * `RecyclerView`: `1.3.0` -> `1.3.1` | ||||||
|  |     * `Fragment`: `1.6.0` -> `1.6.1` | ||||||
|  | * `Repos`: | ||||||
|  |     * Fixes In `KeyValueRepo.clear()` of almost all inheritors of `KeyValueRepo` | ||||||
|  |     * `Cache`: | ||||||
|  |         * All full caches got `skipStartInvalidate` property. By default, this property is `false` and fully caching repos | ||||||
|  |           will be automatically invalidated on start of their work | ||||||
|  |  | ||||||
|  | ## 0.19.7 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.7.1` -> `1.7.2` | ||||||
|  |  | ||||||
|  | ## 0.19.6 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.6.4` -> `1.7.1` | ||||||
|  |     * `Ktor`: `2.3.1` -> `2.3.2` | ||||||
|  |     * `Compose`: `1.4.0` -> `1.4.1` | ||||||
|  |  | ||||||
|  | ## 0.19.5 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Fixes in new type generation | ||||||
|  |  | ||||||
|  | ## 0.19.4 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.4.1` -> `3.4.2` | ||||||
|  |     * `Android Fragments`: `1.5.7` -> `1.6.0` | ||||||
|  | * `Koin` | ||||||
|  |     * `Generator` | ||||||
|  |         * Fixes in new generic generator part | ||||||
|  |  | ||||||
|  | ## 0.19.3 | ||||||
|  |  | ||||||
|  | * `Koin` | ||||||
|  |     * `Generator` | ||||||
|  |         * New getter methods now available with opportunity to use parameters | ||||||
|  |         * Old notation `*Single` and `*Factory` is deprecated since this release. With old | ||||||
|  |           will be generated new `single*` and `factory*` notations for new generations | ||||||
|  |         * Add opportunity to use generic-oriented koin definitions | ||||||
|  |  | ||||||
|  | ## 0.19.2 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.0` -> `2.3.1` | ||||||
|  |     * `Koin`: `3.4.0` -> `3.4.1` | ||||||
|  |     * `Uuid`: `0.7.0` -> `0.7.1` | ||||||
|  |  | ||||||
|  | ## 0.19.1 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Korlibs`: `4.0.1` -> `4.0.3` | ||||||
|  |     * `Kotlin Poet`: `1.13.2` -> `1.14.0` | ||||||
|  |  | ||||||
|  | ## 0.19.0 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Korlibs`: `3.4.0` -> `4.0.1` | ||||||
|  |  | ||||||
|  | ## 0.18.4 | ||||||
|  |  | ||||||
|  | * `Koin`: | ||||||
|  |     * New extension `lazyInject` | ||||||
|  |  | ||||||
|  | ## 0.18.3 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.5.0` -> `1.5.1` | ||||||
|  |     * `Android Cor Ktx`: `1.10.0` -> `1.10.1` | ||||||
|  |  | ||||||
|  | ## 0.18.2 | ||||||
|  |  | ||||||
|  | * `Startup`: | ||||||
|  |     * Now internal `Json` is fully customizable | ||||||
|  |  | ||||||
|  | ## 0.18.1 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Add `MapDiff` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Add `SmartMutex` | ||||||
|  |  | ||||||
|  | ## 0.18.0 | ||||||
|  |  | ||||||
|  | **ALL PREVIOUSLY DEPRECATED FUNCTIONALITY HAVE BEEN REMOVED** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Fragments`: `1.5.6` -> `1.5.7` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Server`: | ||||||
|  |         * Now it is possible to take query parameters as list | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * New `WriteKeyValuesRepo.removeWithValue` | ||||||
|  |     * `Cache`: | ||||||
|  |         * Rename full caching factories functions to `fullyCached` | ||||||
|  |  | ||||||
|  | ## 0.17.8 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.2.4` -> `2.3.0` | ||||||
|  |  | ||||||
|  | ## 0.17.7 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android CoreKtx`: `1.9.0` -> `1.10.0` | ||||||
|  | * `Startup`: | ||||||
|  |     * Add support of `linuxX64` and `mingwX64` platforms | ||||||
|  |  | ||||||
|  | ## 0.17.6 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.8.10` -> `1.8.20` | ||||||
|  |     * `KSLog`: `1.0.0` -> `1.1.1` | ||||||
|  |     * `Compose`: `1.3.1` -> `1.4.0` | ||||||
|  |     * `Koin`: `3.3.2` -> `3.4.0` | ||||||
|  |     * `RecyclerView`: `1.2.1` -> `1.3.0` | ||||||
|  |     * `Fragment`: `1.5.5` -> `1.5.6` | ||||||
|  | * Experimentally (`!!!`) add `linuxX64` and `mingwX64` targets | ||||||
|  |  | ||||||
|  | ## 0.17.5 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Conversations of number primitives with bounds care | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * By default, `getAll` for repos will take all the size of repo as page size | ||||||
|  |         * New extension for all built-in repos `maxPagePagination` | ||||||
|  |     * All the repos got `getAll` functions | ||||||
|  |  | ||||||
|  | ## 0.17.4 | ||||||
|  |  | ||||||
|  | * `Serialization`: | ||||||
|  |     * `Mapper`: | ||||||
|  |         * Module inited | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.3.1-rc02` -> `1.3.1` | ||||||
|  |  | ||||||
|  | ## 0.17.3 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Add `fixed` extensions for `Float` and `Double` | ||||||
|  |     * New function `emptyDiff` | ||||||
|  |     * Now you may pass custom `comparisonFun` to all `diff` functions | ||||||
|  |  | ||||||
|  | ## 0.17.2 | ||||||
|  |  | ||||||
|  | * `FSM`: | ||||||
|  |     * `DefaultStatesManager.onUpdateContextsConflictResolver` and `DefaultStatesManager.onStartContextsConflictResolver` now return `false` by default | ||||||
|  |  | ||||||
|  | ## 0.17.1 | ||||||
|  |  | ||||||
|  | * **Hotfix** for absence of jvm dependencies in android modules | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.2.3` -> `2.2.4` | ||||||
|  |  | ||||||
|  | ## 0.17.0 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.7.20` -> `1.8.10` | ||||||
|  |     * `Serialization`: `1.4.1` -> `1.5.0` | ||||||
|  |     * `KSLog`: `0.5.4` -> `1.0.0` | ||||||
|  |     * `AppCompat`: `1.6.0` -> `1.6.1` | ||||||
|  |  | ||||||
|  | ## 0.16.13 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Module has been created | ||||||
|  |  | ||||||
|  | ## 0.16.12 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed`: | ||||||
|  |         * `CommonExposedRepo.selectByIds` uses `foldRight` by default instead of raw foreach | ||||||
|  | * `Koin`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Module has been created | ||||||
|  |  | ||||||
|  | ## 0.16.11 | ||||||
|  |  | ||||||
|  | * `LanguageCodes`: | ||||||
|  |     * In android and JVM targets now available `toJavaLocale` and from Java `Locale` conversations from/to | ||||||
|  |       `IetfLanguageCode` | ||||||
|  |  | ||||||
|  | ## 0.16.10 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * New transformer type: `ReadCRUDFromKeyValueRepo` | ||||||
|  |         * New transformer type: `ReadKeyValueFromCRUDRepo` | ||||||
|  | * `Pagination`: | ||||||
|  |     * New `paginate` extensions with `reversed` support for `List`/`Set` | ||||||
|  |  | ||||||
|  | ## 0.16.9 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.2.2` -> `3.3.2` | ||||||
|  |     * `AppCompat`: `1.5.1` -> `1.6.0` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Client` | ||||||
|  |         * `HttpResponse.bodyOrNull` now retrieve callback to check if body should be received or null | ||||||
|  |         * New extension `HttpResponse.bodyOrNullOnNoContent` | ||||||
|  |  | ||||||
|  | ## 0.16.8 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.2.2` -> `2.2.3` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Client` | ||||||
|  |         * Fixes in `HttpClient.uniUpload` | ||||||
|  |     * `Server` | ||||||
|  |         * Fixes in `PartData.FileItem.download` | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * New type of caches: `FallbackCacheRepo` | ||||||
|  |         * Fixes in `Write*` variants of cached repos | ||||||
|  |         * New type `ActionWrapper` | ||||||
|  |         * New `AutoRecache*` classes for all types of repos as `FallbackCacheRepo`s | ||||||
|  |     * `Common`: | ||||||
|  |         * New transformations for key-value and key-values vice-verse | ||||||
|  |         * Fixes in `FileReadKeyValueRepo` | ||||||
|  |  | ||||||
|  | ## 0.16.7 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * New extensions `ifTrue`/`ifFalse`/`alsoIfTrue`/`alsoIfFalse`/`letIfTrue`/`letIfFalse` | ||||||
|  |     * `Diff` now is serializable | ||||||
|  |     * Add `IndexedValue` serializer | ||||||
|  |     * `repeatOnFailure` extending: now you may pass any lambda to check if continue to try/do something | ||||||
|  |     * `Compose`: | ||||||
|  |         * New extension `MutableState.asState` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `Compose`: | ||||||
|  |         * All the `Flow` conversations to compose `State`/`MutableState`/`SnapshotStateList`/`List` got several new | ||||||
|  |         parameters | ||||||
|  |         * `Flow.toMutableState` now is deprecated in favor to `asMutableComposeState` | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * New type `FullCacheRepo` | ||||||
|  |         * New type `CommonCacheRepo` | ||||||
|  |         * `CacheRepo` got `invalidate` method. It will fully reload `FullCacheRepo` and just clear `CommonCacheRepo` | ||||||
|  |         * New extensions `KVCache.actualizeAll` | ||||||
|  |  | ||||||
|  | ## 0.16.6 | ||||||
|  |  | ||||||
|  | * `Startup`: | ||||||
|  |     * `Launcher`: | ||||||
|  |         * Improvements in `StartLauncherPlugin#start` methods | ||||||
|  |         * Add opportunity to pass second argument on `JVM` platform as log level | ||||||
|  | * `Repos`: | ||||||
|  |     * `Ktor`: | ||||||
|  |         * `Client`: | ||||||
|  |             * All clients repos got opportunity to customize their flows | ||||||
|  |     * `Exposed`: | ||||||
|  |         * Extensions `eqOrIsNull` and `neqOrIsNotNull` for `Column` | ||||||
|  |  | ||||||
|  | ## 0.16.5 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.2.1` -> `2.2.2` | ||||||
|  |  | ||||||
|  | ## 0.16.4 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Create `launchInCurrentThread` | ||||||
|  |  | ||||||
|  | ## 0.16.3 | ||||||
|  |  | ||||||
|  | * `Startup`: | ||||||
|  |     * `Launcher`: | ||||||
|  |         * All starting API have been moved into `StartLauncherPlugin` and do not require serialize/deserialize cycle for now | ||||||
|  |  | ||||||
|  | ## 0.16.2 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.2.1` -> `1.2.2` | ||||||
|  | * `Startup`: | ||||||
|  |     * Module become available on `JS` target | ||||||
|  |  | ||||||
|  | ## 0.16.1 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * New `runCatchingSafely`/`safelyWithResult` with receivers | ||||||
|  | * `SafeWrapper`: | ||||||
|  |     * Module inited | ||||||
|  |  | ||||||
|  | ## 0.16.0 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.1.3` -> `2.2.1` | ||||||
|  |     * `Android Fragment`: `1.5.3` -> `1.5.5` | ||||||
|  |  | ||||||
|  | ## 0.15.1 | ||||||
|  |  | ||||||
|  | * `Startup`: | ||||||
|  |     * Inited :) | ||||||
|  |     * `Plugin`: | ||||||
|  |         * Inited :) | ||||||
|  |     * `Launcher`: | ||||||
|  |         * Inited :) | ||||||
|  |  | ||||||
|  | ## 0.15.0 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `CRUD`: | ||||||
|  |         * `Common`: | ||||||
|  |             * New method `ReadCRUDRepo#getIdsByPagination` | ||||||
|  |         * `Android`: | ||||||
|  |             * `AbstractAndroidCRUDRepo` got new abstract method `toId` | ||||||
|  |         * `Exposed`: | ||||||
|  |             * `CommonExposedRepo` new abstract property `asId` | ||||||
|  |         * `Ktor`: | ||||||
|  |             * `Client`: | ||||||
|  |                 * `KtorReadCRUDRepoClient` now requires `paginationIdType` | ||||||
|  | * `LanguageCodes`: | ||||||
|  |     * Updates and fixes in generation | ||||||
|  | * `MimeTypes`: | ||||||
|  |     * Updates and fixes in generation | ||||||
|  |  | ||||||
|  | ## 0.14.4 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * `JVM`: | ||||||
|  |         * New extension `downloadToTempFile` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Server`: | ||||||
|  |         * Small fix in `handleUniUpload` | ||||||
|  |         * `ApplicationCall#uniloadMultipartFile` now uses `uniloadMultipart` | ||||||
|  |     * `Common`: | ||||||
|  |         * New extension `downloadToTempFile` | ||||||
|  |     * `Client`: | ||||||
|  |         * New extensions on top of `uniUpload` | ||||||
|  |  | ||||||
|  | ## 0.14.3 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * New type `Progress` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Client`: | ||||||
|  |         * New universal `uniUpload` extension for `HttpClient` | ||||||
|  |     * `Server`: | ||||||
|  |         * New universal `handleUniUpload` extension for `ApplicationCall` | ||||||
|  |         * Add extensions `download` and `downloadToTemporalFile` | ||||||
|  |  | ||||||
|  | ## 0.14.2 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.40.1` -> `0.41.1` | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## 0.14.1 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Klock`: `3.3.1` -> `3.4.0` | ||||||
|  |     * `UUID`: `0.5.0` -> `0.6.0` | ||||||
|  |  | ||||||
|  | ## 0.14.0 | ||||||
|  |  | ||||||
|  | **ALL DEPRECATIONS HAVE BEEN REMOVED** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.7.10` -> `1.7.20` | ||||||
|  |     * `Klock`: `3.3.0` -> `3.3.1` | ||||||
|  |     * `Compose`: `1.2.0` -> `1.2.1` | ||||||
|  |     * `Exposed`: `0.39.2` -> `0.40.1` | ||||||
|  |  | ||||||
|  | ## 0.13.2 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Klock`: `3.1.0` -> `3.3.0` | ||||||
|  |     * `Ktor`: `2.1.2` -> `2.1.3` | ||||||
|  |  | ||||||
|  | ## 0.13.1 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed`: | ||||||
|  |       * `AbstractExposedWriteCRUDRepo#createAndInsertId` now is optional and returns nullable value | ||||||
|  |  | ||||||
|  | ## 0.13.0 | ||||||
|  |  | ||||||
|  | **ALL DEPRECATIONS HAVE BEEN REMOVED** | ||||||
|  | **A LOT OF KTOR METHODS RELATED TO UnifierRouter/UnifiedRequester HAVE BEEN REMOVED** | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |   * `Exposed`: | ||||||
|  |     * `AbstractExposedWriteCRUDRepo` got two new methods: `update` with `it` as `UpdateBuilder<Int>` and `createAndInsertId` | ||||||
|  |       * Old `update` method has been deprecated and not recommended to override anymore in realizations | ||||||
|  |       * Old `insert` method now is `open` instead of `abstract` and can be omitted | ||||||
|  |     * `AbstractExposedKeyValueRepo` got two new methods: `update` with `it` as `UpdateBuilder<Int>` and `insertKey` | ||||||
|  |       * Old `update` method has been deprecated and not recommended to override anymore | ||||||
|  |       * Old `insert` method now is `open` instead of `abstract` and can be omitted in realizations | ||||||
|  |  | ||||||
|  | ## 0.12.17 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `JB Compose`: `1.2.0-alpha01-dev774` -> `1.2.0-beta02` | ||||||
|  |     * `Ktor`: `2.1.1` -> `2.1.2` | ||||||
|  |     * `Koin`: `3.2.0` -> `3.2.2` | ||||||
|  |  | ||||||
|  | ## 0.12.16 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |   * `Android`: | ||||||
|  |     * Add class `FlowOnHierarchyChangeListener` | ||||||
|  |     * Add `ViewGroup#setOnHierarchyChangeListenerRecursively(OnHierarchyChangeListener)` | ||||||
|  |  | ||||||
|  | ## 0.12.15 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * `applyDiff` will return `Diff` object since this release | ||||||
|  |     * `Android`: | ||||||
|  |       * New functions/extensions `findViewsByTag` and `findViewsByTagInActivity` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Add `Flow` extensions `flatMap`, `flatMapNotNull` and `flatten` | ||||||
|  |     * Add `Flow` extensions `takeNotNull` and `filterNotNull` | ||||||
|  |  | ||||||
| ## 0.12.14 | ## 0.12.14 | ||||||
|  |  | ||||||
| * `Versions`: | * `Versions`: | ||||||
|   | |||||||
| @@ -9,6 +9,7 @@ buildscript { | |||||||
|     dependencies { |     dependencies { | ||||||
|         classpath libs.buildscript.kt.gradle |         classpath libs.buildscript.kt.gradle | ||||||
|         classpath libs.buildscript.kt.serialization |         classpath libs.buildscript.kt.serialization | ||||||
|  |         classpath libs.buildscript.kt.ksp | ||||||
|         classpath libs.buildscript.jb.dokka |         classpath libs.buildscript.jb.dokka | ||||||
|         classpath libs.buildscript.gh.release |         classpath libs.buildscript.gh.release | ||||||
|         classpath libs.buildscript.android.gradle |         classpath libs.buildscript.android.gradle | ||||||
| @@ -16,12 +17,17 @@ buildscript { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | plugins { | ||||||
|  |     alias(libs.plugins.versions) | ||||||
|  | } | ||||||
|  |  | ||||||
| allprojects { | allprojects { | ||||||
|     repositories { |     repositories { | ||||||
|         mavenLocal() |         mavenLocal() | ||||||
|         mavenCentral() |         mavenCentral() | ||||||
|         google() |         google() | ||||||
|         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } |         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } | ||||||
|  |         maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     // temporal crutch until legacy tests will be stabled or legacy target will be removed |     // temporal crutch until legacy tests will be stabled or legacy target will be removed | ||||||
| @@ -36,3 +42,4 @@ allprojects { | |||||||
|  |  | ||||||
| apply from: "./extensions.gradle" | apply from: "./extensions.gradle" | ||||||
| apply from: "./github_release.gradle" | apply from: "./github_release.gradle" | ||||||
|  | apply from: "./versions_plugin_setup.gradle" | ||||||
|   | |||||||
| @@ -18,6 +18,18 @@ kotlin { | |||||||
|                 api project(":micro_utils.coroutines") |                 api project(":micro_utils.coroutines") | ||||||
|                 api libs.android.fragment |                 api libs.android.fragment | ||||||
|             } |             } | ||||||
|  |             dependsOn jvmMain | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         linuxX64Main { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.okio | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         mingwX64Main { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.okio | ||||||
|  |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,10 @@ | |||||||
|  | package dev.inmo.micro_utils.common.compose | ||||||
|  |  | ||||||
|  | import androidx.compose.runtime.MutableState | ||||||
|  | import androidx.compose.runtime.State | ||||||
|  | import androidx.compose.runtime.derivedStateOf | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Converts current [MutableState] to immutable [State] using [derivedStateOf] | ||||||
|  |  */ | ||||||
|  | fun <T> MutableState<T>.asState(): State<T> = derivedStateOf { this.value } | ||||||
| @@ -2,6 +2,8 @@ | |||||||
|  |  | ||||||
| package dev.inmo.micro_utils.common | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.Serializable | ||||||
|  |  | ||||||
| private inline fun <T> getObject( | private inline fun <T> getObject( | ||||||
|     additional: MutableList<T>, |     additional: MutableList<T>, | ||||||
|     iterator: Iterator<T> |     iterator: Iterator<T> | ||||||
| @@ -14,16 +16,29 @@ private inline fun <T> getObject( | |||||||
| /** | /** | ||||||
|  * Diff object which contains information about differences between two [Iterable]s |  * Diff object which contains information about differences between two [Iterable]s | ||||||
|  * |  * | ||||||
|  |  * See tests for more info | ||||||
|  |  * | ||||||
|  |  * @param removed The objects which has been presented in the old collection but absent in new one. Index here is the index in the old collection | ||||||
|  |  * @param added The object which appear in new collection only. Indexes here show the index in the new collection | ||||||
|  |  * @param replaced Pair of old-new changes. First object has been presented in the old collection on its | ||||||
|  |  * [IndexedValue.index] place, the second one is the object in new collection. Both have indexes due to the fact that in | ||||||
|  |  * case when some value has been replaced after adds or removes in original collection the object index will be changed | ||||||
|  |  * | ||||||
|  * @see calculateDiff |  * @see calculateDiff | ||||||
|  */ |  */ | ||||||
|  | @Serializable | ||||||
| data class Diff<T> internal constructor( | data class Diff<T> internal constructor( | ||||||
|     val removed: List<IndexedValue<T>>, |     val removed: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>>, | ||||||
|     /** |     /** | ||||||
|      * Old-New values pairs |      * Old-New values pairs | ||||||
|      */ |      */ | ||||||
|     val replaced: List<Pair<IndexedValue<T>, IndexedValue<T>>>, |     val replaced: List<Pair<@Serializable(IndexedValueSerializer::class) IndexedValue<T>, @Serializable(IndexedValueSerializer::class) IndexedValue<T>>>, | ||||||
|     val added: List<IndexedValue<T>> |     val added: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>> | ||||||
| ) | ) { | ||||||
|  |     fun isEmpty(): Boolean = removed.isEmpty() && replaced.isEmpty() && added.isEmpty() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun <T> emptyDiff(): Diff<T> = Diff(emptyList(), emptyList(), emptyList()) | ||||||
|  |  | ||||||
| private inline fun <T> performChanges( | private inline fun <T> performChanges( | ||||||
|     potentialChanges: MutableList<Pair<IndexedValue<T>?, IndexedValue<T>?>>, |     potentialChanges: MutableList<Pair<IndexedValue<T>?, IndexedValue<T>?>>, | ||||||
| @@ -32,14 +47,14 @@ private inline fun <T> performChanges( | |||||||
|     changedList: MutableList<Pair<IndexedValue<T>, IndexedValue<T>>>, |     changedList: MutableList<Pair<IndexedValue<T>, IndexedValue<T>>>, | ||||||
|     removedList: MutableList<IndexedValue<T>>, |     removedList: MutableList<IndexedValue<T>>, | ||||||
|     addedList: MutableList<IndexedValue<T>>, |     addedList: MutableList<IndexedValue<T>>, | ||||||
|     strictComparison: Boolean |     comparisonFun: (T?, T?) -> Boolean | ||||||
| ) { | ) { | ||||||
|     var i = -1 |     var i = -1 | ||||||
|     val (oldObject, newObject) = potentialChanges.lastOrNull() ?: return |     val (oldObject, newObject) = potentialChanges.lastOrNull() ?: return | ||||||
|     for ((old, new) in potentialChanges.take(potentialChanges.size - 1)) { |     for ((old, new) in potentialChanges.take(potentialChanges.size - 1)) { | ||||||
|         i++ |         i++ | ||||||
|         val oldOneEqualToNewObject = old ?.value === newObject ?.value || (old ?.value == newObject ?.value && !strictComparison) |         val oldOneEqualToNewObject = comparisonFun(old ?.value, newObject ?.value) | ||||||
|         val newOneEqualToOldObject = new ?.value === oldObject ?.value || (new ?.value == oldObject ?.value && !strictComparison) |         val newOneEqualToOldObject = comparisonFun(new ?.value, oldObject ?.value) | ||||||
|         if (oldOneEqualToNewObject || newOneEqualToOldObject) { |         if (oldOneEqualToNewObject || newOneEqualToOldObject) { | ||||||
|             changedList.addAll( |             changedList.addAll( | ||||||
|                 potentialChanges.take(i).mapNotNull { |                 potentialChanges.take(i).mapNotNull { | ||||||
| @@ -93,7 +108,7 @@ private inline fun <T> performChanges( | |||||||
|  */ |  */ | ||||||
| fun <T> Iterable<T>.calculateDiff( | fun <T> Iterable<T>.calculateDiff( | ||||||
|     other: Iterable<T>, |     other: Iterable<T>, | ||||||
|     strictComparison: Boolean = false |     comparisonFun: (T?, T?) -> Boolean | ||||||
| ): Diff<T> { | ): Diff<T> { | ||||||
|     var i = -1 |     var i = -1 | ||||||
|     var j = -1 |     var j = -1 | ||||||
| @@ -121,7 +136,7 @@ fun <T> Iterable<T>.calculateDiff( | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         when { |         when { | ||||||
|             oldObject === newObject || (oldObject == newObject && !strictComparison) -> { |             comparisonFun(oldObject, newObject) -> { | ||||||
|                 changedObjects.addAll(potentiallyChangedObjects.map { |                 changedObjects.addAll(potentiallyChangedObjects.map { | ||||||
|                     @Suppress("UNCHECKED_CAST") |                     @Suppress("UNCHECKED_CAST") | ||||||
|                     it as Pair<IndexedValue<T>, IndexedValue<T>> |                     it as Pair<IndexedValue<T>, IndexedValue<T>> | ||||||
| @@ -132,23 +147,49 @@ fun <T> Iterable<T>.calculateDiff( | |||||||
|                 potentiallyChangedObjects.add(oldObject ?.let { IndexedValue(i, oldObject) } to newObject ?.let { IndexedValue(j, newObject) }) |                 potentiallyChangedObjects.add(oldObject ?.let { IndexedValue(i, oldObject) } to newObject ?.let { IndexedValue(j, newObject) }) | ||||||
|                 val previousOldsAdditionsSize = additionalInOld.size |                 val previousOldsAdditionsSize = additionalInOld.size | ||||||
|                 val previousNewsAdditionsSize = additionalInNew.size |                 val previousNewsAdditionsSize = additionalInNew.size | ||||||
|                 performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, strictComparison) |                 performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, comparisonFun) | ||||||
|                 i -= (additionalInOld.size - previousOldsAdditionsSize) |                 i -= (additionalInOld.size - previousOldsAdditionsSize) | ||||||
|                 j -= (additionalInNew.size - previousNewsAdditionsSize) |                 j -= (additionalInNew.size - previousNewsAdditionsSize) | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|     potentiallyChangedObjects.add(null to null) |     potentiallyChangedObjects.add(null to null) | ||||||
|     performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, strictComparison) |     performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, comparisonFun) | ||||||
|  |  | ||||||
|     return Diff(removedObjects.toList(), changedObjects.toList(), addedObjects.toList()) |     return Diff(removedObjects.toList(), changedObjects.toList(), addedObjects.toList()) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Calculating [Diff] object | ||||||
|  |  * | ||||||
|  |  * @param strictComparison If this parameter set to true, objects which are not equal by links will be used as different | ||||||
|  |  * objects. For example, in case of two "Example" string they will be equal by value, but CAN be different by links | ||||||
|  |  */ | ||||||
|  | fun <T> Iterable<T>.calculateDiff( | ||||||
|  |     other: Iterable<T>, | ||||||
|  |     strictComparison: Boolean = false | ||||||
|  | ): Diff<T> = calculateDiff( | ||||||
|  |     other, | ||||||
|  |     comparisonFun = if (strictComparison) { | ||||||
|  |         { t1, t2 -> | ||||||
|  |             t1 === t2 | ||||||
|  |         } | ||||||
|  |     } else { | ||||||
|  |         { t1, t2 -> | ||||||
|  |             t1 === t2 || t1 == t2 // small optimization for cases when t1 and t2 are the same - comparison will be faster potentially | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | ) | ||||||
| inline fun <T> Iterable<T>.diff( | inline fun <T> Iterable<T>.diff( | ||||||
|     other: Iterable<T>, |     other: Iterable<T>, | ||||||
|     strictComparison: Boolean = false |     strictComparison: Boolean = false | ||||||
| ): Diff<T> = calculateDiff(other, strictComparison) | ): Diff<T> = calculateDiff(other, strictComparison) | ||||||
|  | inline fun <T> Iterable<T>.diff( | ||||||
|  |     other: Iterable<T>, | ||||||
|  |     noinline comparisonFun: (T?, T?) -> Boolean | ||||||
|  | ): Diff<T> = calculateDiff(other, comparisonFun) | ||||||
|  |  | ||||||
| inline fun <T> Diff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new) | inline fun <T> Diff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new, strictComparison = false) | ||||||
| inline fun <T> StrictDiff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new, true) | inline fun <T> StrictDiff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new, true) | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -158,6 +199,23 @@ inline fun <T> Iterable<T>.calculateStrictDiff( | |||||||
|     other: Iterable<T> |     other: Iterable<T> | ||||||
| ) = calculateDiff(other, strictComparison = true) | ) = calculateDiff(other, strictComparison = true) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Applies [diff] to [this] [MutableList] | ||||||
|  |  */ | ||||||
|  | fun <T> MutableList<T>.applyDiff( | ||||||
|  |     diff: Diff<T> | ||||||
|  | ) { | ||||||
|  |     for (i in diff.removed.indices.sortedDescending()) { | ||||||
|  |         removeAt(diff.removed[i].index) | ||||||
|  |     } | ||||||
|  |     diff.added.forEach { (i, t) -> | ||||||
|  |         add(i, t) | ||||||
|  |     } | ||||||
|  |     diff.replaced.forEach { (_, new) -> | ||||||
|  |         set(new.index, new.value) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * This method call [calculateDiff] with strict mode [strictComparison] and then apply differences to [this] |  * This method call [calculateDiff] with strict mode [strictComparison] and then apply differences to [this] | ||||||
|  * mutable list |  * mutable list | ||||||
| @@ -165,14 +223,27 @@ inline fun <T> Iterable<T>.calculateStrictDiff( | |||||||
| fun <T> MutableList<T>.applyDiff( | fun <T> MutableList<T>.applyDiff( | ||||||
|     source: Iterable<T>, |     source: Iterable<T>, | ||||||
|     strictComparison: Boolean = false |     strictComparison: Boolean = false | ||||||
| ) = calculateDiff(source, strictComparison).let { | ): Diff<T> = calculateDiff(source, strictComparison).also { | ||||||
|     for (i in it.removed.indices.sortedDescending()) { |     applyDiff(it) | ||||||
|         removeAt(it.removed[i].index) |  | ||||||
|     } |  | ||||||
|     it.added.forEach { (i, t) -> |  | ||||||
|         add(i, t) |  | ||||||
|     } |  | ||||||
|     it.replaced.forEach { (_, new) -> |  | ||||||
|         set(new.index, new.value) |  | ||||||
|     } |  | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This method call [calculateDiff] and then apply differences to [this] | ||||||
|  |  * mutable list | ||||||
|  |  */ | ||||||
|  | fun <T> MutableList<T>.applyDiff( | ||||||
|  |     source: Iterable<T>, | ||||||
|  |     comparisonFun: (T?, T?) -> Boolean | ||||||
|  | ): Diff<T> = calculateDiff(source, comparisonFun).also { | ||||||
|  |     applyDiff(it) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Reverse [this] [Diff]. Result will contain [Diff.added] on [Diff.removed] (and vice-verse), all the | ||||||
|  |  * [Diff.replaced] values will be reversed too | ||||||
|  |  */ | ||||||
|  | fun <T> Diff<T>.reversed() = Diff( | ||||||
|  |     removed = added, | ||||||
|  |     replaced = replaced.map { it.second to it.first }, | ||||||
|  |     added = removed | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -0,0 +1,43 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.letIfTrue(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         block() | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.letIfFalse(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         null | ||||||
|  |     } else { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun Boolean.alsoIfTrue(block: () -> Unit): Boolean { | ||||||
|  |     letIfTrue(block) | ||||||
|  |     return this | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun Boolean.alsoIfFalse(block: () -> Unit): Boolean { | ||||||
|  |     letIfFalse(block) | ||||||
|  |     return this | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.ifTrue(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         block() | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.ifFalse(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         null | ||||||
|  |     } else { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,30 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.KSerializer | ||||||
|  | import kotlinx.serialization.Serializer | ||||||
|  | import kotlinx.serialization.builtins.PairSerializer | ||||||
|  | import kotlinx.serialization.builtins.serializer | ||||||
|  | import kotlinx.serialization.descriptors.SerialDescriptor | ||||||
|  | import kotlinx.serialization.encoding.Decoder | ||||||
|  | import kotlinx.serialization.encoding.Encoder | ||||||
|  |  | ||||||
|  | class IndexedValueSerializer<T>(private val subSerializer: KSerializer<T>) : KSerializer<IndexedValue<T>> { | ||||||
|  |     private val originalSerializer = PairSerializer(Int.serializer(), subSerializer) | ||||||
|  |     override val descriptor: SerialDescriptor | ||||||
|  |         get() = originalSerializer.descriptor | ||||||
|  |  | ||||||
|  |     override fun deserialize(decoder: Decoder): IndexedValue<T> { | ||||||
|  |         val pair = originalSerializer.deserialize(decoder) | ||||||
|  |         return IndexedValue( | ||||||
|  |             pair.first, | ||||||
|  |             pair.second | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun serialize(encoder: Encoder, value: IndexedValue<T>) { | ||||||
|  |         originalSerializer.serialize( | ||||||
|  |             encoder, | ||||||
|  |             Pair(value.index, value.value) | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,135 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Contains diff based on the comparison of objects with the same [K]. | ||||||
|  |  * | ||||||
|  |  * @param removed Contains map with keys removed from parent map | ||||||
|  |  * @param changed Contains map with keys values changed new map in comparison with old one | ||||||
|  |  * @param added Contains map with new keys and values | ||||||
|  |  */ | ||||||
|  | data class MapDiff<K, V> @Warning(warning) constructor( | ||||||
|  |     val removed: Map<K, V>, | ||||||
|  |     val changed: Map<K, Pair<V, V>>, | ||||||
|  |     val added: Map<K, V> | ||||||
|  | ) { | ||||||
|  |     fun isEmpty() = removed.isEmpty() && changed.isEmpty() && added.isEmpty() | ||||||
|  |     inline fun isNotEmpty() = !isEmpty() | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         private const val warning = "This feature can be changed without any warranties. Use with caution and only in case you know what you are doing" | ||||||
|  |         fun <K, V> empty() = MapDiff<K, V>(emptyMap(), emptyMap(), emptyMap()) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private inline fun <K, V> createCompareFun( | ||||||
|  |     strictComparison: Boolean | ||||||
|  | ): (K, V, V) -> Boolean = if (strictComparison) { | ||||||
|  |     { _, first, second -> first === second } | ||||||
|  | } else { | ||||||
|  |     { _, first, second -> first == second } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Compare [this] [Map] with the [other] one in principle when [other] is newer than [this] | ||||||
|  |  * | ||||||
|  |  * @param compareFun Will be used to determine changed values | ||||||
|  |  */ | ||||||
|  | fun <K, V> Map<K, V>.diff( | ||||||
|  |     other: Map<K, V>, | ||||||
|  |     compareFun: (K, V, V) -> Boolean | ||||||
|  | ): MapDiff<K, V> { | ||||||
|  |     val removed: Map<K, V> = (keys - other.keys).associateWith { | ||||||
|  |         getValue(it) | ||||||
|  |     } | ||||||
|  |     val added: Map<K, V> = (other.keys - keys).associateWith { | ||||||
|  |         other.getValue(it) | ||||||
|  |     } | ||||||
|  |     val changed = keys.intersect(other.keys).mapNotNull { | ||||||
|  |         val old = getValue(it) | ||||||
|  |         val new = other.getValue(it) | ||||||
|  |         if (compareFun(it, old, new)) { | ||||||
|  |             return@mapNotNull null | ||||||
|  |         } else { | ||||||
|  |             it to (old to new) | ||||||
|  |         } | ||||||
|  |     }.toMap() | ||||||
|  |  | ||||||
|  |     return MapDiff( | ||||||
|  |         removed, | ||||||
|  |         changed, | ||||||
|  |         added | ||||||
|  |     ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Compare [this] [Map] with the [other] one in principle when [other] is newer than [this] | ||||||
|  |  * | ||||||
|  |  * @param strictComparison If true, will use strict (===) comparison for the values' comparison. Otherwise, standard | ||||||
|  |  * `equals` will be used | ||||||
|  |  */ | ||||||
|  | fun <K, V> Map<K, V>.diff( | ||||||
|  |     other: Map<K, V>, | ||||||
|  |     strictComparison: Boolean = false | ||||||
|  | ): MapDiff<K, V> = diff( | ||||||
|  |     other, | ||||||
|  |     compareFun = createCompareFun(strictComparison) | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will apply [mapDiff] to [this] [MutableMap] | ||||||
|  |  */ | ||||||
|  | fun <K, V> MutableMap<K, V>.applyDiff( | ||||||
|  |     mapDiff: MapDiff<K, V> | ||||||
|  | ) { | ||||||
|  |     mapDiff.apply { | ||||||
|  |         removed.keys.forEach { remove(it) } | ||||||
|  |         changed.forEach { (k, oldNew) -> | ||||||
|  |             put(k, oldNew.second) | ||||||
|  |         } | ||||||
|  |         added.forEach { (k, new) -> | ||||||
|  |             put(k, new) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will apply changes with [from] map into [this] one | ||||||
|  |  * | ||||||
|  |  * @param compareFun Will be used to determine changed values | ||||||
|  |  * | ||||||
|  |  * @return [MapDiff] applied to [this] [MutableMap] | ||||||
|  |  */ | ||||||
|  | fun <K, V> MutableMap<K, V>.applyDiff( | ||||||
|  |     from: Map<K, V>, | ||||||
|  |     compareFun: (K, V, V) -> Boolean | ||||||
|  | ): MapDiff<K, V> { | ||||||
|  |     return diff(from, compareFun).also { | ||||||
|  |         applyDiff(it) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will apply changes with [from] map into [this] one | ||||||
|  |  * | ||||||
|  |  * @param strictComparison If true, will use strict (===) comparison for the values' comparison. Otherwise, standard | ||||||
|  |  * `equals` will be used | ||||||
|  |  * | ||||||
|  |  * @return [MapDiff] applied to [this] [MutableMap] | ||||||
|  |  */ | ||||||
|  | fun <K, V> MutableMap<K, V>.applyDiff( | ||||||
|  |     from: Map<K, V>, | ||||||
|  |     strictComparison: Boolean = false | ||||||
|  | ): MapDiff<K, V> = applyDiff( | ||||||
|  |     from, | ||||||
|  |     compareFun = createCompareFun(strictComparison) | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Reverse [this] [MapDiff]. Result will contain [MapDiff.added] on [MapDiff.removed] (and vice-verse), all the | ||||||
|  |  * [MapDiff.changed] values will be reversed too | ||||||
|  |  */ | ||||||
|  | fun <K, V> MapDiff<K, V>.reversed(): MapDiff<K, V> = MapDiff( | ||||||
|  |     removed = added, | ||||||
|  |     changed = changed.mapValues { (_, oldNew) -> oldNew.second to oldNew.first }, | ||||||
|  |     added = removed | ||||||
|  | ) | ||||||
| @@ -0,0 +1,28 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Long] to [Int] with bounds of [Int.MIN_VALUE] and [Int.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Long.toCoercedInt(): Int = coerceIn(Int.MIN_VALUE.toLong(), Int.MAX_VALUE.toLong()).toInt() | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Long] to [Short] with bounds of [Short.MIN_VALUE] and [Short.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Long.toCoercedShort(): Short = coerceIn(Short.MIN_VALUE.toLong(), Short.MAX_VALUE.toLong()).toShort() | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Long] to [Byte] with bounds of [Byte.MIN_VALUE] and [Byte.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Long.toCoercedByte(): Byte = coerceIn(Byte.MIN_VALUE.toLong(), Byte.MAX_VALUE.toLong()).toByte() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Int] to [Short] with bounds of [Short.MIN_VALUE] and [Short.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Int.toCoercedShort(): Short = coerceIn(Short.MIN_VALUE.toInt(), Short.MAX_VALUE.toInt()).toShort() | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Int] to [Byte] with bounds of [Byte.MIN_VALUE] and [Byte.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Int.toCoercedByte(): Byte = coerceIn(Byte.MIN_VALUE.toInt(), Byte.MAX_VALUE.toInt()).toByte() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Short] to [Byte] with bounds of [Byte.MIN_VALUE] and [Byte.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Short.toCoercedByte(): Byte = coerceIn(Byte.MIN_VALUE.toShort(), Byte.MAX_VALUE.toShort()).toByte() | ||||||
| @@ -0,0 +1,37 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.Serializable | ||||||
|  | import kotlin.jvm.JvmInline | ||||||
|  |  | ||||||
|  | @Serializable | ||||||
|  | @JvmInline | ||||||
|  | value class Progress private constructor( | ||||||
|  |     val of1: Double | ||||||
|  | ) { | ||||||
|  |     val of1Float | ||||||
|  |         get() = of1.toFloat() | ||||||
|  |     val of100 | ||||||
|  |         get() = of1 * 100 | ||||||
|  |     val of100Float | ||||||
|  |         get() = of100.toFloat() | ||||||
|  |     val of100Int | ||||||
|  |         get() = of100.toInt() | ||||||
|  |  | ||||||
|  |     init { | ||||||
|  |         require(of1 in rangeOfValues) { | ||||||
|  |             "Progress main value should be in $rangeOfValues, but incoming value is $of1" | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         val rangeOfValues = 0.0 .. 1.0 | ||||||
|  |  | ||||||
|  |         val START = Progress(rangeOfValues.start) | ||||||
|  |         val COMPLETED = Progress(rangeOfValues.endInclusive) | ||||||
|  |  | ||||||
|  |         operator fun invoke(of1: Double) = Progress(of1.coerceIn(rangeOfValues)) | ||||||
|  |         operator fun invoke(part: Number, total: Number) = Progress( | ||||||
|  |             part.toDouble() / total.toDouble() | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,80 @@ | |||||||
|  | @file:Suppress( | ||||||
|  |   "RemoveRedundantCallsOfConversionMethods", | ||||||
|  |   "RedundantVisibilityModifier", | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlin.Byte | ||||||
|  | import kotlin.Double | ||||||
|  | import kotlin.Float | ||||||
|  | import kotlin.Int | ||||||
|  | import kotlin.Long | ||||||
|  | import kotlin.Short | ||||||
|  | import kotlin.Suppress | ||||||
|  |  | ||||||
|  | public operator fun Progress.plus(other: Progress): Progress = Progress(of1 + other.of1) | ||||||
|  |  | ||||||
|  | public operator fun Progress.minus(other: Progress): Progress = Progress(of1 - other.of1) | ||||||
|  |  | ||||||
|  | public operator fun Progress.plus(i: Byte): Progress = Progress((of1 + i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.minus(i: Byte): Progress = Progress((of1 - i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.times(i: Byte): Progress = Progress((of1 * i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.div(i: Byte): Progress = Progress((of1 / i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.rem(i: Byte): Progress = Progress((of1 % i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.plus(i: Short): Progress = Progress((of1 + i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.minus(i: Short): Progress = Progress((of1 - i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.times(i: Short): Progress = Progress((of1 * i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.div(i: Short): Progress = Progress((of1 / i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.rem(i: Short): Progress = Progress((of1 % i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.plus(i: Int): Progress = Progress((of1 + i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.minus(i: Int): Progress = Progress((of1 - i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.times(i: Int): Progress = Progress((of1 * i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.div(i: Int): Progress = Progress((of1 / i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.rem(i: Int): Progress = Progress((of1 % i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.plus(i: Long): Progress = Progress((of1 + i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.minus(i: Long): Progress = Progress((of1 - i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.times(i: Long): Progress = Progress((of1 * i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.div(i: Long): Progress = Progress((of1 / i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.rem(i: Long): Progress = Progress((of1 % i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.plus(i: Float): Progress = Progress((of1 + i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.minus(i: Float): Progress = Progress((of1 - i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.times(i: Float): Progress = Progress((of1 * i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.div(i: Float): Progress = Progress((of1 / i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.rem(i: Float): Progress = Progress((of1 % i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.plus(i: Double): Progress = Progress((of1 + i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.minus(i: Double): Progress = Progress((of1 - i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.times(i: Double): Progress = Progress((of1 * i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.div(i: Double): Progress = Progress((of1 / i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.rem(i: Double): Progress = Progress((of1 % i).toDouble()) | ||||||
|  |  | ||||||
|  | public operator fun Progress.compareTo(other: Progress): Int = (of1 - other.of1).toInt() | ||||||
| @@ -1,5 +1,27 @@ | |||||||
| package dev.inmo.micro_utils.common | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Executes the given [action] until getting of successful result specified number of [times]. | ||||||
|  |  * | ||||||
|  |  * A zero-based index of current iteration is passed as a parameter to [action]. | ||||||
|  |  */ | ||||||
|  | inline fun <R> repeatOnFailure( | ||||||
|  |     onFailure: (Throwable) -> Boolean, | ||||||
|  |     action: () -> R | ||||||
|  | ): Result<R> { | ||||||
|  |     do { | ||||||
|  |         runCatching { | ||||||
|  |             action() | ||||||
|  |         }.onFailure { | ||||||
|  |             if (!onFailure(it)) { | ||||||
|  |                 return Result.failure(it) | ||||||
|  |             } | ||||||
|  |         }.onSuccess { | ||||||
|  |             return Result.success(it) | ||||||
|  |         } | ||||||
|  |     } while (true) | ||||||
|  | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Executes the given [action] until getting of successful result specified number of [times]. |  * Executes the given [action] until getting of successful result specified number of [times]. | ||||||
|  * |  * | ||||||
| @@ -10,12 +32,23 @@ inline fun <R> repeatOnFailure( | |||||||
|     onEachFailure: (Throwable) -> Unit = {}, |     onEachFailure: (Throwable) -> Unit = {}, | ||||||
|     action: (Int) -> R |     action: (Int) -> R | ||||||
| ): Optional<R> { | ): Optional<R> { | ||||||
|     repeat(times) { |     var i = 0 | ||||||
|         runCatching { |     val result = repeatOnFailure( | ||||||
|             action(it) |         { | ||||||
|         }.onFailure(onEachFailure).onSuccess { |             onEachFailure(it) | ||||||
|             return Optional.presented(it) |             if (i < times) { | ||||||
|  |                 i++ | ||||||
|  |                 true | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|         } |         } | ||||||
|  |     ) { | ||||||
|  |         action(i) | ||||||
|  |     } | ||||||
|  |     return if (result.isSuccess) { | ||||||
|  |         Optional.presented(result.getOrThrow()) | ||||||
|  |     } else { | ||||||
|  |         Optional.absent() | ||||||
|     } |     } | ||||||
|     return Optional.absent() |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,6 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | val FixedSignsRange = 0 .. 100 | ||||||
|  |  | ||||||
|  | expect fun Float.fixed(signs: Int): Float | ||||||
|  | expect fun Double.fixed(signs: Int): Double | ||||||
| @@ -0,0 +1,4 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float = this.asDynamic().toFixed(signs.coerceIn(FixedSignsRange)).unsafeCast<String>().toFloat() | ||||||
|  | actual fun Double.fixed(signs: Int): Double = this.asDynamic().toFixed(signs.coerceIn(FixedSignsRange)).unsafeCast<String>().toDouble() | ||||||
| @@ -0,0 +1,20 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import java.io.File | ||||||
|  | import java.io.InputStream | ||||||
|  | import java.util.UUID | ||||||
|  |  | ||||||
|  | fun InputStream.downloadToTempFile( | ||||||
|  |     fileName: String = UUID.randomUUID().toString(), | ||||||
|  |     fileExtension: String? = ".temp", | ||||||
|  |     folder: File? = null | ||||||
|  | ) = File.createTempFile( | ||||||
|  |     fileName, | ||||||
|  |     fileExtension, | ||||||
|  |     folder | ||||||
|  | ).apply { | ||||||
|  |     outputStream().use { | ||||||
|  |         copyTo(it) | ||||||
|  |     } | ||||||
|  |     deleteOnExit() | ||||||
|  | } | ||||||
| @@ -0,0 +1,12 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import java.math.BigDecimal | ||||||
|  | import java.math.RoundingMode | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float = BigDecimal.valueOf(this.toDouble()) | ||||||
|  |     .setScale(signs.coerceIn(FixedSignsRange), RoundingMode.HALF_UP) | ||||||
|  |     .toFloat(); | ||||||
|  |  | ||||||
|  | actual fun Double.fixed(signs: Int): Double = BigDecimal.valueOf(this) | ||||||
|  |     .setScale(signs.coerceIn(FixedSignsRange), RoundingMode.HALF_UP) | ||||||
|  |     .toDouble(); | ||||||
							
								
								
									
										36
									
								
								common/src/linuxX64Main/kotlin/ActualMPPFile.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								common/src/linuxX64Main/kotlin/ActualMPPFile.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import okio.FileSystem | ||||||
|  | import okio.Path | ||||||
|  | import okio.use | ||||||
|  |  | ||||||
|  | actual typealias MPPFile = Path | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filename: FileName | ||||||
|  |     get() = FileName(toString()) | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filesize: Long | ||||||
|  |     get() = FileSystem.SYSTEM.openReadOnly(this).use { | ||||||
|  |         it.size() | ||||||
|  |     } | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator | ||||||
|  |     get() = { | ||||||
|  |         FileSystem.SYSTEM.read(this) { | ||||||
|  |             readByteArray() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator | ||||||
|  |     get() = { | ||||||
|  |         bytesAllocatorSync() | ||||||
|  |     } | ||||||
							
								
								
									
										26
									
								
								common/src/linuxX64Main/kotlin/fixed.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								common/src/linuxX64Main/kotlin/fixed.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,26 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.cinterop.ByteVar | ||||||
|  | import kotlinx.cinterop.allocArray | ||||||
|  | import kotlinx.cinterop.memScoped | ||||||
|  | import kotlinx.cinterop.toKString | ||||||
|  | import platform.posix.snprintf | ||||||
|  | import platform.posix.sprintf | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float { | ||||||
|  |     return memScoped { | ||||||
|  |         val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2) | ||||||
|  |  | ||||||
|  |         sprintf(buff, "%.${signs}f", this@fixed) | ||||||
|  |         buff.toKString().toFloat() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | actual fun Double.fixed(signs: Int): Double { | ||||||
|  |     return memScoped { | ||||||
|  |         val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2) | ||||||
|  |  | ||||||
|  |         sprintf(buff, "%.${signs}f", this@fixed) | ||||||
|  |         buff.toKString().toDouble() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,61 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import android.app.Activity | ||||||
|  | import android.view.View | ||||||
|  | import android.view.ViewGroup | ||||||
|  | import androidx.core.view.children | ||||||
|  | import androidx.fragment.app.Fragment | ||||||
|  |  | ||||||
|  | fun findViewsByTag(viewGroup: ViewGroup, tag: Any?): List<View> { | ||||||
|  |     return viewGroup.children.flatMap { | ||||||
|  |         findViewsByTag(it, tag) | ||||||
|  |     }.toList() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun findViewsByTag(viewGroup: ViewGroup, key: Int, tag: Any?): List<View> { | ||||||
|  |     return viewGroup.children.flatMap { | ||||||
|  |         findViewsByTag(it, key, tag) | ||||||
|  |     }.toList() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun findViewsByTag(view: View, tag: Any?): List<View> { | ||||||
|  |     val result = mutableListOf<View>() | ||||||
|  |     if (view.tag == tag) { | ||||||
|  |         result.add(view) | ||||||
|  |     } | ||||||
|  |     if (view is ViewGroup) { | ||||||
|  |         result.addAll(findViewsByTag(view, tag)) | ||||||
|  |     } | ||||||
|  |     return result.toList() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun findViewsByTag(view: View, key: Int, tag: Any?): List<View> { | ||||||
|  |     val result = mutableListOf<View>() | ||||||
|  |     if (view.getTag(key) == tag) { | ||||||
|  |         result.add(view) | ||||||
|  |     } | ||||||
|  |     if (view is ViewGroup) { | ||||||
|  |         result.addAll(findViewsByTag(view, key, tag)) | ||||||
|  |     } | ||||||
|  |     return result.toList() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Activity.findViewsByTag(tag: Any?) = rootView ?.let { | ||||||
|  |     findViewsByTag(it, tag) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Activity.findViewsByTag(key: Int, tag: Any?) = rootView ?.let { | ||||||
|  |     findViewsByTag(it, key, tag) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Fragment.findViewsByTag(tag: Any?) = view ?.let { | ||||||
|  |     findViewsByTag(it, tag) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Fragment.findViewsByTag(key: Int, tag: Any?) = view ?.let { | ||||||
|  |     findViewsByTag(it, key, tag) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Fragment.findViewsByTagInActivity(tag: Any?) = activity ?.findViewsByTag(tag) | ||||||
|  |  | ||||||
|  | fun Fragment.findViewsByTagInActivity(key: Int, tag: Any?) = activity ?.findViewsByTag(key, tag) | ||||||
| @@ -0,0 +1,7 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import android.app.Activity | ||||||
|  | import android.view.View | ||||||
|  |  | ||||||
|  | val Activity.rootView: View? | ||||||
|  |     get() = findViewById<View?>(android.R.id.content) ?.rootView ?: window.decorView.findViewById<View?>(android.R.id.content) ?.rootView | ||||||
							
								
								
									
										36
									
								
								common/src/mingwX64Main/kotlin/ActualMPPFile.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								common/src/mingwX64Main/kotlin/ActualMPPFile.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import okio.FileSystem | ||||||
|  | import okio.Path | ||||||
|  | import okio.use | ||||||
|  |  | ||||||
|  | actual typealias MPPFile = Path | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filename: FileName | ||||||
|  |     get() = FileName(toString()) | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filesize: Long | ||||||
|  |     get() = FileSystem.SYSTEM.openReadOnly(this).use { | ||||||
|  |         it.size() | ||||||
|  |     } | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator | ||||||
|  |     get() = { | ||||||
|  |         FileSystem.SYSTEM.read(this) { | ||||||
|  |             readByteArray() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator | ||||||
|  |     get() = { | ||||||
|  |         bytesAllocatorSync() | ||||||
|  |     } | ||||||
							
								
								
									
										26
									
								
								common/src/mingwX64Main/kotlin/fixed.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								common/src/mingwX64Main/kotlin/fixed.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,26 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.cinterop.ByteVar | ||||||
|  | import kotlinx.cinterop.allocArray | ||||||
|  | import kotlinx.cinterop.memScoped | ||||||
|  | import kotlinx.cinterop.toKString | ||||||
|  | import platform.posix.snprintf | ||||||
|  | import platform.posix.sprintf | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float { | ||||||
|  |     return memScoped { | ||||||
|  |         val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2) | ||||||
|  |  | ||||||
|  |         sprintf(buff, "%.${signs}f", this@fixed) | ||||||
|  |         buff.toKString().toFloat() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | actual fun Double.fixed(signs: Int): Double { | ||||||
|  |     return memScoped { | ||||||
|  |         val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2) | ||||||
|  |  | ||||||
|  |         sprintf(buff, "%.${signs}f", this@fixed) | ||||||
|  |         buff.toKString().toDouble() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -22,6 +22,7 @@ kotlin { | |||||||
|             dependencies { |             dependencies { | ||||||
|                 api libs.kt.coroutines.android |                 api libs.kt.coroutines.android | ||||||
|             } |             } | ||||||
|  |             dependsOn(jvmMain) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -3,24 +3,58 @@ package dev.inmo.micro_utils.coroutines.compose | |||||||
| import androidx.compose.runtime.* | import androidx.compose.runtime.* | ||||||
| import androidx.compose.runtime.snapshots.SnapshotStateList | import androidx.compose.runtime.snapshots.SnapshotStateList | ||||||
| import dev.inmo.micro_utils.common.applyDiff | import dev.inmo.micro_utils.common.applyDiff | ||||||
|  | import dev.inmo.micro_utils.coroutines.ExceptionHandler | ||||||
|  | import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandlerWithNull | ||||||
| import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
| import kotlinx.coroutines.flow.Flow | import kotlinx.coroutines.flow.Flow | ||||||
| import kotlinx.coroutines.flow.StateFlow | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.withContext | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Each value of [this] [Flow] will trigger [applyDiff] to the result [SnapshotStateList] | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [SnapshotStateList] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <reified T> Flow<List<T>>.asMutableComposeListState( | inline fun <reified T> Flow<List<T>>.asMutableComposeListState( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
|  |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<List<T>?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
| ): SnapshotStateList<T> { | ): SnapshotStateList<T> { | ||||||
|     val state = mutableStateListOf<T>() |     val state = mutableStateListOf<T>() | ||||||
|     subscribeSafelyWithoutExceptions(scope) { |     val changeBlock: suspend (List<T>) -> Unit = useContextOnChange ?.let { | ||||||
|  |         { | ||||||
|  |             withContext(useContextOnChange) { | ||||||
|  |                 state.applyDiff(it) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } ?: { | ||||||
|         state.applyDiff(it) |         state.applyDiff(it) | ||||||
|     } |     } | ||||||
|  |     subscribeSafelyWithoutExceptions(scope, onException, changeBlock) | ||||||
|     return state |     return state | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * In fact, it is just classcast of [asMutableComposeListState] to [List] | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [List] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  * | ||||||
|  |  * @return Changing in time [List] which follow [Flow] values | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <reified T> Flow<List<T>>.asComposeList( | inline fun <reified T> Flow<List<T>>.asComposeList( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ): List<T> = asMutableComposeListState(scope) |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<List<T>?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|  | ): List<T> = asMutableComposeListState(scope, useContextOnChange, onException) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,35 +1,94 @@ | |||||||
| package dev.inmo.micro_utils.coroutines.compose | package dev.inmo.micro_utils.coroutines.compose | ||||||
|  |  | ||||||
| import androidx.compose.runtime.* | import androidx.compose.runtime.* | ||||||
|  | import dev.inmo.micro_utils.common.compose.asState | ||||||
|  | import dev.inmo.micro_utils.coroutines.ExceptionHandler | ||||||
|  | import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandlerWithNull | ||||||
|  | import dev.inmo.micro_utils.coroutines.doInUI | ||||||
| import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
| import kotlinx.coroutines.flow.Flow | import kotlinx.coroutines.flow.Flow | ||||||
| import kotlinx.coroutines.flow.StateFlow | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.withContext | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will map [this] [Flow] as [MutableState]. Returned [MutableState] WILL NOT change source [Flow] | ||||||
|  |  * | ||||||
|  |  * @param initial First value which will be passed to the result [MutableState] | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [MutableState] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| fun <T> Flow<T>.asMutableComposeState( | fun <T> Flow<T>.asMutableComposeState( | ||||||
|     initial: T, |     initial: T, | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
|  |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
| ): MutableState<T> { | ): MutableState<T> { | ||||||
|     val state = mutableStateOf(initial) |     val state = mutableStateOf(initial) | ||||||
|     subscribeSafelyWithoutExceptions(scope) { state.value = it } |     val changeBlock: suspend (T) -> Unit = useContextOnChange ?.let { | ||||||
|  |         { | ||||||
|  |             withContext(useContextOnChange) { | ||||||
|  |                 state.value = it | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } ?: { | ||||||
|  |         state.value = it | ||||||
|  |     } | ||||||
|  |     subscribeSafelyWithoutExceptions(scope, onException, block = changeBlock) | ||||||
|     return state |     return state | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will map [this] [StateFlow] as [MutableState]. Returned [MutableState] WILL NOT change source [StateFlow]. | ||||||
|  |  * This conversation will pass its [StateFlow.value] as the first value | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [MutableState] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <T> StateFlow<T>.asMutableComposeState( | inline fun <T> StateFlow<T>.asMutableComposeState( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ): MutableState<T> = asMutableComposeState(value, scope) |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|  | ): MutableState<T> = asMutableComposeState(value, scope, useContextOnChange, onException) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will create [MutableState] using [asMutableComposeState] and use [asState] to convert it as immutable state | ||||||
|  |  * | ||||||
|  |  * @param initial First value which will be passed to the result [State] | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [State] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| fun <T> Flow<T>.asComposeState( | fun <T> Flow<T>.asComposeState( | ||||||
|     initial: T, |     initial: T, | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
|  |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
| ): State<T> { | ): State<T> { | ||||||
|     val state = asMutableComposeState(initial, scope) |     val state = asMutableComposeState(initial, scope, useContextOnChange, onException) | ||||||
|     return derivedStateOf { state.value } |     return state.asState() | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will map [this] [StateFlow] as [State]. This conversation will pass its [StateFlow.value] as the first value | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [State] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <T> StateFlow<T>.asComposeState( | inline fun <T> StateFlow<T>.asComposeState( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ): State<T> = asComposeState(value, scope) |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|  | ): State<T> = asComposeState(value, scope, useContextOnChange, onException) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,23 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.coroutines.compose |  | ||||||
|  |  | ||||||
| import androidx.compose.runtime.MutableState |  | ||||||
| import androidx.compose.runtime.mutableStateOf |  | ||||||
| import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions |  | ||||||
| import kotlinx.coroutines.CoroutineScope |  | ||||||
| import kotlinx.coroutines.flow.Flow |  | ||||||
| import kotlinx.coroutines.flow.StateFlow |  | ||||||
|  |  | ||||||
| fun <T> Flow<T>.toMutableState( |  | ||||||
|     initial: T, |  | ||||||
|     scope: CoroutineScope |  | ||||||
| ): MutableState<T> { |  | ||||||
|     val state = mutableStateOf(initial) |  | ||||||
|     subscribeSafelyWithoutExceptions(scope) { state.value = it } |  | ||||||
|     return state |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Suppress("NOTHING_TO_INLINE") |  | ||||||
| inline fun <T> StateFlow<T>.toMutableState( |  | ||||||
|     scope: CoroutineScope |  | ||||||
| ): MutableState<T> = toMutableState(value, scope) |  | ||||||
|  |  | ||||||
| @@ -0,0 +1,39 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.flow.* | ||||||
|  | import kotlin.js.JsName | ||||||
|  | import kotlin.jvm.JvmName | ||||||
|  |  | ||||||
|  | inline fun <T, R> Flow<Flow<T>>.flatMap( | ||||||
|  |     crossinline mapper: suspend (T) -> R | ||||||
|  | ) = flow { | ||||||
|  |     collect { | ||||||
|  |         it.collect { | ||||||
|  |             emit(mapper(it)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @JsName("flatMapIterable") | ||||||
|  | @JvmName("flatMapIterable") | ||||||
|  | inline fun <T, R> Flow<Iterable<T>>.flatMap( | ||||||
|  |     crossinline mapper: suspend (T) -> R | ||||||
|  | ) = map { | ||||||
|  |     it.asFlow() | ||||||
|  | }.flatMap(mapper) | ||||||
|  |  | ||||||
|  | inline fun <T, R> Flow<Flow<T>>.flatMapNotNull( | ||||||
|  |     crossinline mapper: suspend (T) -> R | ||||||
|  | ) = flatMap(mapper).takeNotNull() | ||||||
|  |  | ||||||
|  | @JsName("flatMapNotNullIterable") | ||||||
|  | @JvmName("flatMapNotNullIterable") | ||||||
|  | inline fun <T, R> Flow<Iterable<T>>.flatMapNotNull( | ||||||
|  |     crossinline mapper: suspend (T) -> R | ||||||
|  | ) = flatMap(mapper).takeNotNull() | ||||||
|  |  | ||||||
|  | fun <T> Flow<Flow<T>>.flatten() = flatMap { it } | ||||||
|  |  | ||||||
|  | @JsName("flattenIterable") | ||||||
|  | @JvmName("flattenIterable") | ||||||
|  | fun <T> Flow<Iterable<T>>.flatten() = flatMap { it } | ||||||
| @@ -0,0 +1,6 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.flow.* | ||||||
|  |  | ||||||
|  | fun <T> Flow<T>.takeNotNull() = mapNotNull { it } | ||||||
|  | fun <T> Flow<T>.filterNotNull() = takeNotNull() | ||||||
| @@ -115,10 +115,21 @@ suspend inline fun <T> runCatchingSafely( | |||||||
|     safely(onException, block) |     safely(onException, block) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | suspend inline fun <T, R> T.runCatchingSafely( | ||||||
|  |     noinline onException: ExceptionHandler<R> = defaultSafelyExceptionHandler, | ||||||
|  |     noinline block: suspend T.() -> R | ||||||
|  | ): Result<R> = runCatching { | ||||||
|  |     safely(onException) { block() } | ||||||
|  | } | ||||||
|  |  | ||||||
| suspend inline fun <T> safelyWithResult( | suspend inline fun <T> safelyWithResult( | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     noinline block: suspend CoroutineScope.() -> T | ||||||
| ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||||
|  |  | ||||||
|  | suspend inline fun <T, R> T.safelyWithResult( | ||||||
|  |     noinline block: suspend T.() -> R | ||||||
|  | ): Result<R> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and |  * Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and | ||||||
|  * returning null at one time |  * returning null at one time | ||||||
|   | |||||||
| @@ -0,0 +1,136 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.currentCoroutineContext | ||||||
|  | import kotlinx.coroutines.flow.MutableStateFlow | ||||||
|  | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.flow.asStateFlow | ||||||
|  | import kotlinx.coroutines.flow.first | ||||||
|  | import kotlinx.coroutines.isActive | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  | import kotlin.contracts.ExperimentalContracts | ||||||
|  | import kotlin.contracts.InvocationKind | ||||||
|  | import kotlin.contracts.contract | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * It is interface which will work like classic [Mutex], but in difference have [lockStateFlow] for listening of the | ||||||
|  |  * [SmartMutex] state. | ||||||
|  |  * | ||||||
|  |  * There is [Mutable] and [Immutable] realizations. In case you are owner and manager current state of lock, you need | ||||||
|  |  * [Mutable] [SmartMutex]. Otherwise, [Immutable]. | ||||||
|  |  * | ||||||
|  |  * Any [Mutable] [SmartMutex] may produce its [Immutable] variant which will contains [lockStateFlow] equal to its | ||||||
|  |  * [Mutable] creator | ||||||
|  |  */ | ||||||
|  | sealed interface SmartMutex { | ||||||
|  |     val lockStateFlow: StateFlow<Boolean> | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * * True - locked | ||||||
|  |      * * False - unlocked | ||||||
|  |      */ | ||||||
|  |     val isLocked: Boolean | ||||||
|  |         get() = lockStateFlow.value | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Immutable variant of [SmartMutex]. In fact will depend on the owner of [lockStateFlow] | ||||||
|  |      */ | ||||||
|  |     class Immutable(override val lockStateFlow: StateFlow<Boolean>) : SmartMutex | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Mutable variant of [SmartMutex]. With that variant you may [lock] and [unlock]. Besides, you may create | ||||||
|  |      * [Immutable] variant of [this] instance with [immutable] factory | ||||||
|  |      * | ||||||
|  |      * @param locked Preset state of [isLocked] and its internal [_lockStateFlow] | ||||||
|  |      */ | ||||||
|  |     class Mutable(locked: Boolean = false) : SmartMutex { | ||||||
|  |         private val _lockStateFlow = MutableStateFlow<Boolean>(locked) | ||||||
|  |         override val lockStateFlow: StateFlow<Boolean> = _lockStateFlow.asStateFlow() | ||||||
|  |  | ||||||
|  |         private val internalChangesMutex = Mutex() | ||||||
|  |  | ||||||
|  |         fun immutable() = Immutable(lockStateFlow) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Holds call until this [SmartMutex] will be re-locked. That means that while [isLocked] == true, [holds] will | ||||||
|  |          * wait for [isLocked] == false and then try to lock | ||||||
|  |          */ | ||||||
|  |         suspend fun lock() { | ||||||
|  |             do { | ||||||
|  |                 waitUnlock() | ||||||
|  |                 val shouldContinue = internalChangesMutex.withLock { | ||||||
|  |                     if (_lockStateFlow.value) { | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         _lockStateFlow.value = true | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } while (shouldContinue && currentCoroutineContext().isActive) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Will try to lock this [SmartMutex] immediataly | ||||||
|  |          * | ||||||
|  |          * @return True if lock was successful. False otherwise | ||||||
|  |          */ | ||||||
|  |         suspend fun tryLock(): Boolean { | ||||||
|  |             return if (!_lockStateFlow.value) { | ||||||
|  |                 internalChangesMutex.withLock { | ||||||
|  |                     if (!_lockStateFlow.value) { | ||||||
|  |                         _lockStateFlow.value = true | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * If [isLocked] == true - will change it to false and return true. If current call will not unlock this | ||||||
|  |          * [SmartMutex] - false | ||||||
|  |          */ | ||||||
|  |         suspend fun unlock(): Boolean { | ||||||
|  |             return if (_lockStateFlow.value) { | ||||||
|  |                 internalChangesMutex.withLock { | ||||||
|  |                     if (_lockStateFlow.value) { | ||||||
|  |                         _lockStateFlow.value = false | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will call [SmartMutex.Mutable.lock], then execute [action] and return the result after [SmartMutex.Mutable.unlock] | ||||||
|  |  */ | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T> SmartMutex.Mutable.withLock(action: () -> T): T { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     lock() | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         unlock() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will wait until the [SmartMutex.lockStateFlow] of [this] instance will be false. | ||||||
|  |  * | ||||||
|  |  * Anyway, after the end of this block there are no any guaranties that [SmartMutex.isLocked] == false due to the fact | ||||||
|  |  * that some other parties may lock it again | ||||||
|  |  */ | ||||||
|  | suspend fun SmartMutex.waitUnlock() = lockStateFlow.first { !it } | ||||||
| @@ -0,0 +1,26 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CancellationException | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  | import org.w3c.dom.Image | ||||||
|  |  | ||||||
|  | suspend fun preloadImage(src: String): Image { | ||||||
|  |     val image = Image() | ||||||
|  |     image.src = src | ||||||
|  |  | ||||||
|  |     val job = Job() | ||||||
|  |  | ||||||
|  |     image.addEventListener("load", { | ||||||
|  |         runCatching { job.complete() } | ||||||
|  |     }) | ||||||
|  |  | ||||||
|  |     runCatchingSafely { | ||||||
|  |         job.join() | ||||||
|  |     }.onFailure { | ||||||
|  |         if (it is CancellationException) { | ||||||
|  |             image.src = "" | ||||||
|  |         } | ||||||
|  |     }.getOrThrow() | ||||||
|  |  | ||||||
|  |     return image | ||||||
|  | } | ||||||
| @@ -0,0 +1,9 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
|  |  | ||||||
|  | fun <T> launchInCurrentThread(block: suspend CoroutineScope.() -> T): T { | ||||||
|  |     val scope = CoroutineScope(Dispatchers.Unconfined) | ||||||
|  |     return scope.launchSynchronously(block) | ||||||
|  | } | ||||||
| @@ -6,7 +6,7 @@ fun <T> CoroutineScope.launchSynchronously(block: suspend CoroutineScope.() -> T | |||||||
|     var result: Result<T>? = null |     var result: Result<T>? = null | ||||||
|     val objectToSynchronize = Object() |     val objectToSynchronize = Object() | ||||||
|     synchronized(objectToSynchronize) { |     synchronized(objectToSynchronize) { | ||||||
|         launch { |         launch(start = CoroutineStart.UNDISPATCHED) { | ||||||
|             result = safelyWithResult(block) |             result = safelyWithResult(block) | ||||||
|         }.invokeOnCompletion { |         }.invokeOnCompletion { | ||||||
|             synchronized(objectToSynchronize) { |             synchronized(objectToSynchronize) { | ||||||
|   | |||||||
| @@ -0,0 +1,47 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
|  | import kotlinx.coroutines.delay | ||||||
|  | import kotlinx.coroutines.withContext | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  |  | ||||||
|  | class LaunchInCurrentThreadTests { | ||||||
|  |     @Test | ||||||
|  |     fun simpleTestThatLaunchInCurrentThreadWorks() { | ||||||
|  |         val expectedResult = 10 | ||||||
|  |         val result = launchInCurrentThread { | ||||||
|  |             expectedResult | ||||||
|  |         } | ||||||
|  |         assertEquals(expectedResult, result) | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun simpleTestThatSeveralLaunchInCurrentThreadWorks() { | ||||||
|  |         val testData = 0 until 100 | ||||||
|  |  | ||||||
|  |         testData.forEach { | ||||||
|  |             val result = launchInCurrentThread { | ||||||
|  |                 it | ||||||
|  |             } | ||||||
|  |             assertEquals(it, result) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun simpleTestThatLaunchInCurrentThreadWillCorrectlyHandleSuspensionsWorks() { | ||||||
|  |         val testData = 0 until 100 | ||||||
|  |  | ||||||
|  |         suspend fun test(data: Any): Any { | ||||||
|  |             return withContext(Dispatchers.Default) { | ||||||
|  |                 delay(1) | ||||||
|  |                 data | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         testData.forEach { | ||||||
|  |             val result = launchInCurrentThread { | ||||||
|  |                 test(it) | ||||||
|  |             } | ||||||
|  |             assertEquals(it, result) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										50
									
								
								coroutines/src/main/kotlin/FlowOnHierarchyChangeListener.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								coroutines/src/main/kotlin/FlowOnHierarchyChangeListener.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,50 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import android.view.View | ||||||
|  | import android.view.ViewGroup | ||||||
|  | import kotlinx.coroutines.flow.MutableSharedFlow | ||||||
|  | import kotlinx.coroutines.flow.asSharedFlow | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * [kotlinx.coroutines.flow.Flow]-based [android.view.ViewGroup.OnHierarchyChangeListener] | ||||||
|  |  * | ||||||
|  |  * @param recursive If set, any call of [onChildViewAdded] will check if child [View] is [ViewGroup] and subscribe to this | ||||||
|  |  * [ViewGroup] too | ||||||
|  |  * @param [_onChildViewAdded] Internal [MutableSharedFlow] which will be used to pass data to [onChildViewAdded] flow | ||||||
|  |  * @param [_onChildViewRemoved] Internal [MutableSharedFlow] which will be used to pass data to [onChildViewRemoved] flow | ||||||
|  |  */ | ||||||
|  | class FlowOnHierarchyChangeListener( | ||||||
|  |     private val recursive: Boolean = false, | ||||||
|  |     private val _onChildViewAdded: MutableSharedFlow<Pair<View, View>> = MutableSharedFlow(extraBufferCapacity = Int.MAX_VALUE), | ||||||
|  |     private val _onChildViewRemoved: MutableSharedFlow<Pair<View, View>> = MutableSharedFlow(extraBufferCapacity = Int.MAX_VALUE) | ||||||
|  | ) : ViewGroup.OnHierarchyChangeListener { | ||||||
|  |     val onChildViewAdded = _onChildViewAdded.asSharedFlow() | ||||||
|  |     val onChildViewRemoved = _onChildViewRemoved.asSharedFlow() | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Will emit data into [onChildViewAdded] flow. If [recursive] is true and [child] is [ViewGroup] will also | ||||||
|  |      * subscribe to [child] hierarchy changes. | ||||||
|  |      * | ||||||
|  |      * Due to the fact that this method is not suspendable, [FlowOnHierarchyChangeListener] will use | ||||||
|  |      * [MutableSharedFlow.tryEmit] to send data into [_onChildViewAdded]. That is why its default extraBufferCapacity is | ||||||
|  |      * [Int.MAX_VALUE] | ||||||
|  |      */ | ||||||
|  |     override fun onChildViewAdded(parent: View, child: View) { | ||||||
|  |         _onChildViewAdded.tryEmit(parent to child) | ||||||
|  |  | ||||||
|  |         if (recursive && child is ViewGroup) { | ||||||
|  |             child.setOnHierarchyChangeListener(this) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Just emit data into [onChildViewRemoved] | ||||||
|  |      * | ||||||
|  |      * Due to the fact that this method is not suspendable, [FlowOnHierarchyChangeListener] will use | ||||||
|  |      * [MutableSharedFlow.tryEmit] to send data into [_onChildViewRemoved]. That is why its default extraBufferCapacity is | ||||||
|  |      * [Int.MAX_VALUE] | ||||||
|  |      */ | ||||||
|  |     override fun onChildViewRemoved(parent: View, child: View) { | ||||||
|  |         _onChildViewRemoved.tryEmit(parent to child) | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										17
									
								
								coroutines/src/main/kotlin/RecursiveHierarchySubscriber.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								coroutines/src/main/kotlin/RecursiveHierarchySubscriber.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import android.view.ViewGroup | ||||||
|  | import android.view.ViewGroup.OnHierarchyChangeListener | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Use [ViewGroup.setOnHierarchyChangeListener] recursively for all available [ViewGroup]s starting with [this]. | ||||||
|  |  * This extension DO NOT guarantee that recursive subscription will happen after this method call | ||||||
|  |  */ | ||||||
|  | fun ViewGroup.setOnHierarchyChangeListenerRecursively( | ||||||
|  |     listener: OnHierarchyChangeListener | ||||||
|  | ) { | ||||||
|  |     setOnHierarchyChangeListener(listener) | ||||||
|  |     (0 until childCount).forEach { | ||||||
|  |         (getChildAt(it) as? ViewGroup) ?.setOnHierarchyChangeListenerRecursively(listener) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -11,6 +11,7 @@ kotlin { | |||||||
|         commonMain { |         commonMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api project(":micro_utils.common") |                 api project(":micro_utils.common") | ||||||
|  |                 api libs.krypto | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         jsMain { |         jsMain { | ||||||
|   | |||||||
| @@ -1,6 +1,8 @@ | |||||||
| package dev.inmo.micro_utils.crypto | package dev.inmo.micro_utils.crypto | ||||||
|  |  | ||||||
|  | import korlibs.crypto.md5 | ||||||
|  |  | ||||||
| typealias MD5 = String | typealias MD5 = String | ||||||
|  |  | ||||||
| expect fun SourceBytes.md5(): MD5 | fun SourceBytes.md5(): MD5 = md5().hexLower | ||||||
| fun SourceString.md5(): MD5 = encodeToByteArray().md5() | fun SourceString.md5(): MD5 = encodeToByteArray().md5().hexLower | ||||||
|   | |||||||
| @@ -1,6 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.crypto |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual fun SourceBytes.md5(): MD5 = CryptoJS.MD5(decodeToString()) |  | ||||||
| @@ -1,12 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.crypto |  | ||||||
|  |  | ||||||
| import java.math.BigInteger |  | ||||||
| import java.security.MessageDigest |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual fun SourceBytes.md5(): MD5 = BigInteger( |  | ||||||
|     1, |  | ||||||
|     MessageDigest.getInstance("MD5").digest(this) |  | ||||||
| ).toString(16) |  | ||||||
| @@ -1,30 +1,5 @@ | |||||||
| apply plugin: 'com.getkeepsafe.dexcount' | apply plugin: 'com.getkeepsafe.dexcount' | ||||||
|  |  | ||||||
| ext { |  | ||||||
|     jvmKotlinFolderFile = { |  | ||||||
|         String sep = File.separator |  | ||||||
|         return new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin") |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     enableIncludingJvmCodeInAndroidPart = { |  | ||||||
|         File jvmKotlinFolder = jvmKotlinFolderFile() |  | ||||||
|         if (jvmKotlinFolder.exists()) { |  | ||||||
|             android.sourceSets.main.java.srcDirs += jvmKotlinFolder.path |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     disableIncludingJvmCodeInAndroidPart = { |  | ||||||
|         File jvmKotlinFolder = jvmKotlinFolderFile() |  | ||||||
|         String[] oldDirs = android.sourceSets.main.java.srcDirs |  | ||||||
|         android.sourceSets.main.java.srcDirs = [] |  | ||||||
|         for (oldDir in oldDirs) { |  | ||||||
|             if (oldDir != jvmKotlinFolder.path) { |  | ||||||
|                 android.sourceSets.main.java.srcDirs += oldDir |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| android { | android { | ||||||
|     compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() |     compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() | ||||||
|     buildToolsVersion libs.versions.android.props.buildTools.get() |     buildToolsVersion libs.versions.android.props.buildTools.get() | ||||||
| @@ -58,10 +33,4 @@ android { | |||||||
|     kotlinOptions { |     kotlinOptions { | ||||||
|         jvmTarget = JavaVersion.VERSION_1_8.toString() |         jvmTarget = JavaVersion.VERSION_1_8.toString() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         String sep = File.separator |  | ||||||
|         main.java.srcDirs += "src${sep}main${sep}kotlin" |  | ||||||
|         enableIncludingJvmCodeInAndroidPart() |  | ||||||
|     } |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -13,10 +13,10 @@ repositories { | |||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     jvm() |     jvm() | ||||||
| //    js(IR) { |     js(IR) { | ||||||
| //        browser() |         browser() | ||||||
| //        nodejs() |         nodejs() | ||||||
| //    } |     } | ||||||
|     android {} |     android {} | ||||||
|  |  | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -26,44 +26,44 @@ kotlin { | |||||||
|  |  | ||||||
|                 project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
|                     if ( |                     if ( | ||||||
|                         it != project |                             it != project | ||||||
|                         && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
| //                        && it.kotlin.sourceSets.any { it.name.contains("jsMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jsMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("androidMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("androidMain") } | ||||||
|                     ) { |                     ) { | ||||||
|                         api it |                         api it | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
| //        jsMain { |         jsMain { | ||||||
| //            dependencies { |             dependencies { | ||||||
| //                implementation kotlin('stdlib') |                 implementation kotlin('stdlib') | ||||||
|  |  | ||||||
| //                project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
| //                    if ( |                     if ( | ||||||
| //                        it != project |                             it != project | ||||||
| //                        && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
| //                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
| //                        && it.kotlin.sourceSets.any { it.name.contains("jsMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jsMain") } | ||||||
| //                    ) { |                     ) { | ||||||
| //                        api it |                         api it | ||||||
| //                    } |                     } | ||||||
| //                } |                 } | ||||||
| //            } |             } | ||||||
| //        } |         } | ||||||
|         jvmMain { |         jvmMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('stdlib') |                 implementation kotlin('stdlib') | ||||||
|  |  | ||||||
|                 project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
|                     if ( |                     if ( | ||||||
|                         it != project |                             it != project | ||||||
|                         && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } | ||||||
|                     ) { |                     ) { | ||||||
|                         api it |                         api it | ||||||
|                     } |                     } | ||||||
| @@ -76,10 +76,10 @@ kotlin { | |||||||
|  |  | ||||||
|                 project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
|                     if ( |                     if ( | ||||||
|                         it != project |                             it != project | ||||||
|                         && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("androidMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("androidMain") } | ||||||
|                     ) { |                     ) { | ||||||
|                         api it |                         api it | ||||||
|                     } |                     } | ||||||
| @@ -116,16 +116,16 @@ tasks.dokkaHtml { | |||||||
|             sourceRoots.setFrom(findSourcesWithName("commonMain")) |             sourceRoots.setFrom(findSourcesWithName("commonMain")) | ||||||
|         } |         } | ||||||
|  |  | ||||||
| //        named("jsMain") { |         named("jsMain") { | ||||||
| //            sourceRoots.setFrom(findSourcesWithName("jsMain", "commonMain")) |             sourceRoots.setFrom(findSourcesWithName("jsMain")) | ||||||
| //        } |         } | ||||||
|  |  | ||||||
|         named("jvmMain") { |         named("jvmMain") { | ||||||
|             sourceRoots.setFrom(findSourcesWithName("jvmMain", "commonMain")) |             sourceRoots.setFrom(findSourcesWithName("jvmMain")) | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         named("androidMain") { |         named("androidMain") { | ||||||
|             sourceRoots.setFrom(findSourcesWithName("androidMain", "commonMain")) |             sourceRoots.setFrom(findSourcesWithName("androidMain")) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -23,11 +23,12 @@ allprojects { | |||||||
|         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" |         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" | ||||||
|         mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" |         mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" | ||||||
|         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" |         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" | ||||||
|  |         mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle" | ||||||
|         mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" |         mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" | ||||||
|  |  | ||||||
|         defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" |         defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" | ||||||
|  |  | ||||||
|         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" |         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" | ||||||
|         publishMavenPath = "${rootProject.projectDir.absolutePath}/maven.publish.gradle" |         publishJvmOnlyPath = "${rootProject.projectDir.absolutePath}/jvm.publish.gradle" | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -48,8 +48,8 @@ interface DefaultStatesManagerRepo<T : State> { | |||||||
|  */ |  */ | ||||||
| open class DefaultStatesManager<T : State>( | open class DefaultStatesManager<T : State>( | ||||||
|     protected val repo: DefaultStatesManagerRepo<T> = InMemoryDefaultStatesManagerRepo(), |     protected val repo: DefaultStatesManagerRepo<T> = InMemoryDefaultStatesManagerRepo(), | ||||||
|     protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> true }, |     protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> false }, | ||||||
|     protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> true } |     protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> false } | ||||||
| ) : StatesManager<T> { | ) : StatesManager<T> { | ||||||
|     protected val _onChainStateUpdated = MutableSharedFlow<Pair<T, T>>(0) |     protected val _onChainStateUpdated = MutableSharedFlow<Pair<T, T>>(0) | ||||||
|     override val onChainStateUpdated: Flow<Pair<T, T>> = _onChainStateUpdated.asSharedFlow() |     override val onChainStateUpdated: Flow<Pair<T, T>> = _onChainStateUpdated.asSharedFlow() | ||||||
|   | |||||||
| @@ -14,5 +14,5 @@ crypto_js_version=4.1.1 | |||||||
| # Project data | # Project data | ||||||
|  |  | ||||||
| group=dev.inmo | group=dev.inmo | ||||||
| version=0.12.14 | version=0.19.9 | ||||||
| android_code_version=153 | android_code_version=205 | ||||||
|   | |||||||
| @@ -1,35 +1,44 @@ | |||||||
| [versions] | [versions] | ||||||
|  |  | ||||||
| kt = "1.7.10" | kt = "1.8.22" | ||||||
| kt-serialization = "1.4.0" | kt-serialization = "1.5.1" | ||||||
| kt-coroutines = "1.6.4" | kt-coroutines = "1.7.3" | ||||||
|  |  | ||||||
| jb-compose = "1.2.0-alpha01-dev774" | kslog = "1.1.1" | ||||||
| jb-exposed = "0.39.2" |  | ||||||
| jb-dokka = "1.7.10" |  | ||||||
|  |  | ||||||
| klock = "3.1.0" | jb-compose = "1.4.3" | ||||||
| uuid = "0.5.0" | jb-exposed = "0.41.1" | ||||||
|  | jb-dokka = "1.8.20" | ||||||
|  |  | ||||||
| ktor = "2.1.1" | korlibs = "4.0.3" | ||||||
|  | uuid = "0.7.1" | ||||||
|  |  | ||||||
|  | ktor = "2.3.2" | ||||||
|  |  | ||||||
| gh-release = "2.4.1" | gh-release = "2.4.1" | ||||||
|  |  | ||||||
| koin = "3.2.0" | koin = "3.4.3" | ||||||
|  |  | ||||||
| android-gradle = "7.2.2" | okio = "3.4.0" | ||||||
| dexcount = "3.1.0" |  | ||||||
|  |  | ||||||
| android-coreKtx = "1.9.0" | ksp = "1.8.22-1.0.11" | ||||||
| android-recyclerView = "1.2.1" | kotlin-poet = "1.14.2" | ||||||
| android-appCompat = "1.5.1" |  | ||||||
| android-fragment = "1.5.3" | versions = "0.47.0" | ||||||
| android-espresso = "3.4.0" |  | ||||||
| android-test = "1.1.3" | android-gradle = "7.4.2" | ||||||
|  | dexcount = "4.0.0" | ||||||
|  |  | ||||||
|  | android-coreKtx = "1.10.1" | ||||||
|  | android-recyclerView = "1.3.1" | ||||||
|  | android-appCompat = "1.6.1" | ||||||
|  | android-fragment = "1.6.1" | ||||||
|  | android-espresso = "3.5.1" | ||||||
|  | android-test = "1.1.5" | ||||||
|  |  | ||||||
| android-props-minSdk = "21" | android-props-minSdk = "21" | ||||||
| android-props-compileSdk = "33" | android-props-compileSdk = "33" | ||||||
| android-props-buildTools = "33.0.0" | android-props-buildTools = "33.0.2" | ||||||
|  |  | ||||||
| [libraries] | [libraries] | ||||||
|  |  | ||||||
| @@ -60,8 +69,10 @@ ktor-server-websockets = { module = "io.ktor:ktor-server-websockets", version.re | |||||||
| ktor-server-statusPages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" } | ktor-server-statusPages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" } | ||||||
| ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" } | ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" } | ||||||
|  |  | ||||||
|  | kslog = { module = "dev.inmo:kslog", version.ref = "kslog" } | ||||||
|  |  | ||||||
| klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" } | klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "korlibs" } | ||||||
|  | krypto = { module = "com.soywiz.korlibs.krypto:krypto", version.ref = "korlibs" } | ||||||
| uuid = { module = "com.benasher44:uuid", version.ref = "uuid" } | uuid = { module = "com.benasher44:uuid", version.ref = "uuid" } | ||||||
| koin = { module = "io.insert-koin:koin-core", version.ref = "koin" } | koin = { module = "io.insert-koin:koin-core", version.ref = "koin" } | ||||||
|  |  | ||||||
| @@ -80,9 +91,18 @@ android-test-junit = { module = "androidx.test.ext:junit", version.ref = "androi | |||||||
| kt-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kt" } | kt-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kt" } | ||||||
| kt-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kt" } | kt-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kt" } | ||||||
|  |  | ||||||
|  | # ksp dependencies | ||||||
|  |  | ||||||
|  | kotlin-poet = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin-poet" } | ||||||
|  | ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" } | ||||||
|  |  | ||||||
|  | okio = { module = "com.squareup.okio:okio", version.ref = "okio" } | ||||||
|  |  | ||||||
|  | # Buildscript | ||||||
|  |  | ||||||
| buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" } | buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" } | ||||||
| buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" } | buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" } | ||||||
|  | buildscript-kt-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" } | ||||||
| buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" } | buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" } | ||||||
| buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" } | buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" } | ||||||
| buildscript-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle" } | buildscript-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle" } | ||||||
| @@ -91,3 +111,5 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra | |||||||
| [plugins] | [plugins] | ||||||
|  |  | ||||||
| jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } | jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } | ||||||
|  |  | ||||||
|  | versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } | ||||||
|   | |||||||
							
								
								
									
										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-7.5.1-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
|   | |||||||
							
								
								
									
										118
									
								
								jvm.publish.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										118
									
								
								jvm.publish.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,118 @@ | |||||||
|  | apply plugin: 'maven-publish' | ||||||
|  |  | ||||||
|  | task javadocJar(type: Jar) { | ||||||
|  |     from javadoc | ||||||
|  |     classifier = 'javadoc' | ||||||
|  | } | ||||||
|  | task sourcesJar(type: Jar) { | ||||||
|  |     from sourceSets.main.allSource | ||||||
|  |     classifier = 'sources' | ||||||
|  | } | ||||||
|  |  | ||||||
|  | publishing { | ||||||
|  |     publications { | ||||||
|  |         maven(MavenPublication) { | ||||||
|  |             from components.java | ||||||
|  |  | ||||||
|  |             artifact javadocJar | ||||||
|  |             artifact sourcesJar | ||||||
|  |  | ||||||
|  |             pom { | ||||||
|  |                 resolveStrategy = Closure.DELEGATE_FIRST | ||||||
|  |  | ||||||
|  |                 description = "It is set of projects with micro tools for avoiding of routines coding" | ||||||
|  |                 name = "${project.name}" | ||||||
|  |                 url = "https://github.com/InsanusMokrassar/MicroUtils/" | ||||||
|  |  | ||||||
|  |                 scm { | ||||||
|  |                     developerConnection = "scm:git:[fetch=]https://github.com/InsanusMokrassar/MicroUtils.git[push=]https://github.com/InsanusMokrassar/MicroUtils.git" | ||||||
|  |                     url = "https://github.com/InsanusMokrassar/MicroUtils.git" | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 developers { | ||||||
|  |                      | ||||||
|  |                         developer { | ||||||
|  |                             id = "InsanusMokrassar" | ||||||
|  |                             name = "Aleksei Ovsiannikov" | ||||||
|  |                             email = "ovsyannikov.alexey95@gmail.com" | ||||||
|  |                         } | ||||||
|  |                      | ||||||
|  |  | ||||||
|  |                         developer { | ||||||
|  |                             id = "000Sanya" | ||||||
|  |                             name = "Syrov Aleksandr" | ||||||
|  |                             email = "000sanya.000sanya@gmail.com" | ||||||
|  |                         } | ||||||
|  |                      | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 licenses { | ||||||
|  |                      | ||||||
|  |                         license { | ||||||
|  |                             name = "Apache Software License 2.0" | ||||||
|  |                             url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE" | ||||||
|  |                         } | ||||||
|  |                      | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             repositories { | ||||||
|  |                 if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { | ||||||
|  |                     maven { | ||||||
|  |                         name = "GithubPackages" | ||||||
|  |                         url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils") | ||||||
|  |                  | ||||||
|  |                         credentials { | ||||||
|  |                             username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') | ||||||
|  |                             password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') | ||||||
|  |                         } | ||||||
|  |                  | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) { | ||||||
|  |                     maven { | ||||||
|  |                         name = "Gitea" | ||||||
|  |                         url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven") | ||||||
|  |                  | ||||||
|  |                         credentials(HttpHeaderCredentials) { | ||||||
|  |                             name = "Authorization" | ||||||
|  |                             value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN') | ||||||
|  |                         } | ||||||
|  |                  | ||||||
|  |                         authentication { | ||||||
|  |                             header(HttpHeaderAuthentication) | ||||||
|  |                         } | ||||||
|  |                  | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { | ||||||
|  |                     maven { | ||||||
|  |                         name = "sonatype" | ||||||
|  |                         url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") | ||||||
|  |                  | ||||||
|  |                         credentials { | ||||||
|  |                             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') | ||||||
|  |                             password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') | ||||||
|  |                         } | ||||||
|  |                  | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | if (project.hasProperty("signing.gnupg.keyName")) { | ||||||
|  |     apply plugin: 'signing' | ||||||
|  |      | ||||||
|  |     signing { | ||||||
|  |         useGpgCmd() | ||||||
|  |      | ||||||
|  |         sign publishing.publications | ||||||
|  |     } | ||||||
|  |      | ||||||
|  |     task signAll { | ||||||
|  |         tasks.withType(Sign).forEach { | ||||||
|  |             dependsOn(it) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								jvm.publish.kpsb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								jvm.publish.kpsb
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | {"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"} | ||||||
							
								
								
									
										100
									
								
								koin/generator/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										100
									
								
								koin/generator/README.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,100 @@ | |||||||
|  | # Koin generator | ||||||
|  |  | ||||||
|  | It is Kotlin Symbol Processing generator for `Koin` module in `MicroUtils`. | ||||||
|  |  | ||||||
|  | 1. [What may do this generator](#what-may-do-this-generator) | ||||||
|  | 2. [How to add generator](#how-to-add-generator) | ||||||
|  |  | ||||||
|  | ## What may do this generator | ||||||
|  |  | ||||||
|  | Let's imagine you want to have shortcuts in koin, to get something easily: | ||||||
|  |  | ||||||
|  | ```kotlin | ||||||
|  | val koin: Koin// some initialization | ||||||
|  |  | ||||||
|  | val someUrl = koin.serverUrl | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | So, in that case you may mark containing file with next annotation (in the beginning of file): | ||||||
|  |  | ||||||
|  | ```kotlin | ||||||
|  | @file:GenerateKoinDefinition("serverUrl", String::class, nullable = false) | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | If file is called like `Sample.kt`, will be generated file `GeneratedDefinitionsSample.kt` with next content: | ||||||
|  |  | ||||||
|  | ```kotlin | ||||||
|  | public val Scope.serverUrl: String | ||||||
|  |   get() = get(named("serverUrl")) | ||||||
|  |  | ||||||
|  | public val Koin.serverUrl: String | ||||||
|  |   get() = get(named("serverUrl")) | ||||||
|  |  | ||||||
|  | public fun Module.serverUrlSingle(createdAtStart: Boolean = false, | ||||||
|  |     definition: Definition<String>): KoinDefinition<String> = | ||||||
|  |     single(named("serverUrl"), createdAtStart = createdAtStart, definition = definition) | ||||||
|  |  | ||||||
|  | public fun Module.serverUrlFactory(definition: Definition<String>): | ||||||
|  |     KoinDefinition<String> = factory(named("serverUrl"), definition = definition) | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | Besides, you may use the generics: | ||||||
|  |  | ||||||
|  | ```kotlin | ||||||
|  | @file:GenerateKoinDefinition("sampleInfo", Sample::class, G1::class, G2::class, nullable = false) | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | Will generate: | ||||||
|  |  | ||||||
|  | ```kotlin | ||||||
|  | public val Scope.sampleInfo: Sample<G1, G2> | ||||||
|  |   get() = get(named("sampleInfo")) | ||||||
|  |  | ||||||
|  | public val Koin.sampleInfo: Sample<G1, G2> | ||||||
|  |   get() = get(named("sampleInfo")) | ||||||
|  |  | ||||||
|  | public fun Module.sampleInfoSingle(createdAtStart: Boolean = false, | ||||||
|  |     definition: Definition<Sample<G1, G2>>): KoinDefinition<Sample<G1, G2>> = | ||||||
|  |     single(named("sampleInfo"), createdAtStart = createdAtStart, definition = definition) | ||||||
|  |  | ||||||
|  | public fun Module.sampleInfoFactory(definition: Definition<Sample<G1, G2>>): | ||||||
|  |     KoinDefinition<Sample<G1, G2>> = factory(named("sampleInfo"), definition = definition) | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | In case you wish not to generate single: | ||||||
|  |  | ||||||
|  | ```kotlin | ||||||
|  | @file:GenerateKoinDefinition("sampleInfo", Sample::class, G1::class, G2::class, nullable = false, generateSingle = false) | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | And you will take next code: | ||||||
|  |  | ||||||
|  | ```kotlin | ||||||
|  | public val Scope.sampleInfo: Sample<G1, G2> | ||||||
|  |   get() = get(named("sampleInfo")) | ||||||
|  |  | ||||||
|  | public val Koin.sampleInfo: Sample<G1, G2> | ||||||
|  |   get() = get(named("sampleInfo")) | ||||||
|  |  | ||||||
|  | public fun Module.sampleInfoFactory(definition: Definition<Sample<G1, G2>>): | ||||||
|  |     KoinDefinition<Sample<G1, G2>> = factory(named("sampleInfo"), definition = definition) | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | ## How to add generator | ||||||
|  |  | ||||||
|  | **Note: $ksp_version in the samples above is equal to supported `ksp` version presented in `/gradle/libs.versions.toml` of project** | ||||||
|  |  | ||||||
|  | **Note: $microutils_version in the version of MicroUtils library in your project** | ||||||
|  |  | ||||||
|  | 1. Add `classpath` in `build.gradle` (`classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version"`) | ||||||
|  | 2. Add plugin to the plugins list of your module: `id "com.google.devtools.ksp"` | ||||||
|  | 3. In `dependencies` block add to the required target/compile the dependency `dev.inmo:micro_utils.koin.generator:$microutils_version`: | ||||||
|  |    ```groovy | ||||||
|  |     dependencies { | ||||||
|  |         add("kspCommonMainMetadata", "dev.inmo:micro_utils.koin.generator:$microutils_version") // will work in commonMain of your multiplatform module | ||||||
|  |         add("kspJvm", "dev.inmo:micro_utils.koin.generator:$microutils_version") // will work in main of your JVM module | ||||||
|  |     } | ||||||
|  |      | ||||||
|  |     ksp { // this generator do not require any arguments and we should left `ksp` empty | ||||||
|  |     } | ||||||
|  |     ``` | ||||||
							
								
								
									
										20
									
								
								koin/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								koin/generator/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.jvm" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$publishJvmOnlyPath" | ||||||
|  |  | ||||||
|  | repositories { | ||||||
|  |     mavenCentral() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dependencies { | ||||||
|  |     api project(":micro_utils.koin") | ||||||
|  |     api libs.kotlin.poet | ||||||
|  |     api libs.ksp | ||||||
|  | } | ||||||
|  |  | ||||||
|  | java { | ||||||
|  |     sourceCompatibility = JavaVersion.VERSION_1_8 | ||||||
|  |     targetCompatibility = JavaVersion.VERSION_1_8 | ||||||
|  | } | ||||||
							
								
								
									
										332
									
								
								koin/generator/src/main/kotlin/Processor.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										332
									
								
								koin/generator/src/main/kotlin/Processor.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,332 @@ | |||||||
|  | package dev.inmo.micro_utils.koin.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.KSTypeNotPresentException | ||||||
|  | import com.google.devtools.ksp.KSTypesNotPresentException | ||||||
|  | import com.google.devtools.ksp.KspExperimental | ||||||
|  | import com.google.devtools.ksp.getAnnotationsByType | ||||||
|  | import com.google.devtools.ksp.processing.CodeGenerator | ||||||
|  | import com.google.devtools.ksp.processing.Resolver | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessor | ||||||
|  | import com.google.devtools.ksp.symbol.KSAnnotated | ||||||
|  | import com.google.devtools.ksp.symbol.KSFile | ||||||
|  | import com.google.devtools.ksp.symbol.Modifier | ||||||
|  | import com.squareup.kotlinpoet.AnnotationSpec | ||||||
|  | import com.squareup.kotlinpoet.ClassName | ||||||
|  | import com.squareup.kotlinpoet.CodeBlock | ||||||
|  | import com.squareup.kotlinpoet.FileSpec | ||||||
|  | import com.squareup.kotlinpoet.FunSpec | ||||||
|  | import com.squareup.kotlinpoet.KModifier | ||||||
|  | import com.squareup.kotlinpoet.ParameterSpec | ||||||
|  | import com.squareup.kotlinpoet.ParameterizedTypeName | ||||||
|  | import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy | ||||||
|  | import com.squareup.kotlinpoet.PropertySpec | ||||||
|  | import com.squareup.kotlinpoet.TypeName | ||||||
|  | import com.squareup.kotlinpoet.TypeVariableName | ||||||
|  | import com.squareup.kotlinpoet.asTypeName | ||||||
|  | import com.squareup.kotlinpoet.ksp.toClassName | ||||||
|  | import com.squareup.kotlinpoet.ksp.toTypeName | ||||||
|  | import com.squareup.kotlinpoet.ksp.writeTo | ||||||
|  | import dev.inmo.micro_utils.koin.annotations.GenerateGenericKoinDefinition | ||||||
|  | import dev.inmo.micro_utils.koin.annotations.GenerateKoinDefinition | ||||||
|  | import org.koin.core.Koin | ||||||
|  | import org.koin.core.module.Module | ||||||
|  | import org.koin.core.parameter.ParametersDefinition | ||||||
|  | import org.koin.core.scope.Scope | ||||||
|  | import java.io.File | ||||||
|  | import kotlin.reflect.KClass | ||||||
|  |  | ||||||
|  | class Processor( | ||||||
|  |     private val codeGenerator: CodeGenerator | ||||||
|  | ) : SymbolProcessor { | ||||||
|  |     private val definitionClassName = ClassName("org.koin.core.definition", "Definition") | ||||||
|  |     private val koinDefinitionClassName = ClassName("org.koin.core.definition", "KoinDefinition") | ||||||
|  |  | ||||||
|  |     private fun FileSpec.Builder.addCodeForType( | ||||||
|  |         targetType: TypeName, | ||||||
|  |         name: String, | ||||||
|  |         nullable: Boolean, | ||||||
|  |         generateSingle: Boolean, | ||||||
|  |         generateFactory: Boolean, | ||||||
|  |     ) { | ||||||
|  |         val targetTypeAsGenericType = (targetType as? TypeVariableName) ?.copy(reified = true) | ||||||
|  |  | ||||||
|  |         fun addGetterProperty( | ||||||
|  |             receiver: KClass<*> | ||||||
|  |         ) { | ||||||
|  |             addProperty( | ||||||
|  |                 PropertySpec.builder( | ||||||
|  |                     name, | ||||||
|  |                     targetType, | ||||||
|  |                 ).apply { | ||||||
|  |                     addKdoc( | ||||||
|  |                         """ | ||||||
|  |                             @return Definition by key "${name}" | ||||||
|  |                         """.trimIndent() | ||||||
|  |                     ) | ||||||
|  |                     getter( | ||||||
|  |                         FunSpec.getterBuilder().apply { | ||||||
|  |                             targetTypeAsGenericType ?.let { | ||||||
|  |                                 addModifiers(KModifier.INLINE) | ||||||
|  |                             } | ||||||
|  |                             addCode( | ||||||
|  |                                 "return " + (if (nullable) { | ||||||
|  |                                     "getOrNull" | ||||||
|  |                                 } else { | ||||||
|  |                                     "get" | ||||||
|  |                                 }) + "(named(\"${name}\"))" | ||||||
|  |                             ) | ||||||
|  |                         }.build() | ||||||
|  |                     ) | ||||||
|  |                     targetTypeAsGenericType ?.let { | ||||||
|  |                         addTypeVariable(it) | ||||||
|  |                     } | ||||||
|  |                     receiver(receiver) | ||||||
|  |                 }.build() | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         if (targetTypeAsGenericType == null) { | ||||||
|  |             addGetterProperty(Scope::class) | ||||||
|  |             addGetterProperty(Koin::class) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         val parametersDefinitionClassName = ClassName( | ||||||
|  |             "org.koin.core.parameter", | ||||||
|  |             "ParametersDefinition" | ||||||
|  |         ) | ||||||
|  |         fun addGetterMethod( | ||||||
|  |             receiver: KClass<*> | ||||||
|  |         ) { | ||||||
|  |             addFunction( | ||||||
|  |                 FunSpec.builder( | ||||||
|  |                     name | ||||||
|  |                 ).apply { | ||||||
|  |                     addKdoc( | ||||||
|  |                         """ | ||||||
|  |                             @return Definition by key "${name}" with [parameters] | ||||||
|  |                         """.trimIndent() | ||||||
|  |                     ) | ||||||
|  |                     receiver(receiver) | ||||||
|  |                     addParameter( | ||||||
|  |                         ParameterSpec( | ||||||
|  |                             "parameters", | ||||||
|  |                             parametersDefinitionClassName.let { | ||||||
|  |                                 if (targetTypeAsGenericType != null) { | ||||||
|  |                                     it.copy(nullable = true) | ||||||
|  |                                 } else { | ||||||
|  |                                     it | ||||||
|  |                                 } | ||||||
|  |                             }, | ||||||
|  |                             KModifier.NOINLINE | ||||||
|  |                         ).toBuilder().apply { | ||||||
|  |                             if (targetTypeAsGenericType != null) { | ||||||
|  |                                 defaultValue("null") | ||||||
|  |                             } | ||||||
|  |                         }.build() | ||||||
|  |                     ) | ||||||
|  |                     addModifiers(KModifier.INLINE) | ||||||
|  |                     targetTypeAsGenericType ?.let { | ||||||
|  |                         addTypeVariable(it) | ||||||
|  |                         returns(it.copy(nullable = nullable)) | ||||||
|  |                     } ?: returns(targetType) | ||||||
|  |                     addCode( | ||||||
|  |                         "return " + (if (nullable) { | ||||||
|  |                             "getOrNull" | ||||||
|  |                         } else { | ||||||
|  |                             "get" | ||||||
|  |                         }) + "(named(\"${name}\"), parameters)" | ||||||
|  |                     ) | ||||||
|  |                 }.build() | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         addGetterMethod(Scope::class) | ||||||
|  |         addGetterMethod(Koin::class) | ||||||
|  |  | ||||||
|  |         fun FunSpec.Builder.addDefinitionParameter() { | ||||||
|  |             val definitionModifiers = if (targetTypeAsGenericType == null) { | ||||||
|  |                 arrayOf() | ||||||
|  |             } else { | ||||||
|  |                 arrayOf(KModifier.NOINLINE) | ||||||
|  |             } | ||||||
|  |             addParameter( | ||||||
|  |                 ParameterSpec.builder( | ||||||
|  |                     "definition", | ||||||
|  |                     definitionClassName.parameterizedBy(targetType.copy(nullable = false)), | ||||||
|  |                     *definitionModifiers | ||||||
|  |                 ).build() | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         if (generateSingle) { | ||||||
|  |             fun FunSpec.Builder.configure( | ||||||
|  |                 useInstead: String? = null | ||||||
|  |             ) { | ||||||
|  |                 addKdoc( | ||||||
|  |                     """ | ||||||
|  |                         Will register [definition] with [org.koin.core.module.Module.single] and key "${name}" | ||||||
|  |                     """.trimIndent() | ||||||
|  |                 ) | ||||||
|  |                 receiver(Module::class) | ||||||
|  |                 addParameter( | ||||||
|  |                     ParameterSpec.builder( | ||||||
|  |                         "createdAtStart", | ||||||
|  |                         Boolean::class | ||||||
|  |                     ).apply { | ||||||
|  |                         defaultValue("false") | ||||||
|  |                     }.build() | ||||||
|  |                 ) | ||||||
|  |                 addDefinitionParameter() | ||||||
|  |                 returns(koinDefinitionClassName.parameterizedBy(targetType.copy(nullable = false))) | ||||||
|  |                 addCode( | ||||||
|  |                     "return single(named(\"${name}\"), createdAtStart = createdAtStart, definition = definition)" | ||||||
|  |                 ) | ||||||
|  |                 targetTypeAsGenericType ?.let { | ||||||
|  |                     addTypeVariable(it) | ||||||
|  |                     addModifiers(KModifier.INLINE) | ||||||
|  |                 } | ||||||
|  |                 if (useInstead != null) { | ||||||
|  |                     addAnnotation( | ||||||
|  |                         AnnotationSpec.builder( | ||||||
|  |                             Deprecated::class | ||||||
|  |                         ).apply { | ||||||
|  |                             addMember( | ||||||
|  |                                 CodeBlock.of( | ||||||
|  |                                     """ | ||||||
|  |                                         "This definition is old style and should not be used anymore. Use $useInstead instead" | ||||||
|  |                                     """.trimIndent() | ||||||
|  |                                 ) | ||||||
|  |                             ) | ||||||
|  |                             addMember(CodeBlock.of("ReplaceWith(\"$useInstead\")")) | ||||||
|  |                         }.build() | ||||||
|  |                     ) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             val actualSingleName = "single${name.replaceFirstChar { it.uppercase() }}" | ||||||
|  |             if (targetTypeAsGenericType == null) { // classic type | ||||||
|  |                 addFunction( | ||||||
|  |                     FunSpec.builder("${name}Single").apply { configure(actualSingleName) }.build() | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             addFunction( | ||||||
|  |                 FunSpec.builder(actualSingleName).apply { configure() }.build() | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         if (generateFactory) { | ||||||
|  |             fun FunSpec.Builder.configure( | ||||||
|  |                 useInstead: String? = null | ||||||
|  |             ) { | ||||||
|  |                 addKdoc( | ||||||
|  |                     """ | ||||||
|  |                         Will register [definition] with [org.koin.core.module.Module.factory] and key "${name}" | ||||||
|  |                     """.trimIndent() | ||||||
|  |                 ) | ||||||
|  |                 receiver(Module::class) | ||||||
|  |                 addDefinitionParameter() | ||||||
|  |                 returns(koinDefinitionClassName.parameterizedBy(targetType.copy(nullable = false))) | ||||||
|  |                 addCode( | ||||||
|  |                     "return factory(named(\"${name}\"), definition = definition)" | ||||||
|  |                 ) | ||||||
|  |                 targetTypeAsGenericType ?.let { | ||||||
|  |                     addTypeVariable(it) | ||||||
|  |                     addModifiers(KModifier.INLINE) | ||||||
|  |                 } | ||||||
|  |                 if (useInstead != null) { | ||||||
|  |                     addAnnotation( | ||||||
|  |                         AnnotationSpec.builder( | ||||||
|  |                             Deprecated::class | ||||||
|  |                         ).apply { | ||||||
|  |                             addMember( | ||||||
|  |                                 CodeBlock.of( | ||||||
|  |                                     """ | ||||||
|  |                                         "This definition is old style and should not be used anymore. Use $useInstead instead" | ||||||
|  |                                     """.trimIndent() | ||||||
|  |                                 ) | ||||||
|  |                             ) | ||||||
|  |                             addMember(CodeBlock.of("ReplaceWith(\"$useInstead\")")) | ||||||
|  |                         }.build() | ||||||
|  |                     ) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             val actualFactoryName = "factory${name.replaceFirstChar { it.uppercase() }}" | ||||||
|  |             if (targetTypeAsGenericType == null) { // classic type | ||||||
|  |                 addFunction( | ||||||
|  |                     FunSpec.builder("${name}Factory").apply { configure(useInstead = actualFactoryName) }.build() | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |             addFunction( | ||||||
|  |                 FunSpec.builder(actualFactoryName).apply { configure() }.build() | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |         addImport("org.koin.core.qualifier", "named") | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @OptIn(KspExperimental::class) | ||||||
|  |     override fun process(resolver: Resolver): List<KSAnnotated> { | ||||||
|  |         (resolver.getSymbolsWithAnnotation( | ||||||
|  |             GenerateKoinDefinition::class.qualifiedName!! | ||||||
|  |         ) + resolver.getSymbolsWithAnnotation( | ||||||
|  |             GenerateGenericKoinDefinition::class.qualifiedName!! | ||||||
|  |         )).filterIsInstance<KSFile>().forEach { ksFile -> | ||||||
|  |             FileSpec.builder( | ||||||
|  |                 ksFile.packageName.asString(), | ||||||
|  |                 "GeneratedDefinitions${ksFile.fileName.removeSuffix(".kt")}" | ||||||
|  |             ).apply { | ||||||
|  |                 addFileComment( | ||||||
|  |                     """ | ||||||
|  |                         THIS CODE HAVE BEEN GENERATED AUTOMATICALLY | ||||||
|  |                         TO REGENERATE IT JUST DELETE FILE | ||||||
|  |                         ORIGINAL FILE: ${ksFile.fileName} | ||||||
|  |                     """.trimIndent() | ||||||
|  |                 ) | ||||||
|  |                 ksFile.getAnnotationsByType(GenerateKoinDefinition::class).forEach { | ||||||
|  |                     val type = runCatching { | ||||||
|  |                         it.type.asTypeName() | ||||||
|  |                     }.getOrElse { e -> | ||||||
|  |                         if (e is KSTypeNotPresentException) { | ||||||
|  |                             e.ksType.toClassName() | ||||||
|  |                         } else { | ||||||
|  |                             throw e | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                     val targetType = runCatching { | ||||||
|  |                         type.parameterizedBy(*(it.typeArgs.takeIf { it.isNotEmpty() } ?.map { it.asTypeName() } ?.toTypedArray() ?: return@runCatching type)) | ||||||
|  |                     }.getOrElse { e -> | ||||||
|  |                         when (e) { | ||||||
|  |                             is KSTypeNotPresentException -> e.ksType.toClassName() | ||||||
|  |                         } | ||||||
|  |                         if (e is KSTypesNotPresentException) { | ||||||
|  |                             type.parameterizedBy(*e.ksTypes.map { it.toTypeName() }.toTypedArray()) | ||||||
|  |                         } else { | ||||||
|  |                             throw e | ||||||
|  |                         } | ||||||
|  |                     }.copy( | ||||||
|  |                         nullable = it.nullable | ||||||
|  |                     ) | ||||||
|  |  | ||||||
|  |                     addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory) | ||||||
|  |                 } | ||||||
|  |                 ksFile.getAnnotationsByType(GenerateGenericKoinDefinition::class).forEach { | ||||||
|  |                     val targetType = TypeVariableName("T", Any::class) | ||||||
|  |                     addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory) | ||||||
|  |                 } | ||||||
|  |             }.build().let { | ||||||
|  |                 File( | ||||||
|  |                     File(ksFile.filePath).parent, | ||||||
|  |                     "GeneratedDefinitions${ksFile.fileName}" | ||||||
|  |                 ).takeIf { !it.exists() } ?.apply { | ||||||
|  |                     parentFile.mkdirs() | ||||||
|  |  | ||||||
|  |                     writer().use { writer -> | ||||||
|  |                         it.writeTo(writer) | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         return emptyList() | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										11
									
								
								koin/generator/src/main/kotlin/Provider.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								koin/generator/src/main/kotlin/Provider.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_utils.koin.generator | ||||||
|  |  | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessor | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessorEnvironment | ||||||
|  | import com.google.devtools.ksp.processing.SymbolProcessorProvider | ||||||
|  |  | ||||||
|  | class Provider : SymbolProcessorProvider { | ||||||
|  |     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor = Processor( | ||||||
|  |         environment.codeGenerator | ||||||
|  |     ) | ||||||
|  | } | ||||||
| @@ -0,0 +1 @@ | |||||||
|  | dev.inmo.micro_utils.koin.generator.Provider | ||||||
							
								
								
									
										27
									
								
								koin/generator/test/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								koin/generator/test/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  |     id "com.google.devtools.ksp" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppProjectWithSerializationPresetPath" | ||||||
|  |  | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api project(":micro_utils.koin") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | dependencies { | ||||||
|  |     add("kspCommonMainMetadata", project(":micro_utils.koin.generator")) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | ksp { | ||||||
|  | } | ||||||
| @@ -0,0 +1,124 @@ | |||||||
|  | // THIS CODE HAVE BEEN GENERATED AUTOMATICALLY | ||||||
|  | // TO REGENERATE IT JUST DELETE FILE | ||||||
|  | // ORIGINAL FILE: Test.kt | ||||||
|  | package dev.inmo.micro_utils.koin.generator.test | ||||||
|  |  | ||||||
|  | import kotlin.Any | ||||||
|  | import kotlin.Boolean | ||||||
|  | import kotlin.Deprecated | ||||||
|  | import kotlin.String | ||||||
|  | import org.koin.core.Koin | ||||||
|  | import org.koin.core.definition.Definition | ||||||
|  | import org.koin.core.definition.KoinDefinition | ||||||
|  | import org.koin.core.module.Module | ||||||
|  | import org.koin.core.parameter.ParametersDefinition | ||||||
|  | import org.koin.core.qualifier.named | ||||||
|  | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "sampleInfo" | ||||||
|  |  */ | ||||||
|  | public val Scope.sampleInfo: Test<String> | ||||||
|  |   get() = get(named("sampleInfo")) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "sampleInfo" | ||||||
|  |  */ | ||||||
|  | public val Koin.sampleInfo: Test<String> | ||||||
|  |   get() = get(named("sampleInfo")) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "sampleInfo" with [parameters] | ||||||
|  |  */ | ||||||
|  | public inline fun Scope.sampleInfo(noinline parameters: ParametersDefinition): Test<String> = | ||||||
|  |     get(named("sampleInfo"), parameters) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "sampleInfo" with [parameters] | ||||||
|  |  */ | ||||||
|  | public inline fun Koin.sampleInfo(noinline parameters: ParametersDefinition): Test<String> = | ||||||
|  |     get(named("sampleInfo"), parameters) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.single] and key "sampleInfo" | ||||||
|  |  */ | ||||||
|  | @Deprecated( | ||||||
|  |   "This definition is old style and should not be used anymore. Use singleSampleInfo instead", | ||||||
|  |   ReplaceWith("singleSampleInfo"), | ||||||
|  | ) | ||||||
|  | public fun Module.sampleInfoSingle(createdAtStart: Boolean = false, | ||||||
|  |     definition: Definition<Test<String>>): KoinDefinition<Test<String>> = | ||||||
|  |     single(named("sampleInfo"), createdAtStart = createdAtStart, definition = definition) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.single] and key "sampleInfo" | ||||||
|  |  */ | ||||||
|  | public fun Module.singleSampleInfo(createdAtStart: Boolean = false, | ||||||
|  |     definition: Definition<Test<String>>): KoinDefinition<Test<String>> = | ||||||
|  |     single(named("sampleInfo"), createdAtStart = createdAtStart, definition = definition) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.factory] and key "sampleInfo" | ||||||
|  |  */ | ||||||
|  | @Deprecated( | ||||||
|  |   "This definition is old style and should not be used anymore. Use factorySampleInfo instead", | ||||||
|  |   ReplaceWith("factorySampleInfo"), | ||||||
|  | ) | ||||||
|  | public fun Module.sampleInfoFactory(definition: Definition<Test<String>>): | ||||||
|  |     KoinDefinition<Test<String>> = factory(named("sampleInfo"), definition = definition) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.factory] and key "sampleInfo" | ||||||
|  |  */ | ||||||
|  | public fun Module.factorySampleInfo(definition: Definition<Test<String>>): | ||||||
|  |     KoinDefinition<Test<String>> = factory(named("sampleInfo"), definition = definition) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "test" with [parameters] | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Scope.test(noinline parameters: ParametersDefinition? = null): T | ||||||
|  |     = get(named("test"), parameters) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "test" with [parameters] | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Koin.test(noinline parameters: ParametersDefinition? = null): T | ||||||
|  |     = get(named("test"), parameters) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.single] and key "test" | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Module.singleTest(createdAtStart: Boolean = false, noinline | ||||||
|  |     definition: Definition<T>): KoinDefinition<T> = single(named("test"), createdAtStart = | ||||||
|  |     createdAtStart, definition = definition) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.factory] and key "test" | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Module.factoryTest(noinline definition: Definition<T>): | ||||||
|  |     KoinDefinition<T> = factory(named("test"), definition = definition) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "testNullable" with [parameters] | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Scope.testNullable(noinline parameters: ParametersDefinition? = | ||||||
|  |     null): T? = getOrNull(named("testNullable"), parameters) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @return Definition by key "testNullable" with [parameters] | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Koin.testNullable(noinline parameters: ParametersDefinition? = | ||||||
|  |     null): T? = getOrNull(named("testNullable"), parameters) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.single] and key "testNullable" | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Module.singleTestNullable(createdAtStart: Boolean = false, | ||||||
|  |     noinline definition: Definition<T>): KoinDefinition<T> = single(named("testNullable"), | ||||||
|  |     createdAtStart = createdAtStart, definition = definition) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will register [definition] with [org.koin.core.module.Module.factory] and key "testNullable" | ||||||
|  |  */ | ||||||
|  | public inline fun <reified T : Any> Module.factoryTestNullable(noinline definition: Definition<T>): | ||||||
|  |     KoinDefinition<T> = factory(named("testNullable"), definition = definition) | ||||||
							
								
								
									
										16
									
								
								koin/generator/test/src/commonMain/kotlin/Test.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								koin/generator/test/src/commonMain/kotlin/Test.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,16 @@ | |||||||
|  | @file:GenerateKoinDefinition("sampleInfo", Test::class, String::class, nullable = false) | ||||||
|  | @file:GenerateGenericKoinDefinition("test", nullable = false) | ||||||
|  | @file:GenerateGenericKoinDefinition("testNullable", nullable = true) | ||||||
|  | package dev.inmo.micro_utils.koin.generator.test | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.koin.annotations.GenerateGenericKoinDefinition | ||||||
|  | import dev.inmo.micro_utils.koin.annotations.GenerateKoinDefinition | ||||||
|  | import org.koin.core.Koin | ||||||
|  |  | ||||||
|  | class Test<T>( | ||||||
|  |     koin: Koin | ||||||
|  | ) { | ||||||
|  |     init { | ||||||
|  |         koin.sampleInfo | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								koin/generator/test/src/main/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								koin/generator/test/src/main/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest package="dev.inmo.micro_utils.koin.generator.test"/> | ||||||
							
								
								
									
										40
									
								
								koin/src/commonMain/kotlin/GetWithDefinition.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								koin/src/commonMain/kotlin/GetWithDefinition.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,40 @@ | |||||||
|  | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
|  | import org.koin.core.Koin | ||||||
|  | import org.koin.core.definition.BeanDefinition | ||||||
|  | import org.koin.core.definition.KoinDefinition | ||||||
|  | import org.koin.core.instance.InstanceFactory | ||||||
|  | import org.koin.core.parameter.ParametersDefinition | ||||||
|  | import org.koin.core.scope.Scope | ||||||
|  |  | ||||||
|  | fun <T> Koin.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|  |     definition.primaryType, | ||||||
|  |     definition.qualifier, | ||||||
|  |     parameters | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | fun <T> Koin.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|  |     definition.beanDefinition, | ||||||
|  |     parameters | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | fun <T> Koin.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|  |     definition.factory, | ||||||
|  |     parameters | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | fun <T> Scope.get(definition: BeanDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|  |     definition.primaryType, | ||||||
|  |     definition.qualifier, | ||||||
|  |     parameters | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | fun <T> Scope.get(definition: InstanceFactory<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|  |     definition.beanDefinition, | ||||||
|  |     parameters | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | fun <T> Scope.get(definition: KoinDefinition<T>, parameters: ParametersDefinition? = null): T = get( | ||||||
|  |     definition.factory, | ||||||
|  |     parameters | ||||||
|  | ) | ||||||
| @@ -0,0 +1,26 @@ | |||||||
|  | package dev.inmo.micro_utils.koin.annotations | ||||||
|  |  | ||||||
|  | import kotlin.reflect.KClass | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Use this annotation to mark files near to which generator should place generated extensions for koin [org.koin.core.scope.Scope] | ||||||
|  |  * and [org.koin.core.Koin] | ||||||
|  |  * | ||||||
|  |  * @param name Name for definitions. This name will be available as extension for [org.koin.core.scope.Scope] and [org.koin.core.Koin] | ||||||
|  |  * @param type Type of extensions. It is base star-typed class | ||||||
|  |  * @param typeArgs Generic types for [type]. For example, if [type] == `Something::class` and [typeArgs] == `G1::class, | ||||||
|  |  * G2::class`, the result type will be `Something<G1, G2>` | ||||||
|  |  * @param nullable In case when true, extension will not throw error when definition has not been registered in koin | ||||||
|  |  * @param generateSingle Generate definition factory with [org.koin.core.module.Module.single]. You will be able to use | ||||||
|  |  * the extension [org.koin.core.module.Module].[name]Single(createdAtStart/* default false */) { /* your definition */ } | ||||||
|  |  * @param generateFactory Generate definition factory with [org.koin.core.module.Module.factory]. You will be able to use | ||||||
|  |  * the extension [org.koin.core.module.Module].[name]Factory { /* your definition */ } | ||||||
|  |  */ | ||||||
|  | @Target(AnnotationTarget.FILE) | ||||||
|  | @Repeatable | ||||||
|  | annotation class GenerateGenericKoinDefinition( | ||||||
|  |     val name: String, | ||||||
|  |     val nullable: Boolean = true, | ||||||
|  |     val generateSingle: Boolean = true, | ||||||
|  |     val generateFactory: Boolean = true | ||||||
|  | ) | ||||||
| @@ -0,0 +1,28 @@ | |||||||
|  | package dev.inmo.micro_utils.koin.annotations | ||||||
|  |  | ||||||
|  | import kotlin.reflect.KClass | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Use this annotation to mark files near to which generator should place generated extensions for koin [org.koin.core.scope.Scope] | ||||||
|  |  * and [org.koin.core.Koin] | ||||||
|  |  * | ||||||
|  |  * @param name Name for definitions. This name will be available as extension for [org.koin.core.scope.Scope] and [org.koin.core.Koin] | ||||||
|  |  * @param type Type of extensions. It is base star-typed class | ||||||
|  |  * @param typeArgs Generic types for [type]. For example, if [type] == `Something::class` and [typeArgs] == `G1::class, | ||||||
|  |  * G2::class`, the result type will be `Something<G1, G2>` | ||||||
|  |  * @param nullable In case when true, extension will not throw error when definition has not been registered in koin | ||||||
|  |  * @param generateSingle Generate definition factory with [org.koin.core.module.Module.single]. You will be able to use | ||||||
|  |  * the extension [org.koin.core.module.Module].[name]Single(createdAtStart/* default false */) { /* your definition */ } | ||||||
|  |  * @param generateFactory Generate definition factory with [org.koin.core.module.Module.factory]. You will be able to use | ||||||
|  |  * the extension [org.koin.core.module.Module].[name]Factory { /* your definition */ } | ||||||
|  |  */ | ||||||
|  | @Target(AnnotationTarget.FILE) | ||||||
|  | @Repeatable | ||||||
|  | annotation class GenerateKoinDefinition( | ||||||
|  |     val name: String, | ||||||
|  |     val type: KClass<*>, | ||||||
|  |     vararg val typeArgs: KClass<*>, | ||||||
|  |     val nullable: Boolean = true, | ||||||
|  |     val generateSingle: Boolean = true, | ||||||
|  |     val generateFactory: Boolean = true | ||||||
|  | ) | ||||||
| @@ -1,6 +1,7 @@ | |||||||
| package dev.inmo.micro_utils.koin | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
| import org.koin.core.definition.Definition | import org.koin.core.definition.Definition | ||||||
|  | import org.koin.core.definition.KoinDefinition | ||||||
| import org.koin.core.instance.InstanceFactory | import org.koin.core.instance.InstanceFactory | ||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import org.koin.core.qualifier.Qualifier | import org.koin.core.qualifier.Qualifier | ||||||
| @@ -13,7 +14,7 @@ inline fun <reified T : Any> Module.factoryWithBinds( | |||||||
|     qualifier: Qualifier? = null, |     qualifier: Qualifier? = null, | ||||||
|     bindFilter: (KClass<*>) -> Boolean = { true }, |     bindFilter: (KClass<*>) -> Boolean = { true }, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
| ): Pair<Module, InstanceFactory<*>> { | ): KoinDefinition<*> { | ||||||
|     return factory(qualifier, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) |     return factory(qualifier, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -21,7 +22,7 @@ inline fun <reified T : Any> Module.factoryWithBinds( | |||||||
|     qualifier: String, |     qualifier: String, | ||||||
|     bindFilter: (KClass<*>) -> Boolean = { true }, |     bindFilter: (KClass<*>) -> Boolean = { true }, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
| ): Pair<Module, InstanceFactory<*>> { | ): KoinDefinition<*> { | ||||||
|     return factory(qualifier, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) |     return factory(qualifier, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| package dev.inmo.micro_utils.koin | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
| import org.koin.core.definition.Definition | import org.koin.core.definition.Definition | ||||||
|  | import org.koin.core.definition.KoinDefinition | ||||||
| import org.koin.core.instance.InstanceFactory | import org.koin.core.instance.InstanceFactory | ||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import kotlin.reflect.KClass | import kotlin.reflect.KClass | ||||||
| @@ -8,6 +9,6 @@ import kotlin.reflect.KClass | |||||||
| inline fun <reified T : Any> Module.factoryWithRandomQualifierAndBinds( | inline fun <reified T : Any> Module.factoryWithRandomQualifierAndBinds( | ||||||
|     bindFilter: (KClass<*>) -> Boolean = { true }, |     bindFilter: (KClass<*>) -> Boolean = { true }, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
| ): Pair<Module, InstanceFactory<*>> { | ): KoinDefinition<*> { | ||||||
|     return factoryWithBinds(RandomQualifier(), bindFilter, definition) |     return factoryWithBinds(RandomQualifier(), bindFilter, definition) | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										27
									
								
								koin/src/jvmMain/kotlin/LazyInject.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								koin/src/jvmMain/kotlin/LazyInject.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
|  | import org.koin.core.parameter.ParametersDefinition | ||||||
|  | import org.koin.core.qualifier.Qualifier | ||||||
|  | import org.koin.java.KoinJavaComponent | ||||||
|  | import kotlin.reflect.KClass | ||||||
|  |  | ||||||
|  | fun <T> lazyInject( | ||||||
|  |     kClassFactory: () -> KClass<*>, | ||||||
|  |     qualifier: Qualifier? = null, | ||||||
|  |     parameters: ParametersDefinition? = null | ||||||
|  | ): Lazy<T> { | ||||||
|  |     return lazy(LazyThreadSafetyMode.SYNCHRONIZED) { | ||||||
|  |         KoinJavaComponent.get(kClassFactory().java, qualifier, parameters) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun <T> lazyInject( | ||||||
|  |     kClass: KClass<*>, | ||||||
|  |     qualifier: Qualifier? = null, | ||||||
|  |     parameters: ParametersDefinition? = null | ||||||
|  | ): Lazy<T> = lazyInject({ kClass }, qualifier, parameters) | ||||||
|  |  | ||||||
|  | inline fun <reified T> lazyInject( | ||||||
|  |     qualifier: Qualifier? = null, | ||||||
|  |     noinline parameters: ParametersDefinition? = null | ||||||
|  | ): Lazy<T> = lazyInject(T::class, qualifier, parameters) | ||||||
| @@ -1,6 +1,7 @@ | |||||||
| package dev.inmo.micro_utils.koin | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
| import org.koin.core.definition.Definition | import org.koin.core.definition.Definition | ||||||
|  | import org.koin.core.definition.KoinDefinition | ||||||
| import org.koin.core.instance.InstanceFactory | import org.koin.core.instance.InstanceFactory | ||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import org.koin.core.qualifier.Qualifier | import org.koin.core.qualifier.Qualifier | ||||||
| @@ -14,7 +15,7 @@ inline fun <reified T : Any> Module.singleWithBinds( | |||||||
|     createdAtStart: Boolean = false, |     createdAtStart: Boolean = false, | ||||||
|     bindFilter: (KClass<*>) -> Boolean = { true }, |     bindFilter: (KClass<*>) -> Boolean = { true }, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
| ): Pair<Module, InstanceFactory<*>> { | ): KoinDefinition<*> { | ||||||
|     return single(qualifier, createdAtStart, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) |     return single(qualifier, createdAtStart, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -24,7 +25,7 @@ inline fun <reified T : Any> Module.singleWithBinds( | |||||||
|     createdAtStart: Boolean = false, |     createdAtStart: Boolean = false, | ||||||
|     bindFilter: (KClass<*>) -> Boolean = { true }, |     bindFilter: (KClass<*>) -> Boolean = { true }, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
| ): Pair<Module, InstanceFactory<*>> { | ): KoinDefinition<*> { | ||||||
|     return single(qualifier, createdAtStart, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) |     return single(qualifier, createdAtStart, definition) binds (T::class.allSuperclasses.filter(bindFilter).toTypedArray()) | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| package dev.inmo.micro_utils.koin | package dev.inmo.micro_utils.koin | ||||||
|  |  | ||||||
| import org.koin.core.definition.Definition | import org.koin.core.definition.Definition | ||||||
|  | import org.koin.core.definition.KoinDefinition | ||||||
| import org.koin.core.instance.InstanceFactory | import org.koin.core.instance.InstanceFactory | ||||||
| import org.koin.core.module.Module | import org.koin.core.module.Module | ||||||
| import kotlin.reflect.KClass | import kotlin.reflect.KClass | ||||||
| @@ -9,6 +10,6 @@ inline fun <reified T : Any> Module.singleWithRandomQualifierAndBinds( | |||||||
|     createdAtStart: Boolean = false, |     createdAtStart: Boolean = false, | ||||||
|     bindFilter: (KClass<*>) -> Boolean = { true }, |     bindFilter: (KClass<*>) -> Boolean = { true }, | ||||||
|     noinline definition: Definition<T> |     noinline definition: Definition<T> | ||||||
| ): Pair<Module, InstanceFactory<*>> { | ): KoinDefinition<*> { | ||||||
|     return singleWithBinds(RandomQualifier(), createdAtStart, bindFilter, definition) |     return singleWithBinds(RandomQualifier(), createdAtStart, bindFilter, definition) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -15,5 +15,20 @@ kotlin { | |||||||
|                 api libs.ktor.client |                 api libs.ktor.client | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |         androidMain { | ||||||
|  |             dependsOn jvmMain | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         linuxX64Main { | ||||||
|  |             dependencies { | ||||||
|  |                 api internalProject("micro_utils.mime_types") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         mingwX64Main { | ||||||
|  |             dependencies { | ||||||
|  |                 api internalProject("micro_utils.mime_types") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -4,6 +4,10 @@ import io.ktor.client.call.body | |||||||
| import io.ktor.client.statement.HttpResponse | import io.ktor.client.statement.HttpResponse | ||||||
| import io.ktor.http.HttpStatusCode | import io.ktor.http.HttpStatusCode | ||||||
|  |  | ||||||
| suspend inline fun <reified T : Any> HttpResponse.bodyOrNull() = takeIf { | suspend inline fun <reified T : Any> HttpResponse.bodyOrNull( | ||||||
|     status == HttpStatusCode.OK |     statusFilter: (HttpResponse) -> Boolean = { it.status == HttpStatusCode.OK } | ||||||
| } ?.body<T>() | ) = takeIf(statusFilter) ?.body<T>() | ||||||
|  |  | ||||||
|  | suspend inline fun <reified T : Any> HttpResponse.bodyOrNullOnNoContent() = bodyOrNull<T> { | ||||||
|  |     it.status != HttpStatusCode.NoContent | ||||||
|  | } | ||||||
|   | |||||||
| @@ -1,82 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.ktor.client |  | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.coroutines.runCatchingSafely |  | ||||||
| import dev.inmo.micro_utils.coroutines.safely |  | ||||||
| import dev.inmo.micro_utils.ktor.common.* |  | ||||||
| import io.ktor.client.HttpClient |  | ||||||
| import io.ktor.client.plugins.pluginOrNull |  | ||||||
| import io.ktor.client.plugins.websocket.WebSockets |  | ||||||
| import io.ktor.client.plugins.websocket.ws |  | ||||||
| import io.ktor.client.request.HttpRequestBuilder |  | ||||||
| import io.ktor.websocket.Frame |  | ||||||
| import io.ktor.websocket.readBytes |  | ||||||
| import kotlinx.coroutines.flow.Flow |  | ||||||
| import kotlinx.coroutines.flow.channelFlow |  | ||||||
| import kotlinx.coroutines.isActive |  | ||||||
| import kotlinx.serialization.DeserializationStrategy |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish |  | ||||||
|  * connection. Must return true in case if must be reconnected. By default always reconnecting |  | ||||||
|  */ |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| inline fun <T> HttpClient.createStandardWebsocketFlow( |  | ||||||
|     url: String, |  | ||||||
|     crossinline checkReconnection: suspend (Throwable?) -> Boolean = { true }, |  | ||||||
|     noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     crossinline conversation: suspend (StandardKtorSerialInputData) -> T |  | ||||||
| ): Flow<T> { |  | ||||||
|     pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow") |  | ||||||
|  |  | ||||||
|     val correctedUrl = url.asCorrectWebSocketUrl |  | ||||||
|  |  | ||||||
|     return channelFlow { |  | ||||||
|         do { |  | ||||||
|             val reconnect = runCatchingSafely { |  | ||||||
|                 ws(correctedUrl, requestBuilder) { |  | ||||||
|                     for (received in incoming) { |  | ||||||
|                         when (received) { |  | ||||||
|                             is Frame.Binary -> send(conversation(received.data)) |  | ||||||
|                             else -> { |  | ||||||
|                                 close() |  | ||||||
|                                 return@ws |  | ||||||
|                             } |  | ||||||
|                         } |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|                 checkReconnection(null) |  | ||||||
|             }.getOrElse { e -> |  | ||||||
|                 checkReconnection(e).also { |  | ||||||
|                     if (!it) { |  | ||||||
|                         close(e) |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } while (reconnect && isActive) |  | ||||||
|  |  | ||||||
|         if (isActive) { |  | ||||||
|             safely { |  | ||||||
|                 close() |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish |  | ||||||
|  * connection. Must return true in case if must be reconnected. By default always reconnecting |  | ||||||
|  */ |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| inline fun <T> HttpClient.createStandardWebsocketFlow( |  | ||||||
|     url: String, |  | ||||||
|     deserializer: DeserializationStrategy<T>, |  | ||||||
|     crossinline checkReconnection: suspend (Throwable?) -> Boolean = { true }, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat, |  | ||||||
|     noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
| ) = createStandardWebsocketFlow( |  | ||||||
|     url, |  | ||||||
|     checkReconnection, |  | ||||||
|     requestBuilder |  | ||||||
| ) { |  | ||||||
|     serialFormat.decodeDefault(deserializer, it) |  | ||||||
| } |  | ||||||
| @@ -1,6 +1,10 @@ | |||||||
| package dev.inmo.micro_utils.ktor.client | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.common.MPPFile | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.common.filesize | ||||||
|  | import dev.inmo.micro_utils.ktor.common.input | ||||||
| import io.ktor.client.request.forms.InputProvider | import io.ktor.client.request.forms.InputProvider | ||||||
|  |  | ||||||
| expect suspend fun MPPFile.inputProvider(): InputProvider | fun MPPFile.inputProvider(): InputProvider = InputProvider(filesize) { | ||||||
|  |     input() | ||||||
|  | } | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ import kotlinx.coroutines.isActive | |||||||
|  * connection. Must return true in case if must be reconnected. By default always reconnecting |  * connection. Must return true in case if must be reconnected. By default always reconnecting | ||||||
|  */ |  */ | ||||||
| @Warning("This feature is internal and should not be used directly. It is can be changed without any notification and warranty on compile-time or other guaranties") | @Warning("This feature is internal and should not be used directly. It is can be changed without any notification and warranty on compile-time or other guaranties") | ||||||
| inline fun <reified T : Any> openBaseWebSocketFlow( | inline fun <T : Any> openBaseWebSocketFlow( | ||||||
|     noinline checkReconnection: suspend (Throwable?) -> Boolean = { true }, |     noinline checkReconnection: suspend (Throwable?) -> Boolean = { true }, | ||||||
|     noinline webSocketSessionRequest: suspend SendChannel<T>.() -> Unit |     noinline webSocketSessionRequest: suspend SendChannel<T>.() -> Unit | ||||||
| ): Flow<T> { | ): Flow<T> { | ||||||
| @@ -57,7 +57,7 @@ inline fun <reified T : Any> HttpClient.openWebSocketFlow( | |||||||
| ): Flow<T> { | ): Flow<T> { | ||||||
|     pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow") |     pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow") | ||||||
|  |  | ||||||
|     return openBaseWebSocketFlow<T>(checkReconnection) { |     return openBaseWebSocketFlow(checkReconnection) { | ||||||
|         val block: suspend DefaultClientWebSocketSession.() -> Unit = { |         val block: suspend DefaultClientWebSocketSession.() -> Unit = { | ||||||
|             while (isActive) { |             while (isActive) { | ||||||
|                 send(receiveDeserialized<T>()) |                 send(receiveDeserialized<T>()) | ||||||
|   | |||||||
| @@ -0,0 +1,3 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | typealias OnUploadCallback = suspend (uploaded: Long, count: Long) -> Unit | ||||||
| @@ -1,260 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.ktor.client |  | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.common.MPPFile |  | ||||||
| import dev.inmo.micro_utils.common.filename |  | ||||||
| import dev.inmo.micro_utils.ktor.common.* |  | ||||||
| import io.ktor.client.HttpClient |  | ||||||
| import io.ktor.client.call.body |  | ||||||
| import io.ktor.client.request.* |  | ||||||
| import io.ktor.client.request.forms.* |  | ||||||
| import io.ktor.client.statement.readBytes |  | ||||||
| import io.ktor.http.* |  | ||||||
| import io.ktor.utils.io.core.ByteReadPacket |  | ||||||
| import kotlinx.serialization.* |  | ||||||
|  |  | ||||||
| @Deprecated("This class will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| class UnifiedRequester( |  | ||||||
|     val client: HttpClient = HttpClient(), |  | ||||||
|     val serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ) { |  | ||||||
|     suspend fun <ResultType> uniget( |  | ||||||
|         url: String, |  | ||||||
|         resultDeserializer: DeserializationStrategy<ResultType> |  | ||||||
|     ): ResultType = client.uniget(url, resultDeserializer, serialFormat) |  | ||||||
|  |  | ||||||
|     fun <T> encodeUrlQueryValue( |  | ||||||
|         serializationStrategy: SerializationStrategy<T>, |  | ||||||
|         value: T |  | ||||||
|     ) = serializationStrategy.encodeUrlQueryValue( |  | ||||||
|         value, |  | ||||||
|         serialFormat |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|     suspend fun <BodyType, ResultType> unipost( |  | ||||||
|         url: String, |  | ||||||
|         bodyInfo: Pair<SerializationStrategy<BodyType>, BodyType>, |  | ||||||
|         resultDeserializer: DeserializationStrategy<ResultType> |  | ||||||
|     ) = client.unipost(url, bodyInfo, resultDeserializer, serialFormat) |  | ||||||
|  |  | ||||||
|     suspend fun <ResultType> unimultipart( |  | ||||||
|         url: String, |  | ||||||
|         filename: String, |  | ||||||
|         inputProvider: InputProvider, |  | ||||||
|         resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|         mimetype: String = "*/*", |  | ||||||
|         additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|         dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|         requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     ): ResultType = client.unimultipart(url, filename, inputProvider, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat) |  | ||||||
|  |  | ||||||
|     suspend fun <BodyType, ResultType> unimultipart( |  | ||||||
|         url: String, |  | ||||||
|         filename: String, |  | ||||||
|         inputProvider: InputProvider, |  | ||||||
|         otherData: Pair<SerializationStrategy<BodyType>, BodyType>, |  | ||||||
|         resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|         mimetype: String = "*/*", |  | ||||||
|         additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|         dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|         requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     ): ResultType = client.unimultipart(url, filename, otherData, inputProvider, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat) |  | ||||||
|  |  | ||||||
|     suspend fun <ResultType> unimultipart( |  | ||||||
|         url: String, |  | ||||||
|         mppFile: MPPFile, |  | ||||||
|         resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|         mimetype: String = "*/*", |  | ||||||
|         additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|         dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|         requestBuilder: HttpRequestBuilder.() -> Unit = {} |  | ||||||
|     ): ResultType = client.unimultipart( |  | ||||||
|         url, mppFile, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|     suspend fun <BodyType, ResultType> unimultipart( |  | ||||||
|         url: String, |  | ||||||
|         mppFile: MPPFile, |  | ||||||
|         otherData: Pair<SerializationStrategy<BodyType>, BodyType>, |  | ||||||
|         resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|         mimetype: String = "*/*", |  | ||||||
|         additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|         dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|         requestBuilder: HttpRequestBuilder.() -> Unit = {} |  | ||||||
|     ): ResultType = client.unimultipart( |  | ||||||
|         url, mppFile, otherData, resultDeserializer, mimetype, additionalParametersBuilder, dataHeadersBuilder, requestBuilder, serialFormat |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|     fun <T> createStandardWebsocketFlow( |  | ||||||
|         url: String, |  | ||||||
|         checkReconnection: suspend (Throwable?) -> Boolean, |  | ||||||
|         deserializer: DeserializationStrategy<T>, |  | ||||||
|         requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     ) = client.createStandardWebsocketFlow(url, deserializer, checkReconnection, serialFormat, requestBuilder) |  | ||||||
|  |  | ||||||
|     fun <T> createStandardWebsocketFlow( |  | ||||||
|         url: String, |  | ||||||
|         deserializer: DeserializationStrategy<T>, |  | ||||||
|         requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     ) = createStandardWebsocketFlow(url, { true }, deserializer, requestBuilder) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This property will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| val defaultRequester = UnifiedRequester() |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <ResultType> HttpClient.uniget( |  | ||||||
|     url: String, |  | ||||||
|     resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ) = get(url).let { |  | ||||||
|     serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>()) |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| fun <T> SerializationStrategy<T>.encodeUrlQueryValue( |  | ||||||
|     value: T, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ) = serialFormat.encodeHex( |  | ||||||
|     this, |  | ||||||
|     value |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <BodyType, ResultType> HttpClient.unipost( |  | ||||||
|     url: String, |  | ||||||
|     bodyInfo: Pair<SerializationStrategy<BodyType>, BodyType>, |  | ||||||
|     resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ) = post(url) { |  | ||||||
|     setBody( |  | ||||||
|         serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second) |  | ||||||
|     ) |  | ||||||
| }.let { |  | ||||||
|     serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>()) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <ResultType> HttpClient.unimultipart( |  | ||||||
|     url: String, |  | ||||||
|     filename: String, |  | ||||||
|     inputProvider: InputProvider, |  | ||||||
|     resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|     mimetype: String = "*/*", |  | ||||||
|     additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|     dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|     requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ): ResultType = submitFormWithBinaryData( |  | ||||||
|     url, |  | ||||||
|     formData = formData { |  | ||||||
|         append( |  | ||||||
|             "bytes", |  | ||||||
|             inputProvider, |  | ||||||
|             Headers.build { |  | ||||||
|                 append(HttpHeaders.ContentType, mimetype) |  | ||||||
|                 append(HttpHeaders.ContentDisposition, "filename=\"$filename\"") |  | ||||||
|                 dataHeadersBuilder() |  | ||||||
|             } |  | ||||||
|         ) |  | ||||||
|         additionalParametersBuilder() |  | ||||||
|     } |  | ||||||
| ) { |  | ||||||
|     requestBuilder() |  | ||||||
| }.let { serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>()) } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <BodyType, ResultType> HttpClient.unimultipart( |  | ||||||
|     url: String, |  | ||||||
|     filename: String, |  | ||||||
|     otherData: Pair<SerializationStrategy<BodyType>, BodyType>, |  | ||||||
|     inputProvider: InputProvider, |  | ||||||
|     resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|     mimetype: String = "*/*", |  | ||||||
|     additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|     dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|     requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ): ResultType = unimultipart( |  | ||||||
|     url, |  | ||||||
|     filename, |  | ||||||
|     inputProvider, |  | ||||||
|     resultDeserializer, |  | ||||||
|     mimetype, |  | ||||||
|     additionalParametersBuilder = { |  | ||||||
|         val serialized = serialFormat.encodeDefault(otherData.first, otherData.second) |  | ||||||
|         append( |  | ||||||
|             "data", |  | ||||||
|             InputProvider(serialized.size.toLong()) { |  | ||||||
|                 ByteReadPacket(serialized) |  | ||||||
|             }, |  | ||||||
|             Headers.build { |  | ||||||
|                 append(HttpHeaders.ContentType, ContentType.Application.Cbor.contentType) |  | ||||||
|                 append(HttpHeaders.ContentDisposition, "filename=data.bytes") |  | ||||||
|                 dataHeadersBuilder() |  | ||||||
|             } |  | ||||||
|         ) |  | ||||||
|         additionalParametersBuilder() |  | ||||||
|     }, |  | ||||||
|     dataHeadersBuilder, |  | ||||||
|     requestBuilder, |  | ||||||
|     serialFormat |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <ResultType> HttpClient.unimultipart( |  | ||||||
|     url: String, |  | ||||||
|     mppFile: MPPFile, |  | ||||||
|     resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|     mimetype: String = "*/*", |  | ||||||
|     additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|     dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|     requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ): ResultType = unimultipart( |  | ||||||
|     url, |  | ||||||
|     mppFile.filename.string, |  | ||||||
|     mppFile.inputProvider(), |  | ||||||
|     resultDeserializer, |  | ||||||
|     mimetype, |  | ||||||
|     additionalParametersBuilder, |  | ||||||
|     dataHeadersBuilder, |  | ||||||
|     requestBuilder, |  | ||||||
|     serialFormat |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <BodyType, ResultType> HttpClient.unimultipart( |  | ||||||
|     url: String, |  | ||||||
|     mppFile: MPPFile, |  | ||||||
|     otherData: Pair<SerializationStrategy<BodyType>, BodyType>, |  | ||||||
|     resultDeserializer: DeserializationStrategy<ResultType>, |  | ||||||
|     mimetype: String = "*/*", |  | ||||||
|     additionalParametersBuilder: FormBuilder.() -> Unit = {}, |  | ||||||
|     dataHeadersBuilder: HeadersBuilder.() -> Unit = {}, |  | ||||||
|     requestBuilder: HttpRequestBuilder.() -> Unit = {}, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat |  | ||||||
| ): ResultType = unimultipart( |  | ||||||
|     url, |  | ||||||
|     mppFile, |  | ||||||
|     resultDeserializer, |  | ||||||
|     mimetype, |  | ||||||
|     additionalParametersBuilder = { |  | ||||||
|         val serialized = serialFormat.encodeDefault(otherData.first, otherData.second) |  | ||||||
|         append( |  | ||||||
|             "data", |  | ||||||
|             InputProvider(serialized.size.toLong()) { |  | ||||||
|                 ByteReadPacket(serialized) |  | ||||||
|             }, |  | ||||||
|             Headers.build { |  | ||||||
|                 append(HttpHeaders.ContentType, ContentType.Application.Cbor.contentType) |  | ||||||
|                 append(HttpHeaders.ContentDisposition, "filename=data.bytes") |  | ||||||
|                 dataHeadersBuilder() |  | ||||||
|             } |  | ||||||
|         ) |  | ||||||
|         additionalParametersBuilder() |  | ||||||
|     }, |  | ||||||
|     dataHeadersBuilder, |  | ||||||
|     requestBuilder, |  | ||||||
|     serialFormat |  | ||||||
| ) |  | ||||||
| @@ -7,13 +7,5 @@ import io.ktor.client.HttpClient | |||||||
| expect suspend fun HttpClient.tempUpload( | expect suspend fun HttpClient.tempUpload( | ||||||
|     fullTempUploadDraftPath: String, |     fullTempUploadDraftPath: String, | ||||||
|     file: MPPFile, |     file: MPPFile, | ||||||
|     onUpload: (uploaded: Long, count: Long) -> Unit = { _, _ -> } |     onUpload: OnUploadCallback = { _, _ -> } | ||||||
| ): TemporalFileId | ): TemporalFileId | ||||||
|  |  | ||||||
| suspend fun UnifiedRequester.tempUpload( |  | ||||||
|     fullTempUploadDraftPath: String, |  | ||||||
|     file: MPPFile, |  | ||||||
|     onUpload: (uploaded: Long, count: Long) -> Unit = { _, _ -> } |  | ||||||
| ): TemporalFileId = client.tempUpload( |  | ||||||
|     fullTempUploadDraftPath, file, onUpload |  | ||||||
| ) |  | ||||||
|   | |||||||
| @@ -0,0 +1,105 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.FileName | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.ktor.common.LambdaInputProvider | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
|  | import kotlinx.serialization.StringFormat | ||||||
|  | import kotlinx.serialization.json.Json | ||||||
|  |  | ||||||
|  | data class UniUploadFileInfo( | ||||||
|  |     val fileName: FileName, | ||||||
|  |     val mimeType: String, | ||||||
|  |     val inputAllocator: LambdaInputProvider | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will execute submitting of multipart data request | ||||||
|  |  * | ||||||
|  |  * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass | ||||||
|  |  * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value | ||||||
|  |  * in case you wish to pass other source of multipart binary data than regular file | ||||||
|  |  * | ||||||
|  |  * @see dev.inmo.micro_utils.ktor.server.handleUniUpload | ||||||
|  |  */ | ||||||
|  | expect suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     data: Map<String, Any>, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     headers: Headers = Headers.Empty, | ||||||
|  |     stringFormat: StringFormat = Json, | ||||||
|  |     onUpload: OnUploadCallback = { _, _ -> } | ||||||
|  | ): T? | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Additional variant of [uniUpload] which will unify sending of some [MPPFile] with the server | ||||||
|  |  * | ||||||
|  |  * @see dev.inmo.micro_utils.ktor.server.uniloadMultipartFile | ||||||
|  |  */ | ||||||
|  | suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     file: MPPFile, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     additionalData: Map<String, Any> = emptyMap(), | ||||||
|  |     headers: Headers = Headers.Empty, | ||||||
|  |     stringFormat: StringFormat = Json, | ||||||
|  |     onUpload: OnUploadCallback = { _, _ -> } | ||||||
|  | ): T? = uniUpload( | ||||||
|  |     url, | ||||||
|  |     additionalData + ("bytes" to file), | ||||||
|  |     resultDeserializer, | ||||||
|  |     headers, | ||||||
|  |     stringFormat, | ||||||
|  |     onUpload | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Additional variant of [uniUpload] which will unify sending of some [UniUploadFileInfo] with the server | ||||||
|  |  * | ||||||
|  |  * @see dev.inmo.micro_utils.ktor.server.uniloadMultipartFile | ||||||
|  |  */ | ||||||
|  | suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     info: UniUploadFileInfo, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     additionalData: Map<String, Any> = emptyMap(), | ||||||
|  |     headers: Headers = Headers.Empty, | ||||||
|  |     stringFormat: StringFormat = Json, | ||||||
|  |     onUpload: OnUploadCallback = { _, _ -> } | ||||||
|  | ): T? = uniUpload( | ||||||
|  |     url, | ||||||
|  |     additionalData + ("bytes" to info), | ||||||
|  |     resultDeserializer, | ||||||
|  |     headers, | ||||||
|  |     stringFormat, | ||||||
|  |     onUpload | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Additional variant of [uniUpload] which will unify sending of some [UniUploadFileInfo] (built from [fileName], | ||||||
|  |  * [mimeType] and [inputAllocator]) with the server | ||||||
|  |  * | ||||||
|  |  * @see dev.inmo.micro_utils.ktor.server.uniloadMultipartFile | ||||||
|  |  */ | ||||||
|  | suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     fileName: FileName, | ||||||
|  |     mimeType: String, | ||||||
|  |     inputAllocator: LambdaInputProvider, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     additionalData: Map<String, Any> = emptyMap(), | ||||||
|  |     headers: Headers = Headers.Empty, | ||||||
|  |     stringFormat: StringFormat = Json, | ||||||
|  |     onUpload: OnUploadCallback = { _, _ -> } | ||||||
|  | ): T? = uniUpload( | ||||||
|  |     url, | ||||||
|  |     UniUploadFileInfo(fileName, mimeType, inputAllocator), | ||||||
|  |     resultDeserializer, | ||||||
|  |     additionalData, | ||||||
|  |     headers, | ||||||
|  |     stringFormat, | ||||||
|  |     onUpload | ||||||
|  | ) | ||||||
| @@ -1,11 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.ktor.client |  | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.common.* |  | ||||||
| import io.ktor.client.request.forms.InputProvider |  | ||||||
| import io.ktor.utils.io.core.ByteReadPacket |  | ||||||
|  |  | ||||||
| actual suspend fun MPPFile.inputProvider(): InputProvider = bytes().let { |  | ||||||
|     InputProvider(it.size.toLong()) { |  | ||||||
|         ByteReadPacket(it) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -1,6 +1,8 @@ | |||||||
| package dev.inmo.micro_utils.ktor.client | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.common.MPPFile | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions | ||||||
| import dev.inmo.micro_utils.ktor.common.TemporalFileId | import dev.inmo.micro_utils.ktor.common.TemporalFileId | ||||||
| import io.ktor.client.HttpClient | import io.ktor.client.HttpClient | ||||||
| import kotlinx.coroutines.* | import kotlinx.coroutines.* | ||||||
| @@ -12,10 +14,11 @@ import org.w3c.xhr.XMLHttpRequest.Companion.DONE | |||||||
| suspend fun tempUpload( | suspend fun tempUpload( | ||||||
|     fullTempUploadDraftPath: String, |     fullTempUploadDraftPath: String, | ||||||
|     file: MPPFile, |     file: MPPFile, | ||||||
|     onUpload: (Long, Long) -> Unit |     onUpload: OnUploadCallback | ||||||
| ): TemporalFileId { | ): TemporalFileId { | ||||||
|     val formData = FormData() |     val formData = FormData() | ||||||
|     val answer = CompletableDeferred<TemporalFileId>(currentCoroutineContext().job) |     val answer = CompletableDeferred<TemporalFileId>(currentCoroutineContext().job) | ||||||
|  |     val subscope = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()) | ||||||
|  |  | ||||||
|     formData.append( |     formData.append( | ||||||
|         "data", |         "data", | ||||||
| @@ -25,7 +28,7 @@ suspend fun tempUpload( | |||||||
|     val request = XMLHttpRequest() |     val request = XMLHttpRequest() | ||||||
|     request.responseType = XMLHttpRequestResponseType.TEXT |     request.responseType = XMLHttpRequestResponseType.TEXT | ||||||
|     request.upload.onprogress = { |     request.upload.onprogress = { | ||||||
|         onUpload(it.loaded.toLong(), it.total.toLong()) |         subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) } | ||||||
|     } |     } | ||||||
|     request.onload = { |     request.onload = { | ||||||
|         if (request.status == 200.toShort()) { |         if (request.status == 200.toShort()) { | ||||||
| @@ -48,12 +51,14 @@ suspend fun tempUpload( | |||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     return answer.await() |     return answer.await().also { | ||||||
|  |         subscope.cancel() | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
| actual suspend fun HttpClient.tempUpload( | actual suspend fun HttpClient.tempUpload( | ||||||
|     fullTempUploadDraftPath: String, |     fullTempUploadDraftPath: String, | ||||||
|     file: MPPFile, |     file: MPPFile, | ||||||
|     onUpload: (uploaded: Long, count: Long) -> Unit |     onUpload: OnUploadCallback | ||||||
| ): TemporalFileId = dev.inmo.micro_utils.ktor.client.tempUpload(fullTempUploadDraftPath, file, onUpload) | ): 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.common.Progress | ||||||
|  | import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import io.ktor.utils.io.core.readBytes | ||||||
|  | import kotlinx.coroutines.CompletableDeferred | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.cancel | ||||||
|  | import kotlinx.coroutines.currentCoroutineContext | ||||||
|  | import kotlinx.coroutines.job | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
|  | import kotlinx.serialization.StringFormat | ||||||
|  | import kotlinx.serialization.encodeToString | ||||||
|  | import org.khronos.webgl.Int8Array | ||||||
|  | import org.w3c.files.Blob | ||||||
|  | import org.w3c.xhr.FormData | ||||||
|  | import org.w3c.xhr.TEXT | ||||||
|  | import org.w3c.xhr.XMLHttpRequest | ||||||
|  | import org.w3c.xhr.XMLHttpRequestResponseType | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will execute submitting of multipart data request | ||||||
|  |  * | ||||||
|  |  * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass | ||||||
|  |  * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value | ||||||
|  |  * in case you wish to pass other source of multipart binary data than regular file | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     data: Map<String, Any>, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     headers: Headers, | ||||||
|  |     stringFormat: StringFormat, | ||||||
|  |     onUpload: OnUploadCallback | ||||||
|  | ): T? { | ||||||
|  |     val formData = FormData() | ||||||
|  |     val answer = CompletableDeferred<T?>(currentCoroutineContext().job) | ||||||
|  |     val subscope = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()) | ||||||
|  |  | ||||||
|  |     data.forEach { (k, v) -> | ||||||
|  |         when (v) { | ||||||
|  |             is MPPFile -> formData.append( | ||||||
|  |                 k, | ||||||
|  |                 v | ||||||
|  |             ) | ||||||
|  |             is UniUploadFileInfo -> formData.append( | ||||||
|  |                 k, | ||||||
|  |                 Blob(arrayOf(Int8Array(v.inputAllocator().readBytes().toTypedArray()))), | ||||||
|  |                 v.fileName.name | ||||||
|  |             ) | ||||||
|  |             else -> formData.append( | ||||||
|  |                 k, | ||||||
|  |                 stringFormat.encodeToString(v) | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val request = XMLHttpRequest() | ||||||
|  |     headers.forEach { s, strings -> | ||||||
|  |         request.setRequestHeader(s, strings.joinToString()) | ||||||
|  |     } | ||||||
|  |     request.responseType = XMLHttpRequestResponseType.TEXT | ||||||
|  |     request.upload.onprogress = { | ||||||
|  |         subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) } | ||||||
|  |     } | ||||||
|  |     request.onload = { | ||||||
|  |         if (request.status == 200.toShort()) { | ||||||
|  |             answer.complete( | ||||||
|  |                 stringFormat.decodeFromString(resultDeserializer, request.responseText) | ||||||
|  |             ) | ||||||
|  |         } else { | ||||||
|  |             answer.completeExceptionally(Exception("Something went wrong: $it")) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     request.onerror = { | ||||||
|  |         answer.completeExceptionally(Exception("Something went wrong: $it")) | ||||||
|  |     } | ||||||
|  |     request.open("POST", url, true) | ||||||
|  |     request.send(formData) | ||||||
|  |  | ||||||
|  |     answer.invokeOnCompletion { | ||||||
|  |         runCatching { | ||||||
|  |             if (request.readyState != XMLHttpRequest.DONE) { | ||||||
|  |                 request.abort() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     return answer.await().also { | ||||||
|  |         subscope.cancel() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -4,6 +4,6 @@ import dev.inmo.micro_utils.common.MPPFile | |||||||
| import io.ktor.client.request.forms.InputProvider | import io.ktor.client.request.forms.InputProvider | ||||||
| import io.ktor.utils.io.streams.asInput | import io.ktor.utils.io.streams.asInput | ||||||
|  |  | ||||||
| actual suspend fun MPPFile.inputProvider(): InputProvider = InputProvider(length()) { | fun MPPFile.inputProviderSync(): InputProvider = InputProvider(length()) { | ||||||
|     inputStream().asInput() |     inputStream().asInput() | ||||||
| } | } | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ internal val MPPFile.mimeType: String | |||||||
| actual suspend fun HttpClient.tempUpload( | actual suspend fun HttpClient.tempUpload( | ||||||
|     fullTempUploadDraftPath: String, |     fullTempUploadDraftPath: String, | ||||||
|     file: MPPFile, |     file: MPPFile, | ||||||
|     onUpload: (Long, Long) -> Unit |     onUpload: OnUploadCallback | ||||||
| ): TemporalFileId { | ): TemporalFileId { | ||||||
|     val inputProvider = file.inputProvider() |     val inputProvider = file.inputProvider() | ||||||
|     val fileId = submitFormWithBinaryData( |     val fileId = submitFormWithBinaryData( | ||||||
|   | |||||||
| @@ -0,0 +1,107 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.Progress | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.engine.mergeHeaders | ||||||
|  | import io.ktor.client.plugins.onUpload | ||||||
|  | import io.ktor.client.request.HttpRequestBuilder | ||||||
|  | import io.ktor.client.request.forms.InputProvider | ||||||
|  | import io.ktor.client.request.forms.formData | ||||||
|  | import io.ktor.client.request.forms.submitForm | ||||||
|  | import io.ktor.client.request.forms.submitFormWithBinaryData | ||||||
|  | import io.ktor.client.request.headers | ||||||
|  | import io.ktor.client.statement.bodyAsText | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import io.ktor.http.HttpHeaders | ||||||
|  | import io.ktor.http.HttpStatusCode | ||||||
|  | import io.ktor.http.Parameters | ||||||
|  | import io.ktor.http.content.PartData | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
|  | import kotlinx.serialization.InternalSerializationApi | ||||||
|  | import kotlinx.serialization.SerializationStrategy | ||||||
|  | import kotlinx.serialization.StringFormat | ||||||
|  | import kotlinx.serialization.encodeToString | ||||||
|  | import kotlinx.serialization.serializer | ||||||
|  | import java.io.File | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will execute submitting of multipart data request | ||||||
|  |  * | ||||||
|  |  * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass | ||||||
|  |  * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value | ||||||
|  |  * in case you wish to pass other source of multipart binary data than regular file | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | @OptIn(InternalSerializationApi::class) | ||||||
|  | actual suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     data: Map<String, Any>, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     headers: Headers, | ||||||
|  |     stringFormat: StringFormat, | ||||||
|  |     onUpload: OnUploadCallback | ||||||
|  | ): T? { | ||||||
|  |     val withBinary = data.values.any { it is File || it is UniUploadFileInfo } | ||||||
|  |  | ||||||
|  |     val formData = formData { | ||||||
|  |         for (k in data.keys) { | ||||||
|  |             val v = data[k] ?: continue | ||||||
|  |             when (v) { | ||||||
|  |                 is File -> append( | ||||||
|  |                     k, | ||||||
|  |                     v.inputProviderSync(), | ||||||
|  |                     Headers.build { | ||||||
|  |                         append(HttpHeaders.ContentType, v.mimeType) | ||||||
|  |                         append(HttpHeaders.ContentDisposition, "filename=\"${v.name}\"") | ||||||
|  |                     } | ||||||
|  |                 ) | ||||||
|  |                 is UniUploadFileInfo -> append( | ||||||
|  |                     k, | ||||||
|  |                     InputProvider(block = v.inputAllocator), | ||||||
|  |                     Headers.build { | ||||||
|  |                         append(HttpHeaders.ContentType, v.mimeType) | ||||||
|  |                         append(HttpHeaders.ContentDisposition, "filename=\"${v.fileName.name}\"") | ||||||
|  |                     } | ||||||
|  |                 ) | ||||||
|  |                 else -> append( | ||||||
|  |                     k, | ||||||
|  |                     stringFormat.encodeToString(v::class.serializer() as SerializationStrategy<in Any>, v) | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val requestBuilder: HttpRequestBuilder.() -> Unit = { | ||||||
|  |         headers { | ||||||
|  |             appendAll(headers) | ||||||
|  |         } | ||||||
|  |         onUpload { bytesSentTotal, contentLength -> | ||||||
|  |             onUpload(bytesSentTotal, contentLength) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val response = if (withBinary) { | ||||||
|  |         submitFormWithBinaryData( | ||||||
|  |             url, | ||||||
|  |             formData, | ||||||
|  |             block = requestBuilder | ||||||
|  |         ) | ||||||
|  |     } else { | ||||||
|  |         submitForm( | ||||||
|  |             url, | ||||||
|  |             Parameters.build { | ||||||
|  |                 for (it in formData) { | ||||||
|  |                     val formItem = (it as PartData.FormItem) | ||||||
|  |                     append(it.name!!, it.value) | ||||||
|  |                 } | ||||||
|  |             }, | ||||||
|  |             block = requestBuilder | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     return if (response.status == HttpStatusCode.OK) { | ||||||
|  |         stringFormat.decodeFromString(resultDeserializer, response.bodyAsText()) | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										40
									
								
								ktor/client/src/linuxX64Main/kotlin/ActualTemporalUpload.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								ktor/client/src/linuxX64Main/kotlin/ActualTemporalUpload.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,40 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.common.filename | ||||||
|  | import dev.inmo.micro_utils.ktor.common.TemporalFileId | ||||||
|  | import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.plugins.onUpload | ||||||
|  | import io.ktor.client.request.forms.formData | ||||||
|  | import io.ktor.client.request.forms.submitFormWithBinaryData | ||||||
|  | import io.ktor.client.statement.bodyAsText | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import io.ktor.http.HttpHeaders | ||||||
|  |  | ||||||
|  | internal val MPPFile.mimeType: String | ||||||
|  |     get() = getMimeTypeOrAny(filename.extension).raw | ||||||
|  |  | ||||||
|  | actual suspend fun HttpClient.tempUpload( | ||||||
|  |     fullTempUploadDraftPath: String, | ||||||
|  |     file: MPPFile, | ||||||
|  |     onUpload: OnUploadCallback | ||||||
|  | ): TemporalFileId { | ||||||
|  |     val inputProvider = file.inputProvider() | ||||||
|  |     val fileId = submitFormWithBinaryData( | ||||||
|  |         fullTempUploadDraftPath, | ||||||
|  |         formData = formData { | ||||||
|  |             append( | ||||||
|  |                 "data", | ||||||
|  |                 inputProvider, | ||||||
|  |                 Headers.build { | ||||||
|  |                     append(HttpHeaders.ContentType, file.mimeType) | ||||||
|  |                     append(HttpHeaders.ContentDisposition, "filename=\"${file.filename.string}\"") | ||||||
|  |                 } | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |     ) { | ||||||
|  |         onUpload(onUpload) | ||||||
|  |     }.bodyAsText() | ||||||
|  |     return TemporalFileId(fileId) | ||||||
|  | } | ||||||
							
								
								
									
										107
									
								
								ktor/client/src/linuxX64Main/kotlin/ActualUniUpload.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										107
									
								
								ktor/client/src/linuxX64Main/kotlin/ActualUniUpload.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,107 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.common.Progress | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.engine.mergeHeaders | ||||||
|  | import io.ktor.client.plugins.onUpload | ||||||
|  | import io.ktor.client.request.HttpRequestBuilder | ||||||
|  | import io.ktor.client.request.forms.InputProvider | ||||||
|  | import io.ktor.client.request.forms.formData | ||||||
|  | import io.ktor.client.request.forms.submitForm | ||||||
|  | import io.ktor.client.request.forms.submitFormWithBinaryData | ||||||
|  | import io.ktor.client.request.headers | ||||||
|  | import io.ktor.client.statement.bodyAsText | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import io.ktor.http.HttpHeaders | ||||||
|  | import io.ktor.http.HttpStatusCode | ||||||
|  | import io.ktor.http.Parameters | ||||||
|  | import io.ktor.http.content.PartData | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
|  | import kotlinx.serialization.InternalSerializationApi | ||||||
|  | import kotlinx.serialization.SerializationStrategy | ||||||
|  | import kotlinx.serialization.StringFormat | ||||||
|  | import kotlinx.serialization.encodeToString | ||||||
|  | import kotlinx.serialization.serializer | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * 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 | ||||||
|  |  */ | ||||||
|  | @OptIn(InternalSerializationApi::class) | ||||||
|  | actual suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     data: Map<String, Any>, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     headers: Headers, | ||||||
|  |     stringFormat: StringFormat, | ||||||
|  |     onUpload: OnUploadCallback | ||||||
|  | ): T? { | ||||||
|  |     val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo } | ||||||
|  |  | ||||||
|  |     val formData = formData { | ||||||
|  |         for (k in data.keys) { | ||||||
|  |             val v = data[k] ?: continue | ||||||
|  |             when (v) { | ||||||
|  |                 is MPPFile -> append( | ||||||
|  |                     k, | ||||||
|  |                     v.inputProvider(), | ||||||
|  |                     Headers.build { | ||||||
|  |                         append(HttpHeaders.ContentType, v.mimeType) | ||||||
|  |                         append(HttpHeaders.ContentDisposition, "filename=\"${v.name}\"") | ||||||
|  |                     } | ||||||
|  |                 ) | ||||||
|  |                 is UniUploadFileInfo -> append( | ||||||
|  |                     k, | ||||||
|  |                     InputProvider(block = v.inputAllocator), | ||||||
|  |                     Headers.build { | ||||||
|  |                         append(HttpHeaders.ContentType, v.mimeType) | ||||||
|  |                         append(HttpHeaders.ContentDisposition, "filename=\"${v.fileName.name}\"") | ||||||
|  |                     } | ||||||
|  |                 ) | ||||||
|  |                 else -> append( | ||||||
|  |                     k, | ||||||
|  |                     stringFormat.encodeToString(v::class.serializer() as SerializationStrategy<in Any>, v) | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val requestBuilder: HttpRequestBuilder.() -> Unit = { | ||||||
|  |         headers { | ||||||
|  |             appendAll(headers) | ||||||
|  |         } | ||||||
|  |         onUpload { bytesSentTotal, contentLength -> | ||||||
|  |             onUpload(bytesSentTotal, contentLength) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val response = if (withBinary) { | ||||||
|  |         submitFormWithBinaryData( | ||||||
|  |             url, | ||||||
|  |             formData, | ||||||
|  |             block = requestBuilder | ||||||
|  |         ) | ||||||
|  |     } else { | ||||||
|  |         submitForm( | ||||||
|  |             url, | ||||||
|  |             Parameters.build { | ||||||
|  |                 for (it in formData) { | ||||||
|  |                     val formItem = (it as PartData.FormItem) | ||||||
|  |                     append(it.name!!, it.value) | ||||||
|  |                 } | ||||||
|  |             }, | ||||||
|  |             block = requestBuilder | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     return if (response.status == HttpStatusCode.OK) { | ||||||
|  |         stringFormat.decodeFromString(resultDeserializer, response.bodyAsText()) | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										40
									
								
								ktor/client/src/mingwX64Main/kotlin/ActualTemporalUpload.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								ktor/client/src/mingwX64Main/kotlin/ActualTemporalUpload.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,40 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.common.filename | ||||||
|  | import dev.inmo.micro_utils.ktor.common.TemporalFileId | ||||||
|  | import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.plugins.onUpload | ||||||
|  | import io.ktor.client.request.forms.formData | ||||||
|  | import io.ktor.client.request.forms.submitFormWithBinaryData | ||||||
|  | import io.ktor.client.statement.bodyAsText | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import io.ktor.http.HttpHeaders | ||||||
|  |  | ||||||
|  | internal val MPPFile.mimeType: String | ||||||
|  |     get() = getMimeTypeOrAny(filename.extension).raw | ||||||
|  |  | ||||||
|  | actual suspend fun HttpClient.tempUpload( | ||||||
|  |     fullTempUploadDraftPath: String, | ||||||
|  |     file: MPPFile, | ||||||
|  |     onUpload: OnUploadCallback | ||||||
|  | ): TemporalFileId { | ||||||
|  |     val inputProvider = file.inputProvider() | ||||||
|  |     val fileId = submitFormWithBinaryData( | ||||||
|  |         fullTempUploadDraftPath, | ||||||
|  |         formData = formData { | ||||||
|  |             append( | ||||||
|  |                 "data", | ||||||
|  |                 inputProvider, | ||||||
|  |                 Headers.build { | ||||||
|  |                     append(HttpHeaders.ContentType, file.mimeType) | ||||||
|  |                     append(HttpHeaders.ContentDisposition, "filename=\"${file.filename.string}\"") | ||||||
|  |                 } | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |     ) { | ||||||
|  |         onUpload(onUpload) | ||||||
|  |     }.bodyAsText() | ||||||
|  |     return TemporalFileId(fileId) | ||||||
|  | } | ||||||
							
								
								
									
										107
									
								
								ktor/client/src/mingwX64Main/kotlin/ActualUniUpload.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										107
									
								
								ktor/client/src/mingwX64Main/kotlin/ActualUniUpload.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,107 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.client | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.common.Progress | ||||||
|  | import io.ktor.client.HttpClient | ||||||
|  | import io.ktor.client.engine.mergeHeaders | ||||||
|  | import io.ktor.client.plugins.onUpload | ||||||
|  | import io.ktor.client.request.HttpRequestBuilder | ||||||
|  | import io.ktor.client.request.forms.InputProvider | ||||||
|  | import io.ktor.client.request.forms.formData | ||||||
|  | import io.ktor.client.request.forms.submitForm | ||||||
|  | import io.ktor.client.request.forms.submitFormWithBinaryData | ||||||
|  | import io.ktor.client.request.headers | ||||||
|  | import io.ktor.client.statement.bodyAsText | ||||||
|  | import io.ktor.http.Headers | ||||||
|  | import io.ktor.http.HttpHeaders | ||||||
|  | import io.ktor.http.HttpStatusCode | ||||||
|  | import io.ktor.http.Parameters | ||||||
|  | import io.ktor.http.content.PartData | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
|  | import kotlinx.serialization.InternalSerializationApi | ||||||
|  | import kotlinx.serialization.SerializationStrategy | ||||||
|  | import kotlinx.serialization.StringFormat | ||||||
|  | import kotlinx.serialization.encodeToString | ||||||
|  | import kotlinx.serialization.serializer | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * 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 | ||||||
|  |  */ | ||||||
|  | @OptIn(InternalSerializationApi::class) | ||||||
|  | actual suspend fun <T> HttpClient.uniUpload( | ||||||
|  |     url: String, | ||||||
|  |     data: Map<String, Any>, | ||||||
|  |     resultDeserializer: DeserializationStrategy<T>, | ||||||
|  |     headers: Headers, | ||||||
|  |     stringFormat: StringFormat, | ||||||
|  |     onUpload: OnUploadCallback | ||||||
|  | ): T? { | ||||||
|  |     val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo } | ||||||
|  |  | ||||||
|  |     val formData = formData { | ||||||
|  |         for (k in data.keys) { | ||||||
|  |             val v = data[k] ?: continue | ||||||
|  |             when (v) { | ||||||
|  |                 is MPPFile -> append( | ||||||
|  |                     k, | ||||||
|  |                     v.inputProvider(), | ||||||
|  |                     Headers.build { | ||||||
|  |                         append(HttpHeaders.ContentType, v.mimeType) | ||||||
|  |                         append(HttpHeaders.ContentDisposition, "filename=\"${v.name}\"") | ||||||
|  |                     } | ||||||
|  |                 ) | ||||||
|  |                 is UniUploadFileInfo -> append( | ||||||
|  |                     k, | ||||||
|  |                     InputProvider(block = v.inputAllocator), | ||||||
|  |                     Headers.build { | ||||||
|  |                         append(HttpHeaders.ContentType, v.mimeType) | ||||||
|  |                         append(HttpHeaders.ContentDisposition, "filename=\"${v.fileName.name}\"") | ||||||
|  |                     } | ||||||
|  |                 ) | ||||||
|  |                 else -> append( | ||||||
|  |                     k, | ||||||
|  |                     stringFormat.encodeToString(v::class.serializer() as SerializationStrategy<in Any>, v) | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val requestBuilder: HttpRequestBuilder.() -> Unit = { | ||||||
|  |         headers { | ||||||
|  |             appendAll(headers) | ||||||
|  |         } | ||||||
|  |         onUpload { bytesSentTotal, contentLength -> | ||||||
|  |             onUpload(bytesSentTotal, contentLength) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     val response = if (withBinary) { | ||||||
|  |         submitFormWithBinaryData( | ||||||
|  |             url, | ||||||
|  |             formData, | ||||||
|  |             block = requestBuilder | ||||||
|  |         ) | ||||||
|  |     } else { | ||||||
|  |         submitForm( | ||||||
|  |             url, | ||||||
|  |             Parameters.build { | ||||||
|  |                 for (it in formData) { | ||||||
|  |                     val formItem = (it as PartData.FormItem) | ||||||
|  |                     append(it.name!!, it.value) | ||||||
|  |                 } | ||||||
|  |             }, | ||||||
|  |             block = requestBuilder | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     return if (response.status == HttpStatusCode.OK) { | ||||||
|  |         stringFormat.decodeFromString(resultDeserializer, response.bodyAsText()) | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -17,5 +17,8 @@ kotlin { | |||||||
|                 api libs.ktor.io |                 api libs.ktor.io | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |         androidMain { | ||||||
|  |             dependsOn jvmMain | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| package dev.inmo.micro_utils.ktor.common | package dev.inmo.micro_utils.ktor.common | ||||||
|  |  | ||||||
| import com.soywiz.klock.DateTime | import korlibs.time.DateTime | ||||||
|  |  | ||||||
| typealias FromToDateTime = Pair<DateTime?, DateTime?> | typealias FromToDateTime = Pair<DateTime?, DateTime?> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -0,0 +1,5 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.common | ||||||
|  |  | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | typealias LambdaInputProvider = () -> Input | ||||||
| @@ -0,0 +1,23 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.common | ||||||
|  |  | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  | import io.ktor.utils.io.core.copyTo | ||||||
|  | import io.ktor.utils.io.streams.asOutput | ||||||
|  | import java.io.File | ||||||
|  | import java.io.InputStream | ||||||
|  | import java.util.UUID | ||||||
|  |  | ||||||
|  | fun Input.downloadToTempFile( | ||||||
|  |     fileName: String = UUID.randomUUID().toString(), | ||||||
|  |     fileExtension: String? = ".temp", | ||||||
|  |     folder: File? = null | ||||||
|  | ) = File.createTempFile( | ||||||
|  |     fileName, | ||||||
|  |     fileExtension, | ||||||
|  |     folder | ||||||
|  | ).apply { | ||||||
|  |     outputStream().use { | ||||||
|  |         copyTo(it.asOutput()) | ||||||
|  |     } | ||||||
|  |     deleteOnExit() | ||||||
|  | } | ||||||
							
								
								
									
										11
									
								
								ktor/common/src/linuxX64Main/kotlin/ActualMPPFileInput.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								ktor/common/src/linuxX64Main/kotlin/ActualMPPFileInput.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.common | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.common.bytesAllocatorSync | ||||||
|  | import io.ktor.utils.io.core.ByteReadPacket | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | actual fun MPPFile.input(): Input { | ||||||
|  |     return ByteReadPacket(bytesAllocatorSync()) | ||||||
|  | } | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								ktor/common/src/mingwX64Main/kotlin/ActualMPPFileInput.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								ktor/common/src/mingwX64Main/kotlin/ActualMPPFileInput.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.common | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.common.MPPFile | ||||||
|  | import dev.inmo.micro_utils.common.bytesAllocatorSync | ||||||
|  | import io.ktor.utils.io.core.ByteReadPacket | ||||||
|  | import io.ktor.utils.io.core.Input | ||||||
|  |  | ||||||
|  | actual fun MPPFile.input(): Input { | ||||||
|  |     return ByteReadPacket(bytesAllocatorSync()) | ||||||
|  | } | ||||||
| @@ -0,0 +1,56 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.server | ||||||
|  |  | ||||||
|  | import com.benasher44.uuid.uuid4 | ||||||
|  | import io.ktor.http.content.PartData | ||||||
|  | import io.ktor.utils.io.copyTo | ||||||
|  | import io.ktor.utils.io.core.copyTo | ||||||
|  | import io.ktor.utils.io.jvm.javaio.copyTo | ||||||
|  | import io.ktor.utils.io.streams.asOutput | ||||||
|  | import java.io.File | ||||||
|  |  | ||||||
|  | fun PartData.FileItem.download(target: File) { | ||||||
|  |     provider().use { input -> | ||||||
|  |         target.outputStream().asOutput().use { | ||||||
|  |             input.copyTo(it) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun PartData.FileItem.downloadToTemporalFile(): File { | ||||||
|  |     val outputFile = File.createTempFile(uuid4().toString(), ".temp").apply { | ||||||
|  |         deleteOnExit() | ||||||
|  |     } | ||||||
|  |     download(outputFile) | ||||||
|  |     return outputFile | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun PartData.BinaryItem.download(target: File) { | ||||||
|  |     provider().use { input -> | ||||||
|  |         target.outputStream().use { | ||||||
|  |             input.copyTo(it.asOutput()) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun PartData.BinaryItem.downloadToTemporalFile(): File { | ||||||
|  |     val outputFile = File.createTempFile(uuid4().toString(), ".temp").apply { | ||||||
|  |         deleteOnExit() | ||||||
|  |     } | ||||||
|  |     download(outputFile) | ||||||
|  |     return outputFile | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun PartData.BinaryChannelItem.download(target: File) { | ||||||
|  |     val input = provider() | ||||||
|  |     target.outputStream().use { | ||||||
|  |         input.copyTo(it) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun PartData.BinaryChannelItem.downloadToTemporalFile(): File { | ||||||
|  |     val outputFile = File.createTempFile(uuid4().toString(), ".temp").apply { | ||||||
|  |         deleteOnExit() | ||||||
|  |     } | ||||||
|  |     download(outputFile) | ||||||
|  |     return outputFile | ||||||
|  | } | ||||||
| @@ -1,61 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.ktor.server |  | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.coroutines.safely |  | ||||||
| import dev.inmo.micro_utils.ktor.common.* |  | ||||||
| import io.ktor.http.URLProtocol |  | ||||||
| import io.ktor.server.application.install |  | ||||||
| import io.ktor.server.application.pluginOrNull |  | ||||||
| import io.ktor.server.routing.Route |  | ||||||
| import io.ktor.server.routing.application |  | ||||||
| import io.ktor.server.websocket.* |  | ||||||
| import io.ktor.websocket.send |  | ||||||
| import kotlinx.coroutines.flow.Flow |  | ||||||
| import kotlinx.serialization.SerializationStrategy |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon") |  | ||||||
| fun <T> Route.includeWebsocketHandling( |  | ||||||
|     suburl: String, |  | ||||||
|     flow: Flow<T>, |  | ||||||
|     protocol: URLProtocol? = null, |  | ||||||
|     converter: suspend WebSocketServerSession.(T) -> StandardKtorSerialInputData? |  | ||||||
| ) { |  | ||||||
|     application.apply { |  | ||||||
|         pluginOrNull(WebSockets) ?: install(WebSockets) |  | ||||||
|     } |  | ||||||
|     webSocket(suburl, protocol ?.name) { |  | ||||||
|         safely { |  | ||||||
|             flow.collect { |  | ||||||
|                 converter(it) ?.let { data -> |  | ||||||
|                     send(data) |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon") |  | ||||||
| fun <T> Route.includeWebsocketHandling( |  | ||||||
|     suburl: String, |  | ||||||
|     flow: Flow<T>, |  | ||||||
|     serializer: SerializationStrategy<T>, |  | ||||||
|     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat, |  | ||||||
|     protocol: URLProtocol? = null, |  | ||||||
|     filter: (suspend WebSocketServerSession.(T) -> Boolean)? = null |  | ||||||
| ) = includeWebsocketHandling( |  | ||||||
|     suburl, |  | ||||||
|     flow, |  | ||||||
|     protocol, |  | ||||||
|     converter = if (filter == null) { |  | ||||||
|         { |  | ||||||
|             serialFormat.encodeDefault(serializer, it) |  | ||||||
|         } |  | ||||||
|     } else { |  | ||||||
|         { |  | ||||||
|             if (filter(it)) { |  | ||||||
|                 serialFormat.encodeDefault(serializer, it) |  | ||||||
|             } else { |  | ||||||
|                 null |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| ) |  | ||||||
| @@ -1,6 +1,6 @@ | |||||||
| package dev.inmo.micro_utils.ktor.server | package dev.inmo.micro_utils.ktor.server | ||||||
|  |  | ||||||
| import com.soywiz.klock.DateTime | import korlibs.time.DateTime | ||||||
| import dev.inmo.micro_utils.ktor.common.FromToDateTime | import dev.inmo.micro_utils.ktor.common.FromToDateTime | ||||||
| import io.ktor.http.Parameters | import io.ktor.http.Parameters | ||||||
|  |  | ||||||
|   | |||||||
| @@ -0,0 +1,45 @@ | |||||||
|  | package dev.inmo.micro_utils.ktor.server | ||||||
|  |  | ||||||
|  | import io.ktor.http.HttpStatusCode | ||||||
|  | import io.ktor.server.application.ApplicationCall | ||||||
|  | import io.ktor.server.response.respond | ||||||
|  |  | ||||||
|  | suspend fun ApplicationCall.getParameterOrSendError( | ||||||
|  |     field: String | ||||||
|  | ) = parameters[field].also { | ||||||
|  |     if (it == null) { | ||||||
|  |         respond(HttpStatusCode.BadRequest, "Request must contains $field") | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun ApplicationCall.getParametersOrSendError( | ||||||
|  |     field: String | ||||||
|  | ) = parameters.getAll(field).also { | ||||||
|  |     if (it == null) { | ||||||
|  |         respond(HttpStatusCode.BadRequest, "Request must contains $field") | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun ApplicationCall.getQueryParameter( | ||||||
|  |     field: String | ||||||
|  | ) = request.queryParameters[field] | ||||||
|  |  | ||||||
|  | fun ApplicationCall.getQueryParameters( | ||||||
|  |     field: String | ||||||
|  | ) = request.queryParameters.getAll(field) | ||||||
|  |  | ||||||
|  | suspend fun ApplicationCall.getQueryParameterOrSendError( | ||||||
|  |     field: String | ||||||
|  | ) = getQueryParameter(field).also { | ||||||
|  |     if (it == null) { | ||||||
|  |         respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field") | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | suspend fun ApplicationCall.getQueryParametersOrSendError( | ||||||
|  |     field: String | ||||||
|  | ) = getQueryParameters(field).also { | ||||||
|  |     if (it == null) { | ||||||
|  |         respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field") | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,308 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.ktor.server |  | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.common.* |  | ||||||
| import dev.inmo.micro_utils.coroutines.safely |  | ||||||
| import dev.inmo.micro_utils.ktor.common.* |  | ||||||
| import io.ktor.http.* |  | ||||||
| import io.ktor.http.content.* |  | ||||||
| import io.ktor.server.application.ApplicationCall |  | ||||||
| import io.ktor.server.application.call |  | ||||||
| import io.ktor.server.request.receive |  | ||||||
| import io.ktor.server.request.receiveMultipart |  | ||||||
| import io.ktor.server.response.respond |  | ||||||
| import io.ktor.server.response.respondBytes |  | ||||||
| import io.ktor.server.routing.Route |  | ||||||
| import io.ktor.server.websocket.WebSocketServerSession |  | ||||||
| import io.ktor.util.pipeline.PipelineContext |  | ||||||
| import io.ktor.utils.io.core.* |  | ||||||
| import kotlinx.coroutines.flow.Flow |  | ||||||
| import kotlinx.serialization.DeserializationStrategy |  | ||||||
| import kotlinx.serialization.SerializationStrategy |  | ||||||
|  |  | ||||||
| @Deprecated("This class method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| class UnifiedRouter( |  | ||||||
|     val serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat, |  | ||||||
|     val serialFormatContentType: ContentType = standardKtorSerialFormatContentType |  | ||||||
| ) { |  | ||||||
|     fun <T> Route.includeWebsocketHandling( |  | ||||||
|         suburl: String, |  | ||||||
|         flow: Flow<T>, |  | ||||||
|         serializer: SerializationStrategy<T>, |  | ||||||
|         protocol: URLProtocol? = null, |  | ||||||
|         filter: (suspend WebSocketServerSession.(T) -> Boolean)? = null |  | ||||||
|     ) = includeWebsocketHandling(suburl, flow, serializer, serialFormat, protocol, filter) |  | ||||||
|  |  | ||||||
|     suspend fun <T> PipelineContext<*, ApplicationCall>.unianswer( |  | ||||||
|         answerSerializer: SerializationStrategy<T>, |  | ||||||
|         answer: T |  | ||||||
|     ) { |  | ||||||
|         call.respondBytes ( |  | ||||||
|             serialFormat.encodeDefault(answerSerializer, answer), |  | ||||||
|             serialFormatContentType |  | ||||||
|         ) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     suspend fun <T> PipelineContext<*, ApplicationCall>.uniload( |  | ||||||
|         deserializer: DeserializationStrategy<T> |  | ||||||
|     ) = safely { |  | ||||||
|         serialFormat.decodeDefault( |  | ||||||
|             deserializer, |  | ||||||
|             call.receive() |  | ||||||
|         ) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     suspend fun PipelineContext<*, ApplicationCall>.getParameterOrSendError( |  | ||||||
|         field: String |  | ||||||
|     ) = call.parameters[field].also { |  | ||||||
|         if (it == null) { |  | ||||||
|             call.respond(HttpStatusCode.BadRequest, "Request must contains $field") |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     fun PipelineContext<*, ApplicationCall>.getQueryParameter( |  | ||||||
|         field: String |  | ||||||
|     ) = call.request.queryParameters[field] |  | ||||||
|  |  | ||||||
|     suspend fun PipelineContext<*, ApplicationCall>.getQueryParameterOrSendError( |  | ||||||
|         field: String |  | ||||||
|     ) = getQueryParameter(field).also { |  | ||||||
|         if (it == null) { |  | ||||||
|             call.respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field") |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     fun <T> PipelineContext<*, ApplicationCall>.decodeUrlQueryValue( |  | ||||||
|         field: String, |  | ||||||
|         deserializer: DeserializationStrategy<T> |  | ||||||
|     ) = getQueryParameter(field) ?.let { |  | ||||||
|         serialFormat.decodeHex( |  | ||||||
|             deserializer, |  | ||||||
|             it |  | ||||||
|         ) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     suspend fun <T> PipelineContext<*, ApplicationCall>.decodeUrlQueryValueOrSendError( |  | ||||||
|         field: String, |  | ||||||
|         deserializer: DeserializationStrategy<T> |  | ||||||
|     ) = decodeUrlQueryValue(field, deserializer).also { |  | ||||||
|         if (it == null) { |  | ||||||
|             call.respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field") |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     companion object { |  | ||||||
|         val default |  | ||||||
|             get() = defaultUnifiedRouter |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| val defaultUnifiedRouter = UnifiedRouter() |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <T> ApplicationCall.unianswer( |  | ||||||
|     answerSerializer: SerializationStrategy<T>, |  | ||||||
|     answer: T |  | ||||||
| ) { |  | ||||||
|     respondBytes ( |  | ||||||
|         standardKtorSerialFormat.encodeDefault(answerSerializer, answer), |  | ||||||
|         standardKtorSerialFormatContentType |  | ||||||
|     ) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <T> ApplicationCall.uniload( |  | ||||||
|     deserializer: DeserializationStrategy<T> |  | ||||||
| ) = safely { |  | ||||||
|     standardKtorSerialFormat.decodeDefault( |  | ||||||
|         deserializer, |  | ||||||
|         receive() |  | ||||||
|     ) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| suspend fun ApplicationCall.uniloadMultipart( |  | ||||||
|     onFormItem: (PartData.FormItem) -> Unit = {}, |  | ||||||
|     onCustomFileItem: (PartData.FileItem) -> Unit = {}, |  | ||||||
|     onBinaryChannelItem: (PartData.BinaryChannelItem) -> Unit = {}, |  | ||||||
|     onBinaryContent: (PartData.BinaryItem) -> Unit = {} |  | ||||||
| ) = safely { |  | ||||||
|     val multipartData = receiveMultipart() |  | ||||||
|  |  | ||||||
|     var resultInput: Input? = null |  | ||||||
|  |  | ||||||
|     multipartData.forEachPart { |  | ||||||
|         when (it) { |  | ||||||
|             is PartData.FormItem -> onFormItem(it) |  | ||||||
|             is PartData.FileItem -> { |  | ||||||
|                 when (it.name) { |  | ||||||
|                     "bytes" -> resultInput = it.provider() |  | ||||||
|                     else -> onCustomFileItem(it) |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|             is PartData.BinaryItem -> onBinaryContent(it) |  | ||||||
|             is PartData.BinaryChannelItem -> onBinaryChannelItem(it) |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     resultInput ?: error("Bytes has not been received") |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <T> ApplicationCall.uniloadMultipart( |  | ||||||
|     deserializer: DeserializationStrategy<T>, |  | ||||||
|     onFormItem: (PartData.FormItem) -> Unit = {}, |  | ||||||
|     onCustomFileItem: (PartData.FileItem) -> Unit = {}, |  | ||||||
|     onBinaryChannelItem: (PartData.BinaryChannelItem) -> Unit = {}, |  | ||||||
|     onBinaryContent: (PartData.BinaryItem) -> Unit = {} |  | ||||||
| ): Pair<Input, T> { |  | ||||||
|     var data: Optional<T>? = null |  | ||||||
|     val resultInput = uniloadMultipart( |  | ||||||
|         onFormItem, |  | ||||||
|         { |  | ||||||
|             if (it.name == "data") { |  | ||||||
|                 data = standardKtorSerialFormat.decodeDefault(deserializer, it.provider().readBytes()).optional |  | ||||||
|             } else { |  | ||||||
|                 onCustomFileItem(it) |  | ||||||
|             } |  | ||||||
|         }, |  | ||||||
|         onBinaryChannelItem, |  | ||||||
|         onBinaryContent |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|     val completeData = data ?: error("Data has not been received") |  | ||||||
|     return resultInput to (completeData.dataOrNull().let { it as T }) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <T> ApplicationCall.uniloadMultipartFile( |  | ||||||
|     deserializer: DeserializationStrategy<T>, |  | ||||||
|     onFormItem: (PartData.FormItem) -> Unit = {}, |  | ||||||
|     onCustomFileItem: (PartData.FileItem) -> Unit = {}, |  | ||||||
|     onBinaryChannelItem: (PartData.BinaryChannelItem) -> Unit = {}, |  | ||||||
|     onBinaryContent: (PartData.BinaryItem) -> Unit = {}, |  | ||||||
| ) = safely { |  | ||||||
|     val multipartData = receiveMultipart() |  | ||||||
|  |  | ||||||
|     var resultInput: MPPFile? = null |  | ||||||
|     var data: Optional<T>? = null |  | ||||||
|  |  | ||||||
|     multipartData.forEachPart { |  | ||||||
|         when (it) { |  | ||||||
|             is PartData.FormItem -> onFormItem(it) |  | ||||||
|             is PartData.FileItem -> { |  | ||||||
|                 when (it.name) { |  | ||||||
|                     "bytes" -> { |  | ||||||
|                         val name = FileName(it.originalFileName ?: error("File name is unknown for default part")) |  | ||||||
|                         resultInput = MPPFile.createTempFile( |  | ||||||
|                             name.nameWithoutExtension.let { |  | ||||||
|                                 var resultName = it |  | ||||||
|                                 while (resultName.length < 3) { |  | ||||||
|                                     resultName += "_" |  | ||||||
|                                 } |  | ||||||
|                                 resultName |  | ||||||
|                             }, |  | ||||||
|                             ".${name.extension}" |  | ||||||
|                         ).apply { |  | ||||||
|                             outputStream().use { fileStream -> |  | ||||||
|                                 it.streamProvider().use { |  | ||||||
|                                     it.copyTo(fileStream) |  | ||||||
|                                 } |  | ||||||
|                             } |  | ||||||
|                         } |  | ||||||
|                     } |  | ||||||
|                     "data" -> data = standardKtorSerialFormat.decodeDefault(deserializer, it.provider().readBytes()).optional |  | ||||||
|                     else -> onCustomFileItem(it) |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|             is PartData.BinaryItem -> onBinaryContent(it) |  | ||||||
|             is PartData.BinaryChannelItem -> onBinaryChannelItem(it) |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     val completeData = data ?: error("Data has not been received") |  | ||||||
|     (resultInput ?: error("Bytes has not been received")) to (completeData.dataOrNull().let { it as T }) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| suspend fun ApplicationCall.uniloadMultipartFile( |  | ||||||
|     onFormItem: (PartData.FormItem) -> Unit = {}, |  | ||||||
|     onCustomFileItem: (PartData.FileItem) -> Unit = {}, |  | ||||||
|     onBinaryChannelItem: (PartData.BinaryChannelItem) -> Unit = {}, |  | ||||||
|     onBinaryContent: (PartData.BinaryItem) -> Unit = {}, |  | ||||||
| ) = safely { |  | ||||||
|     val multipartData = receiveMultipart() |  | ||||||
|  |  | ||||||
|     var resultInput: MPPFile? = null |  | ||||||
|  |  | ||||||
|     multipartData.forEachPart { |  | ||||||
|         when (it) { |  | ||||||
|             is PartData.FormItem -> onFormItem(it) |  | ||||||
|             is PartData.FileItem -> { |  | ||||||
|                 if (it.name == "bytes") { |  | ||||||
|                     val name = FileName(it.originalFileName ?: error("File name is unknown for default part")) |  | ||||||
|                     resultInput = MPPFile.createTempFile( |  | ||||||
|                         name.nameWithoutExtension.let { |  | ||||||
|                             var resultName = it |  | ||||||
|                             while (resultName.length < 3) { |  | ||||||
|                                 resultName += "_" |  | ||||||
|                             } |  | ||||||
|                             resultName |  | ||||||
|                         }, |  | ||||||
|                         ".${name.extension}" |  | ||||||
|                     ).apply { |  | ||||||
|                         outputStream().use { fileStream -> |  | ||||||
|                             it.streamProvider().use { |  | ||||||
|                                 it.copyTo(fileStream) |  | ||||||
|                             } |  | ||||||
|                         } |  | ||||||
|                     } |  | ||||||
|                 } else { |  | ||||||
|                     onCustomFileItem(it) |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|             is PartData.BinaryItem -> onBinaryContent(it) |  | ||||||
|             is PartData.BinaryChannelItem -> onBinaryChannelItem(it) |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     resultInput ?: error("Bytes has not been received") |  | ||||||
| } |  | ||||||
|  |  | ||||||
| suspend fun ApplicationCall.getParameterOrSendError( |  | ||||||
|     field: String |  | ||||||
| ) = parameters[field].also { |  | ||||||
|     if (it == null) { |  | ||||||
|         respond(HttpStatusCode.BadRequest, "Request must contains $field") |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| fun ApplicationCall.getQueryParameter( |  | ||||||
|     field: String |  | ||||||
| ) = request.queryParameters[field] |  | ||||||
|  |  | ||||||
| suspend fun ApplicationCall.getQueryParameterOrSendError( |  | ||||||
|     field: String |  | ||||||
| ) = getQueryParameter(field).also { |  | ||||||
|     if (it == null) { |  | ||||||
|         respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field") |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| fun <T> ApplicationCall.decodeUrlQueryValue( |  | ||||||
|     field: String, |  | ||||||
|     deserializer: DeserializationStrategy<T> |  | ||||||
| ) = getQueryParameter(field) ?.let { |  | ||||||
|     standardKtorSerialFormat.decodeHex( |  | ||||||
|         deserializer, |  | ||||||
|         it |  | ||||||
|     ) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Deprecated("This method will be removed soon. It is now recommended to use built-in ktor features instead") |  | ||||||
| suspend fun <T> ApplicationCall.decodeUrlQueryValueOrSendError( |  | ||||||
|     field: String, |  | ||||||
|     deserializer: DeserializationStrategy<T> |  | ||||||
| ) = decodeUrlQueryValue(field, deserializer).also { |  | ||||||
|     if (it == null) { |  | ||||||
|         respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field") |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -26,7 +26,6 @@ import java.nio.file.attribute.FileTime | |||||||
|  |  | ||||||
| class TemporalFilesRoutingConfigurator( | class TemporalFilesRoutingConfigurator( | ||||||
|     private val subpath: String = DefaultTemporalFilesSubPath, |     private val subpath: String = DefaultTemporalFilesSubPath, | ||||||
|     private val unifiedRouter: UnifiedRouter = UnifiedRouter.default, |  | ||||||
|     private val temporalFilesUtilizer: TemporalFilesUtilizer = TemporalFilesUtilizer |     private val temporalFilesUtilizer: TemporalFilesUtilizer = TemporalFilesUtilizer | ||||||
| ) : ApplicationRoutingConfigurator.Element { | ) : ApplicationRoutingConfigurator.Element { | ||||||
|     interface TemporalFilesUtilizer { |     interface TemporalFilesUtilizer { | ||||||
| @@ -80,42 +79,40 @@ class TemporalFilesRoutingConfigurator( | |||||||
|  |  | ||||||
|     override fun Route.invoke() { |     override fun Route.invoke() { | ||||||
|         post(subpath) { |         post(subpath) { | ||||||
|             unifiedRouter.apply { |             val multipart = call.receiveMultipart() | ||||||
|                 val multipart = call.receiveMultipart() |  | ||||||
|  |  | ||||||
|                 var fileInfo: Pair<TemporalFileId, MPPFile>? = null |             var fileInfo: Pair<TemporalFileId, MPPFile>? = null | ||||||
|                 var part = multipart.readPart() |             var part = multipart.readPart() | ||||||
|  |  | ||||||
|                 while (part != null) { |             while (part != null) { | ||||||
|                     if (part is PartData.FileItem) { |                 if (part is PartData.FileItem) { | ||||||
|                         break |                     break | ||||||
|                     } |  | ||||||
|                     part = multipart.readPart() |  | ||||||
|                 } |                 } | ||||||
|  |                 part = multipart.readPart() | ||||||
|                 part ?.let { |  | ||||||
|                     if (it is PartData.FileItem) { |  | ||||||
|                         val fileId = TemporalFileId(uuid4().toString()) |  | ||||||
|                         val fileName = it.originalFileName ?.let { FileName(it) } ?: return@let |  | ||||||
|                         fileInfo = fileId to File.createTempFile(fileId.string, ".${fileName.extension}").apply { |  | ||||||
|                             outputStream().use { outputStream -> |  | ||||||
|                                 it.streamProvider().use { |  | ||||||
|                                     it.copyTo(outputStream) |  | ||||||
|                                 } |  | ||||||
|                             } |  | ||||||
|                             deleteOnExit() |  | ||||||
|                         } |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|  |  | ||||||
|                 fileInfo ?.also { (fileId, file) -> |  | ||||||
|                     temporalFilesMutex.withLock { |  | ||||||
|                         temporalFilesMap[fileId] = file |  | ||||||
|                     } |  | ||||||
|                     call.respondText(fileId.string) |  | ||||||
|                     launchSafelyWithoutExceptions { filesFlow.emit(fileId) } |  | ||||||
|                 } ?: call.respond(HttpStatusCode.BadRequest) |  | ||||||
|             } |             } | ||||||
|  |  | ||||||
|  |             part ?.let { | ||||||
|  |                 if (it is PartData.FileItem) { | ||||||
|  |                     val fileId = TemporalFileId(uuid4().toString()) | ||||||
|  |                     val fileName = it.originalFileName ?.let { FileName(it) } ?: return@let | ||||||
|  |                     fileInfo = fileId to File.createTempFile(fileId.string, ".${fileName.extension}").apply { | ||||||
|  |                         outputStream().use { outputStream -> | ||||||
|  |                             it.streamProvider().use { | ||||||
|  |                                 it.copyTo(outputStream) | ||||||
|  |                             } | ||||||
|  |                         } | ||||||
|  |                         deleteOnExit() | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             fileInfo ?.also { (fileId, file) -> | ||||||
|  |                 temporalFilesMutex.withLock { | ||||||
|  |                     temporalFilesMap[fileId] = file | ||||||
|  |                 } | ||||||
|  |                 call.respondText(fileId.string) | ||||||
|  |                 launchSafelyWithoutExceptions { filesFlow.emit(fileId) } | ||||||
|  |             } ?: call.respond(HttpStatusCode.BadRequest) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user