@riddix/hamh 2.1.0-alpha.475 → 2.1.0-alpha.477

package/dist/backend/cli.js

@@ -149842,7 +149842,7 @@ import express13 from "express";
 
 // src/plugins/plugin-installer.ts
 init_esm();
-import { exec } from "node:child_process";
+import { execFile } from "node:child_process";
 import * as fs4 from "node:fs";
 import * as path4 from "node:path";
 var logger142 = Logger.get("PluginInstaller");
@@ -149887,8 +149887,9 @@ var PluginInstaller = class {
     }
     logger142.info(`Installing plugin: ${packageName}`);
     return new Promise((resolve4) => {
-      exec(
-        `npm install ${packageName} --save`,
+      execFile(
+        "npm",
+        ["install", packageName, "--save"],
         {
           cwd: this.pluginDir,
           timeout: 12e4,
@@ -149930,8 +149931,9 @@ var PluginInstaller = class {
     }
     logger142.info(`Uninstalling plugin: ${packageName}`);
     return new Promise((resolve4) => {
-      exec(
-        `npm uninstall ${packageName} --save`,
+      execFile(
+        "npm",
+        ["uninstall", packageName, "--save"],
         {
           cwd: this.pluginDir,
           timeout: 6e4
@@ -150326,12 +150328,12 @@ function settingsApi(settingsStorage, envAuth) {
 
 // src/api/system-api.ts
 init_esm();
-import { exec as exec2 } from "node:child_process";
+import { exec } from "node:child_process";
 import os2 from "node:os";
 import { promisify } from "node:util";
 import v8 from "node:v8";
 import express14 from "express";
-var execAsync = promisify(exec2);
+var execAsync = promisify(exec);
 var logger144 = Logger.get("SystemApi");
 function detectEnvironment2() {
   if (process.env.SUPERVISOR_TOKEN || process.env.HASSIO_TOKEN) {
@@ -164192,14 +164194,17 @@ var SafePluginRunner = class {
       );
       return void 0;
     }
+    const timeout = this.createTimeout(pluginName, operation, timeoutMs);
     try {
       const result = await Promise.race([
         Promise.resolve().then(fn),
-        this.createTimeout(pluginName, operation, timeoutMs)
+        timeout.promise
       ]);
+      timeout.clear();
       state.failures = 0;
       return result;
     } catch (error) {
+      timeout.clear();
       state.failures++;
       state.lastError = error instanceof Error ? error.message : String(error);
       logger158.error(
@@ -164247,8 +164252,9 @@ var SafePluginRunner = class {
     return new Map(this.states);
   }
   createTimeout(pluginName, operation, timeoutMs) {
-    return new Promise((_, reject) => {
-      setTimeout(() => {
+    let timer;
+    const promise = new Promise((_, reject) => {
+      timer = setTimeout(() => {
         reject(
           new Error(
             `Plugin "${pluginName}" timed out during ${operation} after ${timeoutMs}ms`
@@ -164256,6 +164262,7 @@ var SafePluginRunner = class {
         );
       }, timeoutMs);
     });
+    return { promise, clear: () => clearTimeout(timer) };
   }
 };
 
@@ -170972,9 +170979,14 @@ var LightOnOffServer = OnOffServer2({
   turnOn: (_value, agent) => {
     const entityId = agent.get(HomeAssistantEntityBehavior).entityId;
     const staged = consumePendingColorStaging(entityId);
+    if (entityId.startsWith("light.")) {
+      return {
+        action: "light.turn_on",
+        data: staged
+      };
+    }
     return {
-      action: "light.turn_on",
-      data: staged
+      action: "homeassistant.turn_on"
     };
   },
   turnOff: () => ({
@@ -177310,7 +177322,16 @@ var BridgeEndpointManager = class extends Service {
         );
         return;
       }
-      const endpoint = new Endpoint(type, { id: `plugin_${device.id}` });
+      const initialState = {
+        pluginDevice: { device, pluginName }
+      };
+      for (const cluster2 of device.clusters) {
+        initialState[cluster2.clusterId] = cluster2.attributes;
+      }
+      const configuredType = type.set(initialState);
+      const endpoint = new Endpoint(configuredType, {
+        id: `plugin_${device.id}`
+      });
       try {
         await this.root.add(endpoint);
         this.pluginEndpoints.set(device.id, endpoint);
@@ -177338,6 +177359,23 @@ var BridgeEndpointManager = class extends Service {
         this.pluginEndpoints.delete(deviceId);
       }
     };
+    this.pluginManager.onDeviceStateUpdated = (pluginName, deviceId, clusterId3, attributes7) => {
+      const endpoint = this.pluginEndpoints.get(deviceId);
+      if (!endpoint) return;
+      const behaviorType = endpoint.type.behaviors[clusterId3];
+      if (!behaviorType) {
+        this.log.debug(
+          `Plugin "${pluginName}": cluster "${clusterId3}" not found on device "${deviceId}"`
+        );
+        return;
+      }
+      endpoint.setStateOf(behaviorType, attributes7).catch((e) => {
+        this.log.warn(
+          `Plugin "${pluginName}": failed to update "${clusterId3}" on "${deviceId}":`,
+          e
+        );
+      });
+    };
   }
   async startPlugins() {
     if (!this.pluginManager) return;