@platformatic/watt-extra 1.12.0-alpha.2 → 1.12.0-alpha.4

package/lib/watt.js

@@ -1,3 +1,5 @@
+import os from 'node:os'
+import dns from 'node:dns/promises'
 import { readFile } from 'node:fs/promises'
 import { join, resolve } from 'node:path'
 import { createRequire } from 'node:module'
@@ -603,11 +605,11 @@ class Watt {
     }
   }
 
-  #configureReginaService (runtime, app) {
-    process._rawDebug('--------INS CONFIG--------', this.#instanceConfig)
+  async #configureReginaService (runtime, app) {
+    process._rawDebug('--------INSTANCE CONFIG--------', this.#instanceConfig)
 
-    const privateIp = this.#instanceConfig?.podDetails?.privateIp
-    const port = this.#getContainerHttpPort()
+    const privateIp = await this.#getPrivateIp()
+    const port = this.#getRuntimePort()
 
     if (!privateIp) {
       this.#logger.warn('Missing private IP address, not setting up Regina member address')
@@ -622,41 +624,15 @@ class Watt {
     // ]
   }
 
-  #getContainerHttpPort () {
-    const defaultPort = this.#env.PLT_DEFAULT_CONTAINER_PORT
-
-    let ports = this.#instanceConfig?.podDetails?.ports
-    if (!Array.isArray(ports) || ports.length === 0) {
-      return defaultPort
-    }
-
-    ports = ports.filter((port) => port.protocol === 'TCP')
-    if (ports.length === 0) {
-      return defaultPort
-    }
-
-    if (ports.length === 1) {
-      return ports[0].containerPort
-    }
-
-    const httpPort = ports.find((port) => port.name === 'http')
-    if (httpPort) {
-      return httpPort.containerPort
-    }
-
-    const metricPorts = [9090]
-    ports = ports.filter((port) => !metricPorts.includes(port.containerPort))
-
-    if (ports.length === 1) {
-      return ports[0].containerPort
-    }
-
-    this.#logger.warn(
-      { ports: this.#instanceConfig.ports, defaultPort },
-      'Multiple ports found, cannot determine the HTTP port, using default'
-    )
+  async #getPrivateIp () {
+    const { address } = await dns.lookup(os.hostname())
+    process._rawDebug('--------IP--------', address)
+    return address
+  }
 
-    return defaultPort
+  #getRuntimePort () {
+    const runtimeConfg = this.#config
+    return this.#env.PLT_APP_PORT || runtimeConfg.server.port
   }
 
   async #patchService (runtime, id, patches) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/watt-extra",
-  "version": "1.12.0-alpha.2",
+  "version": "1.12.0-alpha.4",
   "description": "The Platformatic runtime manager",
   "type": "module",
   "scripts": {

package/plugins/env.js

@@ -32,7 +32,6 @@ const schema = {
     PLT_HEALTH_SIGNALS_LONG_BATCH_TIMEOUT: { type: 'number', default: 30000 },
     PLT_HEALTH_SIGNALS_ELU_BATCH_THRESHOLD: { type: 'number', default: 0.5 },
     PLT_HEALTH_SIGNALS_HEAP_BATCH_THRESHOLD: { type: ['number', 'string'], default: '300MB' },
-    PLT_DEFAULT_CONTAINER_PORT: { type: 'number', default: 8080 }
   }
 }