Merge branch 'main' into strict-jetstream

.github/workflows/consistency_checks.yml

@@ -6,11 +6,18 @@ on:
 jobs:
   install:
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [ 1.45.x ]
-        module: [ core, jetstream, kv, obj, services, transport-deno, transport-node ]
+        deno-version: [2.0.x]
+        module: [
+          core,
+          jetstream,
+          kv,
+          obj,
+          services,
+          transport-deno,
+          transport-node,
+        ]
 
     steps:
       - name: Git Checkout Sources

.github/workflows/core.yml

@@ -3,20 +3,19 @@ name: nats-core release
 on:
   push:
     paths:
-      - 'core/**'
-      - '.github/workflows/core.yml'
-    tags: [ 'core/*' ]
+      - "core/**"
+      - ".github/workflows/core.yml"
+    tags: ["core/*"]
     branches:
-      - '*'
+      - "*"
 jobs:
   test:
     name: Test core changes with released dependencies
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [1.45.x]
-        node-version: [ 22.x ]
+        deno-version: [2.0.x]
+        node-version: [22.x]
     permissions:
       contents: read
       id-token: write

.github/workflows/deno_checks.yml

@@ -6,11 +6,10 @@ on:
 jobs:
   install:
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [ 1.45.x ]
-        module: [ core, jetstream, kv, obj, services, transport-deno ]
+        deno-version: [2.0.x]
+        module: [core, jetstream, kv, obj, services, transport-deno]
 
     steps:
       - name: Git Checkout Sources

.github/workflows/jetstream.yml

@@ -3,19 +3,18 @@ name: jetstream release
 on:
   push:
     paths:
-      - 'jetstream/**'
-      - '.github/workflows/jetstream.yml'
-    tags: [ 'jetstream/*' ]
+      - "jetstream/**"
+      - ".github/workflows/jetstream.yml"
+    tags: ["jetstream/*"]
     branches:
-      - '*'
+      - "*"
 jobs:
   test:
     name: test jetstream with released dependencies
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [1.45.x]
+        deno-version: [2.0.x]
 
     steps:
       - name: Git Checkout Core

.github/workflows/kv.yml

@@ -3,19 +3,18 @@ name: kv release
 on:
   push:
     paths:
-      - 'kv/**'
-      - '.github/workflows/kv.yml'
-    tags: [ 'kv/*' ]
+      - "kv/**"
+      - ".github/workflows/kv.yml"
+    tags: ["kv/*"]
     branches:
-      - '*'
+      - "*"
 jobs:
   test:
     name: test kv with released dependencies
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [1.45.x]
+        deno-version: [2.0.x]
 
     steps:
       - name: Git Checkout Core

.github/workflows/node_checks.yml

@@ -6,11 +6,10 @@ on:
 jobs:
   node-tests-workspace:
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [ 1.45.x ]
-        node-version: [ 22.x ]
+        deno-version: [2.0.x]
+        node-version: [22.x]
 
     steps:
       - name: Git Checkout Sources

.github/workflows/obj.yml

@@ -3,19 +3,18 @@ name: obj release
 on:
   push:
     paths:
-      - 'obj/**'
-      - '.github/workflows/obj.yml'
-    tags: [ 'obj/*' ]
+      - "obj/**"
+      - ".github/workflows/obj.yml"
+    tags: ["obj/*"]
     branches:
-      - '*'
+      - "*"
 jobs:
   test:
     name: test obj with released dependencies
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [1.45.x]
+        deno-version: [2.0.x]
 
     steps:
       - name: Git Checkout Core

.github/workflows/services.yml

@@ -3,19 +3,18 @@ name: services release
 on:
   push:
     paths:
-      - 'services/**'
-      - '.github/workflows/services.yml'
-    tags: [ 'services/*' ]
+      - "services/**"
+      - ".github/workflows/services.yml"
+    tags: ["services/*"]
     branches:
-      - '*'
+      - "*"
 jobs:
   test:
     name: test services with released dependencies
     runs-on: ubuntu-latest-4-cores
-    environment: CI
     strategy:
       matrix:
-        deno-version: [1.45.x]
+        deno-version: [2.0.x]
 
     steps:
       - name: Git Checkout Core

.github/workflows/test.yml

@@ -3,9 +3,9 @@ name: Test Modules
 on:
   push:
     tags:
-      - '*'
+      - "*"
     branches:
-      - '*'
+      - "*"
   pull_request:
     branches: [main]
     types: [opened]
@@ -17,4 +17,3 @@ jobs:
     uses: ./.github/workflows/deno_checks.yml
   test-node:
     uses: ./.github/workflows/node_checks.yml
-

.github/workflows/transport-node-test.yml

@@ -3,13 +3,13 @@ name: test transport-node with local modules
 on:
   push:
     paths:
-      - 'core/**'
-      - 'jetstream/**'
-      - 'kv/**'
-      - 'obj/**'
-      - 'services/**'
+      - "core/**"
+      - "jetstream/**"
+      - "kv/**"
+      - "obj/**"
+      - "services/**"
     branches:
-      - '*'
+      - "*"
   pull_request:
     branches: [main]
     types: [opened]
@@ -18,12 +18,11 @@ jobs:
   test:
     strategy:
       matrix:
