@uns-kit/api 2.0.40 → 2.0.42

package/dist/api-interfaces.d.ts

@@ -1 +1 @@
-export type { IApiProxyOptions, IGetEndpointOptions, QueryParamDef } from "@uns-kit/core/uns/uns-interfaces.js";
+export type { IApiProxyOptions, IGetEndpointOptions, QueryParamDef } from "@uns-kit/core/uns/uns-interfaces.js";

package/dist/app.d.ts

@@ -1,48 +1,49 @@
-/**
- * Module dependencies.
- */
-import { type Router } from "express";
-import * as http from "http";
-type MountConfig = {
-    apiBasePrefix?: string;
-    swaggerBasePrefix?: string;
-    disableDefaultApiMount?: boolean;
-};
-export default class App {
-    private expressApplication;
-    server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
-    private port;
-    router: Router;
-    private processName;
-    private instanceName;
-    private apiBasePrefix;
-    private swaggerBasePrefix;
-    swaggerSpec: {
-        openapi: string;
-        info: {
-            title: string;
-            version: string;
-        };
-        paths: Record<string, any>;
-        servers?: Array<{
-            url: string;
-        }>;
-    };
-    private swaggerDocs;
-    constructor(port: number, processName: string, instanceName: string, appContext?: any, mountConfig?: MountConfig);
-    static getExternalIPv4(): string | null;
-    getSwaggerSpec(): {
-        openapi: string;
-        info: {
-            title: string;
-            version: string;
-        };
-        paths: Record<string, any>;
-        servers?: Array<{
-            url: string;
-        }>;
-    };
-    registerSwaggerDoc(path: string, doc: Record<string, unknown>): void;
-    start(): Promise<void>;
-}
-export {};
+/// <reference types="node" resolution-mode="require"/>
+/**
+ * Module dependencies.
+ */
+import { type Router } from "express";
+import * as http from "http";
+type MountConfig = {
+    apiBasePrefix?: string;
+    swaggerBasePrefix?: string;
+    disableDefaultApiMount?: boolean;
+};
+export default class App {
+    private expressApplication;
+    server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+    private port;
+    router: Router;
+    private processName;
+    private instanceName;
+    private apiBasePrefix;
+    private swaggerBasePrefix;
+    swaggerSpec: {
+        openapi: string;
+        info: {
+            title: string;
+            version: string;
+        };
+        paths: Record<string, any>;
+        servers?: Array<{
+            url: string;
+        }>;
+    };
+    private swaggerDocs;
+    constructor(port: number, processName: string, instanceName: string, appContext?: any, mountConfig?: MountConfig);
+    static getExternalIPv4(): string | null;
+    getSwaggerSpec(): {
+        openapi: string;
+        info: {
+            title: string;
+            version: string;
+        };
+        paths: Record<string, any>;
+        servers?: {
+            url: string;
+        }[];
+    };
+    registerSwaggerDoc(path: string, doc: Record<string, unknown>): void;
+    start(): Promise<void>;
+}
+export {};

package/dist/app.js

@@ -1,150 +1,148 @@
-/**
- * Module dependencies.
- */
-import express from "express";
-import * as http from "http";
-import * as path from "path";
-import cookieParser from "cookie-parser";
-import { basePath } from "@uns-kit/core/base-path.js";
-import logger from "@uns-kit/core/logger.js";
-import os from 'os';
-const normalizeBasePrefix = (value) => {
-    if (!value)
-        return "";
-    const trimmed = value.trim();
-    if (!trimmed)
-        return "";
-    const withLeading = trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
-    return withLeading.replace(/\/+$/, "");
-};
-const buildSwaggerPath = (base, processName, instanceName) => {
-    const processSegment = `/${processName}`;
-    let baseWithProcess = base || "/";
-    if (!baseWithProcess.endsWith(processSegment)) {
-        baseWithProcess = `${baseWithProcess}${processSegment}`;
-    }
-    return `${baseWithProcess}/${instanceName}/swagger.json`.replace(/\/{2,}/g, "/");
-};
-export default class App {
-    expressApplication;
-    server;
-    port;
-    router;
-    processName;
-    instanceName;
-    apiBasePrefix;
-    swaggerBasePrefix;
-    swaggerSpec;
-    swaggerDocs = new Map();
-    constructor(port, processName, instanceName, appContext, mountConfig) {
-        this.router = express.Router();
-        this.port = port;
-        this.expressApplication = express();
-        this.server = http.createServer(this.expressApplication);
-        this.processName = processName;
-        this.instanceName = instanceName;
-        this.apiBasePrefix =
-            normalizeBasePrefix(mountConfig?.apiBasePrefix ?? process.env.UNS_API_BASE_PATH) || "/api";
-        const rawSwaggerBase = normalizeBasePrefix(mountConfig?.swaggerBasePrefix ?? process.env.UNS_SWAGGER_BASE_PATH) ||
-            this.apiBasePrefix;
-        // If someone passed ".../api" as swagger base, strip that to avoid duplicated segments
-        this.swaggerBasePrefix = rawSwaggerBase.endsWith("/api")
-            ? rawSwaggerBase.replace(/\/api\/?$/, "") || "/"
-            : rawSwaggerBase;
-        // Add context
-        this.expressApplication.use((req, _res, next) => {
-            req.appContext = appContext;
-            next();
-        });
-        // Body parser (req.body)
-        this.expressApplication.use(express.json());
-        this.expressApplication.use(express.urlencoded({ extended: false }));
-        // Add cookie parser
-        this.expressApplication.use(cookieParser());
-        // Static / public folder
-        const publicHome = process.env.PUBLIC_HOME === null || process.env.PUBLIC_HOME === undefined
-            ? "public"
-            : process.env.PUBLIC_HOME;
-        this.expressApplication.use(express.static(path.join(basePath, publicHome)));
-        // Map routes
-        this.router.use((_req, _res, next) => {
-            logger.info("Time: ", Date.now());
-            next();
-        });
-        if (!mountConfig?.disableDefaultApiMount) {
-            this.expressApplication.use(this.apiBasePrefix, this.router);
-        }
-        // Swagger specs
-        this.swaggerSpec = {
-            openapi: "3.0.0",
-            info: {
-                title: "UNS API",
-                version: "1.0.0",
-            },
-            paths: {},
-            servers: this.swaggerBasePrefix ? [{ url: this.swaggerBasePrefix }] : undefined,
-        };
-    }
-    static getExternalIPv4() {
-        const interfaces = os.networkInterfaces();
-        for (const name of Object.keys(interfaces)) {
-            for (const iface of interfaces[name] || []) {
-                if (iface.family === 'IPv4' && !iface.internal) {
-                    return iface.address;
-                }
-            }
-        }
-        return null;
-    }
-    getSwaggerSpec() {
-        return this.swaggerSpec;
-    }
-    registerSwaggerDoc(path, doc) {
-        const normalizedPath = path.startsWith("/") ? path : `/${path}`;
-        this.swaggerDocs.set(normalizedPath, doc);
-        this.expressApplication.get(normalizedPath, (_req, res) => res.json(doc));
-    }
-    async start() {
-        // Listen on provided port, on all network interfaces.
-        this.server.listen(this.port);
-        this.server.on("error", (error) => {
-            if (error.syscall !== "listen") {
-                throw error;
-            }
-            const bind = typeof this.port === "string"
-                ? `Pipe ${this.port}`
-                : `Port ${this.port}`;
-            // handle specific listen errors with friendly messages
-            switch (error.code) {
-                case "EACCES":
-                    logger.error(`${bind} requires elevated privileges`);
-                    process.exit(1);
-                    break;
-                case "EADDRINUSE":
-                    logger.error(`${bind} is already in use`);
-                    process.exit(1);
-                    break;
-                default:
-                    throw error;
-            }
-        });
-        this.server.on("listening", () => {
-            App.bind(this);
-            const addressInfo = this.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 = "";
-            }
-            logger.info(`API listening on http://${ip}:${port}${this.apiBasePrefix}`);
-            const swaggerPath = buildSwaggerPath(this.swaggerBasePrefix, this.processName, this.instanceName);
-            logger.info(`Swagger openAPI on http://${ip}:${port}${swaggerPath}`);
-            this.expressApplication.get(swaggerPath, (req, res) => res.json(this.getSwaggerSpec()));
-        });
-    }
-}
+/**
+ * Module dependencies.
+ */
+import express from "express";
+import * as http from "http";
+import * as path from "path";
+import cookieParser from "cookie-parser";
+import { basePath } from "@uns-kit/core/base-path.js";
+import logger from "@uns-kit/core/logger.js";
+import os from 'os';
+import { logRequestContext } from "./request-log.js";
+const normalizeBasePrefix = (value) => {
+    if (!value)
+        return "";
+    const trimmed = value.trim();
+    if (!trimmed)
+        return "";
+    const withLeading = trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
+    return withLeading.replace(/\/+$/, "");
+};
+const buildSwaggerPath = (base, processName, instanceName) => {
+    const processSegment = `/${processName}`;
+    let baseWithProcess = base || "/";
+    if (!baseWithProcess.endsWith(processSegment)) {
+        baseWithProcess = `${baseWithProcess}${processSegment}`;
+    }
+    return `${baseWithProcess}/${instanceName}/swagger.json`.replace(/\/{2,}/g, "/");
+};
+export default class App {
+    expressApplication;
+    server;
+    port;
+    router;
+    processName;
+    instanceName;
+    apiBasePrefix;
+    swaggerBasePrefix;
+    swaggerSpec;
+    swaggerDocs = new Map();
+    constructor(port, processName, instanceName, appContext, mountConfig) {
+        this.router = express.Router();
+        this.port = port;
+        this.expressApplication = express();
+        this.server = http.createServer(this.expressApplication);
+        this.processName = processName;
+        this.instanceName = instanceName;
+        this.apiBasePrefix =
+            normalizeBasePrefix(mountConfig?.apiBasePrefix ?? process.env.UNS_API_BASE_PATH) || "/api";
+        const rawSwaggerBase = normalizeBasePrefix(mountConfig?.swaggerBasePrefix ?? process.env.UNS_SWAGGER_BASE_PATH) ||
+            this.apiBasePrefix;
+        // If someone passed ".../api" as swagger base, strip that to avoid duplicated segments
+        this.swaggerBasePrefix = rawSwaggerBase.endsWith("/api")
+            ? rawSwaggerBase.replace(/\/api\/?$/, "") || "/"
+            : rawSwaggerBase;
+        // Add context
+        this.expressApplication.use((req, _res, next) => {
+            req.appContext = appContext;
+            next();
+        });
+        // Body parser (req.body)
+        this.expressApplication.use(express.json());
+        this.expressApplication.use(express.urlencoded({ extended: false }));
+        // Add cookie parser
+        this.expressApplication.use(cookieParser());
+        // Static / public folder
+        const publicHome = process.env.PUBLIC_HOME === null || process.env.PUBLIC_HOME === undefined
+            ? "public"
+            : process.env.PUBLIC_HOME;
+        this.expressApplication.use(express.static(path.join(basePath, publicHome)));
+        // Map routes
+        this.router.use(logRequestContext);
+        if (!mountConfig?.disableDefaultApiMount) {
+            this.expressApplication.use(this.apiBasePrefix, this.router);
+        }
+        // Swagger specs
+        this.swaggerSpec = {
+            openapi: "3.0.0",
+            info: {
+                title: "UNS API",
+                version: "1.0.0",
+            },
+            paths: {},
+            servers: this.swaggerBasePrefix ? [{ url: this.swaggerBasePrefix }] : undefined,
+        };
+    }
+    static getExternalIPv4() {
+        const interfaces = os.networkInterfaces();
+        for (const name of Object.keys(interfaces)) {
+            for (const iface of interfaces[name] || []) {
+                if (iface.family === 'IPv4' && !iface.internal) {
+                    return iface.address;
+                }
+            }
+        }
+        return null;
+    }
+    getSwaggerSpec() {
+        return this.swaggerSpec;
+    }
+    registerSwaggerDoc(path, doc) {
+        const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+        this.swaggerDocs.set(normalizedPath, doc);
+        this.expressApplication.get(normalizedPath, (_req, res) => res.json(doc));
+    }
+    async start() {
+        // Listen on provided port, on all network interfaces.
+        this.server.listen(this.port);
+        this.server.on("error", (error) => {
+            if (error.syscall !== "listen") {
+                throw error;
+            }
+            const bind = typeof this.port === "string"
+                ? `Pipe ${this.port}`
+                : `Port ${this.port}`;
+            // handle specific listen errors with friendly messages
+            switch (error.code) {
+                case "EACCES":
+                    logger.error(`${bind} requires elevated privileges`);
+                    process.exit(1);
+                    break;
+                case "EADDRINUSE":
+                    logger.error(`${bind} is already in use`);
+                    process.exit(1);
+                    break;
+                default:
+                    throw error;
+            }
+        });
+        this.server.on("listening", () => {
+            App.bind(this);
+            const addressInfo = this.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 = "";
+            }
+            logger.info(`API listening on http://${ip}:${port}${this.apiBasePrefix}`);
+            const swaggerPath = buildSwaggerPath(this.swaggerBasePrefix, this.processName, this.instanceName);
+            logger.info(`Swagger openAPI on http://${ip}:${port}${swaggerPath}`);
+            this.expressApplication.get(swaggerPath, (req, res) => res.json(this.getSwaggerSpec()));
+        });
+    }
+}

