@platformatic/runtime 2.19.0-alpha.5 → 2.19.0-alpha.6

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime2190Alpha5Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime2190Alpha6Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;
@@ -133,17 +133,6 @@ export type HttpsSchemasPlatformaticDevPlatformaticRuntime2190Alpha5Json = {
         };
     [k: string]: unknown;
   };
-  httpCache?:
-    | boolean
-    | {
-        store?: string;
-        /**
-         * @minItems 1
-         */
-        methods?: [string, ...string[]];
-        cacheTagsHeader?: string;
-        [k: string]: unknown;
-      };
   watch?: boolean | string;
   managementApi?:
     | boolean

package/lib/runtime.js

@@ -16,7 +16,6 @@ const errors = require('./errors')
 const { createLogger } = require('./logger')
 const { startManagementApi } = require('./management-api')
 const { startPrometheusServer } = require('./prom-server')
-const { createSharedStore } = require('./shared-http-cache')
 const { getRuntimeTmpDir } = require('./utils')
 const { sendViaITC, waitEventFromITC } = require('./worker/itc')
 const { RoundRobinMap } = require('./worker/round-robin-map.js')
@@ -67,7 +66,6 @@ class Runtime extends EventEmitter {
   #inspectorServer
   #workers
   #restartingWorkers
-  #sharedHttpCache
 
   constructor (configManager, runtimeLogsDir, env) {
     super()
@@ -87,7 +85,6 @@ class Runtime extends EventEmitter {
     })
     this.#status = undefined
     this.#restartingWorkers = new Map()
-    this.#sharedHttpCache = null
   }
 
   async init () {
@@ -142,11 +139,6 @@ class Runtime extends EventEmitter {
       throw e
     }
 
-    this.#sharedHttpCache = createSharedStore(
-      this.#configManager.dirname,
-      config.httpCache
-    )
-
     this.#updateStatus('init')
   }
 
@@ -275,10 +267,6 @@ class Runtime extends EventEmitter {
       this.#loggerDestination = null
     }
 
-    if (this.#sharedHttpCache?.close) {
-      await this.#sharedHttpCache.close()
-    }
-
     this.#updateStatus('closed')
   }
 
@@ -741,23 +729,6 @@ class Runtime extends EventEmitter {
     return createReadStream(filePath)
   }
 
-  async invalidateHttpCache (options = {}) {
-    const { keys, tags } = options
-
-    if (!this.#sharedHttpCache) return
-
-    const promises = []
-    if (keys && keys.length > 0) {
-      promises.push(this.#sharedHttpCache.deleteKeys(keys))
-    }
-
-    if (tags && tags.length > 0) {
-      promises.push(this.#sharedHttpCache.deleteTags(tags))
-    }
-
-    await Promise.all(promises)
-  }
-
   async sendCommandToService (id, name, message) {
     const service = await this.#getServiceById(id)
 
@@ -914,18 +885,9 @@ class Runtime extends EventEmitter {
       port: worker,
       handlers: {
         getServiceMeta: this.getServiceMeta.bind(this),
-        listServices: () => this.#servicesIds,
-        getServices: this.getServices.bind(this),
-        getHttpCacheValue: opts => this.#sharedHttpCache.getValue(opts.request),
-        setHttpCacheValue: opts => this.#sharedHttpCache.setValue(
-          opts.request,
-          opts.response,
-          opts.payload
-        ),
-        deleteHttpCacheValue: opts => this.#sharedHttpCache.delete(
-          opts.request
-        ),
-        invalidateHttpCache: opts => this.invalidateHttpCache(opts),
+        listServices: () => {
+          return this.#servicesIds
+        }
       }
     })
     worker[kITC].listen()

package/lib/schema.js

@@ -194,32 +194,6 @@ const platformaticRuntimeSchema = {
         }
       }
     },
