From 972857268d14c304563a82bf650ed8dedaaf075b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 14 Jan 2021 14:22:09 +0600 Subject: [PATCH 1/4] start 0.4.17 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a295b3cd2c9..06836374fcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.4.17 + ## 0.4.16 * `Coroutines`: diff --git a/gradle.properties b/gradle.properties index b7fa50d32b8..e386f045ce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,5 +40,5 @@ dokka_version=1.4.20 # Project data group=dev.inmo -version=0.4.16 -android_code_version=20 +version=0.4.17 +android_code_version=21 From 6cccd5ff6c23c4259d8b58c811e7d3c30556c1da Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 14 Jan 2021 14:22:26 +0600 Subject: [PATCH 2/4] start add base64 --- .../kotlin/dev/inmo/micro_utils/common/Base64.kt | 2 ++ serialization/base64/build.gradle | 7 +++++++ .../serialization/base64/Base64Serializer.kt | 13 +++++++++++++ serialization/base64/src/main/AndroidManifest.xml | 1 + settings.gradle | 1 + 5 files changed, 24 insertions(+) create mode 100644 common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt create mode 100644 serialization/base64/build.gradle create mode 100644 serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt create mode 100644 serialization/base64/src/main/AndroidManifest.xml diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt new file mode 100644 index 00000000000..82be3f57e20 --- /dev/null +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt @@ -0,0 +1,2 @@ +package dev.inmo.micro_utils.common + diff --git a/serialization/base64/build.gradle b/serialization/base64/build.gradle new file mode 100644 index 00000000000..7c54502f100 --- /dev/null +++ b/serialization/base64/build.gradle @@ -0,0 +1,7 @@ +plugins { + id "org.jetbrains.kotlin.multiplatform" + id "org.jetbrains.kotlin.plugin.serialization" + id "com.android.library" +} + +apply from: "$mppProjectWithSerializationPresetPath" diff --git a/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt b/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt new file mode 100644 index 00000000000..8e745ae50a1 --- /dev/null +++ b/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt @@ -0,0 +1,13 @@ +package dev.inmo.micro_utils.serialization.base64 + +import kotlinx.serialization.KSerializer +import kotlinx.serialization.builtins.serializer +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder + +class Base64Serializer(private val typeSerializer: KSerializer) : KSerializer { + override val descriptor: SerialDescriptor = String.serializer().descriptor + override fun deserialize(decoder: Decoder): T { + TODO("Not yet implemented") + } +} diff --git a/serialization/base64/src/main/AndroidManifest.xml b/serialization/base64/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..1506d6b6649 --- /dev/null +++ b/serialization/base64/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index c438c68de35..e53c506e681 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,6 +21,7 @@ String[] includes = [ ":android:recyclerview", ":android:alerts:common", ":android:alerts:recyclerview", + ":serialization:base64", ":dokka" ] From 3174b843677afde702c77db112aaecf1881b9cf4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 14 Jan 2021 20:51:13 +0600 Subject: [PATCH 3/4] base64 tools --- CHANGELOG.md | 6 ++ .../dev/inmo/micro_utils/common/Base64.kt | 75 +++++++++++++++++++ .../dev/inmo/micro_utils/common/Base64Text.kt | 31 ++++++++ serialization/base64/build.gradle | 10 +++ .../serialization/base64/Base64Serializer.kt | 16 +++- 5 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 06836374fcf..f3feac1128c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## 0.4.17 +* `Common` + * Functionality for decode/encode base 64 to/from `ByteArray`/`String` have been added +* `Serialization` + * `Base 64` + * Project has been initiated + ## 0.4.16 * `Coroutines`: diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt index 82be3f57e20..cba5c9c01a7 100644 --- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt @@ -1,2 +1,77 @@ package dev.inmo.micro_utils.common +import kotlin.experimental.and + +private const val BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" +private const val BASE64_MASK: Byte = 0x3f +private const val BASE64_PAD = '=' +private val BASE64_INVERSE_ALPHABET = IntArray(256) { + BASE64_ALPHABET.indexOf(it.toChar()) +} + +internal fun Int.toBase64(): Char = BASE64_ALPHABET[this] +internal fun Byte.fromBase64(): Byte = BASE64_INVERSE_ALPHABET[toInt() and 0xff].toByte() and BASE64_MASK + +typealias EncodedBase64String = String +typealias EncodedByteArray = ByteArray + +fun String.encodeBase64String(): EncodedBase64String = encodeToByteArray().encodeBase64String() +fun String.encodeBase64(): EncodedByteArray = encodeToByteArray().encodeBase64() + +fun ByteArray.encodeBase64String(): EncodedBase64String = buildString { + var i = 0 + while (this@encodeBase64String.size > i) { + val read = kotlin.math.min(3, this@encodeBase64String.size - i) + val data = ByteArray(3) { + if (it < read) { + this@encodeBase64String[it + i] + } else { + 0 + } + } + + val padSize = (data.size - read) * 8 / 6 + val chunk = ((data[0].toInt() and 0xFF) shl 16) or + ((data[1].toInt() and 0xFF) shl 8) or + (data[2].toInt() and 0xFF) + + for (index in data.size downTo padSize) { + val char = (chunk shr (6 * index)) and BASE64_MASK.toInt() + append(char.toBase64()) + } + + repeat(padSize) { append(BASE64_PAD) } + + i += read + } +} +fun ByteArray.encodeBase64(): EncodedByteArray = encodeBase64String().encodeToByteArray() + +fun EncodedBase64String.decodeBase64() = dropLastWhile { it == BASE64_PAD }.encodeToByteArray().decodeBase64() +fun EncodedBase64String.decodeBase64String() = decodeBase64().decodeToString() + +fun EncodedByteArray.decodeBase64(): ByteArray { + val result = mutableListOf() + val data = ByteArray(4) + (0 until size step 4).forEach { i -> + var read = 0 + for (j in 0 until 4) { + if (j + i < size) { + data[j] = get(j + i) + read++ + } else { + break + } + } + val chunk = data.foldIndexed(0) { index, result, current -> + result or (current.fromBase64().toInt() shl ((3 - index) * 6)) + } + for (index in data.size - 2 downTo (data.size - read)) { + val origin = (chunk shr (8 * index)) and 0xff + result.add(origin.toByte()) + } + } + + return result.toByteArray() +} +fun EncodedByteArray.decodeBase64String() = decodeBase64().decodeToString() diff --git a/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt b/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt new file mode 100644 index 00000000000..69104f077a1 --- /dev/null +++ b/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt @@ -0,0 +1,31 @@ +package dev.inmo.micro_utils.common + +import kotlin.random.Random +import kotlin.test.Test +import kotlin.test.assertEquals + + + +class Base64Text { + + val testText = """Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?""" + val base64Text = """TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIFV0IGVuaW0gYWQgbWluaW0gdmVuaWFtLCBxdWlzIG5vc3RydWQgZXhlcmNpdGF0aW9uIHVsbGFtY28gbGFib3JpcyBuaXNpIHV0IGFsaXF1aXAgZXggZWEgY29tbW9kbyBjb25zZXF1YXQuIER1aXMgYXV0ZSBpcnVyZSBkb2xvciBpbiByZXByZWhlbmRlcml0IGluIHZvbHVwdGF0ZSB2ZWxpdCBlc3NlIGNpbGx1bSBkb2xvcmUgZXUgZnVnaWF0IG51bGxhIHBhcmlhdHVyLiBFeGNlcHRldXIgc2ludCBvY2NhZWNhdCBjdXBpZGF0YXQgbm9uIHByb2lkZW50LCBzdW50IGluIGN1bHBhIHF1aSBvZmZpY2lhIGRlc2VydW50IG1vbGxpdCBhbmltIGlkIGVzdCBsYWJvcnVtLgpTZWQgdXQgcGVyc3BpY2lhdGlzIHVuZGUgb21uaXMgaXN0ZSBuYXR1cyBlcnJvciBzaXQgdm9sdXB0YXRlbSBhY2N1c2FudGl1bSBkb2xvcmVtcXVlIGxhdWRhbnRpdW0sIHRvdGFtIHJlbSBhcGVyaWFtLCBlYXF1ZSBpcHNhIHF1YWUgYWIgaWxsbyBpbnZlbnRvcmUgdmVyaXRhdGlzIGV0IHF1YXNpIGFyY2hpdGVjdG8gYmVhdGFlIHZpdGFlIGRpY3RhIHN1bnQgZXhwbGljYWJvLiBOZW1vIGVuaW0gaXBzYW0gdm9sdXB0YXRlbSBxdWlhIHZvbHVwdGFzIHNpdCBhc3Blcm5hdHVyIGF1dCBvZGl0IGF1dCBmdWdpdCwgc2VkIHF1aWEgY29uc2VxdXVudHVyIG1hZ25pIGRvbG9yZXMgZW9zIHF1aSByYXRpb25lIHZvbHVwdGF0ZW0gc2VxdWkgbmVzY2l1bnQuIE5lcXVlIHBvcnJvIHF1aXNxdWFtIGVzdCwgcXVpIGRvbG9yZW0gaXBzdW0gcXVpYSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIsIGFkaXBpc2NpIHZlbGl0LCBzZWQgcXVpYSBub24gbnVtcXVhbSBlaXVzIG1vZGkgdGVtcG9yYSBpbmNpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hbSBhbGlxdWFtIHF1YWVyYXQgdm9sdXB0YXRlbS4gVXQgZW5pbSBhZCBtaW5pbWEgdmVuaWFtLCBxdWlzIG5vc3RydW0gZXhlcmNpdGF0aW9uZW0gdWxsYW0gY29ycG9yaXMgc3VzY2lwaXQgbGFib3Jpb3NhbSwgbmlzaSB1dCBhbGlxdWlkIGV4IGVhIGNvbW1vZGkgY29uc2VxdWF0dXI/IFF1aXMgYXV0ZW0gdmVsIGV1bSBpdXJlIHJlcHJlaGVuZGVyaXQgcXVpIGluIGVhIHZvbHVwdGF0ZSB2ZWxpdCBlc3NlIHF1YW0gbmloaWwgbW9sZXN0aWFlIGNvbnNlcXVhdHVyLCB2ZWwgaWxsdW0gcXVpIGRvbG9yZW0gZXVtIGZ1Z2lhdCBxdW8gdm9sdXB0YXMgbnVsbGEgcGFyaWF0dXI/""" + @Test + fun decodeEncode() { + val encoded = testText.encodeBase64String() + assertEquals(base64Text, encoded) + val decoded = encoded.decodeBase64String() + assertEquals(testText, decoded) + } + + val urlTestText = "https://example.com?isitexample=1" + val urlTestBase64Text = "aHR0cHM6Ly9leGFtcGxlLmNvbT9pc2l0ZXhhbXBsZT0x" + @Test + fun decodeEncodeUrl() { + val encoded = urlTestText.encodeBase64String() + assertEquals(urlTestBase64Text, encoded) + val decoded = encoded.decodeBase64String() + assertEquals(urlTestText, decoded) + } +} \ No newline at end of file diff --git a/serialization/base64/build.gradle b/serialization/base64/build.gradle index 7c54502f100..082ce99346a 100644 --- a/serialization/base64/build.gradle +++ b/serialization/base64/build.gradle @@ -5,3 +5,13 @@ plugins { } apply from: "$mppProjectWithSerializationPresetPath" + +kotlin { + sourceSets { + commonMain { + dependencies { + api project(":micro_utils.common") + } + } + } +} diff --git a/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt b/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt index 8e745ae50a1..39a4087962d 100644 --- a/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt +++ b/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt @@ -1,13 +1,21 @@ package dev.inmo.micro_utils.serialization.base64 +import dev.inmo.micro_utils.common.* import kotlinx.serialization.KSerializer +import kotlinx.serialization.Serializer import kotlinx.serialization.builtins.serializer import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder -class Base64Serializer(private val typeSerializer: KSerializer) : KSerializer { +open class Base64Serializer( + private val converterFrom: (T) -> String, + private val converterTo: (String) -> T, +) : KSerializer { override val descriptor: SerialDescriptor = String.serializer().descriptor - override fun deserialize(decoder: Decoder): T { - TODO("Not yet implemented") - } + override fun deserialize(decoder: Decoder): T = converterTo(decoder.decodeString().decodeBase64String()) + override fun serialize(encoder: Encoder, value: T) = encoder.encodeString(converterFrom(value).encodeBase64String()) } + +@Serializer(String::class) +object Base64StringSerializer : Base64Serializer({ it }, { it }) From 9706524572dd2cb0793dbf92986bb044ccc1ef5b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 14 Jan 2021 20:55:32 +0600 Subject: [PATCH 4/4] update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0686112a8cf..b813b2c758d 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ You always can look at the