@platformatic/basic 2.0.0-alpha.17 → 2.0.0-alpha.19

package/index.js

@@ -8,6 +8,23 @@ import { packageJson, schema } from './lib/schema.js'
 import { importFile } from './lib/utils.js'
 
 const importStackablePackageMarker = '__pltImportStackablePackage.js'
+const configCandidates = [
+  'platformatic.application.json',
+  'platformatic.json',
+  'watt.json',
+  'platformatic.application.yaml',
+  'platformatic.yaml',
+  'watt.yaml',
+  'platformatic.application.yml',
+  'platformatic.yml',
+  'watt.yml',
+  'platformatic.application.toml',
+  'platformatic.toml',
+  'watt.toml',
+  'platformatic.application.tml',
+  'platformatic.tml',
+  'watt.tml',
+]
 
 function isImportFailedError (error, pkg) {
   if (error.code !== 'ERR_MODULE_NOT_FOUND' && error.code !== 'MODULE_NOT_FOUND') {
@@ -68,10 +85,13 @@ async function buildStackable (opts) {
   const hadConfig = opts.config
 
   if (!hadConfig) {
-    const candidate = resolve(root, 'platformatic.application.json')
+    for (const candidate of configCandidates) {
+      const candidatePath = resolve(root, candidate)
 
-    if (existsSync(candidate)) {
-      opts.config = candidate
+      if (existsSync(candidatePath)) {
+        opts.config = candidatePath
+        break
+      }
     }
   }
 
@@ -94,7 +114,7 @@ async function buildStackable (opts) {
   const imported = await importStackablePackage(opts, toImport, autodetectDescription)
 
   const serviceRoot = relative(process.cwd(), opts.context.directory)
-  if (!hadConfig && !existsSync(resolve(serviceRoot, 'platformatic.application.json'))) {
+  if (!hadConfig && !(existsSync(resolve(serviceRoot, 'platformatic.json') || existsSync(resolve(serviceRoot, 'watt.json'))))) {
     const logger = pino({
       level: opts.context.serverConfig?.logger?.level ?? 'warn',
       name: opts.context.serviceId
@@ -103,7 +123,7 @@ async function buildStackable (opts) {
     logger.warn(
       [
         `Platformatic has auto-detected that service ${opts.context.serviceId} ${autodetectDescription}.\n`,
-        `We suggest you create a platformatic.application.json file in the folder ${serviceRoot} with the "$schema" `,
+        `We suggest you create a platformatic.json or watt.json file in the folder ${serviceRoot} with the "$schema" `,
         `property set to "https://schemas.platformatic.dev/${toImport}/${packageJson.version}.json".`
       ].join('')
     )

package/lib/base.js

@@ -20,6 +20,7 @@ export class BaseStackable {
     this.type = type
     this.version = version
     this.id = options.context.serviceId
+    this.telemetryConfig = options.context.telemetryConfig
     this.options = options
     this.root = root
     this.configManager = configManager
@@ -180,7 +181,6 @@ export class BaseStackable {
   async startWithCommand (command, loader) {
     const config = this.configManager.current
     const basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
-
     this.#childManager = new ChildManager({
       logger: this.logger,
       loader,
@@ -190,7 +190,8 @@ export class BaseStackable {
         root: pathToFileURL(this.root).toString(),
         basePath,
         logLevel: this.logger.level,
-        port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true
+        port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
+        telemetry: this.telemetryConfig
       }
     })
 

package/lib/worker/child-process.js

@@ -13,6 +13,7 @@ import { WebSocket } from 'ws'
 import { exitCodes } from '../errors.js'
 import { importFile } from '../utils.js'
 import { getSocketPath, isWindows } from './child-manager.js'
+import { setupNodeHTTPTelemetry } from '@platformatic/telemetry'
 
 function createInterceptor (itc) {
   return function (dispatch) {
@@ -90,6 +91,7 @@ export class ChildProcess extends ITC {
 
     this.listen()
     this.#setupLogger()
+    this.#setupTelemetry()
     this.#setupHandlers()
     this.#setupServer()
     this.#setupInterceptors()
@@ -164,6 +166,12 @@ export class ChildProcess extends ITC {
     }
   }
 
+  #setupTelemetry () {
+    if (globalThis.platformatic.telemetry) {
+      setupNodeHTTPTelemetry(globalThis.platformatic.telemetry, this.#logger)
+    }
+  }
+
   #setupServer () {
     const subscribers = {
       asyncStart ({ options }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.0.0-alpha.17",
+  "version": "2.0.0-alpha.19",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -23,9 +23,10 @@
     "split2": "^4.2.0",
     "undici": "^6.19.5",
     "ws": "^8.18.0",
-    "@platformatic/config": "2.0.0-alpha.17",
-    "@platformatic/itc": "2.0.0-alpha.17",
-    "@platformatic/utils": "2.0.0-alpha.17"
+    "@platformatic/itc": "2.0.0-alpha.19",
+    "@platformatic/config": "2.0.0-alpha.19",
+    "@platformatic/telemetry": "2.0.0-alpha.19",
+    "@platformatic/utils": "2.0.0-alpha.19"
   },
   "devDependencies": {
     "borp": "^0.17.0",
@@ -39,8 +40,8 @@
     "react-dom": "^18.3.1",
     "typescript": "^5.5.4",
     "vite": "^5.4.0",
-    "@platformatic/composer": "2.0.0-alpha.17",
-    "@platformatic/service": "2.0.0-alpha.17"
+    "@platformatic/composer": "2.0.0-alpha.19",
+    "@platformatic/service": "2.0.0-alpha.19"
   },
   "scripts": {
     "gen-schema": "node lib/schema.js > schema.json",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.0.0-alpha.17.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.0.0-alpha.19.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Stackable",
   "type": "object",