mirror of
https://github.com/koala73/worldmonitor.git
synced 2026-04-25 17:14:57 +02:00
* feat(seed-contract): PR 2a — runSeed envelope dual-write + 91 seeders migrated
Opt-in contract path in runSeed: when opts.declareRecords is provided, write
{_seed, data} envelope to the canonical key alongside legacy seed-meta:*
(dual-write). State machine: OK / OK_ZERO / RETRY with zeroIsValid opt.
declareRecords throws or returns non-integer → hard fail (contract violation).
extraKeys[*] support per-key declareRecords; each extra key writes its own
envelope. Legacy seeders (no declareRecords) entirely unchanged.
Migrated all 91 scripts/seed-*.mjs to contract mode. Each exports
declareRecords returning the canonical record count, and passes
schemaVersion: 1 + maxStaleMin (matched to api/health.js SEED_META, or 2.5x
interval where no registry entry exists). Contract conformance reports 84/86
seeders with full descriptor (2 pre-existing warnings).
Legacy seed-meta keys still written so unmigrated readers keep working;
follow-up slices flip health.js + readers to envelope-first.
Tests: 61/61 PR 1 tests still pass.
Next slices for PR 2:
- api/health.js registry collapse + 15 seed-bundle-*.mjs canonicalKey wiring
- reader migration (mcp, resilience, aviation, displacement, regional-snapshot)
- direct writers — ais-relay.cjs, consumer-prices-core publish.ts
- public-boundary stripSeedEnvelope + test migration
Plan: docs/plans/2026-04-14-002-fix-runseed-zero-record-lockout-plan.md
* fix(seed-contract): unwrap envelopes in internal cross-seed readers
After PR 2a enveloped 91 canonical keys as {_seed, data}, every script-side
reader that returned the raw parsed JSON started silently handing callers the
envelope instead of the bare payload. WoW baselines (bigmac, grocery-basket,
fear-greed) saw undefined .countries / .composite; seed-climate-anomalies saw
undefined .normals from climate:zone-normals:v1; seed-thermal-escalation saw
undefined .fireDetections from wildfire:fires:v1; seed-forecasts' ~40-key
pipeline batch returned envelopes for every input.
Fix: route every script-side reader through unwrapEnvelope(...).data. Legacy
bare-shape values pass through unchanged (unwrapEnvelope returns
{_seed: null, data: raw} for any non-envelope shape).
Changed:
- scripts/_seed-utils.mjs: import unwrapEnvelope; redisGet, readSeedSnapshot,
verifySeedKey all unwrap. Exported new readCanonicalValue() helper for
cross-seed consumers.
- 18 seed-*.mjs scripts with local redisGet-style helpers or inline fetch
patched to unwrap via the envelope source module (subagent sweep).
- scripts/seed-forecasts.mjs pipeline batch: parse() unwraps each result.
- scripts/seed-energy-spine.mjs redisMget: unwraps each result.
Tests:
- tests/seed-utils-envelope-reads.test.mjs: 7 new cases covering envelope
+ legacy + null paths for readSeedSnapshot and verifySeedKey.
- Full seed suite: 67/67 pass (was 61, +6 new).
Addresses both of user's P1 findings on PR #3097.
* feat(seed-contract): envelope-aware reads in server + api helpers
Every RPC and public-boundary reader now automatically strips _seed from
contract-mode canonical keys. Legacy bare-shape values pass through unchanged
(unwrapEnvelope no-ops on non-envelope shapes).
Changed helpers (one-place fix — unblocks ~60 call sites):
- server/_shared/redis.ts: getRawJson, getCachedJson, getCachedJsonBatch
unwrap by default. cachedFetchJson inherits via getCachedJson.
- api/_upstash-json.js: readJsonFromUpstash unwraps (covers api/mcp.ts
tool responses + all its canonical-key reads).
- api/bootstrap.js: getCachedJsonBatch unwraps (public-boundary —
clients never see envelope metadata).
Left intentionally unchanged:
- api/health.js / api/seed-health.js: read only seed-meta:* keys which
remain bare-shape during dual-write. unwrapEnvelope already imported at
the meta-read boundary (PR 1) as a defensive no-op.
Tests: 67/67 seed tests pass. typecheck + typecheck:api clean.
This is the blast-radius fix the PR #3097 review called out — external
readers that would otherwise see {_seed, data} after the writer side
migrated.
* fix(test): strip export keyword in vm.runInContext'd seed source
cross-source-signals-regulatory.test.mjs loads scripts/seed-cross-source-signals.mjs
via vm.runInContext, which cannot parse ESM `export` syntax. PR 2a added
`export function declareRecords` to every seeder, which broke this test's
static-analysis approach.
Fix: strip the `export` keyword from the declareRecords line in the
preprocessed source string so the function body still evaluates as a plain
declaration.
Full test:data suite: 5307/5307 pass. typecheck + typecheck:api clean.
* feat(seed-contract): consumer-prices publish.ts writes envelopes
Wrap the 5 canonical keys written by consumer-prices-core/src/jobs/publish.ts
(overview, movers:7d/30d, freshness, categories:7d/30d/90d, retailer-spread,
basket-series) in {_seed, data} envelopes. Legacy seed-meta:<key> writes
preserved for dual-write.
Inlined a buildEnvelope helper (10 lines) rather than taking a cross-package
dependency — consumer-prices-core is a standalone npm package. Documented the
four-file parity contract (mjs source, ts mirror, js edge mirror, this copy).
Contract fields: sourceVersion='consumer-prices-core-publish-v1', schemaVersion=1,
state='OK' (recordCount>0) or 'OK_ZERO' (legitimate zero).
Typecheck: no new errors in publish.ts.
* fix(seed-contract): 3 more server-side readers unwrap envelopes
Found during final audit:
- server/worldmonitor/resilience/v1/_shared.ts: resilience score reader
parsed cached GetResilienceScoreResponse raw. Contract-mode seed-resilience-scores
now envelopes those keys.
- server/worldmonitor/resilience/v1/get-resilience-ranking.ts: p05/p95
interval lookup parsed raw from seed-resilience-scores' extra-key path.
- server/worldmonitor/infrastructure/v1/_shared.ts: mgetJson() used for
count-source keys (wildfire:fires:v1, news:insights:v1) which are both
contract-mode now.
All three now unwrap via server/_shared/seed-envelope. Legacy shapes pass
through unchanged.
Typecheck clean.
* feat(seed-contract): ais-relay.cjs direct writes produce envelopes
32 canonical-key write sites in scripts/ais-relay.cjs now produce {_seed, data}
envelopes. Inlined buildEnvelope() (CJS module can't require ESM source) +
envelopeWrite(key, data, ttlSeconds, meta) wrapper. Enveloped keys span market
bootstrap, aviation, cyber-threats, theater-posture, weather-alerts, economic
spending/fred/worldbank, tech-events, corridor-risk, usni-fleet, shipping-stress,
social:reddit, wsb-tickers, pizzint, product-catalog, chokepoint transits,
ucdp-events, satellites, oref.
Left bare (not seeded data keys): seed-meta:* (dual-write legacy),
classifyCacheKey LLM cache, notam:prev-closed-state internal state,
wm:notif:scan-dedup flags.
Updated tests/ucdp-seed-resilience.test.mjs regex to accept both upstashSet
(pre-contract) and envelopeWrite (post-contract) call patterns.
* feat(seed-contract): 15 bundle files add canonicalKey for envelope gate
54 bundle sections across 12 files now declare canonicalKey alongside the
existing seedMetaKey. _bundle-runner.mjs (from PR 1) prefers canonicalKey
when both are present — gates section runs on envelope._seed.fetchedAt
read directly from the data key, eliminating the meta-outlives-data class
of bugs.
Files touched:
- climate (5), derived-signals (2), ecb-eu (3), energy-sources (6),
health (2), imf-extended (4), macro (10), market-backup (9),
portwatch (4), relay-backup (2), resilience-recovery (5), static-ref (2)
Skipped (14 sections, 3 whole bundles): multi-key writers, dynamic
templated keys (displacement year-scoped), or non-runSeed orchestrators
(regional brief cron, resilience-scores' 222-country publish, validation/
benchmark scripts). These continue to use seedMetaKey or their own gate.
seedMetaKey preserved everywhere — dual-write. _bundle-runner.mjs falls
back to legacy when canonicalKey is absent.
All 15 bundles pass node --check. test:data: 5307/5307. typecheck:all: clean.
* fix(seed-contract): 4 PR #3097 review P1s — transform/declareRecords mismatches + envelope leaks
Addresses both P1 findings and the extra-key seed-meta leak surfaced in review:
1. runSeed helper-level invariant: seed-meta:* keys NEVER envelope.
scripts/_seed-utils.mjs exports shouldEnvelopeKey(key) — returns false for
any key starting with 'seed-meta:'. Both atomicPublish (canonical) and
writeExtraKey (extras) gate the envelope wrap through this helper. Fixes
seed-iea-oil-stocks' ANALYSIS_META_EXTRA_KEY silently getting enveloped,
which broke health.js parsing the value as bare {fetchedAt, recordCount}.
Also defends against any future manual writeExtraKey(..., envelopeMeta)
call that happens to target a seed-meta:* key.
2. seed-token-panels canonical + extras fixed.
publishTransform returns data.defi (the defi panel itself, shape {tokens}).
Old declareRecords counted data.defi.tokens + data.ai.tokens + data.other.tokens
on the transformed payload → 0 → RETRY path → canonical market:defi-tokens:v1
never wrote, and because runSeed returned before the extraKeys loop,
market:ai-tokens:v1 + market:other-tokens:v1 stayed stale too.
New: declareRecords counts data.tokens on the transformed shape. AI_KEY +
OTHER_KEY extras reuse the same function (transforms return structurally
identical panels). Added isMain guard so test imports don't fire runSeed.
3. api/product-catalog.js cached reader unwraps envelope.
ais-relay.cjs now envelopes product-catalog:v2 via envelopeWrite(). The
edge reader did raw JSON.parse(result) and returned {_seed, data} to
clients, breaking the cached path. Fix: import unwrapEnvelope from
./_seed-envelope.js, apply after JSON.parse. One site — :238-241 is
downstream of getFromCache(), so the single reader fix covers both.
4. Regression lock tests/seed-contract-transform-regressions.test.mjs (11 cases):
- shouldEnvelopeKey invariant: seed-meta:* false, canonical true
- Token-panels declareRecords works on transformed shape (canonical + both extras)
- Explicit repro of pre-fix buggy signature returning 0 — guards against revert
- resolveRecordCount accepts 0, rejects non-integer
- Product-catalog envelope unwrap returns bare shape; legacy passes through
Verification:
- npm run test:data → 5318/5318 pass (was 5307 — 11 new regressions)
- npm run typecheck:all → clean
- node --check on every modified script
iea-oil-stocks canonical declareRecords was NOT broken (user confirmed during
review — buildIndex preserves .members); only its ANALYSIS_META_EXTRA_KEY
was affected, now covered generically by commit 1's helper invariant.
* fix(seed-contract): seed-token-panels validateFn also runs on post-transform shape
Review finding: fixing declareRecords wasn't sufficient — atomicPublish() runs
validateFn(publishData) on the transformed payload too. seed-token-panels'
validate() checked data.defi/.ai/.other on the transformed {tokens} shape,
returned false, and runSeed took the early skipped-write branch (before even
reaching the declareRecords RETRY logic). Net effect: same as before the
declareRecords fix — canonical + both extras stayed stale.
Fix: validate() now checks the canonical defi panel directly (Array.isArray
(data?.tokens) && has at least one t.price > 0). AI/OTHER panels are validated
implicitly by their own extraKey declareRecords on write.
Audited the other 9 seeders with publishTransform (bls-series, bis-extended,
bis-data, gdelt-intel, trade-flows, iea-oil-stocks, jodi-gas, sanctions-pressure,
forecasts): all validateFn's correctly target the post-transform shape. Only
token-panels regressed.
Added 4 regression tests (tests/seed-contract-transform-regressions.test.mjs):
- validate accepts transformed panel with priced tokens
- validate rejects all-zero-price tokens
- validate rejects empty/missing tokens
- Explicit pre-fix repro (buggy old signature fails on transformed shape)
Verification:
- npm run test:data → 5322/5322 pass (was 5318; +4 new)
- npm run typecheck:all → clean
- node --check clean
* feat(seed-contract): add /api/seed-contract-probe validation endpoint
Single machine-readable gate for 'is PR #3097 working in production'.
Replaces the curl/jq ritual with one authenticated edge call that returns
HTTP 200 ok:true or 503 + failing check list.
What it validates:
- 8 canonical keys have {_seed, data} envelopes with required data fields
and minRecords floors (fsi-eu, zone-normals, 3 token panels + minRecords
guard against token-panels RETRY regression, product-catalog, wildfire,
earthquakes).
- 2 seed-meta:* keys remain BARE (shouldEnvelopeKey invariant; guards
against iea-oil-stocks ANALYSIS_META_EXTRA_KEY-class regressions).
- /api/product-catalog + /api/bootstrap responses contain no '_seed' leak.
Auth: x-probe-secret header must match RELAY_SHARED_SECRET (reuses existing
Vercel↔Railway internal trust boundary).
Probe logic is exported (checkProbe, checkPublicBoundary, DEFAULT_PROBES) for
hermetic testing. tests/seed-contract-probe.test.mjs covers every branch:
envelope pass/fail on field/records/shape, bare pass/fail on shape/field,
missing/malformed JSON, Redis non-2xx, boundary seed-leak detection,
DEFAULT_PROBES sanity (seed-meta invariant present, token-panels minRecords
guard present).
Usage:
curl -H "x-probe-secret: $RELAY_SHARED_SECRET" \
https://api.worldmonitor.app/api/seed-contract-probe
PR 3 will extend the probe with a stricter mode that asserts seed-meta:*
keys are GONE (not just bare) once legacy dual-write is removed.
Verification:
- tests/seed-contract-probe.test.mjs → 15/15 pass
- npm run test:data → 5338/5338 (was 5322; +16 new incl. conformance)
- npm run typecheck:all → clean
* fix(seed-contract): tighten probe — minRecords on AI/OTHER + cache-path source header
Review P2 findings: the probe's stated guards were weaker than advertised.
1. market:ai-tokens:v1 + market:other-tokens:v1 probes claimed to guard the
token-panels extra-key RETRY regression but only checked shape='envelope'
+ dataHas:['tokens']. If an extra-key declareRecords regressed to 0, both
probes would still pass because checkProbe() only inspects _seed.recordCount
when minRecords is set. Now both enforce minRecords: 1.
2. /api/product-catalog boundary check only asserted no '_seed' leak — which
is also true for the static fallback path. A broken cached reader
(getFromCache returning null or throwing) could serve fallback silently
and still pass this probe. Now:
- api/product-catalog.js emits X-Product-Catalog-Source: cache|dodo|fallback
on the response (the json() helper gained an optional source param wired
to each of the three branches).
- checkPublicBoundary declaratively requires that header's value match
'cache' for /api/product-catalog, so a fallback-serve fails the probe
with reason 'source:fallback!=cache' or 'source:missing!=cache'.
Test updates (tests/seed-contract-probe.test.mjs):
- Boundary check reworked to use a BOUNDARY_CHECKS config with optional
requireSourceHeader per endpoint.
- New cases: served-from-cache passes, served-from-fallback fails with source
mismatch, missing header fails, seed-leak still takes precedence, bad
status fails.
- Token-panels sanity test now asserts minRecords≥1 on all 3 panels.
Verification:
- tests/seed-contract-probe.test.mjs → 17/17 pass (was 15, +2 net)
- npm run test:data → 5340/5340
- npm run typecheck:all → clean
410 lines
16 KiB
JavaScript
410 lines
16 KiB
JavaScript
#!/usr/bin/env node
|
||
|
||
import {
|
||
acquireLockSafely,
|
||
extendExistingTtl,
|
||
getRedisCredentials,
|
||
loadEnvFile,
|
||
logSeedResult,
|
||
releaseLock,
|
||
} from './_seed-utils.mjs';
|
||
import { unwrapEnvelope } from './_seed-envelope-source.mjs';
|
||
|
||
loadEnvFile(import.meta.url);
|
||
|
||
// ── Constants ─────────────────────────────────────────────────────────────────
|
||
|
||
export const SPINE_KEY_PREFIX = 'energy:spine:v1:';
|
||
export const SPINE_COUNTRIES_KEY = 'energy:spine:v1:_countries';
|
||
export const SPINE_META_KEY = 'seed-meta:energy:spine';
|
||
export const SPINE_TTL_SECONDS = 172800; // 48h — 2× daily cron interval
|
||
|
||
const LOCK_DOMAIN = 'energy:spine';
|
||
const LOCK_TTL_MS = 20 * 60 * 1000; // 20 min (pipeline write of 200+ countries)
|
||
const MIN_COVERAGE_RATIO = 0.80; // abort if new spine < 80% of previous country count
|
||
|
||
// Countries with Comtrade reporter codes for shock model inputs.
|
||
// Only these 6 reporters are seeded in comtrade:flows; must stay in sync with
|
||
// compute-energy-shock.ts ISO2_TO_COMTRADE.
|
||
const ISO2_TO_COMTRADE = {
|
||
US: '842',
|
||
CN: '156',
|
||
RU: '643',
|
||
IR: '364',
|
||
IN: '699',
|
||
TW: '490',
|
||
};
|
||
|
||
// Chokepoints supported by the shock model for comtrade-mapped countries.
|
||
const SHOCK_CHOKEPOINTS = ['hormuz', 'malacca', 'suez', 'babelm'];
|
||
|
||
// ── Redis helpers ─────────────────────────────────────────────────────────────
|
||
|
||
async function redisPipeline(commands) {
|
||
const { url, token } = getRedisCredentials();
|
||
const response = await fetch(`${url}/pipeline`, {
|
||
method: 'POST',
|
||
headers: {
|
||
Authorization: `Bearer ${token}`,
|
||
'Content-Type': 'application/json',
|
||
},
|
||
body: JSON.stringify(commands),
|
||
signal: AbortSignal.timeout(30_000),
|
||
});
|
||
if (!response.ok) {
|
||
const text = await response.text().catch(() => '');
|
||
throw new Error(`Redis pipeline failed: HTTP ${response.status} — ${text.slice(0, 200)}`);
|
||
}
|
||
return response.json();
|
||
}
|
||
|
||
async function redisGet(key) {
|
||
const { url, token } = getRedisCredentials();
|
||
const resp = await fetch(`${url}/get/${encodeURIComponent(key)}`, {
|
||
headers: { Authorization: `Bearer ${token}` },
|
||
signal: AbortSignal.timeout(8_000),
|
||
});
|
||
if (!resp.ok) return null;
|
||
const data = await resp.json();
|
||
return data.result ? unwrapEnvelope(JSON.parse(data.result)).data : null;
|
||
}
|
||
|
||
async function redisMget(keys) {
|
||
if (keys.length === 0) return [];
|
||
const { url, token } = getRedisCredentials();
|
||
const pipeline = keys.map(k => ['GET', k]);
|
||
const response = await fetch(`${url}/pipeline`, {
|
||
method: 'POST',
|
||
headers: {
|
||
Authorization: `Bearer ${token}`,
|
||
'Content-Type': 'application/json',
|
||
},
|
||
body: JSON.stringify(pipeline),
|
||
signal: AbortSignal.timeout(30_000),
|
||
});
|
||
if (!response.ok) {
|
||
const text = await response.text().catch(() => '');
|
||
throw new Error(`Redis mget failed: HTTP ${response.status} — ${text.slice(0, 200)}`);
|
||
}
|
||
const results = await response.json();
|
||
return results.map(r => {
|
||
const raw = r?.result;
|
||
if (!raw) return null;
|
||
try { return unwrapEnvelope(JSON.parse(raw)).data; } catch { return null; }
|
||
});
|
||
}
|
||
|
||
// ── Country list assembly ─────────────────────────────────────────────────────
|
||
|
||
async function assembleCountryList() {
|
||
const [jodiOilCountries, owidCountries, emberAll] = await Promise.allSettled([
|
||
redisGet('energy:jodi-oil:v1:_countries'),
|
||
redisGet('energy:mix:v1:_countries'),
|
||
redisGet('energy:ember:v1:_all'),
|
||
]);
|
||
|
||
const jodiList = jodiOilCountries.status === 'fulfilled' && Array.isArray(jodiOilCountries.value)
|
||
? jodiOilCountries.value
|
||
: [];
|
||
const owidList = owidCountries.status === 'fulfilled' && Array.isArray(owidCountries.value)
|
||
? owidCountries.value
|
||
: [];
|
||
const emberList = emberAll.status === 'fulfilled' && emberAll.value && typeof emberAll.value === 'object'
|
||
? Object.keys(emberAll.value)
|
||
: [];
|
||
|
||
const union = new Set([...jodiList, ...owidList, ...emberList]);
|
||
const countries = [...union].filter(iso2 => typeof iso2 === 'string' && iso2.length === 2);
|
||
return { countries, jodiCount: jodiList.length, owidCount: owidList.length };
|
||
}
|
||
|
||
// ── Spine assembly for a single country ──────────────────────────────────────
|
||
|
||
function checkIeaAvailability(ieaStocks) {
|
||
if (!ieaStocks) return false;
|
||
return ieaStocks.netExporter === true ||
|
||
(ieaStocks.daysOfCover != null && ieaStocks.anomaly !== true);
|
||
}
|
||
|
||
function buildOilFields(jodiOil, ieaStocks, hasIeaStocks) {
|
||
return {
|
||
crudeImportsKbd: jodiOil ? (jodiOil.crude?.importsKbd ?? 0) : 0,
|
||
gasolineDemandKbd: jodiOil ? (jodiOil.gasoline?.demandKbd ?? 0) : 0,
|
||
gasolineImportsKbd: jodiOil ? (jodiOil.gasoline?.importsKbd ?? 0) : 0,
|
||
dieselDemandKbd: jodiOil ? (jodiOil.diesel?.demandKbd ?? 0) : 0,
|
||
dieselImportsKbd: jodiOil ? (jodiOil.diesel?.importsKbd ?? 0) : 0,
|
||
jetDemandKbd: jodiOil ? (jodiOil.jet?.demandKbd ?? 0) : 0,
|
||
jetImportsKbd: jodiOil ? (jodiOil.jet?.importsKbd ?? 0) : 0,
|
||
lpgDemandKbd: jodiOil ? (jodiOil.lpg?.demandKbd ?? 0) : 0,
|
||
lpgImportsKbd: jodiOil ? (jodiOil.lpg?.importsKbd ?? 0) : 0,
|
||
daysOfCover: hasIeaStocks ? (ieaStocks.daysOfCover ?? 0) : 0,
|
||
netExporter: ieaStocks?.netExporter === true,
|
||
belowObligation: ieaStocks?.belowObligation === true,
|
||
};
|
||
}
|
||
|
||
function buildGasFields(jodiGas) {
|
||
if (!jodiGas) return { lngImportsTj: 0, pipeImportsTj: 0, totalDemandTj: 0, lngShareOfImports: 0 };
|
||
return {
|
||
lngImportsTj: jodiGas.lngImportsTj ?? 0,
|
||
pipeImportsTj: jodiGas.pipeImportsTj ?? 0,
|
||
totalDemandTj: jodiGas.totalDemandTj ?? 0,
|
||
lngShareOfImports: jodiGas.lngShareOfImports ?? 0,
|
||
};
|
||
}
|
||
|
||
function buildMixFields(mix) {
|
||
if (!mix) return { coalShare: 0, gasShare: 0, oilShare: 0, nuclearShare: 0, renewShare: 0, windShare: 0, solarShare: 0, hydroShare: 0, importShare: 0 };
|
||
return {
|
||
coalShare: mix.coalShare ?? 0,
|
||
gasShare: mix.gasShare ?? 0,
|
||
oilShare: mix.oilShare ?? 0,
|
||
nuclearShare: mix.nuclearShare ?? 0,
|
||
renewShare: mix.renewShare ?? 0,
|
||
windShare: mix.windShare ?? 0,
|
||
solarShare: mix.solarShare ?? 0,
|
||
hydroShare: mix.hydroShare ?? 0,
|
||
importShare: mix.importShare ?? 0,
|
||
};
|
||
}
|
||
|
||
function buildSourceTimestamps(mix, jodiOil, jodiGas, ieaStocks, ember) {
|
||
return {
|
||
mixYear: mix ? (mix.year ?? null) : null,
|
||
jodiOilMonth: jodiOil ? (jodiOil.dataMonth ?? null) : null,
|
||
jodiGasMonth: jodiGas ? (jodiGas.dataMonth ?? null) : null,
|
||
ieaStocksMonth: ieaStocks ? (ieaStocks.dataMonth ?? null) : null,
|
||
emberMonth: ember ? (ember.dataMonth ?? null) : null,
|
||
};
|
||
}
|
||
|
||
/**
|
||
* Build the canonical spine object for one country from its six domain keys.
|
||
* All domain values are validated for required fields before writing.
|
||
* Throws on schema sentinel violation (e.g., OWID mix missing coalShare).
|
||
*/
|
||
// electricity prices and gasStorage are intentionally excluded from the spine
|
||
// (they update sub-daily; the spine seeds once at 06:00 UTC). However, Ember
|
||
// monthly generation mix IS included — it updates at most twice monthly.
|
||
export function buildSpineEntry(iso2, { mix, jodiOil, jodiGas, ieaStocks, ember = null, sprPolicy = null }) {
|
||
// Schema sentinel: OWID mix must have coalShare field if data is present
|
||
if (mix != null && !('coalShare' in mix)) {
|
||
throw new Error(`OWID mix schema changed for ${iso2} — missing coalShare field`);
|
||
}
|
||
|
||
const hasMix = mix != null;
|
||
const hasJodiOil = jodiOil != null;
|
||
const hasJodiGas = jodiGas != null;
|
||
const hasIeaStocks = checkIeaAvailability(ieaStocks);
|
||
const hasEmber = ember != null && typeof ember.fossilShare === 'number';
|
||
|
||
const comtradeCode = ISO2_TO_COMTRADE[iso2] ?? null;
|
||
|
||
return {
|
||
countryCode: iso2,
|
||
updatedAt: new Date().toISOString(),
|
||
sources: buildSourceTimestamps(mix, jodiOil, jodiGas, ieaStocks, ember),
|
||
coverage: { hasMix, hasJodiOil, hasJodiGas, hasIeaStocks, hasEmber, hasSprPolicy: sprPolicy != null && sprPolicy.regime !== 'unknown' },
|
||
oil: buildOilFields(jodiOil, ieaStocks, hasIeaStocks),
|
||
gas: buildGasFields(jodiGas),
|
||
mix: buildMixFields(hasMix ? mix : null),
|
||
electricity: hasEmber ? {
|
||
fossilShare: ember.fossilShare,
|
||
renewShare: ember.renewShare ?? null,
|
||
nuclearShare: ember.nuclearShare ?? null,
|
||
coalShare: ember.coalShare ?? null,
|
||
gasShare: ember.gasShare ?? null,
|
||
demandTwh: ember.demandTwh ?? null,
|
||
} : null,
|
||
shockInputs: {
|
||
comtradeReporterCode: comtradeCode,
|
||
supportedChokepoints: comtradeCode ? SHOCK_CHOKEPOINTS : [],
|
||
sprRegime: sprPolicy?.regime ?? 'unknown',
|
||
sprCapacityMb: sprPolicy?.capacityMb ?? null,
|
||
sprOperator: sprPolicy?.operator ?? null,
|
||
sprIeaMember: sprPolicy?.ieaMember ?? false,
|
||
},
|
||
};
|
||
}
|
||
|
||
// ── Main seed function ────────────────────────────────────────────────────────
|
||
|
||
export async function main() {
|
||
const startedAt = Date.now();
|
||
const runId = `energy:spine:${startedAt}`;
|
||
const lock = await acquireLockSafely(LOCK_DOMAIN, runId, LOCK_TTL_MS, { label: LOCK_DOMAIN });
|
||
|
||
if (lock.skipped) return;
|
||
if (!lock.locked) {
|
||
console.log('[energy-spine] Lock held by another process, skipping');
|
||
return;
|
||
}
|
||
|
||
const writeMeta = async (recordCount, status = 'ok') => {
|
||
const metaPayload = { fetchedAt: Date.now(), recordCount, status };
|
||
await redisPipeline([
|
||
['SET', SPINE_META_KEY, JSON.stringify(metaPayload), 'EX', SPINE_TTL_SECONDS],
|
||
]).catch(e => console.warn('[energy-spine] Failed to write seed-meta:', e.message));
|
||
};
|
||
|
||
try {
|
||
// Step 1: Collect country list (union of JODI oil + OWID mix countries)
|
||
console.log('[energy-spine] Assembling country list...');
|
||
const { countries, jodiCount, owidCount } = await assembleCountryList();
|
||
if (countries.length === 0) {
|
||
console.error('[energy-spine] No countries found in source keys — aborting');
|
||
await writeMeta(0, 'empty');
|
||
return;
|
||
}
|
||
|
||
if (jodiCount === 0 && owidCount === 0) {
|
||
console.error('[energy-spine] Both JODI oil and OWID mix returned zero countries — aborting to preserve snapshot');
|
||
const prevCountries = await redisGet(SPINE_COUNTRIES_KEY).catch(() => null);
|
||
if (Array.isArray(prevCountries) && prevCountries.length > 0) {
|
||
const prevKeys = prevCountries.map(iso2 => `${SPINE_KEY_PREFIX}${iso2}`);
|
||
await extendExistingTtl([...prevKeys, SPINE_COUNTRIES_KEY, SPINE_META_KEY], SPINE_TTL_SECONDS);
|
||
}
|
||
await writeMeta(0, 'core_sources_empty');
|
||
return;
|
||
}
|
||
|
||
console.log(`[energy-spine] ${countries.length} countries to process`);
|
||
|
||
// Step 2: Count-drop guard — check against previous _countries count
|
||
const prevCountries = await redisGet(SPINE_COUNTRIES_KEY).catch(() => null);
|
||
const prevCount = Array.isArray(prevCountries) ? prevCountries.length : 0;
|
||
if (prevCount > 0) {
|
||
const coverageRatio = countries.length / prevCount;
|
||
if (coverageRatio < MIN_COVERAGE_RATIO) {
|
||
console.error(
|
||
`[energy-spine] Count-drop guard triggered: ${countries.length} countries = ` +
|
||
`${(coverageRatio * 100).toFixed(1)}% of previous ${prevCount} — aborting to preserve snapshot`,
|
||
);
|
||
// Extend TTL on existing spine keys
|
||
const prevKeys = prevCountries.map(iso2 => `${SPINE_KEY_PREFIX}${iso2}`);
|
||
await extendExistingTtl(
|
||
[...prevKeys, SPINE_COUNTRIES_KEY, SPINE_META_KEY],
|
||
SPINE_TTL_SECONDS,
|
||
);
|
||
await writeMeta(0, 'count_drop_guard');
|
||
return;
|
||
}
|
||
}
|
||
|
||
// Read SPR policy registry once (global key, not per-country)
|
||
const sprRegistry = await redisGet('energy:spr-policies:v1').catch(() => null);
|
||
const sprPolicies = sprRegistry?.policies ?? {};
|
||
|
||
// Step 3: Batch-read all 6 domain keys per country via pipeline
|
||
// Order: mix, jodiOil, jodiGas, ieaStocks (electricity + gasStorage excluded — they
|
||
// update sub-daily and are always read directly by handlers, not from the spine)
|
||
console.log('[energy-spine] Reading domain keys in batches...');
|
||
const BATCH_SIZE = 60; // 5 keys * 60 countries = 300 commands per pipeline call
|
||
const spineEntries = new Map();
|
||
|
||
for (let i = 0; i < countries.length; i += BATCH_SIZE) {
|
||
const batch = countries.slice(i, i + BATCH_SIZE);
|
||
const keys = [];
|
||
for (const iso2 of batch) {
|
||
keys.push(
|
||
`energy:mix:v1:${iso2}`,
|
||
`energy:jodi-oil:v1:${iso2}`,
|
||
`energy:jodi-gas:v1:${iso2}`,
|
||
`energy:iea-oil-stocks:v1:${iso2}`,
|
||
`energy:ember:v1:${iso2}`,
|
||
);
|
||
}
|
||
|
||
const values = await redisMget(keys);
|
||
|
||
for (let j = 0; j < batch.length; j++) {
|
||
const iso2 = batch[j];
|
||
const base = j * 5;
|
||
const mix = values[base];
|
||
const jodiOil = values[base + 1];
|
||
const jodiGas = values[base + 2];
|
||
const ieaStocks = values[base + 3];
|
||
const ember = values[base + 4];
|
||
|
||
try {
|
||
const sprPolicy = sprPolicies[iso2] ?? null;
|
||
const spine = buildSpineEntry(iso2, { mix, jodiOil, jodiGas, ieaStocks, ember, sprPolicy });
|
||
spineEntries.set(iso2, spine);
|
||
} catch (err) {
|
||
throw new Error(`Schema validation failed for ${iso2}: ${err.message}`);
|
||
}
|
||
}
|
||
|
||
console.log(`[energy-spine] Processed ${Math.min(i + BATCH_SIZE, countries.length)}/${countries.length}`);
|
||
}
|
||
|
||
// Step 4: Write all spine keys in a single pipeline
|
||
console.log(`[energy-spine] Writing ${spineEntries.size} spine keys...`);
|
||
const commands = [];
|
||
|
||
for (const [iso2, entry] of spineEntries) {
|
||
commands.push([
|
||
'SET',
|
||
`${SPINE_KEY_PREFIX}${iso2}`,
|
||
JSON.stringify(entry),
|
||
'EX',
|
||
SPINE_TTL_SECONDS,
|
||
]);
|
||
}
|
||
|
||
// Write _countries index last so it's always a superset
|
||
commands.push([
|
||
'SET',
|
||
SPINE_COUNTRIES_KEY,
|
||
JSON.stringify([...spineEntries.keys()]),
|
||
'EX',
|
||
SPINE_TTL_SECONDS,
|
||
]);
|
||
|
||
// Write seed-meta
|
||
commands.push([
|
||
'SET',
|
||
SPINE_META_KEY,
|
||
JSON.stringify({ fetchedAt: Date.now(), recordCount: spineEntries.size, status: 'ok' }),
|
||
'EX',
|
||
SPINE_TTL_SECONDS,
|
||
]);
|
||
|
||
const results = await redisPipeline(commands);
|
||
const failures = results.filter(r => r?.error || r?.result === 'ERR');
|
||
if (failures.length > 0) {
|
||
throw new Error(
|
||
`Redis pipeline: ${failures.length}/${commands.length} commands failed`,
|
||
);
|
||
}
|
||
|
||
logSeedResult('energy:spine', spineEntries.size, Date.now() - startedAt, {
|
||
countries: spineEntries.size,
|
||
ttlH: SPINE_TTL_SECONDS / 3600,
|
||
});
|
||
console.log(`[energy-spine] Seeded ${spineEntries.size} country spine keys`);
|
||
} catch (err) {
|
||
console.error('[energy-spine] Seed failed:', err.message || err);
|
||
// Extend existing snapshot TTL on failure; still write seed-meta with count=0
|
||
const existingCountries = await redisGet(SPINE_COUNTRIES_KEY).catch(() => null);
|
||
if (Array.isArray(existingCountries) && existingCountries.length > 0) {
|
||
const keys = existingCountries.map(iso2 => `${SPINE_KEY_PREFIX}${iso2}`);
|
||
await extendExistingTtl(
|
||
[...keys, SPINE_COUNTRIES_KEY, SPINE_META_KEY],
|
||
SPINE_TTL_SECONDS,
|
||
).catch(e => console.warn('[energy-spine] TTL extension failed:', e.message));
|
||
}
|
||
await writeMeta(0, 'error');
|
||
throw err;
|
||
} finally {
|
||
await releaseLock(LOCK_DOMAIN, runId);
|
||
}
|
||
}
|
||
|
||
if (process.argv[1]?.endsWith('seed-energy-spine.mjs')) {
|
||
main().catch(err => {
|
||
console.error(err);
|
||
process.exit(1);
|
||
});
|
||
}
|