Address additional comments from review

Author: technocidal

packages/testcontainers/src/utils/bound-ports.ts

@@ -7,15 +7,17 @@ export class BoundPorts {
   private readonly ports = new Map<string, number>();
 
   public getBinding(port: number | string, protocol: string = "tcp"): number {
-    const normalizedProtocol = protocol.toLowerCase();
-    const key = typeof port === "string" ? port : `${port}/${normalizedProtocol}`;
-    let binding = this.ports.get(key);
-    if (!binding && typeof port === "string" && port.includes("/")) {
+    let key: string;
+
+    if (typeof port === "string" && port.includes("/")) {
       const [portNumber, portProtocol] = port.split("/");
-      const normalizedKey = `${portNumber}/${portProtocol.toLowerCase()}`;
-      binding = this.ports.get(normalizedKey);
+      key = `${portNumber}/${portProtocol.toLowerCase()}`;
+    } else {
+      key = `${port}/${protocol.toLowerCase()}`;
     }
 
+    const binding = this.ports.get(key);
+
     if (!binding) {
       throw new Error(`No port binding found for :${key}`);
     }

packages/testcontainers/src/wait-strategies/host-port-wait-strategy.test.ts

@@ -20,7 +20,7 @@ describe("HostPortWaitStrategy", { timeout: 180_000 }, () => {
         .withExposedPorts(8081)
         .withStartupTimeout(0)
         .start()
-    ).rejects.toThrowError(/Port (?:\d+|\d+\/\w+) not bound after 0ms/);
+    ).rejects.toThrowError(/Port \d+\/(tcp|udp) not bound after 0ms/);
 
     expect(await getRunningContainerNames()).not.toContain(containerName);
   });

packages/testcontainers/src/wait-strategies/host-port-wait-strategy.ts

@@ -42,7 +42,7 @@ export class HostPortWaitStrategy extends AbstractWaitStrategy {
     boundPorts: BoundPorts
   ): Promise<void> {
     for (const [internalPort] of boundPorts.iterator()) {
-      if (typeof internalPort === "string" && internalPort.toLowerCase().includes("/udp")) {
+      if (internalPort.toLowerCase().includes("/udp")) {
         log.debug(`Skipping wait for internal UDP port ${internalPort}`, {
           containerId: container.id,
         });
@@ -60,37 +60,15 @@ export class HostPortWaitStrategy extends AbstractWaitStrategy {
     port: number | string,
     portCheck: PortCheck
   ): Promise<void> {
-    // Skip waiting for UDP ports
-    if (typeof port === "string" && port.toLowerCase().includes("/udp")) {
-      log.debug(`Skipping wait for UDP port ${port} (UDP port checks not supported)`, { containerId: container.id });
-      return;
-    }
-
-    log.debug(`Checking availability for port: ${port}`);
-
-    try {
-      await new IntervalRetry<boolean, Error>(100).retryUntil(
-        () => {
-          console.log(`Checking if port ${port} is bound...`);
-          return portCheck.isBound(port);
-        },
-        (isBound) => {
-          if (isBound) {
-            console.log(`Port ${port} is now bound!`);
-          }
-          return isBound;
-        },
-        () => {
-          const message = `Port ${port} not bound after ${this.startupTimeoutMs}ms`;
-          console.log(`TIMEOUT: ${message}`);
-          log.error(message, { containerId: container.id });
-          throw new Error(message);
-        },
-        this.startupTimeoutMs
-      );
-    } catch (err) {
-      log.error(`Error checking port ${port} with error ${err}`);
-      throw err;
-    }
+    await new IntervalRetry<boolean, Error>(100).retryUntil(
+      () => portCheck.isBound(port),
+      (isBound) => isBound,
+      () => {
+        const message = `Port ${port} not bound after ${this.startupTimeoutMs}ms`;
+        log.error(message, { containerId: container.id });
+        throw new Error(message);
+      },
+      this.startupTimeoutMs
+    );
   }
 }