@platformatic/service 0.21.1 → 0.23.0

package/test/https.test.js

@@ -2,7 +2,7 @@
 
 const { mkdtemp, writeFile } = require('fs/promises')
 const { tmpdir } = require('os')
-const { isAbsolute, join, relative } = require('path')
+const { join, relative } = require('path')
 const selfCert = require('self-cert')
 const { test } = require('tap')
 const { Agent, setGlobalDispatcher, request } = require('undici')
@@ -10,7 +10,7 @@ const { buildServer } = require('..')
 const { buildConfig } = require('./helper')
 
 test('supports https options', async ({ teardown, equal, same, plan, comment }) => {
-  plan(7)
+  plan(6)
 
   const { certificate, privateKey } = selfCert({})
   const localDir = tmpdir()
@@ -31,7 +31,7 @@ test('supports https options', async ({ teardown, equal, same, plan, comment })
     }
   }))
 
-  const server = await buildServer(buildConfig({
+  const app = await buildServer(buildConfig({
     server: {
       hostname: '127.0.0.1',
       port: 0,
@@ -42,20 +42,22 @@ test('supports https options', async ({ teardown, equal, same, plan, comment })
     }
   }))
 
-  teardown(server.stop)
-  await server.listen()
+  teardown(async () => {
+    await app.close()
+  })
 
-  equal(isAbsolute(server.app.platformatic.configManager.current.server.https.cert[0].path), true)
-  equal(server.url.startsWith('https://'), true)
-  let res = await (request(`${server.url}/`))
+  await app.start()
+
+  equal(app.url.startsWith('https://'), true)
+  let res = await (request(`${app.url}/`))
   equal(res.statusCode, 200)
   let body = await res.body.json()
   same(body, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })
 
-  await server.restart()
+  await app.restart()
 
-  equal(server.url.startsWith('https://'), true)
-  res = await (request(`${server.url}/`))
+  equal(app.url.startsWith('https://'), true)
+  res = await (request(`${app.url}/`))
   equal(res.statusCode, 200)
   body = await res.body.json()
   same(body, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })

package/test/lambda.test.js

@@ -0,0 +1,103 @@
+'use strict'
+
+const { test } = require('tap')
+const { buildServer } = require('..')
+const { buildConfig } = require('./helper')
+const { join } = require('path')
+const awsLambdaFastify = require('@fastify/aws-lambda')
+
+test('should respond 200 on root endpoint', async ({ teardown, equal, same, ok }) => {
+  const app = await buildServer(buildConfig({
+    server: {
+      hostname: '127.0.0.1',
+      port: 0,
+      healthCheck: {
+        enabled: true,
+        interval: 2000
+      }
+    }
+  }))
+
+  teardown(async () => {
+    await app.close()
+  })
+
+  const handler = awsLambdaFastify(app)
+
+  {
+    // No browser (i.e. curl)
+    const evt = {
+      version: '2.0',
+      httpMethod: 'GET',
+      path: '/',
+      headers: {
+      },
+      cookies: [],
+      queryStringParameters: ''
+    }
+
+    const ret = await handler(evt)
+
+    equal(ret.body, JSON.stringify({ message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' }))
+    equal(ret.isBase64Encoded, false)
+    ok(ret.headers)
+    equal(ret.headers['content-type'], 'application/json; charset=utf-8')
+    equal(ret.headers['content-length'], '80')
+    ok(ret.headers.date)
+    equal(ret.headers.connection, 'keep-alive')
+  }
+
+  {
+    // browser
+    const evt = {
+      version: '2.0',
+      httpMethod: 'GET',
+      path: '/',
+      headers: {
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36'
+      },
+      cookies: [],
+      queryStringParameters: ''
+    }
+
+    const ret = await handler(evt)
+
+    // No browser (i.e. curl)
+    equal(ret.isBase64Encoded, false)
+    ok(ret.headers)
+    equal(ret.headers['content-type'], 'text/html; charset=UTF-8')
+    ok(ret.headers.date)
+    equal(ret.headers.connection, 'keep-alive')
+  }
+})
+
+test('from a config file on disk', async ({ teardown, equal, same, ok }) => {
+  const app = await buildServer(join(__dirname, '..', 'fixtures', 'hello', 'warn-log.service.json'))
+
+  teardown(async () => {
+    await app.close()
+  })
+
+  const handler = awsLambdaFastify(app)
+
+  // No browser (i.e. curl)
+  const evt = {
+    version: '2.0',
+    httpMethod: 'GET',
+    path: '/',
+    headers: {
+    },
+    cookies: [],
+    queryStringParameters: ''
+  }
+
+  const ret = await handler(evt)
+
+  equal(ret.body, JSON.stringify({ hello: 'world' }))
+  equal(ret.isBase64Encoded, false)
+  ok(ret.headers)
+  equal(ret.headers['content-type'], 'application/json; charset=utf-8')
+  equal(ret.headers['content-length'], '17')
+  ok(ret.headers.date)
+  equal(ret.headers.connection, 'keep-alive')
+})

package/test/load-and-reload-files.test.js

@@ -16,7 +16,7 @@ test('load and reload', async ({ teardown, equal, pass, same }) => {
     }`
   )
 
-  const server = await buildServer({
+  const app = await buildServer({
     server: {
       hostname: '127.0.0.1',
       port: 0
@@ -26,11 +26,14 @@ test('load and reload', async ({ teardown, equal, pass, same }) => {
     },
     metrics: false
   })
-  teardown(server.stop)
-  await server.listen()
+
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
 
   {
-    const res = await request(`${server.url}/`)
+    const res = await request(`${app.url}/`)
     equal(res.statusCode, 200, 'status code')
     const data = await res.body.json()
     same(data, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })
@@ -38,13 +41,13 @@ test('load and reload', async ({ teardown, equal, pass, same }) => {
 
   await writeFile(file, `
     module.exports = async function (app) {
-      app.get('/', () => "hello world" ) 
+      app.get('/', () => "hello world" )
     }`)
 
-  await server.restart()
+  await app.restart()
 
   {
-    const res = await request(`${server.url}/`)
+    const res = await request(`${app.url}/`)
     equal(res.statusCode, 200, 'add status code')
     same(await res.body.text(), 'hello world', 'response')
   }
@@ -60,7 +63,7 @@ test('error', async ({ teardown, equal, pass, match }) => {
       })
     }`)
 
-  const server = await buildServer({
+  const app = await buildServer({
     server: {
       hostname: '127.0.0.1',
       port: 0
@@ -70,59 +73,19 @@ test('error', async ({ teardown, equal, pass, match }) => {
     },
     metrics: false
   })
-  teardown(server.stop)
-  await server.listen()
 
-  const res = await request(`${server.url}/`)
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
+
+  const res = await request(`${app.url}/`)
   equal(res.statusCode, 500, 'add status code')
   match(await res.body.json(), {
     message: 'kaboom'
   })
 })
 
-test('update config', async ({ teardown, equal, pass, same }) => {
-  const file = join(os.tmpdir(), `some-plugin-${process.pid}.js`)
-  await writeFile(file, `
-    module.exports = async function (app) {
-    }`
-  )
-
-  const server = await buildServer({
-    server: {
-      hostname: '127.0.0.1',
-      port: 0
-    },
-    metrics: false
-  })
-  teardown(server.stop)
-  await server.listen()
-
-  {
-    const res = await request(`${server.url}/`)
-    equal(res.statusCode, 200, 'status code')
-    const data = await res.body.json()
-    same(data, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })
-  }
-
-  const file2 = join(os.tmpdir(), `some-plugin-${process.pid}-2.js`)
-  await writeFile(file2, `
-    module.exports = async function (app) {
-      app.get('/', () => "hello world" ) 
-    }`)
-
-  await server.restart({
-    plugins: {
-      paths: [file2]
-    }
-  })
-
-  {
-    const res = await request(`${server.url}/`)
-    equal(res.statusCode, 200, 'add status code')
-    same(await res.body.text(), 'hello world', 'response')
-  }
-})
-
 test('mock undici is supported', async ({ teardown, equal, pass, same }) => {
   const previousAgent = getGlobalDispatcher()
   teardown(() => setGlobalDispatcher(previousAgent))
@@ -143,7 +106,7 @@ test('mock undici is supported', async ({ teardown, equal, pass, same }) => {
     hello: 'world'
   })
 
-  const server = await buildServer({
+  const app = await buildServer({
     server: {
       hostname: '127.0.0.1',
       port: 0
@@ -152,10 +115,13 @@ test('mock undici is supported', async ({ teardown, equal, pass, same }) => {
       paths: [join(__dirname, 'fixtures', 'undici-plugin.js')]
     }
   })
-  teardown(server.stop)
-  await server.listen()
 
-  const res = await request(`${server.url}/request`, {
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
+
+  const res = await request(`${app.url}/request`, {
     method: 'GET'
   })
   equal(res.statusCode, 200)
@@ -172,7 +138,7 @@ test('load and reload with the fallback', async ({ teardown, equal, pass, same }
     }`
   )
 
-  const server = await buildServer({
+  const app = await buildServer({
     server: {
       hostname: '127.0.0.1',
       port: 0
@@ -183,11 +149,14 @@ test('load and reload with the fallback', async ({ teardown, equal, pass, same }
       fallback: true
     }
   })
-  teardown(server.stop)
-  await server.listen()
+
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
 
   {
-    const res = await request(`${server.url}/`)
+    const res = await request(`${app.url}/`)
     equal(res.statusCode, 200, 'status code')
     const data = await res.body.json()
     same(data, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })
@@ -195,13 +164,13 @@ test('load and reload with the fallback', async ({ teardown, equal, pass, same }
 
   await writeFile(file, `
     module.exports = async function (app) {
-      app.get('/', () => "hello world" ) 
+      app.get('/', () => "hello world" )
     }`)
 
-  await server.restart()
+  await app.restart()
 
   {
-    const res = await request(`${server.url}/`)
+    const res = await request(`${app.url}/`)
     equal(res.statusCode, 200, 'add status code')
     same(await res.body.text(), 'hello world', 'response')
   }
@@ -215,7 +184,7 @@ test('load and reload ESM', async ({ teardown, equal, pass, same }) => {
     }`
   )
 
-  const server = await buildServer({
+  const app = await buildServer({
     server: {
       hostname: '127.0.0.1',
       port: 0
@@ -224,11 +193,14 @@ test('load and reload ESM', async ({ teardown, equal, pass, same }) => {
       paths: [file]
     }
   })
-  teardown(server.stop)
-  await server.listen()
+
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
 
   {
-    const res = await request(`${server.url}/`)
+    const res = await request(`${app.url}/`)
     equal(res.statusCode, 200, 'status code')
     const data = await res.body.json()
     same(data, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })
@@ -236,19 +208,19 @@ test('load and reload ESM', async ({ teardown, equal, pass, same }) => {
 
   await writeFile(file, `
     export default async function (app) {
-      app.get('/', () => "hello world" ) 
+      app.get('/', () => "hello world" )
     }`)
 
-  await server.restart()
+  await app.restart()
 
   {
-    const res = await request(`${server.url}/`)
+    const res = await request(`${app.url}/`)
     equal(res.statusCode, 200, 'add status code')
     same(await res.body.text(), 'hello world', 'response')
   }
 })
 
-test('server should be available after reload a compromised plugin', async ({ teardown, equal, pass, same }) => {
+test('server should be available after reload a compromised plugin', async ({ teardown, equal, pass, same, rejects }) => {
   const file = join(os.tmpdir(), `some-plugin-${process.pid}.js`)
 
   const workingModule = `
@@ -267,34 +239,35 @@ test('server should be available after reload a compromised plugin', async ({ te
       paths: [file]
     }
   }
-  const restartConfig = { ...config }
-  delete restartConfig.server
 
-  const server = await buildServer(config)
-  await server.listen()
+  const app = await buildServer(config)
+
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
+
   await writeFile(file, compromisedModule)
-  await server.restart(restartConfig).catch(() => {
+  await app.restart().catch(() => {
     pass('plugin reload failed')
   })
 
   {
-    const res = await request(`${server.url}/`, { method: 'GET' })
+    const res = await request(`${app.url}/`, { method: 'GET' })
     equal(res.statusCode, 200, 'status code')
     const data = await res.body.json()
     same(data, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })
   }
 
   await writeFile(file, workingModule)
-  await server.restart(restartConfig)
+  await app.restart()
 
   {
-    const res = await request(`${server.url}/`, { method: 'GET' })
+    const res = await request(`${app.url}/`, { method: 'GET' })
     equal(res.statusCode, 200, 'add status code')
     const data = await res.body.json()
     same(data, { message: 'Welcome to Platformatic! Please visit https://oss.platformatic.dev' })
   }
-
-  teardown(server.stop)
 })
 
 test('hot reload disabled, CommonJS', async ({ teardown, equal, pass, same }) => {
@@ -308,7 +281,7 @@ test('hot reload disabled, CommonJS', async ({ teardown, equal, pass, same }) =>
     }`
   )
 
-  const server = await buildServer({
+  const app = await buildServer({
     server: {
       hostname: '127.0.0.1',
       port: 0
@@ -318,11 +291,14 @@ test('hot reload disabled, CommonJS', async ({ teardown, equal, pass, same }) =>
       hotReload: false
     }
   })
-  teardown(server.stop)
-  await server.listen()
+
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
 
   {
-    const res = await request(`${server.url}/test`, {
+    const res = await request(`${app.url}/test`, {
       method: 'GET'
     })
     equal(res.statusCode, 200)
@@ -337,10 +313,10 @@ test('hot reload disabled, CommonJS', async ({ teardown, equal, pass, same }) =>
     }`
   )
 
-  await server.restart()
+  await app.restart()
 
   {
-    const res = await request(`${server.url}/test`, {
+    const res = await request(`${app.url}/test`, {
       method: 'GET'
     })
     equal(res.statusCode, 200)
@@ -350,9 +326,10 @@ test('hot reload disabled, CommonJS', async ({ teardown, equal, pass, same }) =>
 })
 
 test('hot reload disabled, ESM', async ({ teardown, equal, pass, same }) => {
-  const file = join(os.tmpdir(), `some-plugin-hot-rel-test-${process.pid}.mjs`)
+  const pathToPlugin = join(os.tmpdir(), `some-plugin-hot-rel-test-${process.pid}.mjs`)
+  const pathToConfig = join(os.tmpdir(), `platformatic.service.${process.pid}.json`)
 
-  await writeFile(file, `
+  await writeFile(pathToPlugin, `
     export default async function (app) {
       app.get('/test', {}, async function (request, response) {
         return { res: "plugin, version 1"}
@@ -360,31 +337,36 @@ test('hot reload disabled, ESM', async ({ teardown, equal, pass, same }) => {
     }`
   )
 
-  const server = await buildServer({
+  const config = {
     server: {
       hostname: '127.0.0.1',
       port: 0
     },
     plugins: {
-      paths: [file],
+      paths: [pathToPlugin],
       stopTimeout: 1000,
       hotReload: false
     },
     watch: true,
     metrics: false
+  }
+  await writeFile(pathToConfig, JSON.stringify(config, null, 2))
+  const app = await buildServer(pathToConfig)
+
+  teardown(async () => {
+    await app.close()
   })
-  teardown(server.stop)
-  await server.listen()
+  await app.start()
 
   {
-    const res = await request(`${server.url}/test`, {
+    const res = await request(`${app.url}/test`, {
       method: 'GET'
     })
     equal(res.statusCode, 200)
     same(await res.body.json(), { res: 'plugin, version 1' }, 'get rest plugin')
   }
 
-  await writeFile(file, `
+  await writeFile(pathToPlugin, `
     export default async function (app) {
       app.get('/test', {}, async function (request, response) {
         return { res: "plugin, version 2"}
@@ -392,10 +374,10 @@ test('hot reload disabled, ESM', async ({ teardown, equal, pass, same }) => {
     }`
   )
 
-  await server.restart()
+  await app.restart()
 
   {
-    const res = await request(`${server.url}/test`, {
+    const res = await request(`${app.url}/test`, {
       method: 'GET'
     })
     equal(res.statusCode, 200)
@@ -405,9 +387,10 @@ test('hot reload disabled, ESM', async ({ teardown, equal, pass, same }) => {
 })
 
 test('hot reload disabled, with default export', async ({ teardown, equal, pass, same }) => {
-  const file = join(os.tmpdir(), `some-plugin-hot-rel-test-${process.pid}.js`)
+  const pathToPlugin = join(os.tmpdir(), `some-plugin-hot-rel-test-${process.pid}.js`)
+  const pathToConfig = join(os.tmpdir(), `platformatic.service.${process.pid}.json`)
 
-  await writeFile(file, `
+  await writeFile(pathToPlugin, `
     Object.defineProperty(exports, "__esModule", { value: true })
     exports.default = async function plugin (app) {
       app.get('/test', {}, async function (request, response) {
@@ -415,30 +398,36 @@ test('hot reload disabled, with default export', async ({ teardown, equal, pass,
       })
     }`)
 
-  const server = await buildServer({
+  const config = {
     server: {
       hostname: '127.0.0.1',
       port: 0
     },
     plugins: {
-      paths: [file],
+      paths: [pathToPlugin],
       stopTimeout: 1000,
       hotReload: false
     },
     watch: true,
     metrics: false
+  }
+
+  await writeFile(pathToConfig, JSON.stringify(config, null, 2))
+  const app = await buildServer(pathToConfig)
+
+  teardown(async () => {
+    await app.close()
   })
-  teardown(server.stop)
-  await server.listen()
+  await app.start()
 
   {
-    const res = await request(`${server.url}/test`, {
+    const res = await request(`${app.url}/test`, {
       method: 'GET'
     })
     same(await res.body.json(), { res: 'plugin, version 1' }, 'get rest plugin')
   }
 
-  await writeFile(file, `
+  await writeFile(pathToPlugin, `
     Object.defineProperty(exports, "__esModule", { value: true })
     exports.default = async function plugin (app) {
       app.get('/test', {}, async function (request, response) {
@@ -447,10 +436,10 @@ test('hot reload disabled, with default export', async ({ teardown, equal, pass,
     }`
   )
 
-  await server.restart()
+  await app.restart()
 
   {
-    const res = await request(`${server.url}/test`, {
+    const res = await request(`${app.url}/test`, {
       method: 'GET'
     })
     equal(res.statusCode, 200)

package/test/load-plugin.test.js

@@ -14,15 +14,19 @@ test('customize service', async ({ teardown, equal }) => {
     }])
   }
 
-  const server = await buildServer({
+  const app = await buildServer({
     server: {
       hostname: '127.0.0.1',
       port: 0
     }
   }, myApp)
-  teardown(server.stop)
-  await server.listen()
-  const res = await (request(server.url))
+
+  teardown(async () => {
+    await app.close()
+  })
+  await app.start()
+
+  const res = await (request(app.url))
   const body = await res.body.text()
   equal(res.statusCode, 200)
   equal(body, 'hello world')