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

chore: writes compiled mongosh to lib-boxednode instead of lib to avoid linking it twice when building node #43

Merged
merged 3 commits into from Aug 1, 2023
Merged

chore: writes compiled mongosh to lib-boxednode instead of lib to avoid linking it twice when building node #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d615a6
chore: writes compiled mongosh to lib-boxednode instead of lib to avo…
himanshusinghs Jul 31, 2023
7f465b2
chore: ditch namespace and reference correct path in the main source
himanshusinghs Jul 31, 2023
fe03a4a
chore: conditionally generate the entry point for custom source code …
himanshusinghs Aug 1, 2023
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
32 changes: 26 additions & 6 deletions src/index.ts
View file
Open in desktop
Expand Up @@ -271,6 +271,7 @@ async function compileJSFileAsBinaryImpl (options: CompilationOptions, logger: L

const nodeSourcePath = await getNodeSourceForVersion(
options.nodeVersionRange, options.tmpdir, logger);
const nodeVersion = await getNodeVersionFromSourceDirectory(nodeSourcePath);

const requireMappings: [RegExp, string][] = [];
const extraJSSourceFiles: string[] = [];
Expand Down Expand Up @@ -312,7 +313,6 @@ async function compileJSFileAsBinaryImpl (options: CompilationOptions, logger: L
}

logger.stepStarting('Inserting custom code into Node.js source');
await fs.mkdir(path.join(nodeSourcePath, 'lib', namespace), { recursive: true });
let entryPointTrampolineSource = await fs.readFile(
path.join(__dirname, '..', 'resources', 'entry-point-trampoline.js'), 'utf8');
entryPointTrampolineSource = entryPointTrampolineSource.replace(
Expand All @@ -321,10 +321,30 @@ async function compileJSFileAsBinaryImpl (options: CompilationOptions, logger: L
requireMappings: requireMappings.map(([re, linked]) => [re.source, re.flags, linked]),
enableBindingsPatch
}));
await fs.writeFile(
path.join(nodeSourcePath, 'lib', namespace, `${namespace}.js`),
entryPointTrampolineSource);
extraJSSourceFiles.push(`./lib/${namespace}/${namespace}.js`);

/**
* Since Node 20.x, external source code linked from `lib` directory started
* failing the Node.js build process because of the file being linked multiple
* times which is why we do not link the external files anymore from `lib`
* directory and instead from a different directory, `lib-boxednode`. This
* however does not work for any node version < 20 which is why we are
* conditionally generating the entry point and configure params here based on
* Node version.
*/
const { customCodeSource, customCodeConfigureParam, customCodeEntryPoint } = nodeVersion[0] >= 20
? {
customCodeSource: path.join(nodeSourcePath, 'lib-boxednode', `${namespace}.js`),
customCodeConfigureParam: `./lib-boxednode/${namespace}.js`,
customCodeEntryPoint: `lib-boxednode/${namespace}`
} : {
customCodeSource: path.join(nodeSourcePath, 'lib', namespace, `${namespace}.js`),
customCodeConfigureParam: `./lib/${namespace}/${namespace}.js`,
customCodeEntryPoint: `${namespace}/${namespace}`
};

await fs.mkdir(path.dirname(customCodeSource), { recursive: true });
await fs.writeFile(customCodeSource, entryPointTrampolineSource);
extraJSSourceFiles.push(customCodeConfigureParam);
logger.stepCompleted();

logger.stepStarting('Storing executable metadata');
Expand Down Expand Up @@ -355,7 +375,7 @@ async function compileJSFileAsBinaryImpl (options: CompilationOptions, logger: L
let mainSource = await fs.readFile(
path.join(__dirname, '..', 'resources', 'main-template.cc'), 'utf8');
mainSource = mainSource.replace(/\bREPLACE_WITH_ENTRY_POINT\b/g,
JSON.stringify(`${namespace}/${namespace}`));
JSON.stringify(customCodeEntryPoint));
mainSource = mainSource.replace(/\bREPLACE_DECLARE_LINKED_MODULES\b/g,
registerFunctions.map((fn) => `void ${fn}(const void**,const void**);\n`).join(''));
mainSource = mainSource.replace(/\bREPLACE_DEFINE_LINKED_MODULES\b/g,
Expand Down