@platformatic/node 2.69.0 → 2.70.1

package/config.d.ts

@@ -211,7 +211,7 @@ export interface PlatformaticNodeJsStackable {
       maxELU?: number | string;
       maxHeapUsed?: number | string;
       maxHeapTotal?: number | string;
-      maxYoungGeneration?: number;
+      maxYoungGeneration?: number | string;
     };
     undici?: {
       agentOptions?: {
@@ -401,6 +401,7 @@ export interface PlatformaticNodeJsStackable {
       [k: string]: unknown;
     };
     serviceTimeout?: number | string;
+    messagingTimeout?: number | string;
     env?: {
       [k: string]: string;
     };

package/index.js

@@ -115,32 +115,34 @@ export class NodeStackable extends BaseStackable {
     // Deal with application
     const factory = ['build', 'create'].find(f => typeof this.#module[f] === 'function')
 
-    if (factory) {
-      // We have build function, this Stackable will not use HTTP unless it is the entrypoint
-      serverPromise.cancel()
-
-      this.#app = await this.#module[factory]()
-      this.#isFastify = isFastify(this.#app)
-      this.#isKoa = isKoa(this.#app)
+    if (this.#module.hasServer !== false) {
+      if (factory) {
+        // We have build function, this Stackable will not use HTTP unless it is the entrypoint
+        serverPromise.cancel()
+
+        this.#app = await this.#module[factory]()
+        this.#isFastify = isFastify(this.#app)
+        this.#isKoa = isKoa(this.#app)
+
+        if (this.#isFastify) {
+          await this.#app.ready()
+        } else if (this.#isKoa) {
+          this.#dispatcher = this.#app.callback()
+        } else if (this.#app instanceof Server) {
+          this.#server = this.#app
+          this.#dispatcher = this.#server.listeners('request')[0]
+        }
 
-      if (this.#isFastify) {
-        await this.#app.ready()
-      } else if (this.#isKoa) {
-        this.#dispatcher = this.#app.callback()
-      } else if (this.#app instanceof Server) {
-        this.#server = this.#app
+        if (listen) {
+          await this._listen()
+        }
+      } else {
+        // User blackbox function, we wait for it to listen on a port
+        this.#server = await serverPromise
         this.#dispatcher = this.#server.listeners('request')[0]
-      }
 
-      if (listen) {
-        await this._listen()
+        this.url = getServerUrl(this.#server)
       }
-    } else {
-      // User blackbox function, we wait for it to listen on a port
-      this.#server = await serverPromise
-      this.#dispatcher = this.#server.listeners('request')[0]
-
-      this.url = getServerUrl(this.#server)
     }
 
     await this._collectMetrics()
@@ -202,18 +204,6 @@ export class NodeStackable extends BaseStackable {
       this.logger.trace({ injectParams, url: this.url }, 'injecting via request')
       res = await injectViaRequest(this.url, injectParams, onInject)
     } else {
-      if (this.startHttpTimer && this.endHttpTimer) {
-        this.startHttpTimer({ request: injectParams })
-
-        if (onInject) {
-          const originalOnInject = onInject
-          onInject = (err, response) => {
-            this.endHttpTimer({ request: injectParams, response })
-            originalOnInject(err, response)
-          }
-        }
-      }
-
       if (this.#isFastify) {
         this.logger.trace({ injectParams }, 'injecting via fastify')
         res = await this.#app.inject(injectParams, onInject)
@@ -221,10 +211,6 @@ export class NodeStackable extends BaseStackable {
         this.logger.trace({ injectParams }, 'injecting via light-my-request')
         res = await inject(this.#dispatcher ?? this.#app, injectParams, onInject)
       }
-
-      if (this.endHttpTimer && !onInject) {
-        this.endHttpTimer({ request: injectParams, response: res })
-      }
     }
 
     /* c8 ignore next 3 */
@@ -250,7 +236,7 @@ export class NodeStackable extends BaseStackable {
         url: this.url,
         prefix: this.basePath ?? this.#basePath,
         wantsAbsoluteUrls: this._getWantsAbsoluteUrls(),
-        needsRootRedirect: true
+        needsRootTrailingSlash: true
       },
       connectionStrings: this.connectionString ? [this.connectionString] : []
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/node",
-  "version": "2.69.0",
+  "version": "2.70.1",
   "description": "Platformatic Node.js Stackable",
   "main": "index.js",
   "type": "module",
@@ -21,10 +21,10 @@
   "dependencies": {
     "json5": "^2.2.3",
     "light-my-request": "^6.0.0",
-    "@platformatic/basic": "2.69.0",
-    "@platformatic/config": "2.69.0",
-    "@platformatic/generators": "2.69.0",
-    "@platformatic/utils": "2.69.0"
+    "@platformatic/basic": "2.70.1",
+    "@platformatic/config": "2.70.1",
+    "@platformatic/generators": "2.70.1",
+    "@platformatic/utils": "2.70.1"
   },
   "devDependencies": {
     "borp": "^0.20.0",
@@ -36,8 +36,8 @@
     "neostandard": "^0.12.0",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",
-    "@platformatic/service": "2.69.0",
-    "@platformatic/composer": "2.69.0"
+    "@platformatic/composer": "2.70.1",
+    "@platformatic/service": "2.70.1"
   },
   "scripts": {
     "test": "pnpm run lint && borp --concurrency=1 --no-timeout",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/node/2.69.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/node/2.70.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Node.js Stackable",
   "type": "object",
@@ -724,7 +724,6 @@
           "default": {},
           "properties": {
             "enabled": {
-              "default": true,
               "anyOf": [
                 {
                   "type": "boolean"
@@ -732,10 +731,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": true
             },
             "interval": {
-              "default": 30000,
               "anyOf": [
                 {
                   "type": "number",
@@ -744,10 +743,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 30000
             },
             "gracePeriod": {
-              "default": 30000,
               "anyOf": [
                 {
                   "type": "number",
@@ -756,10 +755,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 30000
             },
             "maxUnhealthyChecks": {
-              "default": 10,
               "anyOf": [
                 {
                   "type": "number",
@@ -768,10 +767,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 10
             },
             "maxELU": {
-              "default": 0.99,
               "anyOf": [
                 {
                   "type": "number",
@@ -781,10 +780,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 0.99
             },
             "maxHeapUsed": {
-              "default": 0.99,
               "anyOf": [
                 {
                   "type": "number",
@@ -794,10 +793,10 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 0.99
             },
             "maxHeapTotal": {
-              "default": 4294967296,
               "anyOf": [
                 {
                   "type": "number",
@@ -806,11 +805,19 @@
                 {
                   "type": "string"
                 }
-              ]
+              ],
+              "default": 4294967296
             },
             "maxYoungGeneration": {
-              "type": "number",
-              "minimum": 0
+              "anyOf": [
+                {
+                  "type": "number",
+                  "minimum": 0
+                },
+                {
+                  "type": "string"
+                }
+              ]
             }
           },
           "additionalProperties": false
@@ -1285,6 +1292,18 @@
           ],
           "default": 300000
         },
+        "messagingTimeout": {
+          "anyOf": [
+            {
+              "type": "number",
+              "minimum": 1
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "default": 30000
+        },
         "env": {
           "type": "object",
           "additionalProperties": {