@platformatic/runtime 2.67.0-alpha.0 → 2.67.0-alpha.2

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime2670Alpha0Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime2670Alpha2Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;

package/lib/runtime.js

@@ -467,14 +467,12 @@ class Runtime extends EventEmitter {
     }
   }
 
-  async updateUndiciConfig (undiciConfig) {
+  async updateUndiciInterceptors (undiciConfig) {
     this.#configManager.current.undici = undiciConfig
 
-    await this.#setDispatcher(undiciConfig)
-
     const promises = []
     for (const worker of this.#workers.values()) {
-      promises.push(sendViaITC(worker, 'updateUndiciConfig', undiciConfig))
+      promises.push(sendViaITC(worker, 'updateUndiciInterceptors', undiciConfig))
     }
 
     const results = await Promise.allSettled(promises)

package/lib/worker/interceptors.js

@@ -11,25 +11,12 @@ const { RemoteCacheStore, httpCacheInterceptor } = require('./http-cache')
 const { kInterceptors } = require('./symbols')
 
 async function setDispatcher (runtimeConfig) {
-  const dispatcherOpts = await getDespatcherOpts(runtimeConfig.undici)
+  const threadDispatcher = createThreadInterceptor(runtimeConfig)
+  const threadInterceptor = threadDispatcher.interceptor
 
-  let interceptors = globalThis[kInterceptors]
-  if (!interceptors) {
-    const threadDispatcher = createThreadInterceptor(runtimeConfig)
-    const threadInterceptor = threadDispatcher.interceptor
-
-    let cacheInterceptor = null
-    if (runtimeConfig.httpCache) {
-      cacheInterceptor = createHttpCacheInterceptor(runtimeConfig)
-    }
-
-    interceptors = {
-      threadDispatcher,
-      threadInterceptor,
-      cacheInterceptor
-    }
-
-    globalThis[kInterceptors] = interceptors
+  let cacheInterceptor = null
+  if (runtimeConfig.httpCache) {
+    cacheInterceptor = createHttpCacheInterceptor(runtimeConfig)
   }
 
   let userInterceptors = []
@@ -38,20 +25,114 @@ async function setDispatcher (runtimeConfig) {
     userInterceptors = await loadInterceptors(_require, runtimeConfig.undici.interceptors)
   }
 
+  const dispatcherOpts = await getDispatcherOpts(runtimeConfig.undici)
+
   setGlobalDispatcher(
     new Agent(dispatcherOpts).compose(
       [
-        interceptors.threadInterceptor,
-        interceptors.cacheInterceptor,
-        ...userInterceptors
+        threadInterceptor,
+        ...userInterceptors,
+        cacheInterceptor
       ].filter(Boolean)
     )
   )
 
-  return interceptors
+  return { threadDispatcher }
+}
+
+async function updateUndiciInterceptors (undiciConfig) {
+  const updatableInterceptors = globalThis[kInterceptors]
+  if (!updatableInterceptors) return
+
+  if (Array.isArray(undiciConfig?.interceptors)) {
+    for (const interceptorConfig of undiciConfig.interceptors) {
+      const { module, options } = interceptorConfig
+
+      const interceptorCtx = updatableInterceptors[module]
+      if (!interceptorCtx) continue
+
+      const { createInterceptor, updateInterceptor } = interceptorCtx
+      updateInterceptor(createInterceptor(options))
+    }
+  } else {
+    for (const key of ['Agent', 'Pool', 'Client']) {
+      const interceptorConfigs = undiciConfig.interceptors[key]
+      if (!interceptorConfigs) continue
+
+      for (const interceptorConfig of interceptorConfigs) {
+        const { module, options } = interceptorConfig
+
+        const interceptorCtx = updatableInterceptors[key][module]
+        if (!interceptorCtx) continue
+
+        const { createInterceptor, updateInterceptor } = interceptorCtx
+        updateInterceptor(createInterceptor(options))
+      }
+    }
+  }
+}
+
+function createUpdatableInterceptor (originInterceptor) {
+  let originalDispatcher = null
+  let originalDispatch = null
+
+  function updatableInterceptor (dispatch) {
+    originalDispatch = dispatch
+    originalDispatcher = originInterceptor(dispatch)
+
+    return function dispatcher (opts, handler) {
+      return originalDispatcher(opts, handler)
+    }
+  }
+
+  function updateInterceptor (newInterceptor) {
+    originalDispatcher = newInterceptor(originalDispatch)
+  }
+
+  return { updatableInterceptor, updateInterceptor }
 }
 
-async function getDespatcherOpts (undiciConfig) {
+async function loadInterceptors (_require, interceptorsConfigs, key) {
+  return Promise.all(
+    interceptorsConfigs.map(async (interceptorConfig) => {
+      return loadInterceptor(_require, interceptorConfig, key)
+    })
+  )
+}
+
+async function loadInterceptor (_require, interceptorConfig, key) {
+  let updatableInterceptors = globalThis[kInterceptors]
+  if (!updatableInterceptors) {
+    updatableInterceptors = {}
+    globalThis[kInterceptors] = updatableInterceptors
+  }
+
+  const { module, options } = interceptorConfig
+
+  const url = pathToFileURL(_require.resolve(module))
+  const createInterceptor = (await import(url)).default
+  const interceptor = createInterceptor(options)
+
+  const {
+    updatableInterceptor,
+    updateInterceptor
+  } = createUpdatableInterceptor(interceptor)
+
+  const interceptorCtx = { createInterceptor, updateInterceptor }
+
+  if (key !== undefined) {
+    if (!updatableInterceptors[key]) {
+      updatableInterceptors[key] = {}
+    }
+    updatableInterceptors[key][module] = interceptorCtx
+  } else {
+    updatableInterceptors[module] = interceptorCtx
+  }
+
+  return updatableInterceptor
+}
+
+async function getDispatcherOpts (undiciConfig) {
   const dispatcherOpts = { ...undiciConfig }
 
   const interceptorsConfigs = undiciConfig?.interceptors
@@ -68,7 +149,7 @@ async function getDespatcherOpts (undiciConfig) {
     const interceptorConfig = undiciConfig.interceptors[key]
     if (!interceptorConfig) continue
 
-    const interceptors = await loadInterceptors(_require, interceptorConfig)
+    const interceptors = await loadInterceptors(_require, interceptorConfig, key)
     if (key === 'Agent') {
       clientInterceptors.push(...interceptors)
       poolInterceptors.push(...interceptors)
@@ -124,18 +205,4 @@ function createHttpCacheInterceptor (runtimeConfig) {
   return cacheInterceptor
 }
 
-async function loadInterceptor (_require, module, options) {
-  const url = pathToFileURL(_require.resolve(module))
-  const interceptor = (await import(url)).default
-  return interceptor(options)
-}
-
-function loadInterceptors (_require, interceptors) {
-  return Promise.all(
-    interceptors.map(async ({ module, options }) => {
-      return loadInterceptor(_require, module, options)
-    })
-  )
-}
-
-module.exports = { setDispatcher }
+module.exports = { setDispatcher, updateUndiciInterceptors }

package/lib/worker/itc.js

@@ -7,7 +7,7 @@ const { ITC } = require('@platformatic/itc')
 const { Unpromise } = require('@watchable/unpromise')
 
 const errors = require('../errors')
-const { setDispatcher } = require('./interceptors')
+const { updateUndiciInterceptors } = require('./interceptors')
 const { kITC, kId, kServiceId, kWorkerId } = require('./symbols')
 
 async function safeHandleInITC (worker, fn) {
@@ -110,9 +110,8 @@ function setupITC (app, service, dispatcher) {
         return app.stackable.inject(injectParams)
       },
 
-      async updateUndiciConfig (undiciConfig) {
-        const config = await app.stackable.getConfig()
-        await setDispatcher({ ...config, undici: undiciConfig })
+      async updateUndiciInterceptors (undiciConfig) {
+        await updateUndiciInterceptors(undiciConfig)
       },
 
       getStatus () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.67.0-alpha.0",
+  "version": "2.67.0-alpha.2",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -37,12 +37,12 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.67.0-alpha.0",
-    "@platformatic/db": "2.67.0-alpha.0",
-    "@platformatic/node": "2.67.0-alpha.0",
-    "@platformatic/service": "2.67.0-alpha.0",
-    "@platformatic/sql-graphql": "2.67.0-alpha.0",
-    "@platformatic/sql-mapper": "2.67.0-alpha.0"
+    "@platformatic/db": "2.67.0-alpha.2",
+    "@platformatic/node": "2.67.0-alpha.2",
+    "@platformatic/service": "2.67.0-alpha.2",
+    "@platformatic/sql-graphql": "2.67.0-alpha.2",
+    "@platformatic/composer": "2.67.0-alpha.2",
+    "@platformatic/sql-mapper": "2.67.0-alpha.2"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -77,13 +77,13 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^0.13.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.67.0-alpha.0",
-    "@platformatic/config": "2.67.0-alpha.0",
-    "@platformatic/generators": "2.67.0-alpha.0",
-    "@platformatic/itc": "2.67.0-alpha.0",
-    "@platformatic/telemetry": "2.67.0-alpha.0",
-    "@platformatic/utils": "2.67.0-alpha.0",
-    "@platformatic/ts-compiler": "2.67.0-alpha.0"
+    "@platformatic/basic": "2.67.0-alpha.2",
+    "@platformatic/config": "2.67.0-alpha.2",
+    "@platformatic/generators": "2.67.0-alpha.2",
+    "@platformatic/itc": "2.67.0-alpha.2",
+    "@platformatic/telemetry": "2.67.0-alpha.2",
+    "@platformatic/ts-compiler": "2.67.0-alpha.2",
+    "@platformatic/utils": "2.67.0-alpha.2"
   },
   "scripts": {
     "test": "pnpm run lint && borp --concurrency=1 --timeout=300000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.67.0-alpha.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.67.0-alpha.2.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {