@magentrix-corp/magentrix-cli 1.3.16 → 1.3.17

package/utils/cli/helpers/ensureApiKey.js

@@ -1,63 +1,63 @@
-import { password } from "@inquirer/prompts";
-import Config from "../../config.js";
-import { HASHED_CWD } from "../../../vars/global.js";
-
-const config = new Config();
-
-/**
- * Ensures a valid Magentrix API key is available in the global config.
- * - If a key is missing, invalid, or forcePrompt is true, prompts the user to enter one.
- * - Validates that the key is at least 12 characters long and contains no spaces.
- * - Exits the process if the user fails to provide a valid key.
- * 
- * @async
- * @param {boolean} [forcePrompt=false] - If true, always prompt for API key, even if one exists.
- * @returns {Promise<string>} The valid API key, either from config or user input.
- */
-export const ensureApiKey = async (forcePrompt = false) => {
-    let apiKey = config.read('apiKey', { global: true, pathHash: HASHED_CWD });
-
-    // Helper: checks for min length and no spaces
-    const isValid = (key) =>
-        typeof key === "string" &&
-        key.trim().length >= 12 &&
-        !/\s/.test(key);
-
-    if (forcePrompt || !isValid(apiKey)) {
-        console.log('\n🚀 Magentrix CLI Setup:');
-
-        while (true) {
-            try {
-                const apiKeyInput = await password({
-                    message: 'Enter your Magentrix API key (no spaces):',
-                    mask: '*',
-                    validate: (value) => {
-                        if (!value || value.trim().length < 12) {
-                            return "API key must be at least 12 characters.";
-                        }
-                        if (/\s/.test(value)) {
-                            return "API key cannot contain any spaces.";
-                        }
-                        return true;
-                    }
-                });
-
-                const trimmed = apiKeyInput.trim();
-
-                if (isValid(trimmed)) {
-                    return trimmed;
-                }
-            } catch (error) {
-                // Handle Ctrl+C or other cancellation
-                if (error.name === 'ExitPromptError') {
-                    console.error('\n❌ API key is required. Exiting.');
-                    process.exit(1);
-                }
-                throw error;
-            }
-            // Invalid: will re-prompt.
-        }
-    }
-
-    return apiKey;
-};
+import { password } from "@inquirer/prompts";
+import Config from "../../config.js";
+import { HASHED_CWD } from "../../../vars/global.js";
+
+const config = new Config();
+
+/**
+ * Ensures a valid Magentrix API key is available in the global config.
+ * - If a key is missing, invalid, or forcePrompt is true, prompts the user to enter one.
+ * - Validates that the key is at least 12 characters long and contains no spaces.
+ * - Exits the process if the user fails to provide a valid key.
+ * 
+ * @async
+ * @param {boolean} [forcePrompt=false] - If true, always prompt for API key, even if one exists.
+ * @returns {Promise<string>} The valid API key, either from config or user input.
+ */
+export const ensureApiKey = async (forcePrompt = false) => {
+    let apiKey = config.read('apiKey', { global: true, pathHash: HASHED_CWD });
+
+    // Helper: checks for min length and no spaces
+    const isValid = (key) =>
+        typeof key === "string" &&
+        key.trim().length >= 12 &&
+        !/\s/.test(key);
+
+    if (forcePrompt || !isValid(apiKey)) {
+        console.log('\n🚀 Magentrix CLI Setup:');
+
+        while (true) {
+            try {
+                const apiKeyInput = await password({
+                    message: 'Enter your Magentrix API key (no spaces):',
+                    mask: '*',
+                    validate: (value) => {
+                        if (!value || value.trim().length < 12) {
+                            return "API key must be at least 12 characters.";
+                        }
+                        if (/\s/.test(value)) {
+                            return "API key cannot contain any spaces.";
+                        }
+                        return true;
+                    }
+                });
+
+                const trimmed = apiKeyInput.trim();
+
+                if (isValid(trimmed)) {
+                    return trimmed;
+                }
+            } catch (error) {
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.error('\n❌ API key is required. Exiting.');
+                    process.exit(1);
+                }
+                throw error;
+            }
+            // Invalid: will re-prompt.
+        }
+    }
+
+    return apiKey;
+};

