@platformatic/runtime 2.0.0-alpha.15 → 2.0.0-alpha.17

package/lib/schema.js

@@ -3,10 +3,37 @@
 
 const telemetry = require('@platformatic/telemetry').schema
 const {
-  schemaComponents: { server }
+  schemaComponents: { server, logger }
 } = require('@platformatic/utils')
 
+const services = {
+  type: 'array',
+  items: {
+    type: 'object',
+    anyOf: [{ required: ['id', 'path'] }, { required: ['id', 'url'] }],
+    properties: {
+      id: {
+        type: 'string'
+      },
+      path: {
+        type: 'string',
+        resolvePath: true
+      },
+      config: {
+        type: 'string'
+      },
+      url: {
+        type: 'string'
+      },
+      useHttp: {
+        type: 'boolean'
+      }
+    }
+  }
+}
+
 const pkg = require('../package.json')
+
 const platformaticRuntimeSchema = {
   $id: `https://schemas.platformatic.dev/@platformatic/runtime/${pkg.version}.json`,
   $schema: 'http://json-schema.org/draft-07/schema#',
@@ -19,6 +46,9 @@ const platformaticRuntimeSchema = {
       type: 'string',
       resolvePath: true
     },
+    entrypoint: {
+      type: 'string'
+    },
     autoload: {
       type: 'object',
       additionalProperties: false,
@@ -56,38 +86,20 @@ const platformaticRuntimeSchema = {
         }
       }
     },
-    telemetry,
+    services,
+    web: services,
+    logger,
     server,
