edilkamin 1.2.0 → 1.3.0

package/dist/package.json

@@ -1,12 +1,14 @@
 {
     "name": "edilkamin",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "description": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
         "cli": "ts-node src/cli.ts",
+        "cli:debug": "node --inspect --require ts-node/register/transpile-only src/cli.ts",
         "test": "mocha --require ts-node/register src/*.test.ts",
+        "test:debug": "mocha --require ts-node/register/transpile-only --inspect src/*.test.ts",
         "lint": "prettier --check src docs .github *.md",
         "format": "prettier --write src docs .github *.md",
         "build": "tsc"
@@ -28,9 +30,8 @@
         "edilkamin": "dist/cli.js"
     },
     "dependencies": {
-        "@aws-amplify/core": "^4.3.14",
-        "aws-amplify": "^4.3.14",
-        "aws-crt": "^1.14.5"
+        "aws-amplify": "^6.10.0",
+        "axios": "^0.26.0"
     },
     "devDependencies": {
         "@aws-amplify/cli": "^7.6.21",
@@ -40,7 +41,8 @@
         "prettier": "^2.5.1",
         "sinon": "^19.0.2",
         "ts-node": "^10.9.1",
-        "typedoc": "^0.22.12"
+        "typedoc": "^0.27.2",
+        "typescript": "^5.7.2"
     },
     "optionalDependencies": {
         "commander": "^12.1.0"

package/dist/src/cli.js

@@ -58,7 +58,7 @@ const createProgram = () => {
     addCommonOptions(program.command("signIn").description("Sign in and retrieve a JWT token")).action((options) => __awaiter(void 0, void 0, void 0, function* () {
         const { username, password } = options;
         const pwd = password || (yield promptPassword());
-        const jwtToken = yield library_1.signIn(username, pwd);
+        const jwtToken = yield (0, library_1.signIn)(username, pwd);
         console.log("JWT Token:", jwtToken);
     }));
     // Command: deviceInfo
@@ -68,8 +68,8 @@ const createProgram = () => {
         .requiredOption("-m, --mac <macAddress>", "MAC address of the device")).action((options) => __awaiter(void 0, void 0, void 0, function* () {
         const { username, password, mac } = options;
         const pwd = password || (yield promptPassword());
-        const jwtToken = yield library_1.signIn(username, pwd);
-        const api = library_1.configure(); // Use the default API configuration
+        const jwtToken = yield (0, library_1.signIn)(username, pwd);
+        const api = (0, library_1.configure)(); // Use the default API configuration
         const deviceInfo = yield api.deviceInfo(jwtToken, mac);
         console.log("Device Info:", deviceInfo.data);
     }));

package/dist/src/index.js

@@ -1,11 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setPowerOn = exports.setPowerOff = exports.setPower = exports.deviceInfo = void 0;
+exports.setPowerOn = exports.setPowerOff = exports.setPower = exports.deviceInfo = exports.configure = exports.signIn = exports.API_URL = void 0;
 const library_1 = require("./library");
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "API_URL", { enumerable: true, get: function () { return constants_1.API_URL; } });
 var library_2 = require("./library");
 Object.defineProperty(exports, "signIn", { enumerable: true, get: function () { return library_2.signIn; } });
 Object.defineProperty(exports, "configure", { enumerable: true, get: function () { return library_2.configure; } });
-_a = library_1.configure(), exports.deviceInfo = _a.deviceInfo, exports.setPower = _a.setPower, exports.setPowerOff = _a.setPowerOff, exports.setPowerOn = _a.setPowerOn;
+_a = (0, library_1.configure)(), exports.deviceInfo = _a.deviceInfo, exports.setPower = _a.setPower, exports.setPowerOff = _a.setPowerOff, exports.setPowerOn = _a.setPowerOn;

package/dist/src/library.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {
@@ -13,15 +46,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configure = exports.signIn = void 0;
+const assert_1 = require("assert");
 const aws_amplify_1 = require("aws-amplify");
+const amplifyAuth = __importStar(require("aws-amplify/auth"));
 const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
 const amplifyconfiguration = {
-    Auth: {
-        region: "eu-central-1",
-        userPoolId: "eu-central-1_BYmQ2VBlo",
-        userPoolWebClientId: "7sc1qltkqobo3ddqsk4542dg2h",
-    },
+    aws_project_region: "eu-central-1",
+    aws_user_pools_id: "eu-central-1_BYmQ2VBlo",
+    aws_user_pools_web_client_id: "7sc1qltkqobo3ddqsk4542dg2h",
 };
 aws_amplify_1.Amplify.configure(amplifyconfiguration);
 const headers = (jwtToken) => ({ Authorization: `Bearer ${jwtToken}` });
@@ -29,8 +62,14 @@ const headers = (jwtToken) => ({ Authorization: `Bearer ${jwtToken}` });
  * Sign in to return the JWT token.
  */
 const signIn = (username, password) => __awaiter(void 0, void 0, void 0, function* () {
-    const user = yield aws_amplify_1.Auth.signIn(username, password);
-    return user.getSignInUserSession().getAccessToken().jwtToken;
+    const { isSignedIn, nextStep } = yield amplifyAuth.signIn({
+        username,
+        password,
+    });
+    assert_1.strict.ok(isSignedIn);
+    const { tokens } = yield amplifyAuth.fetchAuthSession();
+    assert_1.strict.ok(tokens);
+    return tokens.accessToken.toString();
 });
 exports.signIn = signIn;
 const deviceInfo = (axiosInstance) => (jwtToken, macAddress) => axiosInstance.get(`device/${macAddress}/info`, {

package/dist/src/library.test.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = require("assert");
 const sinon_1 = __importDefault(require("sinon"));
-const aws_amplify_1 = require("aws-amplify");
 const axios_1 = __importDefault(require("axios"));
 const library_1 = require("../src/library");
 describe("library", () => {
@@ -28,25 +27,10 @@ describe("library", () => {
     afterEach(() => {
         sinon_1.default.restore();
     });
-    describe("signIn", () => {
-        it("should return a JWT token on successful login", () => __awaiter(void 0, void 0, void 0, function* () {
-            const expectedJwtToken = "mockToken123";
-            const mockUserSession = {
-                getAccessToken: () => ({ jwtToken: expectedJwtToken }),
-            };
-            const mockUser = {
-                getSignInUserSession: () => mockUserSession,
-            };
-            const signInStub = sinon_1.default.stub(aws_amplify_1.Auth, "signIn").resolves(mockUser);
-            const jwtToken = yield library_1.signIn("mockUser", "mockPassword");
-            assert_1.strict.ok(signInStub.calledOnce);
-            assert_1.strict.equal(jwtToken, expectedJwtToken);
-        }));
-    });
     describe("configure", () => {
         it("should create API methods with the correct baseURL", () => {
             const baseURL = "https://example.com/api";
-            const api = library_1.configure(baseURL);
+            const api = (0, library_1.configure)(baseURL);
             assert_1.strict.ok(axiosStub.calledOnce);
             assert_1.strict.deepEqual(axiosStub.firstCall.args[0], { baseURL });
             assert_1.strict.deepEqual(Object.keys(api), [
@@ -65,7 +49,7 @@ describe("library", () => {
                     .resolves({ data: { id: "123", name: "Mock Device" } }),
             };
             axiosStub.returns(mockAxios);
-            const api = library_1.configure("https://example.com/api");
+            const api = (0, library_1.configure)("https://example.com/api");
             const result = yield api.deviceInfo("mockToken", "mockMacAddress");
             assert_1.strict.ok(mockAxios.get.calledOnce);
             assert_1.strict.equal(mockAxios.get.firstCall.args[0], "device/mockMacAddress/info");
@@ -79,7 +63,7 @@ describe("library", () => {
                 put: sinon_1.default.stub().resolves({ status: 200 }),
             };
             axiosStub.returns(mockAxios);
-            const api = library_1.configure("https://example.com/api");
+            const api = (0, library_1.configure)("https://example.com/api");
             const result = yield api.setPowerOn("mockToken", "mockMacAddress");
             assert_1.strict.ok(mockAxios.put.calledOnce);
             assert_1.strict.equal(mockAxios.put.firstCall.args[0], "mqtt/command");

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "edilkamin",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "cli": "ts-node src/cli.ts",
+    "cli:debug": "node --inspect --require ts-node/register/transpile-only src/cli.ts",
     "test": "mocha --require ts-node/register src/*.test.ts",
+    "test:debug": "mocha --require ts-node/register/transpile-only --inspect src/*.test.ts",
     "lint": "prettier --check src docs .github *.md",
     "format": "prettier --write src docs .github *.md",
     "build": "tsc"
@@ -28,9 +30,8 @@
     "edilkamin": "dist/cli.js"
   },
   "dependencies": {
-    "@aws-amplify/core": "^4.3.14",
-    "aws-amplify": "^4.3.14",
-    "aws-crt": "^1.14.5"
+    "aws-amplify": "^6.10.0",
+    "axios": "^0.26.0"
   },
   "devDependencies": {
     "@aws-amplify/cli": "^7.6.21",
@@ -40,7 +41,8 @@
     "prettier": "^2.5.1",
     "sinon": "^19.0.2",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.22.12"
+    "typedoc": "^0.27.2",
+    "typescript": "^5.7.2"
   },
   "optionalDependencies": {
     "commander": "^12.1.0"