@adobe/spacecat-shared-data-access 3.75.1 → 3.75.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [@adobe/spacecat-shared-data-access-v3.75.3](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.75.2...@adobe/spacecat-shared-data-access-v3.75.3) (2026-06-16)
+
+### Bug Fixes
+
+* add EBUSY retry support to S3Client via custom retry strategy ([#1677](https://github.com/adobe/spacecat-shared/issues/1677)) ([04e5504](https://github.com/adobe/spacecat-shared/commit/04e550481cdff0e7545036320aaa43ed64e99ce3)), closes [#1659](https://github.com/adobe/spacecat-shared/issues/1659) [#1659](https://github.com/adobe/spacecat-shared/issues/1659)
+
+## [@adobe/spacecat-shared-data-access-v3.75.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.75.1...@adobe/spacecat-shared-data-access-v3.75.2) (2026-06-16)
+
+### Bug Fixes
+
+* pageCitability url-upsert + metrics-store $metadata 404 detection ([#1683](https://github.com/adobe/spacecat-shared/issues/1683)) ([693a943](https://github.com/adobe/spacecat-shared/commit/693a943396fb78db3caf31fd2cb7f643f66bb0ef))
+
 ## [@adobe/spacecat-shared-data-access-v3.75.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.75.0...@adobe/spacecat-shared-data-access-v3.75.1) (2026-06-15)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "3.75.1",
+  "version": "3.75.3",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "engines": {
@@ -44,6 +44,7 @@
     "@adobe/spacecat-shared-utils": "1.105.0",
     "@supabase/postgrest-js": "2.106.2",
     "@aws-sdk/client-s3": "^3.940.0",
+    "@smithy/util-retry": "^4.0.0",
     "@types/joi": "17.2.3",
     "aws-xray-sdk": "3.12.0",
     "joi": "18.2.1",

package/src/models/base/base.collection.js

@@ -731,7 +731,7 @@ class BaseCollection {
     return this.#queryByIndexKeys(keys, { ...options, limit: 1 });
   }
 
-  async create(item, { upsert = false } = {}) {
+  async create(item, { upsert = false, onConflict } = {}) {
     if (!isNonEmptyObject(item)) {
       const message = `Failed to create [${this.entityName}]: data is required`;
       this.log.error(message);
@@ -751,7 +751,7 @@ class BaseCollection {
 
       const prepared = this.#prepareItem(item);
       const payload = this.#toDbRecord(prepared);
-      const conflictKey = this.#toDbField(this.idName);
+      const conflictKey = this.#toDbField(onConflict ?? this.idName);
 
       let query = this.postgrestService.from(this.tableName);
       query = upsert ? query.upsert(payload, { onConflict: conflictKey }) : query.insert(payload);

package/src/models/configuration/configuration.collection.js

@@ -27,6 +27,10 @@ const S3_CONFIG_KEY = 'config/spacecat/global-config.json';
  * Unlike other collections, this uses S3 instead of PostgREST.
  * Configuration is stored as a versioned JSON object in S3.
  *
+ * The S3Client is configured with a custom retry strategy (EbusyRetryStrategy) that extends
+ * the AWS SDK's StandardRetryStrategy to also retry EBUSY DNS errors. This handles the chronic
+ * DNS resolver exhaustion issue in Lambda without adding application-level retry logic.
+ *
  * @class ConfigurationCollection
  */
 class ConfigurationCollection {

package/src/models/page-citability/page-citability.collection.js

@@ -21,7 +21,19 @@ import BaseCollection from '../base/base.collection.js';
 class PageCitabilityCollection extends BaseCollection {
   static COLLECTION_NAME = 'PageCitabilityCollection';
 
-  // add custom collection-level methods here, if needed
+  /**
+   * Creates a PageCitability record, upserting on the globally-unique `url` column.
+   *
+   * The `url` column carries a global unique index (idx_page_citabilities_url_unique),
+   * so upserting on `url` makes create idempotent and eliminates the concurrent
+   * read-then-insert duplicate-key (Postgres 23505) race observed in production.
+   *
+   * @param {object} item - the PageCitability data to persist.
+   * @returns {Promise<PageCitability>} the created (or updated) PageCitability instance.
+   */
+  async create(item) {
+    return super.create(item, { upsert: true, onConflict: 'url' });
+  }
 }
 
 export default PageCitabilityCollection;

package/src/service/index.js

@@ -13,6 +13,7 @@
 import { S3Client } from '@aws-sdk/client-s3';
 import { PostgrestClient } from '@supabase/postgrest-js';
 import { h1NoCache, keepAliveNoCache } from '@adobe/fetch';
+import { StandardRetryStrategy } from '@smithy/util-retry';
 
 import { instrumentAWSClient } from '@adobe/spacecat-shared-utils';
 import { EntityRegistry } from '../models/index.js';
@@ -78,6 +79,37 @@ const createPostgrestService = (config, client = undefined) => {
   });
 };
 
+/**
+ * Custom retry strategy that extends StandardRetryStrategy to include EBUSY errors.
+ * The AWS SDK's default retry strategy handles ECONNRESET, ETIMEDOUT, ENOTFOUND, etc.,
+ * but does NOT retry EBUSY DNS errors. This class adds EBUSY to the retryable set.
+ *
+ * StandardRetryStrategy implements RetryStrategyV2 interface, which uses
+ * refreshRetryTokenForRetry() rather than retry(). The SDK's retry middleware
+ * calls this method to determine if an error should be retried.
+ */
+export class EbusyRetryStrategy extends StandardRetryStrategy {
+  constructor(maxAttempts = 4) {
+    super(maxAttempts);
+  }
+
+  async refreshRetryTokenForRetry(token, errorInfo) {
+    const { error } = errorInfo;
+
+    // Check if this is an EBUSY error (code or message)
+    const isEbusy = error?.code === 'EBUSY'
+      || (error?.message?.includes('getaddrinfo') && error?.message?.includes('EBUSY'));
+
+    if (isEbusy) {
+      // Reclassify EBUSY as TRANSIENT so StandardRetryStrategy will retry it
+      return super.refreshRetryTokenForRetry(token, { ...errorInfo, errorType: 'TRANSIENT' });
+    }
+
+    // Delegate to StandardRetryStrategy for all other errors
+    return super.refreshRetryTokenForRetry(token, errorInfo);
+  }
+}
+
 /**
  * Creates an S3 service configuration if bucket configuration is provided.
  *
@@ -93,7 +125,11 @@ const createS3Service = (config) => {
     return null;
   }
 
-  const options = region ? { region } : {};
+  const options = {
+    ...(region ? { region } : {}),
+    maxAttempts: 4,
+    retryStrategy: new EbusyRetryStrategy(4),
+  };
   const s3Client = instrumentAWSClient(new S3Client(options));
 
   return { s3Client, s3Bucket };