@salesforce/pwa-kit-runtime 3.9.0 → 3.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-runtime",
-  "version": "3.9.0",
+  "version": "3.9.2",
   "description": "The PWAKit Runtime",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-runtime#readme",
   "bugs": {
@@ -46,11 +46,11 @@
   },
   "devDependencies": {
     "@loadable/component": "^5.15.3",
-    "@salesforce/pwa-kit-dev": "3.9.0",
+    "@salesforce/pwa-kit-dev": "3.9.2",
     "@serverless/event-mocks": "^1.1.1",
     "aws-lambda-mock-context": "^3.2.1",
     "fs-extra": "^11.1.1",
-    "internal-lib-build": "3.9.0",
+    "internal-lib-build": "3.9.2",
     "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.9.0"
+    "@salesforce/pwa-kit-dev": "3.9.2"
   },
   "peerDependenciesMeta": {
     "@salesforce/pwa-kit-dev": {
@@ -72,5 +72,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "bb69324df47c107d592f50aa9a5e7069ae89fccd"
+  "gitHead": "d982971e3a1cc1f65ce296e526c459b2ea5f83fe"
 }

package/ssr/server/build-remote-server.js

@@ -319,6 +319,8 @@ const RemoteServerFactory = exports.RemoteServerFactory = {
     app.disable('x-powered-by');
     const mixin = {
       options,
+      // Forcing a GC is no longer necessary, and will be
+      // skipped by default (unless FORCE_GC env-var is set).
       _collectGarbage() {
         // Do global.gc in a separate 'then' handler so
         // that all major variables are out of scope and
@@ -883,12 +885,15 @@ const RemoteServerFactory = exports.RemoteServerFactory = {
       // the response to the browser.
       context.callbackWaitsForEmptyEventLoop = false;
       if (lambdaContainerReused) {
-        // DESKTOP-434 If this Lambda container is being reused,
-        // clean up memory now, so that we start with low usage.
-        // These regular GC calls take about 80-100 mS each, as opposed
-        // to forced GC calls, which occur randomly and can take several
-        // hundred mS.
-        app._collectGarbage();
+        const forceGarbageCollection = process.env.FORCE_GC;
+        if (forceGarbageCollection && forceGarbageCollection.toLowerCase() === 'true') {
+          // DESKTOP-434 If this Lambda container is being reused,
+          // clean up memory now, so that we start with low usage.
+          // These regular GC calls take about 80-100 mS each, as opposed
+          // to forced GC calls, which occur randomly and can take several
+          // hundred mS.
+          app._collectGarbage();
+        }
         app.sendMetric('LambdaReused');
       } else {
         // This is the first use of this container, so set the

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

@@ -54,6 +54,54 @@ const testFixtures = path.resolve(process.cwd(), 'src/ssr/server/test_fixtures')
 const httpsAgent = new https.Agent({
   rejectUnauthorized: false
 });
+function createServerWithGCSpy() {
+  const route = jest.fn((req, res) => {
+    res.send('<html/>');
+  });
+  const options = {
+    buildDir: testFixtures,
+    mobify: testPackageMobify,
+    sslFilePath: path.join(testFixtures, 'localhost.pem'),
+    quiet: true,
+    port: TEST_PORT,
+    fetchAgents: {
+      https: httpsAgent
+    }
+  };
+  const {
+    handler,
+    server,
+    app
+  } = RemoteServerFactory.createHandler(options, app => {
+    app.get('/*', route);
+  });
+  const collectGarbage = jest.spyOn(app, '_collectGarbage');
+  const sendMetric = jest.spyOn(app, 'sendMetric');
+  return {
+    route,
+    handler,
+    collectGarbage,
+    sendMetric,
+    server
+  };
+}
+function createApiGatewayEvent() {
+  // Set up a fake event and a fake context for the Lambda call
+  const event = createEvent('aws:apiGateway', {
+    path: '/',
+    body: undefined
+  });
+  if (event.queryStringParameters) {
+    delete event.queryStringParameters;
+  }
+  const context = AWSMockContext({
+    functionName: 'SSRTest'
+  });
+  return {
+    event,
+    context
+  };
+}
 describe('SSRServer Lambda integration', () => {
   let savedEnvironment;
   let server;
@@ -329,42 +377,50 @@ describe('SSRServer Lambda integration', () => {
       X_HEADERS_TO_REMOVE_ORIGIN.forEach(key => expect(reqHeaders[key]).toBeUndefined());
     });
   });
-  test('Lambda reuse behaviour', () => {
-    const route = jest.fn((req, res) => {
-      res.send('<html/>');
-    });
-    const options = {
-      buildDir: testFixtures,
-      mobify: testPackageMobify,
-      sslFilePath: path.join(testFixtures, 'localhost.pem'),
-      quiet: true,
-      port: TEST_PORT,
-      fetchAgents: {
-        https: httpsAgent
-      }
-    };
+  test('Lambda reuse -- Default Behavior', () => {
     const {
-      app,
+      route,
       handler,
-      server: srv
-    } = RemoteServerFactory.createHandler(options, app => {
-      app.get('/*', route);
-    });
-    const collectGarbage = jest.spyOn(app, '_collectGarbage');
-    const sendMetric = jest.spyOn(app, 'sendMetric');
-    server = srv;
-
-    // Set up a fake event and a fake context for the Lambda call
-    const event = createEvent('aws:apiGateway', {
-      path: '/',
-      body: undefined
-    });
-    if (event.queryStringParameters) {
-      delete event.queryStringParameters;
-    }
-    const context = AWSMockContext({
-      functionName: 'SSRTest'
+      collectGarbage,
+      sendMetric,
+      new_server
+    } = createServerWithGCSpy();
+    const {
+      event,
+      context
+    } = createApiGatewayEvent();
+    server = new_server;
+    const call = event => new Promise(resolve => handler(event, context, (err, response) => resolve(response)));
+    return Promise.resolve().then(() => call(event)).then(response => {
+      // First request - Lambda container created
+      expect(response.statusCode).toBe(200);
+      expect(collectGarbage.mock.calls).toHaveLength(0);
+      expect(route.mock.calls).toHaveLength(1);
+      expect(sendMetric).toHaveBeenCalledWith('LambdaCreated');
+      expect(sendMetric).not.toHaveBeenCalledWith('LambdaReused');
+    }).then(() => call(event)).then(response => {
+      // Second call - Lambda container reused
+      expect(response.statusCode).toBe(200);
+      expect(collectGarbage.mock.calls).toHaveLength(0);
+      expect(route.mock.calls).toHaveLength(2);
+      expect(sendMetric).toHaveBeenCalledWith('LambdaCreated');
+      expect(sendMetric).toHaveBeenCalledWith('LambdaReused');
     });
+  });
+  test('Lambda reuse -- with Forced Garbage Collection Enabled', () => {
+    process.env.FORCE_GC = 'true';
+    const {
+      event,
+      context
+    } = createApiGatewayEvent();
+    const {
+      route,
+      handler,
+      collectGarbage,
+      sendMetric,
+      new_server
+    } = createServerWithGCSpy();
+    server = new_server;
     const call = event => new Promise(resolve => handler(event, context, (err, response) => resolve(response)));
     return Promise.resolve().then(() => call(event)).then(response => {
       // First request - Lambda container created

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

@@ -59,7 +59,11 @@ class MetricsSender {
         apiVersion: '2010-08-01',
         // The AWS_REGION variable is defined by the Lambda
         // environment.
-        region: process.env.AWS_REGION || 'us-east-1'
+        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
       });
     }
     return this._CW;