@platformatic/runtime 2.0.0-alpha.5 → 2.0.0-alpha.6

package/config.d.ts

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

package/lib/management-api.js

@@ -72,20 +72,6 @@ async function managementApiPlugin (app, opts) {
     return runtime.getServiceGraphqlSchema(id)
   })
 
-  app.get('/services/:id/connection-strings', async request => {
-    const { id } = request.params
-    try {
-      app.log.debug('get connection strings', { id })
-      const meta = await runtime.getServiceMeta(id)
-      if (meta.db) {
-        return meta.db
-      }
-      return null
-    } catch (err) {
-      throw new errors.FailedToRetrieveMetaError(id, err.message)
-    }
-  })
-
   app.post('/services/:id/start', async request => {
     const { id } = request.params
     app.log.debug('start service', { id })

package/lib/runtime.js

@@ -9,6 +9,7 @@ const { setTimeout: sleep } = require('node:timers/promises')
 const { Worker } = require('node:worker_threads')
 
 const { ITC } = require('@platformatic/itc')
+const { Unpromise } = require('@watchable/unpromise')
 const ts = require('tail-file-stream')
 const { createThreadInterceptor } = require('undici-thread-interceptor')
 
@@ -275,13 +276,13 @@ class Runtime extends EventEmitter {
 
     // Always send the stop message, it will shut down workers that only had ITC and interceptors setup
     try {
-      await Promise.race([sendViaITC(service, 'stop'), sleep(10000, 'timeout', { ref: false })])
+      await Unpromise.race([sendViaITC(service, 'stop'), sleep(10000, 'timeout', { ref: false })])
     } catch (error) {
       this.logger?.info(`Failed to stop service "${id}". Killing a worker thread.`, error)
     }
 
     // Wait for the worker thread to finish, we're going to create a new one if the service is ever restarted
-    const res = await Promise.race([once(service, 'exit'), sleep(10000, 'timeout', { ref: false })])
+    const res = await Unpromise.race([once(service, 'exit'), sleep(10000, 'timeout', { ref: false })])
 
     // If the worker didn't exit in time, kill it
     if (res === 'timeout') {
@@ -422,7 +423,7 @@ class Runtime extends EventEmitter {
       packageName: packageJson.name ?? null,
       packageVersion: packageJson.version ?? null,
       url: entrypointDetails?.url ?? null,
-      platformaticVersion,
+      platformaticVersion
     }
   }
 
@@ -449,7 +450,7 @@ class Runtime extends EventEmitter {
   async getServices () {
     return {
       entrypoint: this.#entrypointId,
-      services: await Promise.all(this.#servicesIds.map(id => this.getServiceDetails(id))),
+      services: await Promise.all(this.#servicesIds.map(id => this.getServiceDetails(id)))
     }
   }
 
@@ -478,7 +479,7 @@ class Runtime extends EventEmitter {
       version,
       localUrl,
       entrypoint,
-      dependencies,
+      dependencies
     }
 
     if (entrypoint) {
@@ -610,9 +611,9 @@ class Runtime extends EventEmitter {
             p50: p50Value,
             p90: p90Value,
             p95: p95Value,
-            p99: p99Value,
-          },
-        },
+            p99: p99Value
+          }
+        }
       }
 
       return formattedMetrics
@@ -649,7 +650,7 @@ class Runtime extends EventEmitter {
       }
       runtimesLogsIds.push({
         pid: runtime.runtimePID,
-        indexes: runtimeLogIds,
+        indexes: runtimeLogIds
       })
     }
 
@@ -687,7 +688,7 @@ class Runtime extends EventEmitter {
         serviceConfig,
         dirname: this.#configManager.dirname,
         runtimeLogsDir: this.#runtimeLogsDir,
-        loggingPort,
+        loggingPort
       },
       execArgv: [], // Avoid side effects
       env: this.#env,
@@ -700,7 +701,7 @@ class Runtime extends EventEmitter {
         The author of this (Paolo and Matteo) are not proud of the solution. Forgive us.
       */
       stdout: true,
-      stderr: true,
+      stderr: true
     })
 
     // Make sure the listener can handle a lot of API requests at once before raising a warning
@@ -737,9 +738,13 @@ class Runtime extends EventEmitter {
     service[kConfig] = serviceConfig
 
     // Setup ITC
-    service[kITC] = new ITC({ port: service })
+    service[kITC] = new ITC({
+      port: service,
+      handlers: {
+        getServiceMeta: this.getServiceMeta.bind(this)
+      }
+    })
     service[kITC].listen()
-    service[kITC].handle('getServiceMeta', this.getServiceMeta.bind(this))
 
     // Handle services changes
     // This is not purposely activated on when this.#configManager.current.watch === true
@@ -904,7 +909,7 @@ class Runtime extends EventEmitter {
       runtimesLogFiles.push({
         runtimePID: parseInt(runtimePID),
         runtimeLogFiles,
-        lastModified,
+        lastModified
       })
     }
 

package/lib/worker/itc.js

@@ -4,6 +4,7 @@ const { once } = require('node:events')
 const { parentPort } = require('node:worker_threads')
 
 const { ITC } = require('@platformatic/itc')
+const { Unpromise } = require('@watchable/unpromise')
 
 const errors = require('../errors')
 const { kITC, kId } = require('./symbols')
@@ -14,11 +15,11 @@ async function sendViaITC (worker, name, message) {
     const ac = new AbortController()
     let exitCode
 
-    const response = await Promise.race([
+    const response = await Unpromise.race([
       worker[kITC].send(name, message),
       once(worker, 'exit', { signal: ac.signal }).then(([code]) => {
         exitCode = code
-      }),
+      })
     ])
 
     if (typeof exitCode === 'number') {
@@ -42,90 +43,93 @@ async function sendViaITC (worker, name, message) {
 }
 
 function setupITC (app, service, dispatcher) {
-  const itc = new ITC({ port: parentPort })
-
-  itc.handle('start', async () => {
-    const status = app.getStatus()
-
-    if (status === 'starting') {
-      await once(app, 'start')
-    } else {
-      await app.start()
-    }
-
-    if (service.entrypoint) {
-      await app.listen()
-    }
-
-    const url = app.stackable.getUrl()
-
-    const dispatchFunc = await app.stackable.getDispatchFunc()
-    dispatcher.replaceServer(url ?? dispatchFunc)
-
-    return service.entrypoint ? url : null
-  })
-
-  itc.handle('stop', async () => {
-    const status = app.getStatus()
-
-    if (status === 'starting') {
-      await once(app, 'start')
-    }
-
-    if (status !== 'stopped') {
-      await app.stop()
-    }
-
-    dispatcher.interceptor.close()
-    itc.close()
-  })
-
-  itc.handle('getStatus', async () => {
-    return app.getStatus()
-  })
-
-  itc.handle('getServiceInfo', async () => {
-    return app.stackable.getInfo()
-  })
-
-  itc.handle('getServiceConfig', async () => {
-    const current = await app.stackable.getConfig()
-    // Remove all undefined keys from the config
-    return JSON.parse(JSON.stringify(current))
-  })
-
-  itc.handle('getServiceOpenAPISchema', async () => {
-    try {
-      return app.stackable.getOpenapiSchema()
-    } catch (err) {
-      throw new errors.FailedToRetrieveOpenAPISchemaError(service.id, err.message)
+  const itc = new ITC({
+    port: parentPort,
+    handlers: {
+      async start () {
+        const status = app.getStatus()
+
+        if (status === 'starting') {
+          await once(app, 'start')
+        } else {
+          await app.start()
+        }
+
+        if (service.entrypoint) {
+          await app.listen()
+        }
+
+        const url = app.stackable.getUrl()
+
+        const dispatchFunc = await app.stackable.getDispatchFunc()
+        dispatcher.replaceServer(url ?? dispatchFunc)
+
+        return service.entrypoint ? url : null
+      },
+
+      async stop () {
+        const status = app.getStatus()
+
+        if (status === 'starting') {
+          await once(app, 'start')
+        }
+
+        if (status !== 'stopped') {
+          await app.stop()
+        }
+
+        dispatcher.interceptor.close()
+        itc.close()
+      },
+
+      getStatus () {
+        return app.getStatus()
+      },
+
+      getServiceInfo () {
+        return app.stackable.getInfo()
+      },
+
+      async getServiceConfig () {
+        const current = await app.stackable.getConfig()
+        // Remove all undefined keys from the config
+        return JSON.parse(JSON.stringify(current))
+      },
+
+      async getServiceOpenAPISchema () {
+        try {
+          return await app.stackable.getOpenapiSchema()
+        } catch (err) {
+          throw new errors.FailedToRetrieveOpenAPISchemaError(service.id, err.message)
+        }
+      },
+
+      async getServiceGraphQLSchema () {
+        try {
+          return await app.stackable.getGraphqlSchema()
+        } catch (err) {
+          throw new errors.FailedToRetrieveGraphQLSchemaError(service.id, err.message)
+        }
+      },
+
+      async getServiceMeta () {
+        try {
+          return await app.stackable.getMeta()
+        } catch (err) {
+          throw new errors.FailedToRetrieveMetaError(service.id, err.message)
+        }
+      },
+
+      getMetrics (format) {
+        return app.stackable.getMetrics({ format })
+      },
+
+      inject (injectParams) {
+        return app.stackable.inject(injectParams)
+      }
     }
   })
 
-  itc.handle('getServiceGraphQLSchema', async () => {
-    try {
-      return app.stackable.getGraphqlSchema()
-    } catch (err) {
-      throw new errors.FailedToRetrieveGraphQLSchemaError(service.id, err.message)
-    }
-  })
-
-  itc.handle('getServiceMeta', async () => {
-    try {
-      return app.stackable.getMeta()
-    } catch (err) {
-      throw new errors.FailedToRetrieveMetaError(service.id, err.message)
-    }
-  })
-
-  itc.handle('getMetrics', async format => {
-    return app.stackable.getMetrics({ format })
-  })
-
-  itc.handle('inject', async injectParams => {
-    return app.stackable.inject(injectParams)
-  })
-
   app.on('changed', () => {
     itc.notify('changed')
   })

package/lib/worker/main.js

@@ -6,6 +6,7 @@ const { setTimeout: sleep } = require('node:timers/promises')
 const { parentPort, workerData, threadId } = require('node:worker_threads')
 const { pathToFileURL } = require('node:url')
 
+const { Unpromise } = require('@watchable/unpromise')
 const pino = require('pino')
 const { fetch, setGlobalDispatcher, Agent } = require('undici')
 const { wire } = require('undici-thread-interceptor')
@@ -29,7 +30,7 @@ const logger = createLogger()
 function handleUnhandled (type, err) {
   logger.error({ err }, `application ${type}`)
 
-  Promise.race([app?.stop(), sleep(1000, 'timeout', { ref: false })])
+  Unpromise.race([app?.stop(), sleep(1000, 'timeout', { ref: false })])
     .catch()
     .finally(() => {
       process.exit(1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,16 +34,17 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.0.0-alpha.5",
-    "@platformatic/db": "2.0.0-alpha.5",
-    "@platformatic/sql-graphql": "2.0.0-alpha.5",
-    "@platformatic/sql-mapper": "2.0.0-alpha.5",
-    "@platformatic/service": "2.0.0-alpha.5"
+    "@platformatic/composer": "2.0.0-alpha.6",
+    "@platformatic/service": "2.0.0-alpha.6",
+    "@platformatic/sql-graphql": "2.0.0-alpha.6",
+    "@platformatic/sql-mapper": "2.0.0-alpha.6",
+    "@platformatic/db": "2.0.0-alpha.6"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
     "@fastify/websocket": "^10.0.0",
     "@hapi/topo": "^6.0.2",
+    "@watchable/unpromise": "^1.0.2",
     "boring-name-generator": "^1.0.3",
     "change-case-all": "^2.1.0",
     "close-with-grace": "^2.0.0",
@@ -66,13 +67,13 @@
     "undici": "^6.9.0",
     "undici-thread-interceptor": "^0.5.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.0.0-alpha.5",
-    "@platformatic/itc": "2.0.0-alpha.5",
-    "@platformatic/generators": "2.0.0-alpha.5",
-    "@platformatic/telemetry": "2.0.0-alpha.5",
-    "@platformatic/ts-compiler": "2.0.0-alpha.5",
-    "@platformatic/utils": "2.0.0-alpha.5",
-    "@platformatic/config": "2.0.0-alpha.5"
+    "@platformatic/basic": "2.0.0-alpha.6",
+    "@platformatic/generators": "2.0.0-alpha.6",
+    "@platformatic/config": "2.0.0-alpha.6",
+    "@platformatic/utils": "2.0.0-alpha.6",
+    "@platformatic/itc": "2.0.0-alpha.6",
+    "@platformatic/ts-compiler": "2.0.0-alpha.6",
+    "@platformatic/telemetry": "2.0.0-alpha.6"
   },
   "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.0-alpha.5.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.0.0-alpha.6.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {