@platformatic/next 2.21.0-alpha.1 → 2.21.0

package/lib/caching/valkey.js

@@ -38,31 +38,60 @@ export function getConnection (url) {
 }
 
 export class CacheHandler {
+  #standalone
   #config
   #logger
   #store
+  #prefix
   #subprefix
+  #meta
   #maxTTL
 
   constructor (options) {
     options ??= {}
 
-    this.#config = options.config ?? globalThis.platformatic?.config?.cache
+    this.#standalone = options.standalone
+    this.#config = options.config
+    this.#logger = options.logger
+    this.#store = options.store
+    this.#maxTTL = options.maxTTL
+    this.#prefix = options.prefix
+    this.#subprefix = options.subprefix
+    this.#meta = options.meta
+
+    if (globalThis.platformatic) {
+      this.#config ??= globalThis.platformatic.config.cache
+      this.#logger ??= this.#createPlatformaticLogger()
+      this.#store ??= getConnection(this.#config.url)
+      this.#maxTTL ??= this.#config.maxTTL
+      this.#prefix ??= this.#config.prefix
+      this.#subprefix ??= this.#getPlatformaticSubprefix()
+      this.#meta ??= this.#getPlatformaticMeta()
+    } else {
+      this.#config ??= {}
+      this.#maxTTL ??= 86_400
+      this.#prefix ??= ''
+      this.#subprefix ??= ''
+      this.#meta ??= {}
+    }
 
     if (!this.#config) {
-      throw new Error('Please provide a valid configuration.')
+      throw new Error('Please provide a the "config" option.')
+    }
+
+    if (!this.#logger) {
+      throw new Error('Please provide a the "logger" option.')
     }
 
-    this.#logger = options.logger ?? this.#createLogger()
-    this.#store = options.store ?? getConnection(this.#config.url)
-    this.#maxTTL = options.maxTTL ?? this.#config.maxTTL ?? 86_400
-    this.#subprefix = options.subprefix ?? this.#getSubprefix()
+    if (!this.#store) {
+      throw new Error('Please provide a the "store" option.')
+    }
   }
 
-  async get (cacheKey, isRedisKey) {
+  async get (cacheKey, _, isRedisKey) {
     this.#logger.trace({ key: cacheKey }, 'get')
 
-    const key = isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
+    const key = this.#standalone || isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
 
     let rawValue
     try {
@@ -106,11 +135,18 @@ export class CacheHandler {
   async set (cacheKey, value, { tags, revalidate }, isRedisKey) {
     this.#logger.trace({ key: cacheKey, value, tags, revalidate }, 'set')
 
-    const key = isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
+    const key = this.#standalone || isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
 
     try {
       // Compute the parameters to save
-      const data = this.#serialize({ value, tags, lastModified: Date.now(), revalidate, maxTTL: this.#maxTTL })
+      const data = this.#serialize({
+        value,
+        tags,
+        lastModified: Date.now(),
+        revalidate,
+        maxTTL: this.#maxTTL,
+        ...this.#meta
+      })
       const expire = Math.min(revalidate, this.#maxTTL)
 
       if (expire < 1) {
@@ -142,7 +178,7 @@ export class CacheHandler {
   async remove (cacheKey, isRedisKey) {
     this.#logger.trace({ key: cacheKey }, 'remove')
 
-    const key = isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
+    const key = this.#standalone || isRedisKey ? cacheKey : this.#keyFor(cacheKey, sections.values)
 
     let rawValue
     try {
@@ -177,7 +213,7 @@ export class CacheHandler {
       if (Array.isArray(value.tags)) {
         for (const tag of value.tags) {
           const tagsKey = this.#keyFor(tag, sections.tags)
-          this.#store.srem(tagsKey, key, 'gt')
+          promises.push(this.#store.srem(tagsKey, key))
         }
       }
 
@@ -247,7 +283,7 @@ export class CacheHandler {
     await Promise.all(promises)
   }
 
-  #createLogger () {
+  #createPlatformaticLogger () {
     const pinoOptions = {
       level: globalThis.platformatic?.logLevel ?? 'info'
     }
@@ -263,7 +299,7 @@ export class CacheHandler {
     return pino(pinoOptions)
   }
 
-  #getSubprefix () {
+  #getPlatformaticSubprefix () {
     const root = fileURLToPath(globalThis.platformatic.root)
 
     return existsSync(resolve(root, '.next/BUILD_ID'))
@@ -271,8 +307,15 @@ export class CacheHandler {
       : 'development'
   }
 
+  #getPlatformaticMeta () {
+    return {
+      serviceId: globalThis.platformatic.serviceId,
+      workerId: globalThis.platformatic.workerId
+    }
+  }
+
   #keyFor (key, section) {
-    return keyFor(this.#config.prefix, this.#subprefix, section, key)
+    return keyFor(this.#prefix, this.#subprefix, section, key)
   }
 
   #serialize (data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "2.21.0-alpha.1",
+  "version": "2.21.0",
   "description": "Platformatic Next.js Stackable",
   "main": "index.js",
   "type": "module",
@@ -23,9 +23,9 @@
     "iovalkey": "^0.2.1",
     "msgpackr": "^1.11.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "2.21.0-alpha.1",
-    "@platformatic/config": "2.21.0-alpha.1",
-    "@platformatic/utils": "2.21.0-alpha.1"
+    "@platformatic/basic": "2.21.0",
+    "@platformatic/utils": "2.21.0",
+    "@platformatic/config": "2.21.0"
   },
   "devDependencies": {
     "@fastify/reply-from": "^11.0.0",
@@ -41,8 +41,8 @@
     "react-dom": "^18.3.1",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/composer": "2.21.0-alpha.1",
-    "@platformatic/service": "2.21.0-alpha.1"
+    "@platformatic/composer": "2.21.0",
+    "@platformatic/service": "2.21.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --no-timeout",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.21.0-alpha.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.21.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Stackable",
   "type": "object",