@platformatic/runtime 2.21.1 → 2.22.0

package/config.d.ts

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

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: [
     {
@@ -41,7 +48,11 @@ const services = {
         type: 'boolean'
       },
       workers,
-      health: { ...health, default: undefined }
+      health: { ...health, default: undefined },
+      env,
+      envfile: {
+        type: 'string'
+      }
     }
   }
 }
@@ -316,7 +327,8 @@ const platformaticRuntimeSchema = {
     resolvedServicesBasePath: {
       type: 'string',
       default: 'external'
-    }
+    },
+    env
   },
   anyOf: [{ required: ['autoload'] }, { required: ['services'] }, { required: ['web'] }],
   additionalProperties: false,

package/lib/worker/main.js

@@ -3,13 +3,14 @@
 const { EventEmitter } = require('node:events')
 const { createRequire } = require('node:module')
 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')
@@ -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 = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.21.1",
+  "version": "2.22.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -35,12 +35,12 @@
     "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.22.0",
+    "@platformatic/db": "2.22.0",
+    "@platformatic/node": "2.22.0",
+    "@platformatic/service": "2.22.0",
+    "@platformatic/sql-mapper": "2.22.0",
+    "@platformatic/sql-graphql": "2.22.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -55,6 +55,7 @@
     "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 +73,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.22.0",
+    "@platformatic/config": "2.22.0",
+    "@platformatic/itc": "2.22.0",
+    "@platformatic/generators": "2.22.0",
+    "@platformatic/ts-compiler": "2.22.0",
+    "@platformatic/telemetry": "2.22.0",
+    "@platformatic/utils": "2.22.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.22.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -296,6 +296,15 @@
               }
             },
             "additionalProperties": false
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "envfile": {
+            "type": "string"
           }
         }
       }
@@ -449,6 +458,15 @@
               }
             },
             "additionalProperties": false
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "envfile": {
+            "type": "string"
           }
         }
       }
@@ -1113,6 +1131,12 @@
     "resolvedServicesBasePath": {
       "type": "string",
       "default": "external"
+    },
+    "env": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
     }
   },
   "anyOf": [