Break out humanizeDuration

code-asher · code-asher · commit f417542edc04 · 2023-05-01T14:47:52.000-08:00
diff --git a/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt b/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt
@@ -2,6 +2,7 @@
 
 package com.coder.gateway
 
+import com.coder.gateway.sdk.humanizeDuration
 import com.coder.gateway.sdk.suspendingRetryWithExponentialBackOff
 import com.coder.gateway.services.CoderRecentWorkspaceConnectionsService
 import com.intellij.openapi.application.ApplicationManager
@@ -45,10 +46,10 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
                     e is ConnectionException || e is TimeoutException
                             || e is SSHException || e is DeployException
                 },
-                update = { _, e, remaining, ->
-                    if (remaining != null) {
+                update = { _, e, remainingMs ->
+                    if (remainingMs != null) {
                         indicator.text2 = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
-                        indicator.text = CoderGatewayBundle.message("gateway.connector.coder.connection.retry-error.text", remaining)
+                        indicator.text = CoderGatewayBundle.message("gateway.connector.coder.connection.retry-error.text", humanizeDuration(remainingMs))
                     } else {
                         ApplicationManager.getApplication().invokeAndWait {
                             Messages.showMessageDialog(
diff --git a/src/main/kotlin/com/coder/gateway/sdk/Retry.kt b/src/main/kotlin/com/coder/gateway/sdk/Retry.kt
@@ -38,7 +38,7 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
     label: String,
     logger: Logger,
     predicate: (e: Throwable) -> Boolean,
-    update: (attempt: Int, e: Throwable, remaining: String?) -> Unit,
+    update: (attempt: Int, e: Throwable, remaining: Long?) -> Unit,
     action: suspend (attempt: Int) -> T?
 ): T? {
     val random = Random()
@@ -67,8 +67,6 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
           logger.error("Failed to $label (attempt $attempt; will retry in $delayMs ms)", originalEx)
           var remainingMs = delayMs
           while (remainingMs > 0) {
-              val remainingS = TimeUnit.MILLISECONDS.toSeconds(remainingMs)
-              val remaining = if (remainingS < 1) "now" else "in $remainingS second${if (remainingS > 1) "s" else ""}"
               // When the worker upload times out Gateway just says it failed.
               // Even the root cause (IllegalStateException) is useless.  The
               // error also includes a very long useless tmp path.  With all
@@ -77,7 +75,7 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
                   if (unwrappedEx is DeployException && unwrappedEx.message.contains("Worker binary deploy failed"))
                       DeployException("Failed to upload worker binary...it may have timed out", unwrappedEx)
                   else unwrappedEx
-              update(attempt, mungedEx, remaining)
+              update(attempt, mungedEx, remainingMs)
               val next = min(remainingMs, TimeUnit.SECONDS.toMillis(1))
               remainingMs -= next
               delay(next)
@@ -87,3 +85,15 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
     }
     error("Should never be reached")
 }
+
+/**
+ * Convert a millisecond duration into a human-readable string.
+ *
+ * < 1 second: "now"
+ * 1 second: "in one second"
+ * > 1 second: "in <duration> seconds"
+ */
+fun humanizeDuration(durationMs: Long): String {
+    val seconds = TimeUnit.MILLISECONDS.toSeconds(durationMs)
+    return if (seconds < 1) "now" else "in $seconds second${if (seconds > 1) "s" else ""}"
+}
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -8,6 +8,7 @@ import com.coder.gateway.sdk.Arch
 import com.coder.gateway.sdk.CoderCLIManager
 import com.coder.gateway.sdk.CoderRestClientService
 import com.coder.gateway.sdk.OS
+import com.coder.gateway.sdk.humanizeDuration
 import com.coder.gateway.sdk.suspendingRetryWithExponentialBackOff
 import com.coder.gateway.sdk.toURL
 import com.coder.gateway.sdk.withPath
@@ -197,11 +198,11 @@ class CoderLocateRemoteProjectStepView(private val setNextButtonEnabled: (Boolea
                     e is ConnectionException || e is TimeoutException
                             || e is SSHException || e is DeployException
                 },
-                update = { _, e, remaining ->
+                update = { _, e, remainingMs ->
                     cbIDEComment.foreground = UIUtil.getErrorForeground()
                     cbIDEComment.text = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
                     cbIDE.renderer =
-                        if (remaining != null) IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.retry-error.text", remaining))
+                        if (remainingMs != null) IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.retry-error.text", humanizeDuration(remainingMs)))
                         else IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.error.text"), UIUtil.getBalloonErrorIcon())
                 },
             )
