Merge branch 'main' into release-11.0.0

Author: cristianrgreco

package-lock.json

@@ -28,10 +28,11 @@
     "prepack": "shx cp ../../../README.md . && shx cp ../../../LICENSE .",
     "build": "tsc --project tsconfig.build.json"
   },
-  "devDependencies": {
-    "nats": "^2.29.3"
-  },
   "dependencies": {
     "testcontainers": "^10.27.0"
+  },
+  "devDependencies": {
+    "@nats-io/jetstream": "^3.0.2",
+    "@nats-io/transport-node": "^3.0.2"
   }
 }

packages/modules/nats/package.json

@@ -1,4 +1,5 @@
-import { connect, StringCodec } from "nats";
+import { jetstreamManager } from "@nats-io/jetstream";
+import { connect } from "@nats-io/transport-node";
 import { NatsContainer } from "./nats-container";
 
 const IMAGE = "nats:2.8.4-alpine";
@@ -20,26 +21,41 @@ describe("NatsContainer", { timeout: 180_000 }, () => {
   });
   // }
 
+  it("should start, connect and close using scratch image", async () => {
+    const container = await new NatsContainer("nats:2.11").start();
+
+    // establish connection
+    const nc = await connect(container.getConnectionOptions());
+    // close the connection
+    await nc.close();
+    // check if the close was OK
+    const err = await nc.closed();
+    expect(err).toBe(undefined);
+
+    await container.stop();
+  });
+
   // pubsub {
   it("should subscribe and receive one published message", async () => {
     const SUBJECT = "HELLO";
     const PAYLOAD = "WORLD";
 
     const container = await new NatsContainer(IMAGE).start();
     const nc = await connect(container.getConnectionOptions());
-    const sc = StringCodec();
+    const TE = new TextEncoder();
+    const TD = new TextDecoder();
 
     //----------------
     const sub = nc.subscribe(SUBJECT);
     (async () => {
       for await (const m of sub) {
-        const actual: string = sc.decode(m.data);
+        const actual = TD.decode(m.data);
         expect(actual).toEqual(PAYLOAD);
       }
     })().then();
 
     //----------------
-    nc.publish(SUBJECT, sc.encode(PAYLOAD));
+    nc.publish(SUBJECT, TE.encode(PAYLOAD));
 
     //----------------
     await nc.drain();
@@ -75,7 +91,7 @@ describe("NatsContainer", { timeout: 180_000 }, () => {
     const nc = await connect(container.getConnectionOptions());
 
     // ensure JetStream is enabled, otherwise this will throw an error
-    await nc.jetstream().jetstreamManager();
+    await jetstreamManager(nc);
 
     // close the connection
     await nc.close();
@@ -92,7 +108,7 @@ describe("NatsContainer", { timeout: 180_000 }, () => {
     const nc = await connect(container.getConnectionOptions());
 
     // ensure JetStream is not enabled, as this will throw an error
-    await expect(nc.jetstream().jetstreamManager()).rejects.toThrow("503");
+    await expect(jetstreamManager(nc)).rejects.toThrow("jetstream is not enabled");
 
     // close the connection
     await nc.close();

packages/modules/nats/src/nats-container.test.ts

@@ -81,7 +81,7 @@ export class NatsContainer extends GenericContainer {
   }
 
   private getNormalizedCommand(): string[] {
-    const result: string[] = ["nats-server"];
+    const result: string[] = [];
     for (const arg of this.args) {
       result.push(arg);
       if (this.values.has(arg)) {