🐛 fix(plugin-store): 优先获取commit号在进行插件下载 (#1853)

* 🐛  fix(plugin-store): 优先获取commit号在进行插件下载

* ✅  perf(github-utils): 使用sourcery建议，封装更新commit方法

tests/builtin_plugins/plugin_store/test_add_plugin.py

@@ -16,8 +16,10 @@ from tests.utils import _v11_group_message_event
 
 
 @pytest.mark.parametrize("package_api", ["jsd", "gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_basic(
     package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
     mocked_api: MockRouter,
@@ -40,6 +42,12 @@ async def test_add_plugin_basic(
     if package_api != "gh":
         mocked_api["zhenxun_bot_plugins_tree"].respond(404)
 
+    if not is_commit:
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
+
     plugin_id = 1
 
     async with app.test_matcher(_matcher) as ctx:
@@ -67,15 +75,22 @@ async def test_add_plugin_basic(
             result=None,
             bot=bot,
         )
-    assert mocked_api["basic_plugins"].called
-    assert mocked_api["extra_plugins"].called
-    assert mocked_api["search_image_plugin_file_init"].called
+    if is_commit:
+        assert mocked_api["search_image_plugin_file_init_commit"].called
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["search_image_plugin_file_init"].called
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
 @pytest.mark.parametrize("package_api", ["jsd", "gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_basic_commit_version(
     package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
     mocked_api: MockRouter,
@@ -98,6 +113,11 @@ async def test_add_plugin_basic_commit_version(
     if package_api != "gh":
         mocked_api["zhenxun_bot_plugins_tree_commit"].respond(404)
 
+    if not is_commit:
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
     plugin_id = 3
 
     async with app.test_matcher(_matcher) as ctx:
@@ -125,19 +145,25 @@ async def test_add_plugin_basic_commit_version(
             result=None,
             bot=bot,
         )
-    assert mocked_api["basic_plugins"].called
-    assert mocked_api["extra_plugins"].called
     if package_api == "jsd":
         assert mocked_api["zhenxun_bot_plugins_metadata_commit"].called
     if package_api == "gh":
         assert mocked_api["zhenxun_bot_plugins_tree_commit"].called
+    if is_commit:
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
     assert mocked_api["bilibili_sub_plugin_file_init"].called
     assert (mock_base_path / "plugins" / "bilibili_sub" / "__init__.py").is_file()
 
 
 @pytest.mark.parametrize("package_api", ["jsd", "gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_basic_is_not_dir(
     package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
     mocked_api: MockRouter,
@@ -160,6 +186,12 @@ async def test_add_plugin_basic_is_not_dir(
     if package_api != "gh":
         mocked_api["zhenxun_bot_plugins_tree"].respond(404)
 
+    if not is_commit:
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
+
     plugin_id = 0
 
     async with app.test_matcher(_matcher) as ctx:
@@ -187,15 +219,22 @@ async def test_add_plugin_basic_is_not_dir(
             result=None,
             bot=bot,
         )
-    assert mocked_api["basic_plugins"].called
-    assert mocked_api["extra_plugins"].called
-    assert mocked_api["jitang_plugin_file"].called
+    if is_commit:
+        assert mocked_api["jitang_plugin_file_commit"].called
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["jitang_plugin_file"].called
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
     assert (mock_base_path / "plugins" / "alapi" / "jitang.py").is_file()
 
 
 @pytest.mark.parametrize("package_api", ["jsd", "gh"])
+@pytest.mark.parametrize("is_commit", [True, False])
 async def test_add_plugin_extra(
     package_api: str,
+    is_commit: bool,
     app: App,
     mocker: MockerFixture,
     mocked_api: MockRouter,
@@ -218,6 +257,14 @@ async def test_add_plugin_extra(
     if package_api != "gh":
         mocked_api["zhenxun_github_sub_tree"].respond(404)
 
+    if not is_commit:
+        mocked_api["zhenxun_github_sub_commit"].respond(404)
+        mocked_api["zhenxun_github_sub_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_commit_proxy"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit"].respond(404)
+        mocked_api["zhenxun_bot_plugins_index_commit_proxy"].respond(404)
+
     plugin_id = 4
 
     async with app.test_matcher(_matcher) as ctx:
@@ -245,9 +292,14 @@ async def test_add_plugin_extra(
             result=None,
             bot=bot,
         )
-    assert mocked_api["basic_plugins"].called
-    assert mocked_api["extra_plugins"].called
-    assert mocked_api["github_sub_plugin_file_init"].called
+    if is_commit:
+        assert mocked_api["github_sub_plugin_file_init_commit"].called
+        assert mocked_api["basic_plugins"].called
+        assert mocked_api["extra_plugins"].called
+    else:
+        assert mocked_api["github_sub_plugin_file_init"].called
+        assert mocked_api["basic_plugins_no_commit"].called
+        assert mocked_api["extra_plugins_no_commit"].called
     assert (mock_base_path / "plugins" / "github_sub" / "__init__.py").is_file()
 
 

tests/builtin_plugins/plugin_store/test_plugin_store.py

@@ -112,7 +112,7 @@ async def test_plugin_store_fail(
 
     init_mocked_api(mocked_api=mocked_api)
     mocked_api.get(
-        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins.json",
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins.json",
         name="basic_plugins",
     ).respond(404)
 

tests/builtin_plugins/plugin_store/test_update_all_plugin.py

@@ -65,7 +65,7 @@ async def test_update_all_plugin_basic_need_update(
         )
     assert mocked_api["basic_plugins"].called
     assert mocked_api["extra_plugins"].called
-    assert mocked_api["search_image_plugin_file_init"].called
+    assert mocked_api["search_image_plugin_file_init_commit"].called
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 

tests/builtin_plugins/plugin_store/test_update_plugin.py

@@ -65,7 +65,7 @@ async def test_update_plugin_basic_need_update(
         )
     assert mocked_api["basic_plugins"].called
     assert mocked_api["extra_plugins"].called
-    assert mocked_api["search_image_plugin_file_init"].called
+    assert mocked_api["search_image_plugin_file_init_commit"].called
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 

tests/builtin_plugins/plugin_store/utils.py

@@ -30,6 +30,10 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
         "https://data.jsdelivr.com/v1/packages/gh/zhenxun-org/zhenxun_bot_plugins@b101fbc",
         name="zhenxun_bot_plugins_metadata_commit",
     ).respond(json=get_response_json("zhenxun_bot_plugins_metadata.json"))
+    mocked_api.get(
+        "https://data.jsdelivr.com/v1/packages/gh/xuanerwa/zhenxun_github_sub@f524632f78d27f9893beebdf709e0e7885cd08f1",
+        name="zhenxun_github_sub_metadata_commit",
+    ).respond(json=get_response_json("zhenxun_github_sub_metadata.json"))
 
     # tree
     mocked_api.get(
@@ -44,6 +48,10 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
         "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/git/trees/b101fbc?recursive=1",
         name="zhenxun_bot_plugins_tree_commit",
     ).respond(json=get_response_json("zhenxun_bot_plugins_tree.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/git/trees/f524632f78d27f9893beebdf709e0e7885cd08f1?recursive=1",
+        name="zhenxun_github_sub_tree_commit",
+    ).respond(json=get_response_json("zhenxun_github_sub_tree.json"))
 
     mocked_api.head(
         "https://raw.githubusercontent.com/",
@@ -51,36 +59,89 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
     ).respond(200, text="")
 
     mocked_api.get(
-        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins.json",
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins.json",
         name="basic_plugins",
     ).respond(json=get_response_json("basic_plugins.json"))
     mocked_api.get(
-        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins@main/plugins.json",
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins@b101fbc/plugins.json",
         name="basic_plugins_jsdelivr",
     ).respond(200, json=get_response_json("basic_plugins.json"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins.json",
+        name="basic_plugins_no_commit",
+    ).respond(json=get_response_json("basic_plugins.json"))
+    mocked_api.get(
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins@main/plugins.json",
+        name="basic_plugins_jsdelivr_no_commit",
+    ).respond(200, json=get_response_json("basic_plugins.json"))
 
     mocked_api.get(
-        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins_index/index/plugins.json",
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins_index/2ed61284873c526802752b12a3fd3b5e1a59d948/plugins.json",
         name="extra_plugins",
     ).respond(200, json=get_response_json("extra_plugins.json"))
     mocked_api.get(
-        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins_index@index/plugins.json",
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins_index@2ed61284873c526802752b12a3fd3b5e1a59d948/plugins.json",
         name="extra_plugins_jsdelivr",
     ).respond(200, json=get_response_json("extra_plugins.json"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins_index/index/plugins.json",
+        name="extra_plugins_no_commit",
+    ).respond(200, json=get_response_json("extra_plugins.json"))
+    mocked_api.get(
+        "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins_index@index/plugins.json",
+        name="extra_plugins_jsdelivr_no_commit",
+    ).respond(200, json=get_response_json("extra_plugins.json"))
 
     mocked_api.get(
         "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins/search_image/__init__.py",
         name="search_image_plugin_file_init",
     ).respond(content=get_content_bytes("search_image.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins/search_image/__init__.py",
+        name="search_image_plugin_file_init_commit",
+    ).respond(content=get_content_bytes("search_image.py"))
     mocked_api.get(
         "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/main/plugins/alapi/jitang.py",
         name="jitang_plugin_file",
     ).respond(content=get_content_bytes("jitang.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins/alapi/jitang.py",
+        name="jitang_plugin_file_commit",
+    ).respond(content=get_content_bytes("jitang.py"))
     mocked_api.get(
         "https://raw.githubusercontent.com/xuanerwa/zhenxun_github_sub/main/github_sub/__init__.py",
         name="github_sub_plugin_file_init",
     ).respond(content=get_content_bytes("github_sub.py"))
+    mocked_api.get(
+        "https://raw.githubusercontent.com/xuanerwa/zhenxun_github_sub/f524632f78d27f9893beebdf709e0e7885cd08f1/github_sub/__init__.py",
+        name="github_sub_plugin_file_init_commit",
+    ).respond(content=get_content_bytes("github_sub.py"))
     mocked_api.get(
         "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins/b101fbc/plugins/bilibili_sub/__init__.py",
         name="bilibili_sub_plugin_file_init",
     ).respond(content=get_content_bytes("bilibili_sub.py"))
+
+    mocked_api.get(
+        "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins/commits/main",
+        name="zhenxun_bot_plugins_commit",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_commit.json"))
+    mocked_api.get(
+        "https://git-api.zhenxun.org/repos/zhenxun-org/zhenxun_bot_plugins/commits/main",
+        name="zhenxun_bot_plugins_commit_proxy",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_commit.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/zhenxun-org/zhenxun_bot_plugins_index/commits/index",
+        name="zhenxun_bot_plugins_index_commit",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_index_commit.json"))
+    mocked_api.get(
+        "https://git-api.zhenxun.org/repos/zhenxun-org/zhenxun_bot_plugins_index/commits/index",
+        name="zhenxun_bot_plugins_index_commit_proxy",
+    ).respond(json=get_response_json("zhenxun_bot_plugins_index_commit.json"))
+    mocked_api.get(
+        "https://api.github.com/repos/xuanerwa/zhenxun_github_sub/commits/main",
+        name="zhenxun_github_sub_commit",
+    ).respond(json=get_response_json("zhenxun_github_sub_commit.json"))
+    mocked_api.get(
+        "https://git-api.zhenxun.org/repos/xuanerwa/zhenxun_github_sub/commits/main",
+        name="zhenxun_github_sub_commit_proxy",
+    ).respond(json=get_response_json("zhenxun_github_sub_commit.json"))