@uns-kit/api 3.0.1 → 3.0.3

package/dist/uns-api-proxy.d.ts

@@ -22,6 +22,7 @@ export default class UnsApiProxy extends UnsProxy {
     private readonly dataCatalogOffers;
     constructor(processName: string, instanceName: string, options: IApiProxyOptions);
     getProcessName(): string;
+    private getPublishedApiHost;
     /**
      * Unregister endpoint
      * @param topic - The API topic

package/dist/uns-api-proxy.js

@@ -95,6 +95,26 @@ export default class UnsApiProxy extends UnsProxy {
     getProcessName() {
         return this.processName;
     }
+    getPublishedApiHost() {
+        const addressInfo = this.app.server.address();
+        const port = addressInfo && typeof addressInfo === "object" ? addressInfo.port : undefined;
+        const configuredHost = this.options.publishedApiHost?.trim() || process.env.UNS_PUBLISHED_API_HOST?.trim();
+        if (configuredHost) {
+            const origin = new URL(/^[a-z][a-z\d+.-]*:\/\//i.test(configuredHost)
+                ? configuredHost
+                : `http://${configuredHost}`);
+            if (!origin.port && port !== undefined) {
+                origin.port = String(port);
+            }
+            origin.pathname = "";
+            origin.search = "";
+            origin.hash = "";
+            return origin.origin;
+        }
+        return port === undefined
+            ? `http://${App.getExternalIPv4()}`
+            : `http://${App.getExternalIPv4()}:${port}`;
+    }
     /**
      * Unregister endpoint
      * @param topic - The API topic
@@ -141,18 +161,6 @@ export default class UnsApiProxy extends UnsProxy {
         const apiPath = `${this.apiBasePrefix}${fullPath}`.replace(/\/{2,}/g, "/");
         const swaggerPath = buildSwaggerPath(this.swaggerBasePrefix, this.processName, this.instanceName);
         try {
-            // Get ip and port from environment variables or defaults
-            const addressInfo = this.app.server.address();
-            let ip;
-            let port;
-            if (addressInfo && typeof addressInfo === "object") {
-                ip = App.getExternalIPv4();
-                port = addressInfo.port;
-            }
-            else if (typeof addressInfo === "string") {
-                ip = App.getExternalIPv4();
-                port = "";
-            }
             this.registerApiEndpoint({
                 timestamp: time,
                 topic: topic,
@@ -160,10 +168,10 @@ export default class UnsApiProxy extends UnsProxy {
                 routeOnly: options?.routeOnly === true,
                 registryTopic: options?.registryTopic ??
                     "api-endpoints",
-                apiHost: `http://${ip}:${port}`,
+                apiHost: this.getPublishedApiHost(),
                 apiEndpoint: apiPath,
                 apiMethod: "GET",
-                apiQueryParams: options.queryParams,
+                apiQueryParams: options?.queryParams ?? [],
                 apiDescription: options?.apiDescription,
                 serviceApi: options?.serviceApi ?? null,
                 attributeType: UnsAttributeType.Api,
@@ -330,20 +338,9 @@ export default class UnsApiProxy extends UnsProxy {
         }
         const finalOptions = options ?? {};
         const topicNormalized = topicPrefix.endsWith("/") ? topicPrefix : `${topicPrefix}`;
-        const addressInfo = this.app.server.address();
-        let ip;
-        let port;
-        if (addressInfo && typeof addressInfo === "object") {
-            ip = App.getExternalIPv4();
-            port = addressInfo.port;
-        }
-        else if (typeof addressInfo === "string") {
-            ip = App.getExternalIPv4();
-            port = "";
-        }
         const apiBase = typeof finalOptions?.apiBase === "string" && finalOptions.apiBase.length
             ? finalOptions.apiBase
-            : `http://${ip}:${port}`;
+            : this.getPublishedApiHost();
         const apiBasePath = typeof finalOptions?.apiBasePath === "string" && finalOptions.apiBasePath.length
             ? finalOptions.apiBasePath
             : "/api";
@@ -428,17 +425,6 @@ export default class UnsApiProxy extends UnsProxy {
         const swaggerPath = buildSwaggerPath(this.swaggerBasePrefix, this.processName, this.instanceName);
         const methodKey = method.toLowerCase();
         try {
-            const addressInfo = this.app.server.address();
-            let ip;
-            let port;
-            if (addressInfo && typeof addressInfo === "object") {
-                ip = App.getExternalIPv4();
-                port = addressInfo.port;
-            }
-            else if (typeof addressInfo === "string") {
-                ip = App.getExternalIPv4();
-                port = "";
-            }
             this.registerApiEndpoint({
                 timestamp: time,
                 topic,
@@ -446,7 +432,7 @@ export default class UnsApiProxy extends UnsProxy {
                 routeOnly: options?.routeOnly === true,
                 registryTopic: options?.registryTopic ??
                     "api-endpoints",
-                apiHost: `http://${ip}:${port}`,
+                apiHost: this.getPublishedApiHost(),
                 apiEndpoint: apiPath,
                 apiMethod: method,
                 apiQueryParams: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uns-kit/api",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Express-powered API gateway plugin for UnsProxyProcess with JWT/JWKS support.",
   "type": "module",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "multer": "^2.0.2",
     "parquets": "^0.10.10",
     "uuid": "^14.0.0",
-    "@uns-kit/core": "3.0.1"
+    "@uns-kit/core": "3.0.3"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.9",