@platformatic/next 3.49.1 → 3.50.0

package/config.d.ts

@@ -122,6 +122,7 @@ export interface PlatformaticNextJsConfig {
     entrypointPort?: number;
     changeDirectoryBeforeExecution?: boolean;
     preferLocalCommands?: boolean;
+    processSpawner?: string;
   };
   runtime?: {
     preload?: string | string[];
@@ -703,5 +704,10 @@ export interface PlatformaticNextJsConfig {
     cacheComponents?: boolean;
     maxTTL?: number | string;
     ignoreNextConfig?: boolean | string;
+    remote?: {
+      url?: string;
+      prefix?: string;
+      maxTTL?: number | string;
+    };
   };
 }

package/index.js

@@ -48,8 +48,17 @@ function enhanceNextCacheConfig (nextConfig, modifications) {
     nextConfig.cacheComponents = true
     nextConfig.cacheHandler = getCacheHandlerPath('null-isr')
     nextConfig.cacheHandlers = { default: getCacheHandlerPath(`${config.cache.adapter}-components`) }
+
+    if (config.cache.remote) {
+      nextConfig.cacheHandlers.remote = getCacheHandlerPath(`${config.cache.adapter}-components-remote`)
+    }
+
     nextConfig.cacheMaxMemorySize = 0
     modifications.push(['componentsCache', config.cache.adapter])
+
+    if (config.cache.remote) {
+      modifications.push(['remoteComponentsCache', config.cache.adapter])
+    }
   } else {
     delete nextConfig.cacheHandlers
     nextConfig.cacheHandler = getCacheHandlerPath(`${config.cache.adapter}-isr`)

package/lib/caching/valkey-components-remote.js

@@ -0,0 +1,22 @@
+import { CacheHandler } from './valkey-components.js'
+
+export const CACHE_HIT_METRIC = {
+  name: 'next_remote_components_cache_valkey_hit_count',
+  help: 'Next.js Remote Components Cache (Valkey) Hit Count'
+}
+export const CACHE_MISS_METRIC = {
+  name: 'next_remote_components_cache_valkey_miss_count',
+  help: 'Next.js Remote Components Cache (Valkey) Miss Count'
+}
+
+export const sections = {
+  values: 'remote:components:values',
+  tags: 'remote:components:tags'
+}
+
+export default new CacheHandler({
+  configKey: 'remote',
+  sections,
+  cacheHitMetric: CACHE_HIT_METRIC,
+  cacheMissMetric: CACHE_MISS_METRIC
+})

package/lib/caching/valkey-components.js

@@ -35,20 +35,30 @@ export class CacheHandler {
   #subprefix
   #meta
   #maxTTL
+  #sections
   #cacheHitMetric
   #cacheMissMetric
+  #cacheHitMetricDef
+  #cacheMissMetricDef
 
-  constructor () {
+  constructor (options) {
+    options ??= {}
     ensureRedis()
     ensureMsgpackr()
 
-    this.#config ??= globalThis.platformatic.config.cache
+    const baseConfig = globalThis.platformatic.config.cache
+    const resolvedConfig = options.configKey ? { ...baseConfig, ...baseConfig[options.configKey] } : baseConfig
+
+    this.#config ??= resolvedConfig
     this.#logger ??= createPlatformaticLogger()
     this.#store ??= getConnection(this.#config.url)
     this.#maxTTL ??= this.#config.maxTTL
     this.#prefix ??= this.#config.prefix
     this.#subprefix ??= getPlatformaticSubprefix()
     this.#meta ??= getPlatformaticMeta()
+    this.#sections = options.sections ?? sections
+    this.#cacheHitMetricDef = options.cacheHitMetric ?? CACHE_HIT_METRIC
+    this.#cacheMissMetricDef = options.cacheMissMetric ?? CACHE_MISS_METRIC
 
     if (!this.#config) {
       throw new Error('Please provide a the "config" option.')
@@ -70,7 +80,7 @@ export class CacheHandler {
   async get (cacheKey, _, isRedisKey) {
     this.#logger.trace({ key: cacheKey }, 'cache get')
 
-    const key = isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
+    const key = isRedisKey ? cacheKey : this.#keyFor(cacheKey, this.#sections.values)
 
     let rawValue
     try {
@@ -131,7 +141,7 @@ export class CacheHandler {
 
     this.#logger.trace({ key: cacheKey, value, tags, revalidate }, 'cache set')
 
-    const key = isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
+    const key = isRedisKey ? cacheKey : this.#keyFor(cacheKey, this.#sections.values)
 
     try {
       // Gather the value
@@ -147,7 +157,11 @@ export class CacheHandler {
         value: Buffer.concat(chunks),
         ...data
       })
-      const expire = Math.min(revalidate, expireSec, this.#maxTTL)
+      // revalidate === false means "cache forever" in Next.js (SSG/force-static pages).
+      // Use maxTTL as the expiration in that case.
+      const effectiveRevalidate = revalidate === false ? this.#maxTTL : revalidate
+      const effectiveExpire = expireSec === false ? this.#maxTTL : expireSec
+      const expire = Math.min(effectiveRevalidate, effectiveExpire, this.#maxTTL)
 
       if (expire < 1) {
         return
@@ -160,7 +174,7 @@ export class CacheHandler {
       // As Next.js limits tags to 64, we don't need to manage batches here
       if (Array.isArray(tags)) {
         for (const tag of tags) {
-          const tagsKey = this.#keyFor(tag, sections.tags)
+          const tagsKey = this.#keyFor(tag, this.#sections.tags)
           promises.push(this.#store.sadd(tagsKey, key))
           promises.push(this.#store.expire(tagsKey, expire))
         }
@@ -191,7 +205,7 @@ export class CacheHandler {
       const toDelete = new Set()
 
       for (const tag of tags) {
-        const tagsKey = this.#keyFor(tag, sections.tags)
+        const tagsKey = this.#keyFor(tag, this.#sections.tags)
 
         // For each key in the tag set, expire the key
         for await (const keys of this.#store.sscanStream(tagsKey)) {
@@ -228,7 +242,7 @@ export class CacheHandler {
 
     if (Array.isArray(value.tags)) {
       for (const tag of value.tags) {
-        const tagsKey = this.#keyFor(tag, sections.tags)
+        const tagsKey = this.#keyFor(tag, this.#sections.tags)
         promises.push(this.#store.expire(tagsKey, expire, 'gt'))
       }
     }
@@ -244,18 +258,18 @@ export class CacheHandler {
     const { client, registry } = globalThis.platformatic.prometheus
 
     this.#cacheHitMetric =
-      registry.getSingleMetric(CACHE_HIT_METRIC.name) ??
+      registry.getSingleMetric(this.#cacheHitMetricDef.name) ??
       new client.Counter({
-        name: CACHE_HIT_METRIC.name,
-        help: CACHE_HIT_METRIC.help,
+        name: this.#cacheHitMetricDef.name,
+        help: this.#cacheHitMetricDef.help,
         registers: [registry]
       })
 
     this.#cacheMissMetric =
-      registry.getSingleMetric(CACHE_MISS_METRIC.name) ??
+      registry.getSingleMetric(this.#cacheMissMetricDef.name) ??
       new client.Counter({
-        name: CACHE_MISS_METRIC.name,
-        help: CACHE_MISS_METRIC.help,
+        name: this.#cacheMissMetricDef.name,
+        help: this.#cacheMissMetricDef.help,
         registers: [registry]
       })
   }

package/lib/caching/valkey-isr.js

@@ -146,7 +146,9 @@ export class CacheHandler {
         maxTTL: this.#maxTTL,
         ...this.#meta
       })
-      const expire = Math.min(revalidate, this.#maxTTL)
+      // revalidate === false means "cache forever" in Next.js (SSG/force-static pages).
+      // Use maxTTL as the expiration in that case.
+      const expire = revalidate === false ? this.#maxTTL : Math.min(revalidate, this.#maxTTL)
 
       if (expire < 1) {
         return

package/lib/capability.js

@@ -400,6 +400,10 @@ export class NextCapability extends BaseCapability {
       } else if (pltNextModifications.componentsCache) {
         nextConfig.cacheHandler = getCacheHandlerPath('null-isr')
         nextConfig.cacheHandlers.default = getCacheHandlerPath(`${pltNextModifications.componentsCache}-components`)
+
+        if (pltNextModifications.remoteComponentsCache) {
+          nextConfig.cacheHandlers.remote = getCacheHandlerPath(`${pltNextModifications.remoteComponentsCache}-components-remote`)
+        }
       }
     }
 
@@ -501,8 +505,24 @@ export class NextCapability extends BaseCapability {
       const requiredServerFilesPath = resolvePath(distDir, 'required-server-files.json')
       const requiredServerFiles = JSON.parse(await readFile(requiredServerFilesPath, 'utf-8'))
 
+      let modified = false
+
       if (requiredServerFiles.config.cacheHandler) {
         requiredServerFiles.config.cacheHandler = resolvePath(distDir, requiredServerFiles.config.cacheHandler)
+        modified = true
+      }
+
+      if (requiredServerFiles.config.cacheHandlers?.default) {
+        requiredServerFiles.config.cacheHandlers.default = resolvePath(distDir, requiredServerFiles.config.cacheHandlers.default)
+        modified = true
+      }
+
+      if (requiredServerFiles.config.cacheHandlers?.remote) {
+        requiredServerFiles.config.cacheHandlers.remote = resolvePath(distDir, requiredServerFiles.config.cacheHandlers.remote)
+        modified = true
+      }
+
+      if (modified) {
         await writeFile(requiredServerFilesPath, JSON.stringify(requiredServerFiles, null, 2))
       }
     }

package/lib/schema.js

@@ -53,6 +53,29 @@ export const cache = {
           type: 'string'
         }
       ]
+    },
+    remote: {
+      type: 'object',
+      properties: {
+        url: {
+          type: 'string'
+        },
+        prefix: {
+          type: 'string'
+        },
+        maxTTL: {
+          anyOf: [
+            {
+              type: 'number',
+              minimum: 0
+            },
+            {
+              type: 'string'
+            }
+          ]
+        }
+      },
+      additionalProperties: false
     }
   },
   required: ['adapter', 'url'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "3.49.1",
+  "version": "3.50.0",
   "description": "Platformatic Next.js Capability",
   "main": "index.js",
   "type": "module",
@@ -25,8 +25,8 @@
     "light-my-request": "^6.0.0",
     "msgpackr": "^1.11.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "3.49.1",
-    "@platformatic/foundation": "3.49.1"
+    "@platformatic/foundation": "3.50.0",
+    "@platformatic/basic": "3.50.0"
   },
   "devDependencies": {
     "@fastify/reply-from": "^12.0.0",
@@ -43,8 +43,8 @@
     "next": "^16.1.0",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/gateway": "3.49.1",
-    "@platformatic/service": "3.49.1"
+    "@platformatic/gateway": "3.50.0",
+    "@platformatic/service": "3.50.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.49.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.50.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Config",
   "type": "object",
@@ -393,6 +393,9 @@
         "preferLocalCommands": {
           "type": "boolean",
           "default": true
+        },
+        "processSpawner": {
+          "type": "string"
         }
       },
       "additionalProperties": false,
@@ -2682,6 +2685,29 @@
               "type": "string"
             }
           ]
+        },
+        "remote": {
+          "type": "object",
+          "properties": {
+            "url": {
+              "type": "string"
+            },
+            "prefix": {
+              "type": "string"
+            },
+            "maxTTL": {
+              "anyOf": [
+                {
+                  "type": "number",
+                  "minimum": 0
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            }
+          },
+          "additionalProperties": false
         }
       },
       "required": [