@platformatic/runtime 2.0.1 → 2.1.0

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime201Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime210Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;

package/index.d.ts

@@ -35,6 +35,7 @@ export module errors {
   export const ConfigPathMustBeStringError: () => FastifyError
   export const NoConfigFileFoundError: (id: string) => FastifyError
   export const InvalidEntrypointError: (entrypoint: string) => FastifyError
+  export const MissingEntrypointError: () => FastifyError
   export const MissingDependencyError: (dependency: string) => FastifyError
   export const InspectAndInspectBrkError: () => FastifyError
   export const InspectorPortError: () => FastifyError

package/lib/config.js

@@ -105,8 +105,44 @@ async function _transformConfig (configManager, args) {
     configManager.current.serviceMap.set(service.id, service)
   }
 
+  // If there is no entrypoint, autodetect one
+  if (!config.entrypoint) {
+    // If there is only one service, it becomes the entrypoint
+    if (services.length === 1) {
+      services[0].entrypoint = true
+      config.entrypoint = services[0].id
+      hasValidEntrypoint = true
+    } else {
+      // Search if exactly service uses @platformatic/composer
+      const composers = []
+
+      for (const service of services) {
+        if (!service.config) {
+          continue
+        }
+
+        const manager = new ConfigManager({ source: pathResolve(service.path, service.config) })
+        await manager.parse()
+        const config = manager.current
+        const type = config.$schema ? ConfigManager.matchKnownSchema(config.$schema) : undefined
+
+        if (type === 'composer') {
+          composers.push(service.id)
+        }
+      }
+
+      if (composers.length === 1) {
+        services.find(s => s.id === composers[0]).entrypoint = true
+        config.entrypoint = composers[0]
+        hasValidEntrypoint = true
+      }
+    }
+  }
+
   if (!hasValidEntrypoint) {
-    throw new errors.InvalidEntrypointError(config.entrypoint)
+    throw typeof config.entrypoint !== 'undefined'
+      ? new errors.InvalidEntrypointError(config.entrypoint)
+      : new errors.MissingEntrypointError()
   }
 
   configManager.current.services = services

package/lib/errors.js

@@ -20,6 +20,7 @@ module.exports = {
   ConfigPathMustBeStringError: createError(`${ERROR_PREFIX}_CONFIG_PATH_MUST_BE_STRING`, 'Config path must be a string'),
   NoConfigFileFoundError: createError(`${ERROR_PREFIX}_NO_CONFIG_FILE_FOUND`, "No config file found for service '%s'"),
   InvalidEntrypointError: createError(`${ERROR_PREFIX}_INVALID_ENTRYPOINT`, "Invalid entrypoint: '%s' does not exist"),
+  MissingEntrypointError: createError(`${ERROR_PREFIX}_MISSING_ENTRYPOINT`, 'Missing application entrypoint.'),
   InvalidServicesWithWebError: createError(`${ERROR_PREFIX}_INVALID_SERVICES_WITH_WEB`, 'The "services" property cannot be used when the "web" property is also defined'),
   MissingDependencyError: createError(`${ERROR_PREFIX}_MISSING_DEPENDENCY`, 'Missing dependency: "%s"'),
   InspectAndInspectBrkError: createError(`${ERROR_PREFIX}_INSPECT_AND_INSPECT_BRK`, '--inspect and --inspect-brk cannot be used together'),

package/lib/schema.js

@@ -224,11 +224,7 @@ const platformaticRuntimeSchema = {
       }
     }
   },
