@salesforce/pwa-kit-runtime 3.15.0 → 3.16.0-nightly-20260116080227

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-runtime",
-  "version": "3.15.0",
+  "version": "3.16.0-nightly-20260116080227",
   "description": "The PWAKit Runtime",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-runtime#readme",
   "bugs": {
@@ -30,9 +30,9 @@
     "version": "node ./scripts/version.js"
   },
   "dependencies": {
+    "@aws-sdk/client-cloudwatch": "^3.962.0",
     "@h4ad/serverless-adapter": "4.4.0",
     "@loadable/babel-plugin": "^5.15.3",
-    "aws-sdk": "^2.1354.0",
     "cosmiconfig": "8.1.3",
     "cross-env": "^5.2.1",
     "express": "^4.19.2",
@@ -46,11 +46,11 @@
   },
   "devDependencies": {
     "@loadable/component": "^5.15.3",
-    "@salesforce/pwa-kit-dev": "3.15.0",
+    "@salesforce/pwa-kit-dev": "3.16.0-nightly-20260116080227",
     "@serverless/event-mocks": "^1.1.1",
     "aws-lambda-mock-context": "^3.2.1",
     "fs-extra": "^11.1.1",
-    "internal-lib-build": "3.15.0",
+    "internal-lib-build": "3.16.0-nightly-20260116080227",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
     "sinon": "^13.0.2",
@@ -58,7 +58,7 @@
     "supertest": "^4.0.2"
   },
   "peerDependencies": {
-    "@salesforce/pwa-kit-dev": "3.15.0"
+    "@salesforce/pwa-kit-dev": "3.16.0-nightly-20260116080227"
   },
   "peerDependenciesMeta": {
     "@salesforce/pwa-kit-dev": {
@@ -72,5 +72,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "af930c12134d2cf4d4b7dcf9b144f5d431092f95"
+  "gitHead": "e77808bcd68817cdcaa7cc010e8942ab99e294c6"
 }

package/ssr/server/express.lambda.test.js

@@ -291,9 +291,9 @@ describe('SSRServer Lambda integration', () => {
     // track them.
     const metrics = [];
     app.metrics._CW = {
-      putMetricData: (params, callback) => {
+      putMetricData: params => {
         metrics.push(params);
-        callback(null);
+        return Promise.resolve();
       }
     };
     const metricSent = name => !!metrics.find(metric => !!metric.MetricData.find(data => data.MetricName === name));

package/utils/ssr-server/metrics-sender.js

@@ -54,16 +54,19 @@ class MetricsSender {
     /* istanbul ignore next */
     if (!this._CW && ((0, _utils.isRemote)() || MetricsSender._override)) {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const Cloudwatch = require('aws-sdk/clients/cloudwatch');
+      const {
+        CloudWatch: Cloudwatch
+      } = require('@aws-sdk/client-cloudwatch');
       this._CW = new Cloudwatch({
-        apiVersion: '2010-08-01',
         // The AWS_REGION variable is defined by the Lambda
         // environment.
         region: process.env.AWS_REGION || 'us-east-1',
         // Setting maxRetries to 0 will prevent the SDK from retrying.
         // This is necessary because under high load, there will be backpressure
         // on the Lambda function, and causing severe performance issues (400-500ms latency)
-        maxRetries: 0
+        // The key maxRetries is renamed to maxAttempts.
+        // The value of maxAttempts needs to be maxRetries + 1.
+        maxAttempts: 1
       });
     }
     return this._CW;
@@ -83,21 +86,18 @@ class MetricsSender {
     if (!cw) {
       return Promise.resolve();
     }
-    return new Promise(resolve => {
-      cw.putMetricData({
-        MetricData: metrics,
-        Namespace: 'ssr'
-      }, err => {
-        if (err) {
-          _loggerInstance.default.warn(`Metrics: error sending data: ${err}`, {
-            namespace: 'metrics-sender._putMetricData',
-            additionalProperties: {
-              metrics,
-              error: err
-            }
-          });
+
+    // v3 supports promises, so we can use that instead of a callback.
+    return cw.putMetricData({
+      MetricData: metrics,
+      Namespace: 'ssr'
+    }).catch(err => {
+      _loggerInstance.default.warn(`Metrics: error sending data: ${err}`, {
+        namespace: 'metrics-sender._putMetricData',
+        additionalProperties: {
+          metrics,
+          error: err
         }
-        resolve();
       });
     });
   }
@@ -168,8 +168,8 @@ class MetricsSender {
       const metricData = {
         MetricName: metric.name,
         Value: metric.value || 0,
-        // This value must be a string
-        Timestamp: (metric.timestamp instanceof Date ? metric.timestamp : now).toISOString(),
+        // AWS SDK expects a Date object
+        Timestamp: metric.timestamp instanceof Date ? metric.timestamp : typeof metric.timestamp === 'number' ? new Date(metric.timestamp) : now,
         Unit: metric.unit || 'Count'
       };
       if (metric.dimensions) {

package/utils/ssr-server.test.js

@@ -360,13 +360,14 @@ describe('MetricsSender', () => {
     const calledParams = [];
     let callCount = 0;
     sender._CW = {
-      putMetricData: (params, callback) => {
+      putMetricData: params => {
         callCount += 1;
-        // This returns a fake error on the first call, and then
-        // accepts all subsequent calls.
-        const err = calledParams.length ? null : new Error('imaginary error');
         params.MetricData.forEach(metric => calledParams.push(metric));
-        callback(err, null);
+        // This returns a fake promise that resolves immediately
+        if (callCount === 1) {
+          return Promise.reject(new Error('Some error'));
+        }
+        return Promise.resolve();
       }
     };
 
@@ -393,7 +394,7 @@ describe('MetricsSender', () => {
         expect(actual).toBeDefined();
         expect(actual.MetricName).toEqual(metric.name);
         expect(actual.Value).toEqual(metric.value || 0);
-        expect(actual.Timestamp).toEqual(nowISO);
+        expect(actual.Timestamp.toISOString()).toEqual(nowISO);
         if (metric.dimensions) {
           expect(actual.Dimensions).toBeDefined();
           actual.Dimensions.forEach(dimension => {
@@ -422,10 +423,8 @@ describe('MetricsSender', () => {
     // Set up a fake CloudWatch client that will return a Throttling
     // error every time it's called.
     sender._CW = {
-      putMetricData: (params, callback) => {
-        const err = new Error('Throttled');
-        err.code = 'Throttling';
-        callback(err);
+      putMetricData: params => {
+        return Promise.reject(new Error('Throttled'));
       }
     };