@capawesome/cli 1.14.0 → 2.0.1

package/dist/utils/hash.js

@@ -1,40 +1,4 @@
-"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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __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) {
-        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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHash = void 0;
-const createHash = (data) => __awaiter(void 0, void 0, void 0, function* () {
-    const crypto = yield Promise.resolve().then(() => __importStar(require('crypto')));
+export const createHash = async (data) => {
+    const crypto = await import('crypto');
     return crypto.createHash('sha256').update(data).digest('hex');
-});
-exports.createHash = createHash;
+};

package/dist/utils/http-client.js

@@ -1,61 +1,35 @@
-"use strict";
-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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
-const package_json_1 = require("../../package.json");
-const config_1 = __importDefault(require("../services/config"));
+import axios from 'axios';
+import pkg from '../../package.json' with { type: 'json' };
+import configService from '../services/config.js';
 class HttpClientImpl {
-    constructor() {
-        this.baseHeaders = {
-            'User-Agent': `Capawesome CLI v${package_json_1.version}`,
-        };
+    baseHeaders = {
+        'User-Agent': `Capawesome CLI v${pkg.version}`,
+    };
+    async delete(url, config) {
+        const baseUrl = await configService.getValueForKey('API_BASE_URL');
+        const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
+        return axios.delete(urlWithHost, { ...config, headers: { ...this.baseHeaders, ...config?.headers } });
     }
-    delete(url, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
-            const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
-            return axios_1.default.delete(urlWithHost, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, this.baseHeaders), config === null || config === void 0 ? void 0 : config.headers) }));
-        });
+    async get(url, config) {
+        const baseUrl = await configService.getValueForKey('API_BASE_URL');
+        const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
+        return axios.get(urlWithHost, { ...config, headers: { ...this.baseHeaders, ...config?.headers } });
     }
-    get(url, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
-            const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
-            return axios_1.default.get(urlWithHost, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, this.baseHeaders), config === null || config === void 0 ? void 0 : config.headers) }));
-        });
+    async patch(url, data, config) {
+        const baseUrl = await configService.getValueForKey('API_BASE_URL');
+        const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
+        return axios.patch(urlWithHost, data, { ...config, headers: { ...this.baseHeaders, ...config?.headers } });
     }
-    patch(url, data, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
-            const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
-            return axios_1.default.patch(urlWithHost, data, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, this.baseHeaders), config === null || config === void 0 ? void 0 : config.headers) }));
-        });
+    async post(url, data, config) {
+        const baseUrl = await configService.getValueForKey('API_BASE_URL');
+        const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
+        return axios.post(urlWithHost, data, { ...config, headers: { ...this.baseHeaders, ...config?.headers } });
     }
-    post(url, data, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
-            const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
-            return axios_1.default.post(urlWithHost, data, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, this.baseHeaders), config === null || config === void 0 ? void 0 : config.headers) }));
-        });
-    }
-    put(url, data, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
-            const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
-            return axios_1.default.put(urlWithHost, data, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, this.baseHeaders), config === null || config === void 0 ? void 0 : config.headers) }));
-        });
+    async put(url, data, config) {
+        const baseUrl = await configService.getValueForKey('API_BASE_URL');
+        const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
+        return axios.put(urlWithHost, data, { ...config, headers: { ...this.baseHeaders, ...config?.headers } });
     }
 }
 let httpClient = new HttpClientImpl();
-exports.default = httpClient;
+export default httpClient;

package/dist/utils/manifest.js

@@ -1,28 +1,16 @@
-"use strict";
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateManifestJson = void 0;
-const config_1 = require("../config");
-const buffer_1 = require("./buffer");
-const file_1 = require("./file");
-const hash_1 = require("./hash");
-const ignoreFiles = ['.DS_Store', config_1.MANIFEST_JSON_FILE_NAME];
-const generateManifestJson = (path) => __awaiter(void 0, void 0, void 0, function* () {
+import { MANIFEST_JSON_FILE_NAME } from '../config/index.js';
+import { createBufferFromPath } from './buffer.js';
+import { getFilesInDirectoryAndSubdirectories, writeFile } from './file.js';
+import { createHash } from './hash.js';
+const ignoreFiles = ['.DS_Store', MANIFEST_JSON_FILE_NAME];
+export const generateManifestJson = async (path) => {
     const manifestItems = [];
     // Get all files
-    const files = yield (0, file_1.getFilesInDirectoryAndSubdirectories)(path);
+    const files = await getFilesInDirectoryAndSubdirectories(path);
     // Iterate over each file
     for (const [index, file] of files.entries()) {
-        const fileBuffer = yield (0, buffer_1.createBufferFromPath)(file.path);
-        const checksum = yield (0, hash_1.createHash)(fileBuffer);
+        const fileBuffer = await createBufferFromPath(file.path);
+        const checksum = await createHash(fileBuffer);
         const sizeInBytes = fileBuffer.byteLength;
         // Skip ignored files
         if (ignoreFiles.includes(file.name)) {
@@ -35,6 +23,5 @@ const generateManifestJson = (path) => __awaiter(void 0, void 0, void 0, functio
         });
     }
     // Write the manifest file
-    (0, file_1.writeFile)(`${path}/${config_1.MANIFEST_JSON_FILE_NAME}`, JSON.stringify(manifestItems, null, 2));
-});
-exports.generateManifestJson = generateManifestJson;
+    writeFile(`${path}/${MANIFEST_JSON_FILE_NAME}`, JSON.stringify(manifestItems, null, 2));
+};

