edilkamin 1.6.2 → 1.7.3

package/dist/esm/token-storage.js

@@ -0,0 +1,81 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { promises as fs } from "fs";
+import * as os from "os";
+import * as path from "path";
+const TOKEN_DIR = path.join(os.homedir(), ".edilkamin");
+const TOKEN_FILE = path.join(TOKEN_DIR, "session.json");
+/**
+ * Custom storage adapter for AWS Amplify that persists to file system.
+ * Used for CLI to maintain sessions between invocations.
+ */
+export const createFileStorage = () => {
+    let cache = {};
+    let loaded = false;
+    const ensureDir = () => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield fs.mkdir(TOKEN_DIR, { recursive: true, mode: 0o700 });
+        }
+        catch (_a) {
+            // Directory may already exist
+        }
+    });
+    const load = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (loaded)
+            return;
+        try {
+            const data = yield fs.readFile(TOKEN_FILE, "utf-8");
+            cache = JSON.parse(data);
+        }
+        catch (_a) {
+            cache = {};
+        }
+        loaded = true;
+    });
+    const save = () => __awaiter(void 0, void 0, void 0, function* () {
+        yield ensureDir();
+        yield fs.writeFile(TOKEN_FILE, JSON.stringify(cache), {
+            encoding: "utf-8",
+            mode: 0o600,
+        });
+    });
+    return {
+        setItem: (key, value) => __awaiter(void 0, void 0, void 0, function* () {
+            yield load();
+            cache[key] = value;
+            yield save();
+        }),
+        getItem: (key) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            yield load();
+            return (_a = cache[key]) !== null && _a !== void 0 ? _a : null;
+        }),
+        removeItem: (key) => __awaiter(void 0, void 0, void 0, function* () {
+            yield load();
+            delete cache[key];
+            yield save();
+        }),
+        clear: () => __awaiter(void 0, void 0, void 0, function* () {
+            cache = {};
+            yield save();
+        }),
+    };
+};
+/**
+ * Clears all stored session data.
+ */
+export const clearSession = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        yield fs.unlink(TOKEN_FILE);
+    }
+    catch (_a) {
+        // File may not exist
+    }
+});

package/eslint.config.mjs

@@ -1,4 +1,6 @@
 import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import prettierConfig from "eslint-config-prettier";
+import prettierPlugin from "eslint-plugin-prettier";
 import simpleImportSort from "eslint-plugin-simple-import-sort";
 import globals from "globals";
 import tsParser from "@typescript-eslint/parser";
