@magentrix-corp/magentrix-cli 1.3.14 → 1.3.16

package/actions/setup.js

@@ -6,6 +6,7 @@ import { ensureVSCodeFileAssociation } from "../utils/preferences.js";
 import { CWD, EXPORT_ROOT, HASHED_CWD } from "../vars/global.js";
 import { select } from "@inquirer/prompts";
 import { registerWorkspace } from "../utils/workspaces.js";
+import debug from '../utils/debug.js';
 
 const config = new Config();
 
@@ -52,6 +53,9 @@ export const setup = async (cliOptions = {}) => {
     let authSuccess = false;
     let apiKey, instanceUrl, tokenData;
 
+    debug.log('SETUP', `Starting setup (pathHash: ${HASHED_CWD}, CWD: ${CWD})`);
+    debug.log('SETUP', `CLI options provided: apiKey=${cliOptions.apiKey ? 'yes' : 'no'}, instanceUrl=${cliOptions.instanceUrl || 'no'}`);
+
     while (!authSuccess) {
         // Get API key (from CLI or prompt)
         apiKey = cliOptions.apiKey
@@ -63,11 +67,15 @@ export const setup = async (cliOptions = {}) => {
             ? cliOptions.instanceUrl.trim()
             : await ensureInstanceUrl(true);
 
+        debug.log('SETUP', `Attempting authentication with instance: ${instanceUrl}`);
+
         // Validate credentials by attempting to fetch an access token
         try {
             tokenData = await tryAuthenticate(apiKey, instanceUrl);
+            debug.log('SETUP', 'Authentication successful');
             authSuccess = true;
         } catch (error) {
+            debug.log('SETUP', `Authentication failed: ${error.message}`);
             console.log(error.message);
             console.log();
 
@@ -105,6 +113,7 @@ export const setup = async (cliOptions = {}) => {
     console.log(); // Blank line for spacing
 
     // Save values since authentication succeeded
+    debug.log('SETUP', `Saving credentials for pathHash: ${HASHED_CWD}`);
     config.save('instanceUrl', instanceUrl, { global: true, pathHash: HASHED_CWD });
     console.log('✅ Instance URL saved securely!');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magentrix-corp/magentrix-cli",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "description": "CLI tool for synchronizing local files with Magentrix cloud platform",
   "main": "index.js",
   "type": "module",

package/utils/cli/checkInstanceUrl.js

@@ -1,3 +1,6 @@
+import { lookup } from 'node:dns/promises';
+import debug from '../debug.js';
+
 /**
  * Checks if the provided Magentrix instance URL is reachable by making a GET request.
  * Throws an error if the response status is not 200 (OK), or if there is a network error.
@@ -8,22 +11,64 @@
  * @returns {Promise<void>} Resolves if the instance is reachable (status 200); otherwise throws.
  */
 export const checkInstanceUrl = async (instanceUrl) => {
+    debug.log('URL-CHECK', `Checking reachability: GET ${instanceUrl}`);
+
+    // Resolve DNS first to help diagnose hosts file / local server issues
+    const hostname = new URL(instanceUrl).hostname;
+    try {
+        const { address, family } = await lookup(hostname);
+        debug.log('URL-CHECK', `DNS resolved: ${hostname} -> ${address} (IPv${family})`);
+    } catch (dnsErr) {
+        debug.log('URL-CHECK', `DNS lookup failed for ${hostname}: ${dnsErr.code || dnsErr.message}`);
+    }
+
+    const controller = new AbortController();
+    const timeout = setTimeout(() => {
+        debug.log('URL-CHECK', `Timeout after 15s — aborting request to ${instanceUrl}. If this is a local server (hosts file), check: (1) IIS has an HTTPS binding on port 443 for this hostname, (2) the SSL certificate is valid/trusted for "${hostname}", (3) Node.js trusts the certificate (self-signed certs require NODE_EXTRA_CA_CERTS or NODE_TLS_REJECT_UNAUTHORIZED=0)`);
+        controller.abort();
+    }, 15000);
     try {
-        // Native fetch is available in Node 18+; for older versions, use node-fetch.
         const response = await fetch(instanceUrl, {
             method: "GET",
-            // You can add a small timeout here using AbortController if needed.
+            signal: controller.signal,
         });
 
+        debug.log('URL-CHECK', `Response: ${response.status} ${response.statusText}`);
+
         if (response.status !== 200) {
             throw new Error(
                 `Instance URL responded with status ${response.status} (${response.statusText}). Expected 200 OK.`
             );
         }
     } catch (err) {
+        // Node's fetch wraps the real error in err.cause (e.g. ENOTFOUND, ECONNREFUSED, ETIMEDOUT)
+        const cause = err.cause || {};
+        const rootCode = cause.code || '';
+        const rootMsg = cause.message || '';
+        const isTimeout = err.name === 'AbortError' || rootCode === 'ABORT_ERR';
+        const isTLS = rootCode === 'UNABLE_TO_VERIFY_LEAF_SIGNATURE' || rootCode === 'CERT_HAS_EXPIRED'
+            || rootCode === 'DEPTH_ZERO_SELF_SIGNED_CERT' || rootCode === 'ERR_TLS_CERT_ALTNAME_INVALID'
+            || rootCode === 'SELF_SIGNED_CERT_IN_CHAIN' || (rootMsg && rootMsg.includes('certificate'));
+
+        let detail;
+        if (isTimeout) {
+            detail = `Connection timed out after 15s. The server at "${hostname}" did not respond. Check the debug log for DNS resolution and troubleshooting hints.`;
+        } else if (isTLS) {
+            detail = `SSL/TLS error (${rootCode}). If using a local server with a self-signed certificate, set NODE_TLS_REJECT_UNAUTHORIZED=0 or use NODE_EXTRA_CA_CERTS. Detail: ${rootMsg}`;
+        } else {
+            detail = rootCode ? `${rootCode}: ${rootMsg}` : (err.message || String(err));
+        }
+
+        debug.log('URL-CHECK', `Failed: ${detail}`);
+        if (cause.code) debug.log('URL-CHECK', `Error code: ${cause.code}`);
+        if (cause.hostname) debug.log('URL-CHECK', `Hostname: ${cause.hostname}`);
+        if (err.stack) debug.log('URL-CHECK', `Stack: ${err.stack}`);
+
         // Wrap and re-throw to provide a clear error message.
         throw new Error(
-            `Failed to reach instance URL "${instanceUrl}": ${err.message || err}`
+            `Failed to reach instance URL "${instanceUrl}": ${detail}`
         );
+    } finally {
+        clearTimeout(timeout);
     }
 };

package/utils/cli/helpers/ensureCredentials.js

@@ -36,7 +36,7 @@ export async function ensureValidCredentials() {
 
     // If missing API key or URL, prompt/setup immediately
     if (!apiKey || !instanceUrl) {
-        debug.auth('Missing credentials, falling back to setup wizard');
+        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();
     }
 

package/utils/cli/helpers/ensureInstanceUrl.js

@@ -3,6 +3,7 @@ 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,}$/;
@@ -45,13 +46,16 @@ export const ensureInstanceUrl = async (forcePrompt = false) => {
                 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.');
                 }

package/utils/magentrix/fetch.js

@@ -84,7 +84,11 @@ export const fetchMagentrix = async ({
             body: requestBody
         });
     } catch (err) {
-        debug.log('HTTP-ERR', `Network error: ${err.message}`, err.stack);
+        const cause = err.cause || {};
+        const rootDetail = cause.code ? `${cause.code}: ${cause.message || ''}` : '';
+        debug.log('HTTP-ERR', `Network error: ${err.message}${rootDetail ? ` (${rootDetail})` : ''}`);
+        if (cause.code) debug.log('HTTP-ERR', `Error code: ${cause.code}, hostname: ${cause.hostname || 'N/A'}`);
+        if (err.stack) debug.log('HTTP-ERR', `Stack: ${err.stack}`);
         const errorObj = {
             type: 'network',
             message: `Network error contacting Magentrix API: ${err.message}`,