revert: revert: refactor: migrate to Lagrange.Milky

revert 657f5d8

Author: ProgramRipper

.github/workflows/deploy-image.yml

@@ -2,18 +2,28 @@ name: Create and publish a Docker image
 
 on:
   push:
-    branches: ["master"]
+    branches: [ master ]
 
 jobs:
-  build-and-push-image:
-    runs-on: ${{ matrix.os }}
+  build:
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm]
+        include:
+        - platform: linux/amd64
+          runner: ubuntu-24.04
+        - platform: linux/arm64
+          runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
 
     steps:
       - uses: actions/checkout@v6
 
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
       - name: Login to Container Registry
         uses: docker/login-action@v3
         with:
@@ -30,11 +40,70 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push
+      - name: Build and push by digest
+        id: build
         uses: docker/build-push-action@v6
         with:
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          tags: ${{ vars.DOCKER_REGISTRY }}/${{ vars.DOCKER_IMAGE_NAME }}
+          outputs: type=image,push-by-digest=true,name-canonical=true,push=true
+          cache-from: type=gha,scope=${{ env.PLATFORM_PAIR }}
+          cache-to: type=gha,mode=max,scope=${{ env.PLATFORM_PAIR }}
+
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Login to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ vars.DOCKER_REGISTRY }}/${{ vars.DOCKER_IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ vars.DOCKER_REGISTRY }}/${{ vars.DOCKER_IMAGE_NAME }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ vars.DOCKER_REGISTRY }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ steps.meta.outputs.version }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-alpine AS base
+FROM python:3.14-alpine AS base
 WORKDIR /app
 
 

bot.py

@@ -1,9 +1,11 @@
 import nonebot
+from nonebot.adapters.milky import Adapter as NONEBOT_ADAPTER_MILKYAdapter
 from nonebot.adapters.onebot.v11 import Adapter as ONEBOT_V11Adapter
 
 nonebot.init()
 
 driver = nonebot.get_driver()
+driver.register_adapter(NONEBOT_ADAPTER_MILKYAdapter)
 driver.register_adapter(ONEBOT_V11Adapter)
 
 

pdm.lock

@@ -1,41 +1,43 @@
 [project]
-name = ""
+name = "Twelve"
 version = "0.1.0"
-description = "Twelve"
-readme = "README.md"
-requires-python = "~=3.13"
+requires-python = "~=3.14"
 dependencies = [
     "backoff~=2.2",
     "nonebot2[fastapi,httpx,websockets]~=2.4",
+    "nonebot-adapter-milky @ https://github.com/nonebot/adapter-milky/archive/9afaa853697e1ee6f126b5127b1e7cbc701c1656.zip",
     "nonebot-adapter-onebot~=2.4",
     "nonebot-plugin-alconna~=0.60",
     "nonebot-plugin-apscheduler~=0.5",
-    "nonebot-plugin-htmlkit~=0.1.0rc4",
+    "nonebot-plugin-htmlkit~=0.1.0rc5",
     "nonebot-plugin-htmlrender~=0.6",
     "nonebot-plugin-orm[sqlite]~=0.8",
     "nonebot-plugin-uninfo~=0.10",
     "playwright @ https://github.com/ProgramRipper/playwright-python/releases/download/v1.55.1/playwright-1.55.1-py3-none-any.whl",
 ]
 
 [dependency-groups]
-dev = ["black~=24.10", "isort~=5.13", "nb-cli~=1.4"]
+dev = ["black~=24.10", "isort~=5.13", "nb-cli~=1.7"]
+
+[tool.pdm]
+distribution = false
 
 [tool.nonebot]
