Commit 2de845b

Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already treated as an `EPERM` error, but it is not included in one of the omittable errors when retrying the `RmSync` operation. This commit includes it. This also fixes the `retryDelay` calculation on Windows where the `retryDelay` is divided by `1000` but the win32's `Sleep` function takes the argument as an `ms` unit, dividing the supplied `ms` unit further to a much smaller delay. Signed-off-by: louiellan <louie.lou.llaneta@gmail.com> PR-URL: #64698Fixes: #64016 Refs: #64017 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b

2 files changed

Lines changed: 91 additions & 1 deletion

File tree

‎src/node_file.cc‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
error == std::errc::too_many_files_open ||
17941794
error == std::errc::too_many_files_open_in_system ||
17951795
error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
error == std::errc::permission_denied ||
1798+
#endif
17961799
error == std::errc::operation_not_permitted);
17971800
};
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
}

‎test/parallel/test-fs-rmSync-eperm-retries.js‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
const fs = require('fs');
21+
const UV_FS_O_EXLOCK = 0x10000000;
22+
fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
process.stdout.write('locked');
24+
setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());

0 commit comments

Comments
 (0)
, '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
Commit 2de845b
Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already
treated as an `EPERM` error, but it is not included in one of the
omittable errors when retrying the `RmSync` operation. This commit
includes it.
This also fixes the `retryDelay` calculation on Windows where the
`retryDelay` is divided by `1000` but the win32's `Sleep` function
takes the argument as an `ms` unit, dividing the supplied `ms` unit
further to a much smaller delay.
Signed-off-by: louiellan <louie.lou.llaneta@gmail.com>
PR-URL: #64698Fixes: #64016
Refs: #64017
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b
2 files changed
Lines changed: 91 additions & 1 deletion
File tree
‎src/node_file.cc‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
 error == std::errc::too_many_files_open ||
17941794
 error == std::errc::too_many_files_open_in_system ||
17951795
 error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
 error == std::errc::permission_denied ||
1798+
#endif
17961799
 error == std::errc::operation_not_permitted);
17971800
 };
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
 }
‎test/parallel/test-fs-rmSync-eperm-retries.js‎
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
 const fs = require('fs');
21+
 const UV_FS_O_EXLOCK = 0x10000000;
22+
 fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
 process.stdout.write('locked');
24+
 setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());
0 commit comments
Comments
 (0)

, '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
Commit 2de845b
Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already
treated as an `EPERM` error, but it is not included in one of the
omittable errors when retrying the `RmSync` operation. This commit
includes it.
This also fixes the `retryDelay` calculation on Windows where the
`retryDelay` is divided by `1000` but the win32's `Sleep` function
takes the argument as an `ms` unit, dividing the supplied `ms` unit
further to a much smaller delay.
Signed-off-by: louiellan <louie.lou.llaneta@gmail.com>
PR-URL: #64698Fixes: #64016
Refs: #64017
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b
2 files changed
Lines changed: 91 additions & 1 deletion
File tree
‎src/node_file.cc‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
 error == std::errc::too_many_files_open ||
17941794
 error == std::errc::too_many_files_open_in_system ||
17951795
 error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
 error == std::errc::permission_denied ||
1798+
#endif
17961799
 error == std::errc::operation_not_permitted);
17971800
 };
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
 }
‎test/parallel/test-fs-rmSync-eperm-retries.js‎
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
 const fs = require('fs');
21+
 const UV_FS_O_EXLOCK = 0x10000000;
22+
 fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
 process.stdout.write('locked');
24+
 setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());
0 commit comments
Comments
 (0)

, '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
Commit 2de845b
Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already
treated as an `EPERM` error, but it is not included in one of the
omittable errors when retrying the `RmSync` operation. This commit
includes it.
This also fixes the `retryDelay` calculation on Windows where the
`retryDelay` is divided by `1000` but the win32's `Sleep` function
takes the argument as an `ms` unit, dividing the supplied `ms` unit
further to a much smaller delay.
Signed-off-by: louiellan <louie.lou.llaneta@gmail.com>
PR-URL: #64698Fixes: #64016
Refs: #64017
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b
2 files changed
Lines changed: 91 additions & 1 deletion
File tree
‎src/node_file.cc‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
 error == std::errc::too_many_files_open ||
17941794
 error == std::errc::too_many_files_open_in_system ||
17951795
 error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
 error == std::errc::permission_denied ||
1798+
#endif
17961799
 error == std::errc::operation_not_permitted);
17971800
 };
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
 }
‎test/parallel/test-fs-rmSync-eperm-retries.js‎
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
 const fs = require('fs');
21+
 const UV_FS_O_EXLOCK = 0x10000000;
22+
 fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
 process.stdout.write('locked');
24+
 setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());
0 commit comments
Comments
 (0)

, '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
Commit 2de845b
Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already
treated as an `EPERM` error, but it is not included in one of the
omittable errors when retrying the `RmSync` operation. This commit
includes it.
This also fixes the `retryDelay` calculation on Windows where the
`retryDelay` is divided by `1000` but the win32's `Sleep` function
takes the argument as an `ms` unit, dividing the supplied `ms` unit
further to a much smaller delay.
Signed-off-by: louiellan <louie.lou.llaneta@gmail.com>
PR-URL: #64698Fixes: #64016
Refs: #64017
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b
2 files changed
Lines changed: 91 additions & 1 deletion
File tree
‎src/node_file.cc‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
 error == std::errc::too_many_files_open ||
17941794
 error == std::errc::too_many_files_open_in_system ||
17951795
 error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
 error == std::errc::permission_denied ||
1798+
#endif
17961799
 error == std::errc::operation_not_permitted);
17971800
 };
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
 }
‎test/parallel/test-fs-rmSync-eperm-retries.js‎
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
 const fs = require('fs');
21+
 const UV_FS_O_EXLOCK = 0x10000000;
22+
 fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
 process.stdout.write('locked');
24+
 setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());
0 commit comments
Comments
 (0)

, '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
Commit 2de845b
Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already
treated as an `EPERM` error, but it is not included in one of the
omittable errors when retrying the `RmSync` operation. This commit
includes it.
This also fixes the `retryDelay` calculation on Windows where the
`retryDelay` is divided by `1000` but the win32's `Sleep` function
takes the argument as an `ms` unit, dividing the supplied `ms` unit
further to a much smaller delay.
Signed-off-by: louiellan <louie.lou.llaneta@gmail.com>
PR-URL: #64698Fixes: #64016
Refs: #64017
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b
2 files changed
Lines changed: 91 additions & 1 deletion
File tree
‎src/node_file.cc‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
 error == std::errc::too_many_files_open ||
17941794
 error == std::errc::too_many_files_open_in_system ||
17951795
 error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
 error == std::errc::permission_denied ||
1798+
#endif
17961799
 error == std::errc::operation_not_permitted);
17971800
 };
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
 }
‎test/parallel/test-fs-rmSync-eperm-retries.js‎
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
 const fs = require('fs');
21+
 const UV_FS_O_EXLOCK = 0x10000000;
22+
 fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
 process.stdout.write('locked');
24+
 setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());
0 commit comments
Comments
 (0)

, '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
Commit 2de845b
Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already
treated as an `EPERM` error, but it is not included in one of the
omittable errors when retrying the `RmSync` operation. This commit
includes it.
This also fixes the `retryDelay` calculation on Windows where the
`retryDelay` is divided by `1000` but the win32's `Sleep` function
takes the argument as an `ms` unit, dividing the supplied `ms` unit
further to a much smaller delay.
Signed-off-by: louiellan <louie.lou.llaneta@gmail.com>
PR-URL: #64698Fixes: #64016
Refs: #64017
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b
2 files changed
Lines changed: 91 additions & 1 deletion
File tree
‎src/node_file.cc‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
 error == std::errc::too_many_files_open ||
17941794
 error == std::errc::too_many_files_open_in_system ||
17951795
 error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
 error == std::errc::permission_denied ||
1798+
#endif
17961799
 error == std::errc::operation_not_permitted);
17971800
 };
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
 }
‎test/parallel/test-fs-rmSync-eperm-retries.js‎
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
 const fs = require('fs');
21+
 const UV_FS_O_EXLOCK = 0x10000000;
22+
 fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
 process.stdout.write('locked');
24+
 setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());
0 commit comments
Comments
 (0)

, '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
Commit 2de845b
Browse files
PickBasaduh95
PickBas
authored and
aduh95
committed
fs: treat std::errc::permission_denied as EPERM error
In the thrown exception, `std::errc::permission_denied` is already
treated as an `EPERM` error, but it is not included in one of the
omittable errors when retrying the `RmSync` operation. This commit
includes it.
This also fixes the `retryDelay` calculation on Windows where the
`retryDelay` is divided by `1000` but the win32's `Sleep` function
takes the argument as an `ms` unit, dividing the supplied `ms` unit
further to a much smaller delay.
Signed-off-by: louiellan <louie.lou.llaneta@gmail.com>
PR-URL: #64698Fixes: #64016
Refs: #64017
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
1 parent 83a7949 commit 2de845b
2 files changed
Lines changed: 91 additions & 1 deletion
File tree
‎src/node_file.cc‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
17931793
 error == std::errc::too_many_files_open ||
17941794
 error == std::errc::too_many_files_open_in_system ||
17951795
 error == std::errc::directory_not_empty ||
1796+
#ifdef _WIN32
1797+
 error == std::errc::permission_denied ||
1798+
#endif
17961799
 error == std::errc::operation_not_permitted);
17971800
 };
17981801

@@ -1813,8 +1816,10 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
18131816

18141817
if (retryDelay > 0) {
18151818
#ifdef _WIN32
1816-
Sleep(i * retryDelay / 1000);
1819+
// No conversion needed: Sleep() takes milliseconds.
1820+
Sleep(i * retryDelay);
18171821
#else
1822+
// sleep() takes seconds, so convert the millisecond delay.
18181823
sleep(i * retryDelay / 1000);
18191824
#endif
18201825
 }
‎test/parallel/test-fs-rmSync-eperm-retries.js‎
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.isWindows)
6+
common.skip('Windows-specific: EPERM sharing-violation retry in rmSync');
7+
8+
consttmpdir=require('../common/tmpdir');
9+
constassert=require('assert');
10+
const{ once }=require('events');
11+
const{ spawn }=require('child_process');
12+
constfs=require('fs');
13+
constpath=require('path');
14+
15+
tmpdir.refresh();
16+
17+
// UV_FS_O_EXLOCK opens with share mode 0, so deletion fails with EPERM
18+
// until this process kills the child.
19+
constlockerScript=`
20+
 const fs = require('fs');
21+
 const UV_FS_O_EXLOCK = 0x10000000;
22+
 fs.openSync(process.argv[1], fs.constants.O_RDWR | UV_FS_O_EXLOCK);
23+
 process.stdout.write('locked');
24+
 setInterval(() => {}, 60_000);
25+
`;
26+
27+
asyncfunctionspawnLocker(file){
28+
constchild=spawn(process.execPath,['-e',lockerScript,file],
29+
{stdio: ['ignore','pipe','inherit']});
30+
const[data]=awaitonce(child.stdout,'data');
31+
assert.strictEqual(data.toString(),'locked');
32+
returnchild;
33+
}
34+
35+
// Sleep before retry i is i * retryDelay ms, so all retries take at least
36+
// retryDelay * (1 + 2 + ... + maxRetries) ms.
37+
functionminRetryTime({ maxRetries, retryDelay }){
38+
returnretryDelay*maxRetries*(maxRetries+1)/2;
39+
}
40+
41+
functiontimedRmThrowsEPERM(dir,options){
42+
conststart=Date.now();
43+
assert.throws(()=>{
44+
fs.rmSync(dir,{recursive: true, ...options});
45+
},{
46+
code: 'EPERM',
47+
name: 'Error',
48+
syscall: 'rm',
49+
});
50+
returnDate.now()-start;
51+
}
52+
53+
(async()=>{
54+
constdir=tmpdir.resolve('rm-eperm-retries');
55+
constfile=path.join(dir,'locked.txt');
56+
fs.mkdirSync(dir);
57+
fs.writeFileSync(file,'hello');
58+
59+
constchild=awaitspawnLocker(file);
60+
try{
61+
// Proves the lock is effective: no retries means an immediate EPERM.
62+
timedRmThrowsEPERM(dir,{maxRetries: 0,retryDelay: 0});
63+
assert.strictEqual(fs.existsSync(file),true);
64+
65+
constoptions={maxRetries: 4,retryDelay: 100};
66+
constexpected=minRetryTime(options);// 100+200+300+400 = 1000 ms.
67+
constelapsed=timedRmThrowsEPERM(dir,options);
68+
69+
// Windows timer granularity may shave a few ms off each Sleep() call.
70+
constslack=16*options.maxRetries;
71+
assert.ok(elapsed>=expected-slack,
72+
`rmSync() gave up after ${elapsed}ms; expected it to spend at `+
73+
`least ~${expected}ms on ${options.maxRetries} retries of `+
74+
`${options.retryDelay}ms escalating delay`);
75+
76+
// Catches unit confusion (e.g. seconds vs. milliseconds) in the delay.
77+
assert.ok(elapsed<common.platformTimeout(expected*10),
78+
`rmSync() gave up after ${elapsed}ms; expected roughly `+
79+
`${expected}ms for ${options.maxRetries} retries`);
80+
}finally{
81+
child.kill();
82+
}
83+
awaitonce(child,'exit');
84+
assert.strictEqual(fs.existsSync(file),true);
85+
})().then(common.mustCall());
0 commit comments
Comments
 (0)