fix: Storage safety, gateway stability, auth UX, canvas, deps (#21, #54, #55, #56, #59, #60, #61, #63, #64, #65, #66, #67) #57
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,8 @@ import io.flutter.plugin.common.EventChannel | |
| import java.io.BufferedReader | ||
| import java.io.File | ||
| import java.io.InputStreamReader | ||
| import java.net.InetSocketAddress | ||
| import java.net.Socket | ||
|
|
||
| class GatewayService : Service() { | ||
| companion object { | ||
|
|
@@ -42,7 +44,7 @@ class GatewayService : Service() { | |
| private var gatewayProcess: Process? = null | ||
| private var wakeLock: PowerManager.WakeLock? = null | ||
| private var restartCount = 0 | ||
| private val maxRestarts = 5 | ||
| private var startTime: Long = 0 | ||
| private var uptimeThread: Thread? = null | ||
|
|
||
|
|
@@ -74,8 +76,34 @@ class GatewayService : Service() { | |
| super.onDestroy() | ||
| } | ||
|
|
||
| /** Check if gateway port is already in use (another instance running). */ | ||
| private fun isPortInUse(port: Int = 18789): Boolean { | ||
| return try { | ||
| Socket().use { socket -> | ||
| socket.connect(InetSocketAddress("127.0.0.1", port), 1000) | ||
| true | ||
| } | ||
| } catch (_: Exception) { | ||
| false | ||
| } | ||
| } | ||
|
|
||
| private fun startGateway() { | ||
| if (gatewayProcess?.isAlive == true) return | ||
|
|
||
| // Check if an existing gateway is already listening on the port. | ||
| // This prevents duplicate instances when the service is recreated | ||
| // but an old proot process is still alive (#60). | ||
| if (isPortInUse()) { | ||
| emitLog("Gateway already running on port 18789, adopting existing instance") | ||
| isRunning = true | ||
| instance = this | ||
| startTime = System.currentTimeMillis() | ||
| updateNotificationRunning() | ||
| startUptimeTicker() | ||
| return | ||
| } | ||
|
|
||
| isRunning = true | ||
| instance = this | ||
| startTime = System.currentTimeMillis() | ||
|
|
@@ -122,6 +150,15 @@ class GatewayService : Service() { | |
| } | ||
| } catch (_: Exception) {} | ||
|
|
||
| // Final check right before launch — another instance may have | ||
| // started between the first check and now | ||
| if (isPortInUse()) { | ||
| emitLog("Gateway already running on port 18789, skipping launch") | ||
| updateNotificationRunning() | ||
| startUptimeTicker() | ||
| return@Thread | ||
| } | ||
|
|
||
| gatewayProcess = pm.startProotProcess("openclaw gateway --verbose") | ||
| updateNotificationRunning() | ||
| emitLog("Gateway started") | ||
|
|
@@ -139,22 +176,31 @@ class GatewayService : Service() { | |
| } catch (_: Exception) {} | ||
| }.start() | ||
|
|
||
| // Read stderr — log all lines on first attempt for debugging visibility | ||
| val stderrReader = BufferedReader(InputStreamReader(gatewayProcess!!.errorStream)) | ||
| val currentRestartCount = restartCount | ||
| Thread { | ||
| try { | ||
| var line: String? | ||
| while (stderrReader.readLine().also { line = it } != null) { | ||
| val l = line ?: continue | ||
| if (currentRestartCount == 0 || | ||
| (!l.contains("proot warning") && !l.contains("can't sanitize"))) { | ||
| emitLog("[ERR] $l") | ||
| } | ||
| } | ||
| } catch (_: Exception) {} | ||
| }.start() | ||
|
|
||
| val exitCode = gatewayProcess!!.waitFor() | ||
| val uptimeMs = System.currentTimeMillis() - startTime | ||
| val uptimeSec = uptimeMs / 1000 | ||
| emitLog("Gateway exited with code $exitCode (uptime: ${uptimeSec}s)") | ||
|
|
||
| // If the gateway ran for >60s, it was a transient crash — reset counter | ||
| if (uptimeMs > 60_000) { | ||
| restartCount = 0 | ||
| } | ||
|
|
||
| if (isRunning && restartCount < maxRestarts) { | ||
| restartCount++ | ||
|
|
@@ -219,7 +265,8 @@ class GatewayService : Service() { | |
|
|
||
| private fun emitLog(message: String) { | ||
| try { | ||
| val ts = java.time.Instant.now().toString() | ||
| logSink?.success("$ts $message") | ||
| } catch (_: Exception) {} | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -461,6 +461,17 @@ class MainActivity : FlutterActivity() { | |
| result.error("INVALID_ARGS", "path and content required", null) | ||
| } | ||
| } | ||
| "bringToForeground" -> { | ||
| try { | ||
| val intent = Intent(applicationContext, MainActivity::class.java).apply { | ||
| flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | ||
| } | ||
| applicationContext.startActivity(intent) | ||
| result.success(true) | ||
| } catch (e: Exception) { | ||
| result.error("FOREGROUND_ERROR", e.message, null) | ||
| } | ||
| } | ||
| "readSensor" -> { | ||
| val sensorType = call.argument<String>("sensor") ?: "accelerometer" | ||
| Thread { | ||
|
|
@@ -530,7 +541,6 @@ class MainActivity : FlutterActivity() { | |
|
|
||
| createUrlNotificationChannel() | ||
| requestNotificationPermission() | ||
|
|
||
| EventChannel(flutterEngine.dartExecutor.binaryMessenger, EVENT_CHANNEL).setStreamHandler( | ||
| object : EventChannel.StreamHandler { | ||
|
|
@@ -558,30 +568,6 @@ class MainActivity : FlutterActivity() { | |
| } | ||
| } | ||
|
|
||
| private fun createUrlNotificationChannel() { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { | ||
| val channel = NotificationChannel( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P1:
canonicalPathresolves symlinks, which prevents the symlink guard below from ever being reached. If a symlink inside the rootfs points outsidefilesDir(e.g., to/storage/emulated/0),canonicalPathreturns the target path, the boundary check fails, and the method returns early — leaving the symlink itself undeleted. UseabsolutePathinstead so the check operates on the link's own path.Prompt for AI agents