Merge 2fa8fef into e21ff32

Copilot · web-flow · commit de9690480395 · 2026-04-05T14:04:55.000+05:30
diff --git a/flutter_app/lib/constants.dart b/flutter_app/lib/constants.dart
@@ -1,6 +1,6 @@
 class AppConstants {
   static const String appName = 'OpenClaw';
-  static const String version = '1.8.6';
+  static const String version = '1.8.7';
   static const String packageName = 'com.nxg.openclawproot';
 
   /// Matches ANSI escape sequences (e.g. color codes in terminal output).
diff --git a/flutter_app/lib/services/node_service.dart b/flutter_app/lib/services/node_service.dart
@@ -135,6 +135,7 @@ class NodeService {
   /// Resolve the gateway auth token from available sources:
   /// 1. Manually entered token (for remote gateways)
   /// 2. Dashboard URL fragment (for local gateway)
+  /// 3. openclaw.json config file (source of truth — fallback when URL is stale or missing)
   Future<String?> _readGatewayToken() async {
     final prefs = PreferencesService();
     await prefs.init();
@@ -156,6 +157,24 @@ class NodeService {
       }
     }
 
+    // 3. Read directly from openclaw.json — the source of truth (#94).
+    // This catches the case where dashboardUrl was cleared before a gateway
+    // restart (GatewayService.start() nulls it out) but the config file still
+    // holds the authoritative token, preventing token_missing reconnect loops.
+    try {
+      final raw = await NativeBridge.readRootfsFile('root/.openclaw/openclaw.json');
+      if (raw != null) {
+        final config = jsonDecode(raw) as Map<String, dynamic>;
+        final token = config['gateway']?['auth']?['token'];
+        if (token is String && token.isNotEmpty) {
+          _log('[NODE] Gateway token read from openclaw.json config');
+          return token;
+        }
+      }
+    } catch (e) {
+      _log('[NODE] Could not read token from openclaw.json: $e');
+    }
+
     _log('[NODE] No gateway token available');
     return null;
   }
@@ -256,6 +275,9 @@ class NodeService {
   }
 
   void _onConnected(NodeFrame frame) {
+    // Reset backoff only after a fully authenticated connection so that repeated
+    // auth failures (e.g. token_missing) still produce growing retry delays (#94).
+    _ws.resetReconnectAttempt();
     _updateState(_state.copyWith(
       status: NodeStatus.paired,
       connectedAt: DateTime.now(),
diff --git a/flutter_app/lib/services/node_ws_service.dart b/flutter_app/lib/services/node_ws_service.dart
@@ -35,14 +35,18 @@ class NodeWsService {
     await _doConnect();
   }
 
+  /// Reset the reconnect backoff counter. Call this only once the gateway
+  /// has fully authenticated the connection (not just the TCP handshake),
+  /// so that repeated auth failures still produce a growing backoff delay.
+  void resetReconnectAttempt() => _reconnectAttempt = 0;
+
   Future<void> _doConnect() async {
     if (_url == null) return;
 
     try {
       _channel = WebSocketChannel.connect(Uri.parse(_url!));
       await _channel!.ready;
       _connected = true;
-      _reconnectAttempt = 0;
       _lastActivity = DateTime.now();
 
       _startPing();
diff --git a/flutter_app/pubspec.yaml b/flutter_app/pubspec.yaml
@@ -1,7 +1,7 @@
 name: openclaw
 description: OpenClaw AI Gateway for Android - standalone, no Termux required.
 publish_to: 'none'
-version: 1.8.6+17
+version: 1.8.7+18
 
 environment:
   sdk: '>=3.2.0 <4.0.0'
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openclaw-termux",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "description": "OpenClaw AI Gateway for Android Termux with Bionic Bypass",
   "main": "lib/index.js",
   "type": "module",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "openclaw-termux",`
`3`		`- "version": "1.8.6",`
	`3`	`+ "version": "1.8.7",`
`4`	`4`	`"description": "OpenClaw AI Gateway for Android Termux with Bionic Bypass",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"type": "module",`