Serverless offline 6

.nvmrc

@@ -1 +1 @@
-v8.15.1
+10.15

.travis.yml

@@ -2,9 +2,9 @@ language: node_js
 sudo: required
 
 node_js:
+  - "14"
   - "12"
   - "10"
-  - "8"
 
 services:
   - docker

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "eslint.format.enable": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  }
+}

packages/serverless-offline-sqs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-offline-sqs",
-  "version": "3.1.3",
+  "version": "4.0.0",
   "description": "Emulate AWS λ and SQS locally when developing your Serverless project",
   "main": "src",
   "repository": {
@@ -21,15 +21,15 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "serverless-offline": "^5.12.1"
+    "serverless-offline": "^6.1.0"
   },
   "dependencies": {
     "aws-sdk": "^2.642.0",
     "figures": "^3.2.0",
     "lodash": "^4.17.15"
   },
   "devDependencies": {
-    "serverless-offline": "^5.12.1"
+    "serverless-offline": "^6.1.0"
   },
   "keywords": [
     "sqs",

packages/serverless-offline-sqs/src/index.js

@@ -1,4 +1,3 @@
-const {join} = require('path');
 const figures = require('figures');
 const SQS = require('aws-sdk/clients/sqs');
 const {
@@ -24,8 +23,6 @@ const {
   toPairs,
   values
 } = require('lodash/fp');
-const functionHelper = require('serverless-offline/src/functionHelper');
-const LambdaContext = require('serverless-offline/src/LambdaContext');
 
 const fromCallback = fun =>
   new Promise((resolve, reject) => {
@@ -56,6 +53,14 @@ class ServerlessOfflineSQS {
       'before:offline:start:end': this.offlineStartEnd.bind(this)
     };
 
+    this.serverlessOfflinePlugin = this.serverless.pluginManager.plugins.find(
+      plugin => plugin.commands && plugin.commands.offline
+    );
+
+    if (!this.serverlessOfflinePlugin) {
+      throw new Error('Missing serverless-offline plugin');
+    }
+
     this.streams = [];
   }
 
@@ -120,43 +125,13 @@ class ServerlessOfflineSQS {
     return queueName;
   }
 
-  eventHandler(queueEvent, functionName, messages, cb) {
-    if (!messages) return cb();
+  async eventHandler(queueEvent, functionName, messages) {
+    if (!messages) return;
 
     const streamName = this.getQueueName(queueEvent);
     this.serverless.cli.log(`${streamName} (λ: ${functionName})`);
 
     const config = this.getConfig();
-    const {location = '.'} = config;
-
-    const __function = this.service.getFunction(functionName);
-
-    const {env} = process;
-    const functionEnv = assignAll([
-      {AWS_REGION: get('service.provider.region', this)},
-      env,
-      get('service.provider.environment', this),
-      get('environment', __function)
-    ]);
-    process.env = functionEnv;
-
-    const serviceRuntime = this.service.provider.runtime;
-    const servicePath = join(this.serverless.config.servicePath, location);
-
-    const funOptions = functionHelper.getFunctionOptions(
-      __function,
-      functionName,
-      servicePath,
-      serviceRuntime
-    );
-    const handler = functionHelper.createHandler(funOptions, config);
-
-    const lambdaContext = new LambdaContext(__function, this.service.provider, (err, data) => {
-      this.serverless.cli.log(
-        `[${err ? figures.cross : figures.tick}] ${functionName} ${JSON.stringify(data) || ''}`
-      );
-      cb(err, data);
-    });
 
     const awsRegion = config.region || 'us-west-2';
     const awsAccountId = config.accountId || '000000000000';
@@ -188,12 +163,30 @@ class ServerlessOfflineSQS {
       )
     };
 
-    const x = handler(event, lambdaContext, lambdaContext.done);
-    if (x && typeof x.then === 'function' && typeof x.catch === 'function')
-      x.then(lambdaContext.succeed).catch(lambdaContext.fail);
-    else if (x instanceof Error) lambdaContext.fail(x);
+    const lambdaFunction = this.getLambdaFunction(functionName);
+    lambdaFunction.setEvent(event);
+
+    let err = null;
+    let data = null;
+    try {
+      data = await lambdaFunction.runHandler();
+    } catch (executionError) {
+      err = executionError;
+      throw err;
+    } finally {
+      this.serverless.cli.log(
+        `${streamName} (λ: ${functionName}) [${
+          err ? figures.cross : figures.tick
+        }] ${JSON.stringify(data) || ''}`
+      );
+    }
+  }
 
-    process.env = env;
+  getLambdaFunction(functionName) {
+    // TODO: Find a better way to hook into serverless-offline Lambda
+    const lambda = this.serverlessOfflinePlugin.__private_5_lambda;
+    const lambdaFunction = lambda.get(functionName);
+    return lambdaFunction;
   }
 
   async createQueueReadable(functionName, queueEvent) {
@@ -226,7 +219,7 @@ class ServerlessOfflineSQS {
 
       if (Messages) {
         try {
-          await fromCallback(cb => this.eventHandler(queueEvent, functionName, Messages, cb));
+          await this.eventHandler(queueEvent, functionName, Messages);
 
           await fromCallback(cb =>
             client.deleteMessageBatch(

tests/serverless-plugins-integration/package.json

@@ -22,10 +22,10 @@
     "figures": "^3.0.0",
     "lodash": "^4.17.15",
     "serverless": "^1.53.0",
-    "serverless-offline": "^5.11.0",
+    "serverless-offline": "^6.1.0",
     "serverless-offline-dynamodb-streams": "^3.0.2",
     "serverless-offline-kinesis": "^3.0.2",
-    "serverless-offline-sqs": "^3.1.3",
+    "serverless-offline-sqs": "^4.0.0",
     "serverless-offline-ssm-provider": "^2.0.1",
     "signal-exit": "^3.0.2"
   }

tests/serverless-plugins-integration/serverless.sqs.autocreate.yml

@@ -6,11 +6,11 @@ provider:
   runtime: nodejs8.10
 
 plugins:
-  localPath: '../../packages'
+  localPath: "../../packages"
   modules:
     - serverless-offline-ssm-provider
-    - serverless-offline-sqs
     - serverless-offline
+    - serverless-offline-sqs
 
 functions:
   autoCreatedHandler:
@@ -49,7 +49,7 @@ resources:
           maxReceiveCount: 12
         MessageRetentionPeriod: 1209600
         ContentBasedDeduplication: true
-        Policy: {Ref: "whatever the policy, i'll ignore it"}
+        Policy: { Ref: "whatever the policy, i'll ignore it" }
 
 custom:
   serverless-offline:

tests/serverless-plugins-integration/serverless.sqs.yml

@@ -6,11 +6,11 @@ provider:
   runtime: nodejs8.10
 
 plugins:
-  localPath: '../../packages'
+  localPath: "../../packages"
   modules:
     - serverless-offline-ssm-provider
-    - serverless-offline-sqs
     - serverless-offline
+    - serverless-offline-sqs
 
 functions:
   myPromiseHandler:
@@ -48,4 +48,4 @@ resources:
 custom:
   serverless-offline:
     port: 3333
-  serverless-offline-sqs: ${file(./custom.yml):serverless-offline-sqs}
+  serverless-offline-sqs: ${file(./custom.yml):serverless-offline-sqs}

tests/serverless-plugins-integration/test-dynamodb-streams.js

@@ -50,7 +50,7 @@ serverless.stdout.pipe(
     write(chunk, enc, cb) {
       const output = chunk.toString();
 
-      if (/Offline \[HTTP] listening on/.test(output)) {
+      if (/Offline.+listening on/.test(output)) {
         putItems();
       }
 

tests/serverless-plugins-integration/test-kinesis.js

@@ -54,7 +54,7 @@ serverless.stdout.pipe(
     write(chunk, enc, cb) {
       const output = chunk.toString();
 
-      if (/Offline \[HTTP] listening on/.test(output)) {
+      if (/Offline.+listening on/.test(output)) {
         putRecords();
       }
 

tests/serverless-plugins-integration/test-sqs-autocreate.js

@@ -45,7 +45,7 @@ serverless.stdout.pipe(
     write(chunk, enc, cb) {
       const output = chunk.toString();
 
-      if (/Offline \[HTTP] listening on/.test(output)) {
+      if (/Offline.+listening on/.test(output)) {
         sendMessages()
           .then(() => console.log('sucessfully send messages'))
           .catch(err => {

tests/serverless-plugins-integration/test-sqs.js

@@ -53,7 +53,7 @@ serverless.stdout.pipe(
     write(chunk, enc, cb) {
       const output = chunk.toString();
 
-      if (/Offline \[HTTP] listening on/.test(output)) {
+      if (/Offline.+listening on/.test(output)) {
         sendMessages();
       }