Fix URL resolver to consdier path in baseURL. closes #263

Author: AchoArnold

android/app/src/main/AndroidManifest.xml

@@ -78,10 +78,10 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="@string/notification_channel_default" />
-        <meta-data android:name="io.sentry.dsn" android:value="https://b0b98a8c44844eb9bed3f58ccbb3ac5c@o291224.ingest.sentry.io/6539757" />
+        <meta-data android:name="io.sentry.dsn" android:value="https://3413741bb211a873f5f93a00b8974a03@o291224.ingest.sentry.io/6539757" />
         <!-- Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
            We recommend adjusting this value in production. -->
-        <meta-data android:name="io.sentry.traces.sample-rate" android:value="1.0" />
+        <meta-data android:name="io.sentry.traces.sample-rate" android:value="0.5" />
         <!-- Enable user interaction tracing to capture transactions for various UI events (such as clicks or scrolls). -->
         <meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="true" />
 

android/app/src/main/java/com/httpsms/FirebaseMessagingService.kt

@@ -69,9 +69,14 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
 
     private fun scheduleJob(messageID: String) {
         // [START dispatch_job]
+        val constraints = Constraints.Builder()
+            .setRequiredNetworkType(NetworkType.CONNECTED)
+            .build()
+
         val inputData: Data = workDataOf(Constants.KEY_MESSAGE_ID to messageID)
         val work = OneTimeWorkRequest
             .Builder(SendSmsWorker::class.java)
+            .setConstraints(constraints)
             .setInputData(inputData)
             .addTag(messageID)
             .build()

android/app/src/main/java/com/httpsms/HttpSmsApiService.kt

@@ -8,6 +8,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import org.apache.commons.text.StringEscapeUtils
 import timber.log.Timber
 import java.net.URI
+import java.net.URL
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.util.logging.Level
@@ -35,7 +36,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
 
     fun getOutstandingMessage(messageID: String): Message? {
         val request: Request = Request.Builder()
-            .url(baseURL.resolve("/v1/messages/outstanding?message_id=${messageID}").toURL())
+            .url(resolveURL("/v1/messages/outstanding?message_id=${messageID}"))
             .header(apiKeyHeader, apiKey)
             .header(clientVersionHeader, BuildConfig.VERSION_NAME)
             .build()
@@ -85,7 +86,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
         """.trimIndent()
 
         val request: Request = Request.Builder()
-            .url(baseURL.resolve("/v1/messages/receive").toURL())
+            .url(resolveURL("/v1/messages/receive"))
             .post(body.toRequestBody(jsonMediaType))
             .header(apiKeyHeader, apiKey)
             .header(clientVersionHeader, BuildConfig.VERSION_NAME)
@@ -111,7 +112,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
         """.trimIndent()
 
         val request: Request = Request.Builder()
-            .url(baseURL.resolve("/v1/heartbeats").toURL())
+            .url(resolveURL("/v1/heartbeats"))
             .post(body.toRequestBody(jsonMediaType))
             .header(apiKeyHeader, apiKey)
             .header(clientVersionHeader, BuildConfig.VERSION_NAME)
@@ -147,7 +148,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
         """.trimIndent()
 
         val request: Request = Request.Builder()
-            .url(baseURL.resolve("/v1/messages/${messageId}/events").toURL())
+            .url(resolveURL("/v1/messages/${messageId}/events"))
             .post(body.toRequestBody(jsonMediaType))
             .header(apiKeyHeader, apiKey)
             .header(clientVersionHeader, BuildConfig.VERSION_NAME)
@@ -175,7 +176,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
         """.trimIndent()
 
         val request: Request = Request.Builder()
-            .url(baseURL.resolve("/v1/phones").toURL())
+            .url(resolveURL("/v1/phones"))
             .put(body.toRequestBody(jsonMediaType))
             .header(apiKeyHeader, apiKey)
             .header(clientVersionHeader, BuildConfig.VERSION_NAME)
@@ -197,7 +198,7 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
 
     fun validateApiKey(): Pair<String?, String?> {
         val request: Request = Request.Builder()
-            .url(baseURL.resolve("/v1/users/me").toURL())
+            .url(resolveURL("/v1/users/me"))
             .header(apiKeyHeader, apiKey)
             .header(clientVersionHeader, BuildConfig.VERSION_NAME)
             .get()
@@ -218,4 +219,8 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {
             return Pair(null, ex.message)
         }
     }
+
+    private fun resolveURL(path: String): URL {
+        return baseURL.resolve(baseURL.path + path).toURL()
+    }
 }

android/app/src/main/java/com/httpsms/LogzTree.kt

@@ -12,12 +12,10 @@ import timber.log.Timber
 import java.time.ZoneOffset
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
-import java.util.concurrent.ConcurrentLinkedQueue
+import io.sentry.Sentry
 
 class LogzTree(val context: Context): Timber.DebugTree() {
     private val client = OkHttpClient()
-    private val jsonMediaType = "application/json; charset=utf-8".toMediaType()
-    private val queue: ConcurrentLinkedQueue<LogEntry> = ConcurrentLinkedQueue<LogEntry>()
 
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
@@ -36,17 +34,8 @@ class LogzTree(val context: Context): Timber.DebugTree() {
             Settings.getUserID(context),
             t
         )
-        queue.add(logEntry)
-        if (queue.size < 100) {
-            return
-        }
-
-        val logEntries = queue.toArray()
-        queue.clear()
-
-        val body = logEntries.joinToString(separator = "\n") { x -> Klaxon().toJsonString(x) }
-            .toRequestBody("application/x-www-form-urlencoded".toMediaType())
 
+        val body = Klaxon().toJsonString(logEntry).toRequestBody("application/x-www-form-urlencoded".toMediaType())
         val request: Request = Request.Builder()
             .url("https://listener.logz.io:8071?token=cTCUVJoTDrPjaFcanAPRzIsYyThyrIDw&type=http-bulk")
             .post(body)
@@ -58,6 +47,7 @@ class LogzTree(val context: Context): Timber.DebugTree() {
                 val response = client.newCall(request).execute()
                 response.body?.close()
             } catch(ex: Exception) {
+                Sentry.captureException(ex)
             }
         }.start()
     }

api/cmd/experiments/main.go

@@ -6,10 +6,6 @@ import (
 	"log"
 	"os"
 	"sync"
-	"time"
-
-	"github.com/NdoleStudio/httpsms/pkg/di"
-	"github.com/NdoleStudio/httpsms/pkg/entities"
 
 	"github.com/carlmjohnson/requests"
 
@@ -22,22 +18,12 @@ func main() {
 		log.Fatal("Error loading .env file")
 	}
 
-	container := di.NewLiteContainer()
-	cache := container.RistrettoCache()
-	logger := container.Logger()
-
-	for i := 0; i < 100; i++ {
-		result := cache.SetWithTTL(fmt.Sprintf("how are you %d", i), entities.AuthUser{
-			ID:    "dasfdfds",
-			Email: "[email protected]",
-		}, 1, 2*time.Hour)
-		logger.Info(fmt.Sprintf("cached [%t]", result))
-	}
+	loadTest()
 }
 
 func loadTest() {
 	wg := sync.WaitGroup{}
-	for i := 0; i < 5; i++ {
+	for i := 0; i < 1; i++ {
 		wg.Add(1)
 		go func(count int) {
 			sendSMS(count)