Spaces:
Paused
Paused
zt p commited on
Commit ·
341be2e
1
Parent(s): 5a34ea1
Fallback when Binance futures API is region blocked
Browse files- README.md +3 -2
- coinpush.py +93 -5
README.md
CHANGED
|
@@ -27,15 +27,16 @@ pinned: false
|
|
| 27 |
- `WEWORK_BOT_WEBHOOK`(必填):企业微信机器人 Webhook
|
| 28 |
- `BINANCE_API_KEY` / `BINANCE_API_SECRET`(可选,公开行情无需)
|
| 29 |
- `BINANCE_SPOT_BASE` / `BINANCE_FAPI_BASE` / `BINANCE_FSTREAM_BASE`(可选,换镜像用)
|
| 30 |
-
- `ENABLE_FUTURES`(可选,默认 false):币安现货主线币种的合约指标/强平流总开关;STRC
|
| 31 |
- `BITGET_API_KEY` / `BITGET_API_SECRET` / `BITGET_API_PASSPHRASE`(可选,Bitget 差价行情)
|
| 32 |
- `OKX_API_KEY` / `OKX_API_SECRET` / `OKX_API_PASSPHRASE`(可选,OKX 差价行情)
|
| 33 |
- `BITGET_BASE` / `OKX_BASE`(可选,受限区域可指向可用代理)
|
| 34 |
|
| 35 |
## 多交易所扩展
|
| 36 |
-
- 主价格通知:BTC、GRAM(原 TON)、STRC 均以 Binance 为主行情源;GRAM 使用 Binance 现货 `GRAMUSDT`,STRC 使用 Binance 合约 `STRCUSDT`。
|
| 37 |
- STRC 作为完整币种处理(与 BTC/GRAM 一样:快速涨跌、突破、成交量、振幅、盘口、均线、RSI、资金费率、持仓量),
|
| 38 |
并保留「休市」属性:价格长时间不变即判定休市,期间不推送任何提醒。
|
|
|
|
| 39 |
- `TONUSDT` 旧配置会自动迁移到 `GRAMUSDT`;旧的 OKX STRC/GRAM 独立提醒会清理,避免和 Binance 主行情重复。
|
| 40 |
- 跨所差价提醒:BTC、GRAM、STRC 在 Binance / Bitget / OKX 之间的价差;其中 STRC 的 Binance 侧使用 `futures:STRCUSDT` 合约价。
|
| 41 |
- 以上均可在页面「多交易所设置」与各币种页开关、调参。Bitget/OKX 对部分地区有访问限制,
|
|
|
|
| 27 |
- `WEWORK_BOT_WEBHOOK`(必填):企业微信机器人 Webhook
|
| 28 |
- `BINANCE_API_KEY` / `BINANCE_API_SECRET`(可选,公开行情无需)
|
| 29 |
- `BINANCE_SPOT_BASE` / `BINANCE_FAPI_BASE` / `BINANCE_FSTREAM_BASE`(可选,换镜像用)
|
| 30 |
+
- `ENABLE_FUTURES`(可选,默认 false):币安现货主线币种的合约指标/强平流总开关;STRC 会优先走 `BINANCE_FAPI_BASE`
|
| 31 |
- `BITGET_API_KEY` / `BITGET_API_SECRET` / `BITGET_API_PASSPHRASE`(可选,Bitget 差价行情)
|
| 32 |
- `OKX_API_KEY` / `OKX_API_SECRET` / `OKX_API_PASSPHRASE`(可选,OKX 差价行情)
|
| 33 |
- `BITGET_BASE` / `OKX_BASE`(可选,受限区域可指向可用代理)
|
| 34 |
|
| 35 |
## 多交易所扩展
|
| 36 |
+
- 主价格通知:BTC、GRAM(原 TON)、STRC 均以 Binance 为主行情源;GRAM 使用 Binance 现货 `GRAMUSDT`,STRC 优先使用 Binance 合约 `STRCUSDT`。
|
| 37 |
- STRC 作为完整币种处理(与 BTC/GRAM 一样:快速涨跌、突破、成交量、振幅、盘口、均线、RSI、资金费率、持仓量),
|
| 38 |
并保留「休市」属性:价格长时间不变即判定休市,期间不推送任何提醒。
|
| 39 |
+
- 若 Space 所在区域访问 Binance `/fapi` 返回 451,STRC 会自动临时使用 OKX `STRC-USDT-SWAP` 备用行情,避免刷屏与断监控;配置 `BINANCE_FAPI_BASE` 为可访问代理后会恢复 Binance 主源。
|
| 40 |
- `TONUSDT` 旧配置会自动迁移到 `GRAMUSDT`;旧的 OKX STRC/GRAM 独立提醒会清理,避免和 Binance 主行情重复。
|
| 41 |
- 跨所差价提醒:BTC、GRAM、STRC 在 Binance / Bitget / OKX 之间的价差;其中 STRC 的 Binance 侧使用 `futures:STRCUSDT` 合约价。
|
| 42 |
- 以上均可在页面「多交易所设置」与各币种页开关、调参。Bitget/OKX 对部分地区有访问限制,
|
coinpush.py
CHANGED
|
@@ -42,6 +42,7 @@ BINANCE_API_SECRET = os.getenv("BINANCE_API_SECRET")
|
|
| 42 |
SPOT_BASE = os.getenv("BINANCE_SPOT_BASE", "https://api.binance.com")
|
| 43 |
FAPI_BASE = os.getenv("BINANCE_FAPI_BASE", "https://fapi.binance.com")
|
| 44 |
FSTREAM_BASE = os.getenv("BINANCE_FSTREAM_BASE", "wss://fstream.binance.com/ws")
|
|
|
|
| 45 |
|
| 46 |
# --- Bitget / OKX 凭证与基址(全部从环境变量读取,切勿硬编码)---
|
| 47 |
BITGET_API_KEY = os.getenv("BITGET_API_KEY")
|
|
@@ -56,8 +57,8 @@ OKX_BASE = os.getenv("OKX_BASE", "https://www.okx.com")
|
|
| 56 |
|
| 57 |
# 合约功能全局开关(默认关闭)。币安合约接口/强平流对 US 区域可能返回 451。
|
| 58 |
# 该开关控制现货主行情币种的合约指标与强平 websocket;若标的本身以 Binance
|
| 59 |
-
# 合约作为主行情源(如 STRC),
|
| 60 |
-
# 若自带可访问合约接口的代理,设置
|
| 61 |
FUTURES_ENABLED = os.getenv("ENABLE_FUTURES", "false").strip().lower() in ("1", "true", "yes", "on")
|
| 62 |
|
| 63 |
# 配置持久化文件
|
|
@@ -518,13 +519,25 @@ class BinanceAPI:
|
|
| 518 |
self.logger = logger
|
| 519 |
self.session = requests.Session()
|
| 520 |
self.session.headers.update(REQ_HEADERS)
|
|
|
|
| 521 |
if BINANCE_API_KEY:
|
| 522 |
self.session.headers.update({"X-MBX-APIKEY": BINANCE_API_KEY})
|
| 523 |
|
| 524 |
def _get(self, base, path, params=None, timeout=10):
|
|
|
|
|
|
|
|
|
|
|
|
|
| 525 |
try:
|
| 526 |
r = self.session.get(base + path, params=params, timeout=timeout)
|
| 527 |
if r.status_code != 200:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 528 |
self.logger(f"⚠️ 接口 {path} 状态码 {r.status_code}")
|
| 529 |
return None
|
| 530 |
return r.json()
|
|
@@ -908,6 +921,71 @@ class OKXMarketAdapter:
|
|
| 908 |
return [{"fundingRate": x["fundingRate"]} for x in data if "fundingRate" in x]
|
| 909 |
|
| 910 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 911 |
# --- 7. 实时强平监控(websocket,可选)---
|
| 912 |
class LiquidationTracker:
|
| 913 |
"""
|
|
@@ -1790,10 +1868,18 @@ class CryptoMonitor:
|
|
| 1790 |
self._auto_calibrate_needed = not os.path.exists(CONFIG_FILE)
|
| 1791 |
|
| 1792 |
self.api = BinanceAPI(self.log)
|
| 1793 |
-
self.binance_futures_adapter = BinanceFuturesMarketAdapter(self.api)
|
| 1794 |
self.bitget = BitgetAPI(self.log)
|
| 1795 |
self.okx = OKXAPI(self.log)
|
| 1796 |
self.okx_adapter = OKXMarketAdapter(self.okx, self.log)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1797 |
self.pusher = WeWorkBotPusher(WEWORK_BOT_WEBHOOK)
|
| 1798 |
self.alert_mgr = AlertManager(self.pusher, self.log, self.stats)
|
| 1799 |
self.liq = LiquidationTracker(self._futures_symbols(), self.log)
|
|
@@ -1818,7 +1904,7 @@ class CryptoMonitor:
|
|
| 1818 |
def _api_for(self, coin_cfg):
|
| 1819 |
"""按币种数据来源选择行情接口(binance / binance_futures / okx)"""
|
| 1820 |
if coin_cfg.get("data_source") == "binance_futures":
|
| 1821 |
-
return self.
|
| 1822 |
if coin_cfg.get("data_source") == "okx":
|
| 1823 |
return self.okx_adapter
|
| 1824 |
return self.api
|
|
@@ -2111,6 +2197,8 @@ def render_config_editor(monitor):
|
|
| 2111 |
help="仅用于跨所差价提醒")
|
| 2112 |
st.caption("⚠️ 密钥从环境变量读取(BITGET_*/OKX_*)。Bitget/OKX 对部分地区有访问限制,"
|
| 2113 |
"若 Space 在受限区域可设置 BITGET_BASE / OKX_BASE 指向可用代理。")
|
|
|
|
|
|
|
| 2114 |
|
| 2115 |
st.markdown("**跨交易所差价提醒**")
|
| 2116 |
sp = ex.setdefault("spread", {})
|
|
@@ -2190,7 +2278,7 @@ def render_config_editor(monitor):
|
|
| 2190 |
"数据来源", list(ds_map.keys()),
|
| 2191 |
index=list(ds_map.keys()).index(current_label),
|
| 2192 |
horizontal=True, key=f"{name}_ds",
|
| 2193 |
-
help="STRC
|
| 2194 |
coin["data_source"] = ds_map[ds_label]
|
| 2195 |
cc1, cc2, cc3 = st.columns(3)
|
| 2196 |
with cc1:
|
|
|
|
| 42 |
SPOT_BASE = os.getenv("BINANCE_SPOT_BASE", "https://api.binance.com")
|
| 43 |
FAPI_BASE = os.getenv("BINANCE_FAPI_BASE", "https://fapi.binance.com")
|
| 44 |
FSTREAM_BASE = os.getenv("BINANCE_FSTREAM_BASE", "wss://fstream.binance.com/ws")
|
| 45 |
+
FAPI_451_COOLDOWN_SEC = int(os.getenv("BINANCE_FAPI_451_COOLDOWN_SEC", "3600"))
|
| 46 |
|
| 47 |
# --- Bitget / OKX 凭证与基址(全部从环境变量读取,切勿硬编码)---
|
| 48 |
BITGET_API_KEY = os.getenv("BITGET_API_KEY")
|
|
|
|
| 57 |
|
| 58 |
# 合约功能全局开关(默认关闭)。币安合约接口/强平流对 US 区域可能返回 451。
|
| 59 |
# 该开关控制现货主行情币种的合约指标与强平 websocket;若标的本身以 Binance
|
| 60 |
+
# 合约作为主行情源(如 STRC),会优先访问 /fapi,受限时自动使用 OKX 备用行情。
|
| 61 |
+
# 若自带可访问合约接口的代理,设置 BINANCE_FAPI_BASE 指向代理即可恢复 Binance 主源。
|
| 62 |
FUTURES_ENABLED = os.getenv("ENABLE_FUTURES", "false").strip().lower() in ("1", "true", "yes", "on")
|
| 63 |
|
| 64 |
# 配置持久化文件
|
|
|
|
| 519 |
self.logger = logger
|
| 520 |
self.session = requests.Session()
|
| 521 |
self.session.headers.update(REQ_HEADERS)
|
| 522 |
+
self.fapi_blocked_until = 0.0
|
| 523 |
if BINANCE_API_KEY:
|
| 524 |
self.session.headers.update({"X-MBX-APIKEY": BINANCE_API_KEY})
|
| 525 |
|
| 526 |
def _get(self, base, path, params=None, timeout=10):
|
| 527 |
+
is_fapi = base == FAPI_BASE or path.startswith("/fapi/")
|
| 528 |
+
now = time.time()
|
| 529 |
+
if is_fapi and now < self.fapi_blocked_until:
|
| 530 |
+
return None
|
| 531 |
try:
|
| 532 |
r = self.session.get(base + path, params=params, timeout=timeout)
|
| 533 |
if r.status_code != 200:
|
| 534 |
+
if is_fapi and r.status_code == 451:
|
| 535 |
+
self.fapi_blocked_until = now + FAPI_451_COOLDOWN_SEC
|
| 536 |
+
mins = max(1, int(FAPI_451_COOLDOWN_SEC / 60))
|
| 537 |
+
self.logger(
|
| 538 |
+
f"⚠️ Binance 合约接口 /fapi 当前区域受限(451),"
|
| 539 |
+
f"暂停直连 {mins} 分钟并使用备用行情")
|
| 540 |
+
return None
|
| 541 |
self.logger(f"⚠️ 接口 {path} 状态码 {r.status_code}")
|
| 542 |
return None
|
| 543 |
return r.json()
|
|
|
|
| 921 |
return [{"fundingRate": x["fundingRate"]} for x in data if "fundingRate" in x]
|
| 922 |
|
| 923 |
|
| 924 |
+
class FallbackMarketAdapter:
|
| 925 |
+
"""主行情源不可用时透明切到备用行情源,返回格式保持 BinanceAPI 兼容。"""
|
| 926 |
+
|
| 927 |
+
def __init__(self, primary, fallback, logger, fallback_symbols=None,
|
| 928 |
+
primary_label="主源", fallback_label="备用源"):
|
| 929 |
+
self.primary = primary
|
| 930 |
+
self.fallback = fallback
|
| 931 |
+
self.logger = logger
|
| 932 |
+
self.fallback_symbols = fallback_symbols or {}
|
| 933 |
+
self.primary_label = primary_label
|
| 934 |
+
self.fallback_label = fallback_label
|
| 935 |
+
self._fallback_logged = set()
|
| 936 |
+
|
| 937 |
+
def _fallback_symbol(self, symbol):
|
| 938 |
+
if symbol in self.fallback_symbols:
|
| 939 |
+
return self.fallback_symbols[symbol]
|
| 940 |
+
if symbol.endswith("USDT") and len(symbol) > 4:
|
| 941 |
+
return f"{symbol[:-4]}-USDT-SWAP"
|
| 942 |
+
return symbol
|
| 943 |
+
|
| 944 |
+
def _call(self, method, symbol, *args):
|
| 945 |
+
primary_fn = getattr(self.primary, method)
|
| 946 |
+
result = primary_fn(symbol, *args)
|
| 947 |
+
if result:
|
| 948 |
+
return result
|
| 949 |
+
|
| 950 |
+
fb_symbol = self._fallback_symbol(symbol)
|
| 951 |
+
fallback_fn = getattr(self.fallback, method, None)
|
| 952 |
+
if fallback_fn is None:
|
| 953 |
+
return None
|
| 954 |
+
result = fallback_fn(fb_symbol, *args)
|
| 955 |
+
if result:
|
| 956 |
+
key = (symbol, fb_symbol)
|
| 957 |
+
if key not in self._fallback_logged:
|
| 958 |
+
self.logger(
|
| 959 |
+
f"ℹ️ {symbol} {self.primary_label}不可用,"
|
| 960 |
+
f"临时使用 {self.fallback_label} {fb_symbol} 备用行情")
|
| 961 |
+
self._fallback_logged.add(key)
|
| 962 |
+
return result
|
| 963 |
+
|
| 964 |
+
def ticker_24h(self, symbol):
|
| 965 |
+
return self._call("ticker_24h", symbol)
|
| 966 |
+
|
| 967 |
+
def klines(self, symbol, interval, limit):
|
| 968 |
+
return self._call("klines", symbol, interval, limit)
|
| 969 |
+
|
| 970 |
+
def klines_history(self, symbol, interval, days, max_calls=40):
|
| 971 |
+
return self._call("klines_history", symbol, interval, days, max_calls)
|
| 972 |
+
|
| 973 |
+
def depth(self, symbol, limit=500):
|
| 974 |
+
return self._call("depth", symbol, limit)
|
| 975 |
+
|
| 976 |
+
def agg_trades(self, symbol, limit=1000):
|
| 977 |
+
return self._call("agg_trades", symbol, limit)
|
| 978 |
+
|
| 979 |
+
def premium_index(self, symbol):
|
| 980 |
+
return self._call("premium_index", symbol)
|
| 981 |
+
|
| 982 |
+
def open_interest(self, symbol):
|
| 983 |
+
return self._call("open_interest", symbol)
|
| 984 |
+
|
| 985 |
+
def funding_rate_history(self, symbol, limit=500):
|
| 986 |
+
return self._call("funding_rate_history", symbol, limit)
|
| 987 |
+
|
| 988 |
+
|
| 989 |
# --- 7. 实时强平监控(websocket,可选)---
|
| 990 |
class LiquidationTracker:
|
| 991 |
"""
|
|
|
|
| 1868 |
self._auto_calibrate_needed = not os.path.exists(CONFIG_FILE)
|
| 1869 |
|
| 1870 |
self.api = BinanceAPI(self.log)
|
|
|
|
| 1871 |
self.bitget = BitgetAPI(self.log)
|
| 1872 |
self.okx = OKXAPI(self.log)
|
| 1873 |
self.okx_adapter = OKXMarketAdapter(self.okx, self.log)
|
| 1874 |
+
self.binance_futures_adapter = BinanceFuturesMarketAdapter(self.api)
|
| 1875 |
+
self.binance_futures_with_fallback = FallbackMarketAdapter(
|
| 1876 |
+
self.binance_futures_adapter,
|
| 1877 |
+
self.okx_adapter,
|
| 1878 |
+
self.log,
|
| 1879 |
+
fallback_symbols={"STRCUSDT": "STRC-USDT-SWAP", "GRAMUSDT": "GRAM-USDT-SWAP"},
|
| 1880 |
+
primary_label="Binance合约主源",
|
| 1881 |
+
fallback_label="OKX",
|
| 1882 |
+
)
|
| 1883 |
self.pusher = WeWorkBotPusher(WEWORK_BOT_WEBHOOK)
|
| 1884 |
self.alert_mgr = AlertManager(self.pusher, self.log, self.stats)
|
| 1885 |
self.liq = LiquidationTracker(self._futures_symbols(), self.log)
|
|
|
|
| 1904 |
def _api_for(self, coin_cfg):
|
| 1905 |
"""按币种数据来源选择行情接口(binance / binance_futures / okx)"""
|
| 1906 |
if coin_cfg.get("data_source") == "binance_futures":
|
| 1907 |
+
return self.binance_futures_with_fallback
|
| 1908 |
if coin_cfg.get("data_source") == "okx":
|
| 1909 |
return self.okx_adapter
|
| 1910 |
return self.api
|
|
|
|
| 2197 |
help="仅用于跨所差价提醒")
|
| 2198 |
st.caption("⚠️ 密钥从环境变量读取(BITGET_*/OKX_*)。Bitget/OKX 对部分地区有访问限制,"
|
| 2199 |
"若 Space 在受限区域可设置 BITGET_BASE / OKX_BASE 指向可用代理。")
|
| 2200 |
+
st.caption("Binance 合约接口在部分区域可能返回 451;STRC 会优先用 Binance 合约价,"
|
| 2201 |
+
"受限时自动临时使用 OKX 备用行情。")
|
| 2202 |
|
| 2203 |
st.markdown("**跨交易所差价提醒**")
|
| 2204 |
sp = ex.setdefault("spread", {})
|
|
|
|
| 2278 |
"数据来源", list(ds_map.keys()),
|
| 2279 |
index=list(ds_map.keys()).index(current_label),
|
| 2280 |
horizontal=True, key=f"{name}_ds",
|
| 2281 |
+
help="STRC 优先用 Binance 合约主行情;若 /fapi 返回 451,会临时使用 OKX 备用行情")
|
| 2282 |
coin["data_source"] = ds_map[ds_label]
|
| 2283 |
cc1, cc2, cc3 = st.columns(3)
|
| 2284 |
with cc1:
|