package/dist/request-log.d.ts

@@ -0,0 +1,2 @@
+import type { NextFunction, Request, Response } from "express";
+export declare const logRequestContext: (req: Request, _res: Response, next: NextFunction) => void;

package/dist/request-log.js

@@ -0,0 +1,28 @@
+import jwt from "jsonwebtoken";
+import logger from "@uns-kit/core/logger.js";
+const resolveUser = (req) => {
+    const authHeader = req.headers.authorization;
+    if (!authHeader || !authHeader.startsWith("Bearer ")) {
+        return "Anonymous";
+    }
+    const token = authHeader.slice(7);
+    try {
+        const decoded = jwt.decode(token);
+        if (decoded?.email && typeof decoded.email === "string") {
+            return decoded.email;
+        }
+        return "Unknown";
+    }
+    catch {
+        return "Unknown";
+    }
+};
+export const logRequestContext = (req, _res, next) => {
+    logger.info({
+        timestamp: new Date().toISOString(),
+        user: resolveUser(req),
+        endpoint: `${req.method} ${req.originalUrl || req.url}`,
+        message: "Request received",
+    });
+    next();
+};

package/dist/routes/api.js

@@ -16,10 +16,6 @@ export default class Api {
         });
         this.upload = multer({ storage: storage });
         this.router = express.Router();
