edilkamin 1.6.1 → 1.7.2

package/src/cli.ts

@@ -3,7 +3,9 @@ import { Command } from "commander";
 import readline from "readline";
 
 import { version } from "../package.json";
-import { configure, signIn } from "./library";
+import { NEW_API_URL, OLD_API_URL } from "./constants";
+import { configure, configureAmplify, getSession, signIn } from "./library";
+import { clearSession, createFileStorage } from "./token-storage";
 
 const promptPassword = (): Promise<string> => {
   const rl = readline.createInterface({
@@ -29,12 +31,16 @@ const promptPassword = (): Promise<string> => {
 
 /**
  * Adds common options (username and password) to a command.
+ * Username is optional if a session already exists.
  * @param command The command to which options should be added.
  * @returns The command with options added.
  */
 const addAuthOptions = (command: Command): Command =>
   command
-    .requiredOption("-u, --username <username>", "Username")
+    .option(
+      "-u, --username <username>",
+      "Username (optional if session exists)",
+    )
     .option("-p, --password <password>", "Password");
 
 /**
@@ -45,25 +51,54 @@ const addAuthOptions = (command: Command): Command =>
 const addMacOption = (command: Command): Command =>
   command.requiredOption("-m, --mac <macAddress>", "MAC address of the device");
 
+/**
+ * Adds legacy API option to a command.
+ * @param command The command to which the legacy option should be added.
+ * @returns The command with the legacy option added.
+ */
+const addLegacyOption = (command: Command): Command =>
+  command.option("--legacy", "Use legacy API endpoint (old AWS Gateway)");
+
 /**
  * Handles common authentication and API initialization logic.
+ * Tries to use existing session first, falls back to sign-in if needed.
  * @param options The options passed from the CLI command.
  * @returns An object containing the normalized MAC, JWT token, and configured API instance.
  */
 const initializeCommand = async (options: {
-  username: string;
+  username?: string;
   password?: string;
   mac: string;
+  legacy?: boolean;
 }): Promise<{
   normalizedMac: string;
   jwtToken: string;
   api: ReturnType<typeof configure>;
 }> => {
-  const { username, password, mac } = options;
+  const { username, password, mac, legacy = false } = options;
   const normalizedMac = mac.replace(/:/g, "");
-  const pwd = password || (await promptPassword());
-  const jwtToken = await signIn(username, pwd);
-  const api = configure();
+
+  // Initialize file storage for session persistence
+  const storage = createFileStorage();
+  configureAmplify(storage);
+
+  let jwtToken: string;
+  try {
+    // Try to get existing session first
+    jwtToken = await getSession(false, legacy);
+  } catch {
+    // No session, need to sign in
+    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);
   return { normalizedMac, jwtToken, api };
 };
 
@@ -73,12 +108,17 @@ const initializeCommand = async (options: {
  * @param getter A function to call on the configured API object.
  */
 const executeGetter = async (
-  options: { username: string; password?: string; mac: string },
+  options: {
+    username?: string;
+    password?: string;
+    mac: string;
+    legacy?: boolean;
+  },
   getter: (
     api: ReturnType<typeof configure>,
     jwtToken: string,
-    mac: string
-  ) => Promise<unknown>
+    mac: string,
+  ) => Promise<unknown>,
 ): Promise<void> => {
   const { normalizedMac, jwtToken, api } = await initializeCommand(options);
   const result = await getter(api, jwtToken, normalizedMac);
@@ -91,13 +131,19 @@ const executeGetter = async (
  * @param setter A function to call on the configured API object.
  */
 const executeSetter = async (
-  options: { username: string; password?: string; mac: string; value: number },
+  options: {
+    username?: string;
+    password?: string;
+    mac: string;
+    value: number;
+    legacy?: boolean;
+  },
   setter: (
     api: ReturnType<typeof configure>,
     jwtToken: string,
     mac: string,
-    value: number
-  ) => Promise<unknown>
+    value: number,
+  ) => Promise<unknown>,
 ): Promise<void> => {
   const { normalizedMac, jwtToken, api } = await initializeCommand(options);
   const result = await setter(api, jwtToken, normalizedMac, options.value);
@@ -111,14 +157,29 @@ const createProgram = (): Command => {
     .description("CLI tool for interacting with the Edilkamin API")
     .version(version);
   // Command: signIn
-  addAuthOptions(
-    program.command("signIn").description("Sign in and retrieve a JWT token")
-  ).action(async (options) => {
-    const { username, password } = options;
-    const pwd = password || (await promptPassword());
-    const jwtToken = await signIn(username, pwd);
-    console.log("JWT Token:", jwtToken);
-  });
+  program
+    .command("signIn")
+    .description("Sign in and retrieve a JWT token")
+    .requiredOption("-u, --username <username>", "Username")
+    .option("-p, --password <password>", "Password")
+    .action(async (options) => {
+      const { username, password } = options;
+      // Initialize file storage for session persistence
+      const storage = createFileStorage();
+      configureAmplify(storage);
+      const pwd = password || (await promptPassword());
+      const jwtToken = await signIn(username, pwd);
+      console.log("JWT Token:", jwtToken);
+    });
+
+  // Command: logout
+  program
+    .command("logout")
+    .description("Clear stored session")
+    .action(async () => {
+      await clearSession();
+      console.log("Session cleared successfully");
+    });
   // Generic getter commands
   [
     {
@@ -127,7 +188,7 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.deviceInfo(jwtToken, mac),
     },
     {
@@ -136,7 +197,7 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.getPower(jwtToken, mac),
     },
     {
@@ -145,7 +206,7 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.getEnvironmentTemperature(jwtToken, mac),
     },
     {
@@ -154,12 +215,14 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.getTargetTemperature(jwtToken, mac),
     },
   ].forEach(({ commandName, description, getter }) => {
-    addMacOption(
-      addAuthOptions(program.command(commandName).description(description))
+    addLegacyOption(
+      addMacOption(
+        addAuthOptions(program.command(commandName).description(description)),
+      ),
     ).action((options) => executeGetter(options, getter));
   });
   // Generic setter commands
@@ -171,7 +234,7 @@ const createProgram = (): Command => {
         api: ReturnType<typeof configure>,
         jwtToken: string,
         mac: string,
-        value: number
+        value: number,
       ) => api.setPower(jwtToken, mac, value),
     },
     {
@@ -181,17 +244,113 @@ const createProgram = (): Command => {
         api: ReturnType<typeof configure>,
         jwtToken: string,
         mac: string,
-        value: number
+        value: number,
       ) => api.setTargetTemperature(jwtToken, mac, value),
     },
   ].forEach(({ commandName, description, setter }) => {
-    addMacOption(
-      addAuthOptions(
-        program.command(commandName).description(description)
-      ).requiredOption("-v, --value <number>", "Value to set", parseFloat)
+    addLegacyOption(
+      addMacOption(
+        addAuthOptions(
+          program.command(commandName).description(description),
+        ).requiredOption("-v, --value <number>", "Value to set", parseFloat),
+      ),
     ).action((options) => executeSetter(options, setter));
   });
 
+  // Command: register
+  addLegacyOption(
+    addAuthOptions(
+      program
+        .command("register")
+        .description("Register a device with your account"),
+    ),
+  )
+    .requiredOption("-m, --mac <macAddress>", "MAC address of the device")
+    .requiredOption("-s, --serial <serialNumber>", "Device serial number")
+    .requiredOption("-n, --name <deviceName>", "Device name")
+    .requiredOption("-r, --room <deviceRoom>", "Room name")
+    .action(async (options) => {
+      const {
+        username,
+        password,
+        mac,
+        serial,
+        name,
+        room,
+        legacy = false,
+      } = options;
+      const normalizedMac = mac.replace(/:/g, "");
+
+      // Initialize file storage for session persistence
+      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.registerDevice(
+        jwtToken,
+        normalizedMac,
+        serial,
+        name,
+        room,
+      );
+      console.log("Device registered successfully:");
+      console.log(JSON.stringify(result, null, 2));
+    });
+
+  // Command: editDevice
+  addLegacyOption(
+    addMacOption(
+      addAuthOptions(
+        program
+          .command("editDevice")
+          .description("Update device name and room"),
+      ),
+    ),
+  )
+    .requiredOption("-n, --name <deviceName>", "Device name")
+    .requiredOption("-r, --room <deviceRoom>", "Room name")
+    .action(async (options) => {
+      const { username, password, mac, name, room, legacy = false } = options;
+      const normalizedMac = mac.replace(/:/g, "");
+
+      // Initialize file storage for session persistence
+      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.editDevice(jwtToken, normalizedMac, name, room);
+      console.log("Device updated successfully:");
+      console.log(JSON.stringify(result, null, 2));
+    });
+
   return program;
 };
 

package/src/constants.ts

@@ -1,3 +1,6 @@
-const API_URL = "https://the-mind-api.edilkamin.com/";
+const OLD_API_URL =
+  "https://fxtj7xkgc6.execute-api.eu-central-1.amazonaws.com/prod/";
+const NEW_API_URL = "https://the-mind-api.edilkamin.com/";
+const API_URL = NEW_API_URL;
 
-export { API_URL };
+export { API_URL, NEW_API_URL, OLD_API_URL };

package/src/index.ts

@@ -1,10 +1,22 @@
 import { configure } from "./library";
 
-export { API_URL } from "./constants";
-export { configure, signIn } from "./library";
+export { decompressBuffer, isBuffer, processResponse } from "./buffer-utils";
+export { API_URL, NEW_API_URL, OLD_API_URL } from "./constants";
+export { configure, getSession, signIn } from "./library";
 export {
+  serialNumberDisplay,
+  serialNumberFromHex,
+  serialNumberToHex,
+} from "./serial-utils";
+export { clearSession } from "./token-storage";
+export {
+  BufferEncodedType,
   CommandsType,
+  DeviceAssociationBody,
+  DeviceAssociationResponse,
+  DeviceInfoRawType,
   DeviceInfoType,
+  EditDeviceAssociationBody,
   StatusType,
   TemperaturesType,
   UserParametersType,
@@ -12,6 +24,8 @@ export {
 
 export const {
   deviceInfo,
+  registerDevice,
+  editDevice,
   setPower,
   setPowerOff,
   setPowerOn,