Created util-shared module + misc updates

api-vpn/build.gradle.kts

@@ -1,15 +1,44 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
+    kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("com.android.library")
     id("org.jetbrains.compose")
     id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.dokka")
-    id("mooncloak.multiplatform")
 }
 
 kotlin {
+    applyDefaultHierarchyTemplate()
+
+    // TODO: Re-enable: linuxArm64()
+    // TODO: Re-enable: linuxX64()
+
+    // TODO: Re-enable: mingwX64()
+
+    // TODO: Re-enable: macosX64()
+    // TODO: Re-enable: macosArm64()
+
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+
+    // TODO: Re-enable: tvosArm64()
+    // TODO: Re-enable: tvosX64()
+    // TODO: Re-enable: tvosSimulatorArm64()
+
+    // TODO: Re-enable: watchosArm32()
+    // TODO: Re-enable: watchosArm64()
+    // TODO: Re-enable: watchosX64()
+    // TODO: Re-enable: watchosSimulatorArm64()
+
+    androidTarget {
+        publishAllLibraryVariants()
+    }
+
+    jvm()
+
     sourceSets {
         all {
             // Disable warnings and errors related to these expected @OptIn annotations.
@@ -24,6 +53,7 @@ kotlin {
 
         val commonMain by getting {
             dependencies {
+                api(project(":util-shared"))
                 api(project(":data-shared"))
 
                 // Coroutines
@@ -73,6 +103,11 @@ kotlin {
                 implementation(RussHWolf.multiplatformSettings.coroutines)
                 implementation(RussHWolf.multiplatformSettings.serialization)
                 implementation(RussHWolf.multiplatformSettings.noArg)
+
+                // Rich Text Utils
+                // https://github.com/mooncloak/textx
+                // Apache 2.0: https://github.com/mooncloak/textx/blob/main/LICENSE
+                api("com.mooncloak.kodetools.textx:textx-core:_")
             }
         }
 
@@ -82,16 +117,6 @@ kotlin {
                 implementation(KotlinX.coroutines.test)
             }
         }
-
-        val jsMain by getting {
-            dependencies {
-            }
-        }
-
-        val wasmJsMain by getting {
-            dependencies {
-            }
-        }
     }
 }
 

app-shared/src/androidMain/kotlin/com.mooncloak.vpn.app.shared/api/network/AndroidDeviceIpAddressProvider.kt → api-vpn/src/androidMain/kotlin/com/mooncloak/vpn/api/shared/network/AndroidDeviceIpAddressProvider.kt

@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.api.network
+package com.mooncloak.vpn.api.shared.network
 
 import android.annotation.SuppressLint
 import android.content.Context

app-shared/src/androidMain/kotlin/com.mooncloak.vpn.app.shared/api/network/AndroidLocalNetworkManager.kt → api-vpn/src/androidMain/kotlin/com/mooncloak/vpn/api/shared/network/AndroidLocalNetworkManager.kt

@@ -1,16 +1,16 @@
-package com.mooncloak.vpn.app.shared.api.network
+package com.mooncloak.vpn.api.shared.network
 
 import android.content.Context
 import android.net.ConnectivityManager
-import android.net.InetAddresses
 import android.net.NetworkCapabilities
 import android.net.wifi.WifiManager
-import androidx.core.content.getSystemService
-import com.mooncloak.kodetools.konstruct.annotations.Inject
 import com.mooncloak.vpn.app.shared.util.ApplicationContext
 import java.net.InetAddress
 
-public class AndroidLocalNetworkManager @Inject public constructor(
+public operator fun LocalNetworkManager.Companion.invoke(context: Context): LocalNetworkManager =
+    AndroidLocalNetworkManager(context = context)
+
+internal class AndroidLocalNetworkManager internal constructor(
     private val context: ApplicationContext
 ) : LocalNetworkManager {
 

app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/MooncloakVpnServiceHttpApi.kt → api-vpn/src/commonMain/kotlin/com/mooncloak/vpn/api/shared/MooncloakVpnServiceHttpApi.kt

@@ -1,10 +1,9 @@
-package com.mooncloak.vpn.app.shared.api
+package com.mooncloak.vpn.api.shared
 
 import com.mooncloak.kodetools.apix.core.ApiException
 import com.mooncloak.kodetools.apix.core.ExperimentalApixApi
 import com.mooncloak.kodetools.apix.core.HttpResponseBody
 import com.mooncloak.kodetools.apix.core.getOrThrow
-import com.mooncloak.kodetools.konstruct.annotations.Inject
 import com.mooncloak.kodetools.locale.Country
 import com.mooncloak.kodetools.locale.CountryCode
 import com.mooncloak.kodetools.pagex.Cursor
@@ -16,20 +15,20 @@ import com.mooncloak.kodetools.pagex.ResolvedPage
 import com.mooncloak.kodetools.pagex.SortOptions
 import com.mooncloak.vpn.api.shared.app.Contributor
 import com.mooncloak.vpn.api.shared.app.CurrentContributors
-import com.mooncloak.vpn.app.shared.api.billing.BitcoinPlanInvoice
-import com.mooncloak.vpn.app.shared.api.billing.GetPaymentInvoiceRequestBody
-import com.mooncloak.vpn.app.shared.api.billing.GetPaymentStatusRequestBody
-import com.mooncloak.vpn.app.shared.api.billing.PlanPaymentStatus
-import com.mooncloak.vpn.app.shared.api.billing.ProofOfPurchase
-import com.mooncloak.vpn.app.shared.api.key.Base64Key
+import com.mooncloak.vpn.api.shared.billing.BitcoinPlanInvoice
+import com.mooncloak.vpn.api.shared.billing.GetPaymentInvoiceRequestBody
+import com.mooncloak.vpn.api.shared.billing.GetPaymentStatusRequestBody
+import com.mooncloak.vpn.api.shared.billing.PlanPaymentStatus
+import com.mooncloak.vpn.api.shared.billing.ProofOfPurchase
+import com.mooncloak.vpn.api.shared.key.Base64Key
 import com.mooncloak.vpn.api.shared.location.CountryFilters
-import com.mooncloak.vpn.app.shared.api.plan.AvailablePlans
-import com.mooncloak.vpn.app.shared.api.plan.Plan
+import com.mooncloak.vpn.api.shared.plan.AvailablePlans
+import com.mooncloak.vpn.api.shared.plan.Plan
 import com.mooncloak.vpn.api.shared.reflection.HttpReflection
-import com.mooncloak.vpn.app.shared.api.server.ClientRegistrationRequestBody
-import com.mooncloak.vpn.app.shared.api.server.RegisteredClient
-import com.mooncloak.vpn.app.shared.api.server.Server
-import com.mooncloak.vpn.app.shared.api.server.ServerFilters
+import com.mooncloak.vpn.api.shared.server.ClientRegistrationRequestBody
+import com.mooncloak.vpn.api.shared.server.RegisteredClient
+import com.mooncloak.vpn.api.shared.server.Server
+import com.mooncloak.vpn.api.shared.server.ServerFilters
 import com.mooncloak.vpn.api.shared.service.ServiceSubscription
 import com.mooncloak.vpn.api.shared.service.ServiceSubscriptionUsage
 import com.mooncloak.vpn.api.shared.service.ServiceTokens
@@ -38,6 +37,7 @@ import com.mooncloak.vpn.api.shared.token.RevokedTokenResponseBody
 import com.mooncloak.vpn.api.shared.token.Token
 import com.mooncloak.vpn.api.shared.token.TokenTypeHint
 import com.mooncloak.vpn.api.shared.token.TransactionToken
+import com.mooncloak.vpn.util.shared.coroutine.PlatformIO
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.accept
@@ -52,26 +52,26 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalApixApi::class)
-public class MooncloakVpnServiceHttpApi @Inject public constructor(
+public class MooncloakVpnServiceHttpApi public constructor(
     private val httpClient: HttpClient
 ) {
 
     @Throws(ApiException::class, CancellationException::class)
-    public suspend fun getReflection(): HttpReflection = withContext(Dispatchers.IO) {
+    public suspend fun getReflection(): HttpReflection = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.get("https://mooncloak.com/api/mirror")
 
         return@withContext response.body<HttpResponseBody<HttpReflection>>().getOrThrow()
     }
 
     @Throws(ApiException::class, CancellationException::class)
-    public suspend fun getAvailablePlans(): AvailablePlans = withContext(Dispatchers.IO) {
+    public suspend fun getAvailablePlans(): AvailablePlans = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.get("https://mooncloak.com/api/billing/plans")
 
         return@withContext response.body<HttpResponseBody<AvailablePlans>>().getOrThrow()
     }
 
     @Throws(ApiException::class, CancellationException::class)
-    public suspend fun getPlan(id: String): Plan = withContext(Dispatchers.IO) {
+    public suspend fun getPlan(id: String): Plan = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.get("https://mooncloak.com/api/billing/plan/$id")
 
         return@withContext response.body<HttpResponseBody<Plan>>().getOrThrow()
@@ -82,7 +82,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
         planId: String,
         secret: String? = null,
         token: Token? = null
-    ): BitcoinPlanInvoice = withContext(Dispatchers.IO) {
+    ): BitcoinPlanInvoice = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/payment/invoice") {
             token?.value?.let { bearerAuth(it) }
 
@@ -105,7 +105,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
         paymentId: String,
         token: TransactionToken,
         secret: String? = null
-    ): PlanPaymentStatus = withContext(Dispatchers.IO) {
+    ): PlanPaymentStatus = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/payment/status") {
             bearerAuth(token.value)
 
@@ -132,7 +132,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     @Throws(ApiException::class, CancellationException::class)
     public suspend fun exchangeToken(
         receipt: ProofOfPurchase
-    ): ServiceTokens = withContext(Dispatchers.IO) {
+    ): ServiceTokens = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/token/exchange") {
             contentType(ContentType.Application.Json)
             accept(ContentType.Application.Json)
@@ -146,7 +146,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     @Throws(ApiException::class, CancellationException::class)
     public suspend fun refreshToken(
         refreshToken: Token
-    ): ServiceTokens = withContext(Dispatchers.IO) {
+    ): ServiceTokens = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/token/refresh") {
             bearerAuth(refreshToken.value)
         }
@@ -157,7 +157,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     @Throws(ApiException::class, CancellationException::class)
     public suspend fun revokeToken(
         refreshToken: Token
-    ): Boolean = withContext(Dispatchers.IO) {
+    ): Boolean = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/token/revoke") {
             bearerAuth(refreshToken.value)
 
@@ -178,7 +178,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     @Throws(ApiException::class, CancellationException::class)
     public suspend fun getCurrentSubscription(
         token: Token
-    ): ServiceSubscription = withContext(Dispatchers.IO) {
+    ): ServiceSubscription = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/subscription") {
             bearerAuth(token.value)
         }
@@ -189,7 +189,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     @Throws(ApiException::class, CancellationException::class)
     public suspend fun getCurrentSubscriptionUsage(
         token: Token
-    ): ServiceSubscriptionUsage = withContext(Dispatchers.IO) {
+    ): ServiceSubscriptionUsage = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/subscription/usage") {
             bearerAuth(token.value)
         }
@@ -200,7 +200,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     @Throws(ApiException::class, CancellationException::class)
     public suspend fun getCountry(
         code: CountryCode
-    ): Country = withContext(Dispatchers.IO) {
+    ): Country = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.get("https://mooncloak.com/api/vpn/service/country/${code.value}")
 
         return@withContext response.body<HttpResponseBody<Country>>().getOrThrow()
@@ -214,7 +214,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
         count: UInt = DEFAULT_COUNT,
         sort: SortOptions? = null,
         filters: CountryFilters? = null
-    ): ResolvedPage<Country> = withContext(Dispatchers.IO) {
+    ): ResolvedPage<Country> = withContext(Dispatchers.PlatformIO) {
         val pageRequest = PageRequest<String, CountryFilters>(
             data = null,
             direction = direction,
@@ -238,7 +238,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
         serverId: String,
         clientPublicKey: Base64Key,
         token: Token?
-    ): RegisteredClient = withContext(Dispatchers.IO) {
+    ): RegisteredClient = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.post("https://mooncloak.com/api/vpn/service/client/register") {
             token?.value?.let { bearerAuth(it) }
 
@@ -259,7 +259,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     public suspend fun getServer(
         id: String,
         token: Token? = null
-    ): Server = withContext(Dispatchers.IO) {
+    ): Server = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.get("https://mooncloak.com/api/vpn/service/server/$id") {
             token?.value?.let { bearerAuth(it) }
         }
@@ -276,7 +276,7 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
         count: UInt = DEFAULT_COUNT,
         sort: SortOptions? = null,
         filters: ServerFilters? = null
-    ): ResolvedPage<Server> = withContext(Dispatchers.IO) {
+    ): ResolvedPage<Server> = withContext(Dispatchers.PlatformIO) {
         val pageRequest = PageRequest<String, ServerFilters>(
             data = null,
             direction = direction,
@@ -299,14 +299,14 @@ public class MooncloakVpnServiceHttpApi @Inject public constructor(
     }
 
     @Throws(ApiException::class, CancellationException::class)
-    public suspend fun getContributors(): CurrentContributors = withContext(Dispatchers.IO) {
+    public suspend fun getContributors(): CurrentContributors = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.get("https://mooncloak.com/api/vpn/app/contributor")
 
         return@withContext response.body<HttpResponseBody<CurrentContributors>>().getOrThrow()
     }
 
     @Throws(ApiException::class, CancellationException::class)
-    public suspend fun getContributor(id: String): Contributor = withContext(Dispatchers.IO) {
+    public suspend fun getContributor(id: String): Contributor = withContext(Dispatchers.PlatformIO) {
         val response = httpClient.get("https://mooncloak.com/api/vpn/app/contributor/$id")
 
         return@withContext response.body<HttpResponseBody<Contributor>>().getOrThrow()

app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/billing/BillingManager.kt → api-vpn/src/commonMain/kotlin/com/mooncloak/vpn/api/shared/billing/BillingManager.kt

@@ -1,6 +1,6 @@
-package com.mooncloak.vpn.app.shared.api.billing
+package com.mooncloak.vpn.api.shared.billing
 
-import com.mooncloak.vpn.app.shared.api.plan.Plan
+import com.mooncloak.vpn.api.shared.plan.Plan
 
 public interface BillingManager : AutoCloseable {
 

app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/billing/BillingResult.kt → api-vpn/src/commonMain/kotlin/com/mooncloak/vpn/api/shared/billing/BillingResult.kt

@@ -1,6 +1,6 @@
-package com.mooncloak.vpn.app.shared.api.billing
+package com.mooncloak.vpn.api.shared.billing
 
-import com.mooncloak.vpn.app.shared.api.plan.Plan
+import com.mooncloak.vpn.api.shared.plan.Plan
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 

app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/billing/GetPaymentInvoiceRequestBody.kt → api-vpn/src/commonMain/kotlin/com/mooncloak/vpn/api/shared/billing/GetPaymentInvoiceRequestBody.kt

@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.api.billing
+package com.mooncloak.vpn.api.shared.billing
 
 import androidx.compose.runtime.Immutable
 import kotlinx.serialization.SerialName
@@ -15,7 +15,7 @@ import kotlinx.serialization.Serializable
  */
 @Immutable
 @Serializable
-internal data class GetPaymentInvoiceRequestBody internal constructor(
+public data class GetPaymentInvoiceRequestBody public constructor(
     @SerialName(value = "plan_id") val planId: String,
     @SerialName(value = "secret") val secret: String? = null
 )

app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/billing/GetPaymentStatusRequestBody.kt → api-vpn/src/commonMain/kotlin/com/mooncloak/vpn/api/shared/billing/GetPaymentStatusRequestBody.kt

@@ -1,12 +1,12 @@
-package com.mooncloak.vpn.app.shared.api.billing
+package com.mooncloak.vpn.api.shared.billing
 
 import androidx.compose.runtime.Immutable
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Immutable
 @Serializable
-internal data class GetPaymentStatusRequestBody internal constructor(
+public data class GetPaymentStatusRequestBody public constructor(
     @SerialName(value = "payment_id") val paymentId: String,
     @SerialName(value = "secret") val secret: String? = null
 )

app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/billing/PlanInvoice.kt → api-vpn/src/commonMain/kotlin/com/mooncloak/vpn/api/shared/billing/PlanInvoice.kt

@@ -1,7 +1,7 @@
-package com.mooncloak.vpn.app.shared.api.billing
+package com.mooncloak.vpn.api.shared.billing
 
 import androidx.compose.runtime.Immutable
-import com.mooncloak.vpn.app.shared.api.plan.Price
+import com.mooncloak.vpn.api.shared.plan.Price
 import com.mooncloak.vpn.api.shared.token.TransactionToken
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName

app-shared/src/commonMain/kotlin/com/mooncloak/vpn/app/shared/api/billing/PlanPaymentStatus.kt → api-vpn/src/commonMain/kotlin/com/mooncloak/vpn/api/shared/billing/PlanPaymentStatus.kt

@@ -1,4 +1,4 @@
-package com.mooncloak.vpn.app.shared.api.billing
+package com.mooncloak.vpn.api.shared.billing
 
 import androidx.compose.runtime.Immutable
 import com.mooncloak.kodetools.apix.core.ExperimentalApixApi