package/utils/cli/helpers/ensureCredentials.js

@@ -1,68 +1,68 @@
-import Config from "../../config.js";
-import { setup } from "../../../actions/setup.js";
-import { HASHED_CWD } from "../../../vars/global.js";
-import { tryAuthenticate } from "../../magentrix/api/auth.js";
-import debug from '../../debug.js';
-
-/**
- * Returns true if the token is present and not expired (60 seconds buffer).
- * @param {{ value?: string, validUntil?: string } | undefined} tokenObj 
- * @returns {boolean}
- */
-export function isTokenValid(tokenObj) {
-    if (!tokenObj || !tokenObj.value || !tokenObj.validUntil) return false;
-    const now = Date.now();
-    const expiresAt = Date.parse(tokenObj.validUntil);
-    if (isNaN(expiresAt)) return false;
-    const SECONDS_BEFORE_EXPIRY = 60 * 1000;
-    return expiresAt - now > SECONDS_BEFORE_EXPIRY;
-}
-
-/**
- * Ensures Magentrix credentials are present and valid, refreshing the token if needed.
- * Prompts user only when needed.
- * 
- * @returns {Promise<{ apiKey: string, instanceUrl: string, token: { value: string, validUntil: string } }>}
- */
-export async function ensureValidCredentials() {
-    const config = new Config();
-
-    // Load from config
-    const apiKey = config.read('apiKey', { global: true, pathHash: HASHED_CWD });
-    const instanceUrl = config.read('instanceUrl', { global: true, pathHash: HASHED_CWD });
-    const token = config.read('token', { global: true, pathHash: HASHED_CWD });
-
-    debug.auth(`Credential check: apiKey=${apiKey ? 'present' : 'missing'}, instanceUrl=${instanceUrl || '(missing)'}`);
-
-    // If missing API key or URL, prompt/setup immediately
-    if (!apiKey || !instanceUrl) {
-        debug.auth(`Missing credentials for this directory (pathHash: ${HASHED_CWD}). No API key or instance URL found in global config for this workspace. This usually means 'magentrix setup' was never run from this directory, or was run from a different path. Falling back to setup wizard.`);
-        return setup();
-    }
-
-    // If token is present and valid, return immediately
-    if (isTokenValid(token)) {
-        debug.auth(`Existing token is valid (expires: ${token.validUntil})`);
-        return { apiKey, instanceUrl, token };
-    }
-
-    debug.auth(`Token ${token ? `expired (was valid until: ${token.validUntil})` : 'missing'}, refreshing...`);
-
-    // If we have API key & URL but no valid token, try to refresh
-    try {
-        const result = await tryAuthenticate(apiKey, instanceUrl);
-
-        if (!result || !result.token || !result.validUntil) {
-            throw new Error("Invalid token refresh response");
-        }
-
-        // Save new token and return
-        const newToken = { value: result.token, validUntil: result.validUntil };
-        config.save('token', newToken, { global: true, pathHash: HASHED_CWD });
-        return { apiKey, instanceUrl, token: newToken };
-    } catch (err) {
-        debug.auth(`Token refresh failed: ${err.message}, falling back to setup wizard`);
-        // Failed to refresh, fall back to prompting the user
-        return setup();
-    }
-}
+import Config from "../../config.js";
+import { setup } from "../../../actions/setup.js";
+import { HASHED_CWD } from "../../../vars/global.js";
+import { tryAuthenticate } from "../../magentrix/api/auth.js";
+import debug from '../../debug.js';
+
+/**
+ * Returns true if the token is present and not expired (60 seconds buffer).
+ * @param {{ value?: string, validUntil?: string } | undefined} tokenObj 
+ * @returns {boolean}
+ */
+export function isTokenValid(tokenObj) {
+    if (!tokenObj || !tokenObj.value || !tokenObj.validUntil) return false;
+    const now = Date.now();
+    const expiresAt = Date.parse(tokenObj.validUntil);
+    if (isNaN(expiresAt)) return false;
+    const SECONDS_BEFORE_EXPIRY = 60 * 1000;
+    return expiresAt - now > SECONDS_BEFORE_EXPIRY;
+}
+
+/**
+ * Ensures Magentrix credentials are present and valid, refreshing the token if needed.
+ * Prompts user only when needed.
+ * 
+ * @returns {Promise<{ apiKey: string, instanceUrl: string, token: { value: string, validUntil: string } }>}
+ */
+export async function ensureValidCredentials() {
+    const config = new Config();
+
+    // Load from config
+    const apiKey = config.read('apiKey', { global: true, pathHash: HASHED_CWD });
+    const instanceUrl = config.read('instanceUrl', { global: true, pathHash: HASHED_CWD });
+    const token = config.read('token', { global: true, pathHash: HASHED_CWD });
+
+    debug.auth(`Credential check: apiKey=${apiKey ? 'present' : 'missing'}, instanceUrl=${instanceUrl || '(missing)'}`);
+
+    // If missing API key or URL, prompt/setup immediately
+    if (!apiKey || !instanceUrl) {
+        debug.auth(`Missing credentials for this directory (pathHash: ${HASHED_CWD}). No API key or instance URL found in global config for this workspace. This usually means 'magentrix setup' was never run from this directory, or was run from a different path. Falling back to setup wizard.`);
+        return setup();
+    }
+
+    // If token is present and valid, return immediately
+    if (isTokenValid(token)) {
+        debug.auth(`Existing token is valid (expires: ${token.validUntil})`);
+        return { apiKey, instanceUrl, token };
+    }
+
+    debug.auth(`Token ${token ? `expired (was valid until: ${token.validUntil})` : 'missing'}, refreshing...`);
+
+    // If we have API key & URL but no valid token, try to refresh
+    try {
+        const result = await tryAuthenticate(apiKey, instanceUrl);
+
+        if (!result || !result.token || !result.validUntil) {
+            throw new Error("Invalid token refresh response");
+        }
+
+        // Save new token and return
+        const newToken = { value: result.token, validUntil: result.validUntil };
+        config.save('token', newToken, { global: true, pathHash: HASHED_CWD });
+        return { apiKey, instanceUrl, token: newToken };
+    } catch (err) {
+        debug.auth(`Token refresh failed: ${err.message}, falling back to setup wizard`);
+        // Failed to refresh, fall back to prompting the user
+        return setup();
+    }
+}

