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

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) {
@@ -170551,6 +170571,70 @@ var MediaPlayerKeypadInputServer = class extends KeypadInputServer {
   }
 };
 
+// src/matter/behaviors/media-input-server.ts
+init_home_assistant_entity_behavior();
+var MediaInputServerBase = class extends MediaInputServer {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update);
+  }
+  update(entity) {
+    if (!entity.state) {
+      return;
+    }
+    const config10 = this.state.config;
+    let source_idx = 0;
+    const sourceList = config10.getSourceList(entity.state, this.agent)?.sort();
+    const inputList = sourceList?.map((source) => ({
+      index: source_idx++,
+      inputType: MediaInput3.InputType.Other,
+      name: source,
+      description: source
+    }));
+    const currentSource = config10.getCurrentSource(entity.state, this.agent);
+    let currentInput = sourceList?.indexOf(currentSource ?? "");
+    if (currentInput === -1 || currentInput == null) {
+      currentInput = 0;
+    }
+    applyPatchState(this.state, {
+      inputList,
+      currentInput
+    });
+  }
+  selectInput(request) {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const target = this.state.inputList[request.index];
+    homeAssistant.callAction(
+      this.state.config.selectSource(target.name, this.agent)
+    );
+  }
+  showInputStatus() {
+  }
+  hideInputStatus() {
+  }
+};
+((MediaInputServerBase2) => {
+  class State extends MediaInputServer.State {
+    config;
+  }
+  MediaInputServerBase2.State = State;
+})(MediaInputServerBase || (MediaInputServerBase = {}));
+function MediaInputServer2(config10) {
+  return MediaInputServerBase.set({ config: config10 });
+}
+
+// src/matter/endpoints/legacy/media-player/behaviors/media-player-media-input-server.ts
+var MediaPlayerMediaInputServer = MediaInputServer2({
+  getCurrentSource: (entity) => entity.attributes.source,
+  getSourceList: (entity) => entity.attributes.source_list,
+  selectSource: (source) => ({
+    action: "media_player.select_source",
+    data: { source }
+  })
+});
+
 // src/matter/endpoints/legacy/media-player/behaviors/media-player-media-playback-server.ts
 init_home_assistant_entity_behavior();
 var MediaPlayerMediaPlaybackServer = class extends MediaPlaybackServer {
@@ -170668,6 +170752,9 @@ function VideoPlayerDevice(homeAssistantEntity) {
   if (supportsPlay || supportsPause) {
     device = device.with(MediaPlayerMediaPlaybackServer);
   }
+  if (testBit(supportedFeatures, MediaPlayerDeviceFeature.SELECT_SOURCE)) {
+    device = device.with(MediaPlayerMediaInputServer);
+  }
   return device.set({ homeAssistantEntity });
 }
 
@@ -170794,70 +170881,6 @@ var MediaPlayerLevelControlServer = SpeakerLevelControlServer({
   }
 });
 
-// src/matter/behaviors/media-input-server.ts
-init_home_assistant_entity_behavior();
-var MediaInputServerBase = class extends MediaInputServer {
-  async initialize() {
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
-  }
-  update(entity) {
-    if (!entity.state) {
-      return;
-    }
-    const config10 = this.state.config;
-    let source_idx = 0;
-    const sourceList = config10.getSourceList(entity.state, this.agent)?.sort();
-    const inputList = sourceList?.map((source) => ({
-      index: source_idx++,
-      inputType: MediaInput3.InputType.Other,
-      name: source,
-      description: source
-    }));
-    const currentSource = config10.getCurrentSource(entity.state, this.agent);
-    let currentInput = sourceList?.indexOf(currentSource ?? "");
-    if (currentInput === -1 || currentInput == null) {
-      currentInput = 0;
-    }
-    applyPatchState(this.state, {
-      inputList,
-      currentInput
-    });
-  }
-  selectInput(request) {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const target = this.state.inputList[request.index];
-    homeAssistant.callAction(
-      this.state.config.selectSource(target.name, this.agent)
-    );
-  }
-  showInputStatus() {
-  }
-  hideInputStatus() {
-  }
-};
-((MediaInputServerBase2) => {
-  class State extends MediaInputServer.State {
-    config;
-  }
-  MediaInputServerBase2.State = State;
-})(MediaInputServerBase || (MediaInputServerBase = {}));
-function MediaInputServer2(config10) {
-  return MediaInputServerBase.set({ config: config10 });
-}
-
-// src/matter/endpoints/legacy/media-player/behaviors/media-player-media-input-server.ts
-var MediaPlayerMediaInputServer = MediaInputServer2({
-  getCurrentSource: (entity) => entity.attributes.source,
-  getSourceList: (entity) => entity.attributes.source_list,
-  selectSource: (source) => ({
-    action: "media_player.select_source",
-    data: { source }
-  })
-});
-
 // src/matter/endpoints/legacy/media-player/behaviors/media-player-on-off-server.ts
 var MediaPlayerOnOffServer = OnOffServer2({
   isOn: (state) => {
@@ -177003,6 +177026,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"]);
 }