Bump testcontainers to v10

Breaking change. May fix segfault issues for consumers.

Check the "connect from another container" test in `src/tests/connection-details.test.ts` if you need to construct a `StartedNetwork()`.

Author: codetheweb

package.json

@@ -38,7 +38,7 @@
     "execa": "6.1.0",
     "prettier": "2.7.1",
     "semantic-release": "19.0.5",
-    "testcontainers": "^9.9.1",
+    "testcontainers": "^10.4.0",
     "tsup": "6.2.3",
     "type-fest": "3.6.1",
     "typescript": "4.8.2"
@@ -51,7 +51,7 @@
   },
   "peerDependencies": {
     "ava": ">=4.3.3",
-    "testcontainers": ">=9.0.0"
+    "testcontainers": ">=10.0.0"
   },
   "scripts": {
     "test": "ava",

src/index.ts

@@ -92,10 +92,6 @@ export const getTestPostgresDatabaseFactory = <
 
       return {
         ...connectionDetailsFromWorker,
-        networkDocker: new StartedNetwork(
-          connectionDetailsFromWorker.networkDocker.id,
-          connectionDetailsFromWorker.networkDocker.options
-        ),
         pool,
       }
     }

src/internal-types.ts

@@ -1,25 +1,16 @@
-import type { StartedNetwork } from "testcontainers"
+import type { ExecResult, StartedNetwork } from "testcontainers"
 import type { Jsonifiable } from "type-fest"
 import type {
   ConnectionDetails,
   GetTestPostgresDatabaseFactoryOptions,
 } from "./public-types"
-import type { ExecResult } from "testcontainers/dist/src/docker/types"
 
 export interface InitialWorkerData {
   postgresVersion: string
   containerOptions?: GetTestPostgresDatabaseFactoryOptions<any>["container"]
 }
 
-export type ConnectionDetailsFromWorker = Omit<
-  ConnectionDetails,
-  "pool" | "networkDocker"
-> & {
-  networkDocker: {
-    id: ConstructorParameters<typeof StartedNetwork>[0]
-    options: ConstructorParameters<typeof StartedNetwork>[1]
-  }
-}
+export type ConnectionDetailsFromWorker = Omit<ConnectionDetails, "pool">
 
 export interface RequestDatabaseFromWorkerMessage {
   type: "GET_TEST_DATABASE"

src/public-types.ts

@@ -1,13 +1,13 @@
 import type { Pool } from "pg"
 import type { Jsonifiable } from "type-fest"
-import type { StartedNetwork } from "testcontainers"
-import type { BindMode, ExecResult } from "testcontainers/dist/src/docker/types"
 import { ExecutionContext } from "ava"
+import { ExecResult } from "testcontainers"
+import { BindMode } from "testcontainers/build/types"
 
 export interface ConnectionDetails {
   connectionString: string
   connectionStringDocker: string
-  networkDocker: StartedNetwork
+  dockerNetworkId: string
 
   host: string
   port: number

src/tests/connection-details.test.ts

@@ -1,7 +1,11 @@
 import test from "ava"
 import { Pool } from "pg"
 import { getTestPostgresDatabaseFactory } from "~/index"
-import { GenericContainer } from "testcontainers"
+import {
+  GenericContainer,
+  StartedNetwork,
+  getContainerRuntimeClient,
+} from "testcontainers"
 
 const getTestServer = getTestPostgresDatabaseFactory({
   postgresVersion: process.env.POSTGRES_VERSION,
@@ -31,11 +35,19 @@ test("using connection details manually works", async (t) => {
 })
 
 test("connect from another container", async (t) => {
-  const { connectionStringDocker, networkDocker } = await getTestServer(t)
+  const { connectionStringDocker, dockerNetworkId } = await getTestServer(t)
+
+  const testContainersClient = await getContainerRuntimeClient()
+  const internalNetwork = testContainersClient.network.getById(dockerNetworkId)
+  const network = new StartedNetwork(
+    testContainersClient,
+    dockerNetworkId,
+    internalNetwork
+  )
 
   const container = await new GenericContainer("postgres:14")
     .withEnvironment({ POSTGRES_HOST_AUTH_METHOD: "trust" })
-    .withNetwork(networkDocker)
+    .withNetwork(network)
     .withStartupTimeout(120_000)
     .start()
 

src/worker.ts

@@ -1,5 +1,10 @@
 import pg from "pg"
-import { GenericContainer, Network } from "testcontainers"
+import {
+  GenericContainer,
+  Network,
+  StartedNetwork,
+  getContainerRuntimeClient,
+} from "testcontainers"
 import { Mutex } from "async-mutex"
 import hash from "object-hash"
 import {
@@ -251,12 +256,7 @@ export class Worker {
       connectionStringDocker: `postgresql://postgres:@${container
         .getName()
         .replace("/", "")}:5432/${databaseName}`,
-      networkDocker: {
-        id: network.getId(),
-        // StartedNetwork.options is private, however we must access it here
-        // using type-safe string index notation for serialization.
-        options: network["options"],
-      },
+      dockerNetworkId: network.getId(),
       host: container.getHost(),
       port: container.getMappedPort(5432),
       database: databaseName,