algolia · millotp · Feb 14, 2024 · Jan 29, 2024 · Jan 29, 2024 · Jan 30, 2024
@@ -3,30 +3,43 @@ final class Host {
   /// Host url.
   final String url;
 
+  // url port
+  final int? port;
+
   /// Host protocol (i.e. `http`, `https`)
   final String scheme;
 
   /// Whether this host should be used for [CallType.read] or [CallType.write] requests.
   final CallType? callType;
 
   /// Constructs a [Host] instance with the provided parameters.
-  const Host({required this.url, this.scheme = 'https', this.callType});
+  const Host({required this.url, this.port, this.scheme = 'https', this.callType});
+
+  factory Host.create({required String url, String scheme = 'https', CallType? callType}) {
+    if (url.contains(':')) {
+      final parts = url.split(':');
+      return Host(url: parts[0], port: int.parse(parts[1]), scheme: scheme, callType: callType);
+    }
+
+    return Host(url: url, scheme: scheme, callType: callType);
+  }
 
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       other is Host &&
           runtimeType == other.runtimeType &&
           url == other.url &&
+          port == other.port &&
           scheme == other.scheme &&
           callType == other.callType;
 
   @override
-  int get hashCode => url.hashCode ^ scheme.hashCode ^ callType.hashCode;
+  int get hashCode => url.hashCode ^ (port ?? 1) ^ scheme.hashCode ^ callType.hashCode;
 
   @override
   String toString() {
-    return 'Host{url: $url, scheme: $scheme, callType: $callType}';
+    return 'Host{url: $url, port: $port, scheme: $scheme, callType: $callType}';
   }
 }
 

