@platformatic/runtime 2.16.0-alpha.1 → 2.17.0

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime2160Alpha1Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime2170Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;
@@ -165,7 +165,6 @@ export type HttpsSchemasPlatformaticDevPlatformaticRuntime2160Alpha1Json = {
     [k: string]: unknown;
   };
   serviceTimeout?: number | string;
-  resolvedServicesBasePath?: string;
 };
 
 export interface UndiciInterceptor {

package/lib/config.js

@@ -87,9 +87,8 @@ async function _transformConfig (configManager, args) {
   for (let i = 0; i < services.length; ++i) {
     const service = services[i]
 
-    // We need to have absolute paths here, ot the `loadConfig` will fail
-    // Make sure we don't resolve if env var was not replaced
-    if (service.path && !isAbsolute(service.path) && !service.path.match(/^\{.*\}$/)) {
+    // We need to have absolut paths here, ot the `loadConfig` will fail
+    if (!isAbsolute(service.path)) {
       service.path = pathResolve(configManager.dirname, service.path)
     }
 

package/lib/errors.js

@@ -7,7 +7,6 @@ const ERROR_PREFIX = 'PLT_RUNTIME'
 module.exports = {
   AddressInUseError: createError(`${ERROR_PREFIX}_EADDR_IN_USE`, 'The current port is in use by another application'),
   RuntimeExitedError: createError(`${ERROR_PREFIX}_RUNTIME_EXIT`, 'The runtime exited before the operation completed'),
-  RuntimeAbortedError: createError(`${ERROR_PREFIX}_RUNTIME_ABORT`, 'The runtime aborted the operation'),
   // The following two use the same code as we only need to differentiate the label
   ServiceExitedError: createError(`${ERROR_PREFIX}_SERVICE_EXIT`, 'The service "%s" exited prematurely with error code %d'),
   WorkerExitedError: createError(`${ERROR_PREFIX}_SERVICE_EXIT`, 'The worker %s of the service "%s" exited prematurely with error code %d'),

package/lib/runtime.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { once, EventEmitter } = require('node:events')
-const { createReadStream, watch, existsSync } = require('node:fs')
+const { createReadStream, watch } = require('node:fs')
 const { readdir, readFile, stat, access } = require('node:fs/promises')
 const { join } = require('node:path')
 const { setTimeout: sleep } = require('node:timers/promises')
@@ -111,33 +111,16 @@ class Runtime extends EventEmitter {
     this.#servicesIds = config.services.map(service => service.id)
     this.#workers.configure(config.services, this.#configManager.current.workers, this.#isProduction)
 
+    if (this.#isProduction) {
+      this.#env['PLT_DEV'] = 'false'
+      this.#env['PLT_ENVIRONMENT'] = 'production'
+    } else {
+      this.#env['PLT_DEV'] = 'true'
+      this.#env['PLT_ENVIRONMENT'] = 'development'
+    }
+
     // Create all services, each in is own worker thread
     for (const serviceConfig of config.services) {
-      // If there is no service path, check if the service was resolved
-      if (!serviceConfig.path) {
-        if (serviceConfig.url) {
-          // Try to backfill the path for external services
-          serviceConfig.path = join(this.#configManager.dirname, config.resolvedServicesBasePath, serviceConfig.id)
-
-          if (!existsSync(serviceConfig.path)) {
-            const executable = globalThis.platformatic?.executable ?? 'platformatic'
-            this.logger.error(
-              `The path for service "%s" does not exist. Please run "${executable} resolve" and try again.`,
-              serviceConfig.id
-            )
-
-            throw new errors.RuntimeAbortedError()
-          }
-        } else {
-          this.logger.error(
-            'The service "%s" has no path defined. Please check your configuration and try again.',
-            serviceConfig.id
-          )
-
-          throw new errors.RuntimeAbortedError()
-        }
-      }
-
       await this.#setupService(serviceConfig)
     }
 
@@ -287,7 +270,7 @@ class Runtime extends EventEmitter {
     this.#updateStatus('closed')
   }
 
-  async startService (id, silent = false) {
+  async startService (id, silent) {
     // Since when a service is stopped the worker is deleted, we consider a service start if its first service
     // is no longer in the init phase
     const firstWorker = this.#workers.get(`${id}:0`)
@@ -309,7 +292,7 @@ class Runtime extends EventEmitter {
     }
   }
 
-  async stopService (id, silent = false) {
+  async stopService (id, silent) {
     const config = this.#configManager.current
     const serviceConfig = config.services.find(s => s.id === id)
 
@@ -746,6 +729,21 @@ class Runtime extends EventEmitter {
     return createReadStream(filePath)
   }
 
+  async sendCommandToService (id, name, message) {
+    const service = await this.#getServiceById(id)
+
+    try {
+      return await sendViaITC(service, name, message)
+    } catch (e) {
+      // The service exports no meta, return an empty object
+      if (e.code === 'PLT_ITC_HANDLER_NOT_FOUND') {
+        return {}
+      }
+
+      throw e
+    }
+  }
+
   #updateStatus (status) {
     this.#status = status
     this.emit(status)

package/lib/schema.js

@@ -27,8 +27,6 @@ const services = {
       },
       path: {
         type: 'string',
-        // This is required for the resolve command to allow empty paths after environment variable replacement
-        allowEmptyPaths: true,
         resolvePath: true
       },
       config: {
@@ -286,10 +284,6 @@ const platformaticRuntimeSchema = {
         { type: 'string' }
       ],
       default: 300000 // 5 minutes
-    },
-    resolvedServicesBasePath: {
-      type: 'string',
-      default: 'external'
     }
   },
   anyOf: [{ required: ['autoload'] }, { required: ['services'] }, { required: ['web'] }],

package/lib/start.js

@@ -146,7 +146,7 @@ async function startCommand (args, throwAllErrors = false, returnRuntime = false
 
     return returnRuntime ? runtime : res
   } catch (err) {
-    if (throwAllErrors && err.code !== 'PLT_RUNTIME_RUNTIME_ABORT') {
+    if (throwAllErrors) {
       throw err
     }
 
@@ -187,9 +187,7 @@ async function startCommand (args, throwAllErrors = false, returnRuntime = false
       process.exit(1)
     }
 
-    if (err.code !== 'PLT_RUNTIME_RUNTIME_ABORT') {
-      console.error(err)
-    }
+    console.error(err)
 
     process.exit(1)
   }

package/lib/worker/default-stackable.js

@@ -13,6 +13,7 @@ const defaultStackable = {
   getEnv: () => null,
   getInfo: () => null,
   getDispatchFunc: () => null,
+  getDispatchTarget: () => null,
   getOpenapiSchema: () => null,
   getGraphqlSchema: () => null,
   getMeta: () => ({}),

package/lib/worker/itc.js

@@ -72,12 +72,8 @@ function setupITC (app, service, dispatcher) {
           await app.listen()
         }
 
-        const url = app.stackable.getUrl()
-
-        const dispatchFunc = await app.stackable.getDispatchFunc()
-        dispatcher.replaceServer(url ?? dispatchFunc)
-
-        return service.entrypoint ? url : null
+        dispatcher.replaceServer(await app.stackable.getDispatchTarget())
+        return service.entrypoint ? app.stackable.getUrl() : null
       },
 
       async stop () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.16.0-alpha.1",
+  "version": "2.17.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -19,12 +19,12 @@
   "devDependencies": {
     "@fastify/express": "^4.0.0",
     "@fastify/formbody": "^8.0.0",
-    "borp": "^0.18.0",
+    "borp": "^0.19.0",
     "c8": "^10.0.0",
     "eslint": "9",
     "execa": "^8.0.1",
     "express": "^4.18.3",
-    "fast-jwt": "^4.0.0",
+    "fast-jwt": "^5.0.0",
     "get-port": "^7.1.0",
     "inspector-client": "^0.1.2",
     "json-schema-to-typescript": "^15.0.0",
@@ -35,12 +35,12 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.16.0-alpha.1",
-    "@platformatic/db": "2.16.0-alpha.1",
-    "@platformatic/node": "2.16.0-alpha.1",
-    "@platformatic/sql-graphql": "2.16.0-alpha.1",
-    "@platformatic/sql-mapper": "2.16.0-alpha.1",
-    "@platformatic/service": "2.16.0-alpha.1"
+    "@platformatic/composer": "2.17.0",
+    "@platformatic/db": "2.17.0",
+    "@platformatic/node": "2.17.0",
+    "@platformatic/sql-graphql": "2.17.0",
+    "@platformatic/service": "2.17.0",
+    "@platformatic/sql-mapper": "2.17.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -70,13 +70,13 @@
     "undici": "^6.9.0",
     "undici-thread-interceptor": "^0.9.0",
     "ws": "^8.16.0",
-    "@platformatic/config": "2.16.0-alpha.1",
-    "@platformatic/basic": "2.16.0-alpha.1",
-    "@platformatic/generators": "2.16.0-alpha.1",
-    "@platformatic/itc": "2.16.0-alpha.1",
-    "@platformatic/ts-compiler": "2.16.0-alpha.1",
-    "@platformatic/telemetry": "2.16.0-alpha.1",
-    "@platformatic/utils": "2.16.0-alpha.1"
+    "@platformatic/basic": "2.17.0",
+    "@platformatic/generators": "2.17.0",
+    "@platformatic/config": "2.17.0",
+    "@platformatic/itc": "2.17.0",
+    "@platformatic/telemetry": "2.17.0",
+    "@platformatic/ts-compiler": "2.17.0",
+    "@platformatic/utils": "2.17.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.16.0-alpha.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.17.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -183,7 +183,6 @@
           },
           "path": {
             "type": "string",
-            "allowEmptyPaths": true,
             "resolvePath": true
           },
           "config": {
@@ -336,7 +335,6 @@
           },
           "path": {
             "type": "string",
-            "allowEmptyPaths": true,
             "resolvePath": true
           },
           "config": {
@@ -1080,10 +1078,6 @@
         }
       ],
       "default": 300000
-    },
-    "resolvedServicesBasePath": {
-      "type": "string",
-      "default": "external"
     }
   },
   "anyOf": [