Merge branch 'main' of https://github.com/vitorpamplona/amethyst

* 'main' of https://github.com/vitorpamplona/amethyst: New Crowdin translations by GitHub Action code simplification and deduplication code simplification and deduplication Add blurhash and dim to Nip96Uploader.kt added blurhash to blossom upload New Crowdin translations by GitHub Action Update README to mark video capture as complete Parse for video segments and exclude them from image gallery add VideoSegment and failing tests Fix location being added to note even after deselecting it optimise imports New Crowdin translations by GitHub Action update cs, de, sv, pt translations Revert "update buffer to 64kb" update buffer to 64kb Change length to Long from Int: avoids potential overflow, Long seems to be used everywhere else Create a CountingInputStream utility to avoid duplication Prevent INT overflow in BlossomUploader.kt Connection Cleanup in ImageDownloader.kt Added try-finally in Sha256Hasher.jvmAndroid.kt Add streaming hash utility function to quartz multiplatform, follow the existing pool/worker design Change hashing in ImageDownloader.kt to use streaming stream file to calculate both hash and size without loading it all at once # Conflicts: # amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetScreen.kt
2025-11-04 19:28:45 -05:00
parent be804092d7 7c439f2448
commit 7dfa343ad8
52 changed files with 732 additions and 178 deletions
@@ -35,7 +35,6 @@ import com.vitorpamplona.quartz.nip55AndroidSigner.api.permission.Permission
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.permission.PermissionDeserializer
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.permission.PermissionSerializer
 import java.io.InputStream
