@platformatic/service 0.8.0 → 0.9.1

package/index.js

@@ -132,7 +132,7 @@ async function buildServer (options, app = platformaticService) {
   if (!options.configManager) {
     // instantiate a new config manager from current options
     const cm = new ConfigManager({
-      source: { ...options },
+      source: options,
       schema
     })
     await cm.parseAndValidate()
@@ -164,28 +164,31 @@ async function buildServer (options, app = platformaticService) {
     }
 
     addLoggerToTheConfig(opts)
+    const configManager = handler.app.platformatic.configManager
+
+    if (!opts) {
+      opts = configManager.current
+    }
 
     // Ignore because not tested on Windows
     // TODO: remove the ignore, we shoduld be testing
     // this on Windows
-    /* c8 ignore start */
-    if (opts) {
-      const fileWatcher = handler.app.platformatic.fileWatcher
-      const configManager = handler.app.platformatic.configManager
-      opts.fileWatcher = fileWatcher
-      opts.configManager = configManager
-      opts = createServerConfig(opts)
-      opts.app = app
-    }
+    const fileWatcher = handler.app.platformatic.fileWatcher
+    opts.fileWatcher = fileWatcher
+    opts.configManager = configManager
+    opts = createServerConfig(opts)
+    opts.app = app
+
     debounce = _restart(opts).then(() => {
       handler.app.log.info('restarted')
     }).finally(() => {
       debounce = null
     })
-    /* c8 ignore stop */
     return debounce
   }
 
+  handler.app.restart = handler.restart
+
   return handler
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "",
   "main": "index.js",
   "author": "Matteo Collina <hello@matteocollina.com>",
@@ -28,15 +28,15 @@
   "dependencies": {
     "@fastify/accepts": "^4.0.1",
     "@fastify/autoload": "^5.5.0",
-    "@fastify/basic-auth": "^4.0.0",
+    "@fastify/basic-auth": "^5.0.0",
     "@fastify/cors": "^8.0.0",
     "@fastify/deepmerge": "^1.1.0",
     "@fastify/restartable": "^1.3.1",
     "@fastify/static": "^6.5.0",
     "@fastify/swagger": "^8.0.0",
     "@fastify/under-pressure": "^8.0.0",
-    "@platformatic/config": "0.8.0",
-    "@platformatic/utils": "0.8.0",
+    "@platformatic/config": "0.9.1",
+    "@platformatic/utils": "0.9.1",
     "close-with-grace": "^1.1.0",
     "commist": "^3.1.2",
     "desm": "^1.2.0",

package/test/config.test.js

@@ -0,0 +1,186 @@
+'use strict'
+
+require('./helper')
+const { test } = require('tap')
+const { buildServer } = require('..')
+const { request } = require('undici')
+const { join } = require('path')
+const os = require('os')
+const { writeFile } = require('fs/promises')
+
+test('config reloads', async ({ teardown, equal, pass, same }) => {
+  const file = join(os.tmpdir(), `${process.pid}-1.js`)
+
+  await writeFile(file, `
+    module.exports = async function (app, options) {
+      app.get('/', () => options.message)
+    }`)
+
+  const server = await buildServer({
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: {
+      path: file,
+      options: {
+        message: 'hello'
+      }
+    },
+    metrics: false
+  })
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'add status code')
+    same(await res.body.text(), 'hello', 'response')
+  }
+
+  await server.app.platformatic.configManager.update({
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: {
+      path: file,
+      options: {
+        message: 'ciao mondo'
+      }
+    },
+    metrics: false
+  })
+
+  await server.restart()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'add status code')
+    same(await res.body.text(), 'ciao mondo', 'response')
+  }
+})
+
+test('config reloads from a written file', async ({ teardown, equal, pass, same }) => {
+  const config = join(os.tmpdir(), `${process.pid}-2.json`)
+  const file = join(os.tmpdir(), `${process.pid}-2.js`)
+
+  await writeFile(config, JSON.stringify({
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: {
+      path: file,
+      options: {
+        message: 'hello'
+      }
+    },
+    metrics: false
+  }))
+
+  await writeFile(file, `
+    module.exports = async function (app, options) {
+      app.get('/', () => options.message)
+    }`)
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'add status code')
+    same(await res.body.text(), 'hello', 'response')
+  }
+
+  await server.app.platformatic.configManager.update({
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: {
+      path: file,
+      options: {
+        message: 'ciao mondo'
+      }
+    },
+    metrics: false
+  })
+
+  await server.restart()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'add status code')
+    same(await res.body.text(), 'ciao mondo', 'response')
+  }
+})
+
+test('config reloads from a written file from a route', async ({ teardown, equal, pass, same }) => {
+  const config = join(os.tmpdir(), `${process.pid}-3.json`)
+  const file = join(os.tmpdir(), `${process.pid}-3.js`)
+
+  await writeFile(config, JSON.stringify({
+    server: {
+      hostname: '127.0.0.1',
+      logger: { level: 'error' },
+      port: 0
+    },
+    plugin: {
+      path: file,
+      options: {
+        message: 'hello'
+      }
+    },
+    metrics: false
+  }))
+
+  await writeFile(file, `
+    module.exports = async function (app, options) {
+      app.get('/', () => options.message)
+
+      app.post('/restart', async (req, res) => {
+        await app.platformatic.configManager.update({
+          server: {
+            hostname: '127.0.0.1',
+            port: 0
+          },
+          plugin: {
+            path: '${file.replace(/\\/g, '\\\\')}',
+            options: {
+              message: 'ciao mondo'
+            }
+          },
+          metrics: false
+        })
+
+        await app.restart()
+
+        return true
+      })
+    }`)
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'add status code')
+    same(await res.body.text(), 'hello', 'response')
+  }
+
+  {
+    const res = await request(`${server.url}/restart`, {
+      method: 'POST'
+    })
+    equal(res.statusCode, 200, 'add status code')
+  }
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'add status code')
+    same(await res.body.text(), 'ciao mondo', 'response')
+  }
+})