@riddix/hamh 2.1.0-alpha.419 → 2.1.0-alpha.420

package/dist/backend/cli.js

@@ -149857,8 +149857,9 @@ var WebSocketApi = class {
   setDiagnosticService(service) {
     this.diagnosticService = service;
   }
-  attach(server) {
-    this.wss = new WebSocketServer2({ server, path: "/api/ws" });
+  attach(server, basePath = "/") {
+    const wsPath = `${basePath === "/" ? "" : basePath}/api/ws`;
+    this.wss = new WebSocketServer2({ server, path: wsPath });
     this.wss.on("connection", (ws2) => {
       this.clients.add(ws2);
       this.log.debug(`WebSocket client connected. Total: ${this.clients.size}`);
@@ -149899,7 +149900,7 @@ var WebSocketApi = class {
     this.pingInterval = setInterval(() => {
       this.broadcast({ type: "ping" });
     }, 3e4);
-    this.log.info("WebSocket server attached at /api/ws");
+    this.log.info(`WebSocket server attached at ${wsPath}`);
   }
   handleMessage(ws2, message) {
     switch (message.type) {
@@ -150062,7 +150063,15 @@ var WebApi = class extends Service {
         })
       );
     }
-    this.app = express14().use(...middlewares).use("/api", api).use(webUi(this.props.webUiDist));
+    const appRouter = express14.Router();
+    appRouter.use(...middlewares).use("/api", api).use(webUi(this.props.webUiDist));
+    this.app = express14();
+    const basePath = this.props.basePath;
+    if (basePath !== "/") {
+      this.log.info(`Base path configured: ${basePath}`);
+      this.app.get("/", (_req, res) => res.redirect(basePath));
+    }
+    this.app.use(basePath, appRouter);
   }
   async dispose() {
     this.wsApi.close();
@@ -150101,7 +150110,7 @@ var WebApi = class extends Service {
         resolve4(server);
       });
     });
-    this.wsApi.attach(this.server);
+    this.wsApi.attach(this.server, this.props.basePath);
   }
 };
 
@@ -150492,6 +150501,7 @@ var Options = class {
       webUiDist: this.startOptions.webUiDist,
       version: resolveAppVersion(),
       storageLocation: this.resolveStorageLocation(),
+      basePath: normalizeBasePath(this.startOptions.httpBasePath),
       auth
     };
   }
@@ -150514,6 +150524,16 @@ var Options = class {
     };
   }
 };
+function normalizeBasePath(val) {
+  let p = val?.trim() ?? "/";
+  if (!p.startsWith("/")) {
+    p = `/${p}`;
+  }
+  if (p.length > 1 && p.endsWith("/")) {
+    p = p.slice(0, -1);
+  }
+  return p;
+}
 function notEmpty(val) {
   const value = val?.trim();
   if (value == null || value.length === 0) {
@@ -177003,6 +177023,9 @@ function startOptionsBuilder(yargs2) {
   }).option("http-auth-password", {
     type: "string",
     description: "Password for HTTP basic authentication (optional)"
+  }).option("http-base-path", {
+    type: "string",
+    description: "Base path for the web interface and API when served behind a reverse proxy under a subfolder (e.g. /matter). Defaults to /"
   }).demandOption(["home-assistant-url", "home-assistant-access-token"]);
 }