-adapters = [
-    { name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11" },
-]
-plugins = [
-    "nonebot_plugin_alconna",
-    "nonebot_plugin_apscheduler",
-    "nonebot_plugin_htmlkit",
-    "nonebot_plugin_htmlrender",
-    "nonebot_plugin_orm",
-    "nonebot_plugin_uninfo",
-]
 plugin_dirs = ["src/plugins"]
-builtin_plugins = []
+
+[tool.nonebot.adapters]
+nonebot-adapter-milky = [{name = "nonebot-adapter-milky", module_name = "nonebot.adapters.milky"}]
+nonebot-adapter-onebot = [{name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11"}]
+
+[tool.nonebot.plugins]
+nonebot-plugin-alconna = ["nonebot_plugin_alconna"]
+nonebot-plugin-apscheduler = ["nonebot_plugin_apscheduler"]
+nonebot-plugin-htmlkit = ["nonebot_plugin_htmlkit"]
+nonebot-plugin-htmlrender = ["nonebot_plugin_htmlrender"]
+nonebot-plugin-orm = ["nonebot_plugin_orm"]
+nonebot-plugin-uninfo = ["nonebot_plugin_uninfo"]
 
 [tool.pyright]
 enableExperimentalFeatures = true
-pythonVersion = "3.13"
+pythonVersion = "3.14"
 pythonPlatform = "Linux"

pyproject.toml

@@ -239,7 +239,7 @@ async def broadcast(dynamics: list[Dynamic]):
                         else render_screenshot(dynamic["id_str"])
                     ),
                     get_share_click(
-                        dynamic["id_str"], "dynamic", "dt.dt-detail.0.0.pv"
+                        dynamic["id_str"], "dt.dt-detail.0.0.pv", "dynamic"
                     ),
                     session.scalars(
                         select(Subscription).where(
@@ -395,7 +395,7 @@ async def _(id_str: str):
                 )
                 else render_screenshot(dynamic["id_str"])
             ),
-            get_share_click(id_str, "dynamic", "dt.dt-detail.0.0.pv"),
+            get_share_click(id_str, "dt.dt-detail.0.0.pv" ,"dynamic"),
         )
     await plugin_config.template.format(
         name=dynamic["modules"]["module_author"]["name"],

src/plugins/bilibili/plugins/dynamic/__init__.py

@@ -75,8 +75,8 @@ async def broadcast(uids: list[int]) -> None:
                     client.get(info["cover_from_user"] or info["face"]),
                     get_share_click(
                         info["room_id"],
-                        "vertical-three-point",
                         "live.live-room-detail.0.0.pv",
+                        "vertical-three-point",
                     ),
                 )
 
@@ -186,7 +186,7 @@ async def _(uid: int):
 
     url, cover = await gather(
         get_share_click(
-            info["room_id"], "vertical-three-point", "live.live-room-detail.0.0.pv"
+            info["room_id"], "live.live-room-detail.0.0.pv", "vertical-three-point"
         ),
         client.get(info["cover_from_user"] or info["face"]),
     )

src/plugins/bilibili/plugins/live/__init__.py

@@ -1,14 +1,19 @@
 import re
 import string
+from hashlib import md5
 from random import choices
+from time import time
 from typing import Any, NoReturn, TypedDict
+from urllib.parse import urlencode
 
 from arclet.alconna import Arg
 from httpx import AsyncClient, Response
 from nepattern import BasePattern, MatchMode
 from nonebot import logger
 from nonebot_plugin_alconna import UniMessage
 
+from ...utils import acache
+
 UID_ARG = Arg(
     "uid",
     BasePattern(
@@ -52,8 +57,7 @@ def raise_for_status(resp: Response) -> Any:
         "user-agent": "bili-universal/75600100 CFNetwork/1.0 "
         "Darwin/23.2.0 os/ios model/iPhone 13 mini mobi_app/iphone "
         "build/75600100 osVer/17.2 network/1 channel/AppStore;tf:cm"
-    },
-    base_url="https://api.bilibili.com/x/share",
+    }
 )
 
 URL_PATTERN = re.compile(
@@ -63,14 +67,17 @@ def raise_for_status(resp: Response) -> Any:
 )
 
 
-async def get_share_click(oid: Any, origin: str, share_id: str) -> str:
+@acache
+async def get_share_click(
+    oid: Any, share_id: str, share_origin: str | None = None
+) -> str:
     data = raise_for_status(
         await client.post(
-            "/click",
+            "https://api.bilibili.com/x/share/click",
             data={
                 "oid": oid,
                 "share_id": share_id,
-                "share_origin": origin,
+                "share_origin": share_origin,
                 "platform": "ios",
                 "share_channel": "COPY",
                 "share_mode": 3,
@@ -88,10 +95,11 @@ class SharePlacard(TypedDict):
     link: str
 
 
+@acache
 async def get_share_placard(oid: Any, share_id: str) -> SharePlacard:
     return raise_for_status(
         await client.post(
-            "/placard",
+            "https://api.bilibili.com/x/share/placard",
             data={
                 "oid": oid,
                 "platform": "ios",
@@ -102,6 +110,25 @@ async def get_share_placard(oid: Any, share_id: str) -> SharePlacard:
     )
 
 
+APPKEY = "1d8b6e7d45233436"
+APPSEC = "560c52ccd288fed045859ed18bffd973"
+
+
+def sign(params: dict[str, Any]) -> str:
+    query = urlencode(sorted((params | {"appkey": APPKEY}).items()))
+    return query + f"&sign={md5((query + APPSEC).encode()).hexdigest()}"
+
+
+@acache
+async def get_space(uid: int):
+    return raise_for_status(
+        await client.get(
+            "https://app.bilibili.com/x/v2/space",
+            params=sign({"build": "76600100", "ts": int(time()), "vmid": uid}),
+        )
+    )
+
+
 async def handle_error(message: str) -> NoReturn:
     logger.error(message)
     await UniMessage(message).send()

src/plugins/bilibili/utils.py

@@ -1,8 +1,9 @@
 from asyncio import Task, create_task
 from collections.abc import Callable
 from contextlib import suppress
+from functools import cache, wraps
 from inspect import iscoroutine
-from typing import TYPE_CHECKING, Awaitable, TypeVar, cast
+from typing import TYPE_CHECKING, Awaitable, cast
 
 from httpx import AsyncClient
 from nonebot.exception import ActionFailed
@@ -15,17 +16,14 @@
     from nonebot.adapters.milky.model.api import MessageResponse
 
 
-T = TypeVar("T")
-
-
 tasks: set[Task] = set()
 
 
-async def await_(awaitable: Awaitable[T]) -> T:
+async def await_[T](awaitable: Awaitable[T]) -> T:
     return await awaitable
 
 
-def run_task(awaitable: Awaitable[T]) -> Task[T]:
+def run_task[T](awaitable: Awaitable[T]) -> Task[T]:
     if isinstance(awaitable, Task):
         task = awaitable
     elif iscoroutine(awaitable):
@@ -39,6 +37,15 @@ def run_task(awaitable: Awaitable[T]) -> Task[T]:
     return task
 
 
+def acache[T: Callable[..., Awaitable]](user_function: T, /) -> T:
+    @cache
+    @wraps(user_function)
+    def wrapper(*args, **kwargs) -> Task[T]:
+        return run_task(user_function(*args, **kwargs))
+
+    return cast(T, wrapper)
+
+
 async def send_message(scene_model: SceneModel, msg: UniMessage) -> Receipt:
     bot_model = await get_bot_model(scene_model.bot_persist_id)