Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
e17c737
tools: copyedit `build-tarball.yml`
aduh95 Sep 10, 2025
43e6e54
build: do not include custom ESLint rules testing in tarball
aduh95 Sep 8, 2025
f0c20cc
src: remove unnecessary `Environment::GetCurrent()` calls
iknoom Sep 11, 2025
0d23fd5
tools: skip test-internet workflow for draft PRs
targos Sep 11, 2025
b200cd8
lib,src: refactor assert to load error source from memory
legendecas Sep 2, 2025
d785929
lib: add source map support for assert messages
legendecas Sep 3, 2025
ff13d1d
lib,src: cache ModuleWrap.hasAsyncGraph
legendecas Sep 11, 2025
8a5325d
src: ensure `v8::Eternal` is empty before setting it
addaleax Sep 11, 2025
b711256
deps: update undici to 7.16.0
nodejs-github-bot Sep 11, 2025
e9cb986
doc: rephrase dynamic import() description
meteorqz6 Sep 12, 2025
e4f5716
doc: deprecate closing `fs.Dir` on garbage collection
LiviaMedeiros Sep 12, 2025
6458867
url: add type checking to urlToHttpOptions()
simon-id Sep 12, 2025
9a4bbdc
benchmark: calibrate config cluster/echo.js
meteorqz6 Sep 12, 2025
bb051c5
crypto: avoid calls to `promise.catch()`
Renegade334 Sep 9, 2025
8ed4587
crypto: use async functions for non-stub Promise-returning functions
Renegade334 Sep 9, 2025
647c332
crypto: use `return await` when returning Promises from async functions
Renegade334 Sep 9, 2025
f006a14
node-api: make napi_delete_reference use node_api_basic_env
JeetuSuthar Sep 12, 2025
03116a7
src: remove `std::array` overload of `FIXED_ONE_BYTE_STRING`
addaleax Aug 4, 2025
2bb1525
src: create strings in `FIXED_ONE_BYTE_STRING` as internalized
addaleax Aug 4, 2025
026d4e3
doc,crypto: update subtle.generateKey and subtle.importKey
panva Sep 13, 2025
0f46c1c
repl: fix cpu overhead pasting big strings to the REPL
BridgeAR Sep 14, 2025
6133a82
util: fix debuglog.enabled not being present with callback logger
BridgeAR Sep 14, 2025
3c62b38
util: inspect objects with throwing Symbol.toStringTag
BridgeAR Sep 14, 2025
9df91e5
doc: type improvement of file `http.md`
samuel871211 Sep 14, 2025
8b29bbc
url: replaced slice with at
Connormiha Sep 14, 2025
cbec4fd
benchmark: calibrate config dgram multi-buffer
brunocroh Sep 14, 2025
fed1dac
lib: update isDeepStrictEqual to support options
miguelmarcondesf Sep 14, 2025
9782ca2
zlib: implement fast path for crc32
gurgunday Sep 14, 2025
83ae610
http: optimize checkIsHttpToken for short strings
JinhyeokFang Sep 14, 2025
acada1f
inspector: ensure adequate memory allocation for `Binary::toBase64`
Renegade334 Sep 14, 2025
bd767c5
doc: add security escalation policy
UlisesGascon Sep 15, 2025
97c4e1b
typings: remove unused imports
meteorqz6 Sep 15, 2025
be48760
node-api: added SharedArrayBuffer api
mertcanaltin Sep 16, 2025
039ac19
crypto: expose signatureAlgorithm on X509Certificate
patrickrbc Sep 16, 2025
213188e
stream: use new AsyncResource instead of bind
mcollina Sep 16, 2025
abecdcb
src: replace FIXED_ONE_BYTE_STRING with Environment-cached strings
iknoom Sep 17, 2025
ac78491
src: reduce the nearest parent package JSON cache size
michaelsmithxyz Sep 17, 2025
993f05d
fs,win: do not add a second trailing slash in readdir
Flarna Sep 17, 2025
728472a
module: only put directly require-d ESM into require.cache
joyeecheung Sep 17, 2025
8f32746
test: guard write to proxy client if proxy connection is ended
joyeecheung Sep 17, 2025
d17f299
src: use DictionaryTemplate more in URLPattern
jasnell Sep 17, 2025
87bbaa2
tools: fix `tools/make-v8.sh` for clang
richardlau Sep 17, 2025
7aec53b
http: add shouldUpgradeCallback to let servers control HTTP upgrades
pimterry Sep 17, 2025
9a3e58a
sqlite: add tagged template
0hmX Sep 17, 2025
e94c573
meta: add .npmrc with ignore-scripts=true
joyeecheung Sep 17, 2025
8c85570
deps: upgrade openssl sources to openssl-3.5.3
nodejs-github-bot Sep 16, 2025
fa40d3a
deps: update archs files for openssl-3.5.3
nodejs-github-bot Sep 16, 2025
f5d3f91
tls: only do off-thread certificate loading on loading tls
joyeecheung Sep 11, 2025
6790093
tls: load bundled and extra certificates off-thread
joyeecheung Sep 11, 2025
2b2591d
esm: make hasAsyncGraph non-enumerable
joyeecheung Sep 18, 2025
b0c1e67
diagnostics_channel: fix race condition with diagnostics_channel and GC
uurien Sep 19, 2025
6e586a1
vm: expose hasTopLevelAwait on SourceTextModule
legendecas Sep 19, 2025
c5d910a
http2: fix allowHttp1+Upgrade, broken by shouldUpgradeCallback
pimterry Sep 20, 2025
86150f3
src: rename private fields to follow naming convention
iknoom Sep 20, 2025
69b5607
src: simplify is_callable by making it a concept
tniessen Sep 20, 2025
396cc8e
lib: update inspect output format for subclasses
miguelmarcondesf Sep 21, 2025
ce8435b
test: testcase demonstrating issue 59541
ericrannaud Sep 7, 2025
44ce971
vm: "afterEvaluate", evaluate() return a promise from the outer context
ericrannaud Sep 10, 2025
9347ddd
vm: explain how to share promises between contexts w/ afterEvaluate
ericrannaud Sep 19, 2025
dea5dd7
dgram: restore buffer optimization in fixBufferList
ri7116 Sep 21, 2025
a28962a
doc: update V8 fast API guidance
Renegade334 Sep 21, 2025
0b284d8
build: add the missing macro definitions for OpenHarmony
hqzing Sep 22, 2025
e330f03
src: update crypto objects to use DictionaryTemplate
jasnell Sep 22, 2025
b970c0b
zlib: reduce code duplication
jhofstee Sep 22, 2025
6695067
http,https: handle IPv6 with proxies
joyeecheung Sep 22, 2025
05e560d
deps: update googletest to 50b8600
nodejs-github-bot Sep 23, 2025
1e723f9
doc: fix typo in section on microtask order
tniessen Sep 23, 2025
49747a5
worker: add heap profile API
theanarkh Sep 23, 2025
f14ed5a
src: simplify watchdog instantiations via `std::optional`
addaleax Sep 23, 2025
0b37b59
doc: use "WebAssembly" instead of "Web Assembly"
tniessen Sep 24, 2025
0fe5337
sqlite: cleanup ERM support and export Session class
jasnell May 18, 2025
3eeb7b4
sqlite: fix crash session extension callbacks with workers
louwers Sep 23, 2025
31c6e70
2025-09-25, Version 24.9.0 (Current)
nodejs-github-bot Sep 24, 2025
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
Prev Previous commit
Next Next commit
sqlite: fix crash session extension callbacks with workers
PR-URL: #59848
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Zeyu "Alex" Yang <[email protected]>
Reviewed-By: Edy Silva <[email protected]>
  • Loading branch information