@@ -19,7 +21,7 @@ const compat = new FlatCompat({
 export default [
   ...compat.extends(
     "eslint:recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
   ),
   {
     plugins: {
@@ -32,4 +34,13 @@ export default [
       "simple-import-sort/exports": "error",
     },
   },
+  prettierConfig,
+  {
+    plugins: {
+      prettier: prettierPlugin,
+    },
+    rules: {
+      "prettier/prettier": "error",
+    },
+  },
 ];

package/package.json

@@ -1,10 +1,22 @@
 {
   "name": "edilkamin",
-  "version": "1.6.2",
+  "version": "1.7.3",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
+    }
+  },
   "scripts": {
     "cli": "ts-node src/cli.ts",
     "cli:debug": "node --inspect --require ts-node/register/transpile-only src/cli.ts",
@@ -42,7 +54,6 @@
   },
   "dependencies": {
     "aws-amplify": "^6.10.0",
-    "axios": "^1.13.2",
     "pako": "^2.1.0"
   },
   "devDependencies": {
@@ -54,13 +65,14 @@
     "@types/sinon": "^17.0.3",
     "@typescript-eslint/eslint-plugin": "^8.17.0",
     "@typescript-eslint/parser": "^8.17.0",
+    "esbuild": "^0.27.1",
     "eslint": "^9.16.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "mocha": "^11.7.5",
     "nyc": "^17.1.0",
-    "prettier": "^2.5.1",
+    "prettier": "^3.7.4",
     "sinon": "^19.0.2",
     "ts-node": "^10.9.1",
     "typedoc": "^0.28.15",

package/src/browser-bundle.test.ts

@@ -0,0 +1,21 @@
+import { strict as assert } from "assert";
+import * as esbuild from "esbuild";
+
+describe("browser-bundle", () => {
+  it("should bundle for browser without Node.js built-ins", async () => {
+    // This test verifies that the library can be bundled for browser environments
+    // without requiring Node.js built-in modules (fs, os, path).
+    // If this test fails, it means Node.js-only code has leaked into the main exports.
+    const result = await esbuild.build({
+      entryPoints: ["dist/esm/index.js"],
+      platform: "browser",
+      bundle: true,
+      write: false,
+      // External dependencies that are expected (real deps + assert which is used for validation)
+      external: ["aws-amplify", "aws-amplify/*", "pako", "assert"],
+      logLevel: "silent",
+    });
+    // If we get here without error, the bundle succeeded
+    assert.ok(result.outputFiles.length > 0, "Bundle should produce output");
+  });
+});

package/src/buffer-utils.test.ts

@@ -8,7 +8,7 @@ import { decompressBuffer, isBuffer, processResponse } from "./buffer-utils";
  * Helper to create a gzip-compressed Buffer object for testing.
  */
 const createGzippedBuffer = (
-  data: unknown
+  data: unknown,
 ): { type: "Buffer"; data: number[] } => {
   const json = JSON.stringify(data);
   const compressed = pako.gzip(json);

package/src/cli.ts

@@ -4,7 +4,8 @@ import readline from "readline";
 
 import { version } from "../package.json";
 import { NEW_API_URL, OLD_API_URL } from "./constants";
-import { configure, signIn } from "./library";
+import { configure, configureAmplify, getSession, signIn } from "./library";
+import { clearSession, createFileStorage } from "./token-storage";
 
 const promptPassword = (): Promise<string> => {
   const rl = readline.createInterface({
@@ -30,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");
 
 /**
@@ -56,11 +61,12 @@ const addLegacyOption = (command: Command): Command =>
 
 /**
  * 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;
@@ -71,8 +77,26 @@ const initializeCommand = async (options: {
 }> => {
   const { username, password, mac, legacy = false } = options;
   const normalizedMac = mac.replace(/:/g, "");
-  const pwd = password || (await promptPassword());
-  const jwtToken = await signIn(username, pwd, legacy);
+
+  // 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 };
@@ -85,7 +109,7 @@ const initializeCommand = async (options: {
  */
 const executeGetter = async (
   options: {
-    username: string;
+    username?: string;
     password?: string;
     mac: string;
     legacy?: boolean;
@@ -93,8 +117,8 @@ const executeGetter = async (
   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);
@@ -108,7 +132,7 @@ const executeGetter = async (
  */
 const executeSetter = async (
   options: {
-    username: string;
+    username?: string;
     password?: string;
     mac: string;
     value: number;
@@ -118,8 +142,8 @@ const executeSetter = async (
     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);
@@ -133,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
   [
     {
@@ -149,7 +188,7 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.deviceInfo(jwtToken, mac),
     },
     {
@@ -158,7 +197,7 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.getPower(jwtToken, mac),
     },
     {
@@ -167,7 +206,7 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.getEnvironmentTemperature(jwtToken, mac),
     },
     {
@@ -176,14 +215,14 @@ const createProgram = (): Command => {
       getter: (
         api: ReturnType<typeof configure>,
         jwtToken: string,
-        mac: string
+        mac: string,
       ) => api.getTargetTemperature(jwtToken, mac),
     },
   ].forEach(({ commandName, description, getter }) => {
     addLegacyOption(
       addMacOption(
-        addAuthOptions(program.command(commandName).description(description))
-      )
+        addAuthOptions(program.command(commandName).description(description)),
+      ),
     ).action((options) => executeGetter(options, getter));
   });
   // Generic setter commands
@@ -195,7 +234,7 @@ const createProgram = (): Command => {
         api: ReturnType<typeof configure>,
         jwtToken: string,
         mac: string,
-        value: number
+        value: number,
       ) => api.setPower(jwtToken, mac, value),
     },
     {
@@ -205,16 +244,16 @@ const createProgram = (): Command => {
         api: ReturnType<typeof configure>,
         jwtToken: string,
         mac: string,
-        value: number
+        value: number,
       ) => api.setTargetTemperature(jwtToken, mac, value),
     },
   ].forEach(({ commandName, description, setter }) => {
     addLegacyOption(
       addMacOption(
         addAuthOptions(
-          program.command(commandName).description(description)
-        ).requiredOption("-v, --value <number>", "Value to set", parseFloat)
-      )
+          program.command(commandName).description(description),
+        ).requiredOption("-v, --value <number>", "Value to set", parseFloat),
+      ),
     ).action((options) => executeSetter(options, setter));
   });
 
@@ -223,8 +262,8 @@ const createProgram = (): Command => {
     addAuthOptions(
       program
         .command("register")
-        .description("Register a device with your account")
-    )
+        .description("Register a device with your account"),
+    ),
   )
     .requiredOption("-m, --mac <macAddress>", "MAC address of the device")
     .requiredOption("-s, --serial <serialNumber>", "Device serial number")
@@ -241,8 +280,24 @@ const createProgram = (): Command => {
         legacy = false,
       } = options;
       const normalizedMac = mac.replace(/:/g, "");
-      const pwd = password || (await promptPassword());
-      const jwtToken = await signIn(username, pwd, legacy);
+
+      // 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(
@@ -250,7 +305,7 @@ const createProgram = (): Command => {
         normalizedMac,
         serial,
         name,
-        room
+        room,
       );
       console.log("Device registered successfully:");
       console.log(JSON.stringify(result, null, 2));
@@ -260,17 +315,35 @@ const createProgram = (): Command => {
   addLegacyOption(
     addMacOption(
       addAuthOptions(
-        program.command("editDevice").description("Update device name and room")
-      )
-    )
+        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, "");
-      const pwd = password || (await promptPassword());
-      const jwtToken = await signIn(username, pwd, legacy);
+
+      // 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);

package/src/configureAmplify.test.ts

@@ -0,0 +1,47 @@
+import { strict as assert } from "assert";
+import sinon from "sinon";
+
+import { configureAmplify } from "../src/library";
+
+/**
+ * This test file specifically tests the configureAmplify function with custom storage.
+ * It tests line 61 in library.ts:
+ * cognitoUserPoolsTokenProvider.setKeyValueStorage(storage)
+ *
+ * IMPORTANT: This file is named to run BEFORE library.test.ts (alphabetically)
+ * to ensure amplifyConfigured is still false when these tests run.
+ */
+
+describe("configureAmplify", () => {
+  it("should configure Amplify with custom storage", () => {
+    const mockStorage = {
+      setItem: sinon.stub().resolves(),
+      getItem: sinon.stub().resolves(null),
+      removeItem: sinon.stub().resolves(),
+      clear: sinon.stub().resolves(),
+    };
+
+    // Call configureAmplify with custom storage
+    // This is the first call in the test suite, so amplifyConfigured is false
+    // This should trigger line 61 in library.ts
+    configureAmplify(mockStorage);
+
+    // The test passes if no error is thrown
+    // Coverage confirms line 61 is executed
+    assert.ok(true, "configureAmplify with storage completed without error");
+  });
+
+  it("should only configure Amplify once (idempotent)", () => {
+    // Call configureAmplify multiple times without storage
+    configureAmplify();
+    configureAmplify();
+    configureAmplify();
+
+    // Should not throw or have any side effects
+    // The function returns early if already configured (line 58)
+    assert.ok(
+      true,
+      "Multiple calls to configureAmplify completed without error",
+    );
+  });
+});

package/src/index.ts

@@ -2,7 +2,7 @@ import { configure } from "./library";
 
 export { decompressBuffer, isBuffer, processResponse } from "./buffer-utils";
 export { API_URL, NEW_API_URL, OLD_API_URL } from "./constants";
-export { configure, signIn } from "./library";
+export { configure, getSession, signIn } from "./library";
 export {
   serialNumberDisplay,
   serialNumberFromHex,