progress towards multi-server handling

- bump some versions
- validate Factorio server ID & token
-

modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/schema/common/factorioIds.kt

@@ -76,9 +76,39 @@ data class EntityIdentifiersData(
 ) : EntityIdentifiers
 
 
+/** Friendly identifier, used in URLs. Should be human-readable. */
 @Serializable
 @SerialName("kafkatorio.id.FactorioServerId")
 @JvmInline
-value class FactorioServerId(private val id: String) {
-  override fun toString() = id
+value class FactorioServerId(val id: String) : CharSequence by id {
+
+  init {
+    require(id.isNotBlank()) { "require FactorioServerId is not blank: '$id'" }
+    require(id.matches(validIdRegex)) { "require FactorioServerId matches $validIdRegex: '$id'" }
+  }
+
+  override fun toString(): String = id
+
+  companion object {
+    val validIdRegex = Regex("""^[a-zA-Z0-9\-_]+""" + "\$")
+  }
+}
+
+
+/** Short identifier, used in tokens. Might not be human-readable. */
+@Serializable
+@SerialName("kafkatorio.id.FactorioServerToken")
+@JvmInline
+value class FactorioServerToken(private val id: String) : CharSequence by id {
+
+  init {
+    require(id.isNotBlank()) { "require FactorioServerToken is not blank: '$id'" }
+    require(id.matches(FactorioServerId.validIdRegex)) { "require FactorioServerToken matches ${validIdRegex}: '$id'" }
+  }
+
+  override fun toString(): String = id
+
+  companion object {
+    val validIdRegex = Regex("^[a-zA-Z0-9]+\$")
+  }
 }

modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/schema/common/mapTile.kt

@@ -110,7 +110,7 @@ value class ServerMapTilePngFilename(val value: String) {
     chunkX: Int,
     chunkY: Int,
   ) : this(
-    "servers/${serverId}" +
+    "servers/${serverId.id}" +
         "/map" +
         "/layers/${layer.dir}" +
         "/s${surfaceIndex}" +

modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/schema/common/secrets.kt

@@ -0,0 +1,13 @@
+package dev.adamko.kafkatorio.schema.common
+
+import kotlin.jvm.JvmInline
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+@SerialName("kafkatorio.common.MaskedValue")
+@JvmInline
+value class MaskedValue(val value: String) {
+  override fun toString(): String = "Secret(***)"
+}

modules/events-library/src/commonMain/kotlin/dev/adamko/kafkatorio/schema/packets/kafkatorioPacket.kt

@@ -24,4 +24,16 @@ sealed class KafkatorioPacketData
 data class KafkatorioPacketDataError(
   val message: String? = null,
   val rawValue: String? = null,
-) : KafkatorioPacketData()
+) : KafkatorioPacketData() {
+  constructor(
+    exception: Exception,
+    rawValue: String? = null
+  ) : this(
+    message = """
+      ${exception::class.qualifiedName} ${exception.message}
+      
+      ${exception.stackTraceToString()}
+    """.trimIndent(),
+    rawValue = rawValue,
+  )
+}