fix: Config corruption, gateway.mode & Node.js update #96
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
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 |
|---|---|---|
|
|
@@ -66,6 +66,10 @@ class GatewayService { | |
| } | ||
| } catch (_) {} | ||
|
|
||
| // Repair corrupted config before gateway start (#88). | ||
| // This fixes the "Invalid input: expected object, received string" crash loop. | ||
| await _repairConfigFile(); | ||
|
|
||
| final alreadyRunning = await NativeBridge.isGatewayRunning(); | ||
| if (alreadyRunning) { | ||
| // Write allowCommands config so the next gateway restart picks it up, | ||
|
|
@@ -137,9 +141,18 @@ const p = "/root/.openclaw/openclaw.json"; | |
| let c = {}; | ||
| try { c = JSON.parse(fs.readFileSync(p, "utf8")); } catch {} | ||
| if (!c.gateway) c.gateway = {}; | ||
| if (!c.gateway.mode) c.gateway.mode = "local"; | ||
| if (!c.gateway.nodes) c.gateway.nodes = {}; | ||
| c.gateway.nodes.denyCommands = []; | ||
| c.gateway.nodes.allowCommands = $allowJson; | ||
| // Fix config corruption: models entries must be objects, not strings (#83, #88) | ||
| if (c.models && c.models.providers) { | ||
| for (const [pid, prov] of Object.entries(c.models.providers)) { | ||
| if (prov && Array.isArray(prov.models)) { | ||
| prov.models = prov.models.map(m => typeof m === "string" ? { id: m } : m); | ||
| } | ||
| } | ||
| } | ||
| fs.writeFileSync(p, JSON.stringify(c, null, 2)); | ||
| '''; | ||
| var prootOk = false; | ||
|
|
@@ -167,10 +180,14 @@ fs.writeFileSync(p, JSON.stringify(c, null, 2)); | |
| } | ||
| config.putIfAbsent('gateway', () => <String, dynamic>{}); | ||
| final gw = config['gateway'] as Map<String, dynamic>; | ||
| // Ensure gateway.mode=local so the gateway starts without --allow-unconfigured (#93, #90) | ||
| gw.putIfAbsent('mode', () => 'local'); | ||
|
Comment on lines
+183
to
+184
There was a problem hiding this comment. Treat null/empty Both Dart repair paths only patch a missing key. Suggested fix- gw.putIfAbsent('mode', () => 'local');
+ final mode = gw['mode'];
+ if (mode is! String || mode.isEmpty) {
+ gw['mode'] = 'local';
+ }
...
- if (!gw.containsKey('mode')) {
- gw['mode'] = 'local';
+ final mode = gw['mode'];
+ if (mode is! String || mode.isEmpty) {
+ gw['mode'] = 'local';
modified = true;
}Also applies to: 219-223 🤖 Prompt for AI Agents |
||
| gw.putIfAbsent('nodes', () => <String, dynamic>{}); | ||
| final nodes = gw['nodes'] as Map<String, dynamic>; | ||
| nodes['denyCommands'] = <String>[]; | ||
| nodes['allowCommands'] = allowCommands; | ||
| // Fix config corruption: models entries must be objects, not strings (#83, #88) | ||
| _repairModelEntries(config); | ||
| configFile.parent.createSync(recursive: true); | ||
| configFile.writeAsStringSync( | ||
| const JsonEncoder.withIndent(' ').convert(config), | ||
|
|
@@ -179,6 +196,81 @@ fs.writeFileSync(p, JSON.stringify(c, null, 2)); | |
| } | ||
| } | ||
|
|
||
| /// Repair openclaw.json on disk — fixes corrupted model entries and ensures | ||
| /// gateway.mode=local is set. Called on init() before any gateway start (#88). | ||
| Future<void> _repairConfigFile() async { | ||
| try { | ||
| final filesDir = await NativeBridge.getFilesDir(); | ||
| final configFile = File('$filesDir/rootfs/ubuntu/root/.openclaw/openclaw.json'); | ||
| if (!configFile.existsSync()) return; | ||
| final content = configFile.readAsStringSync(); | ||
| if (content.isEmpty) return; | ||
|
|
||
| Map<String, dynamic> config; | ||
| try { | ||
| config = Map<String, dynamic>.from(jsonDecode(content) as Map); | ||
| } catch (_) { | ||
| return; // Unparseable — _writeNodeAllowConfig will recreate it | ||
| } | ||
|
Comment on lines
+206
to
+214
There was a problem hiding this comment. Make the init-time repair recover from invalid JSON atomically.
Suggested fix- final content = configFile.readAsStringSync();
- if (content.isEmpty) return;
-
- Map<String, dynamic> config;
- try {
- config = Map<String, dynamic>.from(jsonDecode(content) as Map);
- } catch (_) {
- return; // Unparseable — _writeNodeAllowConfig will recreate it
- }
-
- bool modified = false;
+ final content = configFile.readAsStringSync();
+ bool modified = false;
+
+ Map<String, dynamic> config;
+ if (content.isEmpty) {
+ config = <String, dynamic>{};
+ modified = true;
+ } else {
+ try {
+ config = Map<String, dynamic>.from(jsonDecode(content) as Map);
+ } catch (_) {
+ config = <String, dynamic>{};
+ modified = true;
+ }
+ }
...
- if (modified) {
- configFile.writeAsStringSync(
- const JsonEncoder.withIndent(' ').convert(config),
- );
- }
+ if (modified) {
+ final tmpFile = File('${configFile.path}.tmp');
+ tmpFile.writeAsStringSync(
+ const JsonEncoder.withIndent(' ').convert(config),
+ );
+ tmpFile.renameSync(configFile.path);
+ }Also applies to: 247-250 🤖 Prompt for AI Agents |
||
|
|
||
| bool modified = false; | ||
|
|
||
| // Ensure gateway.mode=local (#93, #90) | ||
| config.putIfAbsent('gateway', () => <String, dynamic>{}); | ||
| final gw = config['gateway'] as Map<String, dynamic>; | ||
| if (!gw.containsKey('mode')) { | ||
| gw['mode'] = 'local'; | ||
| modified = true; | ||
| } | ||
|
|
||
| // Fix model entries: strings → objects (#83, #88) | ||
| final models = config['models'] as Map<String, dynamic>?; | ||
| if (models != null) { | ||
| final providers = models['providers'] as Map<String, dynamic>?; | ||
| if (providers != null) { | ||
| for (final entry in providers.values) { | ||
| if (entry is Map<String, dynamic>) { | ||
| final modelsList = entry['models']; | ||
| if (modelsList is List) { | ||
| for (int i = 0; i < modelsList.length; i++) { | ||
| if (modelsList[i] is String) { | ||
| modelsList[i] = {'id': modelsList[i]}; | ||
| modified = true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (modified) { | ||
| configFile.writeAsStringSync( | ||
| const JsonEncoder.withIndent(' ').convert(config), | ||
| ); | ||
| } | ||
| } catch (_) {} | ||
| } | ||
|
|
||
| /// Fix corrupted model entries: convert bare strings to {id: string} objects (#83, #88). | ||
| static void _repairModelEntries(Map<String, dynamic> config) { | ||
| final models = config['models'] as Map<String, dynamic>?; | ||
| if (models == null) return; | ||
| final providers = models['providers'] as Map<String, dynamic>?; | ||
| if (providers == null) return; | ||
| for (final entry in providers.values) { | ||
| if (entry is Map<String, dynamic>) { | ||
| final modelsList = entry['models']; | ||
| if (modelsList is List) { | ||
| entry['models'] = modelsList.map((m) { | ||
| if (m is String) return {'id': m}; | ||
| return m; | ||
| }).toList(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Read the actual gateway auth token from openclaw.json config file (#74, #82). | ||
| /// This is the source of truth — more reliable than regex-scraping stdout. | ||
| Future<String?> _readTokenFromConfig() async { | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -61,26 +61,32 @@ class ProviderConfigService { | |
| required String apiKey, | ||
| required String model, | ||
| }) async { | ||
| final providerIdJson = jsonEncode(provider.id); | ||
| final apiKeyJson = jsonEncode(apiKey); | ||
| final baseUrlJson = jsonEncode(provider.baseUrl); | ||
| final modelJson = jsonEncode(model); | ||
|
|
||
| // Build the provider object with the model as an object containing `id`, | ||
| // not a bare string. OpenClaw expects: models: [{ id: "model-name" }]. | ||
| // Writing a bare string causes config validation failure (#83, #88). | ||
| final script = ''' | ||
| const fs = require("fs"); | ||
| const p = "$_configPath"; | ||
| let c = {}; | ||
| try { c = JSON.parse(fs.readFileSync(p, "utf8")); } catch {} | ||
| if (!c.models) c.models = {}; | ||
| if (!c.models.providers) c.models.providers = {}; | ||
| c.models.providers[$providerIdJson] = { | ||
| apiKey: $apiKeyJson, | ||
| baseUrl: $baseUrlJson, | ||
| models: [{ id: $modelJson }] | ||
| }; | ||
| if (!c.agents) c.agents = {}; | ||
| if (!c.agents.defaults) c.agents.defaults = {}; | ||
| if (!c.agents.defaults.model) c.agents.defaults.model = {}; | ||
| c.agents.defaults.model.primary = $modelJson; | ||
| if (!c.gateway) c.gateway = {}; | ||
| if (!c.gateway.mode) c.gateway.mode = "local"; | ||
| fs.mkdirSync(require("path").dirname(p), { recursive: true }); | ||
| fs.writeFileSync(p, JSON.stringify(c, null, 2)); | ||
| '''; | ||
|
|
@@ -117,13 +123,13 @@ fs.writeFileSync(p, JSON.stringify(c, null, 2)); | |
| // Start fresh | ||
| } | ||
|
|
||
| // Merge provider entry — models must be objects with `id`, not bare strings (#83, #88). | ||
| config['models'] ??= <String, dynamic>{}; | ||
| (config['models'] as Map<String, dynamic>)['providers'] ??= <String, dynamic>{}; | ||
| ((config['models'] as Map<String, dynamic>)['providers'] as Map<String, dynamic>)[providerId] = { | ||
| 'apiKey': apiKey, | ||
| 'baseUrl': baseUrl, | ||
| 'models': [{'id': model}], | ||
| }; | ||
|
|
||
| // Set active model | ||
|
|
@@ -132,6 +138,10 @@ fs.writeFileSync(p, JSON.stringify(c, null, 2)); | |
| ((config['agents'] as Map<String, dynamic>)['defaults'] as Map<String, dynamic>)['model'] ??= <String, dynamic>{}; | ||
| (((config['agents'] as Map<String, dynamic>)['defaults'] as Map<String, dynamic>)['model'] as Map<String, dynamic>)['primary'] = model; | ||
|
|
||
| // Ensure gateway.mode is set (#93, #90) | ||
| config['gateway'] ??= <String, dynamic>{}; | ||
| (config['gateway'] as Map<String, dynamic>)['mode'] ??= 'local'; | ||
|
|
||
| const encoder = JsonEncoder.withIndent(' '); | ||
| await NativeBridge.writeRootfsFile(_configPath, encoder.convert(config)); | ||
| } | ||
|
|
||
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 |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| name: openclaw | ||
| description: OpenClaw AI Gateway for Android - standalone, no Termux required. | ||
| publish_to: 'none' | ||
| version: 1.8.6+17 | ||
|
|
||
| environment: | ||
| sdk: '>=3.2.0 <4.0.0' | ||
|
|
||
Oops, something went wrong.
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.
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.
Malformed config can remain unrepaired due to swallowed parse errors.
At Line 1266, if JSON parsing fails, the empty catch at Line 1303 leaves
openclaw.jsonuntouched. That can preserve corruption and still missgateway.mode, which conflicts with the repair-on-startup goal.🔧 Proposed fix
🤖 Prompt for AI Agents