@adobe/spacecat-shared-utils 1.50.2 → 1.50.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-utils-v1.50.4](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.50.3...@adobe/spacecat-shared-utils-v1.50.4) (2025-09-10)
+
+
+### Bug Fixes
+
+* getPageEditUrl util ([#952](https://github.com/adobe/spacecat-shared/issues/952)) ([aef026d](https://github.com/adobe/spacecat-shared/commit/aef026db3452606936c271e87f3d376fc8a38642))
+
+# [@adobe/spacecat-shared-utils-v1.50.3](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.50.2...@adobe/spacecat-shared-utils-v1.50.3) (2025-09-09)
+
+
+### Bug Fixes
+
+* **deps:** update external major (major) ([#795](https://github.com/adobe/spacecat-shared/issues/795)) ([b020e88](https://github.com/adobe/spacecat-shared/commit/b020e884bfcad48667da87ad9caee7a3669e43d0))
+
 # [@adobe/spacecat-shared-utils-v1.50.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.50.1...@adobe/spacecat-shared-utils-v1.50.2) (2025-09-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-utils",
-  "version": "1.50.2",
+  "version": "1.50.4",
   "description": "Shared modules of the Spacecat Services - utils",
   "type": "module",
   "engines": {
@@ -36,12 +36,12 @@
   "devDependencies": {
     "@adobe/helix-shared-wrap": "2.0.2",
     "@types/validator": "^13.15.2",
-    "chai": "5.3.3",
+    "chai": "6.0.1",
     "chai-as-promised": "8.0.2",
     "esmock": "2.7.2",
     "husky": "9.1.7",
     "nock": "14.0.10",
-    "sinon": "20.0.0",
+    "sinon": "21.0.0",
     "sinon-chai": "4.0.1"
   },
   "dependencies": {
@@ -53,8 +53,7 @@
     "@aws-sdk/client-sqs": "3.883.0",
     "@json2csv/plainjs": "7.0.6",
     "aws-xray-sdk": "3.10.3",
-    "date-fns": "2.30.0",
-    "uuid": "11.1.0",
+    "date-fns": "4.1.0",
     "validator": "^13.15.15"
   }
 }

package/src/aem-content-api-utils.js

@@ -0,0 +1,124 @@
+/*
+ * Copyright 2025 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import { fetch } from './adobe-fetch.js';
+
+const CONTENT_API_PREFIX = '/adobe/experimental/aspm-expires-20251231';
+
+/**
+ * Determines the AEM CS/AMS page ID for Content API, from the page URL
+ * @param {string} pageURL - The URL of the page
+ * @param {string} authorURL - The URL of the author instance
+ * @param {string} bearerToken - The access token for the author instance
+ * @param {boolean} preferContentApi - Whether to prefer the Content API over the PSS, default is
+ * false
+ * @param {Object} log - The logger object, default is console
+ * @return {string|null} - The AEM page ID
+ */
+export async function determineAEMCSPageId(
+  pageURL,
+  authorURL,
+  bearerToken,
+  preferContentApi = false,
+  log = console,
+) {
+  log.info(`Fetching HTML from ${pageURL} to retrieve content-page-id for AEM CS Content API mode.`);
+  const htmlResponse = await fetch(pageURL);
+
+  if (!htmlResponse.ok) {
+    return null;
+  }
+
+  const html = await htmlResponse.text();
+
+  // First try to find a content-page-ref meta tag
+  const contentPageRefRegex = /<meta\s+name=['"]content-page-ref['"]\s+content=['"]([^'"]*)['"]\s*\/?>/i;
+  const refMatch = html.match(contentPageRefRegex);
+
+  if (refMatch?.[1]?.trim()) {
+    if (!authorURL || !bearerToken) {
+      // If ref was present but resolution failed, return null per spec
+      log.warn('Content-page-ref found but authorURL or bearerToken is missing, skipping resolution.');
+      return null;
+    }
+    const contentPageRef = refMatch[1].trim();
+    try {
+      const base = preferContentApi
+        ? `${authorURL}${CONTENT_API_PREFIX}`
+        : `${authorURL}/adobe/experimental/pss`;
+      const resolveUrl = `${base}/pages/resolve?pageRef=${contentPageRef}`;
+      log.info(`Resolving content-page-ref via ${resolveUrl} (preferContentApi=${preferContentApi})`);
+      const resp = await fetch(resolveUrl, {
+        method: 'GET',
+        headers: { Authorization: bearerToken },
+        redirect: 'follow',
+      });
+      if (resp.status === 200) {
+        let pageId = null;
+        if (preferContentApi) {
+          const data = await resp.json();
+          pageId = data?.id || null;
+        } else {
+          const data = await resp.text();
+          pageId = data || null;
+        }
+
+        if (pageId) {
+          log.info(`Resolved pageId: "${pageId}" from JSON directly for ref "${contentPageRef}"`);
+          return pageId;
+        }
+        log.error('resolve response did not contain an "id" property.');
+        return null;
+      } else {
+        log.warn(`Unexpected status ${resp.status} when resolving content-page-ref.`);
+      }
+    } catch (e) {
+      log.error(`Error while resolving content-page-ref: ${e.message}`);
+    }
+    // If ref was present but resolution failed, return null per spec
+    return null;
+  }
+
+  // Fallback to content-page-id meta tag
+  const contentPageIdRegex = /<meta\s+name=['"]content-page-id['"]\s+content=['"]([^'"]*)['"]\s*\/?>/i;
+  const idMatch = html.match(contentPageIdRegex);
+
+  let pageId = null;
+  if (idMatch?.[1]?.trim()) {
+    pageId = idMatch[1].trim();
+    if (pageId) {
+      log.info(`Extracted pageId: "${pageId}" from "content-page-id" meta tag at ${pageURL}`);
+    }
+  }
+  return pageId;
+}
+
+/**
+ * Fetch the edit URL for a given page ID using the Content API
+ * @param {string} authorURL - The author URL
+ * @param {string} bearerToken - The bearer token
+ * @param {string} pageId - The page ID
+ * @returns {string} The edit URL or null if the page ID is not found
+ */
+export const getPageEditUrl = async (authorURL, bearerToken, pageId) => {
+  const PAGE_ID_API = `${authorURL}${CONTENT_API_PREFIX}/pages/${pageId}`;
+  const response = await fetch(PAGE_ID_API, {
+    method: 'GET',
+    headers: { Authorization: bearerToken },
+  });
+  if (response.ok) {
+    const responseData = await response.json();
+    // eslint-disable-next-line no-underscore-dangle
+    return responseData?._links?.edit;
+  }
+  return null;
+};

package/src/aem.js

@@ -10,8 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-import { fetch } from './adobe-fetch.js';
-
 /**
  * Delivery types for AEM deployment
  */
@@ -199,91 +197,3 @@ export function detectAEMVersion(htmlSource, headers = {}) {
   const found = types.find(([, count]) => count === maxMatches);
   return found[0];
 }
-
-/**
- * Determines the AEM CS/AMS page ID for Content API, from the page URL
- * @param {string} pageURL - The URL of the page
- * @param {string} authorURL - The URL of the author instance
- * @param {string} bearerToken - The access token for the author instance
- * @param {boolean} preferContentApi - Whether to prefer the Content API over the PSS, default is
- * false
- * @param {Object} log - The logger object, default is console
- * @return {string|null} - The AEM page ID
- */
-export async function determineAEMCSPageId(
-  pageURL,
-  authorURL,
-  bearerToken,
-  preferContentApi = false,
-  log = console,
-) {
-  log.info(`Fetching HTML from ${pageURL} to retrieve content-page-id for AEM CS Content API mode.`);
-  const htmlResponse = await fetch(pageURL);
-
-  if (!htmlResponse.ok) {
-    return null;
-  }
-
-  const html = await htmlResponse.text();
-
-  // First try to find a content-page-ref meta tag
-  const contentPageRefRegex = /<meta\s+name=['"]content-page-ref['"]\s+content=['"]([^'"]*)['"]\s*\/?>/i;
-  const refMatch = html.match(contentPageRefRegex);
-
-  if (refMatch?.[1]?.trim()) {
-    if (!authorURL || !bearerToken) {
-      // If ref was present but resolution failed, return null per spec
-      log.warn('Content-page-ref found but authorURL or bearerToken is missing, skipping resolution.');
-      return null;
-    }
-    const contentPageRef = refMatch[1].trim();
-    try {
-      const base = preferContentApi
-        ? `${authorURL}/adobe/experimental/aspm-expires-20251231`
-        : `${authorURL}/adobe/experimental/pss`;
-      const resolveUrl = `${base}/pages/resolve?pageRef=${contentPageRef}`;
-      log.info(`Resolving content-page-ref via ${resolveUrl} (preferContentApi=${preferContentApi})`);
-      const resp = await fetch(resolveUrl, {
-        method: 'GET',
-        headers: { Authorization: bearerToken },
-        redirect: 'follow',
-      });
-      if (resp.status === 200) {
-        let pageId = null;
-        if (preferContentApi) {
-          const data = await resp.json();
-          pageId = data?.id || null;
-        } else {
-          const data = await resp.text();
-          pageId = data || null;
-        }
-
-        if (pageId) {
-          log.info(`Resolved pageId: "${pageId}" from JSON directly for ref "${contentPageRef}"`);
-          return pageId;
-        }
-        log.error('resolve response did not contain an "id" property.');
-        return null;
-      } else {
-        log.warn(`Unexpected status ${resp.status} when resolving content-page-ref.`);
-      }
-    } catch (e) {
-      log.error(`Error while resolving content-page-ref: ${e.message}`);
-    }
-    // If ref was present but resolution failed, return null per spec
-    return null;
-  }
-
-  // Fallback to content-page-id meta tag
-  const contentPageIdRegex = /<meta\s+name=['"]content-page-id['"]\s+content=['"]([^'"]*)['"]\s*\/?>/i;
-  const idMatch = html.match(contentPageIdRegex);
-
-  let pageId = null;
-  if (idMatch?.[1]?.trim()) {
-    pageId = idMatch[1].trim();
-    if (pageId) {
-      log.info(`Extracted pageId: "${pageId}" from "content-page-id" meta tag at ${pageURL}`);
-    }
-  }
-  return pageId;
-}

package/src/functions.js

@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import { validate as uuidValidate } from 'uuid';
 import isEmail from 'validator/lib/isEmail.js';
 
 // Precompile regular expressions
 const REGEX_ISO_DATE = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/;
 const REGEX_TIME_OFFSET_DATE = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}(Z|[+-]\d{2}:\d{2})/;
 const IMS_ORG_ID_REGEX = /[a-z0-9]{24}@AdobeOrg/i;
+const UUID_V4_REGEX = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
 
 /**
  * Determines if the given parameter is an array.
@@ -204,7 +204,7 @@ function isValidUrl(urlString) {
  * @return {boolean} True if the given string is a valid UUID.
  */
 function isValidUUID(uuid) {
-  return uuidValidate(uuid);
+  return UUID_V4_REGEX.test(uuid);
 }
 
 /**

package/src/index.js

@@ -91,4 +91,6 @@ export {
   getTemporalCondition,
 } from './calendar-week-helper.js';
 
-export { detectAEMVersion, determineAEMCSPageId, DELIVERY_TYPES } from './aem.js';
+export { detectAEMVersion, DELIVERY_TYPES } from './aem.js';
+
+export { determineAEMCSPageId, getPageEditUrl } from './aem-content-api-utils.js';