5 Commits
Author SHA1 Message Date
sergeych 1087a2c1c7 merge v0.2.2: kotlin 2.2.20 for all targets 2025-10-20 21:02:04 +02:00
sergeych ec91c0800d v0.1.8: kotlin 2.2.20 for all targets 2025-10-20 21:01:36 +02:00
sergeych 5357b05f4a fixed publishing for newer kotlin 2025-09-25 18:08:48 +04:00
sergeych e7f44bb5a0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build.gradle.kts
2025-09-25 10:32:20 +04:00
sergeych 01d9e0239e added more tools, start shifting to kotlin 2.2.0 2025-09-25 10:29:47 +04:00
9 changed files with 616 additions and 1236 deletions

No files matched your search

+1
View File
@@ -6,3 +6,4 @@
/node_modules /node_modules
.kotlin .kotlin
/.gigaide/gigaide.properties /.gigaide/gigaide.properties
/java_pid40366.hprof
+30 -31
View File
@@ -1,14 +1,16 @@
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
plugins { plugins {
kotlin("multiplatform") version "2.0.21" kotlin("multiplatform") version "2.2.20"
kotlin("plugin.serialization") version "2.0.21" kotlin("plugin.serialization") version "2.2.20"
id("org.jetbrains.dokka") version "1.9.20" id("org.jetbrains.dokka") version "1.9.20"
`maven-publish` `maven-publish`
} }
val serialization_version = "1.9.0"
group = "net.sergeych" group = "net.sergeych"
version = "0.1.12" version = "0.2.2"
repositories { repositories {
mavenCentral() mavenCentral()
@@ -20,8 +22,8 @@ kotlin {
jvmToolchain(8) jvmToolchain(8)
jvm() jvm()
js { js {
browser() browser()
nodejs() nodejs()
} }
macosArm64() macosArm64()
@@ -56,8 +58,9 @@ kotlin {
dependencies { dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
// this is actually a bug: we need only the core, but bare core causes strange errors // this is actually a bug: we need only the core, but bare core causes strange errors
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
api("net.sergeych:mp_stools:[1.5.2,)") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
api("net.sergeych:mp_stools:[1.6.1,)")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
} }
} }
@@ -84,41 +87,37 @@ kotlin {
val jvmTest by getting val jvmTest by getting
val jsMain by getting { val jsMain by getting {
dependencies { dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-browser:0.5.0")
} }
} }
val jsTest by getting val jsTest by getting
// val nativeTest by getting // val nativeTest by getting
val wasmJsMain by getting { val wasmJsMain by getting {
dependencies { dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-browser:0.5.0")
} }
} }
val wasmJsTest by getting { val wasmJsTest by getting
dependencies {
// implementation("org.jetbrains.kotlinx:kotlinx-browser:0.3")
}
}
} }
publishing {
val mavenToken by lazy {
File("${System.getProperty("user.home")}/.gitea_token").readText()
}
repositories {
maven {
credentials(HttpHeaderCredentials::class) {
name = "Authorization"
value = mavenToken
}
url = uri("https://gitea.sergeych.net/api/packages/SergeychWorks/maven")
authentication {
create("Authorization", HttpHeaderAuthentication::class)
}
}
}
}
} }
publishing {
val mavenToken by lazy {
File("${System.getProperty("user.home")}/.gitea_token").readText()
}
repositories {
maven {
credentials(HttpHeaderCredentials::class) {
name = "Authorization"
value = mavenToken
}
url = uri("https://gitea.sergeych.net/api/packages/SergeychWorks/maven")
authentication {
create("Authorization", HttpHeaderAuthentication::class)
}
}
}
}
tasks.dokkaHtml.configure { tasks.dokkaHtml.configure {
outputDirectory.set(buildDir.resolve("dokka")) outputDirectory.set(buildDir.resolve("dokka"))
dokkaSourceSets { dokkaSourceSets {
+1 -1
View File
@@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.js.compiler=ir
kotlin.mpp.applyDefaultHierarchyTemplate=false kotlin.mpp.applyDefaultHierarchyTemplate=false
kotlin.daemon.jvmargs=-Xmx3072M
+457 -1201
View File
File diff suppressed because it is too large. Load diff
@@ -1,7 +1,7 @@
package net.sergeych.bintools package net.sergeych.bintools
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import net.sergeych.mp_tools.encodeToBase64Compact import net.sergeych.mp_tools.encodeToBase64Url
import kotlin.math.min import kotlin.math.min
import kotlin.random.Random import kotlin.random.Random
@@ -53,7 +53,7 @@ class ByteChunk(val data: UByteArray): Comparable<ByteChunk> {
/** /**
* hex representation of data * hex representation of data
*/ */
override fun toString(): String = hex override fun toString(): String = base64
/** /**
* Hex encoded data * Hex encoded data
@@ -68,7 +68,7 @@ class ByteChunk(val data: UByteArray): Comparable<ByteChunk> {
/** /**
* Lazy encode to base64 with url alphabet, without trailing fill '=' characters. * Lazy encode to base64 with url alphabet, without trailing fill '=' characters.
*/ */
val base64 by lazy { data.asByteArray().encodeToBase64Compact() } val base64 by lazy { data.asByteArray().encodeToBase64Url() }
/** /**
* Lazy (cached) view of [data] as ByteArray * Lazy (cached) view of [data] as ByteArray
@@ -0,0 +1,24 @@
package net.sergecyh.diwan.tools
import kotlinx.datetime.Clock
import kotlinx.datetime.Instant
import kotlin.time.Duration
/**
* Value with expiration.
*/
@Suppress("unused")
class Expiring<T>(
val value: T,
val expiresAt: Instant,
) {
constructor(value: T, expiresIn: Duration) : this(value, Clock.System.now() + expiresIn)
/**
* @return value if not expired, null otherwise
*/
fun valueOrNull(): T? = if( isExpired ) value else null
val isExpired: Boolean get() = expiresAt < Clock.System.now()
val isOk: Boolean get() = !isExpired
}
@@ -0,0 +1,29 @@
@file:Suppress("unused")
package net.sergecyh.diwan.tools
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
/**
* Experimental
*
* set of mutexes associated with keys `K`, so each key can have its own mutex
* used with [lock] or [withLock]
*/
class IndividualLock<K> {
private val access = Mutex()
private val locks = mutableMapOf<K, Mutex>()
suspend inline fun <T>withLock(key: K, block: ()->T): T = lock(key).use { block() }
suspend fun lock(key: K): AutoCloseable {
val m = access.withLock {
locks.getOrPut(key) { Mutex() }
}
m.lock()
return AutoCloseable { m.unlock() }
}
}
@@ -0,0 +1,44 @@
package net.sergecyh.diwan.tools
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
/**
* Coroutine-based unique "once-per-key" executor.
*
* When [invoke] is called, it checks that there is already invocation in progress
* and either wait for it to complete or start a new one.
* @param K key value, should have valid `hashCode` and `equals`, e.g., suitable to be a map key
*/
@Suppress("unused")
class OncePer<K> {
private val access = Mutex()
private val queue = mutableMapOf<K,CompletableDeferred<Any>>()
/**
* Execute [f] as unique-per-key [key]. If such invocation is in progress, it suspends than returns
* its result. If there is no invocation for such a key, start new invocation.
*
* __Important note__ all simultaneous invocation should have the same [R] type, or, at least, a type
* _castable to [R]_.
*/
suspend operator fun <R: Any>invoke(key: K, f: suspend ()->R ): R {
var mustStart = false
val d = access.withLock {
queue.getOrPut(key) {
CompletableDeferred<Any>().also { mustStart = true }
}
}
if( mustStart ) {
d.complete(f())
access.withLock {
queue.remove(key)
}
}
@Suppress("UNCHECKED_CAST")
return d.await() as R
}
}
@@ -0,0 +1,27 @@
package net.sergecyh.diwan.tools
import kotlinx.datetime.Clock
import kotlinx.datetime.Instant
import kotlin.time.Duration
/**
* Experimental.
*
* limit invocations rate of [invoke] to once per [minimalInterval] or less frequent.
* Note that it is not a debouncing, it just ignores too frequent calls!
*/
@Suppress("unused")
class RateLimiter(val minimalInterval: Duration) {
var lastExecutedAt = Instant.DISTANT_PAST
private set
/**
* invoke [f] if the last invocation was earlier than now minus [minimalInterval], otherwise
* do nothing.
* @return the value returned by [f] if it was actually invoked this time, null otherwise
*/
suspend operator fun <T> invoke(f: suspend () -> T): T? =
if (Clock.System.now() - lastExecutedAt > minimalInterval) {
f().also { lastExecutedAt = Clock.System.now() }
} else null
}