fix: Figure out asset folder name from jcr image path (#15)

Author: ManasMaji

README.md

@@ -110,7 +110,7 @@ Add the npm script entries to your Edge Delivery project's `package.json`:
 1. Run the following command to log in to your AEM environment::
 
 ```
-npm run aem-login -- --aemurl https://author-env-url/
+npm run aem-login -- --aemurl https://author-env-url
 ```
 
 * You will be prompted to enter your username and password.
@@ -131,14 +131,12 @@ npm run aem-upload
 
 You’ll be prompted to provide the following details:
 * Absolute Path to the Content Package: Path to the .zip file containing JCR pages, generated by the importer tool.
-* Absolute Path to the Image Mapping File: Path to `jcr-image-mappings.json`, which contains mappings for image urls and their corresponding JCR paths.
-* Site Name: The site name (must match the one provided during import).
+* Absolute Path to the Image Mapping File: Path to `image-mapping.json`, which contains mappings for image urls and their corresponding JCR paths.
 
 ```
 Checking for credentials...
 ✔ Enter the absolute path to the content package: /Users/maji/Desktop/test/xwalkdemo.zip
-✔ Enter the absolute path to the jcr-image-mappings.json file: /Users/maji/Desktop/test/jcr-image-mappings.json
-✔ Enter the site name: xwalkdemo
+✔ Enter the absolute path to the image-mapping.json file: /Users/maji/Desktop/test/image-mapping.json
 ```
 
 Ensure that the content and images are successfully uploaded to your AEM instance. Verify the uploaded content through your AEM Author environment.

src/aem/downloadImages.js

@@ -13,6 +13,7 @@
 import fetch from 'node-fetch';
 import fs from 'fs';
 import path from 'path';
+import chalk from 'chalk';
 
 const CONTENT_DAM_PREFIX = '/content/dam';
 
@@ -24,7 +25,7 @@ function ensureDirSync(directoryPath) {
     // Create the directory if it doesn't exist, including parent directories
     fs.mkdirSync(directoryPath, { recursive: true });
   } catch (err) {
-    console.error('Error ensuring directory exists:', err);
+    console.error(chalk.red('Error ensuring directory exists:', err));
   }
 }
 