-  anyOf: [
-    { required: ['autoload', 'entrypoint'] },
-    { required: ['services', 'entrypoint'] },
-    { required: ['web', 'entrypoint'] }
-  ],
+  anyOf: [{ required: ['autoload'] }, { required: ['services'] }, { required: ['web'] }],
   additionalProperties: false,
   $defs: {
     undiciInterceptor: {

package/lib/versions/v2.0.0.js

@@ -14,6 +14,8 @@ module.exports = {
       delete config.hotReload
     }
 
+    delete config.allowCycles
+
     config.$schema = `https://schemas.platformatic.dev/@platformatic/runtime/${pkg.version}.json`
 
     if (config.server?.logger) {

package/lib/worker/app.js

@@ -228,8 +228,7 @@ class PlatformaticApp extends EventEmitter {
   }
 
   #logAndExit (err) {
-    // Runtime logs here with console.error because stackable is not initialized
-    console.error(err.message)
+    console.error(err)
     process.exit(1)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,11 +34,11 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.0.1",
-    "@platformatic/db": "2.0.1",
-    "@platformatic/service": "2.0.1",
-    "@platformatic/sql-graphql": "2.0.1",
-    "@platformatic/sql-mapper": "2.0.1"
+    "@platformatic/service": "2.1.0",
+    "@platformatic/db": "2.1.0",
+    "@platformatic/composer": "2.1.0",
+    "@platformatic/sql-graphql": "2.1.0",
+    "@platformatic/sql-mapper": "2.1.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -68,13 +68,13 @@
     "undici": "^6.9.0",
     "undici-thread-interceptor": "^0.6.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.0.1",
-    "@platformatic/config": "2.0.1",
-    "@platformatic/generators": "2.0.1",
-    "@platformatic/itc": "2.0.1",
-    "@platformatic/ts-compiler": "2.0.1",
-    "@platformatic/utils": "2.0.1",
-    "@platformatic/telemetry": "2.0.1"
+    "@platformatic/basic": "2.1.0",
+    "@platformatic/config": "2.1.0",
+    "@platformatic/generators": "2.1.0",
+    "@platformatic/telemetry": "2.1.0",
+    "@platformatic/itc": "2.1.0",
+    "@platformatic/ts-compiler": "2.1.0",
+    "@platformatic/utils": "2.1.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=180000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.0.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.1.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -600,20 +600,17 @@
   "anyOf": [
     {
       "required": [
-        "autoload",
-        "entrypoint"
+        "autoload"
       ]
     },
     {
       "required": [
-        "services",
-        "entrypoint"
+        "services"
       ]
     },
     {
       "required": [
-        "web",
-        "entrypoint"
+        "web"
       ]
     }
   ],

package/fixtures/botched-start/platformatic.runtime.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "a",
-  "autoload": {
-    "path": "./services"
-  },
-  "server": {
-    "hostname": "127.0.0.1",
-    "port": "{PORT}",
-    "logger": {
-      "level": "info"
-    }
-  }
-}

package/fixtures/botched-start/services/a/platformatic.service.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/service/1.52.0.json",
-  "server": {
-    "logger": {
-      "level": "warn"
-    }
-  },
-  "plugins": {
-    "paths": [{
-      "path": "plugin.js",
-      "encapsulate": false
-    }]
-  }
-}

package/fixtures/botched-start/services/a/plugin.js

@@ -1,11 +0,0 @@
-'use strict'
-
-const { setTimeout: sleep } = require('timers/promises')
-
-module.exports = async function (fastify, options) {
-  setImmediate(() => {
-    throw new Error('Crash!')
-  })
-
-  await sleep(1000)
-}

package/fixtures/composerApp/api1.json

@@ -1,65 +0,0 @@
-{
-  "openapi": "3.0.3",
-  "info": {
-    "version": "8.3.1",
-    "title": "@fastify/swagger"
-  },
-  "components": {
-    "schemas": {}
-  },
-  "paths": {
-    "/users": {
-      "get": {
-        "responses": {
-          "200": {
-            "description": "Default Response"
-          }
-        }
-      },
-      "post": {
-        "responses": {
-          "200": {
-            "description": "Default Response"
-          }
-        }
-      },
-      "put": {
-        "responses": {
-          "200": {
-            "description": "Default Response"
-          }
-        }
-      }
-    },
-    "/users/{id}": {
-      "get": {
-        "responses": {
-          "200": {
-            "description": "Default Response"
-          }
-        }
-      },
-      "post": {
-        "responses": {
-          "200": {
-            "description": "Default Response"
-          }
-        }
-      },
-      "put": {
-        "responses": {
-          "200": {
-            "description": "Default Response"
-          }
-        }
-      },
-      "delete": {
-        "responses": {
-          "200": {
-            "description": "Default Response"
-          }
-        }
-      }
-    }
-  }
-}

package/fixtures/composerApp/platformatic.composer.json

@@ -1,23 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/composer/1.52.0.json",
-  "server": {
-    "hostname": "127.0.0.1",
-    "port": 0,
-    "logger": {
-      "level": "info"
-    }
-  },
-  "composer": {
-    "services": [
-      {
-        "id": "api1",
-        "origin": "http://127.0.0.1",
-        "openapi": {
-          "file": "./api1.json"
-        }
-      }
-    ],
-    "refreshTimeout": 1000
-  },
-  "watch": false
-}

package/fixtures/configs/invalid-entrypoint.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "invalid",
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      }
-    }
-  }
-}

package/fixtures/configs/invalid-schema-type.config.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/trickortreat/0.22.0.json",
-  "server": {
-    "hostname": "127.0.0.1",
-    "port": 0,
-    "logger": {
-      "level": "info",
-      "name": "hello server"
-    }
-  },
-  "plugins": {
-    "paths": ["./plugin.js"]
-  },
-  "service": {
-    "openapi": true
-  },
-  "metrics": false,
-  "watch": false
-}

package/fixtures/configs/invalid-web-with-services.json

