@platformatic/service 1.11.0 → 1.12.1

package/lib/plugins/plugins.js

@@ -3,11 +3,10 @@
 const { join, resolve } = require('path')
 const { readFile } = require('fs/promises')
 const fp = require('fastify-plugin')
+const wrapper = require('./sandbox-wrapper')
 
 const { getJSPluginPath, isFileAccessible } = require('../utils')
 
-const wrapperPath = join(__dirname, 'sandbox-wrapper.js')
-
 async function loadPlugins (app) {
   const configManager = app.platformatic.configManager
   const config = configManager.current
@@ -45,7 +44,7 @@ async function loadPlugins (app) {
     })
   }
 
-  await app.register(require(wrapperPath), { paths: config.plugins.paths })
+  await app.register(wrapper, { packages: config.plugins.packages, paths: config.plugins.paths })
 }
 
 module.exports = fp(loadPlugins)

package/lib/plugins/sandbox-wrapper.js

@@ -2,14 +2,26 @@
 
 const fp = require('fastify-plugin')
 const autoload = require('@fastify/autoload')
-const { stat } = require('fs').promises
+const { stat } = require('node:fs').promises
+const { createRequire } = require('node:module')
+const { join } = require('node:path')
+const { pathToFileURL } = require('node:url')
 
 module.exports = fp(async function (app, opts) {
-  for (let plugin of opts.paths) {
+  // fake require next to the configManager dirname
+  const _require = createRequire(join(app.platformatic.configManager.dirname, 'package.json'))
+  for (const plugin of opts.packages || []) {
+    const name = typeof plugin === 'string' ? plugin : plugin.name
+    const url = pathToFileURL(_require.resolve(name))
+    const loaded = await import(url)
+    await app.register(loaded, plugin.options)
+  }
+
+  for (let plugin of opts.paths || []) {
     if (typeof plugin === 'string') {
       plugin = { path: plugin, encapsulate: true }
     }
-    if ((await stat(plugin.path)).isDirectory()) {
+    if (plugin.path && (await stat(plugin.path)).isDirectory()) {
       const patternOptions = patternOptionsFromPlugin(plugin)
 
       app.register(autoload, {
@@ -27,7 +39,7 @@ module.exports = fp(async function (app, opts) {
         ...patternOptions
       })
     } else {
-      let loaded = await import(`file://${plugin.path}`)
+      let loaded = await import(pathToFileURL(plugin.path))
       /* c8 ignore next 3 */
       if (loaded.__esModule === true || typeof loaded.default === 'function') {
         loaded = loaded.default
@@ -56,7 +68,11 @@ function patternOptionsFromPlugin (plugin) {
   const config = {}
 
   // Expected keys for autoload plugin options that expect regexp patterns
-  const patternOptionKeys = ['ignorePattern', 'indexPattern', 'autoHooksPattern']
+  const patternOptionKeys = [
+    'ignorePattern',
+    'indexPattern',
+    'autoHooksPattern'
+  ]
 
   for (const key of patternOptionKeys) {
     const pattern = plugin[key]

package/lib/schema.js

@@ -422,6 +422,26 @@ const plugins = {
   $id: '#plugins',
   type: 'object',
   properties: {
+    packages: {
+      type: 'array',
+      items: {
+        anyOf: [{
+          type: 'string'
+        }, {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'string'
+            },
+            options: {
+              type: 'object',
+              additionalProperties: true
+            }
+          },
+          required: ['name']
+        }]
+      }
+    },
     paths: {
       type: 'array',
       items: {
@@ -517,7 +537,11 @@ const plugins = {
     }
   },
   additionalProperties: false,
-  required: ['paths']
+  anyOf: [{
+    required: ['paths']
+  }, {
+    required: ['packages']
+  }]
 }
 
 const metrics = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -18,6 +18,7 @@
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
     "@fastify/aws-lambda": "^3.3.0",
+    "@fastify/compress": "^6.5.0",
     "bindings": "^1.5.0",
     "c8": "^8.0.1",
     "glob": "^10.3.10",
@@ -68,11 +69,11 @@
     "pino-pretty": "^10.2.0",
     "rfdc": "^1.3.0",
     "ua-parser-js": "^1.0.36",
-    "@platformatic/client": "1.11.0",
-    "@platformatic/config": "1.11.0",
-    "@platformatic/swagger-ui-theme": "1.11.0",
-    "@platformatic/telemetry": "1.11.0",
-    "@platformatic/utils": "1.11.0"
+    "@platformatic/client": "1.12.1",
+    "@platformatic/config": "1.12.1",
+    "@platformatic/telemetry": "1.12.1",
+    "@platformatic/utils": "1.12.1",
+    "@platformatic/swagger-ui-theme": "1.12.1"
   },
   "standard": {
     "ignore": [