Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 63 additions & 1 deletion lib/fs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,7 @@ const {

const {
FSReqCallback,
ReadFileJob,
} = binding;
const { toPathIfFileURL } = require('internal/url');
const {
Expand All@@ -98,6 +99,7 @@ const {
const {
constants: {
kIoMaxLength,
kReadFileBufferLength,
kMaxUserId,
},
copyObject,
Expand DownExpand Up@@ -428,10 +430,70 @@ function readFile(path, options, callback) {
return;

const flagsNumber = stringToFlags(options.flag, 'options.flag');
path = getValidatedPath(path);
if (options.buffer === undefined) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and take
// the chunked reader below (readFileAfterOneShot). `true`: a handed-back
// fd will be closed through fs.close(), so track it as unmanaged.
const job = new ReadFileJob(path, flagsNumber, kReadFileBufferLength, true);
job.context = context;
job.ondone = readFileAfterOneShot;
const accessError = job.run(path);
if (accessError !== undefined) {
// Not scheduled: report it the way the request-based open() did.
callback(accessError);
}
return;
}
const req = new FSReqCallback();
req.context = context;
req.oncomplete = readFileAfterOpen;
binding.open(getValidatedPath(path), flagsNumber, 0o666, req);
binding.open(path, flagsNumber, 0o666, req);
}

function readFileAfterOneShot(err, buffer, fd, size, closeErr) {
const context = this.context;
if (err) {
context.callback(err);
return;
}
if (fd !== -1) {
// (context.read() below performs the abort check for this case.)
// Larger than one chunk: continue exactly like after open + fstat.
context.fd = fd;
context.size = size;
if (size > kIoMaxLength) {
return context.close(new ERR_FS_FILE_TOO_LARGE(size));
}
try {
context.prepare();
} catch (err) {
return context.close(err);
}
context.read();
return;
}
if (closeErr) {
context.callback(closeErr);
return;
}
if (context.signal?.aborted) {
// An abort that arrived while the read was in flight wins, as it did when
// it was noticed between the open/fstat/read steps.
context.callback(new AbortError(undefined, { cause: context.signal.reason }));
return;
}
let result = buffer;
if (context.encoding) {
try {
result = buffer.toString(context.encoding);
} catch (err) {
context.callback(err);
return;
}
}
context.callback(null, result);
}

function tryStatSync(fd, isUserFd) {
Expand Down
67 changes: 56 additions & 11 deletions lib/internal/fs/promises.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1211,26 +1211,32 @@ async function readFileHandleWithUserBuffer(filehandle, options, size) {
return encoding ? buffer.toString(encoding) : buffer.subarray(0, totalRead);
}

async function readFileHandle(filehandle, options) {
async function readFileHandle(filehandle, options, knownRegularFileSize) {
const signal = options?.signal;
const encoding = options?.encoding;
const decoder = encoding && new StringDecoder(encoding);

checkAborted(signal);

const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

let size = 0;
let length = 0;
if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
if (knownRegularFileSize !== undefined) {
// Handed over by readFile() together with an already open fd.
size = knownRegularFileSize;
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
} else {
const statFields = await PromisePrototypeThen(
binding.fstat(filehandle.fd, false, kUsePromises),
undefined,
handleErrorFromBinding,
);

checkAborted(signal);

if ((statFields[1/* mode */] & S_IFMT) === S_IFREG) {
size = statFields[8/* size */];
length = encoding ? MathMin(size, kReadFileBufferLength) : size;
}
}
if (length === 0) {
length = kReadFileUnknownBufferLength;
Expand DownExpand Up@@ -2146,10 +2152,49 @@ async function readFile(path, options) {

checkAborted(options.signal);

if (options.buffer === undefined && vfsState.handlers === null) {
// Open + fstat + read + close in one thread pool round trip for files of
// up to one chunk; larger files come back as an open fd + size and are
// read by readFileHandle() as before.
path = getValidatedPath(path);
const { 0: buffer, 1: fd, 2: size } = await readFileInOneRoundTrip(path, stringToFlags(flag));
if (fd === -1) {
checkAborted(options.signal); // An abort during the read still wins.
return options.encoding ? buffer.toString(options.encoding) : buffer;
}
const filehandle = new FileHandle(new binding.FileHandle(fd));
return handleFdClose(readFileHandle(filehandle, options, size), filehandle.close);
}

const fd = await open(path, flag, 0o666);
return handleFdClose(readFileHandle(fd, options), fd.close);
}

/**
* @param {string|Buffer} path Validated path
* @param {number} flagsNumber
* @returns {Promise<[Buffer|undefined, number, number|undefined]>} [buffer, -1] or [undefined, fd, size]
*/
function readFileInOneRoundTrip(path, flagsNumber) {
return new Promise((resolve, reject) => {
const job = new binding.ReadFileJob(path, flagsNumber, kReadFileBufferLength);
job.ondone = (err, buffer, fd, size, closeErr) => {
const error = err ?? closeErr;
if (error != null) {
ErrorCaptureStackTrace(error, readFileInOneRoundTrip);
reject(error);
} else {
resolve([buffer, fd, size]);
}
};
const accessError = job.run(path);
if (accessError !== undefined) {
ErrorCaptureStackTrace(accessError, readFileInOneRoundTrip);
reject(accessError);
}
});
}

async function* _watch(filename, options = kEmptyObject) {
const h = vfsState.handlers;
if (h !== null) {
Expand Down
Loading
Loading