mirror of
https://github.com/koala73/worldmonitor.git
synced 2026-04-25 17:14:57 +02:00
* feat(_yahoo-fetch): curl-only Decodo proxy fallback helper Yahoo Finance throttles Railway egress IPs aggressively. 4 seeders (seed-commodity-quotes, seed-etf-flows, seed-gulf-quotes, seed-market-quotes) duplicated the same fetchYahooWithRetry block with no proxy fallback. This helper consolidates them and adds the proxy fallback. Yahoo-specific: CURL-ONLY proxy strategy. Probed 2026-04-16: query1.finance.yahoo.com via CONNECT (httpsProxyFetchRaw): HTTP 404 query1.finance.yahoo.com via curl (curlFetch): HTTP 200 Yahoo's edge blocks Decodo's CONNECT egress IPs but accepts the curl egress IPs. Helper deliberately omits the CONNECT leg — adding it would burn time on guaranteed-404 attempts. Production defaults expose ONLY curlProxyResolver + curlFetcher. All learnings from PR #3118 + #3119 reviews baked in: - lastDirectError accumulator across the loop, embedded in final throw + Error.cause chain - catch block uses break (NOT throw) so thrown errors also reach proxy - DI seams (_curlProxyResolver, _proxyCurlFetcher) for hermetic tests - _PROXY_DEFAULTS exported for production-default lock tests - Sync curlFetch wrapped with await Promise.resolve() to future-proof against an async refactor (Greptile P2 from #3119) Tests (tests/yahoo-fetch.test.mjs, 11 cases): - Production defaults: curl resolver/fetcher reference equality - Production defaults: NO CONNECT leg present (regression guard) - 200 OK passthrough, never touches proxy - 429 with no proxy → throws exhausted with HTTP 429 in message - Retry-After header parsed correctly - 429 + curl proxy succeeds → returns proxy data - Thrown fetch error on final retry → proxy fallback runs (P1 guard) - 429 + proxy ALSO fails → both errors visible in message + cause chain - Proxy malformed JSON → throws exhausted - Non-retryable 500 → no extra direct retry, falls to proxy - parseRetryAfterMs unit (exported sanity check) Verification: 11/11 helper tests pass. node --check clean. Phase 1 of 2 — seeder migrations follow. * feat(yahoo-seeders): migrate 4 seeders to _yahoo-fetch helper Removes the duplicated fetchYahooWithRetry function (4 byte-identical copies across seed-commodity-quotes, seed-etf-flows, seed-gulf-quotes, seed-market-quotes) and routes all Yahoo Finance fetches through the new scripts/_yahoo-fetch.mjs helper. Each seeder gains the curl-only Decodo proxy fallback baked into the helper. Per-seeder changes (mechanical): - import { fetchYahooJson } from './_yahoo-fetch.mjs' - delete the local fetchYahooWithRetry function - replace 'const resp = await fetchYahooWithRetry(url, label); if (!resp) return X; const json = await resp.json()' with 'let json; try { json = await fetchYahooJson(url, { label }); } catch { return X; }' - prune now-unused CHROME_UA/sleep imports where applicable Latent bugs fixed in passing: - seed-etf-flows.mjs:23 and seed-market-quotes.mjs:38 referenced CHROME_UA without importing it (would throw ReferenceError at runtime if the helper were called). Now the call site is gone in etf-flows; in market-quotes CHROME_UA is properly imported because Finnhub call still uses it. seed-commodity-quotes also has fetchYahooChart1y (separate non-retry function for gold history). Migrated to use fetchYahooJson under the hood — preserves return shape, adds proxy fallback automatically. Verification: - node --check clean on all 4 modified seeders - npm run typecheck:all clean - npm run test:data: 5374/5374 pass Phase 2 of 2. * fix(_yahoo-fetch): log success AFTER parse + add _sleep DI seam for honest Retry-After test Greptile P2: "[YAHOO] proxy (curl) succeeded" was logged BEFORE JSON.parse(text). On malformed proxy JSON, Railway logs would show: [YAHOO] proxy (curl) succeeded for AAPL throw: Yahoo retries exhausted ... Contradictory + breaks the post-deploy log-grep verification this PR relies on ("look for [YAHOO] proxy (curl) succeeded"). Fix: parse first; success log only fires when parse succeeds AND the value is about to be returned. Greptile P3: 'Retry-After header parsed correctly' test used header value '0', but parseRetryAfterMs() treats non-positive seconds as null → helper falls through to default linear backoff. So the test was exercising the wrong branch despite its name. Fix: added _sleep DI opt seam to the helper. New test injects a sleep spy and asserts the captured duration: Retry-After: '7' → captured sleep == [7000] (Retry-After branch) no Retry-After → captured sleep == [10] (default backoff = retryBaseMs * 1) Two paired tests lock both branches separately so a future regression that collapses them is caught. Also added a log-ordering regression test: malformed proxy JSON must NOT emit the 'succeeded' log. Captures console.log into an array and asserts no 'proxy (curl) succeeded' line appeared before the throw. Verification: - tests/yahoo-fetch.test.mjs: 13/13 (was 11, +2) - npm run test:data: 5376/5376 (+2) - npm run typecheck:all: clean Followup commits on PR #3120.
128 lines
4.2 KiB
JavaScript
Executable File
128 lines
4.2 KiB
JavaScript
Executable File
#!/usr/bin/env node
|
|
|
|
import { loadEnvFile, loadSharedConfig, runSeed, sleep } from './_seed-utils.mjs';
|
|
import { fetchYahooJson } from './_yahoo-fetch.mjs';
|
|
import { fetchAvPhysicalCommodity, fetchAvFxDaily } from './_shared-av.mjs';
|
|
|
|
const gulfConfig = loadSharedConfig('gulf.json');
|
|
|
|
loadEnvFile(import.meta.url);
|
|
|
|
const CANONICAL_KEY = 'market:gulf-quotes:v1';
|
|
const CACHE_TTL = 5400; // 90min — 1h buffer over 10min cron cadence (was 60min = 50min buffer)
|
|
const YAHOO_DELAY_MS = 200;
|
|
|
|
const GULF_SYMBOLS = gulfConfig.symbols;
|
|
|
|
function parseYahooChart(data, meta) {
|
|
const result = data?.chart?.result?.[0];
|
|
const chartMeta = result?.meta;
|
|
if (!chartMeta) return null;
|
|
|
|
const price = chartMeta.regularMarketPrice;
|
|
const prevClose = chartMeta.chartPreviousClose || chartMeta.previousClose || price;
|
|
const change = ((price - prevClose) / prevClose) * 100;
|
|
|
|
const closes = result.indicators?.quote?.[0]?.close;
|
|
const sparkline = (closes || []).filter((v) => v != null);
|
|
|
|
return {
|
|
symbol: meta.symbol,
|
|
name: meta.name,
|
|
country: meta.country,
|
|
flag: meta.flag,
|
|
type: meta.type,
|
|
price,
|
|
change: +change.toFixed(2),
|
|
sparkline,
|
|
};
|
|
}
|
|
|
|
async function fetchGulfQuotes() {
|
|
const quotes = [];
|
|
let misses = 0;
|
|
const avKey = process.env.ALPHA_VANTAGE_API_KEY;
|
|
const covered = new Set();
|
|
|
|
// --- Primary: Alpha Vantage ---
|
|
if (avKey) {
|
|
for (const meta of GULF_SYMBOLS) {
|
|
if (meta.type === 'oil') {
|
|
const q = await fetchAvPhysicalCommodity(meta.symbol, avKey);
|
|
if (q) {
|
|
quotes.push({ symbol: meta.symbol, name: meta.name, country: meta.country, flag: meta.flag, type: meta.type, price: q.price, change: +q.change.toFixed(2), sparkline: q.sparkline });
|
|
covered.add(meta.symbol);
|
|
console.log(` [AV:physical] ${meta.symbol}: $${q.price} (${q.change > 0 ? '+' : ''}${q.change.toFixed(2)}%)`);
|
|
}
|
|
} else if (meta.type === 'currency') {
|
|
const fromCurrency = meta.symbol.replace('USD=X', ''); // 'SARUSD=X' → 'SAR'
|
|
const q = await fetchAvFxDaily(fromCurrency, avKey);
|
|
if (q) {
|
|
quotes.push({ symbol: meta.symbol, name: meta.name, country: meta.country, flag: meta.flag, type: meta.type, price: q.price, change: +q.change.toFixed(2), sparkline: q.sparkline });
|
|
covered.add(meta.symbol);
|
|
console.log(` [AV:fx] ${meta.symbol}: ${q.price} (${q.change > 0 ? '+' : ''}${q.change.toFixed(2)}%)`);
|
|
}
|
|
}
|
|
// type === 'index' → no AV equivalent, falls through to Yahoo
|
|
}
|
|
}
|
|
|
|
// --- Fallback: Yahoo (for indices and any AV misses) ---
|
|
let yahooIdx = 0;
|
|
for (let i = 0; i < GULF_SYMBOLS.length; i++) {
|
|
const meta = GULF_SYMBOLS[i];
|
|
if (covered.has(meta.symbol)) continue;
|
|
if (yahooIdx > 0) await sleep(YAHOO_DELAY_MS);
|
|
yahooIdx++;
|
|
|
|
try {
|
|
const url = `https://query1.finance.yahoo.com/v8/finance/chart/${encodeURIComponent(meta.symbol)}`;
|
|
let chart;
|
|
try {
|
|
chart = await fetchYahooJson(url, { label: meta.symbol });
|
|
} catch {
|
|
misses++;
|
|
continue;
|
|
}
|
|
const parsed = parseYahooChart(chart, meta);
|
|
if (parsed) {
|
|
quotes.push(parsed);
|
|
covered.add(meta.symbol);
|
|
console.log(` [Yahoo] ${meta.symbol}: $${parsed.price} (${parsed.change > 0 ? '+' : ''}${parsed.change}%)`);
|
|
} else {
|
|
misses++;
|
|
}
|
|
} catch (err) {
|
|
console.warn(` [Yahoo] ${meta.symbol} error: ${err.message}`);
|
|
misses++;
|
|
}
|
|
}
|
|
|
|
if (quotes.length === 0) {
|
|
throw new Error(`All Gulf quote fetches failed (${misses} misses)`);
|
|
}
|
|
|
|
return { quotes, rateLimited: false };
|
|
}
|
|
|
|
function validate(data) {
|
|
return Array.isArray(data?.quotes) && data.quotes.length >= 1;
|
|
}
|
|
|
|
export function declareRecords(data) {
|
|
return Array.isArray(data?.quotes) ? data.quotes.length : 0;
|
|
}
|
|
|
|
runSeed('market', 'gulf-quotes', CANONICAL_KEY, fetchGulfQuotes, {
|
|
validateFn: validate,
|
|
ttlSeconds: CACHE_TTL,
|
|
sourceVersion: 'alphavantage+yahoo-chart',
|
|
|
|
declareRecords,
|
|
schemaVersion: 1,
|
|
maxStaleMin: 30,
|
|
}).catch((err) => {
|
|
const _cause = err.cause ? ` (cause: ${err.cause.message || err.cause.code || err.cause})` : ''; console.error('FATAL:', (err.message || err) + _cause);
|
|
process.exit(1);
|
|
});
|