@agentplugged/claw 0.1.1 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +3 -7
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +1 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +5 -5
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts +0 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +21 -40
- package/dist/index.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +380 -77
- package/dist/router/index.js.map +1 -1
- package/dist/router/logger.d.ts +3 -0
- package/dist/router/logger.d.ts.map +1 -1
- package/dist/router/logger.js +8 -5
- package/dist/router/logger.js.map +1 -1
- package/dist/router/types.d.ts +6 -9
- package/dist/router/types.d.ts.map +1 -1
- package/dist/sidecar/auth.d.ts.map +1 -1
- package/dist/sidecar/auth.js +7 -11
- package/dist/sidecar/auth.js.map +1 -1
- package/dist/sidecar/index.js +104 -21
- package/dist/sidecar/index.js.map +1 -1
- package/dist/sidecar/routes/addons.d.ts.map +1 -1
- package/dist/sidecar/routes/addons.js +3 -13
- package/dist/sidecar/routes/addons.js.map +1 -1
- package/dist/sidecar/routes/api-keys.d.ts +4 -0
- package/dist/sidecar/routes/api-keys.d.ts.map +1 -0
- package/dist/sidecar/routes/api-keys.js +221 -0
- package/dist/sidecar/routes/api-keys.js.map +1 -0
- package/dist/sidecar/routes/backup.js +3 -3
- package/dist/sidecar/routes/backup.js.map +1 -1
- package/dist/sidecar/routes/bindings.d.ts +5 -0
- package/dist/sidecar/routes/bindings.d.ts.map +1 -0
- package/dist/sidecar/routes/bindings.js +64 -0
- package/dist/sidecar/routes/bindings.js.map +1 -0
- package/dist/sidecar/routes/channels.d.ts.map +1 -1
- package/dist/sidecar/routes/channels.js +71 -75
- package/dist/sidecar/routes/channels.js.map +1 -1
- package/dist/sidecar/routes/crons.d.ts +5 -0
- package/dist/sidecar/routes/crons.d.ts.map +1 -0
- package/dist/sidecar/routes/crons.js +81 -0
- package/dist/sidecar/routes/crons.js.map +1 -0
- package/dist/sidecar/routes/health.d.ts.map +1 -1
- package/dist/sidecar/routes/health.js +1 -5
- package/dist/sidecar/routes/health.js.map +1 -1
- package/dist/sidecar/routes/kitchen-proxy.d.ts +5 -0
- package/dist/sidecar/routes/kitchen-proxy.d.ts.map +1 -0
- package/dist/sidecar/routes/kitchen-proxy.js +29 -0
- package/dist/sidecar/routes/kitchen-proxy.js.map +1 -0
- package/dist/sidecar/routes/memory.d.ts +0 -2
- package/dist/sidecar/routes/memory.d.ts.map +1 -1
- package/dist/sidecar/routes/memory.js +116 -113
- package/dist/sidecar/routes/memory.js.map +1 -1
- package/dist/sidecar/routes/metrics.d.ts.map +1 -1
- package/dist/sidecar/routes/metrics.js +30 -1
- package/dist/sidecar/routes/metrics.js.map +1 -1
- package/dist/sidecar/routes/restart.d.ts.map +1 -1
- package/dist/sidecar/routes/restart.js +13 -4
- package/dist/sidecar/routes/restart.js.map +1 -1
- package/dist/sidecar/routes/router-config.d.ts +0 -1
- package/dist/sidecar/routes/router-config.d.ts.map +1 -1
- package/dist/sidecar/routes/router-config.js +2 -139
- package/dist/sidecar/routes/router-config.js.map +1 -1
- package/dist/sidecar/routes/soul.d.ts +11 -0
- package/dist/sidecar/routes/soul.d.ts.map +1 -1
- package/dist/sidecar/routes/soul.js +58 -33
- package/dist/sidecar/routes/soul.js.map +1 -1
- package/dist/sidecar/routes/system.d.ts +7 -0
- package/dist/sidecar/routes/system.d.ts.map +1 -0
- package/dist/sidecar/routes/system.js +49 -0
- package/dist/sidecar/routes/system.js.map +1 -0
- package/dist/sidecar/routes/team.d.ts.map +1 -1
- package/dist/sidecar/routes/team.js +121 -74
- package/dist/sidecar/routes/team.js.map +1 -1
- package/dist/sidecar/routes/update.d.ts.map +1 -1
- package/dist/sidecar/routes/update.js +24 -10
- package/dist/sidecar/routes/update.js.map +1 -1
- package/dist/sidecar/routes/workflow.d.ts +8 -0
- package/dist/sidecar/routes/workflow.d.ts.map +1 -0
- package/dist/sidecar/routes/workflow.js +232 -0
- package/dist/sidecar/routes/workflow.js.map +1 -0
- package/dist/sidecar/utils.d.ts +14 -0
- package/dist/sidecar/utils.d.ts.map +1 -1
- package/dist/sidecar/utils.js +35 -1
- package/dist/sidecar/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -32,142 +32,143 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
36
|
exports.handleListMemory = handleListMemory;
|
|
40
|
-
exports.handleCreateMemory = handleCreateMemory;
|
|
41
|
-
exports.handleDeleteMemory = handleDeleteMemory;
|
|
42
37
|
exports.handleListSessions = handleListSessions;
|
|
43
|
-
const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
|
|
44
38
|
const fs = __importStar(require("fs"));
|
|
45
39
|
const url = __importStar(require("url"));
|
|
46
40
|
const utils_1 = require("../utils");
|
|
41
|
+
/**
|
|
42
|
+
* Counts rows in a SQLite table without loading all data.
|
|
43
|
+
* Returns 0 if the DB or table doesn't exist.
|
|
44
|
+
*/
|
|
45
|
+
function countRows(dbPath, table) {
|
|
46
|
+
if (!fs.existsSync(dbPath))
|
|
47
|
+
return 0;
|
|
48
|
+
let db = null;
|
|
49
|
+
try {
|
|
50
|
+
const Database = require("better-sqlite3");
|
|
51
|
+
db = new Database(dbPath, { readonly: true });
|
|
52
|
+
// Check table exists
|
|
53
|
+
const row = db
|
|
54
|
+
.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name=?")
|
|
55
|
+
.get(table);
|
|
56
|
+
if (!row)
|
|
57
|
+
return 0;
|
|
58
|
+
const countRow = db.prepare(`SELECT COUNT(*) as cnt FROM "${table}"`).get();
|
|
59
|
+
return countRow?.cnt ?? 0;
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return 0;
|
|
63
|
+
}
|
|
64
|
+
finally {
|
|
65
|
+
if (db)
|
|
66
|
+
db.close();
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
// ---------------------------------------------------------------------------
|
|
70
|
+
// GET /memory — return memory stats from all sources (read-only)
|
|
71
|
+
// ---------------------------------------------------------------------------
|
|
47
72
|
function handleListMemory(config) {
|
|
48
73
|
return async (req, res) => {
|
|
49
|
-
const memoryDb = `${config.runtimeDir}/data/memory.db`;
|
|
50
|
-
if (!fs.existsSync(memoryDb)) {
|
|
51
|
-
(0, utils_1.sendJson)(res, 200, { memories: [], total: 0, page: 1, pageSize: 20 });
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
// Parse pagination from query string
|
|
55
74
|
const parsedUrl = url.parse(req.url ?? "", true);
|
|
56
|
-
const
|
|
57
|
-
const
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
page,
|
|
83
|
-
pageSize,
|
|
84
|
-
totalPages: Math.ceil(total / pageSize),
|
|
85
|
-
});
|
|
86
|
-
}
|
|
87
|
-
catch (err) {
|
|
88
|
-
db?.close();
|
|
89
|
-
(0, utils_1.sendError)(res, 500, `Failed to query memory: ${err.message}`);
|
|
75
|
+
const mode = parsedUrl.query["mode"] ?? "stats";
|
|
76
|
+
const workspaceDir = `${config.runtimeDir}/workspace`;
|
|
77
|
+
const vectorStoreDbPath = `${workspaceDir}/vector_store.db`;
|
|
78
|
+
const legacyMemoryDbPath = `${config.dataDir}/memory.db`;
|
|
79
|
+
const openclawMemoryDb = `${config.dataDir}/.openclaw/memory/main.sqlite`;
|
|
80
|
+
const sources = [
|
|
81
|
+
{
|
|
82
|
+
source: "mem0",
|
|
83
|
+
count: countRows(vectorStoreDbPath, "vectors"),
|
|
84
|
+
available: fs.existsSync(vectorStoreDbPath),
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
source: "legacy",
|
|
88
|
+
count: countRows(legacyMemoryDbPath, "memories"),
|
|
89
|
+
available: fs.existsSync(legacyMemoryDbPath),
|
|
90
|
+
},
|
|
91
|
+
{
|
|
92
|
+
source: "openclaw",
|
|
93
|
+
count: countRows(openclawMemoryDb, "chunks"),
|
|
94
|
+
available: fs.existsSync(openclawMemoryDb),
|
|
95
|
+
},
|
|
96
|
+
];
|
|
97
|
+
const total = sources.reduce((sum, s) => sum + s.count, 0);
|
|
98
|
+
if (mode === "stats") {
|
|
99
|
+
(0, utils_1.sendJson)(res, 200, { total, sources });
|
|
100
|
+
return;
|
|
90
101
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
102
|
+
// For mode=full, read actual memories from mem0 (primary source)
|
|
103
|
+
// This is for the dashboard memory viewer — read-only
|
|
104
|
+
if (mode === "full" && fs.existsSync(vectorStoreDbPath)) {
|
|
105
|
+
const page = Math.max(1, parseInt(parsedUrl.query["page"] ?? "1", 10));
|
|
106
|
+
const pageSize = Math.min(100, Math.max(1, parseInt(parsedUrl.query["pageSize"] ?? "20", 10)));
|
|
107
|
+
const offset = (page - 1) * pageSize;
|
|
108
|
+
let db = null;
|
|
109
|
+
try {
|
|
110
|
+
const Database = require("better-sqlite3");
|
|
111
|
+
db = new Database(vectorStoreDbPath, { readonly: true });
|
|
112
|
+
const rows = db
|
|
113
|
+
.prepare("SELECT id, payload FROM vectors LIMIT ? OFFSET ?")
|
|
114
|
+
.all(pageSize, offset);
|
|
115
|
+
const memories = rows.map((r) => {
|
|
116
|
+
try {
|
|
117
|
+
const payload = JSON.parse(r.payload);
|
|
118
|
+
return {
|
|
119
|
+
id: `mem0:${r.id}`,
|
|
120
|
+
content: payload.data ?? "",
|
|
121
|
+
type: "fact",
|
|
122
|
+
source: `mem0/${payload.runId ?? payload.userId ?? "default"}`,
|
|
123
|
+
createdAt: payload.createdAt ?? null,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
return {
|
|
128
|
+
id: `mem0:${r.id}`,
|
|
129
|
+
content: r.payload,
|
|
130
|
+
type: "fact",
|
|
131
|
+
source: "mem0/unknown",
|
|
132
|
+
createdAt: null,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
});
|
|
136
|
+
(0, utils_1.sendJson)(res, 200, {
|
|
137
|
+
memories,
|
|
138
|
+
total,
|
|
139
|
+
page,
|
|
140
|
+
pageSize,
|
|
141
|
+
totalPages: Math.ceil(total / pageSize),
|
|
142
|
+
sources,
|
|
143
|
+
});
|
|
105
144
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
const confidence = body.confidence ?? 1.0;
|
|
109
|
-
const content = body.content.trim();
|
|
110
|
-
db = new better_sqlite3_1.default(memoryDbPath);
|
|
111
|
-
const result = db
|
|
112
|
-
.prepare("INSERT INTO memories (type, content, source, confidence) VALUES (?, ?, ?, ?)")
|
|
113
|
-
.run(type, content, source, confidence);
|
|
114
|
-
const inserted = db
|
|
115
|
-
.prepare("SELECT id, type, content, source, confidence, created_at FROM memories WHERE id = ?")
|
|
116
|
-
.get(result.lastInsertRowid);
|
|
117
|
-
(0, utils_1.sendJson)(res, 201, {
|
|
118
|
-
ok: true,
|
|
119
|
-
id: result.lastInsertRowid,
|
|
120
|
-
memory: inserted,
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
|
-
catch (err) {
|
|
124
|
-
(0, utils_1.sendError)(res, 500, `Failed to create memory: ${err.message}`);
|
|
125
|
-
}
|
|
126
|
-
finally {
|
|
127
|
-
db?.close();
|
|
128
|
-
}
|
|
129
|
-
};
|
|
130
|
-
}
|
|
131
|
-
function handleDeleteMemory(config) {
|
|
132
|
-
return async (req, res) => {
|
|
133
|
-
const memoryDbPath = `${config.runtimeDir}/data/memory.db`;
|
|
134
|
-
let db = null;
|
|
135
|
-
try {
|
|
136
|
-
const match = req.url?.match(/\/memory\/(\d+)/);
|
|
137
|
-
if (!match) {
|
|
138
|
-
(0, utils_1.sendError)(res, 400, "Invalid URL — expected /memory/:id");
|
|
139
|
-
return;
|
|
145
|
+
catch (err) {
|
|
146
|
+
(0, utils_1.sendError)(res, 500, `Failed to read memories: ${err.message}`);
|
|
140
147
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
.prepare("DELETE FROM memories WHERE id = ?")
|
|
145
|
-
.run(parsedId);
|
|
146
|
-
if (result.changes === 0) {
|
|
147
|
-
(0, utils_1.sendError)(res, 404, "Memory not found");
|
|
148
|
-
return;
|
|
148
|
+
finally {
|
|
149
|
+
if (db)
|
|
150
|
+
db.close();
|
|
149
151
|
}
|
|
150
|
-
|
|
151
|
-
}
|
|
152
|
-
catch (err) {
|
|
153
|
-
(0, utils_1.sendError)(res, 500, `Failed to delete memory: ${err.message}`);
|
|
154
|
-
}
|
|
155
|
-
finally {
|
|
156
|
-
db?.close();
|
|
152
|
+
return;
|
|
157
153
|
}
|
|
154
|
+
// Default: just stats
|
|
155
|
+
(0, utils_1.sendJson)(res, 200, { total, sources });
|
|
158
156
|
};
|
|
159
157
|
}
|
|
158
|
+
// ---------------------------------------------------------------------------
|
|
159
|
+
// GET /sessions — list recent sessions from router.db (unchanged)
|
|
160
|
+
// ---------------------------------------------------------------------------
|
|
160
161
|
function handleListSessions(config) {
|
|
161
162
|
return async (_req, res) => {
|
|
162
|
-
const routerDb = `${config.
|
|
163
|
+
const routerDb = `${config.dataDir}/router.db`;
|
|
163
164
|
if (!fs.existsSync(routerDb)) {
|
|
164
165
|
(0, utils_1.sendJson)(res, 200, { sessions: [], total: 0 });
|
|
165
166
|
return;
|
|
166
167
|
}
|
|
167
168
|
let db = null;
|
|
168
169
|
try {
|
|
169
|
-
|
|
170
|
-
|
|
170
|
+
const Database = require("better-sqlite3");
|
|
171
|
+
db = new Database(routerDb, { readonly: true });
|
|
171
172
|
let sessions = [];
|
|
172
173
|
try {
|
|
173
174
|
sessions = db
|
|
@@ -210,6 +211,7 @@ function handleListSessions(config) {
|
|
|
210
211
|
return;
|
|
211
212
|
}
|
|
212
213
|
db.close();
|
|
214
|
+
db = null;
|
|
213
215
|
(0, utils_1.sendJson)(res, 200, {
|
|
214
216
|
sessions: sessions.map((s) => ({
|
|
215
217
|
sessionId: s.session_id,
|
|
@@ -226,7 +228,8 @@ function handleListSessions(config) {
|
|
|
226
228
|
});
|
|
227
229
|
}
|
|
228
230
|
catch (err) {
|
|
229
|
-
db
|
|
231
|
+
if (db)
|
|
232
|
+
db.close();
|
|
230
233
|
(0, utils_1.sendError)(res, 500, `Failed to query sessions: ${err.message}`);
|
|
231
234
|
}
|
|
232
235
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/sidecar/routes/memory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/sidecar/routes/memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/sidecar/routes/metrics.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAsGxC,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,YAAY,CA2FvF;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/sidecar/routes/metrics.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAsGxC,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,YAAY,CA2FvF;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,CA4GtE;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,CAqEpE"}
|
|
@@ -60,7 +60,7 @@ function queryRouterStats(db) {
|
|
|
60
60
|
SUM(inputTokens) as total_input_tokens,
|
|
61
61
|
SUM(outputTokens) as total_output_tokens,
|
|
62
62
|
SUM(cost) as total_cost,
|
|
63
|
-
AVG(
|
|
63
|
+
AVG(latency_ms) as avg_latency,
|
|
64
64
|
SUM(CASE WHEN success = 0 THEN 1 ELSE 0 END) as error_count
|
|
65
65
|
FROM router_logs
|
|
66
66
|
WHERE timestamp >= datetime('now', '-1 day')`)
|
|
@@ -178,12 +178,27 @@ function handleRouterMetrics(routerDbPath) {
|
|
|
178
178
|
}
|
|
179
179
|
try {
|
|
180
180
|
const stats = queryRouterStats(db);
|
|
181
|
+
let recentDecisions = [];
|
|
182
|
+
try {
|
|
183
|
+
recentDecisions = db
|
|
184
|
+
.prepare(`SELECT timestamp, model, complexity, inputTokens, outputTokens,
|
|
185
|
+
cost, latency_ms, success, fallback, strategy
|
|
186
|
+
FROM router_logs
|
|
187
|
+
ORDER BY timestamp DESC
|
|
188
|
+
LIMIT 10`)
|
|
189
|
+
.all();
|
|
190
|
+
}
|
|
191
|
+
catch {
|
|
192
|
+
// columns may not exist yet
|
|
193
|
+
}
|
|
181
194
|
db.close();
|
|
182
195
|
const today = stats.today;
|
|
183
196
|
const totalRequests = today?.total_requests ?? 0;
|
|
184
197
|
const errorCount = today?.error_count ?? 0;
|
|
198
|
+
const fallbackCount = recentDecisions.filter((d) => d.fallback === 1).length;
|
|
185
199
|
const totalModelRequests = stats.models.reduce((sum, m) => sum + m.count, 0);
|
|
186
200
|
(0, utils_1.sendJson)(res, 200, {
|
|
201
|
+
strategy: recentDecisions[0]?.strategy ?? "passthrough",
|
|
187
202
|
requests: {
|
|
188
203
|
today: totalRequests,
|
|
189
204
|
week: stats.week?.total_requests ?? 0,
|
|
@@ -205,6 +220,9 @@ function handleRouterMetrics(routerDbPath) {
|
|
|
205
220
|
errorRate: totalRequests > 0
|
|
206
221
|
? Math.round((errorCount / totalRequests) * 100 * 10) / 10
|
|
207
222
|
: 0,
|
|
223
|
+
fallbackRate: recentDecisions.length > 0
|
|
224
|
+
? fallbackCount / recentDecisions.length
|
|
225
|
+
: 0,
|
|
208
226
|
},
|
|
209
227
|
modelDistribution: stats.models.map((m) => ({
|
|
210
228
|
model: m.model,
|
|
@@ -214,6 +232,17 @@ function handleRouterMetrics(routerDbPath) {
|
|
|
214
232
|
: 0,
|
|
215
233
|
cost: m.total_cost ?? 0,
|
|
216
234
|
})),
|
|
235
|
+
recentDecisions: recentDecisions.map((d) => ({
|
|
236
|
+
timestamp: d.timestamp,
|
|
237
|
+
model: d.model,
|
|
238
|
+
complexity: d.complexity,
|
|
239
|
+
inputTokens: d.inputTokens,
|
|
240
|
+
outputTokens: d.outputTokens,
|
|
241
|
+
cost: d.cost,
|
|
242
|
+
latencyMs: d.latency_ms,
|
|
243
|
+
success: d.success === 1,
|
|
244
|
+
fallback: d.fallback === 1,
|
|
245
|
+
})),
|
|
217
246
|
});
|
|
218
247
|
}
|
|
219
248
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/sidecar/routes/metrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0GA,sCA2FC;AAED,
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/sidecar/routes/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../../src/sidecar/routes/restart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../../src/sidecar/routes/restart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAWxC,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,YAAY,CAiD/D"}
|
|
@@ -35,6 +35,10 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.handleRestart = handleRestart;
|
|
37
37
|
const utils_1 = require("../utils");
|
|
38
|
+
/** Strict whitelist of service names that can be restarted */
|
|
39
|
+
const ALLOWED_SERVICES = new Set([
|
|
40
|
+
"openclaw", "ironclaw", "litellm", "claw-sidecar", "caddy",
|
|
41
|
+
]);
|
|
38
42
|
function handleRestart(_config) {
|
|
39
43
|
return async (req, res) => {
|
|
40
44
|
let body = {};
|
|
@@ -48,8 +52,13 @@ function handleRestart(_config) {
|
|
|
48
52
|
const service = body.service ?? "openclaw";
|
|
49
53
|
const results = {};
|
|
50
54
|
const restart = async (svc) => {
|
|
55
|
+
// SECURITY: validate service name against whitelist before exec
|
|
56
|
+
if (!ALLOWED_SERVICES.has(svc)) {
|
|
57
|
+
results[svc] = "rejected: invalid service name";
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
51
60
|
try {
|
|
52
|
-
const { stdout, stderr } = await (0, utils_1.
|
|
61
|
+
const { stdout, stderr } = await (0, utils_1.execSafeCommand)("sudo", ["systemctl", "restart", svc]);
|
|
53
62
|
results[svc] = stdout || stderr || "restarted";
|
|
54
63
|
}
|
|
55
64
|
catch (err) {
|
|
@@ -59,13 +68,13 @@ function handleRestart(_config) {
|
|
|
59
68
|
try {
|
|
60
69
|
if (service === "all") {
|
|
61
70
|
await restart("openclaw");
|
|
62
|
-
await restart("
|
|
71
|
+
await restart("litellm");
|
|
63
72
|
}
|
|
64
73
|
else if (service === "router") {
|
|
65
|
-
await restart("
|
|
74
|
+
await restart("litellm");
|
|
66
75
|
}
|
|
67
76
|
else {
|
|
68
|
-
await restart(
|
|
77
|
+
await restart(service);
|
|
69
78
|
}
|
|
70
79
|
(0, utils_1.sendJson)(res, 200, {
|
|
71
80
|
restarted: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../src/sidecar/routes/restart.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../src/sidecar/routes/restart.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,sCAiDC;AA7DD,oCAAgE;AAOhE,8DAA8D;AAC9D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO;CAC3D,CAAC,CAAC;AAEH,SAAgB,aAAa,CAAC,OAAmB;IAC/C,OAAO,KAAK,EAAE,GAAoB,EAAE,GAAmB,EAAiB,EAAE;QACxE,IAAI,IAAI,GAAgB,EAAE,CAAC;QAE3B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,kDAAO,UAAU,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YACtE,IAAI,GAAI,MAAsB,IAAI,EAAE,CAAC;QACvC,CAAC;QAAC,MAAM,CAAC;YACP,+BAA+B;QACjC,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC;QAC3C,MAAM,OAAO,GAA2B,EAAE,CAAC;QAE3C,MAAM,OAAO,GAAG,KAAK,EAAE,GAAW,EAAiB,EAAE;YACnD,gEAAgE;YAChE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,gCAAgC,CAAC;gBAChD,OAAO;YACT,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,uBAAe,EAC9C,MAAM,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,CACtC,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,MAAM,IAAI,WAAW,CAAC;YACjD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,GAAG,CAAC,GAAG,WAAY,GAAa,CAAC,OAAO,EAAE,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;gBACtB,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC1B,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;YAC3B,CAAC;iBAAM,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAChC,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;YAED,IAAA,gBAAQ,EAAC,GAAG,EAAE,GAAG,EAAE;gBACjB,SAAS,EAAE,IAAI;gBACf,OAAO;gBACP,OAAO;aACR,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,iBAAS,EAAC,GAAG,EAAE,GAAG,EAAE,mBAAoB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { ClawConfig } from "../../config";
|
|
2
2
|
import { RouteHandler } from "./health";
|
|
3
3
|
export declare function handleGetRouterConfig(config: ClawConfig): RouteHandler;
|
|
4
|
-
export declare function handleUpdateStrategy(config: ClawConfig): RouteHandler;
|
|
5
4
|
//# sourceMappingURL=router-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-config.d.ts","sourceRoot":"","sources":["../../../src/sidecar/routes/router-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router-config.d.ts","sourceRoot":"","sources":["../../../src/sidecar/routes/router-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,CAOtE"}
|