refactor(modules): 添加类型注解并优化 WSL 检测

- 全模块补全类型注解 (files, after_update, on_change)
- docker: 仅在 WSL 环境禁用 networkd-wait-online
- docker: 添加 _is_wsl() 自动检测函数
- zsh/docker: 改进错误输出使用 decman.error
- wsl-init: 统一使用 [[ ]] 并格式化代码
This commit is contained in:
2026-04-09 12:09:00 +08:00
parent 4182b3c300
commit b96e144e82
6 changed files with 54 additions and 35 deletions
+23 -8
View File
@@ -1,4 +1,5 @@
import subprocess
from pathlib import Path
import decman
from decman import Module
@@ -6,10 +7,19 @@ from decman.plugins.pacman import packages as pacman_packages
from decman.plugins.systemd import units
def _is_wsl() -> bool:
"""检测是否在 WSL 环境"""
try:
return "microsoft" in Path("/proc/version").read_text().lower()
except OSError:
return False
class DockerModule(Module):
def __init__(self, user: str):
super().__init__("docker")
self.user = user
self._is_wsl = _is_wsl()
@pacman_packages
def pacman_packages(self) -> set[str]:
@@ -19,26 +29,31 @@ class DockerModule(Module):
def units(self) -> set[str]:
return {"docker.socket"}
def after_update(self, store):
def after_update(self, store: object) -> None:
self._ensure_user_in_docker_group()
self._disable_networkd_wait_online()
if self._is_wsl:
self._disable_networkd_wait_online()
def _ensure_user_in_docker_group(self):
def _ensure_user_in_docker_group(self) -> None:
result = subprocess.run(
["id", "-nG", self.user], capture_output=True, text=True
["id", "-nG", self.user],
capture_output=True,
text=True,
check=False,
)
if result.returncode != 0:
decman.error(f"无法读取用户 {self.user} 的组信息")
return
if "docker" not in result.stdout.split():
decman.prg(["gpasswd", "-a", self.user, "docker"])
def _disable_networkd_wait_online(self):
# systemd-networkd-wait-online.service 会阻塞 network-online.target
# 直到所有 link ready 或 120s 超时,导致 docker.service 启动卡约两分钟
def _disable_networkd_wait_online(self) -> None:
"""WSL 环境:禁用 systemd-networkd-wait-online 避免启动阻塞"""
result = subprocess.run(
["systemctl", "is-enabled", "systemd-networkd-wait-online.service"],
capture_output=True,
text=True,
check=False,
)
if result.stdout.strip() == "enabled":
if result.returncode == 0 and result.stdout.strip() == "enabled":
decman.prg(["systemctl", "disable", "systemd-networkd-wait-online.service"])