louwers authored and targos committed Sep 24, 2025
commit 3eeb7b47ea12daa2b0b14bc486c5d403da6d4f04
39 changes: 22 additions & 17 deletions src/node_sqlite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1668,26 +1668,28 @@ void Backup(const FunctionCallbackInfo<Value>& args) {
job->ScheduleBackup();
}

struct ConflictCallbackContext {
std::function<bool(std::string_view)> filterCallback;
std::function<int(int)> conflictCallback;
};

// the reason for using static functions here is that SQLite needs a
// function pointer
static std::function<int(int)> conflictCallback;

static int xConflict(void* pCtx, int eConflict, sqlite3_changeset_iter* pIter) {
if (!conflictCallback) return SQLITE_CHANGESET_ABORT;
return conflictCallback(eConflict);
auto ctx = static_cast<ConflictCallbackContext*>(pCtx);
if (!ctx->conflictCallback) return SQLITE_CHANGESET_ABORT;
return ctx->conflictCallback(eConflict);
}

static std::function<bool(std::string)> filterCallback;

static int xFilter(void* pCtx, const char* zTab) {
if (!filterCallback) return 1;

return filterCallback(zTab) ? 1 : 0;
auto ctx = static_cast<ConflictCallbackContext*>(pCtx);
if (!ctx->filterCallback) return 1;
return ctx->filterCallback(zTab) ? 1 : 0;
}

