@fin.cx/opendata 3.3.0 → 3.4.0

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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@fin.cx/opendata',
6
- version: '3.3.0',
6
+ version: '3.4.0',
7
7
  description: 'A comprehensive TypeScript library for accessing business data and real-time financial information. Features include German company data management with MongoDB integration, JSONL bulk processing, automated Handelsregister interactions, and real-time stock market data from multiple providers.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHVTQUF1UztDQUNyVCxDQUFBIn0=
@@ -1,28 +1,35 @@
1
1
  import type { IStockProvider, IProviderConfig } from '../interfaces/provider.js';
2
2
  import type { IStockPrice, IStockDataRequest } from '../interfaces/stockprice.js';
3
3
  /**
4
- * Marketstack API v2 Provider - Enhanced
4
+ * Marketstack API v2 Provider - Professional Plan with Intelligent Intraday Support
5
5
  * Documentation: https://docs.apilayer.com/marketstack/docs/marketstack-api-v2-v-2-0-0
6
6
  *
7
7
  * Features:
8
+ * - Intelligent endpoint selection based on market hours
9
+ * - Real-time intraday pricing with multiple intervals (1min, 5min, 10min, 15min, 30min, 1hour)
8
10
  * - End-of-Day (EOD) stock prices with historical data
9
- * - Intraday pricing with multiple intervals (1min, 5min, 15min, 30min, 1hour)
11
+ * - Market state detection (PRE, REGULAR, POST, CLOSED)
10
12
  * - Exchange filtering via MIC codes (XNAS, XNYS, XLON, etc.)
11
13
  * - Supports 500,000+ tickers across 72+ exchanges worldwide
12
14
  * - OHLCV data (Open, High, Low, Close, Volume)
13
15
  * - Pagination for large datasets
16
+ * - Automatic fallback from intraday to EOD on errors
14
17
  * - Requires API key authentication
15
18
  *
19
+ * Intelligent Endpoint Selection:
20
+ * - During market hours (PRE/REGULAR/POST): Uses intraday endpoints for fresh data
21
+ * - After market close (CLOSED): Uses EOD endpoints to save API credits
22
+ * - Automatic fallback to EOD if intraday fails (rate limits, plan restrictions, etc.)
23
+ *
16
24
  * Rate Limits:
17
25
  * - Free Plan: 100 requests/month (EOD only)
18
- * - Basic Plan: 10,000 requests/month
19
- * - Professional Plan: 100,000 requests/month (intraday access)
26
+ * - Basic Plan: 10,000 requests/month (EOD only)
27
+ * - Professional Plan: 100,000 requests/month (intraday + EOD)
20
28
  *
21
- * Phase 1 Enhancements:
22
- * - Historical data retrieval with date ranges
23
- * - Exchange filtering
24
- * - OHLCV data support
25
- * - Pagination handling
29
+ * Intraday Access:
30
+ * - Intervals below 15min (1min, 5min, 10min) require Professional Plan or higher
31
+ * - Real-time data from IEX Exchange for US tickers
32
+ * - Symbol formatting: Periods replaced with hyphens for intraday (BRK.B → BRK-B)
26
33
  */
