Commit 968bdd0

Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the same shape and should be as low cost as possible, use a cached DictionaryTemplate for creating them Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65158 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0

4 files changed

Lines changed: 41 additions & 35 deletions

File tree

‎src/env-inl.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
}
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
}
886884
PERMISSIONS(V)
887885
#undef V

‎src/env.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
info->primitive_values[i++]); \
433433
Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
} \
438-
Name##_permission_string##_.Set(isolate_, field); \
437+
Name##_permission_string##_.Set(isolate_, field); \
439438
} while (0);
440439
PERMISSIONS(V)
441440
#undef V

‎src/env_properties.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
V(naptr_record_template, v8::DictionaryTemplate) \
461461
V(object_stats_template, v8::DictionaryTemplate) \
462462
V(page_stats_template, v8::DictionaryTemplate) \
463+
V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
V(pipe_constructor_template, v8::FunctionTemplate) \
464465
V(script_context_constructor_template, v8::FunctionTemplate) \
465466
V(secure_context_constructor_template, v8::FunctionTemplate) \

‎src/permission/permission.cc‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
}
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
};
69+
tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
env->set_permission_diagnostic_channel_message(tmpl);
71+
}
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
v8::Isolate* isolate = env->isolate();
260277
v8::HandleScope handle_scope(isolate);
261278
v8::Local<v8::Context> context = env->context();
262-
v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
msg->Set(context,
265-
env->permission_string(),
266-
PermissionToString(env, permission))
267-
.Check();
268-
msg->Set(context,
269-
env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
.Check();
272-
ch->Publish(env, msg);
279+
v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
};
284+
ch->Publish(
285+
env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
publishing_ = false;
274288
}
275289
}
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
v8::Isolate* isolate = env->isolate();
325339
v8::HandleScope handle_scope(isolate);
326340
v8::Local<v8::Context> context = env->context();
327-
v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
msg->Set(context,
330-
env->permission_string(),
331-
PermissionToString(env, scope))
332-
.Check();
333-
msg->Set(context,
334-
env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
.Check();
337-
msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
.Check();
341-
ch->Publish(env, msg);
341+
342+
v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
};
347+
ch->Publish(
348+
env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
publishing_ = false;
343351
}
344352
}

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 968bdd0
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the
same shape and should be as low cost as possible, use a
cached DictionaryTemplate for creating them
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #65158
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0
4 files changed
Lines changed: 41 additions & 35 deletions
File tree
‎src/env-inl.h‎
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
 IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
 }
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
 Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
 }
886884
PERMISSIONS(V)
887885
#undef V
‎src/env.cc‎
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
 info->primitive_values[i++]); \
433433
 Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
 } \
438-
 Name##_permission_string##_.Set(isolate_, field); \
437+
 Name##_permission_string##_.Set(isolate_, field); \
439438
 } while (0);
440439
PERMISSIONS(V)
441440
#undef V
‎src/env_properties.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
 V(naptr_record_template, v8::DictionaryTemplate) \
461461
 V(object_stats_template, v8::DictionaryTemplate) \
462462
 V(page_stats_template, v8::DictionaryTemplate) \
463+
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
 V(pipe_constructor_template, v8::FunctionTemplate) \
464465
 V(script_context_constructor_template, v8::FunctionTemplate) \
465466
 V(secure_context_constructor_template, v8::FunctionTemplate) \
‎src/permission/permission.cc‎
Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
 }
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
 };
69+
 tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
 env->set_permission_diagnostic_channel_message(tmpl);
71+
 }
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
 v8::Isolate* isolate = env->isolate();
260277
 v8::HandleScope handle_scope(isolate);
261278
 v8::Local<v8::Context> context = env->context();
262-
 v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
 msg->Set(context,
265-
 env->permission_string(),
266-
PermissionToString(env, permission))
267-
 .Check();
268-
 msg->Set(context,
269-
 env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
 .Check();
272-
 ch->Publish(env, msg);
279+
 v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
 };
284+
 ch->Publish(
285+
 env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
 publishing_ = false;
274288
 }
275289
 }
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
 v8::Isolate* isolate = env->isolate();
325339
 v8::HandleScope handle_scope(isolate);
326340
 v8::Local<v8::Context> context = env->context();
327-
 v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
 msg->Set(context,
330-
 env->permission_string(),
331-
PermissionToString(env, scope))
332-
 .Check();
333-
 msg->Set(context,
334-
 env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
 .Check();
337-
 msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
 .Check();
341-
 ch->Publish(env, msg);
341+
342+
 v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
 };
347+
 ch->Publish(
348+
 env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
 publishing_ = false;
343351
 }
344352
 }
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 968bdd0
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the
same shape and should be as low cost as possible, use a
cached DictionaryTemplate for creating them
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #65158
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0
4 files changed
Lines changed: 41 additions & 35 deletions
File tree
‎src/env-inl.h‎
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
 IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
 }
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
 Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
 }
886884
PERMISSIONS(V)
887885
#undef V
‎src/env.cc‎
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
 info->primitive_values[i++]); \
433433
 Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
 } \
438-
 Name##_permission_string##_.Set(isolate_, field); \
437+
 Name##_permission_string##_.Set(isolate_, field); \
439438
 } while (0);
440439
PERMISSIONS(V)
441440
#undef V
‎src/env_properties.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
 V(naptr_record_template, v8::DictionaryTemplate) \
461461
 V(object_stats_template, v8::DictionaryTemplate) \
462462
 V(page_stats_template, v8::DictionaryTemplate) \
463+
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
 V(pipe_constructor_template, v8::FunctionTemplate) \
464465
 V(script_context_constructor_template, v8::FunctionTemplate) \
465466
 V(secure_context_constructor_template, v8::FunctionTemplate) \
‎src/permission/permission.cc‎
Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
 }
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
 };
69+
 tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
 env->set_permission_diagnostic_channel_message(tmpl);
71+
 }
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
 v8::Isolate* isolate = env->isolate();
260277
 v8::HandleScope handle_scope(isolate);
261278
 v8::Local<v8::Context> context = env->context();
262-
 v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
 msg->Set(context,
265-
 env->permission_string(),
266-
PermissionToString(env, permission))
267-
 .Check();
268-
 msg->Set(context,
269-
 env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
 .Check();
272-
 ch->Publish(env, msg);
279+
 v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
 };
284+
 ch->Publish(
285+
 env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
 publishing_ = false;
274288
 }
275289
 }
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
 v8::Isolate* isolate = env->isolate();
325339
 v8::HandleScope handle_scope(isolate);
326340
 v8::Local<v8::Context> context = env->context();
327-
 v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
 msg->Set(context,
330-
 env->permission_string(),
331-
PermissionToString(env, scope))
332-
 .Check();
333-
 msg->Set(context,
334-
 env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
 .Check();
337-
 msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
 .Check();
341-
 ch->Publish(env, msg);
341+
342+
 v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
 };
347+
 ch->Publish(
348+
 env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
 publishing_ = false;
343351
 }
344352
 }
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 968bdd0
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the
same shape and should be as low cost as possible, use a
cached DictionaryTemplate for creating them
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #65158
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0
4 files changed
Lines changed: 41 additions & 35 deletions
File tree
‎src/env-inl.h‎
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
 IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
 }
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
 Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
 }
886884
PERMISSIONS(V)
887885
#undef V
‎src/env.cc‎
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
 info->primitive_values[i++]); \
433433
 Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
 } \
438-
 Name##_permission_string##_.Set(isolate_, field); \
437+
 Name##_permission_string##_.Set(isolate_, field); \
439438
 } while (0);
440439
PERMISSIONS(V)
441440
#undef V
‎src/env_properties.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
 V(naptr_record_template, v8::DictionaryTemplate) \
461461
 V(object_stats_template, v8::DictionaryTemplate) \
462462
 V(page_stats_template, v8::DictionaryTemplate) \
463+
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
 V(pipe_constructor_template, v8::FunctionTemplate) \
464465
 V(script_context_constructor_template, v8::FunctionTemplate) \
465466
 V(secure_context_constructor_template, v8::FunctionTemplate) \
‎src/permission/permission.cc‎
Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
 }
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
 };
69+
 tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
 env->set_permission_diagnostic_channel_message(tmpl);
71+
 }
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
 v8::Isolate* isolate = env->isolate();
260277
 v8::HandleScope handle_scope(isolate);
261278
 v8::Local<v8::Context> context = env->context();
262-
 v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
 msg->Set(context,
265-
 env->permission_string(),
266-
PermissionToString(env, permission))
267-
 .Check();
268-
 msg->Set(context,
269-
 env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
 .Check();
272-
 ch->Publish(env, msg);
279+
 v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
 };
284+
 ch->Publish(
285+
 env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
 publishing_ = false;
274288
 }
275289
 }
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
 v8::Isolate* isolate = env->isolate();
325339
 v8::HandleScope handle_scope(isolate);
326340
 v8::Local<v8::Context> context = env->context();
327-
 v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
 msg->Set(context,
330-
 env->permission_string(),
331-
PermissionToString(env, scope))
332-
 .Check();
333-
 msg->Set(context,
334-
 env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
 .Check();
337-
 msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
 .Check();
341-
 ch->Publish(env, msg);
341+
342+
 v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
 };
347+
 ch->Publish(
348+
 env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
 publishing_ = false;
343351
 }
344352
 }
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 968bdd0
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the
same shape and should be as low cost as possible, use a
cached DictionaryTemplate for creating them
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #65158
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0
4 files changed
Lines changed: 41 additions & 35 deletions
File tree
‎src/env-inl.h‎
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
 IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
 }
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
 Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
 }
886884
PERMISSIONS(V)
887885
#undef V
‎src/env.cc‎
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
 info->primitive_values[i++]); \
433433
 Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
 } \
438-
 Name##_permission_string##_.Set(isolate_, field); \
437+
 Name##_permission_string##_.Set(isolate_, field); \
439438
 } while (0);
440439
PERMISSIONS(V)
441440
#undef V
‎src/env_properties.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
 V(naptr_record_template, v8::DictionaryTemplate) \
461461
 V(object_stats_template, v8::DictionaryTemplate) \
462462
 V(page_stats_template, v8::DictionaryTemplate) \
463+
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
 V(pipe_constructor_template, v8::FunctionTemplate) \
464465
 V(script_context_constructor_template, v8::FunctionTemplate) \
465466
 V(secure_context_constructor_template, v8::FunctionTemplate) \
‎src/permission/permission.cc‎
Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
 }
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
 };
69+
 tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
 env->set_permission_diagnostic_channel_message(tmpl);
71+
 }
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
 v8::Isolate* isolate = env->isolate();
260277
 v8::HandleScope handle_scope(isolate);
261278
 v8::Local<v8::Context> context = env->context();
262-
 v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
 msg->Set(context,
265-
 env->permission_string(),
266-
PermissionToString(env, permission))
267-
 .Check();
268-
 msg->Set(context,
269-
 env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
 .Check();
272-
 ch->Publish(env, msg);
279+
 v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
 };
284+
 ch->Publish(
285+
 env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
 publishing_ = false;
274288
 }
275289
 }
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
 v8::Isolate* isolate = env->isolate();
325339
 v8::HandleScope handle_scope(isolate);
326340
 v8::Local<v8::Context> context = env->context();
327-
 v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
 msg->Set(context,
330-
 env->permission_string(),
331-
PermissionToString(env, scope))
332-
 .Check();
333-
 msg->Set(context,
334-
 env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
 .Check();
337-
 msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
 .Check();
341-
 ch->Publish(env, msg);
341+
342+
 v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
 };
347+
 ch->Publish(
348+
 env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
 publishing_ = false;
343351
 }
344352
 }
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 968bdd0
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the
same shape and should be as low cost as possible, use a
cached DictionaryTemplate for creating them
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #65158
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0
4 files changed
Lines changed: 41 additions & 35 deletions
File tree
‎src/env-inl.h‎
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
 IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
 }
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
 Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
 }
886884
PERMISSIONS(V)
887885
#undef V
‎src/env.cc‎
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
 info->primitive_values[i++]); \
433433
 Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
 } \
438-
 Name##_permission_string##_.Set(isolate_, field); \
437+
 Name##_permission_string##_.Set(isolate_, field); \
439438
 } while (0);
440439
PERMISSIONS(V)
441440
#undef V
‎src/env_properties.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
 V(naptr_record_template, v8::DictionaryTemplate) \
461461
 V(object_stats_template, v8::DictionaryTemplate) \
462462
 V(page_stats_template, v8::DictionaryTemplate) \
463+
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
 V(pipe_constructor_template, v8::FunctionTemplate) \
464465
 V(script_context_constructor_template, v8::FunctionTemplate) \
465466
 V(secure_context_constructor_template, v8::FunctionTemplate) \
‎src/permission/permission.cc‎
Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
 }
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
 };
69+
 tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
 env->set_permission_diagnostic_channel_message(tmpl);
71+
 }
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
 v8::Isolate* isolate = env->isolate();
260277
 v8::HandleScope handle_scope(isolate);
261278
 v8::Local<v8::Context> context = env->context();
262-
 v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
 msg->Set(context,
265-
 env->permission_string(),
266-
PermissionToString(env, permission))
267-
 .Check();
268-
 msg->Set(context,
269-
 env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
 .Check();
272-
 ch->Publish(env, msg);
279+
 v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
 };
284+
 ch->Publish(
285+
 env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
 publishing_ = false;
274288
 }
275289
 }
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
 v8::Isolate* isolate = env->isolate();
325339
 v8::HandleScope handle_scope(isolate);
326340
 v8::Local<v8::Context> context = env->context();
327-
 v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
 msg->Set(context,
330-
 env->permission_string(),
331-
PermissionToString(env, scope))
332-
 .Check();
333-
 msg->Set(context,
334-
 env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
 .Check();
337-
 msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
 .Check();
341-
 ch->Publish(env, msg);
341+
342+
 v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
 };
347+
 ch->Publish(
348+
 env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
 publishing_ = false;
343351
 }
344352
 }
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 968bdd0
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the
same shape and should be as low cost as possible, use a
cached DictionaryTemplate for creating them
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #65158
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0
4 files changed
Lines changed: 41 additions & 35 deletions
File tree
‎src/env-inl.h‎
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
 IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
 }
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
 Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
 }
886884
PERMISSIONS(V)
887885
#undef V
‎src/env.cc‎
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
 info->primitive_values[i++]); \
433433
 Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
 } \
438-
 Name##_permission_string##_.Set(isolate_, field); \
437+
 Name##_permission_string##_.Set(isolate_, field); \
439438
 } while (0);
440439
PERMISSIONS(V)
441440
#undef V
‎src/env_properties.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
 V(naptr_record_template, v8::DictionaryTemplate) \
461461
 V(object_stats_template, v8::DictionaryTemplate) \
462462
 V(page_stats_template, v8::DictionaryTemplate) \
463+
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
 V(pipe_constructor_template, v8::FunctionTemplate) \
464465
 V(script_context_constructor_template, v8::FunctionTemplate) \
465466
 V(secure_context_constructor_template, v8::FunctionTemplate) \
‎src/permission/permission.cc‎
Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
 }
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
 };
69+
 tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
 env->set_permission_diagnostic_channel_message(tmpl);
71+
 }
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
 v8::Isolate* isolate = env->isolate();
260277
 v8::HandleScope handle_scope(isolate);
261278
 v8::Local<v8::Context> context = env->context();
262-
 v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
 msg->Set(context,
265-
 env->permission_string(),
266-
PermissionToString(env, permission))
267-
 .Check();
268-
 msg->Set(context,
269-
 env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
 .Check();
272-
 ch->Publish(env, msg);
279+
 v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
 };
284+
 ch->Publish(
285+
 env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
 publishing_ = false;
274288
 }
275289
 }
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
 v8::Isolate* isolate = env->isolate();
325339
 v8::HandleScope handle_scope(isolate);
326340
 v8::Local<v8::Context> context = env->context();
327-
 v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
 msg->Set(context,
330-
 env->permission_string(),
331-
PermissionToString(env, scope))
332-
 .Check();
333-
 msg->Set(context,
334-
 env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
 .Check();
337-
 msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
 .Check();
341-
 ch->Publish(env, msg);
341+
342+
 v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
 };
347+
 ch->Publish(
348+
 env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
 publishing_ = false;
343351
 }
344352
 }
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 968bdd0
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: use DictionaryTemplate for permission diag channel message
Since DiagnosticChannel permission messages always have the
same shape and should be as low cost as possible, use a
cached DictionaryTemplate for creating them
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #65158
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent f77aa2f commit 968bdd0
4 files changed
Lines changed: 41 additions & 35 deletions
File tree
‎src/env-inl.h‎
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,8 @@ void Environment::set_process_exit_handler(
842842
#undef VP
843843

844844
#defineV(Name, label, _, __) \
845-
inline v8::Local<v8::String> \
846-
 IsolateData::Name##_permission_string() const { \
847-
return Name##_permission_string##_.Get(isolate_); \
845+
inline v8::Local<v8::String> IsolateData::Name##_permission_string() const { \
846+
return Name##_permission_string##_.Get(isolate_); \
848847
 }
849848
PERMISSIONS(V)
850849
#undef V
@@ -879,9 +878,8 @@ void Environment::set_process_exit_handler(
879878
#undef VP
880879

881880
#defineV(Name, label, _, __) \
882-
inline v8::Local<v8::String> \
883-
 Environment::Name##_permission_string() const { \
884-
returnisolate_data()->Name##_permission_string(); \
881+
inline v8::Local<v8::String> Environment::Name##_permission_string() const { \
882+
returnisolate_data()->Name##_permission_string(); \
885883
 }
886884
PERMISSIONS(V)
887885
#undef V
‎src/env.cc‎
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,9 @@ void IsolateData::DeserializeProperties(const IsolateDataSerializeInfo* info) {
432432
 info->primitive_values[i++]); \
433433
 Local<String> field; \
434434
if (!maybe_field.ToLocal(&field)) { \
435-
fprintf(stderr, \
436-
"Failed to deserialize " #Name "_permission_string\n"); \
435+
fprintf(stderr, "Failed to deserialize " #Name "_permission_string\n"); \
437436
 } \
438-
 Name##_permission_string##_.Set(isolate_, field); \
437+
 Name##_permission_string##_.Set(isolate_, field); \
439438
 } while (0);
440439
PERMISSIONS(V)
441440
#undef V
‎src/env_properties.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
 V(naptr_record_template, v8::DictionaryTemplate) \
461461
 V(object_stats_template, v8::DictionaryTemplate) \
462462
 V(page_stats_template, v8::DictionaryTemplate) \
463+
 V(permission_diagnostic_channel_message, v8::DictionaryTemplate) \
463464
 V(pipe_constructor_template, v8::FunctionTemplate) \
464465
 V(script_context_constructor_template, v8::FunctionTemplate) \
465466
 V(secure_context_constructor_template, v8::FunctionTemplate) \
‎src/permission/permission.cc‎
Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include"node_external_reference.h"
99
#include"node_file.h"
1010

11+
#include"v8-template.h"
1112
#include"v8.h"
1213

1314
#include<memory>
@@ -17,11 +18,13 @@
1718
namespacenode {
1819

1920
using v8::Context;
21+
using v8::DictionaryTemplate;
2022
using v8::FunctionCallbackInfo;
2123
using v8::IntegrityLevel;
2224
using v8::Local;
2325
using v8::MaybeLocal;
2426
using v8::Object;
27+
using v8::Undefined;
2528
using v8::Value;
2629

2730
namespacepermission {
@@ -55,6 +58,20 @@ constexpr std::string_view GetDiagnosticsChannelName(PermissionScope scope) {
5558
 }
5659
}
5760

61+
Local<DictionaryTemplate> GetPermissionDiagnosicsTemplate(Environment* env) {
62+
auto tmpl = env->permission_diagnostic_channel_message();
63+
if (tmpl.IsEmpty()) {
64+
staticconstexpr std::string_view names[] = {
65+
"permission",
66+
"resource",
67+
"drop",
68+
 };
69+
 tmpl = DictionaryTemplate::New(env->isolate(), names);
70+
 env->set_permission_diagnostic_channel_message(tmpl);
71+
 }
72+
return tmpl;
73+
}
74+
5875
// permission.drop('fs.read', '/tmp/')
5976
// permission.drop('child')
6077
staticvoidDrop(const FunctionCallbackInfo<Value>& args) {
@@ -259,17 +276,14 @@ bool Permission::is_scope_granted(Environment* env,
259276
 v8::Isolate* isolate = env->isolate();
260277
 v8::HandleScope handle_scope(isolate);
261278
 v8::Local<v8::Context> context = env->context();
262-
 v8::Local<v8::Object> msg =
263-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
264-
 msg->Set(context,
265-
 env->permission_string(),
266-
PermissionToString(env, permission))
267-
 .Check();
268-
 msg->Set(context,
269-
 env->resource_string(),
270-
ToV8Value(context, res).ToLocalChecked())
271-
 .Check();
272-
 ch->Publish(env, msg);
279+
 v8::MaybeLocal<v8::Value> values[] = {
280+
PermissionToString(env, permission),
281+
ToV8Value(context, res),
282+
Undefined(isolate),
283+
 };
284+
 ch->Publish(
285+
 env,
286+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
273287
 publishing_ = false;
274288
 }
275289
 }
@@ -324,21 +338,15 @@ void Permission::Drop(Environment* env,
324338
 v8::Isolate* isolate = env->isolate();
325339
 v8::HandleScope handle_scope(isolate);
326340
 v8::Local<v8::Context> context = env->context();
327-
 v8::Local<v8::Object> msg =
328-
v8::Object::New(isolate, v8::Null(isolate), nullptr, nullptr, 0);
329-
 msg->Set(context,
330-
 env->permission_string(),
331-
PermissionToString(env, scope))
332-
 .Check();
333-
 msg->Set(context,
334-
 env->resource_string(),
335-
ToV8Value(context, param).ToLocalChecked())
336-
 .Check();
337-
 msg->Set(context,
338-
FIXED_ONE_BYTE_STRING(isolate, "drop"),
339-
v8::Boolean::New(isolate, true))
340-
 .Check();
341-
 ch->Publish(env, msg);
341+
342+
 v8::MaybeLocal<v8::Value> values[] = {
343+
PermissionToString(env, scope),
344+
ToV8Value(context, param),
345+
v8::True(isolate),
346+
 };
347+
 ch->Publish(
348+
 env,
349+
GetPermissionDiagnosicsTemplate(env)->NewInstance(context, values));
342350
 publishing_ = false;
343351
 }
344352
 }
0 commit comments
Comments
 (0)