зеркало из https://github.com/electron/electron.git
fix: support the throwIfNoEntry option to statSync and lstatSync in asar files (#40221)
This commit is contained in:
Родитель
f7b1c75c72
Коммит
b6ec19a582
|
@ -261,6 +261,14 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
|
|||
fs.writeSync(logFDs.get(asarPath), `${offset}: ${filePath}\n`);
|
||||
};
|
||||
|
||||
const shouldThrowStatError = (options: any) => {
|
||||
if (options && typeof options === 'object' && options.throwIfNoEntry === false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
const { lstatSync } = fs;
|
||||
fs.lstatSync = (pathArgument: string, options: any) => {
|
||||
const pathInfo = splitPath(pathArgument);
|
||||
|
@ -268,10 +276,16 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
|
|||
const { asarPath, filePath } = pathInfo;
|
||||
|
||||
const archive = getOrCreateArchive(asarPath);
|
||||
if (!archive) throw createError(AsarError.INVALID_ARCHIVE, { asarPath });
|
||||
if (!archive) {
|
||||
if (shouldThrowStatError(options)) throw createError(AsarError.INVALID_ARCHIVE, { asarPath });
|
||||
return null;
|
||||
}
|
||||
|
||||
const stats = archive.stat(filePath);
|
||||
if (!stats) throw createError(AsarError.NOT_FOUND, { asarPath, filePath });
|
||||
if (!stats) {
|
||||
if (shouldThrowStatError(options)) throw createError(AsarError.NOT_FOUND, { asarPath, filePath });
|
||||
return null;
|
||||
}
|
||||
|
||||
return asarStatsToFsStats(stats);
|
||||
};
|
||||
|
|
|
@ -490,6 +490,15 @@ describe('asar package', function () {
|
|||
}).to.throw(/ENOENT/);
|
||||
}
|
||||
});
|
||||
|
||||
itremote('returns null when can not find file with throwIfNoEntry === false', function () {
|
||||
const ref2 = ['file4', 'file5', path.join('dir1', 'file4')];
|
||||
for (let j = 0, len = ref2.length; j < len; j++) {
|
||||
const file = ref2[j];
|
||||
const p = path.join(asarDir, 'a.asar', file);
|
||||
expect(fs.lstatSync(p, { throwIfNoEntry: false })).to.equal(null);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe('fs.lstat', function () {
|
||||
|
|
Загрузка…
Ссылка в новой задаче