@platformatic/service 2.74.3 → 3.0.0-alpha.2

package/lib/{root-endpoint/index.js → plugins/root.js}

@@ -1,12 +1,11 @@
-'use strict'
+import fastifyStatic from '@fastify/static'
+import fp from 'fastify-plugin'
+import userAgentParser from 'my-ua-parser'
+import { join } from 'node:path'
 
-const path = require('path')
-const fastifyStatic = require('@fastify/static')
-const userAgentParser = require('my-ua-parser')
-
-module.exports = async (app, opts) => {
+async function setupRootPlugin (app) {
   app.register(fastifyStatic, {
-    root: path.join(__dirname, 'public'),
+    root: join(import.meta.dirname, '../../public')
   })
 
   // root endpoint
@@ -23,6 +22,8 @@ module.exports = async (app, opts) => {
         }
       }
       return { message: 'Welcome to Platformatic! Please visit https://docs.platformatic.dev' }
-    },
+    }
   })
 }
+
+export const setupRoot = fp(setupRootPlugin)

package/lib/plugins/sandbox-wrapper.js

@@ -1,26 +1,75 @@
-'use strict'
+import autoload from '@fastify/autoload'
+import { kMetadata } from '@platformatic/foundation'
+import fp from 'fastify-plugin'
+import { stat } from 'node:fs/promises'
+import { createRequire } from 'node:module'
+import { isAbsolute, resolve } from 'node:path'
+import { pathToFileURL } from 'node:url'
 
-const fp = require('fastify-plugin')
-const autoload = require('@fastify/autoload')
-const { stat } = require('node:fs/promises')
-const { createRequire } = require('node:module')
-const { join } = require('node:path')
-const { pathToFileURL } = require('node:url')
+/**
+ * Creates an object for pattern specific options. This ensures that
+ * only configurations that have been provided are included in the
+ * final result. This prevents 'cannot read properties of undefined'
+ * errors when undefined configs are provided to the underlying
+ * @fastify/autoload plugin.
+ */
+function patternOptionsFromPlugin (plugin) {
+  const config = {}
+
+  // Expected keys for autoload plugin options that expect regexp patterns
+  const patternOptionKeys = ['ignorePattern', 'indexPattern', 'autoHooksPattern']
 
-module.exports = fp(async function (app, opts) {
+  for (const key of patternOptionKeys) {
+    const pattern = plugin[key]
+
+    // If pattern key not found in plugin object, move on
+    if (!pattern) {
+      continue
+    }
+
+    // Build an instance of a RegExp. If this comes back undefined,
+    // then an invalid value was provided. Move on.
+    const regExpPattern = stringPatternToRegExp(pattern)
+    if (!regExpPattern) {
+      continue
+    }
+
+    // We have a valid RegExp so add the option to the config to pass along to
+    // autoload.
+    config[key] = regExpPattern
+  }
+
+  return config
+}
+
+function stringPatternToRegExp (stringPattern) {
+  try {
+    return new RegExp(stringPattern)
+  } catch (err) {
+    return undefined
+  }
+}
+
+async function sandboxWrapperPlugin (app, options) {
   // fake require next to the configManager dirname
-  const _require = createRequire(join(app.platformatic.configManager.dirname, 'package.json'))
-  for (const plugin of opts.packages || []) {
+  const require = createRequire(resolve(app.platformatic.config[kMetadata].root, 'noop.js'))
+
+  for (const plugin of options.packages || []) {
     const name = typeof plugin === 'string' ? plugin : plugin.name
-    const url = pathToFileURL(_require.resolve(name))
+    const url = pathToFileURL(require.resolve(name))
     const loaded = await import(url)
     await app.register(loaded, plugin.options)
   }
 
-  for (let plugin of opts.paths || []) {
+  for (let plugin of options.paths || []) {
     if (typeof plugin === 'string') {
       plugin = { path: plugin, encapsulate: true }
     }
+
+    if (plugin.path && !isAbsolute(plugin.path)) {
+      plugin.path = resolve(app.platformatic.config[kMetadata].root, plugin.path)
+    }
+
     if (plugin.path && (await stat(plugin.path)).isDirectory()) {
       const patternOptions = patternOptionsFromPlugin(plugin)
 
@@ -55,48 +104,6 @@ module.exports = fp(async function (app, opts) {
       }
     }
   }
-})
-
-/**
- * Creates an object for pattern specific options. This ensures that
- * only configurations that have been provided are included in the
- * final result. This prevents 'cannot read properties of undefined'
- * errors when undefined configs are provided to the underlying
- * @fastify/autoload plugin.
- */
-function patternOptionsFromPlugin (plugin) {
-  const config = {}
-
-  // Expected keys for autoload plugin options that expect regexp patterns
-  const patternOptionKeys = ['ignorePattern', 'indexPattern', 'autoHooksPattern']
-
-  for (const key of patternOptionKeys) {
-    const pattern = plugin[key]
-
-    // If pattern key not found in plugin object, move on
-    if (!pattern) {
-      continue
-    }
-
-    // Build an instance of a RegExp. If this comes back undefined,
-    // then an invalid value was provided. Move on.
-    const regExpPattern = stringPatternToRegExp(pattern)
-    if (!regExpPattern) {
-      continue
-    }
-
-    // We have a valid RegExp so add the option to the config to pass along to
-    // autoload.
-    config[key] = regExpPattern
-  }
-
-  return config
 }
 
-function stringPatternToRegExp (stringPattern) {
-  try {
-    return new RegExp(stringPattern)
-  } catch (err) {
-    return undefined
-  }
-}
+export const sandboxWrapper = fp(sandboxWrapperPlugin)