packet-server start with python

Dockerfile

@@ -2,7 +2,7 @@ FROM mlikiowa/napcat-docker:base
 
 WORKDIR /app
 
-COPY NapCat.Shell.zip entrypoint.sh /app/
+COPY NapCat.Shell.zip entrypoint.sh napcat.packet.production.py /app/
 
 # 安装Linux QQ
 RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
@@ -12,11 +12,6 @@ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
     echo "(async () => {await import('file:///app/napcat/napcat.mjs');})();" > /opt/QQ/resources/app/loadNapCat.js && \
     sed -i 's|"main": "[^"]*"|"main": "./loadNapCat.js"|' /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
 

base/Dockerfile

@@ -26,8 +26,10 @@ RUN apt-get update && apt-get install -y \
     dbus-user-session \
     curl \
     jq \
+    python3-pip \
     tzdata && \
     echo "${TZ}" > /etc/timezone && \ 
+    pip3 install frida websockets && \
     ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
     apt autoremove -y && \
     apt clean && \

entrypoint.sh

@@ -88,10 +88,8 @@ cat <<EOF > $CONFIG_PATH
     "token": "$TOKEN"
 }
 EOF
-    if [ "$(arch)" = "x86_64" ]; then
+    jq '.packetServer = "127.0.0.1:8086"' napcat/config/napcat.json > napcat/config/napcat._json && mv napcat/config/napcat._json napcat/config/napcat.json
-        jq '.packetServer = "127.0.0.1:8086"' napcat/config/napcat.json > napcat/config/napcat._json && mv napcat/config/napcat._json napcat/config/napcat.json
+    cp -f napcat/config/napcat.json napcat/config/napcat_$ACCOUNT.json
-        cp -f napcat/config/napcat.json napcat/config/napcat_$ACCOUNT.json
-    fi
 fi
 rm -rf "/tmp/.X1-lock"
 
@@ -102,11 +100,9 @@ chmod -R 777 /app
 Xvfb :1 -screen 0 1080x760x16 +extension GLX +render > /dev/null 2>&1 &
 sleep 2
 # 方便调试, 或许应该重定向到/dev/null?
-if [ "$(arch)" = "x86_64" ]; then
+python3 napcat.packet.production.py &
-    cd /app/napcat.packet/
+sleep 2
-    /app/napcat.packet/napcat.packet.linux &
+
-    sleep 2
-fi
 export FFMPEG_PATH=/usr/bin/ffmpeg
 export DISPLAY=:1
 cd /app/napcat

get_artifacts.sh

@@ -10,11 +10,6 @@ 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/$version/napcat.packet.linux" \
-    -o "$output_dir/napcat.packet.linux"
 
 echo "编译产物已保存到$output_dir"
 ls -lh