@blamejs/core 0.6.34 → 0.6.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -0
- package/lib/cluster-provider-db.js +145 -74
- package/package.json +1 -1
- package/sbom.cyclonedx.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -8,6 +8,7 @@ upgrading across more than a few patches at a time.
|
|
|
8
8
|
|
|
9
9
|
## v0.6.x
|
|
10
10
|
|
|
11
|
+
- **0.6.35** (2026-05-02) — `cluster-provider-db` MySQL dialect. **`b.cluster.create({ provider: clusterProviderDb.create({ dialect: "mysql", ... }) })`** — operators on MySQL no longer have to supply their own provider; the framework's default DB-row leader-election provider now speaks all three of postgres / sqlite / mysql. The MySQL acquireLease shape uses `INSERT INTO _blamejs_leader (...) VALUES (...) ON DUPLICATE KEY UPDATE col = IF(expiresAt < ?, VALUES(col), col), ..., expiresAt = IF(expiresAt < ?, VALUES(expiresAt), expiresAt)` so a still-valid lease is preserved untouched and an expired one is overwritten — atomic at the row level — followed by a `SELECT FROM _blamejs_leader WHERE scope='leader'` to read who holds (MySQL has no `RETURNING`). The expiresAt assignment runs LAST so per-column IF() predicates evaluate against pre-update row state. Renew uses `UPDATE ... SET expiresAt=?, endpoint=? WHERE scope='leader' AND nodeId=? AND leaseId=?` followed by a check-SELECT to surface takeover races as `LEASE_LOST`. Schema generation: `BIGINT` int columns (was `INTEGER` for SQLite), `VARCHAR(64)` for primary-key text columns and `VARCHAR(255)` for body text (MySQL needs explicit lengths on PRIMARY KEY columns), `CHECK (scope = 'leader' / 'state')` constraint dropped on MySQL because some MariaDB / MySQL 5.x versions parse-then-silently-drop CHECK clauses (would surface as version drift); the constant-scope invariant is enforced by application code anyway. Placeholder style auto-flips to `?` for MySQL (Postgres / SQLite continue to use `$1..$N`). **Tests**: 16 layer-1 assertions exercising the MySQL dialect path against a fake mysql-shaped driver (`_makeFakeMysqlDriver` in `test/helpers/drivers.js`) that emulates `INSERT ... ON DUPLICATE KEY UPDATE` with the per-column `IF()` semantics; covers acquire-empty, blocked-while-held, renew-no-fencing-bump, takeover-with-fencing-bump, old-leader-renew-throws-LEASE_LOST, currentLeader, releaseLease — plus a SQL-shape audit (validates VARCHAR primary keys, ON DUPLICATE KEY syntax, ?-placeholders, IF() gating). 14 live integration assertions against the docker MySQL 8.4 container via a docker-exec-based external-db driver shim (no npm mysql client; the framework already requires operator-supplied driver wiring, the shim demonstrates one path) covering ensureSchema, acquireLease, blocked-second-node, currentLeader, renewLease, release, takeover-after-expiry, fencingToken bump, old-leader LEASE_LOST. Smoke 6833 / wiki e2e 178 / per-primitive integration 16 files / wiki integration 32 / shellcheck clean / eslint clean.
|
|
11
12
|
- **0.6.34** (2026-05-02) — distributed pub/sub primitive. **`b.pubsub`** — single API for cross-node fan-out across the framework, with three backends. `local` dispatches in-process to registered handlers (zero coordination overhead for single-node deploys); `cluster` polls a shared `_blamejs_pubsub_messages` table at `pollIntervalMs` (default 100ms) and dispatches new rows past `lastSeenId` from other nodes (publishedBy=self filter prevents loopback); `redis` opens a SUBSCRIBE-mode connection on `lib/redis-client.js` (now with new push-message demultiplexing — server-pushed `["message", channel, payload]` and `["pmessage", pattern, channel, payload]` arrays route through `setOnPushMessage` instead of consuming a pending request slot, while SUBSCRIBE / UNSUBSCRIBE acks still flow through the normal command pipeline). Per-instance nonce stamped on outgoing redis payloads so the SUBSCRIBE socket recognizes its own publishes and skips the loopback (without it every same-instance publish would fire local handlers twice). Operator API: `ps.subscribe(channel, handler) → token`, `ps.subscribePattern(pattern, handler) → token` (glob-style on local + cluster, native PSUBSCRIBE on redis), `ps.unsubscribe(token)`, `await ps.publish(channel, payload) → { local, remote }`, `await ps.close()`. `topicPrefix` opt scopes channel names so independent pubsub instances sharing a backend (cache invalidation + websocket channels + custom) don't collide. Handler errors are caught + logged via the framework's boot logger; they never abort dispatch to other handlers on the same channel. **`lib/websocket-channels.js`** — replaces the inline cluster-poll-and-fan-out logic with `b.pubsub` consumption. The hub now owns one pubsub instance per primitive; cross-node delivery is `pubsub.subscribe` per channel the hub joins, with the hub's `_localDispatch` as the handler. Per-channel pubsub subscription is refcounted by local conn count (subscribe on first conn, unsubscribe on last). The `_blamejs_ws_messages` table is renamed to `_blamejs_pubsub_messages` (column `channel` → `topic`) reflecting the generalization; pre-v1, no compat shim — operators upgrading wipe the previous table (which carried only ephemeral fan-out rows with default 60s retention). **`b.cache.create({ invalidationPubsub })`** — passing a `b.pubsub.create()` instance auto-publishes on every successful `del` / `clear` / `invalidateTag`, and subscribes for the same events so other cache instances on other nodes (or processes sharing the pubsub backend) react locally — primarily useful for the memory backend so stale per-node entries don't survive a global tag wipe. Re-entrancy guard prevents inbound invalidation events from re-publishing (no fan-out loops). Tests: 29 layer-0 assertions covering local + cluster behavior, topicPrefix isolation, pattern subscribe, handler error isolation, post-close error path, end-to-end cache invalidationPubsub fan-out via local pubsub. 10 live integration assertions against the docker redis container covering single-instance round-trip, PSUBSCRIBE pattern, cross-instance fan-out, and cache invalidation through redis PUB/SUB. Smoke 6817 / wiki e2e 178 / per-primitive integration 15 files / wiki integration 32 / shellcheck clean / eslint clean.
|
|
12
13
|
- **0.6.33** (2026-05-02) — log-stream sinks parity sweep. **`b.logStream` syslog sink (RFC 5424)** — first-class `protocol: "syslog"` for `b.logStream.init({ sinks: { ... } })`; new module `lib/log-stream-syslog.js`. URL-driven transport selection: `udp://host:514` / `tcp://host:514` / `tls://host:6514`. UDP is best-effort one-datagram-per-record; TCP / TLS use RFC 6587 octet-counting framing (`<length> <message>`) so collectors that prefer it over the older non-transparent newline framing parse cleanly. TLS is TLS 1.3 minimum; operators with private CAs pass `ca` (PEM string or array) for trust pinning, `servername` for SNI override (auto-suppressed on IP literals per the v0.6.28 redis-client convention). Outgoing records are formatted with PRI = `(facility << 3) | severity`, default facility `local0` (16), severity mapped from the framework's level field (debug=7 / info=6 / warn=4 / error=3); operators override via `facility`, `appName` (default `blamejs`), `procId` (default `process.pid`), `hostname` (default `os.hostname()`), `structuredData` (default `-`). Meta is JSON-encoded into the MSG body so the structured payload survives the wire as a single token. TCP / TLS reconnect with exponential backoff (default 250ms→30s); records buffer during the down window with `bufferLimit`-bounded oldest-drop semantics, replay on reconnect. `close()` waits up to 3s for an in-flight (re)connect to drain the buffer before tearing down — without this the slower TLS handshake raced fire-and-forget shutdown emits and silently dropped records. Operator-supplied `onDrop({reason, batch, error})` surfaces every drop class (`overflow` / `udp-send-error` / `write-error` / `sink-closed`). Removed `syslog` from `DEFERRED_PROTOCOLS`. **`b.logStream` cloudwatch sink: `autoCreate`** — pass `{ autoCreate: true }` to have the framework issue `CreateLogGroup` + `CreateLogStream` on first emit so operators provisioning collectors via env vars / runbooks don't need a separate aws-cli step. Idempotent: AWS's `ResourceAlreadyExistsException` is treated as success on both calls. Hard failures (5xx, AccessDenied, etc.) drop the batch with `onDrop` reason `autocreate-failed`. Default remains `autoCreate: false` so the AWS posture (operator pre-creates via aws / CDK / Terraform) stays the recommended path; `autoCreate` exists for ephemeral / dynamic-stream deployments where pre-provisioning is impractical. **Test suite**: 19 new framework-level cloudwatch assertions cover autoCreate fires both Create calls in order before PutLogEvents, ResourceAlreadyExists doesn't abort the post-create PutLogEvents, hard 5xx during CreateLogGroup drops the batch via `onDrop`, autoCreate=false skips Create calls entirely. Live syslog integration covers UDP / TCP wire delivery against the docker syslog-ng container (`/var/log/blamejs-test.log`) plus an in-process `tls.createServer` receiver that asserts the on-the-wire RFC 6587 octet-counting framing + RFC 5424 PRI / timestamp / structured-data slot the framework emits over TLS. **Test infrastructure fix**: `docker/init/generate-certs.sh` was overwriting an existing CA when re-run with `.complete` removed, invalidating every previously-issued leaf cert; now reuses an existing `(ca.crt, ca.key)` pair across `.complete`-only resets and only generates a fresh CA when neither file is present. Smoke 6790 / wiki e2e 178 / per-primitive integration 14 files (log-stream up from 16→18 checks, cloudwatch suite up from 39→58 assertions) / wiki integration 32 / shellcheck clean / eslint clean.
|
|
13
14
|
- **0.6.32** (2026-05-02) — E1 from the v0.6.x scope plan. **`b.cache` Redis backend** — first-class `backend: "redis"` for `b.cache.create({...})`, no operator-supplied glue needed. New module `lib/cache-redis.js` consumes `lib/redis-client.js` directly; storage layout: `<namespace>:e:<key>` (STRING, JSON-encoded value, PEXPIREAT-bounded), `<namespace>:t:<tag>` (SET, cacheKeys carrying that tag — powers `invalidateTag` fan-out), `<namespace>:k:<key>:tags` (SET, tags this key carries — powers per-key tag cleanup on `del`/`set`-overwrite, expires alongside the entry). TTL is enforced by Redis itself (PEXPIREAT) so the framework's sweeper is a no-op for this backend; sliding TTL bumps the entry's expiry on every read when `slidingTtl: true` AND `ttlMs` is finite. New opts on `cache.create`: `redisUrl` (required when `backend: "redis"`), `redisPassword`, `redisUsername`, `redisTls`, `redisCa` (private-CA trust pinning per v0.6.28), `redisServername`, `redisConnectTimeoutMs`, `redisCommandTimeoutMs`, `redisMaxReconnectAttempts`. Concurrency: invalidateTag filters out ghost entries (key already PEXPIRE'd from the keyspace but lingering in a tag SET) by EXISTS-checking before del. Lazy connect — `cache.create({backend:"redis"})` stays sync-safe; first op opens the socket. Tests: 10 new live integration assertions on top of the existing memory + custom-backend coverage (set+get round-trip, has, del, complex JSON value round-trip, short-TTL Redis-side expiry, multi-tag invalidateTag fan-out + preservation of untagged entries, wrap() single-flight memoization through Redis). Smoke 6780 / wiki e2e 178 / per-primitive integration 14 files (cache up from 15→25 checks) / wiki integration green.
|
|
@@ -14,11 +14,14 @@
|
|
|
14
14
|
* which fences out a partitioned old leader even if its application-
|
|
15
15
|
* layer `_requireLeader()` gate somehow allowed the call through.
|
|
16
16
|
*
|
|
17
|
-
* Dialects: Postgres
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
17
|
+
* Dialects: Postgres / SQLite use `INSERT ... ON CONFLICT ... DO
|
|
18
|
+
* UPDATE WHERE ... RETURNING` (atomic acquire-or-steal in one
|
|
19
|
+
* statement). MySQL takes a different shape because its
|
|
20
|
+
* `ON DUPLICATE KEY UPDATE` doesn't support a WHERE clause: each
|
|
21
|
+
* column update is gated by `IF(expiresAt < <nowMs>, VALUES(col), col)`
|
|
22
|
+
* so a non-expired lease is preserved untouched, and the followup
|
|
23
|
+
* SELECT reveals who currently holds the row. Both shapes are
|
|
24
|
+
* row-level atomic at the database — no client-side locking required.
|
|
22
25
|
*
|
|
23
26
|
* Public API:
|
|
24
27
|
* create({ externalDbBackend, dialect? }) → provider instance
|
|
@@ -55,57 +58,67 @@ function create(config) {
|
|
|
55
58
|
}
|
|
56
59
|
var backendName = config.externalDbBackend;
|
|
57
60
|
var dialect = (config.dialect || "postgres").toLowerCase();
|
|
58
|
-
if (dialect !== "postgres" && dialect !== "sqlite") {
|
|
61
|
+
if (dialect !== "postgres" && dialect !== "sqlite" && dialect !== "mysql") {
|
|
59
62
|
throw _err("UNSUPPORTED_DIALECT",
|
|
60
|
-
"cluster-provider-db dialect must be 'postgres' or '
|
|
63
|
+
"cluster-provider-db dialect must be 'postgres', 'sqlite', or 'mysql' (got: " + dialect + ")",
|
|
61
64
|
true);
|
|
62
65
|
}
|
|
63
66
|
|
|
64
|
-
// Postgres
|
|
65
|
-
//
|
|
66
|
-
function _placeholder(n) {
|
|
67
|
+
// Postgres + SQLite use $1/$2 placeholders; MySQL uses ?. Keeping a
|
|
68
|
+
// single helper means the SQL builder doesn't have to care.
|
|
69
|
+
function _placeholder(n) {
|
|
70
|
+
return dialect === "mysql" ? "?" : "$" + n;
|
|
71
|
+
}
|
|
67
72
|
|
|
68
73
|
function _q(sql, params) {
|
|
69
74
|
return externalDb.query(sql, params || [], { backend: backendName });
|
|
70
75
|
}
|
|
71
76
|
|
|
72
77
|
async function ensureSchema() {
|
|
73
|
-
// Postgres: BIGINT for ms-precision timestamps. SQLite:
|
|
74
|
-
//
|
|
75
|
-
var intType = dialect === "
|
|
78
|
+
// Postgres + MySQL: BIGINT for ms-precision timestamps. SQLite:
|
|
79
|
+
// INTEGER (which is wide enough to hold a 64-bit value).
|
|
80
|
+
var intType = dialect === "sqlite" ? "INTEGER" : "BIGINT";
|
|
81
|
+
// MySQL needs explicit lengths on TEXT columns when used as a
|
|
82
|
+
// PRIMARY KEY; VARCHAR(64) covers our scope/nodeId/leaseId values
|
|
83
|
+
// with room to spare. Postgres and SQLite happily PRIMARY-KEY a
|
|
84
|
+
// plain TEXT column.
|
|
85
|
+
var pkText = dialect === "mysql" ? "VARCHAR(64)" : "TEXT";
|
|
86
|
+
var bodyText = dialect === "mysql" ? "VARCHAR(255)" : "TEXT";
|
|
87
|
+
// MySQL doesn't enforce CHECK constraints in some MariaDB / older
|
|
88
|
+
// MySQL versions; the constant-scope invariant is a documentation
|
|
89
|
+
// belt-and-braces — application code only ever writes 'leader' /
|
|
90
|
+
// 'state' so the check is informational. Skip on MySQL to avoid
|
|
91
|
+
// CREATE TABLE failures on installations where CHECK is parsed
|
|
92
|
+
// but then dropped silently (which would cause version drift).
|
|
93
|
+
var leaderCheck = dialect === "mysql" ? "" : ", CHECK (scope = 'leader')";
|
|
94
|
+
var stateCheck = dialect === "mysql" ? "" : ", CHECK (scope = 'state')";
|
|
76
95
|
|
|
77
96
|
await _q(
|
|
78
97
|
"CREATE TABLE IF NOT EXISTS _blamejs_leader (" +
|
|
79
|
-
" scope
|
|
80
|
-
" nodeId
|
|
81
|
-
" leaseId
|
|
98
|
+
" scope " + pkText + " PRIMARY KEY," +
|
|
99
|
+
" nodeId " + bodyText + " NOT NULL," +
|
|
100
|
+
" leaseId " + bodyText + " NOT NULL," +
|
|
82
101
|
" acquiredAt " + intType + " NOT NULL," +
|
|
83
102
|
" expiresAt " + intType + " NOT NULL," +
|
|
84
103
|
" fencingToken " + intType + " NOT NULL," +
|
|
85
|
-
" endpoint
|
|
86
|
-
" CHECK (scope = 'leader')" +
|
|
104
|
+
" endpoint " + bodyText + leaderCheck +
|
|
87
105
|
")"
|
|
88
106
|
);
|
|
89
107
|
// Migration for installs that pre-date the endpoint column. Both
|
|
90
108
|
// Postgres (≥9.6) and SQLite (≥3.35, March 2021) support ADD COLUMN
|
|
91
|
-
// IF NOT EXISTS
|
|
92
|
-
//
|
|
93
|
-
// "column already exists," which we swallow.
|
|
109
|
+
// IF NOT EXISTS; MySQL 8.0.29+ does as well. We go through try/catch
|
|
110
|
+
// to keep the path version-agnostic — the only "expected" failure
|
|
111
|
+
// here is "column already exists," which we swallow.
|
|
94
112
|
try {
|
|
95
|
-
await _q("ALTER TABLE _blamejs_leader ADD COLUMN endpoint
|
|
113
|
+
await _q("ALTER TABLE _blamejs_leader ADD COLUMN endpoint " + bodyText);
|
|
96
114
|
} catch (_e) { /* column already exists — fine */ }
|
|
97
115
|
|
|
98
|
-
// _blamejs_cluster_state — single-row consistency check used to
|
|
99
|
-
// detect vault-key drift across cluster nodes. Same single-row
|
|
100
|
-
// invariant pattern as _blamejs_leader (PRIMARY KEY on a
|
|
101
|
-
// constant-valued scope column + CHECK).
|
|
102
116
|
await _q(
|
|
103
117
|
"CREATE TABLE IF NOT EXISTS _blamejs_cluster_state (" +
|
|
104
|
-
" scope
|
|
105
|
-
" vaultKeyFp
|
|
118
|
+
" scope " + pkText + " PRIMARY KEY," +
|
|
119
|
+
" vaultKeyFp " + bodyText + " NOT NULL," +
|
|
106
120
|
" recordedAt " + intType + " NOT NULL," +
|
|
107
|
-
" recordedByNode
|
|
108
|
-
" CHECK (scope = 'state')" +
|
|
121
|
+
" recordedByNode " + bodyText + " NOT NULL" + stateCheck +
|
|
109
122
|
")"
|
|
110
123
|
);
|
|
111
124
|
}
|
|
@@ -120,35 +133,65 @@ function create(config) {
|
|
|
120
133
|
var nowMs = Date.now();
|
|
121
134
|
var expiresAt = nowMs + leaseTtlMs;
|
|
122
135
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
136
|
+
var row;
|
|
137
|
+
if (dialect === "mysql") {
|
|
138
|
+
// MySQL has no `ON CONFLICT ... DO UPDATE WHERE` and no
|
|
139
|
+
// `RETURNING`. Atomicity comes from `INSERT ... ON DUPLICATE
|
|
140
|
+
// KEY UPDATE` evaluated as one statement; the WHERE-clause
|
|
141
|
+
// semantics are implemented per-column with `IF(expiresAt <
|
|
142
|
+
// nowMs, VALUES(col), col)` so a still-valid lease is preserved
|
|
143
|
+
// and an expired one is overwritten. The follow-up SELECT
|
|
144
|
+
// reveals who currently holds the row — same as Postgres'
|
|
145
|
+
// RETURNING but as a separate statement.
|
|
146
|
+
var insertSql =
|
|
147
|
+
"INSERT INTO _blamejs_leader " +
|
|
148
|
+
" (scope, nodeId, leaseId, acquiredAt, expiresAt, fencingToken, endpoint) " +
|
|
149
|
+
"VALUES " +
|
|
150
|
+
" ('leader', ?, ?, ?, ?, 1, ?) " +
|
|
151
|
+
"ON DUPLICATE KEY UPDATE " +
|
|
152
|
+
" nodeId = IF(expiresAt < ?, VALUES(nodeId), nodeId)," +
|
|
153
|
+
" leaseId = IF(expiresAt < ?, VALUES(leaseId), leaseId)," +
|
|
154
|
+
" acquiredAt = IF(expiresAt < ?, VALUES(acquiredAt), acquiredAt)," +
|
|
155
|
+
" fencingToken = IF(expiresAt < ?, fencingToken + 1, fencingToken)," +
|
|
156
|
+
" endpoint = IF(expiresAt < ?, VALUES(endpoint), endpoint)," +
|
|
157
|
+
// expiresAt MUST be the last assignment — IF() evaluates each
|
|
158
|
+
// column against the row state BEFORE that column's update is
|
|
159
|
+
// applied, so checking expiresAt for the other columns first
|
|
160
|
+
// and overwriting it last keeps the predicate consistent.
|
|
161
|
+
" expiresAt = IF(expiresAt < ?, VALUES(expiresAt), expiresAt)";
|
|
162
|
+
await _q(insertSql, [
|
|
163
|
+
nodeId, leaseId, nowMs, expiresAt, endpoint,
|
|
164
|
+
nowMs, nowMs, nowMs, nowMs, nowMs, nowMs,
|
|
165
|
+
]);
|
|
166
|
+
var sel = await _q(
|
|
167
|
+
"SELECT nodeId, leaseId, acquiredAt, expiresAt, fencingToken, endpoint " +
|
|
168
|
+
"FROM _blamejs_leader WHERE scope = 'leader'"
|
|
169
|
+
);
|
|
170
|
+
if (!sel.rows || sel.rows.length === 0) return null;
|
|
171
|
+
row = sel.rows[0];
|
|
172
|
+
} else {
|
|
173
|
+
// Postgres / SQLite — single-statement RETURNING.
|
|
174
|
+
var sql =
|
|
175
|
+
"INSERT INTO _blamejs_leader " +
|
|
176
|
+
" (scope, nodeId, leaseId, acquiredAt, expiresAt, fencingToken, endpoint) " +
|
|
177
|
+
"VALUES " +
|
|
178
|
+
" ('leader', " + _placeholder(1) + ", " + _placeholder(2) + ", " +
|
|
179
|
+
" " + _placeholder(3) + ", " + _placeholder(4) + ", 1, " + _placeholder(5) + ") " +
|
|
180
|
+
"ON CONFLICT (scope) DO UPDATE SET " +
|
|
181
|
+
" nodeId = EXCLUDED.nodeId," +
|
|
182
|
+
" leaseId = EXCLUDED.leaseId," +
|
|
183
|
+
" acquiredAt = EXCLUDED.acquiredAt," +
|
|
184
|
+
" expiresAt = EXCLUDED.expiresAt," +
|
|
185
|
+
" fencingToken = _blamejs_leader.fencingToken + 1," +
|
|
186
|
+
" endpoint = EXCLUDED.endpoint " +
|
|
187
|
+
"WHERE _blamejs_leader.expiresAt < " + _placeholder(6) + " " +
|
|
188
|
+
"RETURNING nodeId, leaseId, acquiredAt, expiresAt, fencingToken, endpoint";
|
|
189
|
+
var result = await _q(sql, [nodeId, leaseId, nowMs, expiresAt, endpoint, nowMs]);
|
|
190
|
+
if (!result.rows || result.rows.length === 0) return null;
|
|
191
|
+
row = result.rows[0];
|
|
148
192
|
}
|
|
149
|
-
var row = result.rows[0];
|
|
150
193
|
if (row.nodeId !== nodeId || row.leaseId !== leaseId) {
|
|
151
|
-
// Another node won the race (
|
|
194
|
+
// Another node won the race (the row reflects their values, not ours).
|
|
152
195
|
return null;
|
|
153
196
|
}
|
|
154
197
|
return {
|
|
@@ -171,24 +214,52 @@ function create(config) {
|
|
|
171
214
|
var endpoint = (opts && opts.endpoint !== undefined) ? opts.endpoint : lease.endpoint || null;
|
|
172
215
|
|
|
173
216
|
// Match on (nodeId, leaseId) so a takeover is detectable: if our
|
|
174
|
-
// leaseId is no longer in the row,
|
|
175
|
-
//
|
|
176
|
-
//
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
217
|
+
// leaseId is no longer in the row, the SELECT-after-UPDATE
|
|
218
|
+
// returns either no row OR a row with a different leaseId, and
|
|
219
|
+
// we throw LEASE_LOST. Don't bump fencingToken on renewal — only
|
|
220
|
+
// on a fresh acquire.
|
|
221
|
+
var row;
|
|
222
|
+
if (dialect === "mysql") {
|
|
223
|
+
var rv = await _q(
|
|
224
|
+
"UPDATE _blamejs_leader SET " +
|
|
225
|
+
" expiresAt = ?, endpoint = ? " +
|
|
226
|
+
"WHERE scope = 'leader' AND nodeId = ? AND leaseId = ?",
|
|
227
|
+
[newExpiresAt, endpoint, lease.nodeId, lease.leaseId]
|
|
228
|
+
);
|
|
229
|
+
var affected = rv && (rv.affectedRows || rv.rowCount || 0);
|
|
230
|
+
if (!affected) {
|
|
231
|
+
throw _err("LEASE_LOST",
|
|
232
|
+
"lease for node '" + lease.nodeId + "' was taken over (renewal rejected)",
|
|
233
|
+
false);
|
|
234
|
+
}
|
|
235
|
+
var sel = await _q(
|
|
236
|
+
"SELECT nodeId, leaseId, acquiredAt, expiresAt, fencingToken, endpoint " +
|
|
237
|
+
"FROM _blamejs_leader WHERE scope = 'leader'"
|
|
238
|
+
);
|
|
239
|
+
if (!sel.rows || sel.rows.length === 0 ||
|
|
240
|
+
sel.rows[0].nodeId !== lease.nodeId ||
|
|
241
|
+
sel.rows[0].leaseId !== lease.leaseId) {
|
|
242
|
+
throw _err("LEASE_LOST",
|
|
243
|
+
"lease for node '" + lease.nodeId + "' was taken over after renewal",
|
|
244
|
+
false);
|
|
245
|
+
}
|
|
246
|
+
row = sel.rows[0];
|
|
247
|
+
} else {
|
|
248
|
+
var sql =
|
|
249
|
+
"UPDATE _blamejs_leader SET " +
|
|
250
|
+
" expiresAt = " + _placeholder(1) + "," +
|
|
251
|
+
" endpoint = " + _placeholder(2) + " " +
|
|
252
|
+
"WHERE scope = 'leader' AND nodeId = " + _placeholder(3) +
|
|
253
|
+
" AND leaseId = " + _placeholder(4) + " " +
|
|
254
|
+
"RETURNING nodeId, leaseId, acquiredAt, expiresAt, fencingToken, endpoint";
|
|
255
|
+
var result = await _q(sql, [newExpiresAt, endpoint, lease.nodeId, lease.leaseId]);
|
|
256
|
+
if (!result.rows || result.rows.length === 0) {
|
|
257
|
+
throw _err("LEASE_LOST",
|
|
258
|
+
"lease for node '" + lease.nodeId + "' was taken over (renewal rejected)",
|
|
259
|
+
false);
|
|
260
|
+
}
|
|
261
|
+
row = result.rows[0];
|
|
190
262
|
}
|
|
191
|
-
var row = result.rows[0];
|
|
192
263
|
return {
|
|
193
264
|
nodeId: row.nodeId,
|
|
194
265
|
leaseId: row.leaseId,
|
package/package.json
CHANGED
package/sbom.cyclonedx.json
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
|
|
3
3
|
"bomFormat": "CycloneDX",
|
|
4
4
|
"specVersion": "1.5",
|
|
5
|
-
"serialNumber": "urn:uuid:
|
|
5
|
+
"serialNumber": "urn:uuid:e7b125dc-2b9c-460b-8b32-6ae1b9da3dac",
|
|
6
6
|
"version": 1,
|
|
7
7
|
"metadata": {
|
|
8
|
-
"timestamp": "2026-05-02T20:
|
|
8
|
+
"timestamp": "2026-05-02T20:25:21.814Z",
|
|
9
9
|
"lifecycles": [
|
|
10
10
|
{
|
|
11
11
|
"phase": "build"
|
|
@@ -19,14 +19,14 @@
|
|
|
19
19
|
}
|
|
20
20
|
],
|
|
21
21
|
"component": {
|
|
22
|
-
"bom-ref": "@blamejs/core@0.6.
|
|
22
|
+
"bom-ref": "@blamejs/core@0.6.35",
|
|
23
23
|
"type": "library",
|
|
24
24
|
"name": "blamejs",
|
|
25
|
-
"version": "0.6.
|
|
25
|
+
"version": "0.6.35",
|
|
26
26
|
"scope": "required",
|
|
27
27
|
"author": "blamejs contributors",
|
|
28
28
|
"description": "The Node framework that owns its stack.",
|
|
29
|
-
"purl": "pkg:npm/%40blamejs/core@0.6.
|
|
29
|
+
"purl": "pkg:npm/%40blamejs/core@0.6.35",
|
|
30
30
|
"properties": [],
|
|
31
31
|
"externalReferences": [
|
|
32
32
|
{
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"components": [],
|
|
55
55
|
"dependencies": [
|
|
56
56
|
{
|
|
57
|
-
"ref": "@blamejs/core@0.6.
|
|
57
|
+
"ref": "@blamejs/core@0.6.35",
|
|
58
58
|
"dependsOn": []
|
|
59
59
|
}
|
|
60
60
|
]
|