package/utils/cli/helpers/ensureInstanceUrl.js

@@ -1,75 +1,75 @@
-import { input } from "@inquirer/prompts";
-import Config from "../../config.js";
-import { checkInstanceUrl } from "../checkInstanceUrl.js";
-import { withSpinner } from "../../spinner.js";
-import { HASHED_CWD } from "../../../vars/global.js";
-import debug from '../../debug.js';
-
-const config = new Config();
-const urlRegex = /^https:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-
-/**
- * Ensures a valid Magentrix instance URL is available in the global config.
- * Prompts until user provides a valid, reachable URL or cancels.
- *
- * @async
- * @param {boolean} [forcePrompt=false] - If true, always prompt for instance URL, even if one exists.
- * @returns {Promise<string>} The valid instance URL, either from config or user input.
- */
-export const ensureInstanceUrl = async (forcePrompt = false) => {
-    let instanceUrl = config.read('instanceUrl', { global: true, pathHash: HASHED_CWD });
-
-    if (
-        forcePrompt ||
-        !instanceUrl ||
-        typeof instanceUrl !== 'string' ||
-        !urlRegex.test(instanceUrl.trim())
-    ) {
-        console.log('\n🚀 Magentrix CLI Setup: Instance URL');
-
-        while (true) {
-            try {
-                // Prompt: Only validate format, NOT reachability
-                const inputUrl = await input({
-                    message: 'Enter your Magentrix instance URL (e.g., https://example.magentrix.com):',
-                    validate: (value) => {
-                        // Automatically strip trailing slashes for validation
-                        const cleaned = value.trim().replace(/\/+$/, '');
-                        if (!urlRegex.test(cleaned)) {
-                            return 'Instance URL must be in the form: https://subdomain.domain.com (no http, no extra path)';
-                        }
-                        return true;
-                    }
-                });
-
-                // Trim and automatically strip trailing slashes
-                const trimmed = inputUrl.trim().replace(/\/+$/, '');
-
-                // Now check reachability WITH a spinner
-                debug.log('SETUP', `User entered instance URL: ${trimmed}`);
-                try {
-                    await withSpinner('Checking instance URL...', () =>
-                        checkInstanceUrl(trimmed)
-                    );
-
-                    debug.log('SETUP', `Instance URL reachable: ${trimmed}`);
-                    return trimmed;
-                } catch (error) {
-                    debug.log('SETUP', `Instance URL not reachable: ${trimmed} — ${error.message}`);
-                    // Print error AFTER spinner, then re-prompt
-                    console.error('❌ Instance URL not reachable. Try again.');
-                }
-            } catch (error) {
-                // Handle Ctrl+C or other cancellation
-                if (error.name === 'ExitPromptError') {
-                    console.error('\n❌ Instance URL is required. Exiting.');
-                    process.exit(1);
-                }
-                throw error;
-            }
-        }
-    }
-
-    // Trim and automatically strip trailing slashes from existing URL
-    return instanceUrl.trim().replace(/\/+$/, '');
-};
+import { input } from "@inquirer/prompts";
+import Config from "../../config.js";
+import { checkInstanceUrl } from "../checkInstanceUrl.js";
+import { withSpinner } from "../../spinner.js";
+import { HASHED_CWD } from "../../../vars/global.js";
+import debug from '../../debug.js';
+
+const config = new Config();
+const urlRegex = /^https:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+
+/**
+ * Ensures a valid Magentrix instance URL is available in the global config.
+ * Prompts until user provides a valid, reachable URL or cancels.
+ *
+ * @async
+ * @param {boolean} [forcePrompt=false] - If true, always prompt for instance URL, even if one exists.
+ * @returns {Promise<string>} The valid instance URL, either from config or user input.
+ */
+export const ensureInstanceUrl = async (forcePrompt = false) => {
+    let instanceUrl = config.read('instanceUrl', { global: true, pathHash: HASHED_CWD });
+
+    if (
+        forcePrompt ||
+        !instanceUrl ||
+        typeof instanceUrl !== 'string' ||
+        !urlRegex.test(instanceUrl.trim())
+    ) {
+        console.log('\n🚀 Magentrix CLI Setup: Instance URL');
+
+        while (true) {
+            try {
+                // Prompt: Only validate format, NOT reachability
+                const inputUrl = await input({
+                    message: 'Enter your Magentrix instance URL (e.g., https://example.magentrix.com):',
+                    validate: (value) => {
+                        // Automatically strip trailing slashes for validation
+                        const cleaned = value.trim().replace(/\/+$/, '');
+                        if (!urlRegex.test(cleaned)) {
+                            return 'Instance URL must be in the form: https://subdomain.domain.com (no http, no extra path)';
+                        }
+                        return true;
+                    }
+                });
+
+                // Trim and automatically strip trailing slashes
+                const trimmed = inputUrl.trim().replace(/\/+$/, '');
+
+                // Now check reachability WITH a spinner
+                debug.log('SETUP', `User entered instance URL: ${trimmed}`);
+                try {
+                    await withSpinner('Checking instance URL...', () =>
+                        checkInstanceUrl(trimmed)
+                    );
+
+                    debug.log('SETUP', `Instance URL reachable: ${trimmed}`);
+                    return trimmed;
+                } catch (error) {
+                    debug.log('SETUP', `Instance URL not reachable: ${trimmed} — ${error.message}`);
+                    // Print error AFTER spinner, then re-prompt
+                    console.error('❌ Instance URL not reachable. Try again.');
+                }
+            } catch (error) {
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.error('\n❌ Instance URL is required. Exiting.');
+                    process.exit(1);
+                }
+                throw error;
+            }
+        }
+    }
+
+    // Trim and automatically strip trailing slashes from existing URL
+    return instanceUrl.trim().replace(/\/+$/, '');
+};