@trieb.work/nextjs-turbo-redis-cache 1.9.0 → 1.10.0-beta.13

package/.github/workflows/ci.yml

@@ -29,16 +29,18 @@ jobs:
           - next-app-15-0-3
           - next-app-15-3-2
           - next-app-15-4-7
+          - next-app-16-0-3
+
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Install pnpm
         run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
           cache: 'pnpm'
@@ -76,6 +78,16 @@ jobs:
           SKIP_BUILD: true
           NEXT_TEST_APP: ${{ matrix.next-test-app }}
 
+      - name: Install Playwright browsers (Next 16 only)
+        if: matrix.next-test-app == 'next-app-16-0-3'
+        run: pnpm exec playwright install --with-deps
+
+      - name: Run Playwright E2E tests (Next 16 only)
+        if: matrix.next-test-app == 'next-app-16-0-3'
+        run: pnpm test:e2e
+        env:
+          PLAYWRIGHT_BASE_URL: http://localhost:3055
+
       - name: Code Coverage Comments
         if: github.event_name == 'pull_request'
         uses: kcjpop/coverage-comments@v2.2

package/.github/workflows/release.yml

@@ -15,6 +15,7 @@ permissions:
   issues: write
   actions: write
   discussions: write
+  id-token: write
 
 jobs:
   release:
@@ -22,25 +23,165 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Install pnpm
         run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'pnpm'
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
+      - name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
+        run: npm audit signatures
 
       - name: Build project
