ha-frp-rn 1.0.16 → 1.0.18

package/android/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Dec 24 14:56:04 CST 2025
+#Tue Dec 30 14:08:53 CST 2025
 io.github.acedroidx.frp.ha-frp-rn-appcompat-1.7.0-10\:/drawable-xxxhdpi-v4/abc_text_select_handle_right_mtrl.png=D\:\\Project\\Page_Manager\\ha-mobile-rn\\node_modules\\ha-frp-rn\\android\\build\\intermediates\\merged_res\\release\\mergeReleaseResources\\drawable-xxxhdpi-v4\\abc_text_select_handle_right_mtrl.png
 io.github.acedroidx.frp.ha-frp-rn-appcompat-1.7.0-10\:/layout/abc_action_mode_bar.xml=D\:\\Project\\Page_Manager\\ha-mobile-rn\\node_modules\\ha-frp-rn\\android\\build\\intermediates\\merged_res\\release\\mergeReleaseResources\\layout\\abc_action_mode_bar.xml
 io.github.acedroidx.frp.ha-frp-rn-core-1.13.1-17\:/drawable-hdpi-v4/notification_bg_low_pressed.9.png=D\:\\Project\\Page_Manager\\ha-mobile-rn\\node_modules\\ha-frp-rn\\android\\build\\intermediates\\merged_res\\release\\mergeReleaseResources\\drawable-hdpi-v4\\notification_bg_low_pressed.9.png

package/android/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties

@@ -1 +1 @@
-#Wed Dec 24 14:44:33 CST 2025
+#Tue Dec 30 14:08:45 CST 2025

package/android/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-5
+6
 0

package/android/build/outputs/logs/manifest-merger-release-report.txt

@@ -1,16 +1,16 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml:2:13-83
-INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml:2:13-83
+ADDED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml:2:13-83
+INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml:2:13-83
 	package
-		INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml
+		INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml
 	xmlns:android
-		ADDED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml:2:23-81
+		ADDED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml:2:23-81
 uses-sdk
-INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml reason: use-sdk injection requested
-INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml
-INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml
+INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml reason: use-sdk injection requested
+INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml
+INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml
 	android:targetSdkVersion
-		INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml
+		INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml
 	android:minSdkVersion
-		INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest2194563455099757824.xml
+		INJECTED from D:\Project\Page_Manager\ha-mobile-rn\node_modules\ha-frp-rn\android\build\intermediates\tmp\ProcessLibraryManifest\release\tempAndroidManifest14099836558573805620.xml

package/android/src/main/java/io/github/acedroidx/frp/ShellService.kt

@@ -1,226 +1,253 @@
-package io.github.acedroidx.frp
-
-import android.content.Context
-import android.util.Log
-import java.io.*
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-class ShellService(private val context: Context) {
-
-    enum class Status {
-        STOPPED,
-        STARTING,
-        RUNNING,
-        STOPPING,
-        ERROR
-    }
-
-    private var process: Process? = null
-    private var status = Status.STOPPED
-    private var lastMessage = ""
-    private var executorService = Executors.newSingleThreadExecutor()
-    private var onStatusChangeListener: ((Status, String) -> Unit)? = null
-    private val TAG = "ShellService"
-
-    fun setOnStatusChangeListener(listener: (Status, String) -> Unit) {
-        this.onStatusChangeListener = listener
-    }
-
-    /**
-     * 使用配置路径启动FRP访问者模式
-     * 
-     * @param configPath - 配置文件路径
-     */
-    fun startVisitor(configPath: String) {
-        startFrp("frpc", configPath)
-    }
-
-    /**
-     * 使用配置路径启动FRP服务器模式
-     * 
-     * @param configPath - 配置文件路径
-     */
-    fun startServer(configPath: String) {
-        startFrp("frps", configPath)
-    }
-
-    /**
-     * 使用FrpConfig对象启动FRP
-     * 
-     * @param frpConfig - FRP配置对象
-     */
-    fun start(frpConfig: FrpConfig) {
-        val binaryName = when (frpConfig.type) {
-            FrpType.FRPC -> "frpc"
-            FrpType.FRPS -> "frps"
-        }
-        val configPath = frpConfig.getFile(context).absolutePath
-        startFrp(binaryName, configPath)
-    }
-
-    private fun startFrp(binaryName: String, configPath: String) {
-        if (status == Status.RUNNING) {
-            Log.w(TAG, "FRP is already running")
-            return
-        }
-
-        setStatus(Status.STARTING, "Starting $binaryName...")
-
-        executorService.submit {
-            try {
-                // 使用正确的工作目录
-                val frpDir = File(context.cacheDir, "frp")
-                if (!frpDir.exists()) {
-                    frpDir.mkdirs()
-                }
-                
-                // 获取应用的nativeLibraryDir，找到真正的FRP二进制文件
-                val packageManager = context.packageManager
-                val applicationInfo = packageManager.getApplicationInfo(
-                    context.packageName,
-                    android.content.pm.PackageManager.GET_SHARED_LIBRARY_FILES
-                )
-                
-                // 构建完整的FRP二进制文件路径
-                val nativeLibraryDir = applicationInfo.nativeLibraryDir
-                val libName = when (binaryName) {
-                    "frpc" -> "libfrpc.so"
-                    "frps" -> "libfrps.so"
-                    else -> {
-                        Log.e(TAG, "Unknown binary name: $binaryName")
-                        setStatus(Status.ERROR, "Unknown binary name: $binaryName")
-                        return@submit
-                    }
-                }
-                
-                val binaryPath = File(nativeLibraryDir, libName)
-                if (!binaryPath.exists()) {
-                    Log.e(TAG, "FRP binary not found: $binaryPath")
-                    setStatus(Status.ERROR, "FRP binary not found: $binaryPath")
-                    return@submit
-                }
-                
-                // 确保二进制文件可执行
-                binaryPath.setExecutable(true)
-                
-                // 构建命令
-                val command = arrayOf(
-                    binaryPath.absolutePath,  // 使用完整的二进制文件路径
-                    "-c",
-                    configPath
-                )
-                
-                Log.i(TAG, "Executing: ${command.joinToString(" ")}")
-                Log.i(TAG, "Working directory: ${frpDir.absolutePath}")
-                
-                // 执行命令
-                val pb = ProcessBuilder(*command)
-                    .redirectErrorStream(true)
-                    .directory(frpDir)
-                
-                process = pb.start()
-                setStatus(Status.RUNNING, "$binaryName started successfully")
-                lastMessage = "$binaryName is running normally"
-                onStatusChangeListener?.invoke(status, lastMessage)
-                
-                // 读取输出
-                BufferedReader(InputStreamReader(process?.inputStream)).use { reader ->
-                    var line: String?
-                    while (reader.readLine().also { line = it } != null) {
-                        Log.d(TAG, "FRP output: $line")
-                        lastMessage = line ?: ""
-                        onStatusChangeListener?.invoke(status, lastMessage)
-                    }
-                }
-                
-                // 监控进程
-                monitorProcess()
-                
-            } catch (e: Exception) {
-                Log.e(TAG, "Error running FRP: ${e.message}", e)
-                setStatus(Status.ERROR, "Failed to start FRP: ${e.message}")
-            }
-        }
-    }
-
-    private fun monitorProcess() {
-        executorService.submit {
-            try {
-                process?.waitFor()
-                val exitCode = process?.exitValue() ?: -1
-                setStatus(Status.STOPPED, "FRP stopped with exit code $exitCode")
-            } catch (e: Exception) {
-                Log.e(TAG, "Error monitoring FRP process: ${e.message}", e)
-                setStatus(Status.ERROR, "Error monitoring FRP: ${e.message}")
-            }
-        }
-    }
-
-    fun stop() {
-        if (status != Status.RUNNING && status != Status.STARTING) {
-            Log.w(TAG, "FRP is not running")
-            return
-        }
-
-        setStatus(Status.STOPPING, "Stopping FRP...")
-
-        try {
-            process?.destroy()
-            process?.waitFor(5, TimeUnit.SECONDS)
-            if (process?.isAlive == true) {
-                process?.destroyForcibly()
-                process?.waitFor(2, TimeUnit.SECONDS)
-            }
-            setStatus(Status.STOPPED, "FRP stopped")
-        } catch (e: Exception) {
-            Log.e(TAG, "Error stopping FRP: ${e.message}", e)
-            setStatus(Status.ERROR, "Failed to stop FRP: ${e.message}")
-        } finally {
-            process = null
-        }
-    }
-
-    private fun extractBinary(binaryName: String): String? {
-        // FRP二进制文件作为Native Library打包在APK的lib目录下
-        // 直接返回正确的二进制文件名（Android会自动加载）
-        Log.i(TAG, "Using native library for $binaryName")
-        return when (binaryName) {
-            "frpc" -> "libfrpc.so"
-            "frps" -> "libfrps.so"
-            else -> {
-                Log.e(TAG, "Unknown binary name: $binaryName")
-                null
-            }
-        }
-    }
-
-    private fun setStatus(newStatus: Status, message: String) {
-        status = newStatus
-        lastMessage = message
-        Log.i(TAG, "Status: $status, Message: $message")
-        onStatusChangeListener?.invoke(newStatus, message)
-    }
-
-    fun getStatus(): Status {
-        return status
-    }
-
-    fun getLastMessage(): String {
-        return lastMessage
-    }
-
-    companion object {
-        // Properties for external access
-        val Status.status: Status
-            get() = this
-        val Status.message: String
-            get() = when (this) {
-                Status.STOPPED -> "Stopped"
-                Status.STARTING -> "Starting"
-                Status.RUNNING -> "Running"
-                Status.STOPPING -> "Stopping"
-                Status.ERROR -> "Error"
-            }
-    }
-}
+package io.github.acedroidx.frp
+
+import android.content.Context
+import android.util.Log
+import java.io.*
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+class ShellService(private val context: Context) {
+
+    enum class Status {
+        STOPPED,
+        STARTING,
+        RUNNING,
+        STOPPING,
+        ERROR
+    }
+
+    private var process: Process? = null
+    private var status = Status.STOPPED
+    private var lastMessage = ""
+    private var executorService = Executors.newSingleThreadExecutor()
+    private var onStatusChangeListener: ((Status, String) -> Unit)? = null
+    private val TAG = "ShellService"
+
+    fun setOnStatusChangeListener(listener: (Status, String) -> Unit) {
+        this.onStatusChangeListener = listener
+    }
+
+    /**
+     * 使用配置路径启动FRP访问者模式
+     * 
+     * @param configPath - 配置文件路径
+     */
+    fun startVisitor(configPath: String) {
+        startFrp("frpc", configPath)
+    }
+
+    /**
+     * 使用配置路径启动FRP服务器模式
+     * 
+     * @param configPath - 配置文件路径
+     */
+    fun startServer(configPath: String) {
+        startFrp("frps", configPath)
+    }
+
+    /**
+     * 使用FrpConfig对象启动FRP
+     * 
+     * @param frpConfig - FRP配置对象
+     */
+    fun start(frpConfig: FrpConfig) {
+        val binaryName = when (frpConfig.type) {
+            FrpType.FRPC -> "frpc"
+            FrpType.FRPS -> "frps"
+        }
+        val configPath = frpConfig.getFile(context).absolutePath
+        startFrp(binaryName, configPath)
+    }
+
+    private fun startFrp(binaryName: String, configPath: String) {
+        if (status == Status.RUNNING) {
+            Log.w(TAG, "FRP is already running")
+            return
+        }
+
+        setStatus(Status.STARTING, "Starting $binaryName...")
+
+        executorService.submit {
+            try {
+                // === 关键修复：区分 asset 和真实文件 ===
+                val rawConfigFile = File(configPath)
+                val isAssetPath = configPath.startsWith("assets/") || configPath.contains("asset")
+
+                val actualConfigFile: File = if (isAssetPath) {
+                    // 复制 asset 到可写目录
+                    val internalDir = context.filesDir // /data/data/.../files
+                    val destFile = File(internalDir, "frpc-running.toml") // 可写位置
+                    copyAssetToFile(context, configPath.substringAfterLast("/"), destFile)
+                    destFile
+                } else {
+                    // 已经是真实路径
+                    if (!rawConfigFile.exists()) {
+                        Log.e(TAG, "Config file does not exist: $configPath")
+                        setStatus(Status.ERROR, "Config file not found: $configPath")
+                        return@submit
+                    }
+                    rawConfigFile
+                }
+
+                // 此时 actualConfigFile 一定是可访问的真实文件
+                val workingDir = actualConfigFile.parentFile!!
+                val binaryPath = getBinaryPath(binaryName)
+
+                // 构建命令
+                val command = arrayOf(
+                    binaryPath.absolutePath,
+                    "-c",
+                    actualConfigFile.name  // 只传文件名，工作目录已设
+                )
+
+                Log.i(TAG, "Executing: ${command.joinToString(" ")}")
+                Log.i(TAG, "Working directory: ${workingDir.absolutePath}")
+                Log.i(TAG, "Config file: ${actualConfigFile.absolutePath}")
+
+                // 执行
+                val pb = ProcessBuilder(*command)
+                    .redirectErrorStream(true)
+                    .directory(workingDir)
+
+                process = pb.start()
+                setStatus(Status.RUNNING, "$binaryName started successfully")
+
+                // 输出监听
+                BufferedReader(InputStreamReader(process?.inputStream)).use { reader ->
+                    var line: String?
+                    while (reader.readLine().also { line = it } != null) {
+                        Log.d(TAG, "FRP output: $line")
+                        lastMessage = line ?: ""
+                        onStatusChangeListener?.invoke(status, lastMessage)
+                    }
+                }
+
+                monitorProcess()
+
+            } catch (e: Exception) {
+                Log.e(TAG, "Error running FRP: ${e.message}", e)
+                setStatus(Status.ERROR, "Failed to start FRP: ${e.message}")
+            }
+        }
+    }
+
+    /**
+    * 将 assets 中的文件复制到目标文件
+    */
+    private fun copyAssetToFile(context: Context, assetName: String, destFile: File) {
+        try {
+            context.assets.open(assetName).use { input ->
+                FileOutputStream(destFile).use { output ->
+                    val buffer = ByteArray(1024)
+                    var length: Int
+                    while (input.read(buffer).also { length = it } > 0) {
+                        output.write(buffer, 0, length)
+                    }
+                }
+            }
+            Log.i(TAG, "Successfully copied asset $assetName to ${destFile.absolutePath}")
+        } catch (e: IOException) {
+            Log.e(TAG, "Failed to copy asset $assetName", e)
+            throw RuntimeException("Failed to copy asset: $assetName", e)
+        }
+    }
+
+    /**
+    * 获取 native 二进制路径
+    */
+    private fun getBinaryPath(binaryName: String): File {
+        val packageManager = context.packageManager
+        val applicationInfo = packageManager.getApplicationInfo(
+            context.packageName,
+            android.content.pm.PackageManager.GET_SHARED_LIBRARY_FILES
+        )
+        val nativeLibraryDir = File(applicationInfo.nativeLibraryDir)
+        val libName = when (binaryName) {
+            "frpc" -> "libfrpc.so"
+            "frps" -> "libfrps.so"
+            else -> throw IllegalArgumentException("Unknown binary: $binaryName")
+        }
+        return File(nativeLibraryDir, libName)
+    }
+
+
+    private fun monitorProcess() {
+        executorService.submit {
+            try {
+                process?.waitFor()
+                val exitCode = process?.exitValue() ?: -1
+                setStatus(Status.STOPPED, "FRP stopped with exit code $exitCode")
+            } catch (e: Exception) {
+                Log.e(TAG, "Error monitoring FRP process: ${e.message}", e)
+                setStatus(Status.ERROR, "Error monitoring FRP: ${e.message}")
+            }
+        }
+    }
+
+    fun stop() {
+        if (status != Status.RUNNING && status != Status.STARTING) {
+            Log.w(TAG, "FRP is not running")
+            return
+        }
+
+        setStatus(Status.STOPPING, "Stopping FRP...")
+
+        try {
+            process?.destroy()
+            process?.waitFor(5, TimeUnit.SECONDS)
+            if (process?.isAlive == true) {
+                process?.destroyForcibly()
+                process?.waitFor(2, TimeUnit.SECONDS)
+            }
+            setStatus(Status.STOPPED, "FRP stopped")
+        } catch (e: Exception) {
+            Log.e(TAG, "Error stopping FRP: ${e.message}", e)
+            setStatus(Status.ERROR, "Failed to stop FRP: ${e.message}")
+        } finally {
+            process = null
+        }
+    }
+
+    private fun extractBinary(binaryName: String): String? {
+        // FRP二进制文件作为Native Library打包在APK的lib目录下
+        // 直接返回正确的二进制文件名（Android会自动加载）
+        Log.i(TAG, "Using native library for $binaryName")
+        return when (binaryName) {
+            "frpc" -> "libfrpc.so"
+            "frps" -> "libfrps.so"
+            else -> {
+                Log.e(TAG, "Unknown binary name: $binaryName")
+                null
+            }
+        }
+    }
+
+    private fun setStatus(newStatus: Status, message: String) {
+        status = newStatus
+        lastMessage = message
+        Log.i(TAG, "Status: $status, Message: $message")
+        onStatusChangeListener?.invoke(newStatus, message)
+    }
+
+    fun getStatus(): Status {
+        return status
+    }
+
+    fun getLastMessage(): String {
+        return lastMessage
+    }
+
+    companion object {
+        // Properties for external access
+        val Status.status: Status
+            get() = this
+        val Status.message: String
+            get() = when (this) {
+                Status.STOPPED -> "Stopped"
+                Status.STARTING -> "Starting"
+                Status.RUNNING -> "Running"
+                Status.STOPPING -> "Stopping"
+                Status.ERROR -> "Error"
+            }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ha-frp-rn",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "React Native FRP module for network penetration",
   "main": "dist/index.js",
   "module": "dist/index.js",