mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: asar integration for require('node:child_process') (#38742)

Browse source
This commit is contained in:
Milan Burda 2023-06-14 11:03:53 +02:00 committed by GitHub
parent 46458ab517
commit dc2e822dc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/asar/fs-wrapper.ts
View file

@ -838,7 +838,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
const originalModuleLoad = Module._load; const originalModuleLoad = Module._load;
Module._load = (request: string, ...args: any[]) => { Module._load = (request: string, ...args: any[]) => {
const loadResult = originalModuleLoad(request, ...args); const loadResult = originalModuleLoad(request, ...args);
if (request === 'child_process') { if (request === 'child_process' || request === 'node:child_process') {
if (!asarReady.has(loadResult)) { if (!asarReady.has(loadResult)) {
asarReady.add(loadResult); asarReady.add(loadResult);
// Just to make it obvious what we are dealing with here // Just to make it obvious what we are dealing with here

105
spec/asar-spec.ts
View file

@ -1220,64 +1220,69 @@ describe('asar package', function () {
}); });
}); });
describe('child_process.fork', function () { function generateSpecs (childProcess: string) {
itremote('opens a normal js file', async function () { describe(`${childProcess}.fork`, function () {
const child = require('child_process').fork(path.join(asarDir, 'a.asar', 'ping.js')); itremote('opens a normal js file', async function (childProcess: string) {
child.send('message'); const child = require(childProcess).fork(path.join(asarDir, 'a.asar', 'ping.js'));
const msg = await new Promise(resolve => child.once('message', resolve)); child.send('message');
expect(msg).to.equal('message'); const msg = await new Promise(resolve => child.once('message', resolve));
expect(msg).to.equal('message');
}, [childProcess]);
itremote('supports asar in the forked js', async function (childProcess: string, fixtures: string) {
const file = path.join(asarDir, 'a.asar', 'file1');
const child = require(childProcess).fork(path.join(fixtures, 'module', 'asar.js'));
child.send(file);
const content = await new Promise(resolve => child.once('message', resolve));
expect(content).to.equal(fs.readFileSync(file).toString());
}, [childProcess, fixtures]);
}); });
itremote('supports asar in the forked js', async function (fixtures: string) { describe(`${childProcess}.exec`, function () {
const file = path.join(asarDir, 'a.asar', 'file1'); itremote('should not try to extract the command if there is a reference to a file inside an .asar', async function (childProcess: string) {
const child = require('child_process').fork(path.join(fixtures, 'module', 'asar.js')); const echo = path.join(asarDir, 'echo.asar', 'echo');
child.send(file);
const content = await new Promise(resolve => child.once('message', resolve));
expect(content).to.equal(fs.readFileSync(file).toString());
}, [fixtures]);
});
describe('child_process.exec', function () { const stdout = await promisify(require(childProcess).exec)('echo ' + echo + ' foo bar');
itremote('should not try to extract the command if there is a reference to a file inside an .asar', async function () { expect(stdout.toString().replace(/\r/g, '')).to.equal(echo + ' foo bar\n');
const echo = path.join(asarDir, 'echo.asar', 'echo'); }, [childProcess]);
const stdout = await promisify(require('child_process').exec)('echo ' + echo + ' foo bar');
expect(stdout.toString().replace(/\r/g, '')).to.equal(echo + ' foo bar\n');
});
});
describe('child_process.execSync', function () {
itremote('should not try to extract the command if there is a reference to a file inside an .asar', async function () {
const echo = path.join(asarDir, 'echo.asar', 'echo');
const stdout = require('child_process').execSync('echo ' + echo + ' foo bar');
expect(stdout.toString().replace(/\r/g, '')).to.equal(echo + ' foo bar\n');
});
});
ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64')('child_process.execFile', function () {
itremote('executes binaries', async function () {
const echo = path.join(asarDir, 'echo.asar', 'echo');
const stdout = await promisify(require('child_process').execFile)(echo, ['test']);
expect(stdout).to.equal('test\n');
}); });
itremote('executes binaries without callback', async function () { describe(`${childProcess}.execSync`, function () {
const echo = path.join(asarDir, 'echo.asar', 'echo'); itremote('should not try to extract the command if there is a reference to a file inside an .asar', async function (childProcess: string) {
const process = require('child_process').execFile(echo, ['test']); const echo = path.join(asarDir, 'echo.asar', 'echo');
const code = await new Promise(resolve => process.once('close', resolve));
expect(code).to.equal(0); const stdout = require(childProcess).execSync('echo ' + echo + ' foo bar');
process.on('error', function () { expect(stdout.toString().replace(/\r/g, '')).to.equal(echo + ' foo bar\n');
throw new Error('error'); }, [childProcess]);
});
}); });
itremote('execFileSync executes binaries', function () { ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64')(`${childProcess}.execFile`, function () {
const echo = path.join(asarDir, 'echo.asar', 'echo'); itremote('executes binaries', async function (childProcess: string) {
const output = require('child_process').execFileSync(echo, ['test']); const echo = path.join(asarDir, 'echo.asar', 'echo');
expect(String(output)).to.equal('test\n'); const stdout = await promisify(require(childProcess).execFile)(echo, ['test']);
expect(stdout).to.equal('test\n');
}, [childProcess]);
itremote('executes binaries without callback', async function (childProcess: string) {
const echo = path.join(asarDir, 'echo.asar', 'echo');
const process = require(childProcess).execFile(echo, ['test']);
const code = await new Promise(resolve => process.once('close', resolve));
expect(code).to.equal(0);
process.on('error', function () {
throw new Error('error');
});
}, [childProcess]);
itremote('execFileSync executes binaries', function (childProcess: string) {
const echo = path.join(asarDir, 'echo.asar', 'echo');
const output = require(childProcess).execFileSync(echo, ['test']);
expect(String(output)).to.equal('test\n');
}, [childProcess]);
}); });
}); }
generateSpecs('child_process');
generateSpecs('node:child_process');
describe('internalModuleReadJSON', function () { describe('internalModuleReadJSON', function () {
itremote('reads a normal file', function () { itremote('reads a normal file', function () {