@@ -94,6 +94,7 @@ class DioRequester implements Requester {
     Uri uri = Uri(
       scheme: request.host.scheme,
       host: request.host.url,
+      port: request.host.port,
       path: request.path,
     );
     if (request.queryParameters.isNotEmpty) {

@@ -6,6 +6,7 @@
 public final class Host {
 
   private final String url;
+  private final int port;
 
   private final Set<CallType> callTypes;
 
@@ -16,7 +17,14 @@ public Host(@Nonnull String url, @Nonnull Set<CallType> callType) {
   }
 
   public Host(String url, Set<CallType> callType, String scheme) {
-    this.url = url;
+    if (url.contains(":")) {
+      String[] split = url.split(":");
+      this.url = split[0];
+      this.port = Integer.parseInt(split[1]);
+    } else {
+      this.url = url;
+      this.port = -1;
+    }
     this.callTypes = callType;
     this.scheme = scheme;
   }
@@ -26,6 +34,10 @@ public String getUrl() {
     return url;
   }
 
+  public int getPort() {
+    return port;
+  }
+
   @Nonnull
   public Set<CallType> getCallTypes() {
     return callTypes;
@@ -44,13 +56,15 @@ public boolean equals(Object o) {
     Host host = (Host) o;
 
     if (!url.equals(host.url)) return false;
+    if (port != host.port) return false;
     if (!callTypes.equals(host.callTypes)) return false;
     return scheme.equals(host.scheme);
   }
 
   @Override
   public int hashCode() {
     int result = url.hashCode();
+    result = 31 * result + port;
     result = 31 * result + callTypes.hashCode();
     result = 31 * result + scheme.hashCode();
     return result;

@@ -21,6 +21,10 @@ public String getHost() {
     return host.getUrl();
   }
 
+  public int getPort() {
+    return host.getPort();
+  }
+
   public String getScheme() {
     return this.host.getScheme();
   }

@@ -63,7 +63,11 @@ public Response intercept(@Nonnull Chain chain) {
   /** Processes the request for a given host. */
   @Nonnull
   private Response processRequest(@Nonnull Chain chain, @Nonnull Request request, StatefulHost host) throws IOException {
-    HttpUrl newUrl = request.url().newBuilder().scheme(host.getScheme()).host(host.getHost()).build();
+    HttpUrl.Builder urlBuilder = request.url().newBuilder().scheme(host.getScheme()).host(host.getHost());
+    if (host.getPort() != -1) {
+      urlBuilder.port(host.getPort());
+    }
+    HttpUrl newUrl = urlBuilder.build();
     Request newRequest = request.newBuilder().url(newUrl).build();
     chain.withConnectTimeout(chain.connectTimeoutMillis() * (host.getRetryCount() + 1), TimeUnit.MILLISECONDS);
     Response response = chain.proceed(newRequest);

@@ -1,5 +1,7 @@
 package com.algolia.client.configuration
 
+import io.ktor.http.URLProtocol
+
 /**
  * @param url The url to target.
  * @param callType Whether this host should be used for [CallType.Read] or [CallType.Write]
@@ -8,4 +10,5 @@ package com.algolia.client.configuration
 public data class Host(
   public val url: String,
   public val callType: CallType? = null,
+  public val protocol: String = "https",
 )
@@ -49,6 +49,7 @@ public class KtorRequester(
     val requestBuilder = httpRequestBuilderOf(requestConfig, requestOptions)
 
     for (host in hosts) {
+      requestBuilder.url.protocol = URLProtocol.createOrDefault(host.protocol)
       requestBuilder.url.host = host.url
       requestBuilder.setTimeout(requestOptions, callType, host)
       try {
@@ -132,8 +133,6 @@ public class KtorRequester(
   ): HttpRequestBuilder {
     return HttpRequestBuilder().apply {
       url {
-        protocol = URLProtocol.HTTPS
-        port = URLProtocol.HTTPS.defaultPort
         pathSegments = requestConfig.path
       }
       method = requestConfig.method.ktorHttpMethod

@@ -13,9 +13,10 @@ import com.algolia.client.configuration.Host
 internal data class RetryableHost(
   private val host: Host,
 ) {
-
   val url
     get() = host.url
+  val protocol
+    get() = host.protocol
   val callType
     get() = host.callType
 

@@ -28,15 +28,6 @@ class Uri implements UriInterface
     private static $defaultPorts = [
         'http' => 80,
         'https' => 443,
-        'ftp' => 21,
-        'gopher' => 70,
-        'nntp' => 119,
-        'news' => 119,
-        'telnet' => 23,
-        'tn3270' => 23,
-        'imap' => 143,
-        'pop' => 110,
-        'ldap' => 389,
     ];
 
     private static $charUnreserved = 'a-zA-Z0-9_\-\.~';

@@ -33,6 +33,11 @@ final class ApiWrapper implements ApiWrapperInterface
      */
     private $clusterHosts;
 
+    /**
+     * @var Configuration
+     */
+    private $config;
+
     /**
      * @var RequestOptionsFactory
      */
@@ -57,6 +62,7 @@ public function __construct(
     ) {
         $this->http = $http;
         $this->clusterHosts = $clusterHosts;
+        $this->config = $config;
         $this->requestOptionsFactory =
             $RqstOptsFactory ?: new RequestOptionsFactory($config);
         $this->logger = $logger ?: Algolia::getLogger();
@@ -148,7 +154,16 @@ private function request(
 
         $retry = 1;
         foreach ($hosts as $host) {
-            $uri = $uri->withHost($host);
+            if ($this->config->getHasFullHosts()) {
+                $host = explode(':', $host);
+                $uri = $uri->withHost(trim($host[1], '/'))
+                    ->withScheme($host[0])
+                    ->withPort($host[2])
+                ;
+            } else {
+                $uri = $uri->withHost($host);
+            }
+
             $request = null;
             $logParams['retryNumber'] = $retry;
             $logParams['host'] = (string) $uri;

@@ -6,9 +6,14 @@ class Host:
     TTL = 300.0
 
     def __init__(
-        self, url: str, priority: Optional[int] = 0, accept: Optional[int] = None
+        self,
+        url: str,
+        scheme="https",
+        priority: Optional[int] = 0,
+        accept: Optional[int] = None,
     ) -> None:
         self.url = url
+        self.scheme = scheme
         self.priority = cast(int, priority)
         self.accept = (CallType.WRITE | CallType.READ) if accept is None else accept
 
@@ -21,15 +26,15 @@ def reset(self) -> None:
 
 
 class HostsCollection:
-    def __init__(self, hosts: List[Host]) -> None:
+    def __init__(self, hosts: List[Host], reorder_hosts=False) -> None:
         self._hosts = hosts
 
         for host in self._hosts:
             host.reset()
 
-        shuffle(self._hosts)
-
-        self._hosts = sorted(self._hosts, key=lambda x: x.priority, reverse=True)
+        if reorder_hosts:
+            shuffle(self._hosts)
+            self._hosts = sorted(self._hosts, key=lambda x: x.priority, reverse=True)
 
     def read(self) -> List[Host]:
         return [host for host in self._hosts if host.accept & CallType.READ]

@@ -93,7 +93,7 @@ async def request(
             )
 
         for host in self._retry_strategy.valid_hosts(self._hosts):
-            url = "https://{}{}".format(host.url, path)
+            url = "{}://{}{}".format(host.scheme, host.url, path)
 
             proxy = None
             if url.startswith("https"):
@@ -102,7 +102,7 @@ async def request(
                 proxy = self._config.proxies.get("http")
 
             try:
-                async with timeout(self._timeout):
+                async with timeout(self._timeout / 1000):
                     resp = await self._session.request(
                         method=verb,
                         url=url,

@@ -8,5 +8,7 @@ package algoliasearch.config
   *   Whether this host should be used for read and/or write requests.
   * @param scheme
   *   Host protocol (i.e. `http`, `https`)
+  * @param port
+  *   Host port
   */
-case class Host(url: String, callTypes: Set[CallType], scheme: String = "https")
+case class Host(url: String, callTypes: Set[CallType], scheme: String = "https", port : Option[Int] = None)
@@ -15,6 +15,8 @@ private[algoliasearch] class StatefulHost(private val host: Host) {
 
   def getScheme: String = host.scheme
 
+  def getPort: Option[Int] = host.port
+
   def isUp: Boolean = up
 
   def getRetryCount: Int = retryCount

@@ -50,12 +50,16 @@ private[algoliasearch] class RetryStrategy(hosts: List[StatefulHost]) extends In
       request: Request,
       host: StatefulHost
   ): Response = {
-    val newUrl = request
+    val urlBuilder = request
       .url()
       .newBuilder()
       .scheme(host.getScheme)
       .host(host.getHost)
-      .build()
+    if (host.getPort.isDefined) {
+      urlBuilder.port(host.getPort.get)
+    }
+    val newUrl = urlBuilder.build()
+
     val newRequest = request.newBuilder().url(newUrl).build()
     chain.withConnectTimeout(
       chain.connectTimeoutMillis() * (host.getRetryCount + 1),

@@ -63,10 +63,26 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
           testOut.put("autoCreateClient", test.autoCreateClient);
           for (Step step : test.steps) {
             Map<String, Object> stepOut = new HashMap<>();
+            stepOut.put("useEchoRequester", true);
             CodegenOperation ope = null;
             if (step.type.equals("createClient")) {
               stepOut.put("stepTemplate", "tests/client/createClient.mustache");
               stepOut.put("isCreateClient", true); // TODO: remove once dart and kotlin are converted
+
+              boolean hasCustomHosts = step.parameters != null && step.parameters.containsKey("customHosts");
+
+              stepOut.put("useEchoRequester", !hasCustomHosts);
+              stepOut.put("hasCustomHosts", hasCustomHosts);
+              if (hasCustomHosts && !language.equals("javascript") && !"true".equals(System.getenv("CI"))) {
+                // hack for docker on mac, the `network=host` does not work so we need to use
+                // another local IP
+                step.parameters.put(
+                  "customHosts",
+                  ((List<String>) step.parameters.get("customHosts")).stream()
+                    .map(host -> host.replace("localhost", "host.docker.internal"))
+                    .toList()
+                );
+              }
             } else if (step.type.equals("method")) {
               ope = operations.get(step.path);
               if (ope == null) {
@@ -108,9 +124,12 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
                 case "timeouts":
                   stepOut.put("testTimeouts", true);
                   break;
-                default:
-                  stepOut.put("testResult", true);
+                case "response":
+                  stepOut.put("testResponse", true);
+                  stepOut.put("useEchoRequester", false);
                   break;
+                default:
+                  throw new CTSException("Unknown expected type: " + step.expected.type, test.testName);
               }
             }
             if (step.expected.error != null) {