Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/node_sqlite.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,6 +349,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -395,12 +396,18 @@ class CustomAggregate {
return;
}

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

agg->value.Reset(isolate, ret);
}

static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand All@@ -426,6 +433,9 @@ class CustomAggregate {
.ToLocal(&result)) {
self->db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
} else if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}
} else {
result = Local<Value>::New(isolate, agg->value);
Expand DownExpand Up@@ -457,6 +467,10 @@ class CustomAggregate {
auto fn = start_v.As<Function>();
MaybeLocal<Value> retval =
fn->Call(env_->context(), Null(isolate), 0, nullptr);
if (!db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env_, "database is not open");
return nullptr;
}
if (!retval.ToLocal(&start_v)) {
db_->SetIgnoreNextSQLiteError(true);
sqlite3_result_error(ctx, "", 0);
Expand DownExpand Up@@ -669,6 +683,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -700,6 +715,12 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,

MaybeLocal<Value> retval =
fn->Call(env->context(), recv, argc, js_argv.data());

if (!self->db_->IsOpen()) {
THROW_ERR_INVALID_STATE(env, "database is not open");
return;
}

Local<Value> result;
if (!retval.ToLocal(&result)) {
// Ignore the SQLite error because a JavaScript exception is pending.
Expand DownExpand Up@@ -1434,6 +1455,8 @@ void DatabaseSync::Close(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
THROW_AND_RETURN_ON_BAD_STATE(
env, db->IsInCallback(), "database cannot be closed while in a callback");
db->FinalizeStatements();
db->DeleteSessions();
int r = sqlite3_close_v2(db->connection_);
Expand DownExpand Up@@ -2373,13 +2396,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
BaseObjectPtr<DatabaseSync> guard(db);

ArrayBufferViewContents<uint8_t> buf(args[0]);
int r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
int r;
{
CallbackDepthGuard guard(db);
r = sqlite3changeset_apply(
db->connection_,
buf.length(),
const_cast<void*>(static_cast<const void*>(buf.data())),
context.filterCallback ? xFilter : nullptr,
xConflict,
static_cast<void*>(&context));
}
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand DownExpand Up@@ -2509,6 +2536,7 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
const char* param3,
const char* param4) {
DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
CallbackDepthGuard guard(db);
Environment* env = db->env();
Isolate* isolate = env->isolate();
HandleScope handle_scope(isolate);
Expand Down
18 changes: 18 additions & 0 deletions src/node_sqlite.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,10 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

void IncrementCallbackDepth() { ++callback_depth_; }
void DecrementCallbackDepth() { --callback_depth_; }
bool IsInCallback() const { return callback_depth_ > 0; }

SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)

Expand All@@ -241,6 +245,7 @@ class DatabaseSync : public BaseObject {
bool enable_load_extension_;
sqlite3* connection_;
bool ignore_next_sqlite_error_;
int callback_depth_ = 0;

std::set<BackupJob*> backups_;
std::set<sqlite3_session*> sessions_;
Expand DownExpand Up@@ -398,6 +403,19 @@ class SQLTagStore : public BaseObject {
friend class StatementExecutionHelper;
};

class CallbackDepthGuard {
public:
explicit CallbackDepthGuard(DatabaseSync* db) : db_(db) {
db_->IncrementCallbackDepth();
}
~CallbackDepthGuard() { db_->DecrementCallbackDepth(); }
CallbackDepthGuard(const CallbackDepthGuard&) = delete;
CallbackDepthGuard& operator=(const CallbackDepthGuard&) = delete;

private:
DatabaseSync* db_;
};

class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-sqlite-udf-close.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use strict';

const { skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`database.close() from a UDF during statement.${method}()`, () => {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);

db.function('close_db', (value) => {
db.close();
return value;
});

const statement = db.prepare('SELECT close_db(value) FROM data');
assert.throws(() => {
if (method === 'iterate') {
for (const row of statement.iterate()) {
assert.ok(row);
}
} else {
statement[method]();
}
}, {
code: 'ERR_INVALID_STATE',
message: 'database cannot be closed while in a callback',
});

assert.strictEqual(db.isOpen, true);
db.close();
});
}
Loading