-        run: pnpm run build
+        run: pnpm build
+
+      - name: Show npm provenance config
+        env:
+          NPM_CONFIG_PROVENANCE: 'true'
+        run: |
+          node -v
+          npm -v
+          echo "NPM_CONFIG_PROVENANCE=$NPM_CONFIG_PROVENANCE"
+          npm config get provenance
+          node -e "console.log('package.json publishConfig.provenance=', require('./package.json')?.publishConfig?.provenance)"
 
       - name: Run Semantic Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GitHub token for Semantic Release
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }} # NPM token for publishing
-        run: npx semantic-release
+          NPM_CONFIG_PROVENANCE: 'true'
+        run: pnpm exec semantic-release
+
+      - name: Diagnostics (OIDC + npm config)
+        env:
+          NPM_CONFIG_PROVENANCE: 'true'
+        run: |
+          echo "github.ref_name=${{ github.ref_name }}"
+          echo "ACTIONS_ID_TOKEN_REQUEST_URL=${ACTIONS_ID_TOKEN_REQUEST_URL:+set}"
+          echo "ACTIONS_ID_TOKEN_REQUEST_TOKEN=${ACTIONS_ID_TOKEN_REQUEST_TOKEN:+set}"
+          echo "CI=${CI:-unset}"
+          npm config get registry
+          npm config get provenance
+
+      - name: Exchange GitHub OIDC token for npm token
+        id: npm-oidc
+        env:
+          NPM_PACKAGE_NAME: '@trieb.work/nextjs-turbo-redis-cache'
+        run: |
+          node <<'NODE'
+          const fs = require('node:fs');
+
+          const pkg = process.env.NPM_PACKAGE_NAME;
+          const reqUrl = process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
+          const reqToken = process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
+
+          if (!pkg || !reqUrl || !reqToken) {
+            console.error('Missing required env for OIDC token retrieval');
+            process.exit(1);
+          }
+
+          const audience = 'npm:registry.npmjs.org';
+          const url = reqUrl + (reqUrl.includes('?') ? '&' : '?') + 'audience=' + encodeURIComponent(audience);
+
+          (async () => {
+            const idRes = await fetch(url, { headers: { Authorization: 'Bearer ' + reqToken } });
+            if (!idRes.ok) {
+              console.error('Failed to fetch GitHub OIDC token:', idRes.status, await idRes.text());
+              process.exit(1);
+            }
+
+            const idBody = await idRes.json();
+            const idToken = idBody.value;
+
+            const exUrl =
+              'https://registry.npmjs.org/-/npm/v1/oidc/token/exchange/package/' + encodeURIComponent(pkg);
+            const exRes = await fetch(exUrl, {
+              method: 'POST',
+              headers: { Authorization: 'Bearer ' + idToken },
+            });
+
+            const exText = await exRes.text();
+            if (!exRes.ok) {
+              console.error('OIDC token exchange with npm failed:', exRes.status, exText);
+              process.exit(1);
+            }
+
+            const exBody = JSON.parse(exText);
+            const npmToken = exBody.token;
+            if (!npmToken) {
+              console.error('npm exchange response missing token');
+              process.exit(1);
+            }
+
+            fs.appendFileSync(process.env.GITHUB_OUTPUT, `node_auth_token=${npmToken}\n`);
+            const npmrcPath = `${process.env.RUNNER_TEMP}/npmrc`;
+            const npmrc = [
+              'registry=https://registry.npmjs.org/',
+              'always-auth=true',
+              '//registry.npmjs.org/:_authToken=' + npmToken,
+              '',
+            ].join('\n');
+            fs.writeFileSync(npmrcPath, npmrc, { encoding: 'utf8' });
+            fs.appendFileSync(process.env.GITHUB_OUTPUT, `npmrc_path=${npmrcPath}\n`);
+            console.log('OIDC token exchange with npm registry succeeded');
+          })().catch((e) => {
+            console.error(e);
+            process.exit(1);
+          });
+          NODE
+
+      - name: Publish to npm (Trusted Publishing)
+        env:
+          NPM_CONFIG_PROVENANCE: 'true'
+          NPM_DIST_TAG: ${{ github.ref_name == 'beta' && 'beta' || 'latest' }}
+          NPM_CONFIG_USERCONFIG: ${{ steps.npm-oidc.outputs.npmrc_path }}
+        run: |
+          set -euo pipefail
+
+          echo "--- npm debug context (pre-publish) ---"
+          node -v
+          npm -v
+          echo "pwd=$(pwd)"
+          echo "NPM_CONFIG_USERCONFIG=${NPM_CONFIG_USERCONFIG}"
+          echo "NPM_CONFIG_PROVENANCE=${NPM_CONFIG_PROVENANCE}"
+          echo "NPM_DIST_TAG=${NPM_DIST_TAG}"
+
+          echo "--- npmrc (redacted) ---"
+          if [ -f "${NPM_CONFIG_USERCONFIG}" ]; then
+            sed -E 's#(//registry\.npmjs\.org/:_authToken=).*#\1***REDACTED***#' "${NPM_CONFIG_USERCONFIG}" || true
+          else
+            echo "npmrc missing at ${NPM_CONFIG_USERCONFIG}"
+          fi
+
+          echo "--- npm config list (redacted) ---"
+          npm config list -l | sed -E 's#(_authToken=).*#\1***REDACTED***#' || true
+
+          echo "--- npm ping / whoami (best effort) ---"
+          npm ping --registry https://registry.npmjs.org/ || true
+          npm whoami --registry https://registry.npmjs.org/ || true
+
+          echo "--- npm publish (verbose) ---"
+          publish_status=0
+          npm publish --provenance --access public --tag "$NPM_DIST_TAG" --registry https://registry.npmjs.org/ --loglevel verbose || publish_status=$?
+
+          echo "--- npm debug logs (redacted) ---"
+          if [ -d "$HOME/.npm/_logs" ]; then
+            ls -la "$HOME/.npm/_logs" || true
+            latest_log=$(ls -t "$HOME/.npm/_logs"/*-debug-*.log 2>/dev/null | head -n 1 || true)
+            if [ -n "${latest_log}" ] && [ -f "${latest_log}" ]; then
+              echo "latest_log=${latest_log}"
+              sed -E 's#(//registry\.npmjs\.org/:_authToken=).*#\1***REDACTED***#; s#(_authToken=).*#\1***REDACTED***#' "${latest_log}" || true
+            else
+              echo "No npm debug log found"
+            fi
+          else
+            echo "No npm logs directory found"
+          fi
+
+          exit $publish_status

package/CHANGELOG.md

@@ -1,3 +1,120 @@
+# [1.10.0-beta.13](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.12...v1.10.0-beta.13) (2025-12-27)
+
+
+### Bug Fixes
+
+* add comprehensive debugging and .npmrc configuration for npm trusted publishing ([8d4fabb](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/8d4fabb02062a7a771693277909555671e810835))
+
+# [1.10.0-beta.12](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.11...v1.10.0-beta.12) (2025-12-27)
+
+
+### Bug Fixes
+
+* implement OIDC token exchange for npm trusted publishing in release workflow ([3b3cea1](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/3b3cea152dfb183e918dac1b34c6a8277c300474))
+
+# [1.10.0-beta.11](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.10...v1.10.0-beta.11) (2025-12-27)
+
+
+### Bug Fixes
+
+* add diagnostics step to debug OIDC and npm configuration in release workflow ([6a7f3cf](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/6a7f3cf7cda23d57acb34d3bb4c4dd6ab7103ca7))
+
+# [1.10.0-beta.10](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.9...v1.10.0-beta.10) (2025-12-27)
+
+
+### Bug Fixes
+
+* add provenance, public access, and verbose logging to npm publish command ([2fccf3d](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/2fccf3d12c899e5aee38ea5d7c0cdce22dd83ce4))
+
+# [1.10.0-beta.9](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.8...v1.10.0-beta.9) (2025-12-27)
+
+
+### Bug Fixes
+
+* add git+ prefix to repository URL in package.json ([70f94df](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/70f94dff5059808eb4a2376950f3bb9fecb4511e))
+
+# [1.10.0-beta.8](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.7...v1.10.0-beta.8) (2025-12-27)
+
+
+### Bug Fixes
+
+* disable semantic-release npm publishing and add manual npm publish step with trusted publishing ([4cbf99d](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/4cbf99de560a6a466b5d10f945bd9640356ef444))
+
+# [1.10.0-beta.7](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.6...v1.10.0-beta.7) (2025-12-26)
+
+
+### Bug Fixes
+
+* remove empty auth token environment variables from release workflow ([8d4e87b](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/8d4e87b301842842cd3d0c0a8cb8401dbf100fa9))
+
+# [1.10.0-beta.6](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.5...v1.10.0-beta.6) (2025-12-26)
+
+
+### Bug Fixes
+
+* upgrade semantic-release and related dependencies to v25 ([63fd812](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/63fd812bc0815aa5155619faf9b36b9287daac21))
+* use pnpm exec instead of pnpx for semantic-release command ([ca310c0](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/ca310c0e1b4150052787eba1709152d606d2d76d))
+
+# [1.10.0-beta.5](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.4...v1.10.0-beta.5) (2025-12-26)
+
+
+### Bug Fixes
+
+* remove registry-url and clear auth tokens in release workflow ([b0d9edb](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/b0d9edb4e8efa37500a4dfe4054a24f55582e60e))
+
+# [1.10.0-beta.4](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.3...v1.10.0-beta.4) (2025-12-26)
+
+
+### Bug Fixes
+
+* trigger beta release ([724ecbb](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/724ecbb6d76697818a2c6a863c98e144eed049d2))
+
+# [1.10.0-beta.3](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.2...v1.10.0-beta.3) (2025-12-26)
+
+
+### Bug Fixes
+
+* configure npm provenance in package.json publishConfig ([83a3017](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/83a301797396e98b739db199bfb3e97ee1c8565e))
+
+# [1.10.0-beta.2](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.10.0-beta.1...v1.10.0-beta.2) (2025-12-26)
+
+
+### Bug Fixes
+
+* trigger beta release ([432b58f](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/432b58f661db20e5a8302d54679b16cc33a6dfb6))
+
+# [1.10.0-beta.1](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.9.1...v1.10.0-beta.1) (2025-12-26)
+
+
+### Bug Fixes
+
+* avoid overlapping redis reconnects ([4da291f](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/4da291f1a62ef8ffd9a8528640ee57b1367d0e25))
+* cleanup ([c948fdf](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/c948fdfe0e6b5f70edc985b3cdda9cf2f002633a))
+* folder structure ([93356fd](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/93356fd567c0f05fad92d3443da77216fd2cc28d))
+* just testing around ([09bd26d](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/09bd26dc7b328945f11818a11446b3e5dd86c943))
+* remove not needed attributes ([6c11e0d](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/6c11e0d574e6ae8d98c60f71ea70070415de9de7))
+* testing with npm ([fa7ecb0](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/fa7ecb0283c2611918a3f780bc0c87cf2b28d5db))
+* trigger beta release ([62ea418](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/62ea4182b65fac53f23a93418b9f4650ab717b60))
+
+
+### Features
+
+* add Next.js 16.0.3 support with new caching API tests ([8a55040](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/8a55040dbecf564fc4d08c04ee35af7e727d2e30))
+* add Playwright E2E tests to CI workflow for Next.js 16 ([4cde821](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/4cde821ed86bd5d1387751bb85922ada9d890199))
+* add support for Next.js 16.0.3 (WIP) ([e873fe0](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/e873fe08e9659515fd7416c3805be5a3c074538d))
+* adding 16-0.3 ([38923b2](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/38923b299a9600659d2ee6245cf01b702eeba33a))
+* extend Next.js peer dependency support to version 16.0.3 ([4e63a5b](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/4e63a5b3270c1696112b532173a7f6d79711576a))
+* extend Next.js peer dependency support to version 16.0.3 ([ffaa08a](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/ffaa08ac79df7345ea289dad3c0f921ec859cb8f))
+* install Playwright browsers before running E2E tests in CI ([d74231a](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/d74231a4bdcf8d3ba90e5c7ee31008540c4a137e))
+* migrate from Vitest browser mode to Playwright for E2E testing ([6c39c98](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/6c39c989a89625f1835b7b257328b7a5ec45de3c))
+
+## [1.9.1](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.9.0...v1.9.1) (2025-11-24)
+
+
+### Bug Fixes
+
+* serialize map into json ([5a43493](https://github.com/trieb-work/nextjs-turbo-redis-cache/commit/5a43493c53370354ae3238cf589abfe2c6080c41))
+
 # [1.9.0](https://github.com/trieb-work/nextjs-turbo-redis-cache/compare/v1.8.2...v1.9.0) (2025-11-18)
 
 

package/README.md

@@ -25,8 +25,10 @@ Tested versions are:
 - Nextjs 15.0.3 + redis client 4.7.0
 - Nextjs 15.2.4 + redis client 4.7.0
 - Nextjs 15.3.2 + redis client 4.7.0
+- Nextjs 15.4.7 + redis client 4.7.0
+- Nextjs 16.0.3 + redis client 4.7.0 (cacheComponents: false)
 
-Currently PPR, 'use cache', cacheLife and cacheTag are not tested. Use these operations with caution and your own risk.
+Currently PPR, 'use cache', cacheLife and cacheTag are not tested. Use these operations with caution and your own risk. [Cache Components](https://nextjs.org/docs/app/getting-started/cache-components) support is in development.
 
 ## Getting started
 

package/dist/index.js

@@ -429,13 +429,21 @@ var DeduplicatedRequestHandler = class {
 };
 
 // src/utils/json.ts
-function bufferReviver(_, value) {
+function bufferAndMapReviver(_, value) {
   if (value && typeof value === "object" && typeof value.$binary === "string") {
     return Buffer.from(value.$binary, "base64");
   }
+  if (value && typeof value === "object" && typeof value.$map === "object" && !!value.$map) {
+    return new Map(
+      Object.entries(value.$map).map(([key, value2]) => {
+        const revivedValue = bufferAndMapReviver("", value2);
+        return [key, revivedValue];
+      })
+    );
+  }
   return value;
 }
-function bufferReplacer(_, value) {
+function bufferAndMapReplacer(_, value) {
   if (Buffer.isBuffer(value)) {
     return {
       $binary: value.toString("base64")
@@ -446,6 +454,16 @@ function bufferReplacer(_, value) {
       $binary: Buffer.from(value.data).toString("base64")
     };
   }
+  if (value && typeof value === "object" && value instanceof Map) {
+    return {
+      $map: Object.fromEntries(
+        Array.from(value.entries()).map(([key, value2]) => {
+          const replacedValue = bufferAndMapReplacer("", value2);
+          return [key, replacedValue];
+        })
+      )
+    };
+  }
   return value;
 }
 
@@ -521,15 +539,16 @@ var RedisStringsHandler = class {
             error,
             killContainerOnErrorCount++
           );
-          setTimeout(
-            () => this.client.connect().catch((error2) => {
-              console.error(
-                "Failed to reconnect Redis client after connection loss:",
-                error2
-              );
-            }),
-            1e3
-          );
+          setTimeout(() => {
+            if (!this.client.isOpen && !this.client.isReady) {
+              this.client.connect().catch((error2) => {
+                console.error(
+                  "Failed to reconnect Redis client after connection loss:",
+                  error2
+                );
+              });
+            }
+          }, 1e3);
           if (this.killContainerOnErrorThreshold > 0 && killContainerOnErrorCount >= this.killContainerOnErrorThreshold) {
             console.error(
               "Redis client error threshold reached, disconnecting and exiting (please implement a restart process/container watchdog to handle this error)",
@@ -545,12 +564,9 @@ var RedisStringsHandler = class {
         });
         this.client.connect().then(() => {
           debug("green", "Redis client connected.");
-        }).catch(() => {
-          this.client.connect().catch((error) => {
-            console.error("Failed to connect Redis client:", error);
-            this.client.disconnect();
-            throw error;
-          });
+        }).catch((error) => {
+          console.error("Failed to connect Redis client:", error);
+          throw error;
         });
       } catch (error) {
         console.error("Failed to initialize Redis client");
@@ -673,7 +689,7 @@ var RedisStringsHandler = class {
       }
       const cacheEntry = JSON.parse(
         serializedCacheEntry,
-        bufferReviver
+        bufferAndMapReviver
       );
       debug(
         "green",
@@ -784,7 +800,10 @@ var RedisStringsHandler = class {
         tags: ctx?.tags || [],
         value: data
       };
-      const serializedCacheEntry = JSON.stringify(cacheEntry, bufferReplacer);
+      const serializedCacheEntry = JSON.stringify(
+        cacheEntry,
+        bufferAndMapReplacer
+      );
       if (this.redisGetDeduplication) {
         this.redisDeduplicationHandler.seedRequestReturn(
           key,