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

Jump to bottom

Closure emit requires in global scope, to have them run in Lambda init phase #11481

Merged
merged 2 commits into from Dec 9, 2022
Merged

Closure emit requires in global scope, to have them run in Lambda init phase #11481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4e345
fix: emit closure requires in global scope
pjoe Nov 28, 2022
6483001
docs: add changelog entry
pjoe Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...-sdk-nodejs--emit-closure-requires-in-global-scope-for-improved-cold-start-on-lambda.yaml
View file
Open in desktop
@@ -0,0 +1,4 @@
changes:
- type: feat
scope: sdk/nodejs
description: Emit closure requires in global scope for improved cold start on Lambda
11 changes: 11 additions & 0 deletions sdk/nodejs/runtime/closure/serializeClosure.ts
View file
Open in desktop
Expand Up @@ -151,6 +151,7 @@ function serializeJavaScriptText(

let environmentText = "";
let functionText = "";
const emittedRequires = new Set<string>();

const outerFunctionName = emitFunctionAndGetName(outerClosure.func);

Expand Down Expand Up @@ -202,6 +203,16 @@ function serializeJavaScriptText(

const parameters = [...Array(functionInfo.paramCount)].map((_, index) => `__${index}`).join(", ");

for (const [keyEntry, { entry: valEntry }] of functionInfo.capturedValues) {
if (valEntry.module !== undefined) {
if(!emittedRequires.has(keyEntry.json)) {
emittedRequires.add(keyEntry.json);
functionText += `const ${keyEntry.json} = require("${valEntry.module}");\n`;
}
delete capturedValues[keyEntry.json];
}
}

functionText += "\n" +
"function " + varName + "(" + parameters + ") {\n" +
" return (function() {\n" +
Expand Down
12 changes: 8 additions & 4 deletions sdk/nodejs/tests/runtime/tsClosureCases.ts
View file
Open in desktop
Expand Up @@ -859,10 +859,11 @@ return () => { let x = eval("undefined + null + NaN + Infinity + __filename"); r
title: "Capture built in module by ref",
func: () => os,
expectText: `exports.handler = __f0;
const os = require("os");

function __f0() {
return (function() {
with({ os: require("os") }) {
with({ }) {

return () => os;

Expand All @@ -886,10 +887,11 @@ return () => os;
return { v };
},
expectText: `exports.handler = __f0;
const os = require("os");

function __f0(__0, __1, __2) {
return (function() {
with({ os: require("os") }) {
with({ }) {

return (a, b, c) => {
const v = os;
Expand All @@ -915,10 +917,11 @@ return (a, b, c) => {
title: "Capture module through indirect function references",
func: func,
expectText: `exports.handler = __f0;
const os = require("os");

function __f1() {
return (function() {
with({ os: require("os") }) {
with({ }) {

return () => os;

Expand Down Expand Up @@ -6645,10 +6648,11 @@ return function (thisArg, _arguments, P, generator) {
}
}).apply(undefined, undefined).apply(this, arguments);
}
const mockpackage_1 = require("mockpackage");

function __f1() {
return (function() {
with({ mockpackage_1: require("mockpackage") }) {
with({ }) {

return () => mockpackage_1.z.object({
message: mockpackage_1.z.string(),
Expand Down