chore(refactor): check page before loading its last modified [skip ci]

Author: dominique-pfister

src/index/index-page.js

@@ -14,8 +14,7 @@ import { contains, indexResource } from '@adobe/helix-shared-indexer';
 import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
 import { fetchPage } from './fetch-page.js';
 import {
-  getIndexTargets, hasSiteConfig, shouldIndex,
-  getIndexType, getFetchHeaders, containsPath, isSiteConfig,
+  getIndexType, getFetchHeaders, isSiteConfig,
   INTERNAL_SITEMAP_INDEX,
 } from './utils.js';
 
@@ -91,18 +90,7 @@ function indexPageInIndex(path, config, page, log) {
  */
 export async function indexPage(context, info, index, retryParams) {
   const { config: { content: { source } }, log } = context;
-  const { webPath, resourcePath, ext } = info;
-
-  if (webPath.startsWith('/.helix/') || !containsPath(index, webPath)) {
-    return new Response('', { status: 204 });
-  }
-
-  const excludes = getIndexTargets(index);
-  const includeOther = hasSiteConfig(index);
-
-  if (!shouldIndex(includeOther, ext) || excludes.includes(resourcePath)) {
-    return new Response('', { status: 204 });
-  }
+  const { webPath, resourcePath } = info;
 
   const url = info.getLiveUrl();
   const headers = await getFetchHeaders(context, info);

src/index/status.js

@@ -9,7 +9,11 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { Response } from '@adobe/fetch';
 import { indexPage } from './index-page.js';
+import {
+  getIndexTargets, hasSiteConfig, shouldIndex, containsPath,
+} from './utils.js';
 
 /**
  * Returns the index records for a resource.
@@ -20,6 +24,18 @@ import { indexPage } from './index-page.js';
  * @returns {Promise<Response>} response
  */
 export default async function status(context, info, index) {
+  const { webPath, resourcePath, ext } = info;
+  if (webPath.startsWith('/.helix/') || !containsPath(index, webPath)) {
+    return new Response('', { status: 204 });
+  }
+
+  const excludes = getIndexTargets(index);
+  const includeOther = hasSiteConfig(index);
+
+  if (!shouldIndex(includeOther, ext) || excludes.includes(resourcePath)) {
+    return new Response('', { status: 204 });
+  }
+
   const response = await indexPage(context, info, index);
   return response;
 }

src/index/update.js

@@ -12,7 +12,10 @@
 import { Response } from '@adobe/fetch';
 import { getContentBusInfo } from '../contentbus/contentbus.js';
 import { indexPage } from './index-page.js';
-import { sendToQueue } from './utils.js';
+import {
+  getIndexTargets, hasSiteConfig, shouldIndex,
+  containsPath, sendToQueue,
+} from './utils.js';
 
 /**
  * Used for our retry count below.
@@ -80,6 +83,18 @@ async function getRetryParams(context, info) {
  * @returns {Promise<Response>} response
  */
 export default async function update(context, info, index, properties = {}) {
+  const { webPath, resourcePath, ext } = info;
+  if (webPath.startsWith('/.helix/') || !containsPath(index, webPath)) {
+    return new Response('', { status: 204 });
+  }
+
+  const excludes = getIndexTargets(index);
+  const includeOther = hasSiteConfig(index);
+
+  if (!shouldIndex(includeOther, ext) || excludes.includes(resourcePath)) {
+    return new Response('', { status: 204 });
+  }
+
   const retryParams = await getRetryParams(context, info);
   const response = await indexPage(context, info, index, retryParams);
   if (response.status !== 200) {

test/index/update.test.js

@@ -238,11 +238,6 @@ describe('Index Update Tests', () => {
     });
 
     it('ignores resources in `.helix`', async () => {
-      // TODO: should not be required if it won't be indexed
-      nock.content()
-        .head('/live/.helix/config.json')
-        .reply(200, '', { 'x-amz-meta-x-source-last-modified': 'Thu, 08 Jul 2021 11:04:16 GMT' });
-
       const { request, context } = setupTest('/.helix/config.json');
       const response = await main(request, context);
 

test/live/publish.test.js

@@ -339,8 +339,6 @@ describe('Publish Action Tests', () => {
       nock.content()
         .head('/preview/query-index.json')
         .reply(200, '', { 'last-modified': 'Thu, 08 Jul 2021 10:04:16 GMT' })
-        .head('/live/query-index.json')
-        .reply(404)
         .copyObject('/live/query-index.json')
         .reply(200, new xml2js.Builder().buildObject({
           CopyObjectResult: {
@@ -396,8 +394,6 @@ describe('Publish Action Tests', () => {
       nock.content()
         .head('/preview/sitemap-index.json')
         .reply(200, '', { 'last-modified': 'Thu, 08 Jul 2021 10:04:16 GMT' })
-        .head('/live/sitemap-index.json')
-        .reply(404)
         .copyObject('/live/sitemap-index.json')
         .reply(200, new xml2js.Builder().buildObject({
           CopyObjectResult: {