@platformatic/runtime 2.33.0 → 2.35.0

package/config.d.ts

@@ -5,11 +5,11 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime2330Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime2350Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;
-  preload?: string;
+  preload?: string | string[];
   entrypoint?: string;
   basePath?: string;
   autoload?: {
@@ -30,6 +30,8 @@ export type HttpsSchemasPlatformaticDevPlatformaticRuntime2330Json = {
           maxHeapUsed?: number | string;
           maxHeapTotal?: number | string;
         };
+        preload?: string | string[];
+        nodeOptions?: string;
       };
     };
   };

package/lib/runtime.js

@@ -992,6 +992,14 @@ class Runtime extends EventEmitter {
       execArgv.push('--enable-source-maps')
     }
 
+    const workerEnv = structuredClone(this.#env)
+
+    if (serviceConfig.nodeOptions?.trim().length > 0) {
+      const originalNodeOptions = workerEnv['NODE_OPTIONS'] ?? ''
+
+      workerEnv['NODE_OPTIONS'] = `${originalNodeOptions} ${serviceConfig.nodeOptions}`.trim()
+    }
+
     const worker = new Worker(kWorkerFile, {
       workerData: {
         config,
@@ -1011,7 +1019,7 @@ class Runtime extends EventEmitter {
         loggingPort
       },
       execArgv,
-      env: this.#env,
+      env: workerEnv,
       transferList: [loggingPort],
       resourceLimits: {
         maxOldGenerationSizeMb: health.maxHeapTotal

package/lib/schema.js

@@ -23,6 +23,19 @@ const workers = {
   ]
 }
 
+const preload = {
+  anyOf: [
+    { type: 'string', resolvePath: true },
+    {
+      type: 'array',
+      items: {
+        type: 'string',
+        resolvePath: true
+      }
+    }
+  ]
+}
+
 const services = {
   type: 'array',
   items: {
@@ -64,6 +77,10 @@ const services = {
       packageManager: {
         type: 'string',
         enum: ['npm', 'pnpm', 'yarn']
+      },
+      preload,
+      nodeOptions: {
+        type: 'string'
       }
     }
   }
@@ -79,10 +96,7 @@ const platformaticRuntimeSchema = {
     $schema: {
       type: 'string'
     },
-    preload: {
-      type: 'string',
-      resolvePath: true
-    },
+    preload,
     entrypoint: {
       type: 'string'
     },
@@ -122,7 +136,11 @@ const platformaticRuntimeSchema = {
                 type: 'boolean'
               },
               workers,
-              health: { ...health, default: undefined }
+              health: { ...health, default: undefined },
+              preload,
+              nodeOptions: {
+                type: 'string'
+              }
             }
           }
         }

package/lib/shared-http-cache.js

@@ -17,9 +17,16 @@ async function createSharedStore (projectDir, httpCacheConfig = {}) {
 
       const { body, ...response } = cachedValue
 
-      let payload = ''
+      const acc = []
       for await (const chunk of body) {
-        payload += chunk
+        acc.push(chunk)
+      }
+
+      let payload
+      if (acc.length > 0 && typeof acc[0] === 'string') {
+        payload = acc.join('')
+      } else {
+        payload = Buffer.concat(acc)
       }
 
       return { response, payload }

package/lib/worker/http-cache.js

@@ -33,8 +33,10 @@ class RemoteCacheStore {
     const itc = globalThis[kITC]
     if (!itc) return
 
+    const sanitizedRequest = this.#sanitizeRequest(request)
+
     const cachedValue = await itc.send('getHttpCacheValue', {
-      request: this.#sanitizeRequest(request)
+      request: sanitizedRequest
     })
     if (!cachedValue) {
       try {
@@ -71,16 +73,22 @@ class RemoteCacheStore {
     const itc = globalThis[kITC]
     if (!itc) throw new Error('Cannot write to cache without an ITC instance')
 
-    let payload = ''
+    const acc = []
 
     key = this.#sanitizeRequest(key)
 
     return new Writable({
       write (chunk, encoding, callback) {
-        payload += chunk
+        acc.push(chunk)
         callback()
       },
       final (callback) {
+        let payload
+        if (acc.length > 0 && typeof acc[0] === 'string') {
+          payload = acc.join('')
+        } else {
+          payload = Buffer.concat(acc)
+        }
         itc.send('setHttpCacheValue', { request: key, response: value, payload })
           .then(() => callback())
           .catch((err) => callback(err))

package/lib/worker/main.js

@@ -75,10 +75,20 @@ function createLogger () {
   return loggerInstance
 }
 
-async function main () {
-  if (config.preload) {
-    await import(pathToFileURL(config.preload))
+async function performPreloading (...sources) {
+  for (const source of sources) {
+    const preload = typeof source.preload === 'string' ? [source.preload] : source.preload
+
+    if (Array.isArray(preload)) {
+      for (const file of preload) {
+        await import(pathToFileURL(file))
+      }
+    }
   }
+}
+
+async function main () {
+  await performPreloading(config, workerData.serviceConfig)
 
   const service = workerData.serviceConfig
 
@@ -160,13 +170,13 @@ async function main () {
       getGlobalDispatcher().compose(
         httpCacheInterceptor({
           store: new RemoteCacheStore({
-            onRequest: (opts) => {
+            onRequest: opts => {
               globalThis.platformatic?.onHttpCacheRequest?.(opts)
             },
-            onCacheHit: (opts) => {
+            onCacheHit: opts => {
               globalThis.platformatic?.onHttpCacheHit?.(opts)
             },
-            onCacheMiss: (opts) => {
+            onCacheMiss: opts => {
               globalThis.platformatic?.onHttpCacheMiss?.(opts)
             },
             logger: globalThis.platformatic.logger

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.33.0",
+  "version": "2.35.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -17,6 +17,7 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
+    "@fastify/compress": "^8.0.0",
     "@fastify/express": "^4.0.0",
     "@fastify/formbody": "^8.0.0",
     "borp": "^0.19.0",
@@ -35,12 +36,12 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.33.0",
-    "@platformatic/db": "2.33.0",
-    "@platformatic/node": "2.33.0",
-    "@platformatic/service": "2.33.0",
-    "@platformatic/sql-graphql": "2.33.0",
-    "@platformatic/sql-mapper": "2.33.0"
+    "@platformatic/db": "2.35.0",
+    "@platformatic/node": "2.35.0",
+    "@platformatic/composer": "2.35.0",
+    "@platformatic/service": "2.35.0",
+    "@platformatic/sql-mapper": "2.35.0",
+    "@platformatic/sql-graphql": "2.35.0"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -74,13 +75,13 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^0.11.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.33.0",
-    "@platformatic/config": "2.33.0",
-    "@platformatic/generators": "2.33.0",
-    "@platformatic/itc": "2.33.0",
-    "@platformatic/telemetry": "2.33.0",
-    "@platformatic/ts-compiler": "2.33.0",
-    "@platformatic/utils": "2.33.0"
+    "@platformatic/basic": "2.35.0",
+    "@platformatic/generators": "2.35.0",
+    "@platformatic/itc": "2.35.0",
+    "@platformatic/ts-compiler": "2.35.0",
+    "@platformatic/utils": "2.35.0",
+    "@platformatic/telemetry": "2.35.0",
+    "@platformatic/config": "2.35.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.33.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.35.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -7,8 +7,19 @@
       "type": "string"
     },
     "preload": {
-      "type": "string",
-      "resolvePath": true
+      "anyOf": [
+        {
+          "type": "string",
+          "resolvePath": true
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "resolvePath": true
+          }
+        }
+      ]
     },
     "entrypoint": {
       "type": "string"
@@ -153,6 +164,24 @@
                   }
                 },
                 "additionalProperties": false
+              },
+              "preload": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "resolvePath": true
+                  },
+                  {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "resolvePath": true
+                    }
+                  }
+                ]
+              },
+              "nodeOptions": {
+                "type": "string"
               }
             }
           }
@@ -321,6 +350,24 @@
               "pnpm",
               "yarn"
             ]
+          },
+          "preload": {
+            "anyOf": [
+              {
+                "type": "string",
+                "resolvePath": true
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "resolvePath": true
+                }
+              }
+            ]
+          },
+          "nodeOptions": {
+            "type": "string"
           }
         }
       }
@@ -499,6 +546,24 @@
               "pnpm",
               "yarn"
             ]
+          },
+          "preload": {
+            "anyOf": [
+              {
+                "type": "string",
+                "resolvePath": true
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "resolvePath": true
+                }
+              }
+            ]
+          },
+          "nodeOptions": {
+            "type": "string"
           }
         }
       }