@adobe/aem-cli 16.10.44 → 16.10.46

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [16.10.46](https://github.com/adobe/helix-cli/compare/v16.10.45...v16.10.46) (2025-08-30)
+
+
+### Bug Fixes
+
+* **2576:** provide a way to dump all headers ([#2577](https://github.com/adobe/helix-cli/issues/2577)) ([38c2275](https://github.com/adobe/helix-cli/commit/38c2275a8ceec531aa9f4abb4d3cafe66c15a222))
+
+## [16.10.45](https://github.com/adobe/helix-cli/compare/v16.10.44...v16.10.45) (2025-08-26)
+
+
+### Bug Fixes
+
+* make logger compatible with helix-log v7.0.0 ([#2574](https://github.com/adobe/helix-cli/issues/2574)) ([3b937c5](https://github.com/adobe/helix-cli/commit/3b937c5bee112eadd3f5bb7b4e12b1a2651e0c03))
+* preserve --pagesUrl as proxy with git changes ([#2573](https://github.com/adobe/helix-cli/issues/2573)) ([b5f0dfc](https://github.com/adobe/helix-cli/commit/b5f0dfca2d63c2fbccce6f15f2a241a636940b7a))
+
 ## [16.10.44](https://github.com/adobe/helix-cli/compare/v16.10.43...v16.10.44) (2025-08-25)
 
 

package/README.md

@@ -17,22 +17,7 @@ Install `aem` as a global command. You need Node 12.11 or newer.
 npm install -g @adobe/aem-cli
 ```
 
-### Migrating from older version
-
-Starting with version 15.0.0, this tool is named `aem` and published as `@adobe/aem-cli`. If you previously had installed this tool under its old name `hlx` aka `@adobe/helix-cli` you might get an error like:
-
-```
-npm error EEXIST: file already exists
-npm error File exists: /opt/homebrew/bin/hlx
-npm error Remove the existing file and try again, or run npm
-```
-
-To solve, first uninstall the old version, then try again:
-
-```
-npm uninstall -g @adobe/helix-cli
-npm install -g @adobe/aem-cli
-```
+If this fails with `File exists: /opt/homebrew/bin/hlx`, please [see here](#npm-install-fails-with-file-exists-opthomebrewbinhlx).
 
 ## Quick Start
 
@@ -204,3 +189,25 @@ aem up
 ```
 
 This will make Node.js trust the server certificate and `aem up` should work.
+
+## `npm install` fails with `File exists: /opt/homebrew/bin/hlx`
+
+If you try to install `@adobe/aem-cli`: 
+
+```
+> npm install -g @adobe/aem-cli
+...
+npm error EEXIST: file already exists
+npm error File exists: /opt/homebrew/bin/hlx
+npm error Remove the existing file and try again, or run npm
+```
+
+This can happen when you previously had installed this tool under its old package name [@adobe/helix-cli](https://www.npmjs.com/package/@adobe/helix-cli). Starting with version 15.0.0, this tool was renamed `aem` and published as `@adobe/aem-cli`. The previous `@adobe/helix-cli` has been deprecated. However, the new package still provides the command line binary under the old name `hlx` in addition to `aem`, for backwards compatibility, which can lead to the npm install error.
+
+To solve, first uninstall the old version, then install again with the new name:
+
+```
+npm uninstall -g @adobe/helix-cli
+npm install -g @adobe/aem-cli
+```
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.10.44",
+  "version": "16.10.46",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",

package/src/import.cmd.js

@@ -24,6 +24,7 @@ export default class ImportCommand extends AbstractServerCommand {
     super(logger);
     this._importerSubPath = 'tools/importer';
     this._allowInsecure = true;
+    this._dumpHeaders = false;
   }
 
   withAllowInsecure(value) {
@@ -59,6 +60,11 @@ export default class ImportCommand extends AbstractServerCommand {
     return this;
   }
 
+  withDumpHeaders(value) {
+    this._dumpHeaders = value;
+    return this;
+  }
+
   /**
    * Ensure the UI branch the caller specified (or defaulted to) is the one being used.
    * @param uiFolder
@@ -136,7 +142,8 @@ export default class ImportCommand extends AbstractServerCommand {
       .withLogger(this._logger)
       .withKill(this._kill)
       .withAllowInsecure(this._allowInsecure)
-      .withHeadersFile(this._headersFile);
+      .withHeadersFile(this._headersFile)
+      .withDumpHeaders(this._dumpHeaders);
     this.log.info(chalk`{yellow     ___    ________  ___                                __}`);
     this.log.info(chalk`{yellow    /   |  / ____/  |/  /  (_)___ ___  ____  ____  _____/ /____  _____}`);
     this.log.info(chalk`{yellow   / /| | / __/ / /|_/ /  / / __ \`__ \\/ __ \\/ __ \\/ ___/ __/ _ \\/ ___/}`);

package/src/import.js

@@ -80,6 +80,12 @@ export default function up() {
           type: 'string',
           default: undefined,
         })
+        .option('dump-headers', {
+          alias: 'dumpHeaders',
+          describe: 'Dump request headers to console for debugging',
+          type: 'boolean',
+          default: false,
+        })
         .group(['port', 'addr', 'stop-other', 'tls-cert', 'tls-key'], 'Server options')
         .option('cache', {
           describe: 'Path to local folder to cache the responses',
@@ -118,6 +124,7 @@ export default function up() {
         .withSkipUI(argv.skipUI)
         .withUIRepo(argv.uiRepo)
         .withHeadersFile(argv.headersFile)
+        .withDumpHeaders(argv.dumpHeaders)
         .run();
     },
   };

package/src/log-common.js

@@ -100,21 +100,21 @@ export function getOrCreateLogger(config = 'cli') {
     ? config.logFile
     : ['-', (config && config.logFile) || path.join(logsDir, `${categ}-server.log`)];
 
-  const loggers = new Map();
+  const loggers = {};
   logFiles.forEach((logFile) => {
-    const name = loggers.has('default') ? logFile : 'default';
+    const name = loggers.default ? logFile : 'default';
     if (logFile === '-') {
-      loggers.set(name, new ConsoleLogger({
+      loggers[name] = new ConsoleLogger({
         filter: categ === 'cli' ? suppressProgress : filterProgress,
         level,
         formatter: categoryAwareMessageFormatConsole,
-      }));
+      });
     } else {
       fs.ensureDirSync(path.dirname(logFile));
-      loggers.set(name, new FileLogger(logFile, {
+      loggers[name] = new FileLogger(logFile, {
         level: 'debug',
         formatter: /\.json/.test(logFile) ? messageFormatJsonString : messageFormatTechnical,
-      }));
+      });
     }
   });
 

package/src/server/HelixImportProject.js

@@ -18,6 +18,7 @@ export class HelixImportProject extends BaseProject {
     super(HelixImportServer);
 
     this._allowInsecure = true;
+    this._dumpHeaders = false;
   }
 
   withAllowInsecure(value) {
@@ -42,6 +43,15 @@ export class HelixImportProject extends BaseProject {
     return this._cliHeaders;
   }
 
+  withDumpHeaders(value) {
+    this._dumpHeaders = value;
+    return this;
+  }
+
+  get dumpHeaders() {
+    return this._dumpHeaders;
+  }
+
   async start() {
     this.log.debug('Launching AEM import server for importing content...');
     await super.start();

package/src/server/HelixImportServer.js

@@ -108,6 +108,17 @@ export class HelixImportServer extends BaseServer {
     delete headers['accept-encoding'];
     await this._updateHeaders(headers);
 
+    // Dump headers if dump mode is enabled
+    if (this._project.dumpHeaders) {
+      ctx.log.info('=== REQUEST HEADERS ===');
+      ctx.log.info(`Request URL: ${url}`);
+      ctx.log.info(`Request Method: ${req.method}`);
+      Object.entries(headers).forEach(([key, value]) => {
+        ctx.log.info(`${key}: ${value}`);
+      });
+      ctx.log.info('=======================');
+    }
+
     const ret = await getFetch(ctx.config.allowInsecure)(url, {
       method: req.method,
       headers,
@@ -186,8 +197,8 @@ export class HelixImportServer extends BaseServer {
         host = new URL(host).origin;
         const url = this._makeProxyURL(ctx.url, host);
         await this._doProxyRequest(ctx, url, host, req, res);
-      // codecov:ignore:start
-      /* c8 ignore start */
+        // codecov:ignore:start
+        /* c8 ignore start */
       } catch (err) {
         log.error(`Failed to proxy AEM request ${ctx.path}: ${err.message}`);
         res.status(502).send(`Failed to proxy AEM request: ${err.message}`);

package/src/up.cmd.js

@@ -25,7 +25,7 @@ export default class UpCommand extends AbstractServerCommand {
   }
 
   withUrl(value) {
-    this._url = value;
+    this._originalUrl = value;
     return this;
   }
 
@@ -90,13 +90,7 @@ export default class UpCommand extends AbstractServerCommand {
     if (!this._gitUrl) {
       throw Error('No git remote found. Make sure you have a remote "origin" configured.');
     }
-    if (!this._url) {
-      await this.verifyUrl(this._gitUrl, ref);
-    } else if (/\{\{(owner|repo)+\}\}/.test(this._url)) {
-      this._url = this._url
-        .replace(/\{\{owner\}\}/, this._gitUrl.owner)
-        .replace(/\{\{repo\}\}/, this._gitUrl.repo);
-    }
+    await this.initUrl(this._gitUrl, ref);
     this._project.withProxyUrl(this._url);
     const { site, org } = this.extractSiteAndOrg(this._url);
     if (site && org) {
@@ -138,7 +132,7 @@ export default class UpCommand extends AbstractServerCommand {
     return { site, org };
   }
 
-  async verifyUrl(gitUrl, ref) {
+  async initUrl(gitUrl, ref) {
     const dnsName = `${ref.replace(/\//g, '-')}--${gitUrl.repo}--${gitUrl.owner}`;
     // check length limit
     if (dnsName.length > 63) {
@@ -148,8 +142,8 @@ export default class UpCommand extends AbstractServerCommand {
       throw Error('branch name too long');
     }
 
-    // always proxy to main
-    this._url = `https://main--${gitUrl.repo}--${gitUrl.owner}.aem.page`;
+    const url = this._originalUrl || 'https://main--{{repo}}--{{owner}}.aem.page';
+    this._url = url.replace(/\{\{(owner|repo)\}\}/g, (_, key) => gitUrl[key]);
   }
 
   /**
@@ -182,7 +176,7 @@ export default class UpCommand extends AbstractServerCommand {
             if (gitUrl.toString() !== this._gitUrl.toString()) {
               this.log.info('git HEAD or remotes changed, reconfiguring server...');
               this._gitUrl = gitUrl;
-              await this.verifyUrl(gitUrl, ref);
+              await this.initUrl(gitUrl, ref);
               this._project.withProxyUrl(this._url);
               await this._project.initHeadHtml();
               this.log.info(`Updated proxy to ${this._url}`);