@platformatic/basic 3.27.0 → 3.28.0

package/config.d.ts

@@ -391,6 +391,7 @@ export interface PlatformaticBasicConfig {
       [k: string]: string;
     };
     sourceMaps?: boolean;
+    nodeModulesSourceMaps?: string[];
     scheduler?: {
       enabled?: boolean | string;
       name: string;
@@ -445,6 +446,7 @@ export interface PlatformaticBasicConfig {
       };
       envfile?: string;
       sourceMaps?: boolean;
+      nodeModulesSourceMaps?: string[];
       packageManager?: "npm" | "pnpm" | "yarn";
       preload?: string | string[];
       nodeOptions?: string;

package/lib/capability.js

@@ -159,21 +159,9 @@ export class BaseCapability extends EventEmitter {
     throw new Error('BaseCapability.start must be overriden by the subclasses')
   }
 
+  // This is to allow grand-children to access the method without calling super.stop()
   async stop () {
-    if (this.#pendingDependenciesWaits.size > 0) {
-      await Promise.allSettled(this.#pendingDependenciesWaits)
-    }
-
-    if (this.#reuseTcpPortsSubscribers) {
-      tracingChannel('net.server.listen').unsubscribe(this.#reuseTcpPortsSubscribers)
-      this.#reuseTcpPortsSubscribers = null
-    }
-
-    // Stop OTLP bridge if running
-    if (this.otlpBridge) {
-      this.otlpBridge.stop()
-      this.otlpBridge = null
-    }
+    return this._stop()
   }
 
   build () {
@@ -463,38 +451,7 @@ export class BaseCapability extends EventEmitter {
       scripts
     })
 
-    this.childManager.on('config', config => {
-      this.subprocessConfig = config
-      this.notifyConfig(config)
-    })
-
-    this.childManager.on('connectionString', connectionString => {
-      this.connectionString = connectionString
-    })
-
-    this.childManager.on('openapiSchema', schema => {
-      this.openapiSchema = schema
-    })
-
-    this.childManager.on('graphqlSchema', schema => {
-      this.graphqlSchema = schema
-    })
-
-    this.childManager.on('basePath', path => {
-      this.basePath = path
-    })
-
-    this.childManager.on('event', event => {
-      globalThis[kITC]?.notify('event', event)
-      this.emit('application:worker:event:' + event.event, event.payload)
-    })
-
-    // This is not really important for the URL but sometimes it also a sign
-    // that the process has been replaced and thus we need to update the client WebSocket
-    this.childManager.on('url', (url, clientWs) => {
-      this.url = url
-      this.clientWs = clientWs
-    })
+    this.setupChildManagerEventsForwarding(this.childManager)
 
     try {
       await this.childManager.inject()
@@ -594,6 +551,41 @@ export class BaseCapability extends EventEmitter {
     }
   }
 
+  setupChildManagerEventsForwarding (childManager) {
+    childManager.on('config', config => {
+      this.subprocessConfig = config
+      this.notifyConfig(config)
+    })
+
+    childManager.on('connectionString', connectionString => {
+      this.connectionString = connectionString
+    })
+
+    childManager.on('openapiSchema', schema => {
+      this.openapiSchema = schema
+    })
+
+    childManager.on('graphqlSchema', schema => {
+      this.graphqlSchema = schema
+    })
+
+    childManager.on('basePath', path => {
+      this.basePath = path
+    })
+
+    childManager.on('event', event => {
+      globalThis[kITC]?.notify('event', event)
+      this.emit('application:worker:event:' + event.event, event.payload)
+    })
+
+    // This is not really important for the URL but sometimes it also a sign
+    // that the process has been replaced and thus we need to update the client WebSocket
+    childManager.on('url', (url, clientWs) => {
+      this.url = url
+      this.clientWs = clientWs
+    })
+  }
+
   async spawn (command) {
     const [executable, ...args] = parseCommandString(command)
     const hasChainedCommands = command.includes('&&') || command.includes('||') || command.includes(';')
@@ -653,6 +645,23 @@ export class BaseCapability extends EventEmitter {
     }
   }
 
+  async _stop () {
+    if (this.#pendingDependenciesWaits.size > 0) {
+      await Promise.allSettled(this.#pendingDependenciesWaits)
+    }
+
+    if (this.#reuseTcpPortsSubscribers) {
+      tracingChannel('net.server.listen').unsubscribe(this.#reuseTcpPortsSubscribers)
+      this.#reuseTcpPortsSubscribers = null
+    }
+
+    // Stop OTLP bridge if running
+    if (this.otlpBridge) {
+      this.otlpBridge.stop()
+      this.otlpBridge = null
+    }
+  }
+
   async _collectMetrics () {
     if (this.#metricsCollected) {
       return
@@ -669,6 +678,20 @@ export class BaseCapability extends EventEmitter {
     await this.#setupOtlpExporter()
   }
 
+  _closeServer (server) {
+    const { promise, resolve, reject } = Promise.withResolvers()
+
+    server.close(error => {
+      if (error) {
+        return reject(error)
+      }
+
+      resolve()
+    })
+
+    return promise
+  }
+
   async #collectMetrics () {
     const metricsConfig = {
       defaultMetrics: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "3.27.0",
+  "version": "3.28.0",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -25,10 +25,10 @@
     "split2": "^4.2.0",
     "undici": "^7.0.0",
     "ws": "^8.18.0",
-    "@platformatic/foundation": "3.27.0",
-    "@platformatic/itc": "3.27.0",
-    "@platformatic/telemetry": "3.27.0",
-    "@platformatic/metrics": "3.27.0"
+    "@platformatic/foundation": "3.28.0",
+    "@platformatic/metrics": "3.28.0",
+    "@platformatic/telemetry": "3.28.0",
+    "@platformatic/itc": "3.28.0"
   },
   "devDependencies": {
     "cleaner-spec-reporter": "^0.5.0",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/3.27.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/3.28.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Basic Config",
   "type": "object",
@@ -231,6 +231,12 @@
               "sourceMaps": {
                 "type": "boolean"
               },
+              "nodeModulesSourceMaps": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
               "packageManager": {
                 "type": "string",
                 "enum": [
@@ -1477,6 +1483,13 @@
           "type": "boolean",
           "default": false
         },
+        "nodeModulesSourceMaps": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": []
+        },
         "scheduler": {
           "type": "array",
           "items": {
@@ -1730,6 +1743,12 @@
             "sourceMaps": {
               "type": "boolean"
             },
+            "nodeModulesSourceMaps": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
             "packageManager": {
               "type": "string",
               "enum": [