void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
conflictCallback = nullptr;
filterCallback = nullptr;
ConflictCallbackContext context;

DatabaseSync* db;
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Expand Down Expand Up @@ -1723,7 +1725,7 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
return;
}
Local<Function> conflictFunc = conflictValue.As<Function>();
conflictCallback = [env, conflictFunc](int conflictType) -> int {
context.conflictCallback = [env, conflictFunc](int conflictType) -> int {
Local<Value> argv[] = {Integer::New(env->isolate(), conflictType)};
TryCatch try_catch(env->isolate());
Local<Value> result =
Expand Down Expand Up @@ -1761,15 +1763,18 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {

Local<Function> filterFunc = filterValue.As<Function>();

filterCallback = [env, filterFunc](std::string item) -> bool {
context.filterCallback = [env,
filterFunc](std::string_view item) -> bool {
// TODO(@jasnell): The use of ToLocalChecked here means that if
// the filter function throws an error the process will crash.
// The filterCallback should be updated to avoid the check and
// propagate the error correctly.
Local<Value> argv[] = {String::NewFromUtf8(env->isolate(),
item.c_str(),
NewStringType::kNormal)
.ToLocalChecked()};
Local<Value> argv[] = {
String::NewFromUtf8(env->isolate(),
item.data(),
NewStringType::kNormal,
static_cast<int>(item.size()))
.ToLocalChecked()};
Local<Value> result =
filterFunc->Call(env->context(), Null(env->isolate()), 1, argv)
.ToLocalChecked();
Expand All @@ -1785,7 +1790,7 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
const_cast<void*>(static_cast<const void*>(buf.data())),
xFilter,
xConflict,
nullptr);
static_cast<void*>(&context));
if (r == SQLITE_OK) {
args.GetReturnValue().Set(true);
return;
Expand Down
74 changes: 74 additions & 0 deletions test/parallel/test-sqlite-session.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ const {
constants,
} = require('node:sqlite');
const { test, suite } = require('node:test');
const { nextDb } = require('../sqlite/next-db.js');
const { Worker } = require('worker_threads');
const { once } = require('events');

/**
* Convenience wrapper around assert.deepStrictEqual that sets a null
Expand Down Expand Up @@ -555,3 +558,74 @@ test('session supports ERM', (t) => {
message: /session is not open/,
});
});

test('concurrent applyChangeset with workers', async (t) => {
// Before adding this test, the callbacks were stored in static variables
// this could result in a crash
// this test is a regression test for that scenario

function modeToString(mode) {
if (mode === constants.SQLITE_CHANGESET_ABORT) return 'SQLITE_CHANGESET_ABORT';
if (mode === constants.SQLITE_CHANGESET_OMIT) return 'SQLITE_CHANGESET_OMIT';
}

const dbPath = nextDb();
const db1 = new DatabaseSync(dbPath);
const db2 = new DatabaseSync(':memory:');
const createTable = `
CREATE TABLE data(
key INTEGER PRIMARY KEY,
value TEXT
) STRICT`;
db1.exec(createTable);
db2.exec(createTable);
db1.prepare('INSERT INTO data (key, value) VALUES (?, ?)').run(1, 'hello');
db1.close();
const session = db2.createSession();
db2.prepare('INSERT INTO data (key, value) VALUES (?, ?)').run(1, 'world');
const changeset = session.changeset(); // Changeset with conflict (for db1)

const iterations = 10;
for (let i = 0; i < iterations; i++) {
const workers = [];
const expectedResults = new Map([
[constants.SQLITE_CHANGESET_ABORT, false],
[constants.SQLITE_CHANGESET_OMIT, true]]
);

// Launch two workers (abort and omit modes)
for (const mode of [constants.SQLITE_CHANGESET_ABORT, constants.SQLITE_CHANGESET_OMIT]) {
const worker = new Worker(`${__dirname}/../sqlite/worker.js`, {
workerData: {
dbPath,
changeset,
mode
},
});
workers.push(worker);
}

const results = await Promise.all(workers.map(async (worker) => {
const [message] = await once(worker, 'message');
return message;
}));

// Verify each result
for (const res of results) {
if (res.errorMessage) {
if (res.errcode === 5) { // SQLITE_BUSY
break; // ignore
}
t.assert.fail(`Worker error: ${res.error.message}`);
}
const expected = expectedResults.get(res.mode);
t.assert.strictEqual(
res.result,
expected,
`Iteration ${i}: Worker (${modeToString(res.mode)}) expected ${expected} but got ${res.result}`
);
}

workers.forEach((worker) => worker.terminate()); // Cleanup
}
});
10 changes: 1 addition & 9 deletions test/parallel/test-sqlite.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
'use strict';
const { spawnPromisified, skipIfSQLiteMissing } = require('../common');
skipIfSQLiteMissing();
const tmpdir = require('../common/tmpdir');
const { join } = require('node:path');
const { DatabaseSync, constants } = require('node:sqlite');
const { suite, test } = require('node:test');
const { pathToFileURL } = require('node:url');
let cnt = 0;

tmpdir.refresh();

function nextDb() {
return join(tmpdir.path, `database-${cnt++}.db`);
}
const { nextDb } = require('../sqlite/next-db.js');

suite('accessing the node:sqlite module', () => {
test('cannot be accessed without the node: scheme', (t) => {
Expand Down
14 changes: 14 additions & 0 deletions test/sqlite/next-db.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';
require('../common');
const tmpdir = require('../common/tmpdir');
const { join } = require('node:path');

let cnt = 0;

tmpdir.refresh();

function nextDb() {
return join(tmpdir.path, `database-${cnt++}.db`);
}

module.exports = { nextDb };
24 changes: 24 additions & 0 deletions test/sqlite/worker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// This worker is used for one of the tests in test-sqlite-session.js

'use strict';
require('../common');
const { parentPort, workerData } = require('worker_threads');
const { DatabaseSync, constants } = require('node:sqlite');
const { changeset, mode, dbPath } = workerData;

const db = new DatabaseSync(dbPath);

const options = {};
if (mode !== constants.SQLITE_CHANGESET_ABORT && mode !== constants.SQLITE_CHANGESET_OMIT) {
throw new Error('Unexpected value for mode');
}
options.onConflict = () => mode;

try {
const result = db.applyChangeset(changeset, options);
parentPort.postMessage({ mode, result, error: null });
} catch (error) {
parentPort.postMessage({ mode, result: null, errorMessage: error.message, errcode: error.errcode });
} finally {
db.close(); // Just to make sure it is closed ASAP
}
Loading