From fadb059030f2cfe972bc2d341e3b496e8505e37d Mon Sep 17 00:00:00 2001
From: flyqie <flyqie@outlook.com>
Date: Sun, 20 Oct 2024 11:13:58 +0800
Subject: [PATCH] =?UTF-8?q?packet=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile       | 7 ++++++-
 base/Dockerfile  | 1 +
 entrypoint.sh    | 4 ++++
 get_artifacts.sh | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cd5673d..29b1532 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,13 +9,18 @@ COPY qqnt.json /app/
 
 # 安装Linux QQ
 RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
-    curl -o linuxqq.deb https://dldir1.qq.com/qqfile/qq/QQNT/0256c948/linuxqq_3.2.12-28418_${arch}.deb && \
+    curl -o linuxqq.deb https://dldir1.qq.com/qqfile/qq/QQNT/55fb6434/linuxqq_3.2.13-28788_${arch}.deb && \
     dpkg -i --force-depends linuxqq.deb && rm linuxqq.deb && \
     chmod +x entrypoint.sh && \
     rm -rf /opt/QQ/resources/app/package.json && \
     echo "(async () => {await import('file:///app/napcat/napcat.mjs');})();" > /opt/QQ/resources/app/loadNapCat.js && \
     mv /app/qqnt.json /opt/QQ/resources/app/package.json
 
+# 安装packet-server
+RUN mkdir /app/napcat.packet/
+COPY napcat.packet.linux /app/napcat.packet/
+RUN chmod -R 755 /app/napcat.packet/
+
 VOLUME /app/napcat/config
 VOLUME /app/.config/QQ
 
diff --git a/base/Dockerfile b/base/Dockerfile
index bfe99d7..396a49a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update && apt-get install -y \
     unzip \
     dbus-user-session \
     curl \
+    jq \
     gosu \
     tzdata && \
     echo "${TZ}" > /etc/timezone && \ 
diff --git a/entrypoint.sh b/entrypoint.sh
index c52f058..d086b18 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -83,6 +83,7 @@ cat <<EOF > $CONFIG_PATH
     "token": "$TOKEN"
 }
 EOF
+    jq '.packetServer = "127.0.0.1:8086"' napcat/config/napcat.json > napcat/config/napcat._json && mv napcat/config/napcat._json napcat/config/napcat.json
 fi
 rm -rf "/tmp/.X1-lock"
 
@@ -93,6 +94,9 @@ chown -R ${NAPCAT_UID}:${NAPCAT_GID} /app
 
 gosu napcat Xvfb :1 -screen 0 1080x760x16 +extension GLX +render > /dev/null 2>&1 &
 sleep 2
+# 方便调试, 或许应该重定向到/dev/null?
+gosu napcat /app/napcat.packet/napcat.packet.linux 2>&1 &
+sleep 2
 export FFMPEG_PATH=/usr/bin/ffmpeg
 export DISPLAY=:1
 cd /app/napcat
diff --git a/get_artifacts.sh b/get_artifacts.sh
index 3ef71e0..4eaa769 100644
--- a/get_artifacts.sh
+++ b/get_artifacts.sh
@@ -10,6 +10,11 @@ curl -s -X GET \
     -H "Authorization: token $token" \
     -L "https://github.com/NapNeko/NapCatQQ/releases/download/$version/NapCat.Shell.zip" \
     -o "$output_dir/NapCat.Shell.zip"
+# 下载packet-server
+curl -s -X GET \
+    -H "Authorization: token $token" \
+    -L "https://github.com/NapNeko/NapCatQQ/releases/download/v3.0.0/napcat.packet.linux" \
+    -o "$output_dir/napcat.packet.linux"
 
 echo "编译产物已保存到$output_dir"
 ls -lh