node-lambda 1.2.1 → 1.3.0

package/.github/workflows/codeql-analysis.yml

@@ -29,7 +29,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -40,7 +40,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -54,4 +54,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

package/CHANGELOG.md

@@ -480,3 +480,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Improve testing
 - Update dependencies
 - Update README
+
+## [1.3.0] - 2024-01-04
+### Features
+- Support .mjs [#701](https://github.com/motdotla/node-lambda/pull/701)
+- Update lambda runtime list [#702](https://github.com/motdotla/node-lambda/pull/702)
+
+### Minor changes
+- Update dependencies

package/README.md

@@ -230,7 +230,7 @@ AWS Lambda will let you set environment variables for your function. Use the sam
 
 ## Node.js Runtime Configuration
 
-AWS Lambda now supports Node.js 18, Node.js 16 and Node.js 14. Please also check the [Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) page.
+AWS Lambda now supports Node.js 20, Node.js 18 and Node.js 16. Please also check the [Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) page.
 
 ## Use S3 to deploy
 

package/index_mjs.mjs

@@ -0,0 +1,9 @@
+// For development/testing purposes
+export const handler = (event, context, callback) => {
+  console.log('Running index.handler (mjs)')
+  console.log('==================================')
+  console.log('event', event)
+  console.log('==================================')
+  console.log('Stopping index.handler (mjs)')
+  callback(null)
+}

package/lib/.env.example

@@ -10,7 +10,7 @@ AWS_HANDLER=index.handler
 AWS_MEMORY_SIZE=128
 AWS_TIMEOUT=3
 AWS_DESCRIPTION=
-AWS_RUNTIME=nodejs18.x
+AWS_RUNTIME=nodejs20.x
 AWS_VPC_SUBNETS=
 AWS_VPC_SECURITY_GROUPS=
 AWS_TRACING_CONFIG=

package/lib/main.js

@@ -52,14 +52,25 @@ event_sources.json and ${program.eventFile} files as needed.`)
   }
 
   async run (program) {
-    if (!['nodejs14.x', 'nodejs16.x', 'nodejs18.x'].includes(program.runtime)) {
+    if (!['nodejs16.x', 'nodejs18.x', 'nodejs20.x'].includes(program.runtime)) {
       console.error(`Runtime [${program.runtime}] is not supported.`)
       process.exit(254)
     }
 
     this._createSampleFile(program.eventFile, 'event.json')
     const splitHandler = program.handler.split('.')
-    const filename = splitHandler[0] + '.js'
+    const filename = (() => {
+      for (const extension of ['.js', '.mjs']) {
+        if (fs.existsSync(splitHandler[0] + extension)) {
+          return splitHandler[0] + extension
+        }
+      }
+    })()
+    if (filename == null) {
+      console.error('Handler file not found.')
+      process.exitCode = 255
+      return
+    }
     const handlername = splitHandler[1]
 
     // Set custom environment variables if program.configFile is defined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-lambda",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Command line tool for locally running and remotely deploying your node.js applications to Amazon Lambda.",
   "main": "lib/main.js",
   "directories": {

package/test/main.js

@@ -23,7 +23,7 @@ const originalProgram = {
   memorySize: 128,
   timeout: 3,
   description: '',
-  runtime: 'nodejs18.x',
+  runtime: 'nodejs20.x',
   deadLetterConfigTargetArn: '',
   tracingConfig: '',
   Layers: '',
@@ -160,7 +160,7 @@ describe('lib/main', function () {
   })
 
   it('version should be set', () => {
-    assert.equal(lambda.version, '1.2.1')
+    assert.equal(lambda.version, '1.3.0')
   })
 
   describe('_codeDirectory', () => {

package/test/node-lambda.js

@@ -157,7 +157,7 @@ describe('bin/node-lambda', () => {
         process.env.AWS_RUNTIME = 'test'
       })
       after(() => {
-        process.env.AWS_RUNTIME = 'nodejs18.x'
+        process.env.AWS_RUNTIME = 'nodejs20.x'
       })
 
       it('`node-lambda run` exitCode is `254` (callback(null))', (done) => {
@@ -171,14 +171,14 @@ describe('bin/node-lambda', () => {
       })
     })
 
-    describe('node-lambda run (Runtime nodejs18.x is supported)', () => {
+    describe('node-lambda run (Runtime nodejs20.x is supported)', () => {
       const eventObj = {
         asyncTest: false,
         callbackWaitsForEmptyEventLoop: true // True is the default value of Lambda
       }
 
       before(() => {
-        process.env.AWS_RUNTIME = 'nodejs18.x'
+        process.env.AWS_RUNTIME = 'nodejs20.x'
       })
 
       it('`node-lambda run` exitCode is not `254` (callback(null))', (done) => {
@@ -189,7 +189,7 @@ describe('bin/node-lambda', () => {
       })
     })
 
-    describe('node-lambda run (Multiple events))', () => {
+    describe('node-lambda run (Multiple events)', () => {
       const eventObj = [{
         asyncTest: false,
         callbackWaitsForEmptyEventLoop: true,
@@ -217,7 +217,7 @@ describe('bin/node-lambda', () => {
       })
     })
 
-    describe('node-lambda run (disable Multiple events))', () => {
+    describe('node-lambda run (disable Multiple events)', () => {
       const eventObj = [{
         asyncTest: false,
         callbackWaitsForEmptyEventLoop: true,
@@ -264,7 +264,7 @@ describe('bin/node-lambda', () => {
       })
     })
 
-    describe('node-lambda run (API Gateway events))', () => {
+    describe('node-lambda run (API Gateway events)', () => {
       const eventObj = {
         asyncTest: false,
         callbackWaitsForEmptyEventLoop: true,
@@ -295,6 +295,54 @@ describe('bin/node-lambda', () => {
         })
       })
     })
+
+    describe('node-lambda run (by *.mjs)', () => {
+      it('`node-lambda run` by index.mjs', function (done) {
+        const run = spawn('node', [
+          nodeLambdaPath, 'run',
+          '--handler', 'index_mjs.handler'
+        ])
+        let stdoutString = ''
+        run.stdout.on('data', (data) => {
+          stdoutString += data.toString().replace(/\r|\n|\s/g, '')
+        })
+
+        run.on('exit', (code) => {
+          const expected = 'Runningindex.handler(mjs)' +
+            '==================================' +
+            'event{asyncTest:false,callbackWaitsForEmptyEventLoop:true,callbackCode:\'callback(null);\'}' +
+            '==================================' +
+            'Stoppingindex.handler(mjs)Success:'
+          assert.equal(stdoutString, expected)
+          assert.equal(code, 0)
+          done()
+        })
+      })
+    })
+
+    describe('node-lambda run (handler file not found)', () => {
+      it('`node-lambda run` Invalid handler specification.', function (done) {
+        const run = spawn('node', [
+          nodeLambdaPath, 'run',
+          '--handler', 'not_found.handler'
+        ])
+        let stdoutString = ''
+        run.stdout.on('data', (data) => {
+          stdoutString += data.toString().replace(/\r|\n|\s/g, '')
+        })
+        let stderrString = ''
+        run.stderr.on('data', (data) => {
+          stderrString += data.toString()
+        })
+
+        run.on('exit', (code) => {
+          assert.equal(stdoutString, '')
+          assert.match(stderrString, /Handler file not found\./)
+          assert.equal(code, 255)
+          done()
+        })
+      })
+    })
   })
 
   describe('node-lambda duplicate check of short option', () => {