Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several improvements and suggestion #4

Open
wants to merge 6 commits into
base: node-v14
Choose a base branch
from
Open

Several improvements and suggestion #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adf9224
Adding NODE_OPTIONS to clang source and removed CLI argument
Kivol Jan 18, 2021
3603176
Rollback context.succeed/fail/done methods
Kivol Jan 18, 2021
2b9160d
Upgrade NODE_VERSION to 14.15.4 which is the latest LTS
Kivol Jan 18, 2021
6040833
Removed NODE_MODULE_LOADER_TYPE option on test
Kivol Jan 18, 2021
ab360e2
Update layer.zip
Kivol Jan 18, 2021
0894e49
Fix to allow the injection of NODE_OPTIONS
Kivol Jan 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion v14.x/bootstrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,22 @@
"/var/runtime/node_modules:" \
"/var/runtime:" \
"/var/task"
#define NODE_OPTIONS "--experimental-loader=/opt/esm-loader-hook.mjs"
#define MIN_MEM_SIZE 128
#define ARG_BUF_SIZE 32

int main(void) {
setenv("AWS_EXECUTION_ENV", AWS_EXECUTION_ENV, true);
setenv("NODE_PATH", NODE_PATH, true);

const char *node_options = getenv("NODE_OPTIONS");
if (node_options != NULL) {
char custom_node_options[ARG_BUF_SIZE * 8];
snprintf(custom_node_options, ARG_BUF_SIZE * 8, "%s %s", NODE_OPTIONS, node_options);
setenv("NODE_OPTIONS", custom_node_options, true);
} else {
setenv("NODE_OPTIONS", NODE_OPTIONS, true);
}

const char *mem_size_str = getenv("AWS_LAMBDA_FUNCTION_MEMORY_SIZE");
int mem_size = mem_size_str != NULL ? atoi(mem_size_str) : MIN_MEM_SIZE;
Expand All @@ -32,7 +42,6 @@ int main(void) {

execv("/opt/bin/node", (char *[]){
"node",
"--experimental-loader=/opt/esm-loader-hook.mjs",
"--expose-gc",
max_semi_space_size,
max_old_space_size,
Expand Down
10 changes: 5 additions & 5 deletions v14.x/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ async function getHandler() {
}

return (event, context) => new Promise((resolve, reject) => {
context.succeed = resolve
context.fail = reject
context.done = (err, data) => err ? reject(err) : resolve(data)

const callback = (err, data) => {
context[CALLBACK_USED] = true
if(err) {
reject(err)
} else {
resolve(data)
}
context.done(err, data)
}

let result
Expand Down
2 changes: 1 addition & 1 deletion v14.x/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export LAYER_NAME=nodejs14
export NODE_VERSION=14.15.1
export NODE_VERSION=14.15.4
Binary file modified v14.x/layer.zip
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions v14.x/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ npm ci
# Create zipfile for uploading to Lambda – we don't use this here
rm -f lambda.zip && zip -qyr lambda.zip index.js data.json node_modules

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=$LOADER_TYPE lambci/lambda:provided index.handler
docker run --rm -e "NODE_OPTIONS=--enable-source-maps" -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=$LOADER_TYPE lambci/lambda:provided index.handler2
docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=$LOADER_TYPE lambci/lambda:provided index.handler3
docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler2

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=$LOADER_TYPE lambci/lambda:provided index.handler4
docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler3

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=$LOADER_TYPE lambci/lambda:provided index.handler5
docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler4

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=$LOADER_TYPE lambci/lambda:provided index.handler6
docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler5

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=$LOADER_TYPE lambci/lambda:provided index.handler7
docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler6

docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt -e NODE_MODULE_LOADER_TYPE=invalid lambci/lambda:provided index.handler7
docker run --rm -v "$PWD":/var/task -v "$PWD"/../../layer:/opt lambci/lambda:provided index.handler7