@platformatic/runtime 2.66.0 → 2.66.1

package/config.d.ts

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

package/lib/config.js

@@ -263,10 +263,15 @@ async function wrapConfigInRuntimeConfig ({ configManager, args }) {
     // on purpose, the package.json might be missing
   }
 
+  // If the service supports its (so far, only @platformatic/service and descendants)
+  const { hostname, port, http2, https } = configManager.current.server ?? {}
+  const server = { hostname, port, http2, https }
+
   // Important: do not change the order of the properties in this object
   /* c8 ignore next */
   const wrapperConfig = {
     $schema: schema.$id,
+    server,
     watch: true,
     ...omitProperties(configManager.current.runtime ?? {}, runtimeUnwrappablePropertiesList),
     entrypoint: serviceId,

package/lib/start.js

@@ -91,16 +91,29 @@ async function setupAndStartRuntime (config) {
 
   let address = null
   const startErr = null
-  const originalPort = runtimeConfig.current.server?.port || 0
+
+  runtimeConfig.current.server ??= { port: 0 }
+  let port = runtimeConfig.current.server.port
   while (address === null) {
     try {
       address = await runtime.start()
     } catch (err) {
       if (err.code === 'EADDRINUSE') {
+        // Get the actual port from the error message if original port was 0
+        if (!port) {
+          const mo = err.message.match(/ address already in use (.+)/)
+          const url = new URL(`http://${mo[1]}`)
+          port = Number(url.port)
+        }
+
+        port++
         await runtime.close()
 
-        if (runtimeConfig.current?.server?.port > MAX_PORT) throw err
-        runtimeConfig.current.server.port++
+        if (port > MAX_PORT) {
+          throw err
+        }
+
+        runtimeConfig.current.server.port = port
         runtime = await buildRuntime(runtimeConfig)
       } else {
         throw err
@@ -114,7 +127,7 @@ async function setupAndStartRuntime (config) {
         ignore: 'hostname,pid'
       })
     )
-    logger.warn(`Port: ${originalPort} is already in use!`)
+    logger.warn(`Port: ${port} is already in use!`)
     logger.warn(`Changing the port to ${runtimeConfig.current.server.port}`)
   }
   return { address, runtime }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.66.0",
+  "version": "2.66.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -37,12 +37,12 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.66.0",
-    "@platformatic/db": "2.66.0",
-    "@platformatic/node": "2.66.0",
-    "@platformatic/service": "2.66.0",
-    "@platformatic/sql-mapper": "2.66.0",
-    "@platformatic/sql-graphql": "2.66.0"
+    "@platformatic/composer": "2.66.1",
+    "@platformatic/db": "2.66.1",
+    "@platformatic/node": "2.66.1",
+    "@platformatic/service": "2.66.1",
+    "@platformatic/sql-graphql": "2.66.1",
+    "@platformatic/sql-mapper": "2.66.1"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -77,13 +77,13 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^0.13.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.66.0",
-    "@platformatic/generators": "2.66.0",
-    "@platformatic/config": "2.66.0",
-    "@platformatic/itc": "2.66.0",
-    "@platformatic/ts-compiler": "2.66.0",
-    "@platformatic/telemetry": "2.66.0",
-    "@platformatic/utils": "2.66.0"
+    "@platformatic/basic": "2.66.1",
+    "@platformatic/config": "2.66.1",
+    "@platformatic/itc": "2.66.1",
+    "@platformatic/telemetry": "2.66.1",
+    "@platformatic/generators": "2.66.1",
+    "@platformatic/ts-compiler": "2.66.1",
+    "@platformatic/utils": "2.66.1"
   },
   "scripts": {
     "test": "pnpm run lint && borp --concurrency=1 --timeout=300000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.66.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.66.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {