change 'nmp' to 'proxy'

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "nmp/nmp"]
-	path = nmp/nmp
-	url = https://git.oxfs.io/nmp/nmp.git
 [submodule "jellyfin/jellyfin-noto"]
 	path = jellyfin/jellyfin-noto
 	url = https://github.com/jellyfin-archive/jellyfin-noto.git
 [submodule "wsdd2/wsdd2"]
 	path = wsdd2/wsdd2
 	url = https://github.com/Netgear/wsdd2.git
+[submodule "proxy/nmp"]
+	path = proxy/nmp
+	url = https://git.oxfs.io/nmp/nmp.git

custom.env.example

@@ -17,6 +17,7 @@ ARGS_JELLYFIN_VERSION=10.7.7
 
 # proxy service
 PROXY_SOCKS_PORT=1234
+PROXY_HTTP_PORT=1248
 PROXY_NMP_ENDPOINT=wss://next.example.com
 PROXY_NMP_TOKEN=abcd1234bcda4312
 

docker-compose.gen

@@ -28,13 +28,14 @@ cat <<-EOF >docker-compose.yml
 version: '3'
 
 services:
-  nmp:
+  proxy:
-    image: "oxfs.io/nmp"
+    image: "sigkill.top/proxy"
     build:
-      context: ./nmp
+      context: ./proxy
       args:
         - PYTHON_VERSION=${ARGS_PYTHON_VERSION}
         - ALPINE_VERSION=${ARGS_ALPINE_VERSION}
+        - APK_MIRROR=${ARGS_APK_MIRROR}
     environment:
       - NMP_ENDPOINT=${PROXY_NMP_ENDPOINT}
       - NMP_TOKEN=${PROXY_NMP_TOKEN}
@@ -42,7 +43,7 @@ services:
       - localnet
     ports:
       - ${PROXY_SOCKS_PORT}:10086
-      #- 10080:10080
+      - ${PROXY_HTTP_PORT}:10080
     restart: unless-stopped
 
   samba:

motd/Dockerfile

@@ -3,12 +3,15 @@ FROM alpine:${ALPINE_VERSION}
 
 ARG APK_MIRROR=dl-cdn.alpinelinux.org
 
+COPY motd.run /etc/periodic/hourly/
+
 RUN sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories && \
-    apk --no-cache --no-progress add jq curl && \
+    apk add --no-cache --no-progress tzdata jq curl && \
+    chmod +x /etc/periodic/hourly/motd.run && \
     rm -rf /tmp/*
 
-COPY motd.run /etc/periodic/hourly/
-
 VOLUME ["/mnt/motd"]
 
+ENV TZ=Asia/Shanghai
+
 ENTRYPOINT ["crond", "-f", "-d", "8"]

nmp/Dockerfile

@@ -1,19 +0,0 @@
-ARG PYTHON_VERSION=3
-ARG ALPINE_VERSION
-FROM python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
-
-ENV NMP_ENDPOINT=""
-ENV NMP_TOKEN=""
-
-WORKDIR /var/lib/nmp
-
-COPY nmp/nmp/ ./nmp/
-COPY nmp/setup.py ./
-COPY nmp.run /usr/local/bin/
-
-RUN ["chmod", "+x", "/usr/local/bin/nmp.run"]
-RUN ["python", "setup.py", "develop"]
-
-EXPOSE 10086/tcp
-
-ENTRYPOINT ["nmp.run"]

nmp/nmp

@@ -1 +0,0 @@
-Subproject commit 577ed20ee80845163264c230f40903458022f124

nmp/nmp.run

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec nmp --uvloop true --server sockv5 --endpoint "${NMP_ENDPOINT}" --host '0.0.0.0' --port 10086 --token "${NMP_TOKEN}"

proxy/Dockerfile

@@ -0,0 +1,21 @@
+ARG PYTHON_VERSION=3
+ARG ALPINE_VERSION
+FROM python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
+
+ARG APK_MIRROR="dl-cdn.alpinelinux.org"
+ENV NMP_ENDPOINT=""
+ENV NMP_TOKEN=""
+
+COPY proxy.run /usr/local/bin/
+COPY v2ray/config.json /etc/v2ray/
+COPY nmp/setup.py /tmp/nmp/
+COPY nmp/nmp/ /tmp/nmp/nmp/
+
+RUN sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories && \
+    apk add --no-cache --no-progress v2ray && \
+    chmod +x /usr/local/bin/proxy.run && \
+    cd /tmp/nmp && python setup.py develop
+
+EXPOSE 10086 10080
+
+ENTRYPOINT ["proxy.run"]

proxy/nmp

@@ -0,0 +1 @@
+Subproject commit e26f8b811f7ad340f477552ea4becee100b732ce

proxy/proxy.run

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+nmp --uvloop true --server sockv5 --endpoint "${NMP_ENDPOINT}" --host '0.0.0.0' --port 10086 --token "${NMP_TOKEN}" >/dev/null 2>&1 &
+sleep 1
+exec v2ray -config /etc/v2ray/config.json >/dev/null 2>&1

proxy/v2ray/config.json

@@ -0,0 +1,45 @@
+{
+    "log": {
+        "access": "none",
+        "error": "none",
+        "loglevel": "none"
+    },
+    "routing": {
+        "domainStrategy": "AsIs",
+        "domainMatcher": "mph",
+        "rules": [{
+            "domainMatcher": "mph",
+            "type": "field",
+            "domains": [
+                "geosite:tld-cn",
+                "geosite:geolocation-cn"
+            ],
+            "inboundTag": "tagin-http",
+            "outboundTag": "tagout-direct"
+        }]
+    },
+    "inbounds": [{
+        "listen": "0.0.0.0",
+        "port": 10080,
+        "protocol": "http",
+        "settings": {
+            "timeout": 60,
+            "allowTransparent": false
+        },
+        "tag": "tagin-http"
+    }],
+    "outbounds": [{
+        "sendThrough": "0.0.0.0",
+        "protocol": "socks",
+        "settings": {
+            "servers": [{
+                "address": "127.0.0.1",
+                "port": 10086
+            }]
+        },
+        "tag": "tagout-socks"
+    }, {
+        "protocol": "freedom",
+        "tag": "tagout-direct"
+    }]
+}