@platformatic/runtime 0.36.0 → 0.37.1

package/lib/api.js

@@ -193,7 +193,7 @@ class RuntimeApi {
     }
 
     if (typeof service.server.swagger !== 'function') {
-      throw new Error(`Service with id '${id}' does not expose an OpenAPI schema`)
+      return null
     }
 
     try {

package/lib/app.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { once } = require('node:events')
-const { dirname, basename } = require('node:path')
+const { dirname } = require('node:path')
 const { FileWatcher } = require('@platformatic/utils')
 const debounce = require('debounce')
 const {
@@ -18,6 +18,7 @@ class PlatformaticApp {
   #fileWatcher
   #logger
   #telemetryConfig
+  #debouncedRestart
 
   constructor (appConfig, loaderPort, logger, telemetryConfig) {
     this.appConfig = appConfig
@@ -33,6 +34,12 @@ class PlatformaticApp {
       name: this.appConfig.id
     })
     this.#telemetryConfig = telemetryConfig
+
+    /* c8 ignore next 4 */
+    this.#debouncedRestart = debounce(() => {
+      this.server.log.info('files changed')
+      this.restart()
+    }, 100) // debounce restart for 100ms
   }
 
   getStatus () {
@@ -56,8 +63,9 @@ class PlatformaticApp {
       await once(this.#loaderPort, 'message')
     }
 
-    this.#setuplogger(this.config.configManager)
     try {
+      await this.config.configManager.parseAndValidate()
+      this.#setuplogger(this.config.configManager)
       await this.server.restart()
     } catch (err) {
       this.#logAndExit(err)
@@ -159,7 +167,6 @@ class PlatformaticApp {
     let _config
     try {
       _config = await loadConfig({}, ['-c', appConfig.config], {
-        watch: true,
         onMissingEnv (key) {
           return appConfig.localServiceEnvVars.get(key)
         }
@@ -173,30 +180,25 @@ class PlatformaticApp {
 
     function applyOverrides () {
       if (appConfig._configOverrides instanceof Map) {
-        try {
-          appConfig._configOverrides.forEach((value, key) => {
-            if (typeof key !== 'string') {
-              throw new Error('config path must be a string.')
-            }
-
-            const parts = key.split('.')
-            let next = configManager.current
-            let obj
-            let i
-
-            for (i = 0; next !== undefined && i < parts.length; ++i) {
-              obj = next
-              next = obj[parts[i]]
-            }
-
-            if (i === parts.length) {
-              obj[parts.at(-1)] = value
-            }
-          })
-        } catch (err) {
-          configManager.stopWatching()
-          throw err
-        }
+        appConfig._configOverrides.forEach((value, key) => {
+          if (typeof key !== 'string') {
+            throw new Error('config path must be a string.')
+          }
+
+          const parts = key.split('.')
+          let next = configManager.current
+          let obj
+          let i
+
+          for (i = 0; next !== undefined && i < parts.length; ++i) {
+            obj = next
+            next = obj[parts[i]]
+          }
+
+          if (i === parts.length) {
+            obj[parts.at(-1)] = value
+          }
+        })
       }
     }
 
@@ -204,16 +206,6 @@ class PlatformaticApp {
 
     this.#hotReload = this.appConfig.hotReload
 
-    configManager.on('update', async (newConfig) => {
-      if (this.server) { // when we setup telemetry on config, we don't have a server yet
-        this.server.platformatic.config = newConfig
-        applyOverrides()
-        this.server.log.debug('config changed')
-        this.server.log.trace({ newConfig }, 'new config')
-        await this.restart()
-      }
-    })
-
     configManager.on('error', (err) => {
       /* c8 ignore next */
       this.server.log.error({ err }, 'error reloading the configuration')
@@ -234,34 +226,22 @@ class PlatformaticApp {
     }
     const server = this.server
     const { configManager } = server.platformatic
-    // TODO FileWatcher and ConfigManager both watch the configuration file
-    // we should remove the watching from the ConfigManager
     const fileWatcher = new FileWatcher({
       path: dirname(configManager.fullPath),
       /* c8 ignore next 2 */
       allowToWatch: this.#originalWatch?.allow,
-      watchIgnore: [...(this.#originalWatch?.ignore || []), basename(configManager.fullPath)]
+      watchIgnore: this.#originalWatch?.ignore || []
     })
 
-    /* c8 ignore next 4 */
-    const restart = debounce(() => {
-      this.server.log.info('files changed')
-      this.restart()
-    }, 100) // debounce restart for 100ms
-    fileWatcher.on('update', restart)
+    fileWatcher.on('update', this.#debouncedRestart)
 
     fileWatcher.startWatching()
     server.log.debug('start watching files')
     server.platformatic.fileWatcher = fileWatcher
-    server.platformatic.configManager.startWatching()
     this.#fileWatcher = fileWatcher
   }
 
   async #stopFileWatching () {
-    // The configManager automatically watches for the config file changes
-    // therefore we need to stop it all the times.
-    await this.config.configManager.stopWatching()
-
     const watcher = this.#fileWatcher
     if (watcher) {
       this.server.log.debug('stop watching files')
@@ -272,7 +252,6 @@ class PlatformaticApp {
   }
 
   #logAndExit (err) {
-    this.config?.configManager?.stopWatching()
     this.#logger.error({ err })
     process.exit(1)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "0.36.0",
+  "version": "0.37.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -24,8 +24,8 @@
     "standard": "^17.1.0",
     "tsd": "^0.28.1",
     "typescript": "^5.1.6",
-    "@platformatic/sql-graphql": "0.36.0",
-    "@platformatic/sql-mapper": "0.36.0"
+    "@platformatic/sql-mapper": "0.37.1",
+    "@platformatic/sql-graphql": "0.37.1"
   },
   "dependencies": {
     "@hapi/topo": "^6.0.2",
@@ -42,12 +42,12 @@
     "pino": "^8.14.1",
     "pino-pretty": "^10.0.0",
     "undici": "^5.22.1",
-    "@platformatic/composer": "0.36.0",
-    "@platformatic/db": "0.36.0",
-    "@platformatic/config": "0.36.0",
-    "@platformatic/service": "0.36.0",
-    "@platformatic/telemetry": "0.36.0",
-    "@platformatic/utils": "0.36.0"
+    "@platformatic/composer": "0.37.1",
+    "@platformatic/config": "0.37.1",
+    "@platformatic/db": "0.37.1",
+    "@platformatic/service": "0.37.1",
+    "@platformatic/telemetry": "0.37.1",
+    "@platformatic/utils": "0.37.1"
   },
   "standard": {
     "ignore": [

package/test/api.test.js

@@ -349,9 +349,6 @@ test('should fail to get a service openapi schema if service does not expose it'
     await app.close()
   })
 
-  try {
-    await app.getServiceOpenapiSchema('without-openapi')
-  } catch (err) {
-    assert.strictEqual(err.message, 'Service with id \'without-openapi\' does not expose an OpenAPI schema')
-  }
+  const openapiSchema = await app.getServiceOpenapiSchema('without-openapi')
+  assert.strictEqual(openapiSchema, null)
 })

package/test/cli/start.test.mjs

@@ -48,6 +48,10 @@ test('handles startup errors', async (t) => {
   }
 
   assert(found)
+
+  // if we do not await this, the test will crash because the event loop has nothing to do
+  // but there is still a promise waiting
+  await child.catch(() => {})
 })
 
 test('exits on error', async () => {