Add files via upload

更新frpc核心，支持新版本的webui功能

Author: sherry11965

app/ui/config

@@ -0,0 +1,13 @@
+{
+    ".url": {
+        "mefrp.Application": {
+            "title": "ME Frp 内网穿透",
+            "icon": "images/icon_{0}.png",
+            "type": "iframe",
+            "protocol": "http",
+            "port": "1201",
+            "url": "/",
+            "allUsers": false
+        }
+    }
+}

app/ui/images/ICON.PNG

@@ -1,72 +1,5 @@
 #!/bin/bash
 
-### This script is called after the user changes environment variables in the application setting page.
+### This script is called after the user change environment variables in application setting page.
 
-# 设置日志文件
-LOG_FILE="${TRIM_APPDEST}/config_callback.log"
-echo "=== $(date): config_callback started (Merged Logic) ===" >> "$LOG_FILE"
-
-# 获取 start_cmd 值
-START_CMD=""
-
-# 1. 尝试从环境变量获取 (fnOS 会将向导字段作为环境变量传入)
-if [ -n "$start_cmd" ]; then
-    START_CMD="$start_cmd"
-    echo "Got start_cmd from environment: $START_CMD" >> "$LOG_FILE"
-fi
-
-# 2. 如果环境变量为空，尝试从配置文件读取作为回退
-if [ -z "$START_CMD" ] && [ -n "$TRIM_APP_CONFIG_DIR" ]; then
-    ENV_FILE="$TRIM_APP_CONFIG_DIR/environment"
-    if [ -f "$ENV_FILE" ]; then
-        START_CMD=$(grep "^start_cmd=" "$ENV_FILE" | cut -d'=' -f2- | tr -d '"')
-        echo "Got start_cmd from config file: $START_CMD" >> "$LOG_FILE"
-    fi
-fi
-
-# 如果获取到了启动命令，执行更新流程
-if [ -n "$START_CMD" ]; then
-    COMPOSE_FILE="${TRIM_APPDEST}/docker/docker-compose.yaml"
-    
-    # 步骤 1: 更新启动命令 (生成新的 docker-compose.yaml)
-    echo "Step 1: Updating docker-compose.yaml with new command..." >> "$LOG_FILE"
-    
-    # 备份旧文件
-    if [ -f "$COMPOSE_FILE" ]; then
-        cp "$COMPOSE_FILE" "$COMPOSE_FILE.backup.$(date +%s)"
-    fi
-
-    cat > "$COMPOSE_FILE" << EOF
-services:
-  my-app:
-    restart: always
-    container_name: mefrp
-    network_mode: host
-    command: "$START_CMD"
-    image: mefrp/core-next:latest
-EOF
-
-    cd "${TRIM_APPDEST}/docker"
-
-    # 步骤 2: 删除容器
-    echo "Step 2: Deleting existing containers (docker-compose down)..." >> "$LOG_FILE"
-    docker-compose down --remove-orphans >> "$LOG_FILE" 2>&1
-
-    # 步骤 3: 重新拉取并启动
-    echo "Step 3: Pulling latest image and starting (docker-compose pull && up)..." >> "$LOG_FILE"
-    docker-compose pull my-app >> "$LOG_FILE" 2>&1
-    docker-compose up -d my-app >> "$LOG_FILE" 2>&1
-
-    if [ $? -eq 0 ]; then
-        echo "SUCCESS: Configuration applied, containers deleted and re-pulled." >> "$LOG_FILE"
-    else
-        echo "ERROR: Failed to complete the update flow." >> "$LOG_FILE"
-    fi
-else
-    echo "WARNING: No start_cmd found, skipping update." >> "$LOG_FILE"
-fi
-
-echo "=== $(date): config_callback finished ===" >> "$LOG_FILE"
-echo "" >> "$LOG_FILE"
-
-exit 0
+exit 0

app/ui/images/icon_64.png

@@ -2,25 +2,4 @@
 
 ### This script is called before the user change environment variables in application setting page.
 
-# 确保环境变量正确加载
-if [ -n "$TRIM_APP_CONFIG_DIR" ]; then
-    ENV_FILE="$TRIM_APP_CONFIG_DIR/environment"
-    if [ -f "$ENV_FILE" ]; then
-        # 导出环境变量，确保后续脚本可以访问
-        set -a
-        source "$ENV_FILE"
-        set +a
-    fi
-fi
-
-# 如果环境文件不存在，尝试从其他位置加载
-if [ -z "$start_cmd" ] && [ -n "$TRIM_APPDEST" ]; then
-    ENV_FILE="$TRIM_APPDEST/../environment"
-    if [ -f "$ENV_FILE" ]; then
-        set -a
-        source "$ENV_FILE"
-        set +a
-    fi
-fi
-
 exit 0

