From 4c42e7e20956e6baa5b9e436f30bdf3439f3e965 Mon Sep 17 00:00:00 2001 From: aricart Date: Thu, 9 Feb 2023 11:50:58 -0400 Subject: [PATCH] [BUMP] nbc to 1.12.0, version to 1.13.0, ci dependencies --- .github/workflows/natsws.yml | 10 +-- package-lock.json | 141 +++++++++++++++-------------------- package.json | 12 +-- src/connect.ts | 2 +- src/mod.ts | 2 +- src/nats-base-client.ts | 2 +- src/ws_transport.ts | 6 +- 7 files changed, 76 insertions(+), 99 deletions(-) diff --git a/.github/workflows/natsws.yml b/.github/workflows/natsws.yml index 99f831e..aa577ef 100644 --- a/.github/workflows/natsws.yml +++ b/.github/workflows/natsws.yml @@ -18,19 +18,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout NATS.ws - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - name: Use Deno Version ${{ matrix.deno-version }} - uses: denolib/setup-deno@master + uses: denoland/setup-deno@v1.1.1 with: - deno-version: 1.29.2 + deno-version: 1.30.3 - name: Set NATS Server Version - run: echo "NATS_VERSION=v2.9.11" >> $GITHUB_ENV + run: echo "NATS_VERSION=v2.9.14" >> $GITHUB_ENV - name: Set CA run: echo "NODE_EXTRA_CA_CERTS=/home/runner/work/nats.ws/nats.ws/test/certs/ca.crt" >> $GITHUB_ENV - name: Get nats-server diff --git a/package-lock.json b/package-lock.json index 881c244..54fde2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,27 +1,27 @@ { "name": "nats.ws", - "version": "1.12.0", + "version": "1.13.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nats.ws", - "version": "1.12.0", + "version": "1.13.0", "license": "Apache-2.0", "devDependencies": { - "@types/node": "^18.11.18", - "ava": "^5.1.0", + "@types/node": "^18.13.0", + "ava": "^5.2.0", "browser-env": "^3.3.0", "minimist": "^1.2.5", - "nats-jwt": "^0.0.3", + "nats-jwt": "^0.0.5", "nyc": "^15.1.0", "shx": "^0.3.3", "tslint": "^6.1.3", - "typescript": "^4.9.4", + "typescript": "^4.9.5", "web-streams-polyfill": "^3.2.1" }, "optionalDependencies": { - "nkeys.js": "1.0.4" + "nkeys.js": "1.0.5" } }, "node_modules/@ampproject/remapping": { @@ -521,9 +521,9 @@ } }, "node_modules/@types/node": { - "version": "18.11.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", - "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", + "version": "18.13.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz", + "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==", "dev": true }, "node_modules/abab": { @@ -747,9 +747,9 @@ "dev": true }, "node_modules/ava": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ava/-/ava-5.1.0.tgz", - "integrity": "sha512-e5VFrSQ0WBPyZJWRXVrO7RFOizFeNM0t2PORwrPvWtApgkORI6cvGnY3GX1G+lzpd0HjqNx5Jus22AhxVnUMNA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-5.2.0.tgz", + "integrity": "sha512-W8yxFXJr/P68JP55eMpQIa6AiXhCX3VeuajM8nolyWNExcMDD6rnIWKTjw0B/+GkFHBIaN6Jd0LtcMThcoqVfg==", "dev": true, "dependencies": { "acorn": "^8.8.1", @@ -759,10 +759,10 @@ "arrify": "^3.0.0", "callsites": "^4.0.0", "cbor": "^8.1.0", - "chalk": "^5.1.2", + "chalk": "^5.2.0", "chokidar": "^3.5.3", "chunkd": "^2.0.1", - "ci-info": "^3.6.1", + "ci-info": "^3.7.1", "ci-parallel-vars": "^1.0.1", "clean-yaml-object": "^0.1.0", "cli-truncate": "^3.1.0", @@ -774,7 +774,7 @@ "del": "^7.0.0", "emittery": "^1.0.1", "figures": "^5.0.0", - "globby": "^13.1.2", + "globby": "^13.1.3", "ignore-by-default": "^2.1.0", "indent-string": "^5.0.0", "is-error": "^2.2.2", @@ -1024,9 +1024,9 @@ } }, "node_modules/chalk": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz", - "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", + "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -1900,9 +1900,9 @@ } }, "node_modules/globby": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz", - "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==", + "version": "13.1.3", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz", + "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==", "dev": true, "dependencies": { "dir-glob": "^3.0.1", @@ -2800,31 +2800,19 @@ "dev": true }, "node_modules/nats-jwt": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/nats-jwt/-/nats-jwt-0.0.3.tgz", - "integrity": "sha512-VdKnJ+sGnowHIhJJ1HZI+qtFa8B5PQlhvMLJ14jcf619drJ4oX45skOYDWTUYn0cuXaBND0qaFO5bFFhRq6p3Q==", - "dev": true, - "dependencies": { - "nkeys.js": "1.0.3" - } - }, - "node_modules/nats-jwt/node_modules/nkeys.js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/nkeys.js/-/nkeys.js-1.0.3.tgz", - "integrity": "sha512-p5Bpb/acPaQmCrbe4gNmMBY/naZJV8Q7m2B9UkXT8BQRC6wjX8zqD2ya8eZu9mpSXQffodV46HCP9OckmxcwYA==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/nats-jwt/-/nats-jwt-0.0.5.tgz", + "integrity": "sha512-gmqBOdeVWhQSvZkruLevEt7adN5asBwPzUe4VYVJpdEuFjYINTUdPIx/YnOZgm2E+8EnzOgtJZySMUVXATkJUQ==", "dev": true, "dependencies": { - "tweetnacl": "1.0.3" - }, - "engines": { - "node": ">=10.0.0" + "nkeys.js": "1.0.5" } }, "node_modules/nkeys.js": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/nkeys.js/-/nkeys.js-1.0.4.tgz", - "integrity": "sha512-xeNDE6Ha5I3b3PnlHyT9AbmBxq3Vb9KHzmaI/h4IXYg0PUVZSUXNHNhTfU20oBsubw2ZdV/1AdC6hnRuMiZfMQ==", - "optional": true, + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nkeys.js/-/nkeys.js-1.0.5.tgz", + "integrity": "sha512-u25YnRPHiGVsNzwyHnn+PT90sgAhnS8jUJ1nxmkHMFYCJ6+Ic0lv291w7uhRBpJVJ3PH2GWbYqA151lGCRrB5g==", + "devOptional": true, "dependencies": { "tweetnacl": "1.0.3" }, @@ -4322,9 +4310,9 @@ } }, "node_modules/typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -5132,9 +5120,9 @@ } }, "@types/node": { - "version": "18.11.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", - "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", + "version": "18.13.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz", + "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==", "dev": true }, "abab": { @@ -5299,9 +5287,9 @@ "dev": true }, "ava": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ava/-/ava-5.1.0.tgz", - "integrity": "sha512-e5VFrSQ0WBPyZJWRXVrO7RFOizFeNM0t2PORwrPvWtApgkORI6cvGnY3GX1G+lzpd0HjqNx5Jus22AhxVnUMNA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-5.2.0.tgz", + "integrity": "sha512-W8yxFXJr/P68JP55eMpQIa6AiXhCX3VeuajM8nolyWNExcMDD6rnIWKTjw0B/+GkFHBIaN6Jd0LtcMThcoqVfg==", "dev": true, "requires": { "acorn": "^8.8.1", @@ -5311,10 +5299,10 @@ "arrify": "^3.0.0", "callsites": "^4.0.0", "cbor": "^8.1.0", - "chalk": "^5.1.2", + "chalk": "^5.2.0", "chokidar": "^3.5.3", "chunkd": "^2.0.1", - "ci-info": "^3.6.1", + "ci-info": "^3.7.1", "ci-parallel-vars": "^1.0.1", "clean-yaml-object": "^0.1.0", "cli-truncate": "^3.1.0", @@ -5326,7 +5314,7 @@ "del": "^7.0.0", "emittery": "^1.0.1", "figures": "^5.0.0", - "globby": "^13.1.2", + "globby": "^13.1.3", "ignore-by-default": "^2.1.0", "indent-string": "^5.0.0", "is-error": "^2.2.2", @@ -5510,9 +5498,9 @@ } }, "chalk": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz", - "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", + "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", "dev": true }, "chokidar": { @@ -6162,9 +6150,9 @@ "dev": true }, "globby": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz", - "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==", + "version": "13.1.3", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz", + "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==", "dev": true, "requires": { "dir-glob": "^3.0.1", @@ -6827,30 +6815,19 @@ "dev": true }, "nats-jwt": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/nats-jwt/-/nats-jwt-0.0.3.tgz", - "integrity": "sha512-VdKnJ+sGnowHIhJJ1HZI+qtFa8B5PQlhvMLJ14jcf619drJ4oX45skOYDWTUYn0cuXaBND0qaFO5bFFhRq6p3Q==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/nats-jwt/-/nats-jwt-0.0.5.tgz", + "integrity": "sha512-gmqBOdeVWhQSvZkruLevEt7adN5asBwPzUe4VYVJpdEuFjYINTUdPIx/YnOZgm2E+8EnzOgtJZySMUVXATkJUQ==", "dev": true, "requires": { - "nkeys.js": "1.0.3" - }, - "dependencies": { - "nkeys.js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/nkeys.js/-/nkeys.js-1.0.3.tgz", - "integrity": "sha512-p5Bpb/acPaQmCrbe4gNmMBY/naZJV8Q7m2B9UkXT8BQRC6wjX8zqD2ya8eZu9mpSXQffodV46HCP9OckmxcwYA==", - "dev": true, - "requires": { - "tweetnacl": "1.0.3" - } - } + "nkeys.js": "1.0.5" } }, "nkeys.js": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/nkeys.js/-/nkeys.js-1.0.4.tgz", - "integrity": "sha512-xeNDE6Ha5I3b3PnlHyT9AbmBxq3Vb9KHzmaI/h4IXYg0PUVZSUXNHNhTfU20oBsubw2ZdV/1AdC6hnRuMiZfMQ==", - "optional": true, + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nkeys.js/-/nkeys.js-1.0.5.tgz", + "integrity": "sha512-u25YnRPHiGVsNzwyHnn+PT90sgAhnS8jUJ1nxmkHMFYCJ6+Ic0lv291w7uhRBpJVJ3PH2GWbYqA151lGCRrB5g==", + "devOptional": true, "requires": { "tweetnacl": "1.0.3" } @@ -7928,9 +7905,9 @@ } }, "typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, "update-browserslist-db": { diff --git a/package.json b/package.json index 5478d8e..3ebf78a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nats.ws", - "version": "1.12.0", + "version": "1.13.0", "description": "WebSocket NATS client", "main": "./cjs/nats.js", "module": "./esm/nats.js", @@ -44,18 +44,18 @@ "debug-test": "node node_modules/.bin/ava --verbose -T 6500000 --match" }, "optionalDependencies": { - "nkeys.js": "1.0.4" + "nkeys.js": "1.0.5" }, "devDependencies": { - "@types/node": "^18.11.18", - "ava": "^5.1.0", + "@types/node": "^18.13.0", + "ava": "^5.2.0", "browser-env": "^3.3.0", "minimist": "^1.2.5", - "nats-jwt": "^0.0.3", + "nats-jwt": "^0.0.5", "nyc": "^15.1.0", "shx": "^0.3.3", "tslint": "^6.1.3", - "typescript": "^4.9.4", + "typescript": "^4.9.5", "web-streams-polyfill": "^3.2.1" }, "ava": { diff --git a/src/connect.ts b/src/connect.ts index 597b0ca..22c84f0 100644 --- a/src/connect.ts +++ b/src/connect.ts @@ -19,7 +19,7 @@ import { setTransportFactory, Transport, TransportFactory, -} from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.11.0/nats-base-client/internal_mod.ts"; +} from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.12.0/nats-base-client/internal_mod.ts"; import { WsTransport } from "./ws_transport.ts"; diff --git a/src/mod.ts b/src/mod.ts index 173cbb1..9fa9ed7 100644 --- a/src/mod.ts +++ b/src/mod.ts @@ -12,5 +12,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -export * from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.11.0/nats-base-client/mod.ts"; +export * from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.12.0/nats-base-client/mod.ts"; export { connect } from "./connect.ts"; diff --git a/src/nats-base-client.ts b/src/nats-base-client.ts index c8fc733..5583a50 100644 --- a/src/nats-base-client.ts +++ b/src/nats-base-client.ts @@ -13,4 +13,4 @@ * limitations under the License. */ // this import here to drive the build system -export * from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.11.0/nats-base-client/internal_mod.ts"; +export * from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.12.0/nats-base-client/internal_mod.ts"; diff --git a/src/ws_transport.ts b/src/ws_transport.ts index c354dd5..6df5bbd 100644 --- a/src/ws_transport.ts +++ b/src/ws_transport.ts @@ -19,7 +19,7 @@ import type { Server, ServerInfo, Transport, -} from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.11.0/nats-base-client/internal_mod.ts"; +} from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.12.0/nats-base-client/internal_mod.ts"; import { checkOptions, DataBuffer, @@ -30,9 +30,9 @@ import { INFO, NatsError, render, -} from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.11.0/nats-base-client/internal_mod.ts"; +} from "https://raw.githubusercontent.com/nats-io/nats.deno/v1.12.0/nats-base-client/internal_mod.ts"; -const VERSION = "1.12.0"; +const VERSION = "1.13.0"; const LANG = "nats.ws"; export type WsSocketFactory = (u: string, opts: ConnectionOptions) => Promise<{