@mzzsfy/dsh-stock-assistant 0.3.1 → 0.3.2

package/src/collector.mjs

@@ -1,13 +1,15 @@
 import { StockError, fail, makeSecurity } from './market-model.mjs'
 // 报价时间距获取时间不超过该秒数视为实时; 免凭据公开源常缺延迟声明, 由时间戳差派生
 const REALTIME_WINDOW_SECONDS = 90
-// 适配器未声明延迟但带报价时间时, 按时差派生 delayKind; 缺时间戳保持 unknown 不编造
-export function deriveDelay(quote, now) {
+// 适配器未声明延迟但带报价时间时, 按时差派生 delayKind; 缺时间戳保持 unknown 不编造。
+// 非交易时段(休市/午休/未开盘)报价停在最后成交那一刻, 时差是"多久没新数据"而不是"数据延迟", 单独标 closed 交给界面报时间点。
+export function deriveDelay(quote, now, trading = true) {
   if (quote.delayKind !== 'unknown' || !quote.quoteAt) return quote
   const lagSeconds = Math.max(0, Math.round((now() - Date.parse(quote.quoteAt)) / 1000))
   if (!Number.isFinite(lagSeconds)) return quote
-  if (lagSeconds <= REALTIME_WINDOW_SECONDS) quote.delayKind = 'realtime'
-  else { quote.delayKind = 'delayed'; quote.delaySeconds = lagSeconds }
+  if (lagSeconds <= REALTIME_WINDOW_SECONDS) { quote.delayKind = 'realtime'; return quote }
+  if (!trading) { quote.delayKind = 'closed'; quote.delaySeconds = null; return quote }
+  quote.delayKind = 'delayed'; quote.delaySeconds = lagSeconds
   return quote
 }
 const BUSINESS = entry => JSON.stringify(entry && { ...entry, lastAttemptAt: undefined, quote: entry.quote && { ...entry.quote, receivedAt: undefined } })
@@ -15,6 +17,12 @@ export function createCollector({ getControl, router, registry, executor, resolv
   const quotes = new Map(), marketPhases = new Map(), flights = new Map(), rounds = new Map(), blocked = new Map(), failures = new Map(), controllers = new Set()
   let generation = 0, timer, stopped = false, lastStart = -Infinity, manualWaiters = 0
   const entries = () => Object.fromEntries([...quotes].map(([id, value]) => [id, structuredClone(value)]))
+  // 缓存新鲜度: 全部自选都有未过期报价才算新鲜, 用于进入面板时跳过重复拉取
+  const freshWithin = ms => {
+    const order = getControl().watchlist.order
+    if (!order.length) return false
+    return order.every(id => { const quote = quotes.get(id)?.quote; return quote && Number.isFinite(quote.receivedAt) && now() - quote.receivedAt < ms })
+  }
   function apply(id, entry) {
     const before = quotes.get(id)
     quotes.set(id, entry); touched()
@@ -42,7 +50,9 @@ export function createCollector({ getControl, router, registry, executor, resolv
         for (const quote of result.items) {
           if (!requested.has(quote.securityId)) continue
           if (map.has(quote.securityId) || quote.providerInstanceId !== instance.id) fail('BAD_PAYLOAD', '报价身份或来源冲突', 502)
-          deriveDelay(quote, now)
+          // 只有明确处于非交易时段才改口径; 日历缺失(unknown)不能当成休市, 否则等于凭空断言收盘
+          const marketState = calendarState(securities.find(s => s.id === quote.securityId)?.exchange).state
+          deriveDelay(quote, now, marketState === 'unknown' || marketState === 'trading' || marketState === 'auction')
           if (quote.delayKind === 'unknown' && !route.acceptUnknownDelay) fail('BAD_PAYLOAD', '路由不接受未知延迟行情', 422)
           if (route.maxDelaySeconds !== null && quote.delayKind !== 'unknown' && quote.delaySeconds > route.maxDelaySeconds) fail('BAD_PAYLOAD', '报价延迟超过路由限制', 422)
           map.set(quote.securityId, quote)
@@ -152,7 +162,7 @@ export function createCollector({ getControl, router, registry, executor, resolv
     timer = timers.setTimeout(() => { refresh(undefined, { periodic: true }).catch(() => {}).finally(reconcile) }, Math.max(1000, wake - now())); timer?.unref?.()
   }
   return {
-    refresh, entries, reconcile,
+    refresh, entries, reconcile, freshWithin,
     resume() { blocked.clear(); failures.clear(); reconcile() },
     reset() { generation++; for (const c of controllers) c.abort(); flights.clear(); quotes.clear(); marketPhases.clear(); blocked.clear(); failures.clear(); lastStart = -Infinity; touched(); changed(); reconcile() },
     cancelIdle() { timers.clearTimeout(timer); if (!active() && !manualWaiters) for (const c of controllers) c.abort() },

package/src/market-model.mjs

@@ -1,14 +1,32 @@
 // 每市场的币种/时区/价格精度/代码形态/探针门控——securitySchema 与 makeSecurity 的派生源(来源标注见 design.md)
+// sessions 是该市场连续竞价的时段(市场本地时间), 用来判断报价此刻处在交易中/午休/休市;
+// 只描述周内时点, 法定节假日仍以数据本身(最后一根K线的日期)为准。
 export const MARKET_META = {
-  XSHG: { currency: 'CNY', timezone: 'Asia/Shanghai', priceScale: 2, codePattern: /^\d{6}$/, verifiedByDefault: true },
-  XSHE: { currency: 'CNY', timezone: 'Asia/Shanghai', priceScale: 2, codePattern: /^\d{6}$/, verifiedByDefault: true },
-  XHKG: { currency: 'HKD', timezone: 'Asia/Hong_Kong', priceScale: 2, codePattern: /^\d{4,5}$/, verifiedByDefault: true },
-  XNAS: { currency: 'USD', timezone: 'America/New_York', priceScale: 2, codePattern: /^[A-Z]{1,5}$/, verifiedByDefault: true },
-  XNYS: { currency: 'USD', timezone: 'America/New_York', priceScale: 2, codePattern: /^[A-Z]{1,5}$/, verifiedByDefault: true },
-  XJPX: { currency: 'JPY', timezone: 'Asia/Tokyo', priceScale: 0, codePattern: /^\d{4}$/, verifiedByDefault: true },
-  XKRX: { currency: 'KRW', timezone: 'Asia/Seoul', priceScale: 0, codePattern: /^\d{6}$/, verifiedByDefault: true },
-  XLON: { currency: 'GBP', timezone: 'Europe/London', priceScale: 2, codePattern: /^[A-Z0-9.]{1,10}$/, verifiedByDefault: true },
+  XSHG: { currency: 'CNY', timezone: 'Asia/Shanghai', priceScale: 2, codePattern: /^\d{6}$/, verifiedByDefault: true, sessions: [['09:30', '11:30'], ['13:00', '15:00']] },
+  XSHE: { currency: 'CNY', timezone: 'Asia/Shanghai', priceScale: 2, codePattern: /^\d{6}$/, verifiedByDefault: true, sessions: [['09:30', '11:30'], ['13:00', '15:00']] },
+  XHKG: { currency: 'HKD', timezone: 'Asia/Hong_Kong', priceScale: 2, codePattern: /^\d{4,5}$/, verifiedByDefault: true, sessions: [['09:30', '12:00'], ['13:00', '16:00']] },
+  XNAS: { currency: 'USD', timezone: 'America/New_York', priceScale: 2, codePattern: /^[A-Z]{1,5}$/, verifiedByDefault: true, sessions: [['09:30', '16:00']] },
+  XNYS: { currency: 'USD', timezone: 'America/New_York', priceScale: 2, codePattern: /^[A-Z]{1,5}$/, verifiedByDefault: true, sessions: [['09:30', '16:00']] },
+  XJPX: { currency: 'JPY', timezone: 'Asia/Tokyo', priceScale: 0, codePattern: /^\d{4}$/, verifiedByDefault: true, sessions: [['09:00', '11:30'], ['12:30', '15:30']] },
+  XKRX: { currency: 'KRW', timezone: 'Asia/Seoul', priceScale: 0, codePattern: /^\d{6}$/, verifiedByDefault: true, sessions: [['09:00', '15:30']] },
+  XLON: { currency: 'GBP', timezone: 'Europe/London', priceScale: 2, codePattern: /^[A-Z0-9.]{1,10}$/, verifiedByDefault: true, sessions: [['08:00', '16:30']] },
 }
+// 报价此刻落在市场交易日的哪个阶段; 周末恒为休市, 节假日不做推断(没有日历能力时会误判)
+export function sessionStateOf(exchange, nowMs) {
+  const meta = MARKET_META[exchange]
+  if (!meta?.sessions?.length) return 'unknown'
+  const parts = new Intl.DateTimeFormat('en-US', { timeZone: meta.timezone, hour12: false, weekday: 'short', hour: '2-digit', minute: '2-digit' }).formatToParts(new Date(nowMs))
+  const pick = type => parts.find(part => part.type === type)?.value
+  if (pick('weekday') === 'Sat' || pick('weekday') === 'Sun') return 'closed'
+  const minutes = (Number(pick('hour')) % 24) * 60 + Number(pick('minute'))
+  const bounds = meta.sessions.map(([from, to]) => [toMinutes(from), toMinutes(to)])
+  if (minutes < bounds[0][0]) return 'preopen'
+  if (bounds.some(([from, to]) => minutes >= from && minutes < to)) return 'trading'
+  // 午休只存在于两段之间: 只比前一段的收尾会把收盘后也算成午休
+  if (bounds.some(([, to], index) => index < bounds.length - 1 && minutes >= to && minutes < bounds[index + 1][0])) return 'break'
+  return 'closed'
+}
+const toMinutes = stamp => { const [hh, mm] = stamp.split(':').map(Number); return hh * 60 + mm }
 
 export function securityId(exchange, code, instrument = 'equity') {
   const meta = MARKET_META[exchange]
@@ -22,12 +40,15 @@ export function parseSecurityId(securityIdValue) {
   if (parts.length !== 3 || instrument !== 'equity' || !MARKET_META[exchange]) throw new Error('不支持的证券身份')
   return { exchange, instrument, code: securityId(exchange, code, instrument).split(':')[2], meta: MARKET_META[exchange] }
 }
+// 定点基准是分;来源允许多于两位小数(美股常见三位),超出部分四舍五入到分
 function cents(value) {
   if (value === null || value === undefined || value === '') return null
   const text = String(value)
-  if (!/^\d+(?:\.\d{1,2})?$/.test(text)) return null
-  const [whole, fraction = ''] = text.split('.')
-  const n = BigInt(whole) * 100n + BigInt(fraction.padEnd(2, '0'))
+  const match = /^(\d+)(?:\.(\d{1,6}))?$/.exec(text)
+  if (!match) return null
+  const [, whole, fraction = ''] = match
+  let n = BigInt(whole) * 100n + BigInt(fraction.slice(0, 2).padEnd(2, '0'))
+  if (fraction.length > 2 && Number(fraction[2]) >= 5) n += 1n
   return n > 0n ? n : null
 }
 function decimal(n) {
@@ -61,6 +82,13 @@ export function makeSecurity(exchange, code, officialName, extra = {}) {
   return { ...extra, id: securityId(exchange, code), exchange, code, officialName, instrument: 'equity', currency: meta.currency, timezone: meta.timezone, priceScale: meta.priceScale, listingStatus: 'listed' }
 }
 
+// 成交量单位换算: 沪深来源按手报价(1 手 = 100 股), 港美来源直接给股。对外统一按股呈现。
+export const LOTS_EXCHANGES = new Set(['XSHG', 'XSHE'])
+export const sharesFromLots = (volume, exchange) => (volume === null || volume === undefined ? null : LOTS_EXCHANGES.has(exchange) ? volume * 100 : volume)
+// 成交额单位换算: 沪深来源按万元给, 港美来源直接给元。
+export const LOTS_AMOUNT_EXCHANGES = new Set(['XSHG', 'XSHE'])
+export const amountFromWan = (amount, exchange) => (amount === null || amount === undefined ? null : LOTS_AMOUNT_EXCHANGES.has(exchange) ? Math.round(amount * 10000) : amount)
+
 export class StockError extends Error {
   constructor(code, message, status = 400, extra = {}) {
     super(message)

package/src/providers/eastmoney.mjs

@@ -1,5 +1,5 @@
 // 东财公开行情接口适配器:quotes/catalog/search/kline。非官方端点,无SLA;延迟未知,f124为来源秒级时间戳。
-import { normalizeQuote, makeSecurity, securityId, StockError, MARKET_META } from '../market-model.mjs'
+import { normalizeQuote, makeSecurity, securityId, StockError, MARKET_META, sharesFromLots } from '../market-model.mjs'
 // 官方默认端点表(key 供 instance.endpoints 覆盖, 反代/镜像场景由 ctx.endpoints 提供同名 key)
 const DEFAULT_ENDPOINTS = {
   quotes: 'https://push2.eastmoney.com/api/qt/ulist.np/get',
@@ -11,19 +11,25 @@ const DEFAULT_ENDPOINTS = {
 const endpointOf = (ctx, key) => ctx.endpoints?.[key] || DEFAULT_ENDPOINTS[key]
 // 东财市场代码:XSHG=1,XSHE=0;美股 secid 前缀由搜索 MktNum 动态归属(usSymbols),其余市场实测前缀。
 const MARKET = { XSHG: '1', XSHE: '0' }
-// 搜索联想 MktNum→交易所全集(实测: 1/0 沪深, 116 港, 105/106/107 美三大)
-const SEARCH_EXCHANGE = { 1: 'XSHG', 0: 'XSHE', 116: 'XHKG', 105: 'XNAS', 106: 'XNYS', 107: 'XNYS' }
+// 搜索联想 MktNum→交易所全集(实测: 1/0 沪深, 116 港, 105/106/107 美三大, 176/177/155 日韩英)
+const SEARCH_EXCHANGE = { 1: 'XSHG', 0: 'XSHE', 116: 'XHKG', 105: 'XNAS', 106: 'XNYS', 107: 'XNYS', 176: 'XJPX', 177: 'XKRX', 155: 'XLON' }
 const SECID_PREFIX = { XSHG: '1', XSHE: '0', XHKG: '116', XNAS: '105', XNYS: '106', XJPX: '176', XKRX: '177', XLON: '155' }
 const US_DEFAULT_MKT = '105'
+// 美股三大市场号: 105 纳斯达克 / 106 纽约 / 107 美交所。secid 前缀必须精确匹配, 探针期据此逐个试探。
+const US_MKTNUMS = ['105', '106', '107']
+const isUSExchange = exchange => exchange === 'XNAS' || exchange === 'XNYS'
 // klt 周期映射(实测): 日101/周102/月103; trends2 无 klt。
 const KLT = { '1d': 101, '1w': 102, '1M': 103 }
-const LIST_FS = { XSHG: 'm:1+t:2,m:1+t:23', XSHE: 'm:0+t:6,m:0+t:80', XHKG: 'm:116+t:3,m:116+t:4', XNAS: 'm:105+t:1', XNYS: 'm:106+t:1,m:107+t:1' }
-const SYMBOL_PREFIX = { 1: 'XSHG', 0: 'XSHE', 116: 'XHKG', 105: 'XNAS', 106: 'XNYS', 107: 'XNYS' }
+// 目录 fs 按市场给出; 英股 m:155 含债券与结构性产品, 加 t:1 只取股票; 日韩不支持 t: 细分, 全量即股票
+const LIST_FS = { XSHG: 'm:1+t:2,m:1+t:23', XSHE: 'm:0+t:6,m:0+t:80', XHKG: 'm:116+t:3,m:116+t:4', XNAS: 'm:105+t:1', XNYS: 'm:106+t:1,m:107+t:1', XJPX: 'm:176', XKRX: 'm:177', XLON: 'm:155+t:1' }
+const SYMBOL_PREFIX = { 1: 'XSHG', 0: 'XSHE', 116: 'XHKG', 105: 'XNAS', 106: 'XNYS', 107: 'XNYS', 176: 'XJPX', 177: 'XKRX', 155: 'XLON' }
 // 探针代表证券(实测可用的各市场流动性代表),quotes/kline 探针按市场取用。
 const PROBE_SECURITY = { XSHG: '600519', XSHE: '000001', XHKG: '00700', XNAS: 'AAPL', XNYS: 'BABA', XJPX: '7203', XKRX: '005930', XLON: 'SHEL' }
 // klines CSV 前 7 列固定语义(实测 fields2=f51-f57); f53=close 在 f54=high 前为东财原生序。
 const KLINE_FIELDS = 'f51,f52,f53,f54,f55,f56,f57'
 const TREND_FIELDS = 'f51,f52,f53,f54,f55,f56,f57,f58'
+// 分时时间戳的来源时区: 东财统一用北京时间, 与证券所属市场无关
+const SOURCE_ZONE = 'Asia/Shanghai'
 // quotes secid 与 kline secidOf 同源(八市场前缀表);美股 quotes 同样走 usSymbols 动态归属。
 const symbolOf = security => `${SECID_PREFIX[security.exchange]}.${security.code}`
 const num = value => value == null || typeof value === 'number' && !Number.isFinite(value) ? null : value === '-' ? null : String(value)
@@ -40,7 +46,7 @@ async function getJson(ctx, url) {
   return response.json().catch(() => { throw new StockError('BAD_PAYLOAD', '来源响应不是JSON', 502) })
 }
 export const eastmoney = {
-  descriptor: { adapterId: 'eastmoney', capabilities: ['quotes', 'catalog', 'search', 'kline'], markets: ['XSHG', 'XSHE', 'XHKG', 'XNAS', 'XNYS', 'XJPX', 'XKRX', 'XLON'], instruments: ['equity'], maxQuoteBatch: 60, credential: 'none', description: '东方财富公开接口：免凭据，沪深港美目录，八市场行情/K线/搜索，非官方无SLA', endpointKeys: [{ key: 'quotes', label: '行情批量' }, { key: 'list', label: '证券目录' }, { key: 'search', label: '搜索联想' }, { key: 'kline', label: 'K线历史' }, { key: 'trend', label: '分时' }] },
+  descriptor: { adapterId: 'eastmoney', capabilities: ['quotes', 'catalog', 'search', 'kline'], markets: ['XSHG', 'XSHE', 'XHKG', 'XNAS', 'XNYS', 'XJPX', 'XKRX', 'XLON'], instruments: ['equity'], maxQuoteBatch: 60, credential: 'none', description: '东方财富公开接口：免凭据，八市场目录，行情/K线/搜索，非官方无SLA', endpointKeys: [{ key: 'quotes', label: '行情批量' }, { key: 'list', label: '证券目录' }, { key: 'search', label: '搜索联想' }, { key: 'kline', label: 'K线历史' }, { key: 'trend', label: '分时' }] },
   async probe(request, ctx) {
     if (request.capability === 'catalog' || request.capability === 'search') {
       // 探针词按市场用代表证券代码(茅台/平安只对沪深有效, 其他市场返回 0 项会误判 denied)。
@@ -55,14 +61,19 @@ export const eastmoney = {
       if (!result.candles.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
       return { status: 'ready', capability: 'kline', market: request.market, instrument: 'equity' }
     }
+    // 美股 secid 前缀由搜索建立的映射决定, 探针期还没有映射; 逐个候选前缀试一次, 命中即视为就绪
     const security = request.securities?.[0] || { exchange: request.market, code: PROBE_SECURITY[request.market] || '000001' }
-    const rows = await this.quotes({ ...request, securities: [security] }, ctx)
-    if (!rows.items.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
-    return { status: 'ready', capability: 'quotes', market: request.market, instrument: 'equity' }
+    const candidates = isUSExchange(security.exchange) ? US_MKTNUMS : [null]
+    for (const mktNum of candidates) {
+      const scope = mktNum ? { ...ctx, usSymbols: new Map([[`US:${security.code}`, { mktNum, at: ctx.now() }]]) } : ctx
+      const rows = await this.quotes({ ...request, securities: [security] }, scope)
+      if (rows.items.length) return { status: 'ready', capability: 'quotes', market: request.market, instrument: 'equity' }
+    }
+    throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
   },
   async quotes(request, ctx) {
     // 美股 secid 走 usSymbols 动态归属(miss 默认 NASDAQ);其余市场静态前缀表。
-    const secidOf = security => (security.exchange === 'XNAS' || security.exchange === 'XNYS') ? `${ctx.usSymbols?.get(`US:${security.code}`)?.mktNum || US_DEFAULT_MKT}.${security.code}` : `${SECID_PREFIX[security.exchange]}.${security.code}`
+    const secidOf = security => isUSExchange(security.exchange) ? `${ctx.usSymbols?.get(`US:${security.code}`)?.mktNum || US_DEFAULT_MKT}.${security.code}` : `${SECID_PREFIX[security.exchange]}.${security.code}`
     const symbols = new Map(request.securities.map(s => [secidOf(s), s]))
     const body = await getJson(ctx, `${endpointOf(ctx, 'quotes')}?secids=${[...symbols.keys()].join(',')}&fields=f2,f3,f4,f5,f6,f12,f13,f14,f15,f16,f17,f18,f124&fltt=2&invt=2`)
     const rows = body?.data?.diff
@@ -80,7 +91,7 @@ export const eastmoney = {
       items.push(normalizeQuote({
         securityId: security.id, providerInstanceId: request.providerInstanceId, adapterId: 'eastmoney', providerSymbol: `${row.f13}.${row.f12}`,
         last: num(row.f2), previousClose: num(row.f18), open: num(row.f17), high: num(row.f15), low: num(row.f16),
-        volume: num(row.f5), volumeUnit: 'share', amount: num(row.f6), amountUnit: currency,
+        volume: sharesFromLots(num(row.f5), security.exchange), volumeUnit: 'share', amount: num(row.f6), amountUnit: currency,
         quoteAt, timestampKind: 'trade',
         receivedAt: ctx.now(), delayKind: 'unknown', delaySeconds: null, securityState: 'unknown',
       }))
@@ -115,16 +126,18 @@ export const eastmoney = {
     return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items, errors: [], complete }
   },
   async search(request, ctx) {
-    const url = `${endpointOf(ctx, 'search')}?input=${encodeURIComponent(request.q)}&type=14&token=D43BF722C8E33BDC906FB84D85E326E8&count=${Math.min(20, request.limit || 10)}`
+    // 不限市场时扩大候选量: 单次响应要覆盖调用方负责的多个市场
+    const count = request.market ? Math.min(20, request.limit || 10) : Math.min(50, (request.limit || 10) * 3)
+    const url = `${endpointOf(ctx, 'search')}?input=${encodeURIComponent(request.q)}&type=14&token=D43BF722C8E33BDC906FB84D85E326E8&count=${count}`
     const body = await getJson(ctx, url)
     const rows = body?.QuotationCodeTable?.Data
     if (!Array.isArray(rows)) return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items: [], errors: [] }
     const items = []
     for (const row of rows) {
       const exchange = SEARCH_EXCHANGE[row.MktNum]
-      if (!exchange || exchange !== request.market) continue
+      if (!exchange || (request.market && exchange !== request.market)) continue
       // 美股候选写 usSymbols(代码→MktNum/JYS), kline 美股动态归属与腾讯 suffix 唯一数据来源
-      if ((exchange === 'XNAS' || exchange === 'XNYS') && ctx.usSymbols && ['105', '106', '107'].includes(row.MktNum)) ctx.usSymbols.set(`US:${row.Code}`, { mktNum: row.MktNum, jys: row.JYS || null, at: ctx.now() })
+      if (isUSExchange(exchange) && ctx.usSymbols && US_MKTNUMS.includes(String(row.MktNum))) ctx.usSymbols.set(`US:${row.Code}`, { mktNum: row.MktNum, jys: row.JYS || null, at: ctx.now() })
       const meta = MARKET_META[exchange]
       if (!meta || !meta.codePattern.test(row.Code)) continue
       items.push(makeSecurity(exchange, row.Code, row.Name, { cnspell: typeof row.PinYin === 'string' ? row.PinYin.toLowerCase() : '', catalogSource: request.providerInstanceId }))
@@ -169,12 +182,16 @@ export const eastmoney = {
     const url = `${endpointOf(ctx, 'trend')}?secid=${secid}&fields1=f1,f2,f3,f4,f5,f6,f7,f8&fields2=${TREND_FIELDS}&iscr=0&ndays=1`
     const body = await getJson(ctx, url)
     if (!body?.data?.trends) throw new StockError('NO_DATA', '来源未返回此证券分时', 422)
+    // 东财分时的时间戳一律按北京时间给出(八市场实测: 日股 08:00 对应东京 09:00 开盘, 英股 16:00 对应伦敦 08:00),
+    // 不是市场本地时间; 之前按市场时区解释, 日韩英的横轴整体偏了几小时。
     const candles = body.data.trends.map(row => {
       const cols = row.split(',')
       if (cols.length < 8) throw new StockError('BAD_PAYLOAD', '分时列数不足', 502)
       const [, time] = cols[0].split(' ')
       const num = v => { const n = parseFloat(v); return Number.isFinite(n) ? n : null }
-      return { time, open: num(cols[1]), close: num(cols[2]), high: num(cols[3]), low: num(cols[4]), volume: num(cols[5]), amount: num(cols[6]), avg: num(cols[7]) }
+      // at 是来源时刻的 Unix 秒:只留 HH:MM 会让客户端按索引自造时间轴,横轴整体平移
+      // f56 与日K 同为手: 沪深要按 100 股换算, 否则分时图例的量和日K/详情差两个数量级
+      return { time, at: zonedUnixSeconds(cols[0], SOURCE_ZONE), open: num(cols[1]), close: num(cols[2]), high: num(cols[3]), low: num(cols[4]), volume: sharesFromLots(num(cols[5]), request.market), amount: num(cols[6]), avg: num(cols[7]) }
     })
     return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), complete: true, preClose: num_or_null(body.data.preClose), candles }
   },
@@ -182,6 +199,24 @@ export const eastmoney = {
 
 function num_or_null(v) { const n = parseFloat(v); return Number.isFinite(n) ? n : null }
 
+
+// 把指定时区的"YYYY-MM-DD HH:MM"换算成 Unix 秒, 时刻属于哪个时区由调用方给定;
+// 无时区元数据或格式不符时返回 null, 调用方回退自造时间轴
+function zonedUnixSeconds(stamp, timeZone) {
+  const match = /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2})/.exec(stamp)
+  if (!match || !timeZone) return null
+  const [, y, mo, d, hh, mm] = match.map(Number)
+  const localAsUtc = Date.UTC(y, mo - 1, d, hh, mm)
+  const parts = new Intl.DateTimeFormat('en-US', {
+    timeZone, hour12: false,
+    year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit',
+  }).formatToParts(new Date(localAsUtc))
+  const rendered = Object.fromEntries(parts.map((part) => [part.type, part.value]))
+  const asUtc = Date.UTC(Number(rendered.year), Number(rendered.month) - 1, Number(rendered.day),
+    Number(rendered.hour) % 24, Number(rendered.minute), Number(rendered.second))
+  return Math.floor((localAsUtc - (asUtc - localAsUtc)) / 1000)
+}
+
 // klines CSV → 合同响应: 逐行解析/升序/重复拒绝; complete 由 dktotal 与请求量判定(源截断标志)。
 function buildKlineResponse(request, data, ctx) {
   const candles = []
@@ -192,7 +227,7 @@ function buildKlineResponse(request, data, ctx) {
     if (cols[0] <= prevTime) throw new StockError('BAD_PAYLOAD', 'K线时间戳重复或乱序', 502)
     prevTime = cols[0]
     const num = v => { const n = parseFloat(v); return Number.isFinite(n) ? n : null }
-    candles.push({ time: cols[0], open: num(cols[1]), close: num(cols[2]), high: num(cols[3]), low: num(cols[4]), volume: num(cols[5]), amount: num(cols[6]) })
+    candles.push({ time: cols[0], open: num(cols[1]), close: num(cols[2]), high: num(cols[3]), low: num(cols[4]), volume: sharesFromLots(num(cols[5]), request.market), amount: num(cols[6]) })
   }
   const total = Number(data.dktotal)
   return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), complete: Number.isFinite(total) ? request.limit <= total : true, preClose: num_or_null(data.preKPrice), candles }

package/src/providers/sina.mjs

@@ -1,98 +1,121 @@
-// 新浪公开行情接口适配器:quotes/catalog。非官方端点,需Referer,无SLA;延迟未知,时间为来源快照时间。
-import { normalizeQuote, parseQuoteTime, makeSecurity, securityId, StockError } from '../market-model.mjs'
-const ENDPOINT = 'https://hq.sinajs.cn/list='
-const LIST_ENDPOINT = 'https://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/Market_Center.getHQNodeData'
-const LIST_HEADERS = { Referer: 'https://finance.sina.com.cn/', 'User-Agent': 'Mozilla/5.0' }
-const symbolOf = security => `${security.exchange === 'XSHG' ? 'sh' : 'sz'}${security.code}`
-// 新浪价格固定三位小数,A股最小变动0.01,第三位恒为0,裁剪到两位不损失精度。
-const trim = value => /^\d+(\.\d+)?$/.test(value) ? Number(value).toFixed(2) : value
-export const sina = {
-  descriptor: { adapterId: 'sina', capabilities: ['quotes', 'catalog'], markets: ['XSHG', 'XSHE'], instruments: ['equity'], maxQuoteBatch: 60, credential: 'none', description: '新浪公开接口：免凭据，仅沪深行情与目录' },
-  async probe(request, ctx) {
-    if (request.capability === 'catalog') {
-      // 探针只拉一页验证端点连通,不做全量分页。
-      const response = await ctx.fetch(`${LIST_ENDPOINT}?page=1&num=5&sort=symbol&asc=1&node=${request.market === 'XSHG' ? 'sh_a' : 'sz_a'}`, { headers: LIST_HEADERS, signal: ctx.signal, redirect: 'error' })
-      if (!response.ok) throw new StockError('NETWORK', '来源服务暂不可用', 502, { retryable: true })
-      const rows = await response.json()
-      if (!Array.isArray(rows) || !rows.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
-      return { status: 'ready', capability: 'catalog', market: request.market, instrument: 'equity' }
-    }
-    const security = request.securities?.[0] || { exchange: request.market, code: request.market === 'XSHG' ? '600519' : '000001' }
-    const rows = await this.quotes({ ...request, securities: [security] }, ctx)
-    if (!rows.items.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
-    return { status: 'ready', capability: 'quotes', market: request.market, instrument: 'equity' }
-  },
-  async catalog(request, ctx) {
-    // 分市场节点sh_a/sz_a直接取本市场全量,分页间保持来源要求的节流间隔。
-    const PAGE_SIZE = 80, MAX_PAGES = 100, PAGE_GAP = 600
-    const prefix = request.market === 'XSHG' ? 'sh' : 'sz', node = request.market === 'XSHG' ? 'sh_a' : 'sz_a'
-    const items = [], seen = new Set()
-    let page = 1, complete = true, retriedShort = false
-    while (page <= MAX_PAGES) {
-      let rows
-      try {
-        const response = await ctx.fetch(`${LIST_ENDPOINT}?page=${page}&num=${PAGE_SIZE}&sort=symbol&asc=1&node=${node}`, { headers: LIST_HEADERS, signal: ctx.signal, redirect: 'error' })
-        if (!response.ok) throw new StockError('NETWORK', '来源服务暂不可用', 502, { retryable: true })
-        rows = await response.json()
-      } catch (e) {
-        if (ctx.signal.aborted) throw new StockError('CANCELLED', '请求已取消', 503)
-        if (e instanceof StockError) throw e
-        throw new StockError('NETWORK', '无法连接行情来源', 502, { retryable: true })
-      }
-      if (!Array.isArray(rows)) throw new StockError('BAD_PAYLOAD', '目录字段结构异常', 502)
-      if (rows.length < PAGE_SIZE && !retriedShort) {
-        // 连续请求过密时来源会降级返回短页,退避后重拉本页一次再终止。
-        retriedShort = true
-        await new Promise((resolve, reject) => { const t = setTimeout(resolve, 3 * 1000); ctx.signal.addEventListener('abort', () => { clearTimeout(t); reject(new StockError('CANCELLED', '请求已取消', 503)) }, { once: true }) })
-        continue
-      }
-      retriedShort = false
-      for (const row of rows) {
-        if (typeof row.symbol !== 'string' || !row.symbol.startsWith(prefix) || !/^\d{6}$/.test(row.code || '') || typeof row.name !== 'string' || !row.name) continue
-        const id = securityId(request.market, row.code)
-        if (seen.has(id)) throw new StockError('BAD_PAYLOAD', '目录身份冲突', 502)
-        seen.add(id)
-        items.push(makeSecurity(request.market, row.code, row.name, { cnspell: '', catalogSource: request.providerInstanceId }))
-      }
-      if (rows.length < PAGE_SIZE) break
-      if (page === MAX_PAGES) complete = false
-      page++
-      await new Promise((resolve, reject) => { const t = setTimeout(resolve, PAGE_GAP); ctx.signal.addEventListener('abort', () => { clearTimeout(t); reject(new StockError('CANCELLED', '请求已取消', 503)) }, { once: true }) })
-    }
-    return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items, errors: [], complete }
-  },
-  async quotes(request, ctx) {
-    const symbols = new Map(request.securities.map(s => [symbolOf(s), s]))
-    let response
-    try {
-      response = await ctx.fetch(ENDPOINT + [...symbols.keys()].join(','), { headers: { Referer: 'https://finance.sina.com.cn/', 'User-Agent': 'Mozilla/5.0' }, signal: ctx.signal, redirect: 'error' })
-    } catch (e) {
-      if (ctx.signal.aborted) throw new StockError('CANCELLED', '请求已取消', 503)
-      if (e instanceof StockError) throw e
-      throw new StockError('NETWORK', '无法连接行情来源', 502, { retryable: true })
-    }
-    if (!response.ok) throw new StockError('NETWORK', '来源服务暂不可用', 502, { retryable: true })
-    const text = new TextDecoder('gbk').decode(await response.arrayBuffer())
-    const seen = new Set(), items = []
-    for (const line of text.split(';')) {
-      const match = /var hq_str_(sh|sz)(\d{6})="([^"]*)"/.exec(line)
-      if (!match) continue
-      const providerSymbol = `${match[1]}${match[2]}`, security = symbols.get(providerSymbol)
-      if (!security) continue
-      if (seen.has(providerSymbol)) throw new StockError('BAD_PAYLOAD', '报价身份冲突', 502)
-      seen.add(providerSymbol)
-      const f = match[3].split(',')
-      if (f.length < 32) throw new StockError('BAD_PAYLOAD', '来源字段数量异常', 502)
-      // 新浪volume为股,amount为元;时间为"yyyy-MM-dd,HH:mm:ss"两个字段。
-      items.push(normalizeQuote({
-        securityId: security.id, providerInstanceId: request.providerInstanceId, adapterId: 'sina', providerSymbol,
-        last: trim(f[3]), previousClose: trim(f[2]), open: trim(f[1]), high: trim(f[4]), low: trim(f[5]),
-        volume: f[8] == null || Number.isNaN(Number(f[8])) ? null : String(Math.round(Number(f[8]))), volumeUnit: 'share',
-        amount: f[9] == null || Number.isNaN(Number(f[9])) ? null : String(Math.round(Number(f[9]))), amountUnit: 'CNY',
-        quoteAt: parseQuoteTime(`${f[30]} ${f[31]}`), timestampKind: 'trade',
-        receivedAt: ctx.now(), delayKind: 'unknown', delaySeconds: null, securityState: 'unknown',
-      }))
-    }
-    return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items, errors: request.securities.filter(s => !seen.has(symbolOf(s))).map(s => ({ securityId: s.id, code: 'NO_DATA', message: '来源未返回此证券报价' })) }
-  },
-}
+// 新浪公开行情接口适配器:quotes(沪深港美)/catalog(沪深)。非官方端点,需Referer,无SLA;延迟未知,时间为来源快照时间。
+import { normalizeQuote, parseQuoteTime, makeSecurity, securityId, StockError } from '../market-model.mjs'
+const ENDPOINT = 'https://hq.sinajs.cn/list='
+const LIST_ENDPOINT = 'https://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/Market_Center.getHQNodeData'
+const HEADERS = { Referer: 'https://finance.sina.com.cn/', 'User-Agent': 'Mozilla/5.0' }
+// 报价前缀与币种随市场派生(单一事实源);美股代码在来源侧是小写
+const BY_MARKET = {
+  XSHG: { prefix: 'sh', currency: 'CNY' },
+  XSHE: { prefix: 'sz', currency: 'CNY' },
+  XHKG: { prefix: 'rt_hk', currency: 'HKD' },
+  XNAS: { prefix: 'gb_', currency: 'USD' },
+  XNYS: { prefix: 'gb_', currency: 'USD' },
+}
+const symbolOf = security => {
+  const meta = BY_MARKET[security.exchange]
+  const code = meta.prefix === 'gb_' ? String(security.code).toLowerCase() : security.code
+  return `${meta.prefix}${code}`
+}
+// 探针代表证券(各市场实测可达的流动性标的)
+const PROBE_SECURITY = { XSHG: '600519', XSHE: '000001', XHKG: '00700', XNAS: 'AAPL', XNYS: 'BABA' }
+// 新浪价格固定三位以上小数,A股最小变动0.01,裁剪到两位不损失精度;港美同理按分呈现
+const trim = value => /^\d+(\.\d+)?$/.test(value) ? Number(value).toFixed(2) : value
+const count = value => value == null || Number.isNaN(Number(value)) ? null : String(Math.round(Number(value)))
+// 各市场字段位置:沪深34列、港股25列、美股36列,同一行内的列义由前缀决定
+const FIELD_MAP = {
+  cn: f => ({ open: f[1], previousClose: f[2], last: f[3], high: f[4], low: f[5], volume: f[8], amount: f[9], quoteAt: `${f[30]} ${f[31]}` }),
+  hk: f => ({ open: f[2], previousClose: f[3], high: f[4], low: f[5], last: f[6], volume: f[12], amount: f[11], quoteAt: `${String(f[17]).replace(/\//g, '-')} ${f[18]}` }),
+  us: f => ({ open: f[5], previousClose: f[26], last: f[1], high: f[6], low: f[7], volume: f[10], quoteAt: f[3] }),
+}
+const kindOf = providerSymbol => providerSymbol.startsWith('rt_hk') ? 'hk' : providerSymbol.startsWith('gb_') ? 'us' : 'cn'
+const MIN_FIELDS = { cn: 32, hk: 20, us: 28 }
+export const sina = {
+  descriptor: { adapterId: 'sina', capabilities: ['quotes', 'catalog'], markets: ['XSHG', 'XSHE', 'XHKG', 'XNAS', 'XNYS'], instruments: ['equity'], maxQuoteBatch: 60, credential: 'none', description: '新浪公开接口：免凭据，沪深港美行情与沪深目录' },
+  async probe(request, ctx) {
+    if (request.capability === 'catalog') {
+      // 探针只拉一页验证端点连通,不做全量分页。
+      const response = await ctx.fetch(`${LIST_ENDPOINT}?page=1&num=5&sort=symbol&asc=1&node=${request.market === 'XSHG' ? 'sh_a' : 'sz_a'}`, { headers: HEADERS, signal: ctx.signal, redirect: 'error' })
+      if (!response.ok) throw new StockError('NETWORK', '来源服务暂不可用', 502, { retryable: true })
+      const rows = await response.json()
+      if (!Array.isArray(rows) || !rows.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
+      return { status: 'ready', capability: 'catalog', market: request.market, instrument: 'equity' }
+    }
+    const security = request.securities?.[0] || { exchange: request.market, code: PROBE_SECURITY[request.market] || '600519' }
+    const rows = await this.quotes({ ...request, securities: [security] }, ctx)
+    if (!rows.items.length) throw new StockError('NO_DATA', '来源未返回可校验数据，暂不能确认能力就绪', 422)
+    return { status: 'ready', capability: 'quotes', market: request.market, instrument: 'equity' }
+  },
+  async catalog(request, ctx) {
+    // 分市场节点sh_a/sz_a直接取本市场全量,分页间保持来源要求的节流间隔。
+    const PAGE_SIZE = 80, MAX_PAGES = 100, PAGE_GAP = 600
+    const prefix = request.market === 'XSHG' ? 'sh' : 'sz', node = request.market === 'XSHG' ? 'sh_a' : 'sz_a'
+    const items = [], seen = new Set()
+    let page = 1, complete = true, retriedShort = false
+    while (page <= MAX_PAGES) {
+      let rows
+      try {
+        const response = await ctx.fetch(`${LIST_ENDPOINT}?page=${page}&num=${PAGE_SIZE}&sort=symbol&asc=1&node=${node}`, { headers: HEADERS, signal: ctx.signal, redirect: 'error' })
+        if (!response.ok) throw new StockError('NETWORK', '来源服务暂不可用', 502, { retryable: true })
+        rows = await response.json()
+      } catch (e) {
+        if (ctx.signal.aborted) throw new StockError('CANCELLED', '请求已取消', 503)
+        if (e instanceof StockError) throw e
+        throw new StockError('NETWORK', '无法连接行情来源', 502, { retryable: true })
+      }
+      if (!Array.isArray(rows)) throw new StockError('BAD_PAYLOAD', '目录字段结构异常', 502)
+      if (rows.length < PAGE_SIZE && !retriedShort) {
+        // 连续请求过密时来源会降级返回短页,退避后重拉本页一次再终止。
+        retriedShort = true
+        await new Promise((resolve, reject) => { const t = setTimeout(resolve, 3 * 1000); ctx.signal.addEventListener('abort', () => { clearTimeout(t); reject(new StockError('CANCELLED', '请求已取消', 503)) }, { once: true }) })
+        continue
+      }
+      retriedShort = false
+      for (const row of rows) {
+        if (typeof row.symbol !== 'string' || !row.symbol.startsWith(prefix) || !/^\d{6}$/.test(row.code || '') || typeof row.name !== 'string' || !row.name) continue
+        const id = securityId(request.market, row.code)
+        if (seen.has(id)) throw new StockError('BAD_PAYLOAD', '目录身份冲突', 502)
+        seen.add(id)
+        items.push(makeSecurity(request.market, row.code, row.name, { cnspell: '', catalogSource: request.providerInstanceId }))
+      }
+      if (rows.length < PAGE_SIZE) break
+      if (page === MAX_PAGES) complete = false
+      page++
+      await new Promise((resolve, reject) => { const t = setTimeout(resolve, PAGE_GAP); ctx.signal.addEventListener('abort', () => { clearTimeout(t); reject(new StockError('CANCELLED', '请求已取消', 503)) }, { once: true }) })
+    }
+    return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items, errors: [], complete }
+  },
+  async quotes(request, ctx) {
+    const symbols = new Map(request.securities.map(s => [symbolOf(s), s]))
+    let response
+    try {
+      response = await ctx.fetch(ENDPOINT + [...symbols.keys()].join(','), { headers: HEADERS, signal: ctx.signal, redirect: 'error' })
+    } catch (e) {
+      if (ctx.signal.aborted) throw new StockError('CANCELLED', '请求已取消', 503)
+      if (e instanceof StockError) throw e
+      throw new StockError('NETWORK', '无法连接行情来源', 502, { retryable: true })
+    }
+    if (!response.ok) throw new StockError('NETWORK', '来源服务暂不可用', 502, { retryable: true })
+    const text = new TextDecoder('gbk').decode(await response.arrayBuffer())
+    const seen = new Set(), items = []
+    for (const line of text.split(';')) {
+      const match = /var hq_str_(\w+)="([^"]*)"/.exec(line)
+      if (!match) continue
+      const providerSymbol = match[1], security = symbols.get(providerSymbol)
+      if (!security) continue
+      if (seen.has(providerSymbol)) throw new StockError('BAD_PAYLOAD', '报价身份冲突', 502)
+      seen.add(providerSymbol)
+      const f = match[2].split(','), kind = kindOf(providerSymbol)
+      // 停牌行来源返回空串,按无值处理而不是伪造零价
+      if (f.length < MIN_FIELDS[kind]) throw new StockError('BAD_PAYLOAD', '来源字段数量异常', 502)
+      const mapped = FIELD_MAP[kind](f)
+      items.push(normalizeQuote({
+        securityId: security.id, providerInstanceId: request.providerInstanceId, adapterId: 'sina', providerSymbol,
+        last: trim(mapped.last), previousClose: trim(mapped.previousClose), open: trim(mapped.open), high: trim(mapped.high), low: trim(mapped.low),
+        volume: count(mapped.volume), volumeUnit: 'share', amount: count(mapped.amount), amountUnit: BY_MARKET[security.exchange].currency,
+        quoteAt: parseQuoteTime(mapped.quoteAt), timestampKind: 'trade',
+        receivedAt: ctx.now(), delayKind: 'unknown', delaySeconds: null, securityState: 'unknown',
+      }))
+    }
+    return { providerInstanceId: request.providerInstanceId, fetchedAt: ctx.now(), items, errors: request.securities.filter(s => !seen.has(symbolOf(s))).map(s => ({ securityId: s.id, code: 'NO_DATA', message: '来源未返回此证券报价' })) }
+  },
+}