node-lambda 0.19.0 → 0.22.0

package/lib/main.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const process = require('process')
 const path = require('path')
 const os = require('os')
 const aws = require(path.join(__dirname, 'aws'))
@@ -51,7 +52,7 @@ event_sources.json and ${program.eventFile} files as needed.`)
   }
 
   run (program) {
-    if (!['nodejs10.x', 'nodejs12.x', 'nodejs14.x'].includes(program.runtime)) {
+    if (!['nodejs12.x', 'nodejs14.x'].includes(program.runtime)) {
       console.error(`Runtime [${program.runtime}] is not supported.`)
       process.exit(254)
     }
@@ -215,6 +216,7 @@ Emulate only the body of the API Gateway event.
       Description: program.description,
       MemorySize: program.memorySize,
       Timeout: program.timeout,
+      Architectures: program.architecture ? [program.architecture] : ['x86_64'],
       Publish: (() => {
         if (typeof program.publish === 'boolean') {
           return program.publish
@@ -385,31 +387,73 @@ Emulate only the body of the API Gateway event.
     return fs.existsSync(path.join(codeDirectory, 'package-lock.json'))
   }
 
-  _npmInstall (program, codeDirectory) {
-    // Run on windows:
-    // https://nodejs.org/api/child_process.html#child_process_spawning_bat_and_cmd_files_on_windows
-
-    const installCommand = this._shouldUseNpmCi(codeDirectory)
-      ? 'ci'
-      : 'install'
-    const npmInstallBaseOptions = [
+  _getNpmInstallCommand (program, codeDirectory) {
+    const installOptions = [
       '-s',
-      installCommand,
+      this._shouldUseNpmCi(codeDirectory) ? 'ci' : 'install',
       '--production',
       '--no-audit'
     ]
 
     if (program.optionalDependencies === false) {
-      npmInstallBaseOptions.push('--no-optional')
+      installOptions.push('--no-optional')
+    }
+
+    if (!program.dockerImage) {
+      installOptions.push('--prefix', codeDirectory)
+    }
+
+    return {
+      packageManager: 'npm',
+      installOptions
+    }
+  }
+
+  _getYarnInstallCommand (program, codeDirectory) {
+    const installOptions = [
+      '-s',
+      'install',
+      '--production'
+    ]
+
+    if (program.optionalDependencies === false) {
+      installOptions.push('--ignore-optional')
+    }
+
+    if (!program.dockerImage) {
+      installOptions.push('--cwd', codeDirectory)
     }
 
+    return {
+      packageManager: 'yarn',
+      installOptions
+    }
+  }
+
+  _packageInstall (program, codeDirectory) {
+    if (!fs.existsSync(path.join(codeDirectory, 'package.json'))) {
+      console.log('Skip the installation of the package. (Because package.json is not found.)')
+      return
+    }
+
+    // Run on windows:
+    // https://nodejs.org/api/child_process.html#child_process_spawning_bat_and_cmd_files_on_windows
+
+    const { packageManager, installOptions } = (() => {
+      // default npm
+      if (program.packageManager === 'yarn') {
+        return this._getYarnInstallCommand(program, codeDirectory)
+      }
+      return this._getNpmInstallCommand(program, codeDirectory)
+    })()
+
     const paramsOnContainer = (() => {
       // with docker
       let dockerVolumesOptions = []
       program.dockerVolumes && program.dockerVolumes.split(' ').forEach((volume) => {
         dockerVolumesOptions = dockerVolumesOptions.concat(['-v', volume])
       })
-      const dockerCommand = [program.dockerImage, 'npm'].concat(npmInstallBaseOptions)
+      const dockerCommand = [program.dockerImage, packageManager].concat(installOptions)
       const dockerBaseOptions = [
         'run', '--rm',
         '-v', `${fs.realpathSync(codeDirectory)}:/var/task`,
@@ -429,17 +473,16 @@ Emulate only the body of the API Gateway event.
     })()
 
     const paramsOnHost = (() => {
-      // simple npm install
-      const options = npmInstallBaseOptions.concat(['--prefix', codeDirectory])
+      // simple install
       if (process.platform === 'win32') {
         return {
           command: 'cmd.exe',
-          options: ['/c', 'npm'].concat(options)
+          options: ['/c', packageManager].concat(installOptions)
         }
       }
       return {
-        command: 'npm',
-        options
+        command: packageManager,
+        options: installOptions
       }
     })()
 
@@ -450,7 +493,7 @@ Emulate only the body of the API Gateway event.
         env: process.env
       }, (err) => {
         if (err) return reject(err)
-        resolve()
+        resolve(packageManager)
       })
     })
   }
@@ -518,7 +561,7 @@ Emulate only the body of the API Gateway event.
 
   _codeDirectory () {
     // Why realpathSync?:
-    // If tmpdir is symbolic link and npm>=7, `this._npmInstall()` may not work properly.
+    // If tmpdir is symbolic link and npm>=7, `this._packageInstall()` may not work properly.
     return path.join(fs.realpathSync(os.tmpdir()), `${path.basename(path.resolve('.'))}-lambda`)
   }
 
@@ -530,28 +573,27 @@ Emulate only the body of the API Gateway event.
           resolve()
         })
       })
-    } else {
-      return new Promise((resolve, reject) => {
-        fs.readdir(codeDirectory, (err, files) => {
-          if (err) return reject(err)
+    }
+    return new Promise((resolve, reject) => {
+      fs.readdir(codeDirectory, (err, files) => {
+        if (err) return reject(err)
 
-          Promise.all(files.map(file => {
-            return new Promise((resolve, reject) => {
-              if (keepNodeModules && file === 'node_modules') {
+        Promise.all(files.map(file => {
+          return new Promise((resolve, reject) => {
+            if (keepNodeModules && file === 'node_modules') {
+              resolve()
+            } else {
+              fs.remove(path.join(codeDirectory, file), err => {
+                if (err) return reject(err)
                 resolve()
-              } else {
-                fs.remove(path.join(codeDirectory, file), err => {
-                  if (err) return reject(err)
-                  resolve()
-                })
-              }
-            })
-          })).then(() => {
-            resolve()
+              })
+            }
           })
+        })).then(() => {
+          resolve()
         })
       })
-    }
+    })
   }
 
   _setRunTimeEnvironmentVars (program) {
@@ -567,10 +609,11 @@ Emulate only the body of the API Gateway event.
     }
   }
 
-  _uploadExisting (lambda, params) {
+  async _uploadExisting (lambda, params) {
     const functionCodeParams = Object.assign({
       FunctionName: params.FunctionName,
-      Publish: params.Publish
+      Publish: params.Publish,
+      Architectures: params.Architectures
     }, params.Code)
 
     const functionConfigParams = {
@@ -595,29 +638,30 @@ Emulate only the body of the API Gateway event.
       delete functionConfigParams.Layers
     }
 
-    return new Promise((resolve, reject) => {
-      const updateConfigRequest = lambda.updateFunctionConfiguration(
-        functionConfigParams,
-        (err, configResponse) => {
-          if (err) return reject(err)
-
-          const updateCodeRequest = lambda.updateFunctionCode(functionCodeParams, (err) => {
-            if (err) return reject(err)
-            resolve(configResponse)
-          })
+    const updateConfigRequest = lambda.updateFunctionConfiguration(functionConfigParams)
+    updateConfigRequest.on('retry', (response) => {
+      console.log(response.error.message)
+      console.log('=> Retrying')
+    })
+    const updateConfigResponse = await updateConfigRequest.promise()
 
-          updateCodeRequest.on('retry', (response) => {
-            console.log(response.error.message)
-            console.log('=> Retrying')
-          })
-        }
-      )
+    // Wait for the `Configuration.LastUpdateStatus` to change from `InProgress` to `Successful`.
+    for (let i = 0; i < 10; i++) {
+      const data = await lambda.getFunction({ FunctionName: params.FunctionName }).promise()
+      if (data.Configuration.LastUpdateStatus === 'Successful') {
+        break
+      }
+      await new Promise((resolve) => setTimeout(resolve, 3000))
+    }
 
-      updateConfigRequest.on('retry', (response) => {
-        console.log(response.error.message)
-        console.log('=> Retrying')
-      })
+    const updateCodeRequest = lambda.updateFunctionCode(functionCodeParams)
+    updateCodeRequest.on('retry', (response) => {
+      console.log(response.error.message)
+      console.log('=> Retrying')
     })
+    await updateCodeRequest.promise()
+
+    return updateConfigResponse
   }
 
   _uploadNew (lambda, params) {
@@ -658,13 +702,17 @@ Emulate only the body of the API Gateway event.
   _archivePrebuilt (program) {
     const codeDirectory = this._codeDirectory()
 
-    return this._fileCopy(program, program.prebuiltDirectory, codeDirectory, false).then(() => {
-      console.log('=> Zipping deployment package')
-      return this._zip(program, codeDirectory)
+    return Promise.resolve().then(() => {
+      return this._cleanDirectory(codeDirectory, program.keepNodeModules)
+    }).then(() => {
+      return this._fileCopy(program, program.prebuiltDirectory, codeDirectory, false).then(() => {
+        console.log('=> Zipping deployment package')
+        return this._zip(program, codeDirectory)
+      })
     })
   }
 
-  _buildAndArchive (program) {
+  async _buildAndArchive (program) {
     if (!fs.existsSync('.env')) {
       console.warn('[Warning] `.env` file does not exist.')
       console.info('Execute `node-lambda setup` as necessary and set it up.')
@@ -683,24 +731,19 @@ they may not work as expected in the Lambda environment.
     const codeDirectory = this._codeDirectory()
     const lambdaSrcDirectory = program.sourceDirectory ? program.sourceDirectory.replace(/\/$/, '') : '.'
 
-    return Promise.resolve().then(() => {
-      return this._cleanDirectory(codeDirectory, program.keepNodeModules)
-    }).then(() => {
-      console.log('=> Moving files to temporary directory')
-      return this._fileCopy(program, lambdaSrcDirectory, codeDirectory, true)
-    }).then(() => {
-      if (program.keepNodeModules) {
-        return Promise.resolve()
-      } else {
-        console.log(`=> Running npm ${this._shouldUseNpmCi(codeDirectory) ? 'ci' : 'install'} --production`)
-        return this._npmInstall(program, codeDirectory)
+    await this._cleanDirectory(codeDirectory, program.keepNodeModules)
+    console.log('=> Moving files to temporary directory')
+    await this._fileCopy(program, lambdaSrcDirectory, codeDirectory, true)
+    if (!program.keepNodeModules) {
+      console.log('=> Running package install')
+      const usedPackageManager = await this._packageInstall(program, codeDirectory)
+      if (usedPackageManager) {
+        console.log(`(Package manager used was '${usedPackageManager}'.)`)
       }
-    }).then(() => {
-      return this._postInstallScript(program, codeDirectory)
-    }).then(() => {
-      console.log('=> Zipping deployment package')
-      return this._zip(program, codeDirectory)
-    })
+    }
+    await this._postInstallScript(program, codeDirectory)
+    console.log('=> Zipping deployment package')
+    return this._zip(program, codeDirectory)
   }
 
   _listEventSourceMappings (lambda, params) {

package/lib/s3_deploy.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const process = require('process')
 const crypto = require('crypto')
 // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#createBucket-property
 const S3_LOCATION_POSSIBLE_VALUES = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-lambda",
-  "version": "0.19.0",
+  "version": "0.22.0",
   "description": "Command line tool for locally running and remotely deploying your node.js applications to Amazon Lambda.",
   "main": "lib/main.js",
   "directories": {
@@ -31,26 +31,26 @@
   "readmeFilename": "README.md",
   "author": "motdotla",
   "license": "BSD-2-Clause",
-  "devDependencies": {
-    "aws-sdk-mock": "^5.1.0",
-    "chai": "^4.2.0",
-    "mocha": "^8.2.1",
-    "node-zip": "^1.1.1",
-    "standard": "^16.0.1"
+  "engines": {
+    "node": ">= 10.0.0"
   },
   "dependencies": {
-    "archiver": "^5.0.0",
-    "aws-sdk": "^2.831.0",
-    "aws-xray-sdk-core": "^3.1.0",
-    "commander": "^7.0.0",
+    "archiver": "^5.3.0",
+    "aws-sdk": "^2.1074.0",
+    "aws-xray-sdk-core": "^3.3.4",
+    "commander": "^9.0.0",
     "continuation-local-storage": "^3.2.1",
-    "dotenv": "^8.2.0",
-    "fs-extra": "^9.0.1",
-    "klaw": "^3.0.0",
-    "minimatch": "^3.0.4",
-    "proxy-agent": "^3.1.1"
+    "dotenv": "^16.0.0",
+    "fs-extra": "^10.0.0",
+    "klaw": "^4.0.1",
+    "minimatch": "^5.0.0",
+    "proxy-agent": "^5.0.0"
   },
-  "engines": {
-    "node": ">= 10.0.0"
+  "devDependencies": {
+    "aws-sdk-mock": "^5.6.2",
+    "chai": "^4.3.6",
+    "mocha": "^9.2.0",
+    "node-zip": "^1.1.1",
+    "standard": "^16.0.4"
   }
 }