Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	src/connect.ts
#	src/mod.ts
#	src/nats-base-client.ts
#	src/ws_transport.ts
#	test/jetstream.js
  • Loading branch information
aricart committed May 23, 2023
2 parents f4b1f21 + 6160d61 commit feb6db8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nats.ws",
"version": "1.15.0-1",
"version": "1.16.0-1",
"description": "WebSocket NATS client",
"main": "./cjs/nats.js",
"module": "./esm/nats.js",
Expand Down
2 changes: 1 addition & 1 deletion src/ws_transport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
render,
} from "https://raw.githubusercontent.com/nats-io/nats.deno/dev/nats-base-client/internal_mod.ts";

const VERSION = "1.15.0-1";
const VERSION = "1.16.0-1";
const LANG = "nats.ws";

export type WsSocketFactory = (u: string, opts: ConnectionOptions) => Promise<{
Expand Down
4 changes: 2 additions & 2 deletions test/jetstream.js
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,8 @@ test("jetstream - ordered consumer basics", async (t) => {
t.is(buf.length, 4);
t.is(buf[0].subject, "hello.a");
t.is(buf[1].subject, "hello.b");
t.is(buf[1].subject, "hello.c");
t.is(buf[1].subject, "hello.d");
t.is(buf[2].subject, "hello.c");
t.is(buf[3].subject, "hello.d");
buf.length = 0;

c = await js.consumers.get("stream");
Expand Down

0 comments on commit feb6db8

Please sign in to comment.