@platformatic/basic 2.68.0 → 2.70.0

package/config.d.ts

@@ -107,7 +107,7 @@ export interface PlatformaticStackable {
       maxELU?: number | string;
       maxHeapUsed?: number | string;
       maxHeapTotal?: number | string;
-      maxYoungGeneration?: number;
+      maxYoungGeneration?: number | string;
     };
     undici?: {
       agentOptions?: {

package/index.js

@@ -1,8 +1,8 @@
 import { ConfigManager } from '@platformatic/config'
-import { createRequire } from '@platformatic/utils'
+import { detectApplicationType } from '@platformatic/utils'
 import jsonPatch from 'fast-json-patch'
-import { existsSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
+import { createRequire } from 'node:module'
 import { relative, resolve } from 'node:path'
 import { workerData } from 'node:worker_threads'
 import pino from 'pino'
@@ -11,28 +11,6 @@ import { importFile } from './lib/utils.js'
 
 const importStackablePackageMarker = '__pltImportStackablePackage.js'
 
-export 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 hasDependency (packageJson, dependency) {
-  return packageJson.dependencies?.[dependency] || packageJson.devDependencies?.[dependency]
-}
-
 function isImportFailedError (error, pkg) {
   if (error.code !== 'ERR_MODULE_NOT_FOUND' && error.code !== 'MODULE_NOT_FOUND') {
     return false
@@ -70,31 +48,6 @@ async function importStackablePackage (directory, pkg) {
   }
 }
 
-export async function detectStackable (root, packageJson) {
-  let name = '@platformatic/node'
-  let label = 'Node.js'
-
-  if (hasDependency(packageJson, '@nestjs/core')) {
-    name = '@platformatic/nest'
-    label = 'NestJS'
-  } else if (hasDependency(packageJson, 'next')) {
-    name = '@platformatic/next'
-    label = 'Next.js'
-  } else if (hasDependency(packageJson, '@remix-run/dev')) {
-    name = '@platformatic/remix'
-    label = 'Remix'
-  } else if (hasDependency(packageJson, 'astro')) {
-    name = '@platformatic/astro'
-    label = 'Astro'
-    // Since Vite is often used with other frameworks, we must check for Vite last
-  } else if (hasDependency(packageJson, 'vite')) {
-    name = '@platformatic/vite'
-    label = 'Vite'
-  }
-
-  return { name, label }
-}
-
 export async function importStackableAndConfig (root, config, context) {
   let rootPackageJson
   try {
@@ -106,17 +59,16 @@ export async function importStackableAndConfig (root, config, context) {
   const hadConfig = !!config
 
   if (!config) {
-    for (const candidate of configCandidates) {
-      const candidatePath = resolve(root, candidate)
+    config = await ConfigManager.findConfigFile(root, 'application')
+  }
 
-      if (existsSync(candidatePath)) {
-        config = candidatePath
-        break
-      }
-    }
+  const appType = await detectApplicationType(root, rootPackageJson)
+
+  if (!appType) {
+    throw new Error(`Unable to detect application type in ${root}.`)
   }
 
-  const { label, name: moduleName } = await detectStackable(root, rootPackageJson)
+  const { label, name: moduleName } = appType
 
   if (context) {
     const serviceRoot = relative(process.cwd(), root)

package/lib/base.js

@@ -46,8 +46,6 @@ export class BaseStackable extends EventEmitter {
     this.#metricsCollected = false
     this.customHealthCheck = null
     this.customReadinessCheck = null
-    this.startHttpTimer = null
-    this.endHttpTimer = null
     this.clientWs = null
     this.runtimeConfig = deepmerge(options.context?.runtimeConfig ?? {}, workerData?.config ?? {})
     this.stdout = standardStreams?.stdout ?? process.stdout
@@ -354,7 +352,7 @@ export class BaseStackable extends EventEmitter {
       isEntrypoint: this.isEntrypoint,
       runtimeBasePath: this.runtimeConfig?.basePath ?? null,
       wantsAbsoluteUrls: meta.composer?.wantsAbsoluteUrls ?? false,
-      /* c8 ignore next 2 - Else branches */
+      /* c8 ignore next 2 - else */
       port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
       host: (this.isEntrypoint ? this.serverConfig?.hostname : undefined) ?? true,
       telemetryConfig: this.telemetryConfig
@@ -418,15 +416,12 @@ export class BaseStackable extends EventEmitter {
         return
       }
 
-      const { startHttpTimer, endHttpTimer } = await collectMetrics(
+      await collectMetrics(
         this.serviceId,
         this.workerId,
         metricsConfig,
         this.metricsRegistry
       )
-
-      this.startHttpTimer = startHttpTimer
-      this.endHttpTimer = endHttpTimer
     }
   }
 

package/lib/utils.js

@@ -1,4 +1,4 @@
-import { createRequire } from '@platformatic/utils'
+import { createRequire } from 'node:module'
 import { pathToFileURL } from 'node:url'
 import { request } from 'undici'
 
@@ -65,7 +65,7 @@ export function resolvePackage (root, pkg) {
   // We need to add the main module paths to the require.resolve call
   // Note that `require.main` is not defined in `next` if we set sthe instrumentation hook reequired for ESM applications.
   // see: https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/esm-support.md#instrumentation-hook-required-for-esm
-  return require.resolve(pkg, { paths: [root, ...require.main?.paths || []] })
+  return require.resolve(pkg, { paths: [root, ...(require.main?.paths || [])] })
 }
 
 export function cleanBasePath (basePath) {

package/lib/worker/child-manager.js

@@ -1,9 +1,9 @@
 import { ITC } from '@platformatic/itc'
-import { createDirectory, createRequire, ensureLoggableError } from '@platformatic/utils'
+import { createDirectory, ensureLoggableError } from '@platformatic/utils'
 import { once } from 'node:events'
 import { rm, writeFile } from 'node:fs/promises'
 import { createServer } from 'node:http'
-import { register } from 'node:module'
+import { createRequire, register } from 'node:module'
 import { platform, tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.68.0",
+  "version": "2.70.0",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -24,11 +24,11 @@
     "split2": "^4.2.0",
     "undici": "^7.0.0",
     "ws": "^8.18.0",
-    "@platformatic/config": "2.68.0",
-    "@platformatic/itc": "2.68.0",
-    "@platformatic/metrics": "2.68.0",
-    "@platformatic/telemetry": "2.68.0",
-    "@platformatic/utils": "2.68.0"
+    "@platformatic/config": "2.70.0",
+    "@platformatic/metrics": "2.70.0",
+    "@platformatic/itc": "2.70.0",
+    "@platformatic/telemetry": "2.70.0",
+    "@platformatic/utils": "2.70.0"
   },
   "devDependencies": {
     "borp": "^0.20.0",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.68.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.70.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Stackable",
   "type": "object",
@@ -367,7 +367,6 @@
           "default": {},
           "properties": {
             "enabled": {
-              "default": true,
               "anyOf": [
                 {
                   "type": "boolean"
@@ -375,10 +374,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": true
             },
             "interval": {
-              "default": 30000,
               "anyOf": [
                 {
                   "type": "number",
@@ -387,10 +386,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 30000
             },
             "gracePeriod": {
-              "default": 30000,
               "anyOf": [
                 {
                   "type": "number",
@@ -399,10 +398,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 30000
             },
             "maxUnhealthyChecks": {
-              "default": 10,
               "anyOf": [
                 {
                   "type": "number",
@@ -411,10 +410,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 10
             },
             "maxELU": {
-              "default": 0.99,
               "anyOf": [
                 {
                   "type": "number",
@@ -424,10 +423,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 0.99
             },
             "maxHeapUsed": {
-              "default": 0.99,
               "anyOf": [
                 {
                   "type": "number",
@@ -437,10 +436,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 0.99
             },
             "maxHeapTotal": {
-              "default": 4294967296,
               "anyOf": [
                 {
                   "type": "number",
@@ -449,11 +448,19 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 4294967296
             },
             "maxYoungGeneration": {
-              "type": "number",
-              "minimum": 0
+              "anyOf": [
+                {
+                  "type": "number",
+                  "minimum": 0
+                },
+                {
+                  "type": "string"
+                }
+              ]
             }
           },
           "additionalProperties": false