app/www/mefrpc

@@ -1,5 +1,26 @@
 #!/bin/bash
 
-### This script is called before the user installs the application.
+LOG_FILE="${TRIM_TEMP_LOGFILE:-${TRIM_PKGVAR}/install.log}"
+PKG_DIR="${TRIM_APPDEST}"
+WWW_DIR="${PKG_DIR}/www"
+TARGET="${WWW_DIR}/mefrpc"
+SRC=""
 
-exit 0
+mkdir -p "${WWW_DIR}" >> ${LOG_FILE} 2>&1
+
+for p in "${WWW_DIR}/mefrpc" "${PKG_DIR}/app/www/mefrpc" "${PKG_DIR}/mefrpc" "${PKG_DIR}/target/mefrpc" "${PKG_DIR}/app/mefrpc" "${PKG_DIR}/app/bin/mefrpc"; do
+    if [ -f "${p}" ]; then
+        SRC="${p}"
+        break
+    fi
+done
+
+if [ -n "${SRC}" ] && [ "${SRC}" != "${TARGET}" ]; then
+    cp "${SRC}" "${TARGET}" >> ${LOG_FILE} 2>&1
+fi
+
+if [ -f "${TARGET}" ]; then
+    chmod +x "${TARGET}" >> ${LOG_FILE} 2>&1
+fi
+
+exit 0

cmd/config_callback

@@ -1,42 +1,148 @@
 #!/bin/bash
 
-FILE_PATH="${TRIM_APPDEST}/docker/docker-compose.yaml"
+LOG_FILE="${TRIM_TEMP_LOGFILE:-${TRIM_PKGVAR}/info.log}"
+PID_FILE="${TRIM_PKGVAR}/app.pid"
+MEFRPC_LOG="${TRIM_PKGVAR}/mefrpc.log"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PKG_DIR="${TRIM_APPDEST:-$(cd "${SCRIPT_DIR}/.." && pwd)}"
+MEFRPC_BIN=""
+for p in "${PKG_DIR}/www/mefrpc" "${PKG_DIR}/app/www/mefrpc" "${PKG_DIR}/mefrpc" "${PKG_DIR}/target/mefrpc" "${PKG_DIR}/app/mefrpc" "${PKG_DIR}/app/bin/mefrpc" "${SCRIPT_DIR}/../mefrpc"; do
+    if [ -f "${p}" ]; then
+        MEFRPC_BIN="${p}"
+        break
+    fi
+done
+if [ -z "${MEFRPC_BIN}" ]; then
+    MEFRPC_BIN="${PKG_DIR}/mefrpc"
+fi
+MEFRPC_BIND_HOST="${MEFRPC_BIND_HOST:-0.0.0.0}"
+MEFRPC_RUN="\"${MEFRPC_BIN}\""
+if command -v stdbuf >/dev/null 2>&1; then
+    MEFRPC_RUN="stdbuf -oL -eL ${MEFRPC_RUN}"
+fi
+CMD="cd \"${PKG_DIR}\" && exec ${MEFRPC_RUN} --webui-addr \"${MEFRPC_BIND_HOST}\" >> \"${MEFRPC_LOG}\" 2>&1"
 