@@ -1,36 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "db-app",
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      },
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      },
-      "dbApp": {
-        "id": "db-app",
-        "config": "platformatic.db.json"
-      }
-    }
-  },
-  "services": [
-    {
-      "id": "with-logger",
-      "path": "../monorepo/serviceAppWithLogger",
-      "config": "platformatic.service.json"
-    }
-  ],
-  "web": [
-    {
-      "id": "with-logger",
-      "path": "../monorepo/serviceAppWithLogger",
-      "config": "platformatic.service.json"
-    }
-  ]
-}

package/fixtures/configs/missing-property.config.json

@@ -1,13 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "serviceApp",
-  "autoload": {
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      }
-    }
-  }
-}

package/fixtures/configs/missing-service-config.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "serviceApp",
-  "autoload": {
-    "path": "../monorepo"
-  }
-}

package/fixtures/configs/monorepo-composer-no-autoload.json

@@ -1,32 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "composerApp",
-  "watch": false,
-  "services": [
-    {
-      "id": "with-logger",
-      "path": "../monorepo/serviceAppWithLogger",
-      "config": "platformatic.service.json"
-    },
-    {
-      "id": "db-app",
-      "path": "../monorepo/dbApp",
-      "config": "platformatic.db.json"
-    },
-    {
-      "id": "composerApp",
-      "path": "../monorepo/composerApp",
-      "config": "platformatic.composer.json"
-    },
-    {
-      "id": "multi-plugin-service",
-      "path": "../monorepo/serviceAppWithMultiplePlugins",
-      "config": "platformatic.service.json"
-    },
-    {
-      "id": "serviceApp",
-      "path": "../monorepo/serviceApp",
-      "config": "platformatic.service.json"
-    }
-  ]
-}

package/fixtures/configs/monorepo-composer.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "composerApp",
-  "watch": false,
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      },
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      }
-    }
-  }
-}

package/fixtures/configs/monorepo-create-cycle.json

@@ -1,20 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "with-logger",
-  "watch": false,
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": [
-      "composerApp",
-      "docs",
-      "serviceAppWithMultiplePlugins",
-      "serviceAppWithLogger"
-    ],
-    "mappings": {
-      "serviceApp": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      }
-    }
-  }
-}

package/fixtures/configs/monorepo-missing-dependencies.json

@@ -1,9 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "composer",
-  "watch": false,
-  "managementApi": false,
-  "autoload": {
-    "path": "../monorepo-missing-dependencies"
-  }
-}

package/fixtures/configs/monorepo-no-cycles.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "serviceApp",
-  "watch": false,
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      },
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      }
-    }
-  }
-}

package/fixtures/configs/monorepo-openapi.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "without-openapi",
-  "watch": false,
-  "services": [
-    {
-      "id": "without-openapi",
-      "path": "../monorepo-openapi/serviceAppWithoutOpenapi",
-      "config": "platformatic.service.json"
-    }
-  ]
-}

package/fixtures/configs/monorepo-watch-env.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "serviceApp",
-  "watch": "{PLT_WATCH}",
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      },
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      }
-    }
-  }
-}

package/fixtures/configs/monorepo-watch-single.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "https://platformatic.dev/schemas/v0.35.0/runtime",
-  "entrypoint": "service1",
-  "watch": true,
-  "services": [
-    {
-      "id": "service1",
-      "path": "../monorepo-watch/service1",
-      "config": "platformatic.service.json"
-    }
-  ]
-}

package/fixtures/configs/monorepo-watch.json

@@ -1,27 +0,0 @@
-{
-  "$schema": "https://platformatic.dev/schemas/v2.0.0/runtime",
-  "entrypoint": "serviceApp",
-  "watch": true,
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      },
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      },
-      "dbApp": {
-        "id": "db-app",
-        "config": "platformatic.db.json"
-      }
-    }
-  },
-  "logger": {
-    "level": "trace"
-  },
-  "restartOnError": 1000
-}

package/fixtures/configs/monorepo-with-dependencies.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": true,
-  "autoload": {
-    "path": "../monorepo-with-dependencies"
-  }
-}

package/fixtures/configs/monorepo-with-management-api-without-metrics.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.22.0.json",
-  "entrypoint": "serviceApp",
-  "watch": true,
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      },
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      }
-    }
-  },
-  "managementApi": {},
-  "metrics": false
-}

package/fixtures/configs/monorepo-with-management-api.json

@@ -1,20 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "serviceApp",
-  "watch": false,
-  "autoload": {
-    "path": "../monorepo",
-    "exclude": ["docs", "composerApp"],
-    "mappings": {
-      "serviceAppWithLogger": {
-        "id": "with-logger",
-        "config": "platformatic.service.json"
-      },
-      "serviceAppWithMultiplePlugins": {
-        "id": "multi-plugin-service",
-        "config": "platformatic.service.json"
-      }
-    }
-  },
-  "managementApi": {}
-}