@@ -45,7 +46,7 @@ async function downloadImage(opts, imageUrl, jcrPath) {
 
       if (!response.ok) {
         const msg = `Failed to fetch ${imageUrl}. Status: ${response.status}.`;
-        console.error(msg);
+        console.info(chalk.yellow(msg));
         throw new Error(msg);
       }
 
@@ -62,10 +63,10 @@ async function downloadImage(opts, imageUrl, jcrPath) {
       });
     } catch (error) {
       if (attempt === maxRetries) {
-        console.error(`Failed to download ${imageUrl} after ${maxRetries} attempts.`);
+        console.error(chalk.red(`Failed to download ${imageUrl} after ${maxRetries} attempts.`));
         throw error;
       } else {
-        console.info(`Retrying download (${attempt}/${maxRetries})...`);
+        console.info(chalk.yellow(`Retrying download (${attempt}/${maxRetries})...`));
 
         // Exponential backoff
         const delay = baseDelay * 2 ** (attempt - 1);
@@ -87,7 +88,7 @@ async function downloadImage(opts, imageUrl, jcrPath) {
 async function downloadImages(opts, imageUrlMap) {
   // Map over the entries and create a promise for each image download.
   const downloadPromises = Array.from(imageUrlMap.entries()).map(([imageUrl, jcrPath]) =>
-    downloadImage(opts, imageUrl, jcrPath)
+    downloadImage(opts, imageUrl, jcrPath),
   );
 
   // Wait for all downloads to complete
@@ -97,12 +98,12 @@ async function downloadImages(opts, imageUrlMap) {
 
 /**
  * Get a map of image URLs to JCR node paths from a JSON file.
- * @param {string} jcrImageMappingFile - The path to the JSON file containing image URLs and JCR node paths
+ * @param {string} imageMappingFilePath - The path to the JSON file containing image URLs and JCR node paths
  * @returns {Map<string, string> | undefined} a map of image URLs to JCR node paths, or undefined if the file is invalid
  */
-function getImageUrlMap(jcrImageMappingFile) {
+export function getImageUrlMap(imageMappingFilePath) {
   try {
-    const data = fs.readFileSync(jcrImageMappingFile, 'utf8');
+    const data = fs.readFileSync(imageMappingFilePath, 'utf8');
     const jsonData = JSON.parse(data);
 
     if (typeof jsonData === 'object' && jsonData !== null) {
@@ -123,17 +124,17 @@ function getImageUrlMap(jcrImageMappingFile) {
     // Return undefined if there's an error reading the file or parsing JSON
     return undefined;
   }
-};
+}
 
 /**
  * Function to download images present in given markdown file.
  *
  * @param opts - The options for downloading images
- * @param jcrImageMappingFile - The file containing mappings of image urls to their JCR node paths
+ * @param imageMappingFilePath - The file containing mappings of image urls to their JCR node paths
  * @returns {Promise<void>}
  */
-export default async function downloadImagesInMarkdown(opts, jcrImageMappingFile) {
-  const imageUrlMap = getImageUrlMap(jcrImageMappingFile);
+export async function downloadImagesInMarkdown(opts, imageMappingFilePath) {
+  const imageUrlMap = getImageUrlMap(imageMappingFilePath);
 
   // Process the Map entries
   await downloadImages(opts, imageUrlMap);

src/aem/uploadImages.js

@@ -13,7 +13,8 @@
 import path from 'path';
 import fs from 'fs';
 import { FileSystemUploadOptions, FileSystemUpload } from '@adobe/aem-upload';
-import downloadImagesInMarkdown from './downloadImages.js';
+import { downloadImagesInMarkdown, getImageUrlMap } from './downloadImages.js';
+import chalk from 'chalk';
 
 function cleanup(downloadLocation) {
   return fs.promises.rm(downloadLocation, { recursive: true, force: true });
@@ -69,7 +70,7 @@ function buildFileSystemUploadOptions(opts) {
         Authorization: `Basic ${getEncodedCredentials(username, password)}`,
       },
     })
-    // If true and an asset with the given name already exists, the process will delete the existing
+    // If 'true', and an asset with the given name already exists, the process will delete the existing
     // asset and create a new one with the same name and the new binary.
     .withUploadFileOptions({ replace: true });
 }
@@ -85,30 +86,56 @@ function createFileUploader() {
   // specific handling that should occur when a file finishes uploading successfully
   fileUpload.on('fileend', (data) => {
     const { fileName } = data;
-    console.info(`Uploaded asset: ${fileName}`);
+    console.info(chalk.yellow(`Uploaded asset: ${fileName}`));
   });
 
   // specific handling that should occur when a file upload fails
   fileUpload.on('fileerror', (data) => {
     const { fileName, errors } = data;
-    console.error(`Failed to upload asset: ${fileName}. ${errors.toString()}`);
+    console.error(chalk.red(`Failed to upload asset: ${fileName}. ${errors.toString()}`));
   });
 
   return fileUpload;
 }
 
+/**
+ * Get the AEM asset folder name from the image mapping file.
+ */
+function getAemAssetFolderName(imageMappingFilePath) {
+  // Get the image URL map from the image mapping file
+  const imageUrlMap = getImageUrlMap(imageMappingFilePath);
+
+  // Look for jcr content path in the image URL map
+  // check all entries in case the value is not present in the first entry due to some reason
+  for (const jcrAssetPath of imageUrlMap.values()) {
+    if (jcrAssetPath) { // Check if the value is not empty
+      const match = jcrAssetPath.match(/^\/content\/dam\/([^/]+)/);
+      if (match) {
+        return match[1];
+      }
+    }
+  }
+
+  return null;
+}
+
 /**
  * Upload images from urls in markdown file to AEM.
  *
  * @param opts - The options for uploading images to AEM
- * @param jcrImageMappingFile - The file containing mapping of image urls to their JCR node paths
  * @returns {Promise<UploadResult>} The result of the upload operation
  */
-export default async function uploadImagesToAEM(opts, jcrImageMappingFile) {
-  const downloadLocation = path.join(process.cwd(), opts.baseAssetFolderName);
+export default async function uploadImagesToAEM(opts) {
+  const { imageMappingFilePath } = opts;
+  const aemAssetFolderName = getAemAssetFolderName(imageMappingFilePath);
+  if (!aemAssetFolderName) {
+    throw new Error('No valid AEM asset path found in the JCR image mapping file.');
+  }
+  console.log(chalk.yellow(`Uploading images to AEM asset folder: ${aemAssetFolderName}`));
+  const downloadLocation = path.join(process.cwd(), aemAssetFolderName);
 
   // download images from the image mapping file
-  await downloadImagesInMarkdown({ maxRetries: 3, downloadLocation }, jcrImageMappingFile);
+  await downloadImagesInMarkdown({ maxRetries: 3, downloadLocation }, imageMappingFilePath);
 
   // upload all assets in given folder
   const fileUpload = createFileUploader();

src/aem/uploadPackage.js

@@ -12,6 +12,7 @@
 import fs from 'fs';
 import fetch from 'node-fetch';
 import FormData from 'form-data';
+import chalk from "chalk";
 
 const BASE_DELAY = 5000; // base delay in milliseconds
 
@@ -96,16 +97,16 @@ async function uploadPackageWithRetry(endpoint, packagePath, authHeader, maxRetr
       const formData = createFormData(packagePath);
       const uploadResponse = await uploadPackage(endpoint, authHeader, formData);
       const uploadResponseBody = await parseJsonResponse(uploadResponse);
-      console.info(`Package uploaded successfully to ${uploadResponseBody.path}`);
+      console.info(chalk.yellow(`Package uploaded successfully to ${uploadResponseBody.path}`));
 
       return uploadResponseBody;
     } catch (error) {
       if (attempt === maxRetries) {
-        console.error('Max retries reached. Failed to upload package.');
+        console.error(chalk.red('Max retries reached. Failed to upload package.'));
         throw error;
       } else {
         const retryDelay = BASE_DELAY * 2 ** (attempt - 1);
-        console.warn(`Retrying package upload (${attempt}/${maxRetries}) in ${retryDelay}ms...`);
+        console.warn(chalk.yellow(`Retrying package upload (${attempt}/${maxRetries}) in ${retryDelay}ms...`));
         await new Promise((resolve) => {
           setTimeout(resolve, retryDelay);
         });
@@ -127,16 +128,16 @@ async function installPackageWithRetry(endpoint, authHeader, maxRetries = 3) {
       // Install package
       const installResponse = await installPackage(endpoint, authHeader);
       const installResponseBody = await parseJsonResponse(installResponse);
-      console.info(`Package installed successfully at ${endpoint}.`);
+      console.info(chalk.yellow(`Package installed successfully at ${endpoint}.`));
       return installResponseBody;
 
     } catch (error) {
       if (attempt === maxRetries) {
-        console.error('Max retries reached. Failed to install package.');
+        console.error(chalk.red('Max retries reached. Failed to install package.'));
         throw error;
       } else {
         const retryDelay = BASE_DELAY * 2 ** (attempt - 1);
-        console.warn(`Retrying package install (${attempt}/${maxRetries}) in ${retryDelay}ms...`);
+        console.warn(chalk.yellow(`Retrying package install (${attempt}/${maxRetries}) in ${retryDelay}ms...`));
         await new Promise((resolve) => {
           setTimeout(resolve, retryDelay);
         });
@@ -151,9 +152,9 @@ async function installPackageWithRetry(endpoint, authHeader, maxRetries = 3) {
  * @param {string} packagePath - The path to the content package file path
  * @returns {Promise<unknown>} The response from the AEM server.
  */
-export default async function uploadPackageToAEM(opts, packagePath) {
+export default async function uploadPackageToAEM(opts) {
   const {
-    username, password, targetAEMUrl, maxRetries = 3,
+    username, password, targetAEMUrl, maxRetries = 3, packagePath,
   } = opts;
 
   if (!username || !password || !targetAEMUrl || !packagePath) {