-is_docker_running () {
-    DOCKER_NAME=""
+log_msg() {
+    echo "$(date '+%Y-%m-%d %H:%M:%S') - $1" >> ${LOG_FILE}
+}
 
-    if [ -f "$FILE_PATH" ]; then
-        DOCKER_NAME=$(cat $FILE_PATH | grep "container_name" | awk -F ':' '{print $2}' | xargs)
-        echo "DOCKER_NAME is set to: $DOCKER_NAME"
+start_process() {
+    if status; then
+        return 0
     fi
 
-    if [ -n "$DOCKER_NAME" ]; then
-        docker inspect $DOCKER_NAME | grep -q "\"Status\": \"running\"," || exit 1
-        return
+    log_msg "Starting process ..."
+    log_msg "app: ${TRIM_APPNAME} ver: ${TRIM_APPVER}"
+    log_msg "appdir: ${TRIM_APPDEST}"
+    log_msg "etc: ${TRIM_PKGETC} var: ${TRIM_PKGVAR} port: ${TRIM_SERVICE_PORT}"
+    log_msg "mefrpc log: ${MEFRPC_LOG}"
+    log_msg "mefrpc bin: ${MEFRPC_BIN}"
+    log_msg "mefrpc bind: ${MEFRPC_BIND_HOST}"
+    if [ ! -f "${MEFRPC_BIN}" ]; then
+        log_msg "mefrpc not found"
+        return 1
+    fi
+    chmod +x "${MEFRPC_BIN}" >> ${LOG_FILE} 2>&1
+    # run cmd to start process
+    bash -c "${CMD}" >> ${LOG_FILE} 2>&1 &
+    # write pid to pidfile
+    local start_pid=$!
+    printf "%s" "${start_pid}" > ${PID_FILE}
+    sleep 1
+    if ! check_process "${start_pid}"; then
+        log_msg "process exited immediately, check ${MEFRPC_LOG}"
+        return 1
     fi
+    # log_msg "CMD = ${CMD}"
+    # log_msg "pid = $!"
+    return 0
+}
+
+stop_process() {
+    log_msg "Stopping process ..."
+
+    if [ -r "${PID_FILE}" ]; then
+        pid=$(head -n 1 "${PID_FILE}" | tr -d '[:space:]')
+        
+        log_msg "pid=${pid}"
+        if ! check_process "${pid}"; then
+            rm -f "${PID_FILE}"
+            log_msg "remove pid file 1"
+        else
+            log_msg "send TERM signal to PID:${pid}..."
+            kill -TERM ${pid} >> ${LOG_FILE} 2>&1
+
+            local count=0
+            while check_process "${pid}" && [ $count -lt 10 ]; do
+                sleep 1
+                count=$((count + 1))
+                log_msg "waiting process terminal... (${count}s/10s)"
+            done
+
+            if check_process "${pid}"; then
+                log_msg "send KILL signal to PID:${pid}..."
+                kill -KILL "${pid}" >> ${LOG_FILE} 2>&1
+                sleep 1
+                rm -f "${PID_FILE}"
+            else
+                log_msg "process killed... "
+            fi
+        fi
+    fi
+
+    if [ -n "${MEFRPC_BIN}" ]; then
+        pkill -f "${MEFRPC_BIN}" >> ${LOG_FILE} 2>&1
+    fi
+    if [ -n "${TRIM_SERVICE_PORT}" ]; then
+        pkill -f "mefrpc.*${TRIM_SERVICE_PORT}" >> ${LOG_FILE} 2>&1
+    else
+        pkill -f "mefrpc" >> ${LOG_FILE} 2>&1
+    fi
+
+    return 0
+}
+
+check_process() {
+    local pid=$1
+    if kill -0 "${pid}" 2>/dev/null; then
+        return 0  # process exist
+    else
+        return 1  # process not exist
+    fi
+}
+
+status() {
+    if [ -f "${PID_FILE}" ]; then
+        pid=$(head -n 1 "${PID_FILE}" | tr -d '[:space:]')
+        if check_process "${pid}"; then
+            return 0
+        else
+            # Process is not running but pidfile exists - clean it up
+            rm -f "${PID_FILE}"
+        fi    
+    fi
+
+    return 1
 }
 
 case $1 in
 start)
     # run start command. exit 0 if success, exit 1 if failed
-    # do nothing, docker application will be started by appcenter
-    exit 0
+    start_process
     ;;
 stop)
     # run stop command. exit 0 if success, exit 1 if failed
-    # do nothing, docker application will be stopped by appcenter
-    exit 0
+    stop_process
     ;;
 status)
     # check application status command. exit 0 if running, exit 3 if not running
-    # check first container by default, you cound modify it by yourself 
-    if is_docker_running; then
+    if status; then 
         exit 0
-    else
+    else 
         exit 3
     fi
     ;;
 *)
     exit 1
     ;;
-esac
+esac

cmd/config_init

@@ -2,7 +2,5 @@
     "defaults":
     {
         "run-as": "package"
-    },
-    "username": "docker-mefrpfn",
-    "groupname": "docker-mefrpfn"
+    }
 }

cmd/install_init

@@ -1,9 +1,27 @@
 {
-    "docker-project": {
-        "projects": [
+    "data-share":
+    {
+        "shares":
+        [
             {
-                "name": "my-app",
-                "path": "docker"
+                "name": "mefrp",
+                "permission":
+                {
+                    "rw":
+                    [
+                        "mefrp"
+                    ]
+                }
+            },
+            {
+                "name": "mefrp/data",
+                "permission":
+                {
+                    "rw":
+                    [
+                        "mefrp"
+                    ]
+                }
             }
         ]
     }