package/dist/utils/private-key.js

@@ -0,0 +1,23 @@
+export const formatPrivateKey = (privateKey) => {
+    // Extract the header, key data, and footer using regex that preserves spaces
+    const beginMatch = privateKey.match(/-----BEGIN [^-]+ ?-----/);
+    const endMatch = privateKey.match(/-----END [^-]+ ?-----/);
+    if (!beginMatch || !endMatch) {
+        return privateKey; // Return as-is if not properly formatted PEM
+    }
+    const header = beginMatch[0];
+    const footer = endMatch[0];
+    // Remove all whitespace from the entire key, then find the positions
+    const cleanKey = privateKey.replace(/\s/g, '');
+    const cleanHeader = header.replace(/\s/g, '');
+    const cleanFooter = footer.replace(/\s/g, '');
+    const headerEnd = cleanKey.indexOf(cleanHeader) + cleanHeader.length;
+    const footerStart = cleanKey.indexOf(cleanFooter);
+    if (headerEnd >= footerStart) {
+        return privateKey; // Return as-is if structure is invalid
+    }
+    const keyData = cleanKey.substring(headerEnd, footerStart);
+    // Split the key data into 64-character lines
+    const formattedKeyData = keyData.match(/.{1,64}/g)?.join('\n') || keyData;
+    return `${header}\n${formattedKeyData}\n${footer}`;
+};

package/dist/utils/prompt.js

@@ -1,40 +1,23 @@
-"use strict";
-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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.passwordPrompt = exports.prompt = void 0;
-const prompts_1 = require("@clack/prompts");
-const consola_1 = __importDefault(require("consola"));
-const prompt = (message, options) => __awaiter(void 0, void 0, void 0, function* () {
-    options = Object.assign(Object.assign({}, (options || {})), { cancel: 'symbol' });
-    const response = yield consola_1.default.prompt(message, options);
+import { password as clackPassword } from '@clack/prompts';
+import consola from 'consola';
+export const prompt = async (message, options) => {
+    options = { ...(options || {}), cancel: 'symbol' };
+    const response = await consola.prompt(message, options);
     // See https://github.com/unjs/consola/pull/325#issue-2751614453
     if (response === Symbol.for('cancel')) {
         process.exit(0);
     }
     return response;
-});
-exports.prompt = prompt;
+};
 /**
  * This is a workaround to support password prompts.
  *
  * @see https://github.com/unjs/consola/issues/285
  */
-const passwordPrompt = (message) => __awaiter(void 0, void 0, void 0, function* () {
-    const result = yield (0, prompts_1.password)({ message });
+export const passwordPrompt = async (message) => {
+    const result = await clackPassword({ message });
     if (typeof result === 'symbol') {
         process.exit(0);
     }
     return result;
-});
-exports.passwordPrompt = passwordPrompt;
+};

package/dist/utils/signature.js

@@ -1,43 +1,7 @@
-"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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __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) {
-        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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSignature = void 0;
-const createSignature = (privateKey, data) => __awaiter(void 0, void 0, void 0, function* () {
-    const crypto = yield Promise.resolve().then(() => __importStar(require('crypto')));
+export const createSignature = async (privateKey, data) => {
+    const crypto = await import('crypto');
     const sign = crypto.createSign('sha256');
     sign.update(data);
     sign.end();
     return sign.sign(privateKey).toString('base64');
-});
-exports.createSignature = createSignature;
+};

package/dist/utils/user-config.js

