在线搜索、播放功能增强

.gitignore

@@ -171,3 +171,5 @@ cache
 tmp/
 xiaomusic.log.txt*
 node_modules
+js_plugins/
+reference/

Dockerfile

@@ -1,22 +1,52 @@
-FROM hanxi/xiaomusic:builder AS builder
+FROM python:3.12-alpine3.22 AS builder
+
+RUN apk add --no-cache --virtual .build-deps build-base python3-dev libffi-dev openssl-dev zlib-dev jpeg-dev libc6-compat gcc musl-dev \
+    && apk add --no-cache nodejs npm
+
 RUN pip install -U pdm
 ENV PDM_CHECK_UPDATE=false
 WORKDIR /app
-COPY pyproject.toml README.md .
+COPY pyproject.toml README.md package.json .
+
+RUN pdm install --prod --no-editable -v
+RUN npm install
+
 COPY xiaomusic/ ./xiaomusic/
 COPY plugins/ ./plugins/
 COPY holiday/ ./holiday/
+COPY js_plugins/ ./js_plugins/
 COPY xiaomusic.py .
-RUN pdm install --prod --no-editable -v
 
-FROM hanxi/xiaomusic:runtime
+FROM python:3.12-alpine3.22
+
+RUN apk add --no-cache  bash\
+    wget \
+    xz \
+    tiff \
+    openjpeg \
+    libxcb \
+    supervisor \
+    vim \
+    libc6-compat \
+    ffmpeg \
+    nodejs \
+    npm \
+    && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /app
+RUN mkdir -p /app/ffmpeg/bin \
+    && ln -s /usr/bin/ffmpeg /app/ffmpeg/bin/ffmpeg \
+    && ln -s /usr/bin/ffprobe /app/ffmpeg/bin/ffprobe
+
 COPY --from=builder /app/.venv ./.venv
+COPY --from=builder /app/node_modules ./node_modules/
 COPY --from=builder /app/xiaomusic/ ./xiaomusic/
 COPY --from=builder /app/plugins/ ./plugins/
 COPY --from=builder /app/holiday/ ./holiday/
+COPY --from=builder /app/js_plugins/ ./js_plugins/
 COPY --from=builder /app/xiaomusic.py .
 COPY --from=builder /app/xiaomusic/__init__.py /base_version.py
+COPY --from=builder /app/package.json .
 RUN touch /app/.dockerenv
 
 COPY supervisord.conf /etc/supervisor/supervisord.conf
@@ -26,6 +56,6 @@ VOLUME /app/conf
 VOLUME /app/music
 EXPOSE 8090
 ENV TZ=Asia/Shanghai
-ENV PATH=/app/.venv/bin:$PATH
+ENV PATH=/app/.venv/bin:/usr/local/bin:$PATH
 
 ENTRYPOINT ["/bin/sh", "-c", "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf && tail -F /app/supervisord.log /app/xiaomusic.log.txt"]

Dockerfile.builder

@@ -1,14 +1,18 @@
 FROM python:3.12-alpine3.22
 
-RUN apk add --no-cache --virtual .build-deps build-base python3-dev libffi-dev openssl-dev zlib-dev jpeg-dev libc6-compat gcc musl-dev
+RUN apk add --no-cache --virtual .build-deps build-base python3-dev libffi-dev openssl-dev zlib-dev jpeg-dev libc6-compat gcc musl-dev \
+    && apk add --no-cache nodejs npm
+
 RUN pip install -U pdm
 ENV PDM_CHECK_UPDATE=false
 WORKDIR /app
-COPY pyproject.toml README.md ./
+COPY pyproject.toml README.md package.json ./
 
 RUN pdm install --prod --no-editable -v
+RUN npm install
 
 COPY xiaomusic/ ./xiaomusic/
 COPY plugins/ ./plugins/
 COPY holiday/ ./holiday/
 COPY xiaomusic.py .
+COPY js_plugins/ ./js_plugins/

Dockerfile.runtime

@@ -10,6 +10,8 @@ RUN apk add --no-cache  bash\
     vim \
     libc6-compat \
     ffmpeg \
+    nodejs \
+    npm \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app