27
34
  export declare class MarketstackProvider implements IStockProvider {
28
35
  private config?;
@@ -42,21 +49,44 @@ export declare class MarketstackProvider implements IStockProvider {
42
49
  */
43
50
  fetchData(request: IStockDataRequest): Promise<IStockPrice[] | IStockPrice>;
44
51
  /**
45
- * Fetch current/latest EOD price for a single ticker (new API)
52
+ * Fetch current/latest price with intelligent endpoint selection
53
+ * Uses intraday during market hours (PRE, REGULAR, POST) for fresh data
54
+ * Uses EOD after market close (CLOSED) to save API credits
46
55
  */
47
56
  private fetchCurrentPrice;
57
+ /**
58
+ * Fetch current price using intraday endpoint (during market hours)
59
+ * Uses 1min interval for most recent data
60
+ */
61
+ private fetchCurrentPriceIntraday;
62
+ /**
63
+ * Fetch current price using EOD endpoint (after market close)
64
+ */
65
+ private fetchCurrentPriceEod;
48
66
  /**
49
67
  * Fetch historical EOD prices for a ticker with date range
50
68
  */
51
69
  private fetchHistoricalPrices;
52
70
  /**
53
- * Fetch intraday prices with specified interval (Phase 2 placeholder)
71
+ * Fetch intraday prices with specified interval
72
+ * Supports intervals: 1min, 5min, 10min, 15min, 30min, 1hour
73
+ * Note: Intervals below 15min require Professional Plan or higher
54
74
  */
55
75
  private fetchIntradayPrices;
56
76
  /**
57
- * Fetch current prices for multiple tickers (new API)
77
+ * Fetch current prices for multiple tickers with intelligent endpoint selection
78
+ * Uses intraday during market hours (PRE, REGULAR, POST) for fresh data
79
+ * Uses EOD after market close (CLOSED) to save API credits
58
80
  */
59
81
  private fetchBatchCurrentPrices;
82
+ /**
83
+ * Fetch batch current prices using intraday endpoint
84
+ */
85
+ private fetchBatchCurrentPricesIntraday;
86
+ /**
87
+ * Fetch batch current prices using EOD endpoint
88
+ */
89
+ private fetchBatchCurrentPricesEod;
60
90
  /**
61
91
  * Check if the Marketstack API is available and accessible
62
92
  */
@@ -72,6 +102,9 @@ export declare class MarketstackProvider implements IStockProvider {
72
102
  supportsTicker(ticker: string): boolean;
73
103
  /**
74
104
  * Map Marketstack API response to IStockPrice interface
105
+ * @param data - API response data
106
+ * @param dataType - Type of data (eod, intraday, live)
107
+ * @param explicitMarketState - Override market state (used for intraday data fetched during known market hours)
75
108
  */
76
109
  private mapToStockPrice;
77
110
  /**
@@ -83,4 +116,32 @@ export declare class MarketstackProvider implements IStockProvider {
83
116
  * Format date to YYYY-MM-DD for API requests
84
117
  */
85
118
  private formatDate;
119
+ /**
120
+ * Get US market state based on Eastern Time
121
+ * Regular hours: 9:30 AM - 4:00 PM ET
122
+ * Pre-market: 4:00 AM - 9:30 AM ET
123
+ * After-hours: 4:00 PM - 8:00 PM ET
124
+ *
125
+ * @param timestampMs - Optional timestamp in milliseconds (defaults to current time)
126
+ * @returns Market state: PRE, REGULAR, POST, or CLOSED
127
+ */
128
+ private getUsMarketState;
129
+ /**
130
+ * Determine if intraday endpoint should be used based on market state
131
+ * Uses intraday for PRE, REGULAR, and POST market states
132
+ * Uses EOD for CLOSED state to save API credits
133
+ *
134
+ * @param marketState - Current market state
135
+ * @returns true if intraday endpoint should be used
136
+ */
137
+ private shouldUseIntradayEndpoint;
138
+ /**
139
+ * Format ticker symbol for intraday endpoints
140
+ * Marketstack intraday API requires periods to be replaced with hyphens
141
+ * Example: BRK.B → BRK-B
142
+ *
143
+ * @param symbol - Original ticker symbol
144
+ * @returns Formatted symbol for intraday endpoints
145
+ */
146
+ private formatSymbolForIntraday;
86
147
  }
@@ -1,33 +1,40 @@
1
1
  import * as plugins from '../../plugins.js';
2
2
  /**
3
- * Marketstack API v2 Provider - Enhanced
3
+ * Marketstack API v2 Provider - Professional Plan with Intelligent Intraday Support
4
4
  * Documentation: https://docs.apilayer.com/marketstack/docs/marketstack-api-v2-v-2-0-0
5
5
  *
6
6
  * Features:
7
+ * - Intelligent endpoint selection based on market hours
8
+ * - Real-time intraday pricing with multiple intervals (1min, 5min, 10min, 15min, 30min, 1hour)
7
9
  * - End-of-Day (EOD) stock prices with historical data
8
- * - Intraday pricing with multiple intervals (1min, 5min, 15min, 30min, 1hour)
10
+ * - Market state detection (PRE, REGULAR, POST, CLOSED)
9
11
  * - Exchange filtering via MIC codes (XNAS, XNYS, XLON, etc.)
10
12
  * - Supports 500,000+ tickers across 72+ exchanges worldwide
11
13
  * - OHLCV data (Open, High, Low, Close, Volume)
12
14
  * - Pagination for large datasets
15
+ * - Automatic fallback from intraday to EOD on errors
13
16
  * - Requires API key authentication
14
17
  *
18
+ * Intelligent Endpoint Selection:
19
+ * - During market hours (PRE/REGULAR/POST): Uses intraday endpoints for fresh data
20
+ * - After market close (CLOSED): Uses EOD endpoints to save API credits
21
+ * - Automatic fallback to EOD if intraday fails (rate limits, plan restrictions, etc.)
22
+ *
15
23
  * Rate Limits:
16
24
  * - Free Plan: 100 requests/month (EOD only)
17
- * - Basic Plan: 10,000 requests/month
18
- * - Professional Plan: 100,000 requests/month (intraday access)
25
+ * - Basic Plan: 10,000 requests/month (EOD only)
26
+ * - Professional Plan: 100,000 requests/month (intraday + EOD)
19
27
  *
20
- * Phase 1 Enhancements:
21
- * - Historical data retrieval with date ranges
22
- * - Exchange filtering
23
- * - OHLCV data support
24
- * - Pagination handling
28
+ * Intraday Access:
29
+ * - Intervals below 15min (1min, 5min, 10min) require Professional Plan or higher
30
+ * - Real-time data from IEX Exchange for US tickers
31
+ * - Symbol formatting: Periods replaced with hyphens for intraday (BRK.B → BRK-B)
25
32
  */
26
33
  export class MarketstackProvider {
27
34
  constructor(apiKey, config) {
28
35
  this.config = config;
29
36
  this.name = 'Marketstack';
30
- this.priority = 80; // Lower than Yahoo (100) due to rate limits and EOD-only data
37
+ this.priority = 90; // Increased from 80 - now supports real-time intraday data during market hours
31
38
  this.requiresAuth = true;
32
39
  this.rateLimit = {
33
40
  requestsPerMinute: undefined, // No per-minute limit specified
@@ -58,35 +65,89 @@ export class MarketstackProvider {
58
65
  }
59
66
  }
60
67
  /**
61
- * Fetch current/latest EOD price for a single ticker (new API)
68
+ * Fetch current/latest price with intelligent endpoint selection
69
+ * Uses intraday during market hours (PRE, REGULAR, POST) for fresh data
70
+ * Uses EOD after market close (CLOSED) to save API credits
62
71
  */
63
72
  async fetchCurrentPrice(request) {
64
73
  try {
65
- let url = `${this.baseUrl}/tickers/${request.ticker}/eod/latest?access_key=${this.apiKey}`;
66
- // Add exchange filter if specified
67
- if (request.exchange) {
68
- url += `&exchange=${request.exchange}`;
74
+ // Determine current market state
75
+ const marketState = this.getUsMarketState();
76
+ const useIntraday = this.shouldUseIntradayEndpoint(marketState);
77
+ if (useIntraday) {
78
+ // Use intraday endpoint for fresh data during market hours
79
+ return await this.fetchCurrentPriceIntraday(request, marketState);
69
80
  }
70
- const response = await plugins.smartrequest.SmartRequest.create()
71
- .url(url)
72
- .timeout(this.config?.timeout || 10000)
73
- .get();
74
- const responseData = await response.json();
75
- // Check for API errors
76
- if (responseData.error) {
77
- throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
78
- }
79
- // For single ticker endpoint, response is direct object (not wrapped in data field)
80
- if (!responseData || !responseData.close) {
81
- throw new Error(`No data found for ticker ${request.ticker}`);
81
+ else {
82
+ // Use EOD endpoint for after-close data
83
+ return await this.fetchCurrentPriceEod(request);
82
84
  }
83
- return this.mapToStockPrice(responseData, 'eod');
84
85
  }
85
86
  catch (error) {
86
- this.logger.error(`Failed to fetch current price for ${request.ticker}:`, error);
87
- throw new Error(`Marketstack: Failed to fetch current price for ${request.ticker}: ${error.message}`);
87
+ // If intraday fails, fallback to EOD with warning
88
+ if (error.message?.includes('intraday') || error.message?.includes('Marketstack API error')) {
89
+ this.logger.warn(`Intraday endpoint failed for ${request.ticker}, falling back to EOD:`, error.message);
90
+ try {
91
+ return await this.fetchCurrentPriceEod(request);
92
+ }
93
+ catch (eodError) {
94
+ // Both failed, throw original error
95
+ throw error;
96
+ }
97
+ }
98
+ throw error;
88
99
  }
89
100
  }
101
+ /**
102
+ * Fetch current price using intraday endpoint (during market hours)
103
+ * Uses 1min interval for most recent data
104
+ */
105
+ async fetchCurrentPriceIntraday(request, marketState) {
106
+ const formattedSymbol = this.formatSymbolForIntraday(request.ticker);
107
+ let url = `${this.baseUrl}/tickers/${formattedSymbol}/intraday/latest?access_key=${this.apiKey}`;
108
+ url += `&interval=1min`; // Use 1min for most recent data
109
+ // Add exchange filter if specified
110
+ if (request.exchange) {
111
+ url += `&exchange=${request.exchange}`;
112
+ }
113
+ const response = await plugins.smartrequest.SmartRequest.create()
114
+ .url(url)
115
+ .timeout(this.config?.timeout || 10000)
116
+ .get();
117
+ const responseData = await response.json();
118
+ // Check for API errors
119
+ if (responseData.error) {
120
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
121
+ }
122
+ if (!responseData || !responseData.close) {
123
+ throw new Error(`No intraday data found for ticker ${request.ticker}`);
124
+ }
125
+ return this.mapToStockPrice(responseData, 'intraday', marketState);
126
+ }
127
+ /**
128
+ * Fetch current price using EOD endpoint (after market close)
129
+ */
130
+ async fetchCurrentPriceEod(request) {
131
+ let url = `${this.baseUrl}/tickers/${request.ticker}/eod/latest?access_key=${this.apiKey}`;
132
+ // Add exchange filter if specified
133
+ if (request.exchange) {
134
+ url += `&exchange=${request.exchange}`;
135
+ }
136
+ const response = await plugins.smartrequest.SmartRequest.create()
137
+ .url(url)
138
+ .timeout(this.config?.timeout || 10000)
139
+ .get();
140
+ const responseData = await response.json();
141
+ // Check for API errors
142
+ if (responseData.error) {
143
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
144
+ }
145
+ // For single ticker endpoint, response is direct object (not wrapped in data field)
146
+ if (!responseData || !responseData.close) {
147
+ throw new Error(`No data found for ticker ${request.ticker}`);
148
+ }
149
+ return this.mapToStockPrice(responseData, 'eod');
150
+ }
90
151
  /**
91
152
  * Fetch historical EOD prices for a ticker with date range
92
153
  */
@@ -147,52 +208,177 @@ export class MarketstackProvider {
147
208
  }
148
209
  }
149
210
  /**
150
- * Fetch intraday prices with specified interval (Phase 2 placeholder)
211
+ * Fetch intraday prices with specified interval
212
+ * Supports intervals: 1min, 5min, 10min, 15min, 30min, 1hour
213
+ * Note: Intervals below 15min require Professional Plan or higher
151
214
  */
152
215
  async fetchIntradayPrices(request) {
153
- throw new Error('Intraday data support coming in Phase 2. For now, use EOD data with type: "current" or "historical"');
216
+ try {
217
+ const allPrices = [];
218
+ let offset = 0;
219
+ const limit = 1000; // Max per page for intraday
220
+ const maxRecords = 10000; // Safety limit
221
+ // Format symbol for intraday endpoint (replace . with -)
222
+ const formattedSymbol = this.formatSymbolForIntraday(request.ticker);
223
+ while (true) {
224
+ let url = `${this.baseUrl}/tickers/${formattedSymbol}/intraday?access_key=${this.apiKey}`;
225
+ url += `&interval=${request.interval}`;
226
+ url += `&limit=${limit}`;
227
+ url += `&offset=${offset}`;
228
+ // Add date filter if specified
229
+ if (request.date) {
230
+ url += `&date_from=${this.formatDate(request.date)}`;
231
+ url += `&date_to=${this.formatDate(request.date)}`;
232
+ }
233
+ // Add exchange filter if specified
234
+ if (request.exchange) {
235
+ url += `&exchange=${request.exchange}`;
236
+ }
237
+ const response = await plugins.smartrequest.SmartRequest.create()
238
+ .url(url)
239
+ .timeout(this.config?.timeout || 15000)
240
+ .get();
241
+ const responseData = await response.json();
242
+ // Check for API errors
243
+ if (responseData.error) {
244
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
245
+ }
246
+ if (!responseData?.data || !Array.isArray(responseData.data)) {
247
+ throw new Error('Invalid response format from Marketstack API');
248
+ }
249
+ // Map data to stock prices
250
+ for (const data of responseData.data) {
251
+ try {
252
+ allPrices.push(this.mapToStockPrice(data, 'intraday'));
253
+ }
254
+ catch (error) {
255
+ this.logger.warn(`Failed to parse intraday data for ${data.symbol}:`, error);
256
+ }
257
+ }
258
+ // Check if we have more pages
259
+ const pagination = responseData.pagination;
260
+ const hasMore = pagination && offset + limit < pagination.total;
261
+ // Honor limit from request if specified, or safety limit
262
+ if (!hasMore || (request.limit && allPrices.length >= request.limit) || allPrices.length >= maxRecords) {
263
+ break;
264
+ }
265
+ offset += limit;
266
+ }
267
+ // Apply limit if specified
268
+ if (request.limit && allPrices.length > request.limit) {
269
+ return allPrices.slice(0, request.limit);
270
+ }
271
+ return allPrices;
272
+ }
273
+ catch (error) {
274
+ this.logger.error(`Failed to fetch intraday prices for ${request.ticker}:`, error);
275
+ throw new Error(`Marketstack: Failed to fetch intraday prices for ${request.ticker}: ${error.message}`);
276
+ }
154
277
  }
155
278
  /**
156
- * Fetch current prices for multiple tickers (new API)
279
+ * Fetch current prices for multiple tickers with intelligent endpoint selection
280
+ * Uses intraday during market hours (PRE, REGULAR, POST) for fresh data
281
+ * Uses EOD after market close (CLOSED) to save API credits
157
282
  */
158
283
  async fetchBatchCurrentPrices(request) {
159
284
  try {
160
- const symbols = request.tickers.join(',');
161
- let url = `${this.baseUrl}/eod/latest?access_key=${this.apiKey}&symbols=${symbols}`;
162
- if (request.exchange) {
163
- url += `&exchange=${request.exchange}`;
164
- }
165
- const response = await plugins.smartrequest.SmartRequest.create()
166
- .url(url)
167
- .timeout(this.config?.timeout || 15000)
168
- .get();
169
- const responseData = await response.json();
170
- // Check for API errors
171
- if (responseData.error) {
172
- throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
285
+ // Determine current market state
286
+ const marketState = this.getUsMarketState();
287
+ const useIntraday = this.shouldUseIntradayEndpoint(marketState);
288
+ if (useIntraday) {
289
+ return await this.fetchBatchCurrentPricesIntraday(request, marketState);
173
290
  }
174
- if (!responseData?.data || !Array.isArray(responseData.data)) {
175
- throw new Error('Invalid response format from Marketstack API');
291
+ else {
292
+ return await this.fetchBatchCurrentPricesEod(request);
176
293
  }
177
- const prices = [];
178
- for (const data of responseData.data) {
294
+ }
295
+ catch (error) {
296
+ // Fallback to EOD if intraday fails
297
+ if (error.message?.includes('intraday') || error.message?.includes('Marketstack API error')) {
298
+ this.logger.warn(`Intraday batch endpoint failed, falling back to EOD:`, error.message);
179
299
  try {
180
- prices.push(this.mapToStockPrice(data, 'eod'));
300
+ return await this.fetchBatchCurrentPricesEod(request);
181
301
  }
182
- catch (error) {
183
- this.logger.warn(`Failed to parse data for ${data.symbol}:`, error);
184
- // Continue processing other tickers
302
+ catch (eodError) {
303
+ // Both failed, throw original error
304
+ throw error;
185
305
  }
186
306
  }
187
- if (prices.length === 0) {
188
- throw new Error('No valid price data received from batch request');
307
+ throw error;
308
+ }
309
+ }
310
+ /**
311
+ * Fetch batch current prices using intraday endpoint
312
+ */
313
+ async fetchBatchCurrentPricesIntraday(request, marketState) {
314
+ // Format symbols for intraday (replace . with -)
315
+ const formattedSymbols = request.tickers.map(t => this.formatSymbolForIntraday(t)).join(',');
316
+ let url = `${this.baseUrl}/intraday/latest?access_key=${this.apiKey}`;
317
+ url += `&symbols=${formattedSymbols}`;
318
+ url += `&interval=1min`; // Use 1min for most recent data
319
+ if (request.exchange) {
320
+ url += `&exchange=${request.exchange}`;
321
+ }
322
+ const response = await plugins.smartrequest.SmartRequest.create()
323
+ .url(url)
324
+ .timeout(this.config?.timeout || 15000)
325
+ .get();
326
+ const responseData = await response.json();
327
+ if (responseData.error) {
328
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
329
+ }
330
+ if (!responseData?.data || !Array.isArray(responseData.data)) {
331
+ throw new Error('Invalid response format from Marketstack API');
332
+ }
333
+ const prices = [];
334
+ for (const data of responseData.data) {
335
+ try {
336
+ prices.push(this.mapToStockPrice(data, 'intraday', marketState));
337
+ }
338
+ catch (error) {
339
+ this.logger.warn(`Failed to parse intraday data for ${data.symbol}:`, error);
189
340
  }
190
- return prices;
191
341
  }
192
- catch (error) {
193
- this.logger.error(`Failed to fetch batch current prices:`, error);
194
- throw new Error(`Marketstack: Failed to fetch batch current prices: ${error.message}`);
342
+ if (prices.length === 0) {
343
+ throw new Error('No valid price data received from batch intraday request');
195
344
  }
345
+ return prices;
346
+ }
347
+ /**
348
+ * Fetch batch current prices using EOD endpoint
349
+ */
350
+ async fetchBatchCurrentPricesEod(request) {
351
+ const symbols = request.tickers.join(',');
352
+ let url = `${this.baseUrl}/eod/latest?access_key=${this.apiKey}&symbols=${symbols}`;
353
+ if (request.exchange) {
354
+ url += `&exchange=${request.exchange}`;
355
+ }
356
+ const response = await plugins.smartrequest.SmartRequest.create()
357
+ .url(url)
358
+ .timeout(this.config?.timeout || 15000)
359
+ .get();
360
+ const responseData = await response.json();
361
+ // Check for API errors
362
+ if (responseData.error) {
363
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
364
+ }
365
+ if (!responseData?.data || !Array.isArray(responseData.data)) {
366
+ throw new Error('Invalid response format from Marketstack API');
367
+ }
368
+ const prices = [];
369
+ for (const data of responseData.data) {
370
+ try {
371
+ prices.push(this.mapToStockPrice(data, 'eod'));
372
+ }
373
+ catch (error) {
374
+ this.logger.warn(`Failed to parse data for ${data.symbol}:`, error);
375
+ // Continue processing other tickers
376
+ }
377
+ }
378
+ if (prices.length === 0) {
379
+ throw new Error('No valid price data received from batch request');
380
+ }
381
+ return prices;
196
382
  }
197
383
  /**
198
384
  * Check if the Marketstack API is available and accessible
@@ -237,8 +423,11 @@ export class MarketstackProvider {
237
423
  }
238
424
  /**
239
425
  * Map Marketstack API response to IStockPrice interface
426
+ * @param data - API response data
427
+ * @param dataType - Type of data (eod, intraday, live)
428
+ * @param explicitMarketState - Override market state (used for intraday data fetched during known market hours)
240
429
  */
241
- mapToStockPrice(data, dataType = 'eod') {
430
+ mapToStockPrice(data, dataType = 'eod', explicitMarketState) {
242
431
  if (!data.close) {
243
432
  throw new Error('Missing required price data');
244
433
  }
@@ -252,6 +441,24 @@ export class MarketstackProvider {
252
441
  // Parse timestamp
253
442
  const timestamp = data.date ? new Date(data.date) : new Date();
254
443
  const fetchedAt = new Date();
444
+ // Determine market state intelligently
445
+ let marketState;
446
+ if (explicitMarketState) {
447
+ // Use provided market state (for intraday data fetched during known market hours)
448
+ marketState = explicitMarketState;
449
+ }
450
+ else if (dataType === 'eod') {
451
+ // EOD data is always for closed markets
452
+ marketState = 'CLOSED';
453
+ }
454
+ else if (dataType === 'intraday') {
455
+ // For intraday data without explicit state, determine from timestamp
456
+ marketState = this.getUsMarketState(timestamp.getTime());
457
+ }
458
+ else {
459
+ // Default fallback
460
+ marketState = 'CLOSED';
461
+ }
255
462
  const stockPrice = {
256
463
  ticker: data.symbol.toUpperCase(),
257
464
  price: currentPrice,
@@ -261,7 +468,7 @@ export class MarketstackProvider {
261
468
  previousClose: previousClose,
262
469
  timestamp: timestamp,
263
470
  provider: this.name,
264
- marketState: 'CLOSED', // EOD data is always for closed markets
471
+ marketState: marketState, // Now dynamic based on data type, timestamp, and explicit state
265
472
  exchange: data.exchange,
266
473
  exchangeName: data.exchange_code || data.name,
267
474
  // Phase 1 enhancements: OHLCV data
@@ -314,5 +521,71 @@ export class MarketstackProvider {
314
521
  const day = String(date.getDate()).padStart(2, '0');
315
522
  return `${year}-${month}-${day}`;
316
523
  }
524
+ /**
525
+ * Get US market state based on Eastern Time
526
+ * Regular hours: 9:30 AM - 4:00 PM ET
527
+ * Pre-market: 4:00 AM - 9:30 AM ET
528
+ * After-hours: 4:00 PM - 8:00 PM ET
529
+ *
530
+ * @param timestampMs - Optional timestamp in milliseconds (defaults to current time)
531
+ * @returns Market state: PRE, REGULAR, POST, or CLOSED
532
+ */
533
+ getUsMarketState(timestampMs) {
534
+ const now = timestampMs ? new Date(timestampMs) : new Date();
535
+ // Convert to ET (UTC-5 or UTC-4 depending on DST)
536
+ // For simplicity, we'll use a rough approximation
537
+ // TODO: Add proper timezone library for production use
538
+ const etOffset = -5; // Standard time, adjust for DST if needed
539
+ const etTime = new Date(now.getTime() + (etOffset * 60 * 60 * 1000));
540
+ // Get day of week (0 = Sunday, 6 = Saturday)
541
+ const dayOfWeek = etTime.getUTCDay();
542
+ // Check if weekend
543
+ if (dayOfWeek === 0 || dayOfWeek === 6) {
544
+ return 'CLOSED';
545
+ }
546
+ // Get hour and minute in ET
547
+ const hours = etTime.getUTCHours();
548
+ const minutes = etTime.getUTCMinutes();
549
+ const timeInMinutes = hours * 60 + minutes;
550
+ // Define market hours in minutes
551
+ const preMarketStart = 4 * 60; // 4:00 AM
552
+ const regularMarketStart = 9 * 60 + 30; // 9:30 AM
553
+ const regularMarketEnd = 16 * 60; // 4:00 PM
554
+ const afterHoursEnd = 20 * 60; // 8:00 PM
555
+ if (timeInMinutes >= preMarketStart && timeInMinutes < regularMarketStart) {
556
+ return 'PRE';
557
+ }
558
+ else if (timeInMinutes >= regularMarketStart && timeInMinutes < regularMarketEnd) {
559
+ return 'REGULAR';
560
+ }
561
+ else if (timeInMinutes >= regularMarketEnd && timeInMinutes < afterHoursEnd) {
562
+ return 'POST';
563
+ }
564
+ else {
565
+ return 'CLOSED';
566
+ }
567
+ }
568
+ /**
569
+ * Determine if intraday endpoint should be used based on market state
570
+ * Uses intraday for PRE, REGULAR, and POST market states
571
+ * Uses EOD for CLOSED state to save API credits
572
+ *
573
+ * @param marketState - Current market state
574
+ * @returns true if intraday endpoint should be used
575
+ */
576
+ shouldUseIntradayEndpoint(marketState) {
577
+ return marketState !== 'CLOSED';
578
+ }
579
+ /**
580
+ * Format ticker symbol for intraday endpoints
581
+ * Marketstack intraday API requires periods to be replaced with hyphens
582
+ * Example: BRK.B → BRK-B
583
+ *
584
+ * @param symbol - Original ticker symbol
585
+ * @returns Formatted symbol for intraday endpoints
586
+ */
587
+ formatSymbolForIntraday(symbol) {
588
+ return symbol.replace(/\./g, '-');
589
+ }
317
590
  }
318
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.marketstack.js","sourceRoot":"","sources":["../../../ts/stocks/providers/provider.marketstack.ts"],"names":[],"mappings":"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"}
591
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.marketstack.js","sourceRoot":"","sources":["../../../ts/stocks/providers/provider.marketstack.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fin.cx/opendata",
3
- "version": "3.3.0",
3
+ "version": "3.4.0",
4
4
  "private": false,
5
5
  "description": "A comprehensive TypeScript library for accessing business data and real-time financial information. Features include German company data management with MongoDB integration, JSONL bulk processing, automated Handelsregister interactions, and real-time stock market data from multiple providers.",
6
6
  "main": "dist_ts/index.js",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@fin.cx/opendata',
6
- version: '3.3.0',
6
+ version: '3.4.0',
7
7
  description: 'A comprehensive TypeScript library for accessing business data and real-time financial information. Features include German company data management with MongoDB integration, JSONL bulk processing, automated Handelsregister interactions, and real-time stock market data from multiple providers.'
8
8
  }
@@ -10,32 +10,39 @@ import type {
10
10
  } from '../interfaces/stockprice.js';
11
11
 
12
12
  /**
13
- * Marketstack API v2 Provider - Enhanced
13
+ * Marketstack API v2 Provider - Professional Plan with Intelligent Intraday Support
14
14
  * Documentation: https://docs.apilayer.com/marketstack/docs/marketstack-api-v2-v-2-0-0
15
15
  *
16
16
  * Features:
17
+ * - Intelligent endpoint selection based on market hours
18
+ * - Real-time intraday pricing with multiple intervals (1min, 5min, 10min, 15min, 30min, 1hour)
17
19
  * - End-of-Day (EOD) stock prices with historical data
18
- * - Intraday pricing with multiple intervals (1min, 5min, 15min, 30min, 1hour)
20
+ * - Market state detection (PRE, REGULAR, POST, CLOSED)
19
21
  * - Exchange filtering via MIC codes (XNAS, XNYS, XLON, etc.)
20
22
  * - Supports 500,000+ tickers across 72+ exchanges worldwide
21
23
  * - OHLCV data (Open, High, Low, Close, Volume)
22
24
  * - Pagination for large datasets
25
+ * - Automatic fallback from intraday to EOD on errors
23
26
  * - Requires API key authentication
24
27
  *
28
+ * Intelligent Endpoint Selection:
29
+ * - During market hours (PRE/REGULAR/POST): Uses intraday endpoints for fresh data
30
+ * - After market close (CLOSED): Uses EOD endpoints to save API credits
31
+ * - Automatic fallback to EOD if intraday fails (rate limits, plan restrictions, etc.)
32
+ *
25
33
  * Rate Limits:
26
34
  * - Free Plan: 100 requests/month (EOD only)
27
- * - Basic Plan: 10,000 requests/month
28
- * - Professional Plan: 100,000 requests/month (intraday access)
35
+ * - Basic Plan: 10,000 requests/month (EOD only)
36
+ * - Professional Plan: 100,000 requests/month (intraday + EOD)
29
37
  *
30
- * Phase 1 Enhancements:
31
- * - Historical data retrieval with date ranges
32
- * - Exchange filtering
33
- * - OHLCV data support
34
- * - Pagination handling
38
+ * Intraday Access:
39
+ * - Intervals below 15min (1min, 5min, 10min) require Professional Plan or higher
40
+ * - Real-time data from IEX Exchange for US tickers
41
+ * - Symbol formatting: Periods replaced with hyphens for intraday (BRK.B → BRK-B)
35
42
  */
36
43
  export class MarketstackProvider implements IStockProvider {
37
44
  public name = 'Marketstack';
38
- public priority = 80; // Lower than Yahoo (100) due to rate limits and EOD-only data
45
+ public priority = 90; // Increased from 80 - now supports real-time intraday data during market hours
39
46
  public readonly requiresAuth = true;
40
47
  public readonly rateLimit = {
41
48
  requestsPerMinute: undefined, // No per-minute limit specified
@@ -73,39 +80,103 @@ export class MarketstackProvider implements IStockProvider {
73
80
  }
74
81
 
75
82
  /**
76
- * Fetch current/latest EOD price for a single ticker (new API)
83
+ * Fetch current/latest price with intelligent endpoint selection
84
+ * Uses intraday during market hours (PRE, REGULAR, POST) for fresh data
85
+ * Uses EOD after market close (CLOSED) to save API credits
77
86
  */
78
87
  private async fetchCurrentPrice(request: IStockCurrentRequest): Promise<IStockPrice> {
79
88
  try {
80
- let url = `${this.baseUrl}/tickers/${request.ticker}/eod/latest?access_key=${this.apiKey}`;
81
-
82
- // Add exchange filter if specified
83
- if (request.exchange) {
84
- url += `&exchange=${request.exchange}`;
89
+ // Determine current market state
90
+ const marketState = this.getUsMarketState();
91
+ const useIntraday = this.shouldUseIntradayEndpoint(marketState);
92
+
93
+ if (useIntraday) {
94
+ // Use intraday endpoint for fresh data during market hours
95
+ return await this.fetchCurrentPriceIntraday(request, marketState);
96
+ } else {
97
+ // Use EOD endpoint for after-close data
98
+ return await this.fetchCurrentPriceEod(request);
99
+ }
100
+ } catch (error) {
101
+ // If intraday fails, fallback to EOD with warning
102
+ if (error.message?.includes('intraday') || error.message?.includes('Marketstack API error')) {
103
+ this.logger.warn(`Intraday endpoint failed for ${request.ticker}, falling back to EOD:`, error.message);
104
+ try {
105
+ return await this.fetchCurrentPriceEod(request);
106
+ } catch (eodError) {
107
+ // Both failed, throw original error
108
+ throw error;
109
+ }
85
110
  }
111
+ throw error;
112
+ }
113
+ }
86
114
 
87
- const response = await plugins.smartrequest.SmartRequest.create()
88
- .url(url)
89
- .timeout(this.config?.timeout || 10000)
90
- .get();
115
+ /**
116
+ * Fetch current price using intraday endpoint (during market hours)
117
+ * Uses 1min interval for most recent data
118
+ */
119
+ private async fetchCurrentPriceIntraday(
120
+ request: IStockCurrentRequest,
121
+ marketState: 'PRE' | 'REGULAR' | 'POST' | 'CLOSED'
122
+ ): Promise<IStockPrice> {
123
+ const formattedSymbol = this.formatSymbolForIntraday(request.ticker);
124
+ let url = `${this.baseUrl}/tickers/${formattedSymbol}/intraday/latest?access_key=${this.apiKey}`;
125
+ url += `&interval=1min`; // Use 1min for most recent data
126
+
127
+ // Add exchange filter if specified
128
+ if (request.exchange) {
129
+ url += `&exchange=${request.exchange}`;
130
+ }
91
131
 
92
- const responseData = await response.json() as any;
132
+ const response = await plugins.smartrequest.SmartRequest.create()
133
+ .url(url)
134
+ .timeout(this.config?.timeout || 10000)
135
+ .get();
93
136
 
94
- // Check for API errors
95
- if (responseData.error) {
96
- throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
97
- }
137
+ const responseData = await response.json() as any;
98
138
 
99
- // For single ticker endpoint, response is direct object (not wrapped in data field)
100
- if (!responseData || !responseData.close) {
101
- throw new Error(`No data found for ticker ${request.ticker}`);
102
- }
139
+ // Check for API errors
140
+ if (responseData.error) {
141
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
142
+ }
103
143
 
104
- return this.mapToStockPrice(responseData, 'eod');
105
- } catch (error) {
106
- this.logger.error(`Failed to fetch current price for ${request.ticker}:`, error);
107
- throw new Error(`Marketstack: Failed to fetch current price for ${request.ticker}: ${error.message}`);
144
+ if (!responseData || !responseData.close) {
145
+ throw new Error(`No intraday data found for ticker ${request.ticker}`);
108
146
  }
147
+
148
+ return this.mapToStockPrice(responseData, 'intraday', marketState);
149
+ }
150
+
151
+ /**
152
+ * Fetch current price using EOD endpoint (after market close)
153
+ */
154
+ private async fetchCurrentPriceEod(request: IStockCurrentRequest): Promise<IStockPrice> {
155
+ let url = `${this.baseUrl}/tickers/${request.ticker}/eod/latest?access_key=${this.apiKey}`;
156
+
157
+ // Add exchange filter if specified
158
+ if (request.exchange) {
159
+ url += `&exchange=${request.exchange}`;
160
+ }
161
+
162
+ const response = await plugins.smartrequest.SmartRequest.create()
163
+ .url(url)
164
+ .timeout(this.config?.timeout || 10000)
165
+ .get();
166
+
167
+ const responseData = await response.json() as any;
168
+
169
+ // Check for API errors
170
+ if (responseData.error) {
171
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
172
+ }
173
+
174
+ // For single ticker endpoint, response is direct object (not wrapped in data field)
175
+ if (!responseData || !responseData.close) {
176
+ throw new Error(`No data found for ticker ${request.ticker}`);
177
+ }
178
+
179
+ return this.mapToStockPrice(responseData, 'eod');
109
180
  }
110
181
 
111
182
  /**
@@ -179,60 +250,210 @@ export class MarketstackProvider implements IStockProvider {
179
250
  }
180
251
 
181
252
  /**
182
- * Fetch intraday prices with specified interval (Phase 2 placeholder)
253
+ * Fetch intraday prices with specified interval
254
+ * Supports intervals: 1min, 5min, 10min, 15min, 30min, 1hour
255
+ * Note: Intervals below 15min require Professional Plan or higher
183
256
  */
184
257
  private async fetchIntradayPrices(request: IStockIntradayRequest): Promise<IStockPrice[]> {
185
- throw new Error('Intraday data support coming in Phase 2. For now, use EOD data with type: "current" or "historical"');
258
+ try {
259
+ const allPrices: IStockPrice[] = [];
260
+ let offset = 0;
261
+ const limit = 1000; // Max per page for intraday
262
+ const maxRecords = 10000; // Safety limit
263
+
264
+ // Format symbol for intraday endpoint (replace . with -)
265
+ const formattedSymbol = this.formatSymbolForIntraday(request.ticker);
266
+
267
+ while (true) {
268
+ let url = `${this.baseUrl}/tickers/${formattedSymbol}/intraday?access_key=${this.apiKey}`;
269
+ url += `&interval=${request.interval}`;
270
+ url += `&limit=${limit}`;
271
+ url += `&offset=${offset}`;
272
+
273
+ // Add date filter if specified
274
+ if (request.date) {
275
+ url += `&date_from=${this.formatDate(request.date)}`;
276
+ url += `&date_to=${this.formatDate(request.date)}`;
277
+ }
278
+
279
+ // Add exchange filter if specified
280
+ if (request.exchange) {
281
+ url += `&exchange=${request.exchange}`;
282
+ }
283
+
284
+ const response = await plugins.smartrequest.SmartRequest.create()
285
+ .url(url)
286
+ .timeout(this.config?.timeout || 15000)
287
+ .get();
288
+
289
+ const responseData = await response.json() as any;
290
+
291
+ // Check for API errors
292
+ if (responseData.error) {
293
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
294
+ }
295
+
296
+ if (!responseData?.data || !Array.isArray(responseData.data)) {
297
+ throw new Error('Invalid response format from Marketstack API');
298
+ }
299
+
300
+ // Map data to stock prices
301
+ for (const data of responseData.data) {
302
+ try {
303
+ allPrices.push(this.mapToStockPrice(data, 'intraday'));
304
+ } catch (error) {
305
+ this.logger.warn(`Failed to parse intraday data for ${data.symbol}:`, error);
306
+ }
307
+ }
308
+
309
+ // Check if we have more pages
310
+ const pagination = responseData.pagination;
311
+ const hasMore = pagination && offset + limit < pagination.total;
312
+
313
+ // Honor limit from request if specified, or safety limit
314
+ if (!hasMore || (request.limit && allPrices.length >= request.limit) || allPrices.length >= maxRecords) {
315
+ break;
316
+ }
317
+
318
+ offset += limit;
319
+ }
320
+
321
+ // Apply limit if specified
322
+ if (request.limit && allPrices.length > request.limit) {
323
+ return allPrices.slice(0, request.limit);
324
+ }
325
+
326
+ return allPrices;
327
+ } catch (error) {
328
+ this.logger.error(`Failed to fetch intraday prices for ${request.ticker}:`, error);
329
+ throw new Error(`Marketstack: Failed to fetch intraday prices for ${request.ticker}: ${error.message}`);
330
+ }
186
331
  }
187
332
 
188
333
  /**
189
- * Fetch current prices for multiple tickers (new API)
334
+ * Fetch current prices for multiple tickers with intelligent endpoint selection
335
+ * Uses intraday during market hours (PRE, REGULAR, POST) for fresh data
336
+ * Uses EOD after market close (CLOSED) to save API credits
190
337
  */
191
338
  private async fetchBatchCurrentPrices(request: IStockBatchCurrentRequest): Promise<IStockPrice[]> {
192
339
  try {
193
- const symbols = request.tickers.join(',');
194
- let url = `${this.baseUrl}/eod/latest?access_key=${this.apiKey}&symbols=${symbols}`;
195
-
196
- if (request.exchange) {
197
- url += `&exchange=${request.exchange}`;
340
+ // Determine current market state
341
+ const marketState = this.getUsMarketState();
342
+ const useIntraday = this.shouldUseIntradayEndpoint(marketState);
343
+
344
+ if (useIntraday) {
345
+ return await this.fetchBatchCurrentPricesIntraday(request, marketState);
346
+ } else {
347
+ return await this.fetchBatchCurrentPricesEod(request);
198
348
  }
349
+ } catch (error) {
350
+ // Fallback to EOD if intraday fails
351
+ if (error.message?.includes('intraday') || error.message?.includes('Marketstack API error')) {
352
+ this.logger.warn(`Intraday batch endpoint failed, falling back to EOD:`, error.message);
353
+ try {
354
+ return await this.fetchBatchCurrentPricesEod(request);
355
+ } catch (eodError) {
356
+ // Both failed, throw original error
357
+ throw error;
358
+ }
359
+ }
360
+ throw error;
361
+ }
362
+ }
199
363
 
200
- const response = await plugins.smartrequest.SmartRequest.create()
201
- .url(url)
202
- .timeout(this.config?.timeout || 15000)
203
- .get();
364
+ /**
365
+ * Fetch batch current prices using intraday endpoint
366
+ */
367
+ private async fetchBatchCurrentPricesIntraday(
368
+ request: IStockBatchCurrentRequest,
369
+ marketState: 'PRE' | 'REGULAR' | 'POST' | 'CLOSED'
370
+ ): Promise<IStockPrice[]> {
371
+ // Format symbols for intraday (replace . with -)
372
+ const formattedSymbols = request.tickers.map(t => this.formatSymbolForIntraday(t)).join(',');
373
+
374
+ let url = `${this.baseUrl}/intraday/latest?access_key=${this.apiKey}`;
375
+ url += `&symbols=${formattedSymbols}`;
376
+ url += `&interval=1min`; // Use 1min for most recent data
377
+
378
+ if (request.exchange) {
379
+ url += `&exchange=${request.exchange}`;
380
+ }
204
381
 
205
- const responseData = await response.json() as any;
382
+ const response = await plugins.smartrequest.SmartRequest.create()
383
+ .url(url)
384
+ .timeout(this.config?.timeout || 15000)
385
+ .get();
206
386
 
207
- // Check for API errors
208
- if (responseData.error) {
209
- throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
210
- }
387
+ const responseData = await response.json() as any;
211
388
 
212
- if (!responseData?.data || !Array.isArray(responseData.data)) {
213
- throw new Error('Invalid response format from Marketstack API');
214
- }
389
+ if (responseData.error) {
390
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
391
+ }
215
392
 
216
- const prices: IStockPrice[] = [];
393
+ if (!responseData?.data || !Array.isArray(responseData.data)) {
394
+ throw new Error('Invalid response format from Marketstack API');
395
+ }
217
396
 
218
- for (const data of responseData.data) {
219
- try {
220
- prices.push(this.mapToStockPrice(data, 'eod'));
221
- } catch (error) {
222
- this.logger.warn(`Failed to parse data for ${data.symbol}:`, error);
223
- // Continue processing other tickers
224
- }
397
+ const prices: IStockPrice[] = [];
398
+
399
+ for (const data of responseData.data) {
400
+ try {
401
+ prices.push(this.mapToStockPrice(data, 'intraday', marketState));
402
+ } catch (error) {
403
+ this.logger.warn(`Failed to parse intraday data for ${data.symbol}:`, error);
225
404
  }
405
+ }
406
+
407
+ if (prices.length === 0) {
408
+ throw new Error('No valid price data received from batch intraday request');
409
+ }
226
410
 
227
- if (prices.length === 0) {
228
- throw new Error('No valid price data received from batch request');
411
+ return prices;
412
+ }
413
+
414
+ /**
415
+ * Fetch batch current prices using EOD endpoint
416
+ */
417
+ private async fetchBatchCurrentPricesEod(request: IStockBatchCurrentRequest): Promise<IStockPrice[]> {
418
+ const symbols = request.tickers.join(',');
419
+ let url = `${this.baseUrl}/eod/latest?access_key=${this.apiKey}&symbols=${symbols}`;
420
+
421
+ if (request.exchange) {
422
+ url += `&exchange=${request.exchange}`;
423
+ }
424
+
425
+ const response = await plugins.smartrequest.SmartRequest.create()
426
+ .url(url)
427
+ .timeout(this.config?.timeout || 15000)
428
+ .get();
429
+
430
+ const responseData = await response.json() as any;
431
+
432
+ // Check for API errors
433
+ if (responseData.error) {
434
+ throw new Error(`Marketstack API error: ${responseData.error.message || JSON.stringify(responseData.error)}`);
435
+ }
436
+
437
+ if (!responseData?.data || !Array.isArray(responseData.data)) {
438
+ throw new Error('Invalid response format from Marketstack API');
439
+ }
440
+
441
+ const prices: IStockPrice[] = [];
442
+
443
+ for (const data of responseData.data) {
444
+ try {
445
+ prices.push(this.mapToStockPrice(data, 'eod'));
446
+ } catch (error) {
447
+ this.logger.warn(`Failed to parse data for ${data.symbol}:`, error);
448
+ // Continue processing other tickers
229
449
  }
450
+ }
230
451
 
231
- return prices;
232
- } catch (error) {
233
- this.logger.error(`Failed to fetch batch current prices:`, error);
234
- throw new Error(`Marketstack: Failed to fetch batch current prices: ${error.message}`);
452
+ if (prices.length === 0) {
453
+ throw new Error('No valid price data received from batch request');
235
454
  }
455
+
456
+ return prices;
236
457
  }
237
458
 
238
459
  /**
@@ -283,8 +504,15 @@ export class MarketstackProvider implements IStockProvider {
283
504
 
284
505
  /**
285
506
  * Map Marketstack API response to IStockPrice interface
507
+ * @param data - API response data
508
+ * @param dataType - Type of data (eod, intraday, live)
509
+ * @param explicitMarketState - Override market state (used for intraday data fetched during known market hours)
286
510
  */
287
- private mapToStockPrice(data: any, dataType: 'eod' | 'intraday' | 'live' = 'eod'): IStockPrice {
511
+ private mapToStockPrice(
512
+ data: any,
513
+ dataType: 'eod' | 'intraday' | 'live' = 'eod',
514
+ explicitMarketState?: 'PRE' | 'REGULAR' | 'POST' | 'CLOSED'
515
+ ): IStockPrice {
288
516
  if (!data.close) {
289
517
  throw new Error('Missing required price data');
290
518
  }
@@ -301,6 +529,23 @@ export class MarketstackProvider implements IStockProvider {
301
529
  const timestamp = data.date ? new Date(data.date) : new Date();
302
530
  const fetchedAt = new Date();
303
531
 
532
+ // Determine market state intelligently
533
+ let marketState: 'PRE' | 'REGULAR' | 'POST' | 'CLOSED';
534
+
535
+ if (explicitMarketState) {
536
+ // Use provided market state (for intraday data fetched during known market hours)
537
+ marketState = explicitMarketState;
538
+ } else if (dataType === 'eod') {
539
+ // EOD data is always for closed markets
540
+ marketState = 'CLOSED';
541
+ } else if (dataType === 'intraday') {
542
+ // For intraday data without explicit state, determine from timestamp
543
+ marketState = this.getUsMarketState(timestamp.getTime());
544
+ } else {
545
+ // Default fallback
546
+ marketState = 'CLOSED';
547
+ }
548
+
304
549
  const stockPrice: IStockPrice = {
305
550
  ticker: data.symbol.toUpperCase(),
306
551
  price: currentPrice,
@@ -310,7 +555,7 @@ export class MarketstackProvider implements IStockProvider {
310
555
  previousClose: previousClose,
311
556
  timestamp: timestamp,
312
557
  provider: this.name,
313
- marketState: 'CLOSED', // EOD data is always for closed markets
558
+ marketState: marketState, // Now dynamic based on data type, timestamp, and explicit state
314
559
  exchange: data.exchange,
315
560
  exchangeName: data.exchange_code || data.name,
316
561
 
@@ -373,4 +618,76 @@ export class MarketstackProvider implements IStockProvider {
373
618
  const day = String(date.getDate()).padStart(2, '0');
374
619
  return `${year}-${month}-${day}`;
375
620
  }
621
+
622
+ /**
623
+ * Get US market state based on Eastern Time
624
+ * Regular hours: 9:30 AM - 4:00 PM ET
625
+ * Pre-market: 4:00 AM - 9:30 AM ET
626
+ * After-hours: 4:00 PM - 8:00 PM ET
627
+ *
628
+ * @param timestampMs - Optional timestamp in milliseconds (defaults to current time)
629
+ * @returns Market state: PRE, REGULAR, POST, or CLOSED
630
+ */
631
+ private getUsMarketState(timestampMs?: number): 'PRE' | 'REGULAR' | 'POST' | 'CLOSED' {
632
+ const now = timestampMs ? new Date(timestampMs) : new Date();
633
+
634
+ // Convert to ET (UTC-5 or UTC-4 depending on DST)
635
+ // For simplicity, we'll use a rough approximation
636
+ // TODO: Add proper timezone library for production use
637
+ const etOffset = -5; // Standard time, adjust for DST if needed
638
+ const etTime = new Date(now.getTime() + (etOffset * 60 * 60 * 1000));
639
+
640
+ // Get day of week (0 = Sunday, 6 = Saturday)
641
+ const dayOfWeek = etTime.getUTCDay();
642
+
643
+ // Check if weekend
644
+ if (dayOfWeek === 0 || dayOfWeek === 6) {
645
+ return 'CLOSED';
646
+ }
647
+
648
+ // Get hour and minute in ET
649
+ const hours = etTime.getUTCHours();
650
+ const minutes = etTime.getUTCMinutes();
651
+ const timeInMinutes = hours * 60 + minutes;
652
+
653
+ // Define market hours in minutes
654
+ const preMarketStart = 4 * 60; // 4:00 AM
655
+ const regularMarketStart = 9 * 60 + 30; // 9:30 AM
656
+ const regularMarketEnd = 16 * 60; // 4:00 PM
657
+ const afterHoursEnd = 20 * 60; // 8:00 PM
658
+
659
+ if (timeInMinutes >= preMarketStart && timeInMinutes < regularMarketStart) {
660
+ return 'PRE';
661
+ } else if (timeInMinutes >= regularMarketStart && timeInMinutes < regularMarketEnd) {
662
+ return 'REGULAR';
663
+ } else if (timeInMinutes >= regularMarketEnd && timeInMinutes < afterHoursEnd) {
664
+ return 'POST';
665
+ } else {
666
+ return 'CLOSED';
667
+ }
668
+ }
669
+
670
+ /**
671
+ * Determine if intraday endpoint should be used based on market state
672
+ * Uses intraday for PRE, REGULAR, and POST market states
673
+ * Uses EOD for CLOSED state to save API credits
674
+ *
675
+ * @param marketState - Current market state
676
+ * @returns true if intraday endpoint should be used
677
+ */
678
+ private shouldUseIntradayEndpoint(marketState: 'PRE' | 'REGULAR' | 'POST' | 'CLOSED'): boolean {
679
+ return marketState !== 'CLOSED';
680
+ }
681
+
682
+ /**
683
+ * Format ticker symbol for intraday endpoints
684
+ * Marketstack intraday API requires periods to be replaced with hyphens
685
+ * Example: BRK.B → BRK-B
686
+ *
687
+ * @param symbol - Original ticker symbol
688
+ * @returns Formatted symbol for intraday endpoints
689
+ */
690
+ private formatSymbolForIntraday(symbol: string): string {
691
+ return symbol.replace(/\./g, '-');
692
+ }
376
693
  }