@@ -0,0 +1,12 @@
+import { readUser, writeUser } from 'rc9';
+class UserConfigImpl {
+    file = '.capawesome';
+    read() {
+        return readUser({ name: this.file });
+    }
+    write(config) {
+        writeUser(config, { name: this.file });
+    }
+}
+const userConfig = new UserConfigImpl();
+export default userConfig;

package/dist/utils/zip.js

@@ -1,30 +1,14 @@
-"use strict";
-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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const archiver_1 = __importDefault(require("archiver"));
+import archiver from 'archiver';
 class ZipImpl {
-    zipFolder(sourceFolder) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const archive = (0, archiver_1.default)('zip', { zlib: { level: 9 } });
-                const buffers = [];
-                archive.on('data', (data) => buffers.push(data));
-                archive.on('error', (err) => reject(err));
-                archive.on('end', () => resolve(Buffer.concat(buffers)));
-                archive.directory(sourceFolder, false);
-                archive.finalize();
-            });
+    async zipFolder(sourceFolder) {
+        return new Promise((resolve, reject) => {
+            const archive = archiver('zip', { zlib: { level: 9 } });
+            const buffers = [];
+            archive.on('data', (data) => buffers.push(data));
+            archive.on('error', (err) => reject(err));
+            archive.on('end', () => resolve(Buffer.concat(buffers)));
+            archive.directory(sourceFolder, false);
+            archive.finalize();
         });
     }
     isZipped(path) {
@@ -32,4 +16,4 @@ class ZipImpl {
     }
 }
 const zip = new ZipImpl();
-exports.default = zip;
+export default zip;

package/package.json

@@ -1,16 +1,24 @@
 {
   "name": "@capawesome/cli",
-  "version": "1.14.0",
+  "version": "2.0.1",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
+  "type": "module",
   "scripts": {
-    "build": "patch-package && rimraf ./dist && tsc",
+    "build": "rimraf ./dist && tsc && tsc-alias",
     "start": "npm run build && node ./dist/index.js",
+    "test": "vitest run",
+    "test:watch": "vitest --watch",
+    "test:ui": "vitest --ui",
     "lint": "npm run prettier -- --check",
     "fmt": "npm run prettier -- --write",
     "prettier": "prettier \"**/*.{css,html,ts,js}\"",
     "prepublishOnly": "npm run build",
     "release": "commit-and-tag-version"
   },
+  "engines": {
+    "npm": ">=8.0.0",
+    "node": ">=18.0.0"
+  },
   "bin": {
     "capawesome": "./dist/index.js"
   },
@@ -41,30 +49,35 @@
   ],
   "dependencies": {
     "@clack/prompts": "0.7.0",
+    "@robingenz/zli": "0.1.4",
     "@sentry/node": "8.55.0",
     "archiver": "7.0.1",
     "axios": "1.8.4",
     "c12": "2.0.1",
-    "citty": "0.1.6",
     "consola": "3.3.0",
     "form-data": "4.0.4",
-    "mime": "3.0.0",
-    "open": "8.4.2",
+    "mime": "4.0.7",
+    "open": "10.2.0",
     "rc9": "2.1.2",
     "semver": "7.6.3",
-    "systeminformation": "5.25.11"
+    "std-env": "3.9.0",
+    "systeminformation": "5.25.11",
+    "zod": "4.0.17"
   },
   "devDependencies": {
     "@ionic/prettier-config": "4.0.0",
     "@types/archiver": "6.0.3",
     "@types/mime": "3.0.4",
-    "@types/node": "20.11.30",
+    "@types/node": "24.2.1",
     "@types/semver": "7.5.8",
+    "@vitest/ui": "3.2.4",
     "commit-and-tag-version": "12.5.0",
-    "patch-package": "8.0.0",
+    "nock": "14.0.10",
     "prettier": "3.3.3",
     "rimraf": "6.0.1",
-    "typescript": "5.6.3"
+    "tsc-alias": "1.8.16",
+    "typescript": "5.6.3",
+    "vitest": "3.2.4"
   },
   "prettier": "@ionic/prettier-config"
 }

package/dist/utils/ci.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRunningInCi = void 0;
-const isRunningInCi = () => {
-    return process.env.CI === 'true';
-};
-exports.isRunningInCi = isRunningInCi;

package/dist/utils/userConfig.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const rc9_1 = require("rc9");
-class UserConfigImpl {
-    constructor() {
-        this.file = '.capawesome';
-    }
-    read() {
-        return (0, rc9_1.readUser)({ name: this.file });
-    }
-    write(config) {
-        (0, rc9_1.writeUser)(config, { name: this.file });
-    }
-}
-const userConfig = new UserConfigImpl();
-exports.default = userConfig;