diff --git a/CHANGELOG.md b/CHANGELOG.md index a8a780d8d2e..23739bba7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ ## 0.4.21 +* `Common` + * `JS` + * Extension `DataView#toByteArray` has been added + * Extension `ArrayBuffer#toByteArray` has been added + * Extension `ByteArray#toDataView` has been added + * Extension `ByteArray#toArrayBuffer` has been added +* `Coroutines` + * `JS` + * Extension `Blob#toByteArray` has been added +* `Crypto` + * Subproject has been created +* `Serialization` + * `Base64` + * Currently, it is not depended on `common` project and use `crypto` instead + ## 0.4.20 * `Serialization` 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 cba5c9c01a7..26bdf061c77 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 @@ -12,12 +12,19 @@ private val BASE64_INVERSE_ALPHABET = IntArray(256) { internal fun Int.toBase64(): Char = BASE64_ALPHABET[this] internal fun Byte.fromBase64(): Byte = BASE64_INVERSE_ALPHABET[toInt() and 0xff].toByte() and BASE64_MASK +const val replacedInCrypto = "Replaced in crypto subproject" + +@Deprecated(replacedInCrypto, ReplaceWith("EncodedBase64String", "dev.inmo.micro_utils.crypto")) typealias EncodedBase64String = String +@Deprecated(replacedInCrypto, ReplaceWith("EncodedByteArray", "dev.inmo.micro_utils.crypto")) typealias EncodedByteArray = ByteArray +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64String()", "dev.inmo.micro_utils.crypto")) fun String.encodeBase64String(): EncodedBase64String = encodeToByteArray().encodeBase64String() +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64()", "dev.inmo.micro_utils.crypto")) fun String.encodeBase64(): EncodedByteArray = encodeToByteArray().encodeBase64() +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64String()", "dev.inmo.micro_utils.crypto")) fun ByteArray.encodeBase64String(): EncodedBase64String = buildString { var i = 0 while (this@encodeBase64String.size > i) { @@ -45,11 +52,15 @@ fun ByteArray.encodeBase64String(): EncodedBase64String = buildString { i += read } } +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64()", "dev.inmo.micro_utils.crypto")) fun ByteArray.encodeBase64(): EncodedByteArray = encodeBase64String().encodeToByteArray() +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64()", "dev.inmo.micro_utils.crypto")) fun EncodedBase64String.decodeBase64() = dropLastWhile { it == BASE64_PAD }.encodeToByteArray().decodeBase64() +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64String()", "dev.inmo.micro_utils.crypto")) fun EncodedBase64String.decodeBase64String() = decodeBase64().decodeToString() +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64()", "dev.inmo.micro_utils.crypto")) fun EncodedByteArray.decodeBase64(): ByteArray { val result = mutableListOf() val data = ByteArray(4) @@ -74,4 +85,5 @@ fun EncodedByteArray.decodeBase64(): ByteArray { return result.toByteArray() } +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64String()", "dev.inmo.micro_utils.crypto")) 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 index 69104f077a1..8fdc9b95b7d 100644 --- a/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt +++ b/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt @@ -11,6 +11,7 @@ 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() @@ -21,6 +22,7 @@ Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium dolor val urlTestText = "https://example.com?isitexample=1" val urlTestBase64Text = "aHR0cHM6Ly9leGFtcGxlLmNvbT9pc2l0ZXhhbXBsZT0x" + @Test fun decodeEncodeUrl() { val encoded = urlTestText.encodeBase64String() diff --git a/serialization/base64/build.gradle b/serialization/base64/build.gradle index 082ce99346a..403f8887d7b 100644 --- a/serialization/base64/build.gradle +++ b/serialization/base64/build.gradle @@ -10,7 +10,7 @@ kotlin { sourceSets { commonMain { dependencies { - api project(":micro_utils.common") + api project(":micro_utils.crypto") } } } 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 1a623699599..435730f24ac 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,6 +1,6 @@ package dev.inmo.micro_utils.serialization.base64 -import dev.inmo.micro_utils.common.* +import dev.inmo.micro_utils.crypto.* import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializer import kotlinx.serialization.builtins.serializer