-    entrypoint: {
-      type: 'string'
-    },
-    watch: {
+    restartOnError: {
+      default: true,
       anyOf: [
+        { type: 'boolean' },
         {
-          type: 'boolean'
-        },
-        {
-          type: 'string'
+          type: 'number',
+          minimum: 100
         }
       ]
     },
-    inspectorOptions: {
-      type: 'object',
-      properties: {
-        host: {
-          type: 'string'
-        },
-        port: {
-          type: 'number'
-        },
-        breakFirstLine: {
-          type: 'boolean'
-        },
-        watchDisabled: {
-          type: 'boolean'
-        }
-      }
-    },
     undici: {
       type: 'object',
       properties: {
@@ -130,6 +142,16 @@ const platformaticRuntimeSchema = {
         }
       }
     },
+    watch: {
+      anyOf: [
+        {
+          type: 'boolean'
+        },
+        {
+          type: 'string'
+        }
+      ]
+    },
     managementApi: {
       anyOf: [
         { type: 'boolean' },
@@ -138,11 +160,15 @@ const platformaticRuntimeSchema = {
           type: 'object',
           properties: {
             logs: {
-              maxSize: {
-                type: 'number',
-                minimum: 5,
-                default: 200
-              }
+              type: 'object',
+              properties: {
+                maxSize: {
+                  type: 'number',
+                  minimum: 5,
+                  default: 200
+                }
+              },
+              additionalProperties: false
             }
           },
           additionalProperties: false
@@ -179,43 +205,30 @@ const platformaticRuntimeSchema = {
         }
       ]
     },
-    restartOnError: {
-      default: true,
-      anyOf: [
-        { type: 'boolean' },
-        {
-          type: 'number',
-          minimum: 100
-        }
-      ]
-    },
-    services: {
-      type: 'array',
-      items: {
-        type: 'object',
-        anyOf: [{ required: ['id', 'path'] }, { required: ['id', 'url'] }],
-        properties: {
-          id: {
-            type: 'string'
-          },
-          path: {
-            type: 'string',
-            resolvePath: true
-          },
-          config: {
-            type: 'string'
-          },
-          url: {
-            type: 'string'
-          },
-          useHttp: {
-            type: 'boolean'
-          }
+    telemetry,
+    inspectorOptions: {
+      type: 'object',
+      properties: {
+        host: {
+          type: 'string'
+        },
+        port: {
+          type: 'number'
+        },
+        breakFirstLine: {
+          type: 'boolean'
+        },
+        watchDisabled: {
+          type: 'boolean'
         }
       }
     }
   },
-  anyOf: [{ required: ['autoload', 'entrypoint'] }, { required: ['services', 'entrypoint'] }],
+  anyOf: [
+    { required: ['autoload', 'entrypoint'] },
+    { required: ['services', 'entrypoint'] },
+    { required: ['web', 'entrypoint'] }
+  ],
   additionalProperties: false,
   $defs: {
     undiciInterceptor: {

package/lib/start.js

@@ -45,7 +45,13 @@ async function buildRuntime (configManager, env) {
     }
   })
 
-  await runtime.init()
+  try {
+    await runtime.init()
+  } catch (e) {
+    await runtime.close()
+    throw e
+  }
+
   return runtime
 }
 
@@ -108,7 +114,7 @@ async function setupAndStartRuntime (config) {
   return { address, runtime }
 }
 
-async function startCommand (args) {
+async function startCommand (args, throwAllErrors = false) {
   try {
     const config = await loadConfig(
       {
@@ -134,6 +140,10 @@ async function startCommand (args) {
 
     return res
   } catch (err) {
+    if (throwAllErrors) {
+      throw err
+    }
+
     if (err.code === 'PLT_CONFIG_NO_CONFIG_FILE_FOUND' && args.length === 1) {
       const config = {
         $schema: `https://schemas.platformatic.dev/@platformatic/service/${pkg.version}.json`,

package/lib/versions/v2.0.0.js

@@ -12,6 +12,11 @@ module.exports = {
       delete config.hotReload
     }
 
+    if (config.server?.logger) {
+      config.logger = config.server.logger
+      delete config.server.logger
+    }
+
     return config
-  },
+  }
 }

package/lib/worker/app.js

@@ -20,7 +20,7 @@ class PlatformaticApp extends EventEmitter {
   #debouncedRestart
   #context
 
-  constructor (appConfig, telemetryConfig, serverConfig, hasManagementApi, watch, metricsConfig) {
+  constructor (appConfig, telemetryConfig, loggerConfig, serverConfig, metricsConfig, hasManagementApi, watch) {
     super()
     this.appConfig = appConfig
     this.#watch = watch
@@ -38,6 +38,7 @@ class PlatformaticApp extends EventEmitter {
       isProduction: this.appConfig.isProduction,
       telemetryConfig,
       metricsConfig,
+      loggerConfig,
       serverConfig,
       hasManagementApi: !!hasManagementApi,
       localServiceEnvVars: this.appConfig.localServiceEnvVars
@@ -102,11 +103,7 @@ class PlatformaticApp extends EventEmitter {
 
       const metricsConfig = this.#context.metricsConfig
       if (metricsConfig !== false) {
-        this.#metricsRegistry = await collectMetrics(
-          this.stackable,
-          this.appConfig.id,
-          metricsConfig
-        )
+        this.#metricsRegistry = await collectMetrics(this.stackable, this.appConfig.id, metricsConfig)
       }
 
       this.#updateDispatcher()
@@ -183,9 +180,7 @@ class PlatformaticApp extends EventEmitter {
   async getMetrics ({ format }) {
     if (!this.#metricsRegistry) return null
 
-    return format === 'json'
-      ? this.#metricsRegistry.getMetricsAsJSON()
-      : this.#metricsRegistry.metrics()
+    return format === 'json' ? this.#metricsRegistry.getMetricsAsJSON() : this.#metricsRegistry.metrics()
   }
 
   #fetchServiceUrl (key, { parent, context: service }) {

package/lib/worker/default-stackable.js

@@ -10,6 +10,7 @@ const defaultStackable = {
   getUrl: () => null,
   updateContext: () => {},
   getConfig: () => null,
+  getEnv: () => null,
   getInfo: () => null,
   getDispatchFunc: () => null,
   getOpenapiSchema: () => null,
@@ -17,7 +18,7 @@ const defaultStackable = {
   getMeta: () => ({}),
   collectMetrics: () => ({
     defaultMetrics: true,
-    httpMetrics: true,
+    httpMetrics: true
   }),
   inject: () => {
     throw new Error('Stackable inject not implemented')
@@ -26,7 +27,7 @@ const defaultStackable = {
     console.log(message)
   },
   getBootstrapDependencies: () => [],
-  getWatchConfig: () => ({ enabled: false }),
+  getWatchConfig: () => ({ enabled: false })
 }
 
 module.exports = defaultStackable

package/lib/worker/itc.js

@@ -9,14 +9,14 @@ const { Unpromise } = require('@watchable/unpromise')
 const errors = require('../errors')
 const { kITC, kId } = require('./symbols')
 
-async function sendViaITC (worker, name, message) {
+async function safeHandleInITC (worker, fn) {
   try {
     // Make sure to catch when the worker exits, otherwise we're stuck forever
     const ac = new AbortController()
     let exitCode
 
     const response = await Unpromise.race([
-      worker[kITC].send(name, message),
+      fn(),
       once(worker, 'exit', { signal: ac.signal }).then(([code]) => {
         exitCode = code
       })
@@ -42,6 +42,14 @@ async function sendViaITC (worker, name, message) {
   }
 }
 
+async function sendViaITC (worker, name, message) {
+  return safeHandleInITC(worker, () => worker[kITC].send(name, message))
+}
+
+async function waitEventFromITC (worker, event) {
+  return safeHandleInITC(worker, () => once(worker[kITC], event))
+}
+
 function setupITC (app, service, dispatcher) {
   const itc = new ITC({
     name: app.appConfig.id + '-worker',
@@ -101,6 +109,11 @@ function setupITC (app, service, dispatcher) {
         return JSON.parse(JSON.stringify(current))
       },
 
+      async getServiceEnv () {
+        // Remove all undefined keys from the config
+        return JSON.parse(JSON.stringify({ ...process.env, ...(await app.stackable.getEnv()) }))
+      },
+
       async getServiceOpenAPISchema () {
         try {
           return await app.stackable.getOpenapiSchema()
@@ -146,4 +159,4 @@ function setupITC (app, service, dispatcher) {
   return itc
 }
 
-module.exports = { sendViaITC, setupITC }
+module.exports = { sendViaITC, setupITC, waitEventFromITC }

package/lib/worker/main.js

@@ -12,7 +12,12 @@ const { wire } = require('undici-thread-interceptor')
 const { PlatformaticApp } = require('./app')
 const { setupITC } = require('./itc')
 const loadInterceptors = require('./interceptors')
-const { MessagePortWritable, createPinoWritable, executeWithTimeout, errors } = require('@platformatic/utils')
+const {
+  MessagePortWritable,
+  createPinoWritable,
+  executeWithTimeout,
+  ensureLoggableError
+} = require('@platformatic/utils')
 const { kId, kITC } = require('./symbols')
 
 process.on('uncaughtException', handleUnhandled.bind(null, 'uncaught exception'))
@@ -27,7 +32,7 @@ globalThis.platformatic = Object.assign(globalThis.platformatic ?? {}, { logger:
 
 function handleUnhandled (type, err) {
   globalThis.platformatic.logger.error(
-    { err: errors.ensureLoggableError(err) },
+    { err: ensureLoggableError(err) },
     `Service ${workerData.serviceConfig.id} threw an ${type}.`
   )
 
@@ -106,10 +111,11 @@ async function main () {
   app = new PlatformaticApp(
     service,
     telemetryConfig,
+    config.logger,
     serverConfig,
+    config.metrics,
     !!config.managementApi,
-    !!config.watch,
-    config.metrics
+    !!config.watch
   )
 
   await app.init()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.17",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,11 +34,11 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.0.0-alpha.15",
-    "@platformatic/db": "2.0.0-alpha.15",
-    "@platformatic/sql-graphql": "2.0.0-alpha.15",
-    "@platformatic/service": "2.0.0-alpha.15",
-    "@platformatic/sql-mapper": "2.0.0-alpha.15"
+    "@platformatic/composer": "2.0.0-alpha.17",
+    "@platformatic/db": "2.0.0-alpha.17",
+    "@platformatic/sql-graphql": "2.0.0-alpha.17",
+    "@platformatic/sql-mapper": "2.0.0-alpha.17",
+    "@platformatic/service": "2.0.0-alpha.17"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -68,17 +68,17 @@
     "undici": "^6.9.0",
     "undici-thread-interceptor": "^0.6.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.0.0-alpha.15",
-    "@platformatic/generators": "2.0.0-alpha.15",
-    "@platformatic/config": "2.0.0-alpha.15",
-    "@platformatic/itc": "2.0.0-alpha.15",
-    "@platformatic/telemetry": "2.0.0-alpha.15",
-    "@platformatic/ts-compiler": "2.0.0-alpha.15",
-    "@platformatic/utils": "2.0.0-alpha.15"
+    "@platformatic/basic": "2.0.0-alpha.17",
+    "@platformatic/config": "2.0.0-alpha.17",
+    "@platformatic/generators": "2.0.0-alpha.17",
+    "@platformatic/itc": "2.0.0-alpha.17",
+    "@platformatic/telemetry": "2.0.0-alpha.17",
+    "@platformatic/utils": "2.0.0-alpha.17",
+    "@platformatic/ts-compiler": "2.0.0-alpha.17"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=180000 && tsd",
-    "coverage": "npm run lint && borp -X=fixtures -X=test -C --concurrency=1 --timeout=180000 && tsd",
+    "coverage": "npm run lint && borp -X fixtures -X test -C --concurrency=1 --timeout=180000 && tsd",
     "gen-schema": "node lib/schema.js > schema.json",
     "gen-types": "json2ts > config.d.ts < schema.json",
     "build": "pnpm run gen-schema && pnpm run gen-types",