wechatbridge-cli 1.7.1__tar.gz → 1.7.2__tar.gz

{wechatbridge_cli-1.7.1 → wechatbridge_cli-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wechatbridge-cli
-Version: 1.7.1
+Version: 1.7.2
 Summary: Bridge WeChat messages to agy, Grok Build, or Codex CLIs — text/image/file/voice in, CLI replies and generated files back.
 Author: WeChatBridge contributors
 License: MIT

wechatbridge_cli-1.7.2/tests/test_price.py

@@ -0,0 +1,186 @@
+"""Price module contract tests (stdlib unittest only).
+
+These pin the *external* contracts that cannot be exercised without real
+API keys: the JD gateway signature rule, the Dataoke signature rule, the
+correct Dataoke endpoints/params for taokouling parsing and goods detail,
+and response parsing against sample payloads shaped like the real APIs.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import os
+import unittest
+from unittest import mock
+
+os.environ.setdefault("JDUNION_APP_KEY", "test_jd_key")
+os.environ.setdefault("JDUNION_APP_SECRET", "test_jd_secret")
+os.environ.setdefault("DATAOKE_APP_KEY", "test_dt_key")
+os.environ.setdefault("DATAOKE_APP_SECRET", "test_dt_secret")
+
+from wechatbridge import price as price_mod
+
+
+class TestJdSign(unittest.TestCase):
+    def test_secret_wraps_both_ends(self):
+        params = {
+            "method": "jd.union.open.goods.query",
+            "app_key": "test_jd_key",
+            "access_token": "",
+            "timestamp": "2026-11-01 19:00:00",
+            "format": "json",
+            "v": "1.0",
+            "sign_method": "md5",
+            "360buy_param_json": '{"skuIds":["123"]}',
+        }
+        plain = "".join(f"{k}{v}" for k, v in sorted(params.items()))
+        expected = hashlib.md5(
+            ("test_jd_secret" + plain + "test_jd_secret").encode("utf-8")
+        ).hexdigest().upper()
+        self.assertEqual(price_mod._jd_sign(dict(params)), expected)
+
+    def test_jd_query_parses_sample_payload(self):
+        sample = {
+            "jd_union_open_goods_query_reslt": {
+                "code": "0",
+                "data": [
+                    {
+                        "skuName": "Sample Widget 2000",
+                        "priceInfo": {"price": 129.0, "lowestPrice": 99.0},
+                        "couponInfo": {
+                            "couponList": [
+                                {"discount": 20.0, "quota": 100.0, "endTime": "2026-11-11 23:59:59"}
+                            ]
+                        },
+                        "imageInfo": {"imageList": ["https://img.example/x.jpg"]},
+                        "shopInfo": {"shopName": "Sample Shop"},
+                        "materialUrl": "https://item.jd.com/123.html",
+                    }
+                ],
+            }
+        }
+        with mock.patch.object(price_mod, "_jd_call", return_value=sample):
+            res = price_mod.query_jd_sku("123")
+        self.assertEqual(res.title, "Sample Widget 2000")
+        self.assertEqual(res.price, 129.0)
+        self.assertEqual(res.lowest_price, 99.0)
+        self.assertEqual(res.net_price(), 109.0)
+        card = res.card()
+        self.assertIn("到手价: ¥109", card)
+        self.assertIn("历史最低: ¥99", card)
+
+
+class TestDataokeSignAndCalls(unittest.TestCase):
+    def test_dt_sign_matches_sdk_algorithm(self):
+        params = {"goodsId": "789", "appKey": "test_dt_key", "version": "v2.0.0"}
+        plain = "&".join(f"{k}={v}" for k, v in sorted(params.items()))
+        expected = hashlib.md5(
+            (plain + "&key=test_dt_secret").encode("utf-8")
+        ).hexdigest().upper()
+        self.assertEqual(price_mod._dt_sign(dict(params)), expected)
+
+    def test_dt_call_attaches_appkey_version_and_sign(self):
+        captured = {}
+
+        class FakeResp:
+            def raise_for_status(self):
+                pass
+
+            def json(self):
+                return {"code": 0, "data": {"ok": True}}
+
+        def fake_get(url, params=None, timeout=None):
+            captured["url"] = url
+            captured["params"] = dict(params or {})
+            return FakeResp()
+
+        with mock.patch.object(price_mod.httpx, "get", side_effect=fake_get):
+            out = price_mod._dt_call("/goods/get-goods-details", {"goodsId": "789"})
+        self.assertEqual(out, {"ok": True})
+        self.assertEqual(captured["params"]["appKey"], "test_dt_key")
+        self.assertEqual(captured["params"]["version"], "v2.0.0")
+        unsigned = {k: v for k, v in captured["params"].items() if k != "sign"}
+        self.assertEqual(captured["params"]["sign"], price_mod._dt_sign(unsigned))
+
+    def test_dt_call_raises_on_nonzero_code(self):
+        class FakeResp:
+            def raise_for_status(self):
+                pass
+
+            def json(self):
+                return {"code": 1, "msg": "sign error"}
+
+        with mock.patch.object(price_mod.httpx, "get", return_value=FakeResp()):
+            with self.assertRaises(ValueError):
+                price_mod._dt_call("/goods/get-goods-details", {"goodsId": "1"})
+
+    def test_resolve_tkl_uses_parse_content_endpoint(self):
+        captured = {}
+
+        def fake_call(path, params):
+            captured["path"] = path
+            captured["params"] = dict(params)
+            return {"goodsId": "789456"}
+
+        with mock.patch.object(price_mod, "_dt_call", side_effect=fake_call):
+            out = price_mod.resolve_tkl("CZ0001 aBcd12")
+        self.assertEqual(captured["path"], "/tb-service/parse-content")
+        self.assertEqual(captured["params"]["content"], "CZ0001 aBcd12")
+        self.assertEqual(out["goodsId"], "789456")
+
+    def test_query_tb_item_sends_goods_id_and_parses(self):
+        captured = {}
+        sample_data = {
+            "goods": {
+                "goodsName": "TB Sample",
+                "actualPrice": 59.9,
+                "originalPrice": 79.9,
+                "quanPrice": 10.0,
+                "quanReceiveCondition": 50.0,
+                "quanEndTime": "2026-11-11 00:00:00",
+                "shopName": "TB Shop",
+                "goodsImage": "https://img.example/y.jpg",
+                "goodsUrl": "https://detail.tmall.com/item.htm?id=789",
+            }
+        }
+
+        def fake_call(path, params):
+            captured["path"] = path
+            captured["params"] = dict(params)
+            return sample_data
+
+        with mock.patch.object(price_mod, "_dt_call", side_effect=fake_call):
+            res = price_mod.query_tb_item("789")
+        self.assertEqual(captured["params"], {"goodsId": "789"})
+        self.assertEqual(res.title, "TB Sample")
+        self.assertEqual(res.price, 59.9)
+        self.assertEqual(res.net_price(), 49.9)
+
+    def test_dt_configured_requires_secret(self):
+        with mock.patch.object(price_mod, "_DT_APP_SECRET", ""):
+            self.assertFalse(price_mod.dt_configured())
+        with mock.patch.object(price_mod, "_DT_APP_SECRET", "x"):
+            self.assertTrue(price_mod.dt_configured())
+
+
+class TestDetectTrigger(unittest.TestCase):
+    def test_samples(self):
+        cases = [
+            ("看看 https://u.jd.com/AbCdEf 不错", "jd_short"),
+            ("8.8￥CZ0001 aBcd12￥ 打开淘宝", "tkl"),
+            ("https://item.jd.com/100012043978.html", "jd_item"),
+            ("https://detail.tmall.com/item.htm?id=789456123", "tb_item"),
+            ("https://m.tb.cn/h.abc123", "tb_short"),
+            ("今天天气不错", None),
+        ]
+        for text, kind in cases:
+            got = price_mod.detect_price_trigger(text)
+            if kind is None:
+                self.assertIsNone(got, msg=text)
+            else:
+                self.assertIsNotNone(got, msg=text)
+                self.assertEqual(got["kind"], kind, msg=text)
+
+
+if __name__ == "__main__":
+    unittest.main()

{wechatbridge_cli-1.7.1 → wechatbridge_cli-1.7.2}/wechatbridge/__init__.py

@@ -1,2 +1,2 @@
 """WeChatBridge — bridge WeChat messages to agy, Grok Build, or Codex CLIs."""
-__version__ = "1.7.1"
+__version__ = "1.7.2"

{wechatbridge_cli-1.7.1 → wechatbridge_cli-1.7.2}/wechatbridge/main.py

@@ -467,7 +467,7 @@ async def _cmd_price(args: str) -> str:
             "ℹ️ **比价功能未启用** ℹ️\n\n"
             "在桥的 .env 里配置以下任一项后重启：\n"
             "`JDUNION_APP_KEY` / `JDUNION_APP_SECRET`（京东联盟）\n"
-            "`DATAOKE_APP_KEY`（淘宝/天猫，大淘客代理）"
+            "`DATAOKE_APP_KEY` / `DATAOKE_APP_SECRET`（淘宝/天猫，大淘客代理）"
         )
     trigger = detect_price_trigger(target)
     if not trigger:

{wechatbridge_cli-1.7.1 → wechatbridge_cli-1.7.2}/wechatbridge/price.py

@@ -37,6 +37,7 @@ _JD_APP_KEY = os.getenv("JDUNION_APP_KEY", "")
 # false-positive on this empty getenv default (no literal secret value here).
 _JD_SECRET_KEY = os.getenv("JDUNION_APP_SECRET", "")
 _DT_APP_KEY = os.getenv("DATAOKE_APP_KEY", "")
+_DT_APP_SECRET = os.getenv("DATAOKE_APP_SECRET", "")
 _DT_TIMEOUT = int(os.getenv("PRICE_HTTP_TIMEOUT", "15"))
 
 JD_API_URL = "https://api.jd.com/routerjson"
@@ -48,7 +49,9 @@ def jd_configured() -> bool:
 
 
 def dt_configured() -> bool:
-    return bool(_DT_APP_KEY)
+    # Dataoke rejects unsigned requests: both the appKey and the appSecret
+    # (used only locally to compute `sign`, never sent) are required.
+    return bool(_DT_APP_KEY and _DT_APP_SECRET)
 
 
 def price_feature_ready() -> bool:
@@ -182,11 +185,15 @@ def detect_price_trigger(text: str) -> dict | None:
 
 
 def _jd_sign(params: dict) -> str:
+    # JD gateway rule: MD5(secret + sorted key+value concat + secret), upper.
+    # The secret wraps BOTH ends — appending it only at the end produces a
+    # signature the gateway always rejects.
     plain = "".join(
         f"{k}{v}" for k, v in sorted(params.items()) if k != "sign"
     )
-    plain += _JD_SECRET_KEY
-    return hashlib.md5(plain.encode("utf-8")).hexdigest().upper()
+    return hashlib.md5(
+        (_JD_SECRET_KEY + plain + _JD_SECRET_KEY).encode("utf-8")
+    ).hexdigest().upper()
 
 
 def _jd_call(method: str, param_json: dict) -> dict:
@@ -244,10 +251,23 @@ def query_jd_sku(sku: str) -> PriceResult:
 # 大淘客 (Taobao/Tmall proxy) API
 # ---------------------------------------------------------------------------
 
+def _dt_sign(params: dict) -> str:
+    # Dataoke rule (per the official SDK): sort every request parameter
+    # (appKey and version included, sign excluded) by key, join as
+    # "k1=v1&k2=v2&...", append "&key=<appSecret>", MD5, uppercase.
+    plain = "&".join(
+        f"{k}={v}" for k, v in sorted(params.items()) if k != "sign"
+    )
+    return hashlib.md5(
+        (plain + "&key=" + _DT_APP_SECRET).encode("utf-8")
+    ).hexdigest().upper()
+
+
 def _dt_call(path: str, params: dict) -> dict:
     params = dict(params)
     params["appKey"] = _DT_APP_KEY
     params["version"] = params.get("version", "v2.0.0")
+    params["sign"] = _dt_sign(params)
     resp = httpx.get(f"{DT_API_URL}{path}", params=params, timeout=_DT_TIMEOUT)
     resp.raise_for_status()
     data = resp.json()
@@ -257,16 +277,24 @@ def _dt_call(path: str, params: dict) -> dict:
 
 
 def resolve_tkl(token: str) -> dict:
-    """Parse taokouling → item info via dataoke tpwd API."""
+    """Parse taokouling → item info via dataoke's universal parse API.
+
+    The endpoint for turning a share token / share text into a goods id is
+    /tb-service/parse-content (param: content). The privilege-link endpoint
+    only converts an already-known goodsId into a promotion link and cannot
+    parse tokens.
+    """
     return _dt_call(
-        "/goods/get-privilege-link",
-        {"taoCommand": token, "apiName": "generous"},
+        "/tb-service/parse-content",
+        {"content": token, "version": "v1.0.0"},
     )
 
 
 def query_tb_item(item_id: str) -> PriceResult:
     """Query Taobao/Tmall item via dataoke goods detail API."""
-    data = _dt_call("/goods/get-goods-details", {"id": item_id})
+    # get-goods-details takes the Taobao item id as `goodsId`, not `id`
+    # (`id` is dataoke's own internal goods id and matches nothing here).
+    data = _dt_call("/goods/get-goods-details", {"goodsId": str(item_id)})
     goods = data.get("goods", data)
     quan_price = float(goods.get("quanPrice", 0) or 0)
     actual_price = float(goods.get("actualPrice", goods.get("originalPrice", 0)) or 0)
@@ -400,7 +428,11 @@ async def handle_price_query(trigger: dict) -> str:
             if not dt_configured():
                 return _not_configured("大淘客（淘宝口令解析）")
             data = await asyncio.to_thread(resolve_tkl, trigger["token"])
-            goods_id = str(data.get("goodsId", "") or data.get("id", ""))
+            goods_id = str(
+                data.get("goodsId", "")
+                or data.get("itemId", "")
+                or data.get("id", "")
+            )
             if not goods_id:
                 return "❓ 口令解析出来了但没拿到商品信息，可能商品未收录。"
             res = await asyncio.to_thread(query_tb_item, goods_id)
@@ -440,5 +472,5 @@ def _not_configured(what: str) -> str:
         f"ℹ️ **比价功能未启用** ℹ️\n\n{what} 的 API key 还没配置。\n"
         "在桥的 .env 里设置后重启即可：\n"
         "`JDUNION_APP_KEY` / `JDUNION_APP_SECRET`（京东）\n"
-        "`DATAOKE_APP_KEY`（淘宝/天猫）"
+        "`DATAOKE_APP_KEY` / `DATAOKE_APP_SECRET`（淘宝/天猫）"
     )

{wechatbridge_cli-1.7.1 → wechatbridge_cli-1.7.2}/wechatbridge_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wechatbridge-cli
-Version: 1.7.1
+Version: 1.7.2
 Summary: Bridge WeChat messages to agy, Grok Build, or Codex CLIs — text/image/file/voice in, CLI replies and generated files back.
 Author: WeChatBridge contributors
 License: MIT

{wechatbridge_cli-1.7.1 → wechatbridge_cli-1.7.2}/wechatbridge_cli.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ tests/test_codex_auth.py
 tests/test_dsh.py
 tests/test_grok_auth.py
 tests/test_hardening.py
+tests/test_price.py
 wechatbridge/__init__.py
 wechatbridge/__main__.py
 wechatbridge/agy.py