edilkamin 1.9.0 → 1.10.0

package/dist/esm/src/library.js

@@ -186,81 +186,45 @@ const getPowerLevel = (baseURL) =>
     const info = yield deviceInfo(baseURL)(jwtToken, macAddress);
     return info.nvm.user_parameters.manual_power;
 });
-const setFan1Speed = (baseURL) => 
+const setFanSpeed = (baseURL) => 
 /**
- * Sets the speed of fan 1.
+ * Sets the speed of a fan by index.
  *
  * @param {string} jwtToken - The JWT token for authentication.
  * @param {string} macAddress - The MAC address of the device.
+ * @param {1 | 2 | 3} fanIndex - The fan index (1, 2, or 3).
  * @param {number} speed - The fan speed (0-5, 0=auto on some models).
  * @returns {Promise<unknown>} - A promise that resolves to the command response.
  */
-(jwtToken, macAddress, speed) => mqttCommand(baseURL)(jwtToken, macAddress, {
-    name: "fan_1_speed",
+(jwtToken, macAddress, fanIndex, speed) => mqttCommand(baseURL)(jwtToken, macAddress, {
+    name: `fan_${fanIndex}_speed`,
     value: speed,
 });
-const setFan2Speed = (baseURL) => 
+const getFanSpeed = (baseURL) => 
 /**
- * Sets the speed of fan 2.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @param {number} speed - The fan speed (0-5, 0=auto on some models).
- * @returns {Promise<unknown>} - A promise that resolves to the command response.
- */
-(jwtToken, macAddress, speed) => mqttCommand(baseURL)(jwtToken, macAddress, {
-    name: "fan_2_speed",
-    value: speed,
-});
-const setFan3Speed = (baseURL) => 
-/**
- * Sets the speed of fan 3.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @param {number} speed - The fan speed (0-5, 0=auto on some models).
- * @returns {Promise<unknown>} - A promise that resolves to the command response.
- */
-(jwtToken, macAddress, speed) => mqttCommand(baseURL)(jwtToken, macAddress, {
-    name: "fan_3_speed",
-    value: speed,
-});
-const getFan1Speed = (baseURL) => 
-/**
- * Retrieves the current speed of fan 1.
+ * Retrieves the current speed of a fan by index.
  *
  * @param {string} jwtToken - The JWT token for authentication.
  * @param {string} macAddress - The MAC address of the device.
+ * @param {1 | 2 | 3} fanIndex - The fan index (1, 2, or 3).
  * @returns {Promise<number>} - A promise that resolves to the fan speed.
  */
-(jwtToken, macAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    const info = yield deviceInfo(baseURL)(jwtToken, macAddress);
-    return info.nvm.user_parameters.fan_1_ventilation;
-});
-const getFan2Speed = (baseURL) => 
-/**
- * Retrieves the current speed of fan 2.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @returns {Promise<number>} - A promise that resolves to the fan speed.
- */
-(jwtToken, macAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    const info = yield deviceInfo(baseURL)(jwtToken, macAddress);
-    return info.nvm.user_parameters.fan_2_ventilation;
-});
-const getFan3Speed = (baseURL) => 
-/**
- * Retrieves the current speed of fan 3.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @returns {Promise<number>} - A promise that resolves to the fan speed.
- */
-(jwtToken, macAddress) => __awaiter(void 0, void 0, void 0, function* () {
+(jwtToken, macAddress, fanIndex) => __awaiter(void 0, void 0, void 0, function* () {
     const info = yield deviceInfo(baseURL)(jwtToken, macAddress);
-    return info.nvm.user_parameters.fan_3_ventilation;
-});
+    const fields = {
+        1: info.nvm.user_parameters.fan_1_ventilation,
+        2: info.nvm.user_parameters.fan_2_ventilation,
+        3: info.nvm.user_parameters.fan_3_ventilation,
+    };
+    return fields[fanIndex];
+});
+// Fan speed aliases for convenience
+const setFan1Speed = (baseURL) => (jwtToken, macAddress, speed) => setFanSpeed(baseURL)(jwtToken, macAddress, 1, speed);
+const setFan2Speed = (baseURL) => (jwtToken, macAddress, speed) => setFanSpeed(baseURL)(jwtToken, macAddress, 2, speed);
+const setFan3Speed = (baseURL) => (jwtToken, macAddress, speed) => setFanSpeed(baseURL)(jwtToken, macAddress, 3, speed);
+const getFan1Speed = (baseURL) => (jwtToken, macAddress) => getFanSpeed(baseURL)(jwtToken, macAddress, 1);
+const getFan2Speed = (baseURL) => (jwtToken, macAddress) => getFanSpeed(baseURL)(jwtToken, macAddress, 2);
+const getFan3Speed = (baseURL) => (jwtToken, macAddress) => getFanSpeed(baseURL)(jwtToken, macAddress, 3);
 const setAirkare = (baseURL) => 
 /**
  * Enables or disables Airkare (air quality) mode.
@@ -388,79 +352,43 @@ const getEnvironmentTemperature = (baseURL) =>
 });
 const getTargetTemperature = (baseURL) => 
 /**
- * Retrieves the target temperature value set on the device.
+ * Retrieves the target temperature for an environment zone.
  *
  * @param {string} jwtToken - The JWT token for authentication.
  * @param {string} macAddress - The MAC address of the device.
- * @returns {Promise<number>} - A promise that resolves to the target temperature (degree celsius).
+ * @param {1 | 2 | 3} envIndex - The environment zone index (1, 2, or 3).
+ * @returns {Promise<number>} - A promise that resolves to the target temperature (degrees Celsius).
  */
