@platformatic/runtime 2.5.5-alpha.1 → 2.5.5-alpha.3

package/config.d.ts

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

package/lib/runtime.js

@@ -3,7 +3,6 @@
 const { once, EventEmitter } = require('node:events')
 const { createReadStream, watch } = require('node:fs')
 const { readdir, readFile, stat, access } = require('node:fs/promises')
-const inspector = require('node:inspector')
 const { join } = require('node:path')
 const { setTimeout: sleep } = require('node:timers/promises')
 const { Worker } = require('node:worker_threads')
@@ -21,6 +20,8 @@ const { getRuntimeTmpDir } = require('./utils')
 const { sendViaITC, waitEventFromITC } = require('./worker/itc')
 const { kId, kITC, kConfig } = require('./worker/symbols')
 
+const Fastify = require('fastify')
+
 const platformaticVersion = require('../package.json').version
 const kWorkerFile = join(__dirname, 'worker/main.js')
 
@@ -50,6 +51,8 @@ class Runtime extends EventEmitter {
   #startedServices
   #restartPromises
   #bootstrapAttempts
+  #inspectors
+  #inspectorServer
 
   constructor (configManager, runtimeLogsDir, env) {
     super()
@@ -68,6 +71,7 @@ class Runtime extends EventEmitter {
     this.#startedServices = new Map()
     this.#restartPromises = new Map()
     this.#bootstrapAttempts = new Map()
+    this.#inspectors = []
   }
 
   async init () {
@@ -90,17 +94,6 @@ class Runtime extends EventEmitter {
     this.logger = logger
     this.#loggerDestination = destination
 
-    // Handle inspector
-    const inspectorOptions = config.inspectorOptions
-    if (inspectorOptions) {
-      /* c8 ignore next 6 */
-      if (inspectorOptions.watchDisabled) {
-        logger.info('debugging flags were detected. hot reloading has been disabled')
-      }
-
-      inspector.open(inspectorOptions.port, inspectorOptions.host, inspectorOptions.breakFirstLine)
-    }
-
     // Create all services, each in is own worker thread
     for (const serviceConfig of config.services) {
       // Setup forwarding of logs from the worker threads to the main thread
@@ -137,6 +130,33 @@ class Runtime extends EventEmitter {
       for (const service of this.#servicesIds) {
         await this.startService(service)
       }
+
+      if (this.#configManager.current.inspectorOptions) {
+        const { port } = this.#configManager.current.inspectorOptions
+
+        const server = Fastify({
+          loggerInstance: this.logger.child({ name: 'inspector' }, { level: 'warn' })
+        })
+
+        const version = await fetch(`http://127.0.0.1:${this.#configManager.current.inspectorOptions.port + 1}/json/version`).then((res) => res.json())
+
+        const data = (await Promise.all(this.#inspectors.map(async (data) => {
+          const res = await fetch(`http://127.0.0.1:${data.port}/json/list`)
+          const details = await res.json()
+          return {
+            ...details[0],
+            title: data.id
+          }
+        })))
+
+        server.get('/json/list', () => data)
+        server.get('/json', () => data)
+        server.get('/json/version', () => version)
+
+        await server.listen({ port })
+        this.logger.info('The inspector server is now listening for all services. Open `chrome://inspect` in Google Chrome to connect.')
+        this.#inspectorServer = server
+      }
     } catch (error) {
       // Wait for the next tick so that the error is logged first
       await sleep(1)
@@ -162,6 +182,10 @@ class Runtime extends EventEmitter {
     this.#updateStatus('stopping')
     this.#startedServices.clear()
 
+    if (this.#inspectorServer) {
+      await this.#inspectorServer.close()
+    }
+
     await Promise.all(this.#servicesIds.map(service => this._stopService(service, silent)))
 
     this.#updateStatus('stopped')
@@ -750,6 +774,25 @@ class Runtime extends EventEmitter {
       this.#bootstrapAttempts.set(id, 0)
     }
 
+    // Handle inspector
+    let inspectorOptions
+
+    if (this.#configManager.current.inspectorOptions) {
+      inspectorOptions = {
+        ...this.#configManager.current.inspectorOptions
+      }
+
+      inspectorOptions.port = inspectorOptions.port + this.#inspectors.length + 1
+
+      const inspectorData = {
+        port: inspectorOptions.port,
+        id,
+        dirname: this.#configManager.dirname
+      }
+
+      this.#inspectors.push(inspectorData)
+    }
+
     const service = new Worker(kWorkerFile, {
       workerData: {
         config,
@@ -757,6 +800,7 @@ class Runtime extends EventEmitter {
           ...serviceConfig,
           isProduction: this.#configManager.args?.production ?? false
         },
+        inspectorOptions,
         dirname: this.#configManager.dirname,
         runtimeLogsDir: this.#runtimeLogsDir,
         loggingPort

package/lib/worker/main.js

@@ -4,6 +4,7 @@ const { createRequire } = require('node:module')
 const { join } = require('node:path')
 const { parentPort, workerData, threadId } = require('node:worker_threads')
 const { pathToFileURL } = require('node:url')
+const inspector = require('node:inspector')
 
 const pino = require('pino')
 const { fetch, setGlobalDispatcher, Agent } = require('undici')
@@ -109,6 +110,24 @@ async function main () {
     }
   }
 
+  const inspectorOptions = workerData.inspectorOptions
+
+  if (inspectorOptions) {
+    for (let i = 0; !inspector.url(); i++) {
+      inspector.open(inspectorOptions.port + i, inspectorOptions.host, inspectorOptions.breakFirstLine)
+    }
+
+    const url = new URL(inspector.url())
+
+    url.protocol = 'http'
+    url.pathname = '/json/list'
+
+    const res = await fetch(url)
+    const [{ devtoolsFrontendUrl }] = await res.json()
+
+    console.log(`For ${service.id} debugger open the following in chrome: "${devtoolsFrontendUrl}"`)
+  }
+
   // Create the application
   app = new PlatformaticApp(
     service,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.5.5-alpha.1",
+  "version": "2.5.5-alpha.3",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -26,6 +26,7 @@
     "express": "^4.18.3",
     "fast-jwt": "^4.0.0",
     "get-port": "^7.1.0",
+    "inspector-client": "^0.1.2",
     "json-schema-to-typescript": "^15.0.0",
     "neostandard": "^0.11.1",
     "pino-abstract-transport": "^2.0.0",
@@ -34,11 +35,11 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.5.5-alpha.1",
-    "@platformatic/service": "2.5.5-alpha.1",
-    "@platformatic/sql-graphql": "2.5.5-alpha.1",
-    "@platformatic/db": "2.5.5-alpha.1",
-    "@platformatic/sql-mapper": "2.5.5-alpha.1"
+    "@platformatic/composer": "2.5.5-alpha.3",
+    "@platformatic/db": "2.5.5-alpha.3",
+    "@platformatic/service": "2.5.5-alpha.3",
+    "@platformatic/sql-graphql": "2.5.5-alpha.3",
+    "@platformatic/sql-mapper": "2.5.5-alpha.3"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -69,13 +70,13 @@
     "undici": "^6.9.0",
     "undici-thread-interceptor": "^0.7.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.5.5-alpha.1",
-    "@platformatic/generators": "2.5.5-alpha.1",
-    "@platformatic/itc": "2.5.5-alpha.1",
-    "@platformatic/telemetry": "2.5.5-alpha.1",
-    "@platformatic/utils": "2.5.5-alpha.1",
-    "@platformatic/ts-compiler": "2.5.5-alpha.1",
-    "@platformatic/config": "2.5.5-alpha.1"
+    "@platformatic/basic": "2.5.5-alpha.3",
+    "@platformatic/config": "2.5.5-alpha.3",
+    "@platformatic/generators": "2.5.5-alpha.3",
+    "@platformatic/itc": "2.5.5-alpha.3",
+    "@platformatic/telemetry": "2.5.5-alpha.3",
+    "@platformatic/ts-compiler": "2.5.5-alpha.3",
+    "@platformatic/utils": "2.5.5-alpha.3"
   },
   "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.5.5-alpha.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.5.5-alpha.3.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {