Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 82 additions & 71 deletions src/node_http_parser.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,55 +246,63 @@ struct StringPtr {
size_t size_ = 0;
};

struct ParserComparator {
bool operator()(const Parser* lhs, const Parser* rhs) const;
// Intrusive doubly-linked list node, linked to itself when not in a list.
struct ParserListNode {
ParserListNode* prev = this;
ParserListNode* next = this;

ParserListNode() = default;
~ParserListNode() { Remove(); }

ParserListNode(const ParserListNode&) = delete;
ParserListNode& operator=(const ParserListNode&) = delete;

void Remove() {
prev->next = next;
next->prev = prev;
prev = this;
next = this;
}
};

class ConnectionsList : public BaseObject {
public:
static void New(const FunctionCallbackInfo<Value>& args);
static void New(const FunctionCallbackInfo<Value>& args);

static void All(const FunctionCallbackInfo<Value>& args);
static void All(const FunctionCallbackInfo<Value>& args);

static void Idle(const FunctionCallbackInfo<Value>& args);
static void Idle(const FunctionCallbackInfo<Value>& args);

static void Active(const FunctionCallbackInfo<Value>& args);
static void Active(const FunctionCallbackInfo<Value>& args);

static void Expired(const FunctionCallbackInfo<Value>& args);
static void Expired(const FunctionCallbackInfo<Value>& args);

void Push(Parser* parser) {
all_connections_.insert(parser);
}
inline void Push(Parser* parser);

void Pop(Parser* parser) {
all_connections_.erase(parser);
}
inline void Pop(Parser* parser);

void PushActive(Parser* parser) {
active_connections_.insert(parser);
}
inline void PushActive(Parser* parser);

void PopActive(Parser* parser) {
active_connections_.erase(parser);
}
inline void PopActive(Parser* parser);

SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(ConnectionsList)
SET_SELF_SIZE(ConnectionsList)

private:
ConnectionsList(Environment* env, Local<Object> object)
ConnectionsList(Environment* env, Local<Object> object)
: BaseObject(env, object) {
MakeWeak();
}
MakeWeak();
}

std::set<Parser*, ParserComparator> all_connections_;
std::set<Parser*, ParserComparator> active_connections_;
// active_connections_ is ordered by last_message_start_, as parsers are
// appended right after it is assigned from the monotonic uv_hrtime().
ParserListNode all_connections_;
ParserListNode active_connections_;
};

class Parser : public AsyncWrap, public StreamListener {
friend class ConnectionsList;
friend struct ParserComparator;

public:
Parser(BindingData* binding_data, Local<Object> wrap)
Expand All@@ -308,13 +316,6 @@ class Parser : public AsyncWrap, public StreamListener {
SET_SELF_SIZE(Parser)

int on_message_begin() {
// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

num_fields_ = num_values_ = 0;
headers_completed_ = false;
chunk_extensions_nread_ = 0;
Expand All@@ -325,7 +326,6 @@ class Parser : public AsyncWrap, public StreamListener {
status_message_.Reset();

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
connectionsList_->PushActive(this);
}

Expand All@@ -344,7 +344,6 @@ class Parser : public AsyncWrap, public StreamListener {
return 0;
}


int on_url(const char* at, size_t length) {
int rv = TrackHeader(length);
if (rv != 0) {
Expand DownExpand Up@@ -542,19 +541,12 @@ class Parser : public AsyncWrap, public StreamListener {
int on_message_complete() {
HandleScope scope(env()->isolate());

// Important: Pop from the lists BEFORE resetting the last_message_start_
// otherwise std::set.erase will fail.
if (connectionsList_ != nullptr) {
connectionsList_->Pop(this);
connectionsList_->PopActive(this);
}

last_message_start_ = 0;

if (connectionsList_ != nullptr) {
connectionsList_->Push(this);
}

if (num_fields_)
Flush(); // Flush trailing HTTP headers.

Expand DownExpand Up@@ -740,8 +732,6 @@ class Parser : public AsyncWrap, public StreamListener {
// server.timeout is left to the default value of zero.
parser->last_message_start_ = uv_hrtime();

// Important: Push into the lists AFTER setting the last_message_start_
// otherwise std::set.erase will fail later.
parser->connectionsList_->Push(parser);
parser->connectionsList_->PushActive(parser);
} else {
Expand DownExpand Up@@ -1116,6 +1106,8 @@ class Parser : public AsyncWrap, public StreamListener {
uint64_t max_http_header_size_;
uint64_t last_message_start_;
ConnectionsList* connectionsList_;
ParserListNode all_node_;
ParserListNode active_node_;

BaseObjectPtr<BindingData> binding_data_;

Expand DownExpand Up@@ -1143,18 +1135,34 @@ class Parser : public AsyncWrap, public StreamListener {
static const llhttp_settings_t settings;
};

bool ParserComparator::operator()(const Parser* lhs, const Parser* rhs) const {
if (lhs->last_message_start_ == 0 && rhs->last_message_start_ == 0) {
// When both parsers are idle, guarantee strict order by
// comparing pointers as ints.
return lhs < rhs;
} else if (lhs->last_message_start_ == 0) {
return true;
} else if (rhs->last_message_start_ == 0) {
return false;
}
namespace {

// Append `node` at the tail of the list headed by `head`, unlinking it from
// any list it is currently in.
void ListPushBack(ParserListNode* head, ParserListNode* node) {
node->Remove();
node->prev = head->prev;
node->next = head;
head->prev->next = node;
head->prev = node;
}

} // anonymous namespace

return lhs->last_message_start_ < rhs->last_message_start_;
void ConnectionsList::Push(Parser* parser) {
ListPushBack(&all_connections_, &parser->all_node_);
}

void ConnectionsList::Pop(Parser* parser) {
parser->all_node_.Remove();
}

void ConnectionsList::PushActive(Parser* parser) {
ListPushBack(&active_connections_, &parser->active_node_);
}

void ConnectionsList::PopActive(Parser* parser) {
parser->active_node_.Remove();
}

void ConnectionsList::New(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -1172,8 +1180,10 @@ void ConnectionsList::All(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
result.emplace_back(parser->object());
}

Expand All@@ -1189,8 +1199,10 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->all_connections_.size());
for (auto parser : list->all_connections_) {
for (ParserListNode* node = list->all_connections_.next;
node != &list->all_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::all_node_, node);
if (parser->last_message_start_ == 0 || !parser->received_data_) {
result.emplace_back(parser->object());
}
Expand All@@ -1208,8 +1220,10 @@ void ConnectionsList::Active(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&list, args.This());

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
for (auto parser : list->active_connections_) {
for (ParserListNode* node = list->active_connections_.next;
node != &list->active_connections_;
node = node->next) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
result.emplace_back(parser->object());
}

Expand DownExpand Up@@ -1253,14 +1267,11 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(Array::New(isolate, 0));
}

auto iter = list->active_connections_.begin();
auto end = list->active_connections_.end();

LocalVector<Value> result(isolate);
result.reserve(list->active_connections_.size());
while (iter != end) {
Parser* parser = *iter;
iter++;
ParserListNode* node = list->active_connections_.next;
while (node != &list->active_connections_) {
Parser* parser = ContainerOf(&Parser::active_node_, node);
node = node->next;

// Check for expiration.
if (
Expand All@@ -1272,7 +1283,7 @@ void ConnectionsList::Expired(const FunctionCallbackInfo<Value>& args) {
) {
result.emplace_back(parser->object());

list->active_connections_.erase(parser);
parser->active_node_.Remove();
}
}

Expand Down
Loading