@platformatic/service 2.6.1 → 2.8.0-alpha.1

package/lib/stackable.js

@@ -1,6 +1,8 @@
 'use strict'
 
+const { hostname } = require('node:os')
 const { dirname } = require('node:path')
+const { pathToFileURL } = require('node:url')
 const { printSchema } = require('graphql')
 const pino = require('pino')
 const { collectMetrics } = require('@platformatic/metrics')
@@ -20,6 +22,10 @@ class ServiceStackable {
     this.context = options.context ?? {}
     this.context.stackable = this
 
+    this.serviceId = this.context.serviceId
+    this.context.worker ??= { count: 1, index: 0 }
+    this.workerId = this.context.worker.count > 1 ? this.context.worker.index : undefined
+
     this.configManager.on('error', err => {
       /* c8 ignore next */
       this.stackable.log({
@@ -32,6 +38,10 @@ class ServiceStackable {
 
     // Setup globals
     this.registerGlobals({
+      serviceId: this.serviceId,
+      workerId: this.workerId,
+      // Always use URL to avoid serialization problem in Windows
+      root: this.context.directory ? pathToFileURL(this.context.directory).toString() : undefined,
       setOpenapiSchema: this.setOpenapiSchema.bind(this),
       setGraphqlSchema: this.setGraphqlSchema.bind(this),
       setBasePath: this.setBasePath.bind(this)
@@ -117,8 +127,8 @@ class ServiceStackable {
         prefix: config.basePath ?? this.basePath ?? this.context?.serviceId,
         wantsAbsoluteUrls: false,
         needsRootRedirect: false,
-        tcp: !!this.app.url,
-        url: this.app.url
+        tcp: !!this.app?.url,
+        url: this.app?.url
       }
     }
   }
@@ -157,15 +167,13 @@ class ServiceStackable {
   // fastify metrics before the server is started.
   async #collectMetrics () {
     const metricsConfig = this.context.metricsConfig
+
     if (metricsConfig !== false) {
-      const { registry } = await collectMetrics(
-        this.context.serviceId,
-        {
-          defaultMetrics: true,
-          httpMetrics: false,
-          ...metricsConfig
-        }
-      )
+      const { registry } = await collectMetrics(this.context.serviceId, this.context.worker.index, {
+        defaultMetrics: true,
+        httpMetrics: false,
+        ...metricsConfig
+      })
       this.metricsRegistry = registry
       this.#setHttpMetrics()
     }
@@ -174,9 +182,7 @@ class ServiceStackable {
   async getMetrics ({ format }) {
     if (!this.metricsRegistry) return null
 
-    return format === 'json'
-      ? await this.metricsRegistry.getMetricsAsJSON()
-      : await this.metricsRegistry.metrics()
+    return format === 'json' ? await this.metricsRegistry.getMetricsAsJSON() : await this.metricsRegistry.metrics()
   }
 
   async inject (injectParams) {
@@ -308,10 +314,18 @@ class ServiceStackable {
       level: this.loggerConfig?.level ?? 'trace'
     }
 
+    this.registerGlobals({
+      logLevel: pinoOptions.level
+    })
+
     if (this.context?.serviceId) {
       pinoOptions.name = this.context.serviceId
     }
 
+    if (typeof this.context?.worker?.index !== 'undefined') {
+      pinoOptions.base = { pid: process.pid, hostname: hostname(), worker: this.context.worker.index }
+    }
+
     this.logger = pino(pinoOptions)
 
     // Only one of logger and loggerInstance should be set

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "2.6.1",
+  "version": "2.8.0-alpha.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -76,18 +76,18 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^6.9.0",
-    "@platformatic/client": "2.6.1",
-    "@platformatic/config": "2.6.1",
-    "@platformatic/metrics": "2.6.1",
-    "@platformatic/generators": "2.6.1",
-    "@platformatic/scalar-theme": "2.6.1",
-    "@platformatic/telemetry": "2.6.1",
-    "@platformatic/ts-compiler": "2.6.1",
-    "@platformatic/utils": "2.6.1"
+    "@platformatic/client": "2.8.0-alpha.1",
+    "@platformatic/config": "2.8.0-alpha.1",
+    "@platformatic/metrics": "2.8.0-alpha.1",
+    "@platformatic/generators": "2.8.0-alpha.1",
+    "@platformatic/ts-compiler": "2.8.0-alpha.1",
+    "@platformatic/scalar-theme": "2.8.0-alpha.1",
+    "@platformatic/telemetry": "2.8.0-alpha.1",
+    "@platformatic/utils": "2.8.0-alpha.1"
   },
   "scripts": {
-    "test": "pnpm run lint && borp -T --concurrency=1 --timeout=180000 && tsd",
-    "unit": "borp --pattern 'test/**/*.test.{js,mjs}' --ignore 'fixtures/**/*' --concurrency=1 --timeout=180000 --no-typescript",
+    "test": "pnpm run lint && borp -T --concurrency=1 --timeout=300000 && tsd",
+    "unit": "borp --pattern 'test/**/*.test.{js,mjs}' --ignore 'fixtures/**/*' --concurrency=1 --timeout=300000 --no-typescript",
     "gen-schema": "node lib/schema.js > schema.json",
     "gen-types": "json2ts > config.d.ts < schema.json",
     "build": "pnpm run gen-schema && pnpm run gen-types",

package/schema.json

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