@platformatic/next 3.55.0 → 3.57.0

package/config.d.ts

@@ -352,6 +352,33 @@ export interface PlatformaticNextJsConfig {
           enabled?: boolean | string;
           hostname?: string;
           endpoint?: string;
+          https?: {
+            allowHTTP1?: boolean;
+            key:
+              | string
+              | {
+                  path?: string;
+                }
+              | (
+                  | string
+                  | {
+                      path?: string;
+                    }
+                )[];
+            cert:
+              | string
+              | {
+                  path?: string;
+                }
+              | (
+                  | string
+                  | {
+                      path?: string;
+                    }
+                )[];
+            requestCert?: boolean;
+            rejectUnauthorized?: boolean;
+          };
           auth?: {
             username: string;
             password: string;
@@ -490,6 +517,14 @@ export interface PlatformaticNextJsConfig {
                * The path to write the traces to. Only for file exporter.
                */
               path?: string;
+              /**
+               * The OTLP transport protocol to use. Only for the otlp exporter. Defaults to http.
+               */
+              protocol?: "http" | "grpc";
+              /**
+               * Alias for protocol. Only for the otlp exporter. Defaults to http.
+               */
+              transport?: "http" | "grpc";
               [k: string]: unknown;
             };
             additionalProperties?: never;
@@ -515,6 +550,14 @@ export interface PlatformaticNextJsConfig {
                * The path to write the traces to. Only for file exporter.
                */
               path?: string;
+              /**
+               * The OTLP transport protocol to use. Only for the otlp exporter. Defaults to http.
+               */
+              protocol?: "http" | "grpc";
+              /**
+               * Alias for protocol. Only for the otlp exporter. Defaults to http.
+               */
+              transport?: "http" | "grpc";
               [k: string]: unknown;
             };
             additionalProperties?: never;

package/index.js

@@ -1,4 +1,5 @@
 import { kMetadata } from '@platformatic/foundation'
+import { getBasePath, getConfig, getLogger, getNextVersion, getNotifyConfig } from '@platformatic/globals'
 import { resolve as resolvePath } from 'node:path'
 import { getCacheHandlerPath, NextCapability } from './lib/capability.js'
 import { loadConfiguration } from './lib/config.js'
@@ -9,7 +10,9 @@ export function getAdapterPath () {
 }
 
 function enhanceNextCacheConfig (nextConfig, modifications) {
-  const { config, nextVersion, logger } = globalThis.platformatic
+  const config = getConfig()
+  const nextVersion = getNextVersion()
+  const logger = getLogger()
 
   if (!config.cache?.adapter || config.cache?.enabled === false) return
 
@@ -62,7 +65,9 @@ export async function enhanceNextConfig (nextConfig, ...args) {
     nextConfig = await nextConfig(...args)
   }
 
-  const { basePath, config } = globalThis.platformatic
+  const basePath = getBasePath()
+  const config = getConfig()
+  const notifyConfig = getNotifyConfig()
 
   if (typeof nextConfig.basePath === 'undefined') {
     nextConfig.basePath = basePath
@@ -82,7 +87,7 @@ export async function enhanceNextConfig (nextConfig, ...args) {
     nextConfig.env.PLT_NEXT_MODIFICATIONS = JSON.stringify(Object.fromEntries(modifications))
   }
 
-  globalThis.platformatic.notifyConfig(nextConfig)
+  notifyConfig(nextConfig)
   return nextConfig
 }
 

package/lib/caching/valkey-common.js

@@ -1,4 +1,14 @@
 import { buildPinoFormatters, buildPinoTimestamp } from '@platformatic/foundation'
+import {
+  getApplicationId,
+  getConfig,
+  getEvents,
+  getLogLevel,
+  getRoot,
+  getValkeyClients,
+  getWorkerId,
+  updateGlobals
+} from '@platformatic/globals'
 import { existsSync, readFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import { hostname } from 'node:os'
@@ -12,8 +22,7 @@ const require = createRequire(import.meta.url)
 let Redis
 let msgpackr
 
-globalThis.platformatic ??= {}
-globalThis.platformatic.valkeyClients = new Map()
+updateGlobals({ valkeyClients: new Map() })
 
 export function keyFor (prefix, subprefix, section, key) {
   let result = prefix?.length ? prefix + ':' : ''
@@ -48,13 +57,15 @@ export function ensureMsgpackr () {
 }
 
 export function getConnection (url) {
-  let client = globalThis.platformatic.valkeyClients.get(url)
+  const valkeyClients = getValkeyClients()
+  let client = valkeyClients.get(url)
 
   if (!client) {
     client = new Redis(url, { enableAutoPipelining: true })
-    globalThis.platformatic.valkeyClients.set(url, client)
+    valkeyClients.set(url, client)
 
-    globalThis.platformatic.events.on('plt:next:close', () => {
+    const events = getEvents()
+    events.on('plt:next:close', () => {
       client.disconnect(false)
     })
   }
@@ -63,11 +74,12 @@ export function getConnection (url) {
 }
 
 export function createPlatformaticLogger () {
-  const loggerConfig = globalThis.platformatic?.config?.logger
+  const config = getConfig()
+  const loggerConfig = config.logger
 
   const pinoOptions = {
     ...loggerConfig,
-    level: globalThis.platformatic?.logLevel ?? loggerConfig?.level ?? 'info'
+    level: getLogLevel({ throwOnMissing: false }) ?? loggerConfig?.level ?? 'info'
   }
   if (pinoOptions.formatters) {
     pinoOptions.formatters = buildPinoFormatters(pinoOptions.formatters)
@@ -76,8 +88,9 @@ export function createPlatformaticLogger () {
     pinoOptions.timestamp = buildPinoTimestamp(pinoOptions.timestamp)
   }
 
-  if (globalThis.platformatic?.applicationId) {
-    pinoOptions.name = `cache:${globalThis.platformatic.applicationId}`
+  const applicationId = getApplicationId()
+  if (applicationId) {
+    pinoOptions.name = `cache:${applicationId}`
   }
 
   if (pinoOptions.base !== null) {
@@ -85,7 +98,7 @@ export function createPlatformaticLogger () {
       ...(pinoOptions.base ?? {}),
       pid: process.pid,
       hostname: hostname(),
-      worker: globalThis.platformatic?.workerId
+      worker: getWorkerId()
     }
   } else if (pinoOptions.base === null) {
     pinoOptions.base = undefined
@@ -95,7 +108,7 @@ export function createPlatformaticLogger () {
 }
 
 export function getPlatformaticSubprefix () {
-  const root = fileURLToPath(globalThis.platformatic.root)
+  const root = fileURLToPath(getRoot())
 
   return existsSync(resolve(root, '.next/BUILD_ID'))
     ? readFileSync(resolve(root, '.next/BUILD_ID'), 'utf-8').trim()
@@ -104,8 +117,8 @@ export function getPlatformaticSubprefix () {
 
 export function getPlatformaticMeta () {
   return {
-    applicationId: globalThis.platformatic.applicationId,
-    workerId: globalThis.platformatic.workerId
+    applicationId: getApplicationId(),
+    workerId: getWorkerId()
   }
 }
 

package/lib/caching/valkey-components.js

@@ -1,4 +1,5 @@
 import { ensureLoggableError } from '@platformatic/foundation'
+import { getConfig, getPrometheus, hasField } from '@platformatic/globals'
 import { ReadableStream } from 'node:stream/web'
 import {
   createPlatformaticLogger,
@@ -46,7 +47,8 @@ export class CacheHandler {
     ensureRedis()
     ensureMsgpackr()
 
-    const baseConfig = globalThis.platformatic.config.cache
+    const platformaticConfig = getConfig()
+    const baseConfig = platformaticConfig.cache
     const resolvedConfig = options.configKey ? { ...baseConfig, ...baseConfig[options.configKey] } : baseConfig
 
     this.#config ??= resolvedConfig
@@ -72,7 +74,7 @@ export class CacheHandler {
       throw new Error('Please provide a the "store" option.')
     }
 
-    if (globalThis.platformatic) {
+    if (hasField('prometheus')) {
       this.#registerMetrics()
     }
   }
@@ -255,7 +257,7 @@ export class CacheHandler {
   }
 
   #registerMetrics () {
-    const { client, registry } = globalThis.platformatic.prometheus
+    const { client, registry } = getPrometheus()
 
     this.#cacheHitMetric =
       registry.getSingleMetric(this.#cacheHitMetricDef.name) ??

package/lib/caching/valkey-isr.js

@@ -1,4 +1,5 @@
 import { ensureLoggableError } from '@platformatic/foundation'
+import { getConfig, getPrometheus, hasField } from '@platformatic/globals'
 import {
   createPlatformaticLogger,
   deserialize,
@@ -47,8 +48,10 @@ export class CacheHandler {
     this.#subprefix = options.subprefix
     this.#meta = options.meta
 
-    if (!this.#standalone && globalThis.platformatic?.config) {
-      this.#config ??= globalThis.platformatic.config.cache
+    const platformaticConfig = getConfig({ throwOnMissing: false })
+
+    if (!this.#standalone && platformaticConfig) {
+      this.#config ??= platformaticConfig.cache
       this.#logger ??= createPlatformaticLogger()
       this.#store ??= getConnection(this.#config.url)
       this.#maxTTL ??= this.#config.maxTTL
@@ -75,7 +78,7 @@ export class CacheHandler {
       throw new Error('Please provide a the "store" option.')
     }
 
-    if (globalThis.platformatic?.prometheus) {
+    if (hasField('prometheus')) {
       this.#registerMetrics()
     }
   }
@@ -286,7 +289,7 @@ export class CacheHandler {
   }
 
   #registerMetrics () {
-    const { client, registry } = globalThis.platformatic.prometheus
+    const { client, registry } = getPrometheus()
 
     this.#cacheHitMetric =
       registry.getSingleMetric(CACHE_HIT_METRIC.name) ??

package/lib/capability.js

@@ -9,6 +9,7 @@ import {
   importFile,
   resolvePackageViaCJS
 } from '@platformatic/basic'
+import { getEvents, updateGlobals } from '@platformatic/globals'
 import { ChildProcess } from 'node:child_process'
 import { once } from 'node:events'
 import { readFile, writeFile } from 'node:fs/promises'
@@ -115,7 +116,8 @@ export class NextCapability extends BaseCapability {
       return this.stopCommand()
     }
 
-    globalThis.platformatic.events.emit('plt:next:close')
+    const events = getEvents()
+    events.emit('plt:next:close')
 
     if (this.isProduction && this.#server) {
       await this._closeServer(this.#server)
@@ -339,7 +341,7 @@ export class NextCapability extends BaseCapability {
 
   async #startProductionNext () {
     try {
-      globalThis.platformatic.config = this.config
+      updateGlobals({ config: this.config })
       await this.childManager.inject()
       const { nextStart } = await importFile(resolvePath(this.#next, './dist/cli/next-start.js'))
 

package/lib/image-optimizer.js

@@ -9,6 +9,7 @@ import {
 } from '@platformatic/basic'
 import { cleanBasePath } from '@platformatic/basic/lib/utils.js'
 import { ensureLoggableError } from '@platformatic/foundation/lib/errors.js'
+import { getEvents } from '@platformatic/globals'
 import { createQueue } from '@platformatic/image-optimizer'
 import { FileStorage, MemoryStorage, RedisStorage } from '@platformatic/job-queue'
 import inject from 'light-my-request'
@@ -123,7 +124,8 @@ export class NextImageOptimizerCapability extends BaseCapability {
     await super.stop()
     await this.#queue?.stop()
 
-    globalThis.platformatic.events.emit('plt:next:close')
+    const events = getEvents()
+    events.emit('plt:next:close')
 
     if (!this.#app || !this.#server?.listening) {
       return

package/lib/loader-next-15.cjs

@@ -15,10 +15,11 @@ const {
   variableDeclarator
 } = require('@babel/types')
 const { transformSync } = require('amaro')
+const { getConfig, getRoot } = require('@platformatic/globals')
 
 const originalReadFile = fsPromises.readFile
 const originalReadFileSync = fs.readFileSync
-const targetFile = resolve(fileURLToPath(globalThis.platformatic.root), 'next.config.ts')
+const targetFile = resolve(fileURLToPath(getRoot()), 'next.config.ts')
 
 const originalId = '__pltEnhanceNextConfig'
 
@@ -122,8 +123,9 @@ function restoreReadMethods () {
 
 async function patchNextConfigTS (contents) {
   let transformed = contents
+  const config = getConfig()
 
-  if (!globalThis.platformatic.config.next?.useExperimentalAdapter) {
+  if (!config.next?.useExperimentalAdapter) {
     const { code } = transformSync(contents.toString('utf-8'), { mode: 'strip-only' })
     const transformer = detectFormat(code) === 'esm' ? transformESM : transformCJS
     transformed = transformer(code)
@@ -157,7 +159,9 @@ fs.readFileSync = function readAndPatchNextConfigTSSync (url, options) {
     return contents
   }
 
-  if (globalThis.platformatic.config.next?.useExperimentalAdapter) {
+  const config = getConfig()
+
+  if (config.next?.useExperimentalAdapter) {
     return contents
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "3.55.0",
+  "version": "3.57.0",
   "description": "Platformatic Next.js Capability",
   "main": "index.js",
   "type": "module",
@@ -20,13 +20,14 @@
     "@babel/traverse": "^7.25.3",
     "@babel/types": "^7.25.2",
     "@platformatic/image-optimizer": "^0.2.1",
-    "amaro": "^0.3.0",
+    "amaro": "^1.0.0",
     "iovalkey": "^0.3.0",
     "light-my-request": "^6.0.0",
     "msgpackr": "^1.11.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "3.55.0",
-    "@platformatic/foundation": "3.55.0"
+    "@platformatic/globals": "3.57.0",
+    "@platformatic/foundation": "3.57.0",
+    "@platformatic/basic": "3.57.0"
   },
   "devDependencies": {
     "@fastify/reply-from": "^12.0.0",
@@ -43,8 +44,8 @@
     "next": "^16.1.0",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/gateway": "3.55.0",
-    "@platformatic/service": "3.55.0"
+    "@platformatic/service": "3.57.0",
+    "@platformatic/gateway": "3.57.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.55.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.57.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Config",
   "type": "object",
@@ -1616,6 +1616,99 @@
                 "endpoint": {
                   "type": "string"
                 },
+                "https": {
+                  "type": "object",
+                  "properties": {
+                    "allowHTTP1": {
+                      "type": "boolean"
+                    },
+                    "key": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "path": {
+                              "type": "string",
+                              "resolvePath": true
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "array",
+                          "items": {
+                            "anyOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "object",
+                                "properties": {
+                                  "path": {
+                                    "type": "string",
+                                    "resolvePath": true
+                                  }
+                                },
+                                "additionalProperties": false
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "cert": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "path": {
+                              "type": "string",
+                              "resolvePath": true
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "array",
+                          "items": {
+                            "anyOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "object",
+                                "properties": {
+                                  "path": {
+                                    "type": "string",
+                                    "resolvePath": true
+                                  }
+                                },
+                                "additionalProperties": false
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    "requestCert": {
+                      "type": "boolean"
+                    },
+                    "rejectUnauthorized": {
+                      "type": "boolean"
+                    }
+                  },
+                  "additionalProperties": false,
+                  "required": [
+                    "key",
+                    "cert"
+                  ]
+                },
                 "auth": {
                   "type": "object",
                   "properties": {
@@ -1931,6 +2024,22 @@
                           "path": {
                             "type": "string",
                             "description": "The path to write the traces to. Only for file exporter."
+                          },
+                          "protocol": {
+                            "type": "string",
+                            "enum": [
+                              "http",
+                              "grpc"
+                            ],
+                            "description": "The OTLP transport protocol to use. Only for the otlp exporter. Defaults to http."
+                          },
+                          "transport": {
+                            "type": "string",
+                            "enum": [
+                              "http",
+                              "grpc"
+                            ],
+                            "description": "Alias for protocol. Only for the otlp exporter. Defaults to http."
                           }
                         }
                       },
@@ -1967,6 +2076,22 @@
                         "path": {
                           "type": "string",
                           "description": "The path to write the traces to. Only for file exporter."
+                        },
+                        "protocol": {
+                          "type": "string",
+                          "enum": [
+                            "http",
+                            "grpc"
+                          ],
+                          "description": "The OTLP transport protocol to use. Only for the otlp exporter. Defaults to http."
+                        },
+                        "transport": {
+                          "type": "string",
+                          "enum": [
+                            "http",
+                            "grpc"
+                          ],
+                          "description": "Alias for protocol. Only for the otlp exporter. Defaults to http."
                         }
                       }
                     },