-    httpCache: {
-      oneOf: [
-        {
-          type: 'boolean'
-        },
-        {
-          type: 'object',
-          properties: {
-            store: {
-              type: 'string'
-            },
-            methods: {
-              type: 'array',
-              items: {
-                type: 'string'
-              },
-              default: ['GET', 'HEAD'],
-              minItems: 1
-            },
-            cacheTagsHeader: {
-              type: 'string'
-            }
-          }
-        }
-      ]
-    },
     watch: {
       anyOf: [
         {

package/lib/worker/main.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { EventEmitter } = require('node:events')
 const { createRequire } = require('node:module')
 const { hostname } = require('node:os')
 const { join } = require('node:path')
@@ -10,11 +11,9 @@ const diagnosticChannel = require('node:diagnostics_channel')
 const { ServerResponse } = require('node:http')
 
 const pino = require('pino')
-const { fetch, setGlobalDispatcher, getGlobalDispatcher, Agent } = require('undici')
+const { fetch, setGlobalDispatcher, Agent } = require('undici')
 const { wire } = require('undici-thread-interceptor')
-const undici = require('undici')
 
-const RemoteCacheStore = require('./http-cache')
 const { PlatformaticApp } = require('./app')
 const { setupITC } = require('./itc')
 const loadInterceptors = require('./interceptors')
@@ -37,7 +36,10 @@ globalThis[kId] = threadId
 let app
 
 const config = workerData.config
-globalThis.platformatic = Object.assign(globalThis.platformatic ?? {}, { logger: createLogger() })
+globalThis.platformatic = Object.assign(globalThis.platformatic ?? {}, {
+  logger: createLogger(),
+  events: new EventEmitter()
+})
 
 function handleUnhandled (type, err) {
   const label =
@@ -94,50 +96,22 @@ async function main () {
     }
   }
 
-  const dispatcherOpts = { ...config.undici }
-
-  if (Object.keys(interceptors).length > 0) {
-    const clientInterceptors = []
-    const poolInterceptors = []
-
-    if (interceptors.Agent) {
-      clientInterceptors.push(...interceptors.Agent)
-      poolInterceptors.push(...interceptors.Agent)
-    }
-
-    if (interceptors.Pool) {
-      poolInterceptors.push(...interceptors.Pool)
-    }
-
-    if (interceptors.Client) {
-      clientInterceptors.push(...interceptors.Client)
-    }
-
-    dispatcherOpts.factory = (origin, opts) => {
-      return opts && opts.connections === 1
-        ? new undici.Client(origin, opts).compose(clientInterceptors)
-        : new undici.Pool(origin, opts).compose(poolInterceptors)
-    }
-  }
-
-  const globalDispatcher = new Agent(dispatcherOpts)
-    .compose(composedInterceptors)
+  const globalDispatcher = new Agent({
+    ...config.undici,
+    interceptors
+  }).compose(composedInterceptors)
 
   setGlobalDispatcher(globalDispatcher)
 
   const { telemetry } = service
   const hooks = telemetry ? createTelemetryThreadInterceptorHooks() : {}
   // Setup mesh networker
-  const threadDispatcher = wire({ port: parentPort, useNetwork: service.useHttp, timeout: config.serviceTimeout, ...hooks })
-
-  if (config.httpCache) {
-    setGlobalDispatcher(
-      getGlobalDispatcher().compose(undici.interceptors.cache({
-        store: new RemoteCacheStore(),
-        methods: config.httpCache.methods ?? ['GET', 'HEAD']
-      }))
-    )
-  }
+  const threadDispatcher = wire({
+    port: parentPort,
+    useNetwork: service.useHttp,
+    timeout: config.serviceTimeout,
+    ...hooks
+  })
 
   // If the service is an entrypoint and runtime server config is defined, use it.
   let serverConfig = null
@@ -226,10 +200,7 @@ function stripBasePath (basePath) {
 
       if (headers) {
         for (const key in headers) {
-          if (
-            key.toLowerCase() === 'location' &&
-            !headers[key].startsWith(basePath)
-          ) {
+          if (key.toLowerCase() === 'location' && !headers[key].startsWith(basePath)) {
             headers[key] = basePath + headers[key]
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.19.0-alpha.5",
+  "version": "2.19.0-alpha.6",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -35,19 +35,18 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.19.0-alpha.5",
-    "@platformatic/db": "2.19.0-alpha.5",
-    "@platformatic/node": "2.19.0-alpha.5",
-    "@platformatic/sql-graphql": "2.19.0-alpha.5",
-    "@platformatic/service": "2.19.0-alpha.5",
-    "@platformatic/sql-mapper": "2.19.0-alpha.5"
+    "@platformatic/composer": "2.19.0-alpha.6",
+    "@platformatic/db": "2.19.0-alpha.6",
+    "@platformatic/node": "2.19.0-alpha.6",
+    "@platformatic/sql-mapper": "2.19.0-alpha.6",
+    "@platformatic/service": "2.19.0-alpha.6",
+    "@platformatic/sql-graphql": "2.19.0-alpha.6"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
     "@fastify/websocket": "^11.0.0",
     "@hapi/topo": "^6.0.2",
     "@platformatic/http-metrics": "^0.2.1",
-    "@platformatic/undici-cache-memory": "^0.8.0",
     "@watchable/unpromise": "^1.0.2",
     "boring-name-generator": "^1.0.3",
     "change-case-all": "^2.1.0",
@@ -68,17 +67,16 @@
     "prom-client": "^15.1.2",
     "semgrator": "^0.3.0",
     "tail-file-stream": "^0.2.0",
-    "thread-cpu-usage": "^0.2.0",
-    "undici": "7.0.0",
-    "undici-thread-interceptor": "^0.10.0",
+    "undici": "^6.9.0",
+    "undici-thread-interceptor": "^0.9.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.19.0-alpha.5",
-    "@platformatic/config": "2.19.0-alpha.5",
-    "@platformatic/generators": "2.19.0-alpha.5",
-    "@platformatic/itc": "2.19.0-alpha.5",
-    "@platformatic/telemetry": "2.19.0-alpha.5",
-    "@platformatic/utils": "2.19.0-alpha.5",
-    "@platformatic/ts-compiler": "2.19.0-alpha.5"
+    "@platformatic/basic": "2.19.0-alpha.6",
+    "@platformatic/generators": "2.19.0-alpha.6",
+    "@platformatic/config": "2.19.0-alpha.6",
+    "@platformatic/itc": "2.19.0-alpha.6",
+    "@platformatic/telemetry": "2.19.0-alpha.6",
+    "@platformatic/utils": "2.19.0-alpha.6",
+    "@platformatic/ts-compiler": "2.19.0-alpha.6"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.19.0-alpha.5.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.19.0-alpha.6.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -840,35 +840,6 @@
         }
       }
     },
-    "httpCache": {
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "store": {
-              "type": "string"
-            },
-            "methods": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              },
-              "default": [
-                "GET",
-                "HEAD"
-              ],
-              "minItems": 1
-            },
-            "cacheTagsHeader": {
-              "type": "string"
-            }
-          }
-        }
-      ]
-    },
     "watch": {
       "anyOf": [
         {

package/lib/shared-http-cache.js

@@ -1,39 +0,0 @@
-'use strict'
-
-const { join } = require('node:path')
-const { createRequire } = require('node:module')
-const MemoryCacheStore = require('@platformatic/undici-cache-memory')
-
-function createSharedStore (projectDir, httpCacheConfig = {}) {
-  const runtimeRequire = createRequire(join(projectDir, 'file'))
-
-  const { store, ...storeConfig } = httpCacheConfig
-  const CacheStore = store ? runtimeRequire(store) : MemoryCacheStore
-
-  class SharedCacheStore extends CacheStore {
-    async getValue (req) {
-      const cachedValue = await this.get(req)
-      if (!cachedValue) return null
-
-      const { body, ...response } = cachedValue
-
-      let payload = ''
-      for await (const chunk of body) {
-        payload += chunk
-      }
-
-      return { response, payload }
-    }
-
-    setValue (req, opts, data) {
-      const writeStream = this.createWriteStream(req, opts)
-      writeStream.write(data)
-      writeStream.end()
-      return null
-    }
-  }
-
-  return new SharedCacheStore(storeConfig)
-}
-
-module.exports = { createSharedStore }

package/lib/worker/http-cache.js

@@ -1,73 +0,0 @@
-'use strict'
-
-const { Readable, Writable } = require('node:stream')
-const { kITC } = require('./symbols')
-
-class RemoteCacheStore {
-  async get (request) {
-    const itc = globalThis[kITC]
-    if (!itc) return
-
-    const cachedValue = await itc.send('getHttpCacheValue', {
-      request: this.#sanitizeRequest(request)
-    })
-    if (!cachedValue) return
-
-    const readable = new Readable({
-      read () {}
-    })
-
-    Object.defineProperty(readable, 'value', {
-      get () { return cachedValue.response }
-    })
-
-    readable.push(cachedValue.payload)
-    readable.push(null)
-
-    return {
-      ...cachedValue.response,
-      body: readable
-    }
-  }
-
-  createWriteStream (request, response) {
-    const itc = globalThis[kITC]
-    if (!itc) throw new Error('Cannot write to cache without an ITC instance')
-
-    let payload = ''
-
-    request = this.#sanitizeRequest(request)
-
-    return new Writable({
-      write (chunk, encoding, callback) {
-        payload += chunk
-        callback()
-      },
-      final (callback) {
-        itc.send('setHttpCacheValue', { request, response, payload })
-          .then(() => callback())
-          .catch((err) => callback(err))
-      }
-    })
-  }
-
-  delete (request) {
-    const itc = globalThis[kITC]
-    if (!itc) throw new Error('Cannot delete from cache without an ITC instance')
-
-    request = this.#sanitizeRequest(request)
-    itc.send('deleteHttpCacheValue', { request })
-    // TODO: return a Promise
-  }
-
-  #sanitizeRequest (request) {
-    return {
-      origin: request.origin,
-      method: request.method,
-      path: request.path,
-      headers: request.headers
-    }
-  }
-}
-
-module.exports = RemoteCacheStore