@platformatic/service 2.22.0 → 2.24.0

package/index.d.ts

@@ -2,8 +2,7 @@
 /// <reference types="@fastify/swagger" />
 import { FastifyInstance, FastifyBaseLogger } from 'fastify'
 import ConfigManager from '@platformatic/config'
-import type { ConfigManagerConfig } from '@platformatic/config'
-import type { Stackable as _Stackable, StackableInterface } from '@platformatic/config'
+import type { Stackable as _Stackable, StackableInterface, ConfigManagerConfig } from '@platformatic/config'
 import { BaseGenerator } from '@platformatic/generators'
 import { PlatformaticService } from './config'
 import type { JSONSchemaType } from 'ajv'

package/lib/plugins/sandbox-wrapper.js

@@ -3,7 +3,7 @@
 const fp = require('fastify-plugin')
 const autoload = require('@fastify/autoload')
 const { stat } = require('node:fs').promises
-const { createRequire } = require('node:module')
+const { createRequire } = require('@platformatic/utils')
 const { join } = require('node:path')
 const { pathToFileURL } = require('node:url')
 
@@ -36,7 +36,7 @@ module.exports = fp(async function (app, opts) {
         forceESM: plugin.forceESM,
         ignoreFilter: plugin.ignoreFilter,
         matchFilter: plugin.matchFilter,
-        ...patternOptions,
+        ...patternOptions
       })
     } else {
       let loaded = await import(pathToFileURL(plugin.path))
@@ -68,11 +68,7 @@ function patternOptionsFromPlugin (plugin) {
   const config = {}
 
   // Expected keys for autoload plugin options that expect regexp patterns
-  const patternOptionKeys = [
-    'ignorePattern',
-    'indexPattern',
-    'autoHooksPattern',
-  ]
+  const patternOptionKeys = ['ignorePattern', 'indexPattern', 'autoHooksPattern']
 
   for (const key of patternOptionKeys) {
     const pattern = plugin[key]

package/lib/stackable.js

@@ -6,7 +6,7 @@ const { pathToFileURL } = require('node:url')
 const { workerData } = require('node:worker_threads')
 const { printSchema } = require('graphql')
 const pino = require('pino')
-const { collectMetrics } = require('@platformatic/metrics')
+const { client, collectMetrics } = require('@platformatic/metrics')
 const httpMetrics = require('@platformatic/fastify-http-metrics')
 const { extractTypeScriptCompileOptionsFromConfig } = require('./compile')
 const { compile } = require('@platformatic/ts-compiler')
@@ -19,7 +19,7 @@ class ServiceStackable {
     this.app = null
     this._init = options.init
     this.stackable = options.stackable
-    this.metricsRegistry = null
+    this.metricsRegistry = new client.Registry()
 
     this.configManager = options.configManager
     this.context = options.context ?? {}
@@ -49,9 +49,11 @@ class ServiceStackable {
       root: this.context.directory ? pathToFileURL(this.context.directory).toString() : undefined,
       setOpenapiSchema: this.setOpenapiSchema.bind(this),
       setGraphqlSchema: this.setGraphqlSchema.bind(this),
+      setConnectionString: this.setConnectionString.bind(this),
       setBasePath: this.setBasePath.bind(this),
       runtimeBasePath: this.runtimeConfig?.basePath ?? null,
-      invalidateHttpCache: this.#invalidateHttpCache.bind(this)
+      invalidateHttpCache: this.#invalidateHttpCache.bind(this),
+      prometheus: { client, registry: this.metricsRegistry }
     })
   }
 
@@ -136,7 +138,8 @@ class ServiceStackable {
         needsRootRedirect: false,
         tcp: !!this.app?.url,
         url: this.app?.url
-      }
+      },
+      connectionStrings: [this.connectionString]
     }
   }
 
@@ -180,19 +183,22 @@ class ServiceStackable {
     const metricsConfig = this.context.metricsConfig
 
     if (metricsConfig !== false) {
-      const { registry } = await collectMetrics(this.context.serviceId, this.context.worker.index, {
-        defaultMetrics: true,
-        httpMetrics: false,
-        ...metricsConfig
-      })
-      this.metricsRegistry = registry
+      await collectMetrics(
+        this.serviceId,
+        this.workerId,
+        {
+          defaultMetrics: true,
+          httpMetrics: false,
+          ...metricsConfig
+        },
+        this.metricsRegistry
+      )
+
       this.#setHttpMetrics()
     }
   }
 
   async getMetrics ({ format }) {
-    if (!this.metricsRegistry) return null
-
     return format === 'json' ? await this.metricsRegistry.getMetricsAsJSON() : await this.metricsRegistry.metrics()
   }
 
@@ -227,6 +233,10 @@ class ServiceStackable {
     this.graphqlSchema = schema
   }
 
+  setConnectionString (connectionString) {
+    this.connectionString = connectionString
+  }
+
   setBasePath (basePath) {
     this.basePath = basePath
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "2.22.0",
+  "version": "2.24.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -23,7 +23,7 @@
     "borp": "^0.19.0",
     "eslint": "9",
     "json-schema-to-typescript": "^15.0.0",
-    "neostandard": "^0.11.1",
+    "neostandard": "^0.12.0",
     "openapi-types": "^12.1.3",
     "pino-abstract-transport": "^2.0.0",
     "self-cert": "^2.0.0",
@@ -76,14 +76,14 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/client": "2.22.0",
-    "@platformatic/config": "2.22.0",
-    "@platformatic/metrics": "2.22.0",
-    "@platformatic/generators": "2.22.0",
-    "@platformatic/scalar-theme": "2.22.0",
-    "@platformatic/telemetry": "2.22.0",
-    "@platformatic/utils": "2.22.0",
-    "@platformatic/ts-compiler": "2.22.0"
+    "@platformatic/config": "2.24.0",
+    "@platformatic/metrics": "2.24.0",
+    "@platformatic/generators": "2.24.0",
+    "@platformatic/client": "2.24.0",
+    "@platformatic/scalar-theme": "2.24.0",
+    "@platformatic/telemetry": "2.24.0",
+    "@platformatic/ts-compiler": "2.24.0",
+    "@platformatic/utils": "2.24.0"
   },
   "scripts": {
     "test": "pnpm run lint && borp -T --concurrency=1 --timeout=300000 && tsd",

package/schema.json

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