-        deno-version: [ 1.45.x ]
-        node-version: [ 22.x ]
+        deno-version: [2.0.x]
+        node-version: [22.x]
 
     name: test node transport with local dependencies
     runs-on: ubuntu-latest-4-cores
-    environment: CI
 
     steps:
       - name: Git Checkout Core
@@ -52,7 +51,6 @@ jobs:
         run: |
           deno task disable-npm-workspace
 
-
       - name: Test Node Transport with specified dependencies
         working-directory: transport-node
         env:

.github/workflows/version_bump.yml

@@ -27,4 +27,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GIT_USER_NAME: ${{ github.actor }}
-          GIT_USER_EMAIL: ${{ github.actor}}@users.noreply.github.com
+          GIT_USER_EMAIL: ${{ github.actor}}@users.noreply.github.com

TODO.md

@@ -1,3 +1,13 @@
 # TODO
 
 ## BUGS
+
+- ObjectStore should report the number of entries in it.
+
+- no_wait for Consumer args.no_wait = opts.no_wait || false; if (args.no_wait &&
+  args.expires) { args.expires = 0; }
+- headers_only is needed in Consumer
+
+- add a test for next/fetch/consume where message size smaller than availablle
+
+- doc

bin/bundle.ts

@@ -13,26 +13,31 @@
  * limitations under the License.
  */
 import { cli } from "https://deno.land/x/[email protected]/mod.ts";
-import { bundle } from "https://deno.land/x/[email protected]/mod.ts";
+import * as esbuild from "npm:[email protected]";
+// Import the Wasm build on platforms where running subprocesses is not
+// permitted, such as Deno Deploy, or when running without `--allow-run`.
+// import * as esbuild from "https://deno.land/x/[email protected]/wasm.js";
+
+import { denoPlugins } from "jsr:@luca/esbuild-deno-loader@^0.11.0";
 
 const root = cli({
   use: "bundle javascript/typescript",
   run: async (_cmd, _args, flags) => {
     const src = flags.value<string>("src");
     const out = flags.value<string>("out");
-    const type = flags.value<boolean>("module") ? "module" : "classic";
-    try {
-      const r = URL.canParse(src)
-        ? await bundle(new URL(src), { type })
-        : await bundle(src, { type });
-      await Deno.writeTextFile(out, r.code);
-      console.log(`wrote ${out}`);
-      return 0;
-    } catch (err) {
-      console.log(`failed to bundle: ${err.message}`);
-      console.log(err.stack);
-      return 1;
-    }
+
+    const result = await esbuild.build({
+      plugins: [...denoPlugins()],
+      entryPoints: [src],
+      outfile: out,
+      bundle: true,
+      format: "esm",
+    });
+
+    console.log(result.outputFiles || out);
+
+    esbuild.stop();
+    return 0;
   },
 });
 

bin/check-dep-versions.ts

@@ -26,6 +26,7 @@ type PackageJSON = {
   name: string;
   version: string;
   dependencies: Record<string, string>;
+  devDependencies: Record<string, string>;
 };
 type DenoJSON = {
   name: string;
@@ -207,6 +208,15 @@ class NodeModule extends BaseModule {
     return null;
   }
 
+  hasDev(module: string): SemVer | null {
+    if (this.data.devDependencies) {
+      return NodeModule.parseVersion(
+        this.data.devDependencies[module],
+      );
+    }
+    return null;
+  }
+
   static parseVersion(v: string): SemVer | null {
     if (v) {
       return v.startsWith("^") || v.startsWith("~")
@@ -220,12 +230,26 @@ class NodeModule extends BaseModule {
     if (this.data.dependencies) {
       const have = this.has(module);
       if (have && version.compare(have) !== 0) {
-        this.data.dependencies[module] = `~${version.string()}`;
+        let prefix = this.data.dependencies[module].charAt(0);
+        if (prefix !== "^" && prefix !== "~") {
+          prefix = "";
+        }
+        this.data.dependencies[module] = `${prefix}${version.string()}`;
         this.changed = true;
-        return true;
       }
     }
-    return false;
+    if (this.data.devDependencies) {
+      const have = this.hasDev(module);
+      if (have && version.compare(have) !== 0) {
+        let prefix = this.data.devDependencies[module].charAt(0);
+        if (prefix !== "^" && prefix !== "~") {
+          prefix = "";
+        }
+        this.data.devDependencies[module] = `${prefix}${version.string()}`;
+        this.changed = true;
+      }
+    }
+    return this.changed;
   }
 
   store(dir: string): Promise<void> {
@@ -279,15 +303,15 @@ for (const dir of dirs) {
     }
     const nmm = await NodeModule.load(d);
     if (nmm) {
-      if (nmm.has(moduleName)) {
+      if (nmm.has(moduleName) || nmm.hasDev(moduleName)) {
         nmm.update(moduleName, v);
         await nmm.store(d);
       }
-      const onuid = nmm.has("@nats-io/nuid");
+      const onuid = nmm.has("@nats-io/nuid") || nmm.hasDev("@nats-io/nuid");
       if (onuid) {
         nuid = nuid.max(onuid);
       }
-      const onkeys = nmm.has("@nats-io/nkeys");
+      const onkeys = nmm.has("@nats-io/nkeys") || nmm.hasDev("@nats-io/nkeys");
       if (onkeys) {
         nkeys = nkeys.max(onkeys);
       }