-(jwtToken, macAddress) => __awaiter(void 0, void 0, void 0, function* () {
+(jwtToken, macAddress, envIndex) => __awaiter(void 0, void 0, void 0, function* () {
     const info = yield deviceInfo(baseURL)(jwtToken, macAddress);
-    return info.nvm.user_parameters.enviroment_1_temperature;
+    const fields = {
+        1: info.nvm.user_parameters.enviroment_1_temperature,
+        2: info.nvm.user_parameters.enviroment_2_temperature,
+        3: info.nvm.user_parameters.enviroment_3_temperature,
+    };
+    return fields[envIndex];
 });
 const setTargetTemperature = (baseURL) => 
 /**
- * Sends a command to set the target temperature (degree celsius) of a device.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @param {number} temperature - The desired target temperature (degree celsius).
- * @returns {Promise<string>} - A promise that resolves to the command response.
- */
-(jwtToken, macAddress, temperature) => mqttCommand(baseURL)(jwtToken, macAddress, {
-    name: "enviroment_1_temperature",
-    value: temperature,
-});
-const setEnvironment2Temperature = (baseURL) => 
-/**
- * Sets the target temperature for Environment 2 zone.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @param {number} temperature - The target temperature in degrees Celsius.
- * @returns {Promise<unknown>} - A promise that resolves to the command response.
- */
-(jwtToken, macAddress, temperature) => mqttCommand(baseURL)(jwtToken, macAddress, {
-    name: "enviroment_2_temperature",
-    value: temperature,
-});
-const getEnvironment2Temperature = (baseURL) => 
-/**
- * Retrieves the target temperature for Environment 2 zone.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @returns {Promise<number>} - A promise that resolves to the temperature in degrees Celsius.
- */
-(jwtToken, macAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    const info = yield deviceInfo(baseURL)(jwtToken, macAddress);
-    return info.nvm.user_parameters.enviroment_2_temperature;
-});
-const setEnvironment3Temperature = (baseURL) => 
-/**
- * Sets the target temperature for Environment 3 zone.
+ * Sets the target temperature for an environment zone.
  *
  * @param {string} jwtToken - The JWT token for authentication.
  * @param {string} macAddress - The MAC address of the device.
- * @param {number} temperature - The target temperature in degrees Celsius.
+ * @param {1 | 2 | 3} envIndex - The environment zone index (1, 2, or 3).
+ * @param {number} temperature - The desired target temperature (degrees Celsius).
  * @returns {Promise<unknown>} - A promise that resolves to the command response.
  */
-(jwtToken, macAddress, temperature) => mqttCommand(baseURL)(jwtToken, macAddress, {
-    name: "enviroment_3_temperature",
+(jwtToken, macAddress, envIndex, temperature) => mqttCommand(baseURL)(jwtToken, macAddress, {
+    name: `enviroment_${envIndex}_temperature`,
     value: temperature,
 });
-const getEnvironment3Temperature = (baseURL) => 
-/**
- * Retrieves the target temperature for Environment 3 zone.
- *
- * @param {string} jwtToken - The JWT token for authentication.
- * @param {string} macAddress - The MAC address of the device.
- * @returns {Promise<number>} - A promise that resolves to the temperature in degrees Celsius.
- */
-(jwtToken, macAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    const info = yield deviceInfo(baseURL)(jwtToken, macAddress);
-    return info.nvm.user_parameters.enviroment_3_temperature;
-});
+// Environment temperature aliases for convenience
+const setEnvironment1Temperature = (baseURL) => (jwtToken, macAddress, temperature) => setTargetTemperature(baseURL)(jwtToken, macAddress, 1, temperature);
+const setEnvironment2Temperature = (baseURL) => (jwtToken, macAddress, temperature) => setTargetTemperature(baseURL)(jwtToken, macAddress, 2, temperature);
+const setEnvironment3Temperature = (baseURL) => (jwtToken, macAddress, temperature) => setTargetTemperature(baseURL)(jwtToken, macAddress, 3, temperature);
+const getEnvironment1Temperature = (baseURL) => (jwtToken, macAddress) => getTargetTemperature(baseURL)(jwtToken, macAddress, 1);
+const getEnvironment2Temperature = (baseURL) => (jwtToken, macAddress) => getTargetTemperature(baseURL)(jwtToken, macAddress, 2);
+const getEnvironment3Temperature = (baseURL) => (jwtToken, macAddress) => getTargetTemperature(baseURL)(jwtToken, macAddress, 3);
 const setMeasureUnit = (baseURL) => 
 /**
  * Sets the temperature measurement unit (Celsius or Fahrenheit).
@@ -613,6 +541,8 @@ const configure = (baseURL = API_URL) => ({
     getPower: getPower(baseURL),
     setPowerLevel: setPowerLevel(baseURL),
     getPowerLevel: getPowerLevel(baseURL),
+    setFanSpeed: setFanSpeed(baseURL),
+    getFanSpeed: getFanSpeed(baseURL),
     setFan1Speed: setFan1Speed(baseURL),
     setFan2Speed: setFan2Speed(baseURL),
     setFan3Speed: setFan3Speed(baseURL),
@@ -630,6 +560,8 @@ const configure = (baseURL = API_URL) => ({
     getEnvironmentTemperature: getEnvironmentTemperature(baseURL),
     getTargetTemperature: getTargetTemperature(baseURL),
     setTargetTemperature: setTargetTemperature(baseURL),
+    setEnvironment1Temperature: setEnvironment1Temperature(baseURL),
+    getEnvironment1Temperature: getEnvironment1Temperature(baseURL),
     setEnvironment2Temperature: setEnvironment2Temperature(baseURL),
     getEnvironment2Temperature: getEnvironment2Temperature(baseURL),
     setEnvironment3Temperature: setEnvironment3Temperature(baseURL),

package/dist/esm/src/library.test.js

@@ -184,6 +184,8 @@ describe("library", () => {
             "getPower",
             "setPowerLevel",
             "getPowerLevel",
+            "setFanSpeed",
+            "getFanSpeed",
             "setFan1Speed",
             "setFan2Speed",
             "setFan3Speed",
@@ -201,6 +203,8 @@ describe("library", () => {
             "getEnvironmentTemperature",
             "getTargetTemperature",
             "setTargetTemperature",
+            "setEnvironment1Temperature",
+            "getEnvironment1Temperature",
             "setEnvironment2Temperature",
             "getEnvironment2Temperature",
             "setEnvironment3Temperature",
@@ -344,7 +348,7 @@ describe("library", () => {
             },
             {
                 method: "getTargetTemperature",
-                call: (api, token, mac) => api.getTargetTemperature(token, mac),
+                call: (api, token, mac) => api.getTargetTemperature(token, mac, 1),
                 expectedResult: 22,
             },
             {
@@ -443,7 +447,7 @@ describe("library", () => {
             },
             {
                 method: "setTargetTemperature",
-                call: (api, token, mac, value) => api.setTargetTemperature(token, mac, value),
+                call: (api, token, mac, value) => api.setTargetTemperature(token, mac, 1, value),
                 payload: {
                     name: "enviroment_1_temperature",
                     value: 20,
@@ -747,7 +751,7 @@ describe("library", () => {
             };
             fetchStub.resolves(mockResponse(mockResponseData));
             const api = configure("https://example.com/api/");
-            const result = yield api.getTargetTemperature(expectedToken, "mockMacAddress");
+            const result = yield api.getTargetTemperature(expectedToken, "mockMacAddress", 1);
             assert.equal(result, 22);
         }));
         it("should work with getPelletInReserve on compressed response", () => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edilkamin",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "",
   "main": "dist/cjs/src/index.js",
   "module": "dist/esm/src/index.js",

package/src/cli.ts

@@ -219,13 +219,13 @@ const createProgram = (): Command => {
       ) => api.getEnvironmentTemperature(jwtToken, mac),
     },
     {
-      commandName: "getTargetTemperature",
-      description: "Retrieve target temperature",
+      commandName: "getEnvironment1Temperature",
+      description: "Retrieve Environment 1 target temperature",
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
         mac: string,
-      ) => api.getTargetTemperature(jwtToken, mac),
+      ) => api.getEnvironment1Temperature(jwtToken, mac),
     },
     {
       commandName: "getFan1Speed",
@@ -366,14 +366,14 @@ const createProgram = (): Command => {
       ) => api.setPowerLevel(jwtToken, mac, value),
     },
     {
-      commandName: "setTargetTemperature",
-      description: "Set the target temperature (degree celsius) for a device",
+      commandName: "setEnvironment1Temperature",
+      description: "Set Environment 1 target temperature (degrees Celsius)",
       setter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
         mac: string,
         value: number,
-      ) => api.setTargetTemperature(jwtToken, mac, value),
+      ) => api.setEnvironment1Temperature(jwtToken, mac, value),
     },
     {
       commandName: "setFan1Speed",
@@ -506,6 +506,176 @@ const createProgram = (): Command => {
     ).action((options) => executeSetter(options, setter));
   });
 
+  // Indexed getter commands (require --index parameter)
+  addLegacyOption(
+    addMacOption(
+      addAuthOptions(
+        program
+          .command("getFanSpeed")
+          .description("Retrieve fan speed by index (1-3)"),
+      ).requiredOption(
+        "-i, --index <number>",
+        "Fan index (1, 2, or 3)",
+        parseInt,
+      ),
+    ),
+  ).action(async (options) => {
+    const { username, password, mac, index, legacy = false } = options;
+    const normalizedMac = mac.replace(/:/g, "");
+    const storage = createFileStorage();
+    configureAmplify(storage);
+    let jwtToken: string;
+    try {
+      jwtToken = await getSession(false, legacy);
+    } catch {
+      if (!username) {
+        throw new Error(
+          "No session found. Please provide --username to sign in.",
+        );
+      }
+      const pwd = password || (await promptPassword());
+      jwtToken = await signIn(username, pwd, legacy);
+    }
+    const apiUrl = legacy ? OLD_API_URL : NEW_API_URL;
+    const api = configure(apiUrl);
+    const result = await api.getFanSpeed(
+      jwtToken,
+      normalizedMac,
+      index as 1 | 2 | 3,
+    );
+    console.log(JSON.stringify(result, null, 2));
+  });
+
+  addLegacyOption(
+    addMacOption(
+      addAuthOptions(
+        program
+          .command("getTargetTemperature")
+          .description(
+            "Retrieve target temperature by environment index (1-3)",
+          ),
+      ).requiredOption(
+        "-i, --index <number>",
+        "Environment index (1, 2, or 3)",
+        parseInt,
+      ),
+    ),
+  ).action(async (options) => {
+    const { username, password, mac, index, legacy = false } = options;
+    const normalizedMac = mac.replace(/:/g, "");
+    const storage = createFileStorage();
+    configureAmplify(storage);
+    let jwtToken: string;
+    try {
+      jwtToken = await getSession(false, legacy);
+    } catch {
+      if (!username) {
+        throw new Error(
+          "No session found. Please provide --username to sign in.",
+        );
+      }
+      const pwd = password || (await promptPassword());
+      jwtToken = await signIn(username, pwd, legacy);
+    }
+    const apiUrl = legacy ? OLD_API_URL : NEW_API_URL;
+    const api = configure(apiUrl);
+    const result = await api.getTargetTemperature(
+      jwtToken,
+      normalizedMac,
+      index as 1 | 2 | 3,
+    );
+    console.log(JSON.stringify(result, null, 2));
+  });
+
+  // Indexed setter commands (require --index and --value parameters)
+  addLegacyOption(
+    addMacOption(
+      addAuthOptions(
+        program
+          .command("setFanSpeed")
+          .description("Set fan speed by index (1-3)"),
+      )
+        .requiredOption(
+          "-i, --index <number>",
+          "Fan index (1, 2, or 3)",
+          parseInt,
+        )
+        .requiredOption("-v, --value <number>", "Fan speed (0-5)", parseFloat),
+    ),
+  ).action(async (options) => {
+    const { username, password, mac, index, value, legacy = false } = options;
+    const normalizedMac = mac.replace(/:/g, "");
+    const storage = createFileStorage();
+    configureAmplify(storage);
+    let jwtToken: string;
+    try {
+      jwtToken = await getSession(false, legacy);
+    } catch {
+      if (!username) {
+        throw new Error(
+          "No session found. Please provide --username to sign in.",
+        );
+      }
+      const pwd = password || (await promptPassword());
+      jwtToken = await signIn(username, pwd, legacy);
+    }
+    const apiUrl = legacy ? OLD_API_URL : NEW_API_URL;
+    const api = configure(apiUrl);
+    const result = await api.setFanSpeed(
+      jwtToken,
+      normalizedMac,
+      index as 1 | 2 | 3,
+      value,
+    );
+    console.log(JSON.stringify(result, null, 2));
+  });
+
+  addLegacyOption(
+    addMacOption(
+      addAuthOptions(
+        program
+          .command("setTargetTemperature")
+          .description("Set target temperature by environment index (1-3)"),
+      )
+        .requiredOption(
+          "-i, --index <number>",
+          "Environment index (1, 2, or 3)",
+          parseInt,
+        )
+        .requiredOption(
+          "-v, --value <number>",
+          "Temperature in degrees Celsius",
+          parseFloat,
+        ),
+    ),
+  ).action(async (options) => {
+    const { username, password, mac, index, value, legacy = false } = options;
+    const normalizedMac = mac.replace(/:/g, "");
+    const storage = createFileStorage();
+    configureAmplify(storage);
+    let jwtToken: string;
+    try {
+      jwtToken = await getSession(false, legacy);
+    } catch {
+      if (!username) {
+        throw new Error(
+          "No session found. Please provide --username to sign in.",
+        );
+      }
+      const pwd = password || (await promptPassword());
+      jwtToken = await signIn(username, pwd, legacy);
+    }
+    const apiUrl = legacy ? OLD_API_URL : NEW_API_URL;
+    const api = configure(apiUrl);
+    const result = await api.setTargetTemperature(
+      jwtToken,
+      normalizedMac,
+      index as 1 | 2 | 3,
+      value,
+    );
+    console.log(JSON.stringify(result, null, 2));
+  });
+
   // Command: register
   addLegacyOption(
     addAuthOptions(

package/src/library.test.ts

@@ -211,6 +211,8 @@ describe("library", () => {
       "getPower",
       "setPowerLevel",
       "getPowerLevel",
+      "setFanSpeed",
+      "getFanSpeed",
       "setFan1Speed",
       "setFan2Speed",
       "setFan3Speed",
@@ -228,6 +230,8 @@ describe("library", () => {
       "getEnvironmentTemperature",
       "getTargetTemperature",
       "setTargetTemperature",
+      "setEnvironment1Temperature",
+      "getEnvironment1Temperature",
       "setEnvironment2Temperature",
       "getEnvironment2Temperature",
       "setEnvironment3Temperature",
@@ -391,7 +395,7 @@ describe("library", () => {
       {
         method: "getTargetTemperature",
         call: (api: ReturnType<typeof configure>, token: string, mac: string) =>
-          api.getTargetTemperature(token, mac),
+          api.getTargetTemperature(token, mac, 1),
         expectedResult: 22,
       },
       {
@@ -529,7 +533,7 @@ describe("library", () => {
           token: string,
           mac: string,
           value: number,
-        ) => api.setTargetTemperature(token, mac, value),
+        ) => api.setTargetTemperature(token, mac, 1, value),
         payload: {
           name: "enviroment_1_temperature",
           value: 20,
@@ -961,6 +965,7 @@ describe("library", () => {
       const result = await api.getTargetTemperature(
         expectedToken,
         "mockMacAddress",
+        1,
       );
 
       assert.equal(result, 22);