@platformatic/service 2.0.0-alpha.3 → 2.0.0-alpha.5

package/lib/generator/service-generator.js

@@ -83,7 +83,7 @@ declare module 'fastify' {
 }
 `
       this.addFile({ path: '', file: 'global.d.ts', contents: GLOBAL_TYPES_TEMPLATE })
-      this.addFile({ path: '', file: 'README.md', contents: await readFile(join(__dirname, 'README.md')) })
+      this.addFile({ path: '', file: 'README.md', contents: await readFile(join(__dirname, 'README.md'), 'utf-8') })
     }
   }
 

package/lib/plugins/metrics.js

@@ -34,7 +34,7 @@ const metricsPlugin = fp(async function (app, opts = {}) {
       enabled: true,
       customLabels: {
         // TODO: check if this is set in prom
-        telemetry_id: (req) => req.headers['x-telemetry-id'] ?? 'unknown',
+        telemetry_id: (req) => req.headers['x-plt-telemetry-id'] ?? 'unknown',
       },
       overrides: {
         histogram: {

package/lib/stackable.js

@@ -11,9 +11,16 @@ class ServiceStackable {
     this.stackable = options.stackable
 
     this.configManager = options.configManager
-    this.config = this.configManager.current
     this.context = options.context
 
+    this.configManager.on('error', (err) => {
+      /* c8 ignore next */
+      this.stackable.log({
+        message: 'error reloading the configuration' + err,
+        level: 'error',
+      })
+    })
+
     this.#updateConfig()
   }
 
@@ -142,53 +149,46 @@ class ServiceStackable {
       serverConfig,
       hasManagementApi,
       isEntrypoint,
+      isProduction,
     } = this.context
 
-    const configManager = this.configManager
-
-    configManager.on('error', (err) => {
-      /* c8 ignore next */
-      this.stackable.log({ message: 'error reloading the configuration' + err, level: 'error' })
-    })
-
-    configManager.update({
-      ...configManager.current,
-      telemetry: telemetryConfig,
-      metrics: metricsConfig,
-    })
+    const config = this.configManager.current
 
-    if (this.context.serverConfig) {
-      configManager.update({
-        ...configManager.current,
-        server: serverConfig,
-      })
+    if (telemetryConfig) {
+      config.telemetry = telemetryConfig
+    }
+    if (metricsConfig) {
+      config.metrics = metricsConfig
+    }
+    if (serverConfig) {
+      config.server = serverConfig
     }
 
     if (
-      (hasManagementApi && configManager.current.metrics === undefined) ||
-      configManager.current.metrics
+      (hasManagementApi && config.metrics === undefined) || config.metrics
     ) {
-      const labels = configManager.current.metrics?.labels || {}
-      configManager.update({
-        ...configManager.current,
-        metrics: {
-          server: 'hide',
-          defaultMetrics: { enabled: isEntrypoint },
-          ...configManager.current.metrics,
-          labels: { serviceId, ...labels },
-        },
-      })
+      const labels = config.metrics?.labels || {}
+      config.metrics = {
+        server: 'hide',
+        defaultMetrics: { enabled: isEntrypoint },
+        ...config.metrics,
+        labels: { serviceId, ...labels },
+      }
     }
 
     if (!isEntrypoint) {
-      configManager.update({
-        ...configManager.current,
-        server: {
-          ...(configManager.current.server || {}),
-          trustProxy: true,
-        },
-      })
+      config.server = config.server ?? {}
+      config.server.trustProxy = true
     }
+
+    if (isProduction) {
+      if (config.plugins) {
+        config.plugins.typescript = false
+      }
+      config.watch = { enabled: false }
+    }
+
+    this.configManager.update(config)
   }
 
   #initLogger () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -51,7 +51,7 @@
     "@types/ws": "^8.5.10",
     "ajv": "^8.12.0",
     "cli-progress": "^3.12.0",
-    "close-with-grace": "^1.3.0",
+    "close-with-grace": "^2.0.0",
     "code-block-writer": "^13.0.1",
     "colorette": "^2.0.20",
     "commist": "^3.2.0",
@@ -76,13 +76,13 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^6.9.0",
-    "@platformatic/client": "2.0.0-alpha.3",
-    "@platformatic/generators": "2.0.0-alpha.3",
-    "@platformatic/scalar-theme": "2.0.0-alpha.3",
-    "@platformatic/config": "2.0.0-alpha.3",
-    "@platformatic/ts-compiler": "2.0.0-alpha.3",
-    "@platformatic/utils": "2.0.0-alpha.3",
-    "@platformatic/telemetry": "2.0.0-alpha.3"
+    "@platformatic/client": "2.0.0-alpha.5",
+    "@platformatic/config": "2.0.0-alpha.5",
+    "@platformatic/generators": "2.0.0-alpha.5",
+    "@platformatic/scalar-theme": "2.0.0-alpha.5",
+    "@platformatic/ts-compiler": "2.0.0-alpha.5",
+    "@platformatic/telemetry": "2.0.0-alpha.5",
+    "@platformatic/utils": "2.0.0-alpha.5"
   },
   "scripts": {
     "test": "pnpm run lint && borp -T --concurrency=1 --timeout=180000 && tsd",

package/schema.json

@@ -1,6 +1,6 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/service/2.0.0-alpha.3.json",
-  "version": "2.0.0-alpha.3",
+  "$id": "https://schemas.platformatic.dev/@platformatic/service/2.0.0-alpha.5.json",
+  "version": "2.0.0-alpha.5",
   "title": "Platformatic Service",
   "type": "object",
   "properties": {

package/service.mjs

@@ -56,7 +56,7 @@ export async function runService (argv) {
 
   /* c8 ignore next 4 */
   if (args.version) {
-    console.log('v' + JSON.parse(await readFile(join(import.meta.url, 'package.json'))).version)
+    console.log('v' + JSON.parse(await readFile(join(import.meta.url, 'package.json'), 'utf-8')).version)
     process.exit(0)
   }