@platformatic/next 3.38.1 → 3.39.0

package/config.d.ts

@@ -55,6 +55,10 @@ export interface PlatformaticNextJsConfig {
     customLevels?: {
       [k: string]: unknown;
     };
+    openTelemetryExporter?: {
+      protocol: "grpc" | "http";
+      url: string;
+    };
     [k: string]: unknown;
   };
   server?: {
@@ -186,6 +190,10 @@ export interface PlatformaticNextJsConfig {
       customLevels?: {
         [k: string]: unknown;
       };
+      openTelemetryExporter?: {
+        protocol: "grpc" | "http";
+        url: string;
+      };
       [k: string]: unknown;
     };
     server?: {
@@ -648,6 +656,12 @@ export interface PlatformaticNextJsConfig {
     standalone?: boolean;
     trailingSlash?: boolean;
     useExperimentalAdapter?: boolean;
+    https?: {
+      enabled?: boolean | string;
+      key?: string;
+      cert?: string;
+      ca?: string;
+    };
   };
   cache?: {
     enabled?: boolean | string;

package/index.js

@@ -106,7 +106,6 @@ export async function create (configOrRoot, sourceOrConfig, context) {
   return new NextCapability(config[kMetadata].root, config, context)
 }
 
-export * as cachingValkey from './lib/caching/valkey-isr.js'
 export * from './lib/capability.js'
 export * as errors from './lib/errors.js'
 export { packageJson, schema, schemaComponents, version } from './lib/schema.js'

package/lib/caching/valkey-common.js

@@ -1,12 +1,24 @@
 import { buildPinoFormatters, buildPinoTimestamp } from '@platformatic/foundation'
-import { Redis } from 'iovalkey'
-import { pack, unpack } from 'msgpackr'
+import { createRequire } from 'node:module'
 import { existsSync, readFileSync } from 'node:fs'
 import { hostname } from 'node:os'
 import { resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { pino } from 'pino'
 
+// commonjs require is superior because it allows lazy loading
+const require = createRequire(import.meta.url)
+
+let Redis
+let msgpackr
+
+function loadMsgpackr () {
+  if (!msgpackr) {
+    msgpackr = require('msgpackr')
+  }
+  return msgpackr
+}
+
 globalThis.platformatic ??= {}
 globalThis.platformatic.valkeyClients = new Map()
 
@@ -34,6 +46,10 @@ export function getConnection (url) {
   let client = globalThis.platformatic.valkeyClients.get(url)
 
   if (!client) {
+    if (!Redis) {
+      Redis = require('iovalkey').Redis
+      loadMsgpackr()
+    }
     client = new Redis(url, { enableAutoPipelining: true })
     globalThis.platformatic.valkeyClients.set(url, client)
 
@@ -93,9 +109,9 @@ export function getPlatformaticMeta () {
 }
 
 export function serialize (data) {
-  return pack(data).toString('base64url')
+  return loadMsgpackr().pack(data).toString('base64url')
 }
 
 export function deserialize (data) {
-  return unpack(Buffer.from(data, 'base64url'))
+  return loadMsgpackr().unpack(Buffer.from(data, 'base64url'))
 }

package/lib/capability.js

@@ -239,21 +239,71 @@ export class NextCapability extends BaseCapability {
       this.#ensurePipeableStreamsInFork()
 
       if (this.#nextVersion.major === 14 && this.#nextVersion.minor < 2) {
-        await nextDev({
+        const devOptions = {
           '--hostname': serverOptions.host,
           '--port': serverOptions.port,
           _: [this.root]
-        })
+        }
+
+        const httpsOptions = this.config.next?.https ?? {}
+
+        if (httpsOptions.enabled) {
+          devOptions['--experimental-https-key'] = true
+
+          if (httpsOptions.key) {
+            devOptions['--experimental-https-key'] = resolvePath(this.root, httpsOptions.key)
+          }
+
+          if (httpsOptions.cert) {
+            devOptions['--experimental-https-cert'] = resolvePath(this.root, httpsOptions.cert)
+          }
+
+          if (httpsOptions.ca) {
+            devOptions['--experimental-https-ca'] = resolvePath(this.root, httpsOptions.ca)
+          }
+        }
+
+        await nextDev(devOptions)
       } else {
+        const nextConfig = this.config.next ?? {}
+        const httpsOptions = nextConfig.https ?? {}
+
+        if (httpsOptions.enabled) {
+          serverOptions.experimentalHttps = true
+
+          if (httpsOptions.key) {
+            serverOptions.experimentalHttpsKey = resolvePath(this.root, httpsOptions.key)
+          }
+
+          if (httpsOptions.cert) {
+            serverOptions.experimentalHttpsCert = resolvePath(this.root, httpsOptions.cert)
+          }
+
+          if (httpsOptions.ca) {
+            serverOptions.experimentalHttpsCa = resolvePath(this.root, httpsOptions.ca)
+          }
+        }
+
         await nextDev(serverOptions, 'default', this.root)
       }
 
       this.#child = await childPromise
-      this.#child.stdout.setEncoding('utf8')
-      this.#child.stderr.setEncoding('utf8')
 
-      this.#child.stdout.pipe(process.stdout, { end: false })
-      this.#child.stderr.pipe(process.stderr, { end: false })
+      // Paolo: I couldn't really reproduce this, but in some environments our child_process patch
+      // might not work and thus the stdio streams are not pipeable.
+      // Rathen than throwing an error in that case, we log a warning and continue without redirecting the output,
+      // as the worst thing is that the user will lose our formatted output.
+      //
+      // This should be fixable once https://github.com/nodejs/node/pull/61836 lands and it is broadly available.
+      if (typeof this.#child.stdout?.pipe === 'function' && typeof this.#child.stderr?.pipe === 'function') {
+        this.#child.stdout.setEncoding('utf8')
+        this.#child.stderr.setEncoding('utf8')
+
+        this.#child.stdout.pipe(process.stdout, { end: false })
+        this.#child.stderr.pipe(process.stderr, { end: false })
+      } else {
+        this.logger.warn('Unable to redirect Next.js development server output to the main process')
+      }
     } finally {
       await this.childManager.eject()
     }
@@ -493,7 +543,8 @@ export class NextCapability extends BaseCapability {
 
     try {
       serverModule = createRequire(serverEntrypoint)('next/dist/server/lib/start-server.js')
-    } catch (e) { // Fallback to bundled capability
+    } catch (e) {
+      // Fallback to bundled capability
       serverModule = createRequire(import.meta.file)('next/dist/server/lib/start-server.js')
     }
 

package/lib/schema.js

@@ -63,7 +63,7 @@ const next = {
   type: 'object',
   properties: {
     standalone: {
-      type: 'boolean',
+      type: 'boolean'
     },
     trailingSlash: {
       type: 'boolean',
@@ -72,6 +72,31 @@ const next = {
     useExperimentalAdapter: {
       type: 'boolean',
       default: false
+    },
+    https: {
+      type: 'object',
+      properties: {
+        enabled: {
+          anyOf: [
+            {
+              type: 'boolean'
+            },
+            {
+              type: 'string'
+            }
+          ]
+        },
+        key: {
+          type: 'string'
+        },
+        cert: {
+          type: 'string'
+        },
+        ca: {
+          type: 'string'
+        }
+      },
+      additionalProperties: false
     }
   },
   default: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "3.38.1",
+  "version": "3.39.0",
   "description": "Platformatic Next.js Capability",
   "main": "index.js",
   "type": "module",
@@ -23,8 +23,8 @@
     "iovalkey": "^0.3.0",
     "msgpackr": "^1.11.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "3.38.1",
-    "@platformatic/foundation": "3.38.1"
+    "@platformatic/foundation": "3.39.0",
+    "@platformatic/basic": "3.39.0"
   },
   "devDependencies": {
     "@fastify/reply-from": "^12.0.0",
@@ -37,11 +37,11 @@
     "fastify": "^5.7.0",
     "json-schema-to-typescript": "^15.0.1",
     "neostandard": "^0.12.0",
-    "next": "^16.0.0",
+    "next": "^16.1.0",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/service": "3.38.1",
-    "@platformatic/gateway": "3.38.1"
+    "@platformatic/gateway": "3.39.0",
+    "@platformatic/service": "3.39.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.38.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.39.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Config",
   "type": "object",
@@ -152,6 +152,26 @@
         "customLevels": {
           "type": "object",
           "additionalProperties": true
+        },
+        "openTelemetryExporter": {
+          "type": "object",
+          "properties": {
+            "protocol": {
+              "type": "string",
+              "enum": [
+                "grpc",
+                "http"
+              ]
+            },
+            "url": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "protocol",
+            "url"
+          ],
+          "additionalProperties": false
         }
       },
       "default": {},
@@ -935,6 +955,26 @@
             "customLevels": {
               "type": "object",
               "additionalProperties": true
+            },
+            "openTelemetryExporter": {
+              "type": "object",
+              "properties": {
+                "protocol": {
+                  "type": "string",
+                  "enum": [
+                    "grpc",
+                    "http"
+                  ]
+                },
+                "url": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "protocol",
+                "url"
+              ],
+              "additionalProperties": false
             }
           },
           "default": {},
@@ -2372,6 +2412,31 @@
         "useExperimentalAdapter": {
           "type": "boolean",
           "default": false
+        },
+        "https": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "anyOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            },
+            "key": {
+              "type": "string"
+            },
+            "cert": {
+              "type": "string"
+            },
+            "ca": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
         }
       },
       "default": {},