-        this.router.use((req, res, next) => {
-            logger.info("Time: ", Date.now());
-            next();
-        });
         /**
          * Open for all
          *

package/dist/uns-api-plugin.js

@@ -1,43 +1,43 @@
-import UnsProxyProcess from "@uns-kit/core/uns/uns-proxy-process.js";
-import UnsApiProxy from "./uns-api-proxy.js";
-import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
-const apiProxyRegistry = new WeakMap();
-const getApiProxies = (instance) => {
-    let proxies = apiProxyRegistry.get(instance);
-    if (!proxies) {
-        proxies = [];
-        apiProxyRegistry.set(instance, proxies);
-    }
-    return proxies;
-};
-const unsApiPlugin = ({ define }) => {
-    define({
-        async createApiProxy(instanceName, options) {
-            await this.waitForProcessConnection();
-            const internals = this;
-            const unsApiProxy = new UnsApiProxy(internals.processName, instanceName, options);
-            unsApiProxy.event.on("unsProxyProducedTopics", (event) => {
-                internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(event.producedTopics));
-            });
-            unsApiProxy.event.on("unsProxyProducedApiEndpoints", (event) => {
-                internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(event.producedApiEndpoints));
-            });
-            unsApiProxy.event.on("unsProxyProducedApiCatchAll", (event) => {
-                internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(event.producedCatchall));
-            });
-            unsApiProxy.event.on("mqttProxyStatus", (event) => {
-                const time = UnsPacket.formatToISO8601(new Date());
-                const unsMessage = { data: { time, value: event.value, uom: event.uom } };
-                UnsPacket.unsPacketFromUnsMessage(unsMessage).then((packet) => {
-                    internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(packet));
-                });
-            });
-            internals.unsApiProxies.push(unsApiProxy);
-            getApiProxies(this).push(unsApiProxy);
-            return unsApiProxy;
-        },
-    });
-};
-UnsProxyProcess.use(unsApiPlugin);
-export default unsApiPlugin;
-export { UnsApiProxy };
+import UnsProxyProcess from "@uns-kit/core/uns/uns-proxy-process.js";
+import UnsApiProxy from "./uns-api-proxy.js";
+import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
+const apiProxyRegistry = new WeakMap();
+const getApiProxies = (instance) => {
+    let proxies = apiProxyRegistry.get(instance);
+    if (!proxies) {
+        proxies = [];
+        apiProxyRegistry.set(instance, proxies);
+    }
+    return proxies;
+};
+const unsApiPlugin = ({ define }) => {
+    define({
+        async createApiProxy(instanceName, options) {
+            await this.waitForProcessConnection();
+            const internals = this;
+            const unsApiProxy = new UnsApiProxy(internals.processName, instanceName, options);
+            unsApiProxy.event.on("unsProxyProducedTopics", (event) => {
+                internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(event.producedTopics));
+            });
+            unsApiProxy.event.on("unsProxyProducedApiEndpoints", (event) => {
+                internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(event.producedApiEndpoints));
+            });
+            unsApiProxy.event.on("unsProxyProducedApiCatchAll", (event) => {
+                internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(event.producedCatchall));
+            });
+            unsApiProxy.event.on("mqttProxyStatus", (event) => {
+                const time = UnsPacket.formatToISO8601(new Date());
+                const unsMessage = { data: { time, value: event.value, uom: event.uom } };
+                UnsPacket.unsPacketFromUnsMessage(unsMessage).then((packet) => {
+                    internals.processMqttProxy.publish(event.statusTopic, JSON.stringify(packet));
+                });
+            });
+            internals.unsApiProxies.push(unsApiProxy);
+            getApiProxies(this).push(unsApiProxy);
+            return unsApiProxy;
+        },
+    });
+};
+UnsProxyProcess.use(unsApiPlugin);
+export default unsApiPlugin;
+export { UnsApiProxy };