-import kotlin.jvm.java

 object JsonMapperNip55 {
    val defaultMapper: ObjectMapper =
@@ -35,7 +35,6 @@ import com.vitorpamplona.quartz.nip01Core.metadata.tags.Nip05Tag
 import com.vitorpamplona.quartz.nip01Core.metadata.tags.PictureTag
 import com.vitorpamplona.quartz.nip01Core.metadata.tags.PronounsTag
 import com.vitorpamplona.quartz.nip01Core.metadata.tags.WebsiteTag
-import com.vitorpamplona.quartz.nip01Core.metadata.website
 import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate
 import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate
 import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri
@@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.utils.cache.LargeCache
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlin.collections.plus

 class PoolCounts {
    private var queries = LargeCache<String, Map<NormalizedRelayUrl, List<Filter>>>()
@@ -102,7 +101,7 @@ class PoolCounts {
        }
    }

-    suspend fun syncState(
+    fun syncState(
        relay: NormalizedRelayUrl,
        sync: (Command) -> Unit,
    ) {
@@ -20,7 +20,6 @@
 */
 package com.vitorpamplona.quartz.nip06KeyDerivation

-import androidx.compose.runtime.key
 import com.vitorpamplona.quartz.utils.Secp256k1Instance
 import com.vitorpamplona.quartz.utils.mac.MacInstance

@@ -77,9 +76,9 @@ class Bip32SeedDerivation {
        return ExtendedPrivateKey(key, ir)
    }

-    public fun writeInt32BE(n: Int): ByteArray = ByteArray(Int.SIZE_BYTES).also { writeInt32BE(n, it) }
+    fun writeInt32BE(n: Int): ByteArray = ByteArray(Int.SIZE_BYTES).also { writeInt32BE(n, it) }

-    public fun writeInt32BE(
+    fun writeInt32BE(
        n: Int,
        bs: ByteArray,
        off: Int = 0,
@@ -38,8 +38,6 @@ import com.vitorpamplona.quartz.nip19Bech32.entities.NSec
 import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.Log
 import kotlinx.coroutines.CancellationException
-import kotlin.sequences.forEach
-import kotlin.text.Regex

 object Nip19Parser {
    private val nip19PlusNip46regex: Regex =
@@ -23,7 +23,6 @@ package com.vitorpamplona.quartz.nip59Giftwrap
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import kotlinx.serialization.Transient

@Immutable
 open class WrappedEvent(
@@ -22,7 +22,6 @@ package com.vitorpamplona.quartz.nip89AppHandlers.definition

 import androidx.compose.runtime.Stable
 import com.vitorpamplona.quartz.nip01Core.core.JsonMapper
-import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppMetadata
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes
 import kotlinx.serialization.SerialName
@@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.utils.Log
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.pointerSizeInBytes
-import kotlinx.serialization.Transient

@Immutable
 class NIP90ContentDiscoveryResponseEvent(
@@ -21,7 +21,6 @@
 package com.vitorpamplona.quartz

 import com.vitorpamplona.quartz.utils.RandomInstance
-import kotlin.collections.all
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -24,10 +24,6 @@ import com.vitorpamplona.quartz.TestResourceLoader
 import com.vitorpamplona.quartz.nip01Core.core.Address
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
-import com.vitorpamplona.quartz.nip01Core.hints.HintIndexerTest.Companion.addresses
-import com.vitorpamplona.quartz.nip01Core.hints.HintIndexerTest.Companion.eventIds
-import com.vitorpamplona.quartz.nip01Core.hints.HintIndexerTest.Companion.indexer
-import com.vitorpamplona.quartz.nip01Core.hints.HintIndexerTest.Companion.keys
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.isLocalHost
 import com.vitorpamplona.quartz.utils.RandomInstance
@@ -59,7 +59,6 @@ import com.vitorpamplona.quartz.nip59Giftwrap.rumors.Rumor
 import com.vitorpamplona.quartz.nip59Giftwrap.rumors.jackson.RumorDeserializer
 import com.vitorpamplona.quartz.nip59Giftwrap.rumors.jackson.RumorSerializer
 import java.io.InputStream
-import kotlin.jvm.java

 class JacksonMapper {
    companion object {
@@ -23,7 +23,6 @@ package com.vitorpamplona.quartz.nip01Core.relay.commands.toClient
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
-import kotlin.jvm.java

 class CountResultSerializer : StdSerializer<CountResult>(CountResult::class.java) {
    override fun serialize(
@@ -27,7 +27,6 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerMessage
 import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerRequest
 import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerResponse
-import kotlin.jvm.java

 class BunkerMessageDeserializer : StdDeserializer<BunkerMessage>(BunkerMessage::class.java) {
    override fun deserialize(
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerRequest
-import kotlin.collections.forEach

 class BunkerRequestSerializer : StdSerializer<BunkerRequest>(BunkerRequest::class.java) {
    override fun serialize(
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.quartz.utils.sha256
+
+import java.io.FilterInputStream
+import java.io.InputStream
+
+class CountingInputStream(
+    inputStream: InputStream,
+) : FilterInputStream(inputStream) {
+    var bytesRead: Long = 0
+        private set
+
+    override fun read(): Int {
+        val byte = super.read()
+        if (byte != -1) bytesRead++
+        return byte
+    }
+
+    override fun read(
+        b: ByteArray,
+        off: Int,
+        len: Int,
+    ): Int {
+        val count = super.read(b, off, len)
+        if (count > 0) bytesRead += count
+        return count
+    }
+
+    override fun skip(n: Long): Long {
+        val skipped = super.skip(n)
+        bytesRead += skipped
+        return skipped
+    }
+}
@@ -20,6 +20,26 @@
 */
 package com.vitorpamplona.quartz.utils.sha256

+import java.io.InputStream
+
 val pool = Sha256Pool(5) // max parallel operations

 actual fun sha256(data: ByteArray) = pool.hash(data)
+
+/**
+ * Calculate SHA256 hash while counting bytes read from the stream.
+ * Returns both the hash and the number of bytes processed.
+ * This is more efficient than reading the stream twice.
+ *
+ * @param inputStream The input stream to hash
+ * @param bufferSize Size of chunks to read (default 8KB)
+ * @return Pair of (hash bytes, bytes read count)
+ */
+fun sha256StreamWithCount(
+    inputStream: InputStream,
+    bufferSize: Int = 8192,
+): Pair<ByteArray, Long> {
+    val countingStream = CountingInputStream(inputStream)
+    val hash = pool.hashStream(countingStream, bufferSize)
+    return Pair(hash, countingStream.bytesRead)
+}
@@ -20,6 +20,7 @@
 */
 package com.vitorpamplona.quartz.utils.sha256

+import java.io.InputStream
 import java.security.MessageDigest

 class Sha256Hasher {
@@ -30,4 +31,31 @@ class Sha256Hasher {
    fun digest(byteArray: ByteArray) = digest.digest(byteArray)

    fun reset() = digest.reset()
+
+    /**
+     * Calculate SHA256 hash by streaming the input in chunks.
+     * This avoids loading the entire input into memory at once.
+     *
+     * @param inputStream The input stream to hash
+     * @param bufferSize Size of chunks to read (default 8KB)
+     * @return SHA256 hash bytes
+     */
+    fun hashStream(
+        inputStream: InputStream,
+        bufferSize: Int = 8192,
+    ): ByteArray {
+        val buffer = ByteArray(bufferSize)
+        try {
+            var bytesRead: Int
+
+            while (inputStream.read(buffer).also { bytesRead = it } != -1) {
+                digest.update(buffer, 0, bytesRead)
+            }
+
+            return digest.digest()
+        } finally {
+            // Always reset digest to prevent contaminating the pool on exceptions
+            digest.reset()
+        }
+    }
 }
@@ -21,6 +21,7 @@
 package com.vitorpamplona.quartz.utils.sha256

 import com.vitorpamplona.quartz.utils.Log
+import java.io.InputStream
 import java.util.concurrent.ArrayBlockingQueue

 class Sha256Pool(
@@ -54,4 +55,24 @@ class Sha256Pool(
            release(hasher)
        }
    }
+
+    /**
+     * Calculate SHA256 hash by streaming the input in chunks.
+     * This avoids loading the entire input into memory at once.
+     *
+     * @param inputStream The input stream to hash
+     * @param bufferSize Size of chunks to read (default 8KB)
+     * @return SHA256 hash bytes
+     */
+    fun hashStream(
+        inputStream: InputStream,
+        bufferSize: Int = 8192,
+    ): ByteArray {
+        val hasher = acquire()
+        try {
+            return hasher.hashStream(inputStream, bufferSize)
+        } finally {
+            release(hasher)
+        }
+    }
 }