@platformatic/runtime 2.21.1 → 2.23.0

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime2211Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime2230Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;
@@ -177,6 +177,10 @@ export type HttpsSchemasPlatformaticDevPlatformaticRuntime2211Json = {
   };
   serviceTimeout?: number | string;
   resolvedServicesBasePath?: string;
+  env?: {
+    [k: string]: string;
+  };
+  sourceMaps?: boolean;
 };
 
 export interface UndiciInterceptor {

package/lib/build-server.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const { createRequire } = require('node:module')
 const { join } = require('node:path')
 
 const ConfigManager = require('@platformatic/config')
+const { createRequire } = require('@platformatic/utils')
 
 const { platformaticRuntime } = require('./config')
 const { buildRuntime } = require('./start')

package/lib/compile.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { createRequire } = require('node:module')
+const { createRequire } = require('@platformatic/utils')
 const { dirname, join } = require('node:path')
 const { isatty } = require('node:tty')
 const { pathToFileURL } = require('node:url')
@@ -12,9 +12,14 @@ const pretty = require('pino-pretty')
 const { loadConfig } = require('./utils')
 
 async function compile (argv, logger) {
-  const { configManager, configType, app } = await loadConfig({}, argv, {
-    watch: false,
-  }, false)
+  const { configManager, configType, app } = await loadConfig(
+    {},
+    argv,
+    {
+      watch: false
+    },
+    false
+  )
   /* c8 ignore next */
   if (!logger) {
     let stream
@@ -22,7 +27,7 @@ async function compile (argv, logger) {
     if (isatty(process.stdout.fd)) {
       stream = pretty({
         translateTime: 'SYS:HH:MM:ss',
-        ignore: 'hostname,pid',
+        ignore: 'hostname,pid'
       })
     }
 
@@ -31,19 +36,24 @@ async function compile (argv, logger) {
 
   let compiled = false
   const compileOptions = {
-    clean: argv.includes('--clean'),
+    clean: argv.includes('--clean')
   }
   if (configType === 'runtime') {
     for (const service of configManager.current.services) {
       const childLogger = logger.child({ name: service.id })
 
       const serviceConfigPath = service.config
-      const { configManager, app } = await loadConfig({}, ['-c', serviceConfigPath], {
-        onMissingEnv (key) {
-          return service.localServiceEnvVars.get(key)
+      const { configManager, app } = await loadConfig(
+        {},
+        ['-c', serviceConfigPath],
+        {
+          onMissingEnv (key) {
+            return service.localServiceEnvVars.get(key)
+          },
+          watch: false
         },
-        watch: false,
-      }, false)
+        false
+      )
 
       const tsOptions = await extract(configManager, app)
 
@@ -52,7 +62,7 @@ async function compile (argv, logger) {
           ...compileOptions,
           ...tsOptions,
           cwd: service.path,
-          logger: childLogger,
+          logger: childLogger
         })
         compiled ||= serviceWasCompiled
       }
@@ -64,7 +74,7 @@ async function compile (argv, logger) {
         ...compileOptions,
         ...tsOptions,
         cwd: dirname(configManager.fullPath),
-        logger,
+        logger
       })
     }
   }
@@ -81,9 +91,9 @@ async function extract (configManager, app) {
     const _require = createRequire(join(configManager.dirname, 'package.json'))
     const toLoad = _require.resolve('@platformatic/service')
     try {
-      extractTypeScriptCompileOptionsFromConfig = (await import(pathToFileURL(toLoad))).extractTypeScriptCompileOptionsFromConfig
-    } catch {
-    }
+      extractTypeScriptCompileOptionsFromConfig = (await import(pathToFileURL(toLoad)))
+        .extractTypeScriptCompileOptionsFromConfig
+    } catch {}
     // If we can't load `@platformatic/service` we just return null
     // and we won't be compiling typescript
   }

package/lib/generator/runtime-generator.js

@@ -2,7 +2,6 @@
 
 const { BaseGenerator } = require('@platformatic/generators')
 const { NoEntryPointError, NoServiceNamedError } = require('./errors')
-const generateName = require('boring-name-generator')
 const { join } = require('node:path')
 const { envObjectToString } = require('@platformatic/generators/lib/utils')
 const { readFile, readdir, stat } = require('node:fs/promises')
@@ -11,15 +10,14 @@ const { platformaticRuntime } = require('../config')
 const { getServiceTemplateFromSchemaUrl } = require('@platformatic/generators/lib/utils')
 const { DotEnvTool } = require('dotenv-tool')
 const { getArrayDifference } = require('../utils')
-const { createRequire } = require('node:module')
 const { pathToFileURL } = require('node:url')
-const { safeRemove } = require('@platformatic/utils')
+const { createRequire, safeRemove, generateDashedName } = require('@platformatic/utils')
 
 class RuntimeGenerator extends BaseGenerator {
   constructor (opts) {
     super({
       ...opts,
-      module: '@platformatic/runtime',
+      module: '@platformatic/runtime'
     })
     this.runtimeName = opts.name
     this.services = []
@@ -29,18 +27,18 @@ class RuntimeGenerator extends BaseGenerator {
   async addService (service, name) {
     // ensure service config is correct
     const originalConfig = service.config
-    const serviceName = name || generateName().dashed
+    const serviceName = name || generateDashedName()
     const newConfig = {
       ...originalConfig,
       isRuntimeContext: true,
-      serviceName,
+      serviceName
     }
     // reset all files previously generated by the service
     service.reset()
     service.setConfig(newConfig)
     this.services.push({
       name: serviceName,
-      service,
+      service
     })
 
     if (typeof service.setRuntime === 'function') {
@@ -61,20 +59,20 @@ class RuntimeGenerator extends BaseGenerator {
       name: `${this.runtimeName}`,
       workspaces: ['services/*'],
       scripts: {
-        start: 'platformatic start',
+        start: 'platformatic start'
       },
       devDependencies: {
         fastify: `^${this.fastifyVersion}`,
-        borp: `${this.pkgData.devDependencies.borp}`,
+        borp: `${this.pkgData.devDependencies.borp}`
       },
       dependencies: {
         '@platformatic/runtime': `^${this.platformaticVersion}`,
         platformatic: `^${this.platformaticVersion}`,
-        ...this.config.dependencies,
+        ...this.config.dependencies
       },
       engines: {
-        node: '^18.8.0 || >=20.6.0',
-      },
+        node: '^18.8.0 || >=20.6.0'
+      }
     }
     if (this.config.typescript) {
       const typescriptVersion = JSON.parse(await readFile(join(__dirname, '..', '..', 'package.json'), 'utf-8'))
@@ -96,7 +94,7 @@ class RuntimeGenerator extends BaseGenerator {
         PLT_SERVER_HOSTNAME: '127.0.0.1',
         PORT: this.config.port || 3042,
         PLT_SERVER_LOGGER_LEVEL: this.config.logLevel || 'info',
-        PLT_MANAGEMENT_API: true,
+        PLT_MANAGEMENT_API: true
       },
       { overwrite: false, default: true }
     )
@@ -121,7 +119,7 @@ class RuntimeGenerator extends BaseGenerator {
     if (existingConfigFile) {
       const configManager = new ConfigManager({
         ...platformaticRuntime.configManagerConfig,
-        source: join(this.targetDirectory, existingConfigFile),
+        source: join(this.targetDirectory, existingConfigFile)
       })
       await configManager.parse()
       this.existingConfig = configManager.current
@@ -139,7 +137,7 @@ class RuntimeGenerator extends BaseGenerator {
       await this._afterPrepare()
       return {
         env: this.config.env,
-        targetDirectory: this.targetDirectory,
+        targetDirectory: this.targetDirectory
       }
     } else {
       return await super.prepare()
@@ -163,16 +161,16 @@ class RuntimeGenerator extends BaseGenerator {
       watch: true,
       autoload: {
         path: this.config.autoload || 'services',
-        exclude: ['docs'],
+        exclude: ['docs']
       },
       logger: {
-        level: '{PLT_SERVER_LOGGER_LEVEL}',
+        level: '{PLT_SERVER_LOGGER_LEVEL}'
       },
       server: {
         hostname: '{PLT_SERVER_HOSTNAME}',
         port: '{PORT}'
       },
-      managementApi: '{PLT_MANAGEMENT_API}',
+      managementApi: '{PLT_MANAGEMENT_API}'
     }
 
     return config
@@ -186,19 +184,19 @@ class RuntimeGenerator extends BaseGenerator {
     this.addEnvVars({
       ...this.config.env,
       ...this.getRuntimeEnv(),
-      ...servicesEnv,
+      ...servicesEnv
     })
 
     this.addFile({
       path: '',
       file: '.env',
-      contents: envObjectToString(this.config.env),
+      contents: envObjectToString(this.config.env)
     })
 
     this.addFile({
       path: '',
       file: '.env.sample',
-      contents: envObjectToString(this.config.env),
+      contents: envObjectToString(this.config.env)
     })
 
     if (!this.existingConfig) {
@@ -207,7 +205,7 @@ class RuntimeGenerator extends BaseGenerator {
 
     return {
       targetDirectory: this.targetDirectory,
-      env: servicesEnv,
+      env: servicesEnv
     }
   }
 
@@ -231,8 +229,8 @@ class RuntimeGenerator extends BaseGenerator {
       default: false,
       choices: [
         { name: 'yes', value: true },
-        { name: 'no', value: false },
-      ],
+        { name: 'no', value: false }
+      ]
     })
 
     if (this.existingConfig) {
@@ -244,7 +242,7 @@ class RuntimeGenerator extends BaseGenerator {
       type: 'input',
       name: 'port',
       default: 3042,
-      message: 'What port do you want to use?',
+      message: 'What port do you want to use?'
     })
   }
 
@@ -269,7 +267,7 @@ class RuntimeGenerator extends BaseGenerator {
       const originalConfig = service.config
       service.setConfig({
         ...originalConfig,
-        ...configToOverride,
+        ...configToOverride
       })
     })
   }
@@ -280,12 +278,12 @@ class RuntimeGenerator extends BaseGenerator {
       // Propagate TypeScript
       svc.service.setConfig({
         ...svc.service.config,
-        typescript: this.config.typescript,
+        typescript: this.config.typescript
       })
       const svcEnv = await svc.service.prepare()
       servicesEnv = {
         ...servicesEnv,
-        ...svcEnv.env,
+        ...svcEnv.env
       }
     }
     return servicesEnv
@@ -301,7 +299,7 @@ class RuntimeGenerator extends BaseGenerator {
 
   getRuntimeEnv () {
     return {
-      PORT: this.config.port,
+      PORT: this.config.port
     }
   }
 
@@ -319,7 +317,7 @@ class RuntimeGenerator extends BaseGenerator {
 
   async loadFromDir () {
     const output = {
-      services: [],
+      services: []
     }
     const runtimePkgConfigFileData = JSON.parse(
       await readFile(join(this.targetDirectory, 'platformatic.json'), 'utf-8')
@@ -339,7 +337,7 @@ class RuntimeGenerator extends BaseGenerator {
         const template = servicePltJson.module || getServiceTemplateFromSchemaUrl(servicePltJson.$schema)
         const Generator = await this._getGeneratorForTemplate(currentServicePath, template)
         const instance = new Generator({
-          logger: this.logger,
+          logger: this.logger
         })
         this.addService(instance, s)
         output.services.push(await instance.loadFromDir(s, this.targetDirectory))
@@ -360,7 +358,7 @@ class RuntimeGenerator extends BaseGenerator {
     const allNewServicesNames = newConfig.services.map(s => s.name)
     // load dotenv tool
     const envTool = new DotEnvTool({
-      path: join(this.targetDirectory, '.env'),
+      path: join(this.targetDirectory, '.env')
     })
 
     await envTool.load()
@@ -402,13 +400,13 @@ class RuntimeGenerator extends BaseGenerator {
         newService.template
       )
       const serviceInstance = new ServiceGenerator({
-        logger: this.logger,
+        logger: this.logger
       })
       const baseConfig = {
         isRuntimeContext: true,
         targetDirectory: join(this.targetDirectory, 'services', newService.name),
         serviceName: newService.name,
-        plugin: true,
+        plugin: true
       }
       if (allCurrentServicesNames.includes(newService.name)) {
         // update existing services env values
@@ -425,7 +423,7 @@ class RuntimeGenerator extends BaseGenerator {
         // add service to the generator
         this.services.push({
           name: newService.name,
-          service: serviceInstance,
+          service: serviceInstance
         })
       }
       serviceInstance.setConfig(baseConfig)
@@ -464,12 +462,12 @@ class RuntimeGenerator extends BaseGenerator {
     // update runtime package.json dependencies
     currrentPackageJson.dependencies = {
       ...currrentPackageJson.dependencies,
-      ...allServicesDependencies,
+      ...allServicesDependencies
     }
     this.addFile({
       path: '',
       file: 'package.json',
-      contents: JSON.stringify(currrentPackageJson, null, 2),
+      contents: JSON.stringify(currrentPackageJson, null, 2)
     })
 
     // set new entrypoint if specified
@@ -485,7 +483,7 @@ class RuntimeGenerator extends BaseGenerator {
       this.addFile({
         path: '',
         file: 'platformatic.json',
-        contents: JSON.stringify(runtimePkgConfigFileData, null, 2),
+        contents: JSON.stringify(runtimePkgConfigFileData, null, 2)
       })
     }
     await this.writeFiles()

package/lib/runtime.js

@@ -3,10 +3,12 @@
 const { once, EventEmitter } = require('node:events')
 const { createReadStream, watch, existsSync } = require('node:fs')
 const { readdir, readFile, stat, access } = require('node:fs/promises')
+const { STATUS_CODES } = require('node:http')
 const { join } = require('node:path')
 const { setTimeout: sleep } = require('node:timers/promises')
 const { Worker } = require('node:worker_threads')
 const { ITC } = require('@platformatic/itc')
+const { Agent, interceptors: undiciInterceptors, request } = require('undici')
 const { ensureLoggableError, executeWithTimeout, deepmerge } = require('@platformatic/utils')
 const ts = require('tail-file-stream')
 const { createThreadInterceptor } = require('undici-thread-interceptor')
@@ -61,7 +63,8 @@ class Runtime extends EventEmitter {
   #metrics
   #metricsTimeout
   #status
-  #interceptor
+  #meshInterceptor
+  #dispatcher
   #managementApi
   #prometheusServer
   #inspectorServer
@@ -80,8 +83,7 @@ class Runtime extends EventEmitter {
     this.#workers = new RoundRobinMap()
     this.#servicesIds = []
     this.#url = undefined
-    // Note: nothing hits the main thread so there is no reason to set the globalDispatcher here
-    this.#interceptor = createThreadInterceptor({
+    this.#meshInterceptor = createThreadInterceptor({
       domain: '.plt.local',
       timeout: this.#configManager.current.serviceTimeout
     })
@@ -182,10 +184,17 @@ class Runtime extends EventEmitter {
       throw e
     }
 
-    this.#sharedHttpCache = createSharedStore(
-      this.#configManager.dirname,
-      config.httpCache
-    )
+    const dispatcherOpts = { ...config.undici }
+    const interceptors = [this.#meshInterceptor]
+
+    if (config.httpCache) {
+      this.#sharedHttpCache = await createSharedStore(this.#configManager.dirname, config.httpCache)
+      interceptors.push(
+        undiciInterceptors.cache({ store: this.#sharedHttpCache, methods: config.httpCache.methods ?? ['GET', 'HEAD'] })
+      )
+    }
+
+    this.#dispatcher = new Agent(dispatcherOpts).compose(interceptors)
 
     this.#updateStatus('init')
   }
@@ -375,8 +384,48 @@ class Runtime extends EventEmitter {
   }
 
   async inject (id, injectParams) {
-    const service = await this.#getServiceById(id, true)
-    return sendViaITC(service, 'inject', injectParams)
+    // Make sure the service exists
+    await this.#getServiceById(id, true)
+
+    if (typeof injectParams === 'string') {
+      injectParams = { url: injectParams }
+    }
+
+    let { method, headers, body } = injectParams
+    const url = new URL(injectParams.url, `http://${id}.plt.local`)
+
+    if (injectParams.query) {
+      for (const [k, v] of Object.entries(injectParams.query)) {
+        url.searchParams.append(k, v)
+      }
+    }
+
+    // Stringify the body as JSON if needed
+    if (
+      body &&
+      typeof body === 'object' &&
+      headers &&
+      Object.entries(headers).some(([k, v]) => k.toLowerCase() === 'content-type' && v.includes('application/json'))
+    ) {
+      body = JSON.stringify(body)
+    }
+
+    const {
+      statusCode: responseStatus,
+      headers: responseHeaders,
+      body: responseRawBody
+    } = await request(url.toString(), { method, headers, body, dispatcher: this.#dispatcher })
+    const responsePayload = await responseRawBody.arrayBuffer()
+    const responseBody = Buffer.from(responsePayload).toString('utf-8')
+
+    return {
+      statusCode: responseStatus,
+      statusMessage: STATUS_CODES[responseStatus] || 'unknown',
+      headers: responseHeaders,
+      body: responseBody,
+      payload: responseBody,
+      rawPayload: responsePayload
+    }
   }
 
   startCollectingMetrics () {
@@ -520,7 +569,11 @@ class Runtime extends EventEmitter {
   }
 
   getInterceptor () {
-    return this.#interceptor
+    return this.#meshInterceptor
+  }
+
+  getDispatcher () {
+    return this.#dispatcher
   }
 
   getManagementApi () {
@@ -781,10 +834,36 @@ class Runtime extends EventEmitter {
     return createReadStream(filePath)
   }
 
-  async invalidateHttpCache (options = {}) {
+  #getHttpCacheValue ({ request }) {
+    if (!this.#sharedHttpCache) {
+      return
+    }
+
+    return this.#sharedHttpCache.getValue(request)
+  }
+
+  #setHttpCacheValue ({ request, response, payload }) {
+    if (!this.#sharedHttpCache) {
+      return
+    }
+
+    return this.#sharedHttpCache.setValue(request, response, payload)
+  }
+
+  #deleteHttpCacheValue ({ request }) {
+    if (!this.#sharedHttpCache) {
+      return
+    }
+
+    return this.#sharedHttpCache.delete(request)
+  }
+
+  invalidateHttpCache (options = {}) {
     const { keys, tags } = options
 
-    if (!this.#sharedHttpCache) return
+    if (!this.#sharedHttpCache) {
+      return
+    }
 
     const promises = []
     if (keys && keys.length > 0) {
@@ -795,7 +874,7 @@ class Runtime extends EventEmitter {
       promises.push(this.#sharedHttpCache.deleteTags(tags))
     }
 
-    await Promise.all(promises)
+    return Promise.all(promises)
   }
 
   async sendCommandToService (id, name, message) {
@@ -862,6 +941,16 @@ class Runtime extends EventEmitter {
     const errorLabel = this.#workerExtendedLabel(serviceId, index, workersCount)
     const health = deepmerge(config.health ?? {}, serviceConfig.health ?? {})
 
+    const execArgv = []
+
+    if (!serviceConfig.isPLTService) {
+      execArgv.push('--require', openTelemetrySetupPath)
+    }
+
+    if ((serviceConfig.sourceMaps ?? config.sourceMaps) === true) {
+      execArgv.push('--enable-source-maps')
+    }
+
     const worker = new Worker(kWorkerFile, {
       workerData: {
         config,
@@ -879,7 +968,7 @@ class Runtime extends EventEmitter {
         runtimeLogsDir: this.#runtimeLogsDir,
         loggingPort
       },
-      execArgv: serviceConfig.isPLTService ? [] : ['--require', openTelemetrySetupPath],
+      execArgv,
       env: this.#env,
       transferList: [loggingPort],
       resourceLimits: {
@@ -956,16 +1045,10 @@ class Runtime extends EventEmitter {
         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),
+        getHttpCacheValue: this.#getHttpCacheValue.bind(this),
+        setHttpCacheValue: this.#setHttpCacheValue.bind(this),
+        deleteHttpCacheValue: this.#deleteHttpCacheValue.bind(this),
+        invalidateHttpCache: this.invalidateHttpCache.bind(this)
       }
     })
     worker[kITC].listen()
@@ -1004,7 +1087,7 @@ class Runtime extends EventEmitter {
     }
 
     // Setup the interceptor
-    this.#interceptor.route(serviceId, worker)
+    this.#meshInterceptor.route(serviceId, worker)
 
     // Store dependencies
     const [{ dependencies }] = await waitEventFromITC(worker, 'init')

package/lib/schema.js

@@ -6,6 +6,13 @@ const {
   schemaComponents: { server, logger, health }
 } = require('@platformatic/utils')
 
+const env = {
+  type: 'object',
+  additionalProperties: {
+    type: 'string'
+  }
+}
+
 const workers = {
   anyOf: [
     {
@@ -37,11 +44,23 @@ const services = {
       url: {
         type: 'string'
       },
+      gitBranch: {
+        type: 'string',
+        default: 'main'
+      },
       useHttp: {
         type: 'boolean'
       },
       workers,
-      health: { ...health, default: undefined }
+      health: { ...health, default: undefined },
+      env,
+      envfile: {
+        type: 'string'
+      },
+      sourceMaps: {
+        type: 'boolean',
+        default: false
+      }
     }
   }
 }
@@ -316,6 +335,11 @@ const platformaticRuntimeSchema = {
     resolvedServicesBasePath: {
       type: 'string',
       default: 'external'
+    },
+    env,
+    sourceMaps: {
+      type: 'boolean',
+      default: false
     }
   },
   anyOf: [{ required: ['autoload'] }, { required: ['services'] }, { required: ['web'] }],

package/lib/shared-http-cache.js

@@ -1,14 +1,14 @@
 'use strict'
 
 const { join } = require('node:path')
-const { createRequire } = require('node:module')
+const { createRequire, loadModule } = require('@platformatic/utils')
 const MemoryCacheStore = require('@platformatic/undici-cache-memory')
 
-function createSharedStore (projectDir, httpCacheConfig = {}) {
+async function createSharedStore (projectDir, httpCacheConfig = {}) {
   const runtimeRequire = createRequire(join(projectDir, 'file'))
 
   const { store, ...storeConfig } = httpCacheConfig
-  const CacheStore = store ? runtimeRequire(store) : MemoryCacheStore
+  const CacheStore = store ? await loadModule(runtimeRequire, store) : MemoryCacheStore
 
   class SharedCacheStore extends CacheStore {
     async getValue (req) {

package/lib/worker/interceptors.js

@@ -9,9 +9,11 @@ async function loadInterceptor (_require, module, options) {
 }
 
 function loadInterceptors (_require, interceptors) {
-  return Promise.all(interceptors.map(async ({ module, options }) => {
-    return loadInterceptor(_require, module, options)
-  }))
+  return Promise.all(
+    interceptors.map(async ({ module, options }) => {
+      return loadInterceptor(_require, module, options)
+    })
+  )
 }
 
-module.exports = loadInterceptors
+module.exports = { loadInterceptors }

package/lib/worker/main.js

@@ -1,15 +1,16 @@
 'use strict'
 
 const { EventEmitter } = require('node:events')
-const { createRequire } = require('node:module')
+const { createRequire } = require('@platformatic/utils')
 const { hostname } = require('node:os')
-const { join } = require('node:path')
+const { join, resolve } = require('node:path')
 const { parentPort, workerData, threadId } = require('node:worker_threads')
 const { pathToFileURL } = require('node:url')
 const inspector = require('node:inspector')
 const diagnosticChannel = require('node:diagnostics_channel')
 const { ServerResponse } = require('node:http')
 
+const dotenv = require('dotenv')
 const pino = require('pino')
 const { fetch, setGlobalDispatcher, getGlobalDispatcher, Agent } = require('undici')
 const { wire } = require('undici-thread-interceptor')
@@ -18,7 +19,7 @@ const undici = require('undici')
 const RemoteCacheStore = require('./http-cache')
 const { PlatformaticApp } = require('./app')
 const { setupITC } = require('./itc')
-const loadInterceptors = require('./interceptors')
+const { loadInterceptors } = require('./interceptors')
 const { createTelemetryThreadInterceptorHooks } = require('@platformatic/telemetry')
 
 const {
@@ -81,6 +82,22 @@ async function main () {
 
   const service = workerData.serviceConfig
 
+  // Load env file and mixin env vars from service config
+  if (service.envfile) {
+    const envfile = resolve(workerData.dirname, service.envfile)
+    globalThis.platformatic.logger.info({ envfile }, 'Loading envfile...')
+
+    dotenv.config({
+      path: envfile
+    })
+  }
+  if (config.env) {
+    Object.assign(process.env, config.env)
+  }
+  if (service.env) {
+    Object.assign(process.env, service.env)
+  }
+
   // Setup undici
   const interceptors = {}
   const composedInterceptors = []
@@ -124,8 +141,7 @@ async function main () {
     }
   }
 
-  const globalDispatcher = new Agent(dispatcherOpts)
-    .compose(composedInterceptors)
+  const globalDispatcher = new Agent(dispatcherOpts).compose(composedInterceptors)
 
   setGlobalDispatcher(globalDispatcher)
 
@@ -141,10 +157,12 @@ async function main () {
 
   if (config.httpCache) {
     setGlobalDispatcher(
-      getGlobalDispatcher().compose(undici.interceptors.cache({
-        store: new RemoteCacheStore(),
-        methods: config.httpCache.methods ?? ['GET', 'HEAD']
-      }))
+      getGlobalDispatcher().compose(
+        undici.interceptors.cache({
+          store: new RemoteCacheStore(),
+          methods: config.httpCache.methods ?? ['GET', 'HEAD']
+        })
+      )
     )
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.21.1",
+  "version": "2.23.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -26,21 +26,21 @@
     "express": "^4.18.3",
     "fast-jwt": "^5.0.0",
     "get-port": "^7.1.0",
-    "inspector-client": "^0.1.2",
+    "inspector-client": "^0.2.0",
     "json-schema-to-typescript": "^15.0.0",
-    "neostandard": "^0.11.1",
+    "neostandard": "^0.12.0",
     "pino-abstract-transport": "^2.0.0",
     "split2": "^4.2.0",
     "tsd": "^0.31.0",
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.21.1",
-    "@platformatic/db": "2.21.1",
-    "@platformatic/node": "2.21.1",
-    "@platformatic/sql-graphql": "2.21.1",
-    "@platformatic/service": "2.21.1",
-    "@platformatic/sql-mapper": "2.21.1"
+    "@platformatic/composer": "2.23.0",
+    "@platformatic/db": "2.23.0",
+    "@platformatic/node": "2.23.0",
+    "@platformatic/service": "2.23.0",
+    "@platformatic/sql-graphql": "2.23.0",
+    "@platformatic/sql-mapper": "2.23.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -49,12 +49,12 @@
     "@platformatic/http-metrics": "^0.2.1",
     "@platformatic/undici-cache-memory": "^0.8.1",
     "@watchable/unpromise": "^1.0.2",
-    "boring-name-generator": "^1.0.3",
     "change-case-all": "^2.1.0",
     "close-with-grace": "^2.0.0",
     "commist": "^3.2.0",
     "debounce": "^2.0.0",
     "desm": "^1.3.1",
+    "dotenv": "^16.4.5",
     "dotenv-tool": "^0.1.1",
     "es-main": "^1.3.0",
     "fastest-levenshtein": "^1.0.16",
@@ -72,13 +72,13 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^0.10.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.21.1",
-    "@platformatic/itc": "2.21.1",
-    "@platformatic/config": "2.21.1",
-    "@platformatic/telemetry": "2.21.1",
-    "@platformatic/utils": "2.21.1",
-    "@platformatic/generators": "2.21.1",
-    "@platformatic/ts-compiler": "2.21.1"
+    "@platformatic/basic": "2.23.0",
+    "@platformatic/config": "2.23.0",
+    "@platformatic/itc": "2.23.0",
+    "@platformatic/generators": "2.23.0",
+    "@platformatic/telemetry": "2.23.0",
+    "@platformatic/ts-compiler": "2.23.0",
+    "@platformatic/utils": "2.23.0"
   },
   "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.21.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.23.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -192,6 +192,10 @@
           "url": {
             "type": "string"
           },
+          "gitBranch": {
+            "type": "string",
+            "default": "main"
+          },
           "useHttp": {
             "type": "boolean"
           },
@@ -296,6 +300,19 @@
               }
             },
             "additionalProperties": false
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "envfile": {
+            "type": "string"
+          },
+          "sourceMaps": {
+            "type": "boolean",
+            "default": false
           }
         }
       }
@@ -345,6 +362,10 @@
           "url": {
             "type": "string"
           },
+          "gitBranch": {
+            "type": "string",
+            "default": "main"
+          },
           "useHttp": {
             "type": "boolean"
           },
@@ -449,6 +470,19 @@
               }
             },
             "additionalProperties": false
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "envfile": {
+            "type": "string"
+          },
+          "sourceMaps": {
+            "type": "boolean",
+            "default": false
           }
         }
       }
@@ -1113,6 +1147,16 @@
     "resolvedServicesBasePath": {
       "type": "string",
       "default": "external"
+    },
+    "env": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "sourceMaps": {
+      "type": "boolean",
+      "default": false
     }
   },
   "anyOf": [