kumo-cli 1.0.2 → 1.0.4
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/README.md +13 -5
- package/dist/auth/credentialsStore.js +61 -14
- package/dist/auth/credentialsStore.js.map +1 -1
- package/dist/auth/credentialsStore.test.js +60 -0
- package/dist/auth/credentialsStore.test.js.map +1 -0
- package/dist/claude/fileHistory.js +35 -0
- package/dist/claude/fileHistory.js.map +1 -0
- package/dist/claude/sessionScanner.js +7 -95
- package/dist/claude/sessionScanner.js.map +1 -1
- package/dist/claude/sessionScanner.test.js +24 -0
- package/dist/claude/sessionScanner.test.js.map +1 -0
- package/dist/claude/transcriptParser.js +83 -0
- package/dist/claude/transcriptParser.js.map +1 -0
- package/dist/claude/transcriptParser.test.js +78 -0
- package/dist/claude/transcriptParser.test.js.map +1 -0
- package/dist/commands/agentPrompt.js +18 -0
- package/dist/commands/agentPrompt.js.map +1 -0
- package/dist/commands/cliArgs.js +56 -0
- package/dist/commands/cliArgs.js.map +1 -0
- package/dist/commands/cliArgs.test.js +25 -0
- package/dist/commands/cliArgs.test.js.map +1 -0
- package/dist/core/logger.js +7 -2
- package/dist/core/logger.js.map +1 -1
- package/dist/core/projectFileWatcher.js +56 -0
- package/dist/core/projectFileWatcher.js.map +1 -0
- package/dist/handlers/fileHandlerPayloads.js +72 -0
- package/dist/handlers/fileHandlerPayloads.js.map +1 -0
- package/dist/handlers/fileHandlerPayloads.test.js +55 -0
- package/dist/handlers/fileHandlerPayloads.test.js.map +1 -0
- package/dist/handlers/fileHandlers.js +74 -0
- package/dist/handlers/fileHandlers.js.map +1 -0
- package/dist/handlers/messageRouter.js +8 -203
- package/dist/handlers/messageRouter.js.map +1 -1
- package/dist/handlers/router.types.js +2 -0
- package/dist/handlers/router.types.js.map +1 -0
- package/dist/handlers/runtimeHandlers.js +55 -0
- package/dist/handlers/runtimeHandlers.js.map +1 -0
- package/dist/handlers/sessionHandlers.js +68 -0
- package/dist/handlers/sessionHandlers.js.map +1 -0
- package/dist/handlers/terminalHandlers.js +40 -0
- package/dist/handlers/terminalHandlers.js.map +1 -0
- package/dist/index.js +59 -145
- package/dist/index.js.map +1 -1
- package/dist/pty/notificationDetector.js +29 -0
- package/dist/pty/notificationDetector.js.map +1 -0
- package/dist/pty/notificationDetector.test.js +24 -0
- package/dist/pty/notificationDetector.test.js.map +1 -0
- package/dist/pty/ptyMenuParser.js +11 -277
- package/dist/pty/ptyMenuParser.js.map +1 -1
- package/dist/pty/ptyMenuParser.test.js +26 -0
- package/dist/pty/ptyMenuParser.test.js.map +1 -0
- package/dist/pty/selectionMenuDetector.js +49 -0
- package/dist/pty/selectionMenuDetector.js.map +1 -0
- package/dist/pty/selectionMenuDetector.test.js +62 -0
- package/dist/pty/selectionMenuDetector.test.js.map +1 -0
- package/dist/pty/selectionMenuMeta.js +54 -0
- package/dist/pty/selectionMenuMeta.js.map +1 -0
- package/dist/pty/selectionMenuMeta.test.js +26 -0
- package/dist/pty/selectionMenuMeta.test.js.map +1 -0
- package/dist/pty/selectionMenuParser.js +83 -0
- package/dist/pty/selectionMenuParser.js.map +1 -0
- package/dist/pty/selectionMenuParser.test.js +30 -0
- package/dist/pty/selectionMenuParser.test.js.map +1 -0
- package/dist/pty/statusSessionDetector.js +28 -0
- package/dist/pty/statusSessionDetector.js.map +1 -0
- package/dist/pty/statusSessionDetector.test.js +23 -0
- package/dist/pty/statusSessionDetector.test.js.map +1 -0
- package/dist/pty/terminalManager.js +11 -6
- package/dist/pty/terminalManager.js.map +1 -1
- package/dist/pty/textInputDetector.js +60 -0
- package/dist/pty/textInputDetector.js.map +1 -0
- package/dist/pty/textInputDetector.test.js +32 -0
- package/dist/pty/textInputDetector.test.js.map +1 -0
- package/dist/services/bootstrapService.js +28 -0
- package/dist/services/bootstrapService.js.map +1 -0
- package/dist/services/claudeAdapterProxy.js +104 -0
- package/dist/services/claudeAdapterProxy.js.map +1 -0
- package/dist/services/claudeMenuBridge.js +116 -0
- package/dist/services/claudeMenuBridge.js.map +1 -0
- package/dist/services/claudeMenuBridge.test.js +90 -0
- package/dist/services/claudeMenuBridge.test.js.map +1 -0
- package/dist/services/claudeService.js +7 -79
- package/dist/services/claudeService.js.map +1 -1
- package/dist/services/claudeService.test.js +39 -0
- package/dist/services/claudeService.test.js.map +1 -0
- package/dist/services/cliRuntime.js +49 -0
- package/dist/services/cliRuntime.js.map +1 -0
- package/dist/services/cliRuntime.test.js +55 -0
- package/dist/services/cliRuntime.test.js.map +1 -0
- package/dist/services/fileService.js +22 -24
- package/dist/services/fileService.js.map +1 -1
- package/dist/services/modelAdapter.test.js +47 -0
- package/dist/services/modelAdapter.test.js.map +1 -0
- package/dist/services/modelArgs.test.js +64 -0
- package/dist/services/modelArgs.test.js.map +1 -0
- package/dist/services/modelBaseUrl.test.js +32 -0
- package/dist/services/modelBaseUrl.test.js.map +1 -0
- package/dist/services/modelService.js +54 -12
- package/dist/services/modelService.js.map +1 -1
- package/dist/services/modelService.test.js +136 -0
- package/dist/services/modelService.test.js.map +1 -0
- package/dist/services/notificationDedupe.js +23 -0
- package/dist/services/notificationDedupe.js.map +1 -0
- package/dist/services/notificationDedupe.test.js +20 -0
- package/dist/services/notificationDedupe.test.js.map +1 -0
- package/dist/services/pairingService.js +17 -8
- package/dist/services/pairingService.js.map +1 -1
- package/dist/services/sessionListService.js +19 -0
- package/dist/services/sessionListService.js.map +1 -0
- package/dist/services/sessionListService.test.js +22 -0
- package/dist/services/sessionListService.test.js.map +1 -0
- package/dist/services/sessionService.js +8 -45
- package/dist/services/sessionService.js.map +1 -1
- package/dist/services/tunnelHelpers.js +69 -0
- package/dist/services/tunnelHelpers.js.map +1 -0
- package/dist/services/tunnelHelpers.test.js +42 -0
- package/dist/services/tunnelHelpers.test.js.map +1 -0
- package/dist/services/tunnelService.js +69 -25
- package/dist/services/tunnelService.js.map +1 -1
- package/dist/services/tunnelService.test.js +91 -0
- package/dist/services/tunnelService.test.js.map +1 -0
- package/dist/transport/webrtcTransport.js +145 -0
- package/dist/transport/webrtcTransport.js.map +1 -0
- package/dist/transport/webrtcTransport.test.js +104 -0
- package/dist/transport/webrtcTransport.test.js.map +1 -0
- package/dist/transport/webrtcTypes.js +29 -0
- package/dist/transport/webrtcTypes.js.map +1 -0
- package/dist/transport/webrtcTypes.test.js +20 -0
- package/dist/transport/webrtcTypes.test.js.map +1 -0
- package/dist/transport/wsClient.js +16 -3
- package/dist/transport/wsClient.js.map +1 -1
- package/dist/utils/safePath.js +18 -6
- package/dist/utils/safePath.js.map +1 -1
- package/package.json +8 -2
- package/scripts/run-tests.mjs +45 -0
|
@@ -3,7 +3,7 @@ import os from 'node:os';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { log } from '../core/logger.js';
|
|
5
5
|
import { cwdToProjectFolder } from '../utils/safePath.js';
|
|
6
|
-
import {
|
|
6
|
+
import { parseTranscriptMessage } from '../claude/transcriptParser.js';
|
|
7
7
|
// remove any `--resume <id>` or `-r <id>` flag pairs
|
|
8
8
|
export function removeResumeArgs(args) {
|
|
9
9
|
const result = [];
|
|
@@ -116,50 +116,13 @@ export function readSessionHistory(sessionId) {
|
|
|
116
116
|
if (!line.trim())
|
|
117
117
|
continue;
|
|
118
118
|
try {
|
|
119
|
-
const
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
if (!role || role === 'system')
|
|
127
|
-
continue;
|
|
128
|
-
if (entry['isMeta'] || entry['sourceToolUseID'])
|
|
129
|
-
continue;
|
|
130
|
-
const uuid = entry['uuid'];
|
|
131
|
-
if (uuid && seenUuids.has(uuid))
|
|
132
|
-
continue;
|
|
133
|
-
if (uuid)
|
|
134
|
-
seenUuids.add(uuid);
|
|
135
|
-
const timestamp = entry['timestamp'];
|
|
136
|
-
let content = '';
|
|
137
|
-
const toolUses = [];
|
|
138
|
-
if (typeof msgObj['content'] === 'string')
|
|
139
|
-
content = msgObj['content'];
|
|
140
|
-
else if (Array.isArray(msgObj['content'])) {
|
|
141
|
-
const arr = msgObj['content'];
|
|
142
|
-
content = arr
|
|
143
|
-
.filter((b) => b['type'] === 'text' && b['text'] && b['text'].trim() !== 'No response requested.')
|
|
144
|
-
.map((b) => b['text']).join('');
|
|
145
|
-
for (const b of arr) {
|
|
146
|
-
if (b['type'] === 'tool_use' && b['name']) {
|
|
147
|
-
const tu = { toolName: b['name'], input: b['input'] ?? {} };
|
|
148
|
-
if (tu.toolName === 'Write') {
|
|
149
|
-
const fp = tu.input['file_path'] ?? tu.input['path'] ?? '';
|
|
150
|
-
if (fp) {
|
|
151
|
-
const oldContent = readFileHistoryPrev(sessionId, fp);
|
|
152
|
-
if (oldContent !== null)
|
|
153
|
-
tu.input['old_content'] = oldContent;
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
toolUses.push(tu);
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
if (!content && toolUses.length === 0)
|
|
161
|
-
continue;
|
|
162
|
-
messages.push({ role, content, id: uuid, timestamp, toolUses: toolUses.length > 0 ? toolUses : undefined });
|
|
119
|
+
const parsed = parseTranscriptMessage(JSON.parse(line), {
|
|
120
|
+
sessionId,
|
|
121
|
+
seenUuids,
|
|
122
|
+
includeNoise: true,
|
|
123
|
+
});
|
|
124
|
+
if (parsed)
|
|
125
|
+
messages.push(parsed);
|
|
163
126
|
}
|
|
164
127
|
catch { }
|
|
165
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionService.js","sourceRoot":"","sources":["../../src/services/sessionService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sessionService.js","sourceRoot":"","sources":["../../src/services/sessionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
export const DEFAULT_TUNNEL_HOST = '127.0.0.1';
|
|
2
|
+
// build a stable host header for the proxied local target
|
|
3
|
+
export function resolveTunnelHostHeader(port, requestedHost) {
|
|
4
|
+
const trimmedHost = typeof requestedHost === 'string' ? requestedHost.trim() : '';
|
|
5
|
+
if (!trimmedHost)
|
|
6
|
+
return undefined;
|
|
7
|
+
return trimmedHost.includes(':') ? trimmedHost : `${trimmedHost}:${port}`;
|
|
8
|
+
}
|
|
9
|
+
// validate and normalize the tunnel path to avoid malformed local requests
|
|
10
|
+
export function normalizeTunnelPath(pathValue) {
|
|
11
|
+
return typeof pathValue === 'string' && pathValue.startsWith('/') && !pathValue.startsWith('//') ? pathValue : '/';
|
|
12
|
+
}
|
|
13
|
+
// decode a tunnel request body only for methods that may legally send one
|
|
14
|
+
export function decodeTunnelBody(request) {
|
|
15
|
+
if (!request.body || request.method === 'GET' || request.method === 'HEAD') {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
return Buffer.from(request.body, 'base64');
|
|
19
|
+
}
|
|
20
|
+
// drop hop-by-hop headers and rewrite local origins before proxying the request
|
|
21
|
+
export function filterTunnelRequestHeaders(headers, targetHost, port, hostHeader) {
|
|
22
|
+
const filteredHeaders = Object.fromEntries(Object.entries(headers)
|
|
23
|
+
.filter(([key]) => {
|
|
24
|
+
const lowerKey = key.toLowerCase();
|
|
25
|
+
return !lowerKey.startsWith('sec-') && !['host', 'connection', 'accept-encoding', 'upgrade-insecure-requests'].includes(lowerKey);
|
|
26
|
+
})
|
|
27
|
+
.map(([key, value]) => {
|
|
28
|
+
const lowerKey = key.toLowerCase();
|
|
29
|
+
if (lowerKey === 'origin' || lowerKey === 'referer') {
|
|
30
|
+
return [key, value.replace(/http:\/\/(?:localhost|127\.0\.0\.1):\d+/g, `http://${targetHost}:${port}`)];
|
|
31
|
+
}
|
|
32
|
+
return [key, value];
|
|
33
|
+
}));
|
|
34
|
+
if (hostHeader)
|
|
35
|
+
filteredHeaders.host = hostHeader;
|
|
36
|
+
return filteredHeaders;
|
|
37
|
+
}
|
|
38
|
+
// remove transport-specific headers and rewrite redirects/cookies for the app side
|
|
39
|
+
export function rewriteTunnelResponseHeaders(headers, targetHost, port, hostHeader) {
|
|
40
|
+
const responseHeaders = Object.fromEntries(Object.entries(headers).filter(([key]) => !['content-encoding', 'transfer-encoding', 'content-length'].includes(key.toLowerCase())));
|
|
41
|
+
const remoteOrigin = `http://${targetHost}:${port}`;
|
|
42
|
+
if (responseHeaders.location) {
|
|
43
|
+
const location = String(responseHeaders.location);
|
|
44
|
+
const absoluteLike = location.startsWith('http://') || location.startsWith('https://') || location.startsWith('//');
|
|
45
|
+
if (absoluteLike) {
|
|
46
|
+
const parsed = new URL(location.startsWith('//') ? `http:${location}` : location);
|
|
47
|
+
const origin = `${parsed.protocol}//${parsed.host}`;
|
|
48
|
+
const originsToStrip = new Set([
|
|
49
|
+
`http://${targetHost}:${port}`,
|
|
50
|
+
`http://localhost:${port}`,
|
|
51
|
+
hostHeader ? `http://${hostHeader}` : '',
|
|
52
|
+
hostHeader ? `https://${hostHeader}` : '',
|
|
53
|
+
].filter(Boolean));
|
|
54
|
+
if (originsToStrip.has(origin)) {
|
|
55
|
+
responseHeaders.location = `${parsed.pathname}${parsed.search}${parsed.hash}`;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
responseHeaders.location = location.replace(remoteOrigin, '');
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
if (responseHeaders['set-cookie']) {
|
|
63
|
+
responseHeaders['set-cookie'] = responseHeaders['set-cookie']
|
|
64
|
+
.replace(/;\s*domain=[^;]*/gi, '')
|
|
65
|
+
.replace(/;\s*secure/gi, '');
|
|
66
|
+
}
|
|
67
|
+
return responseHeaders;
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=tunnelHelpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnelHelpers.js","sourceRoot":"","sources":["../../src/services/tunnelHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import test from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { decodeTunnelBody, filterTunnelRequestHeaders, normalizeTunnelPath, resolveTunnelHostHeader, rewriteTunnelResponseHeaders, } from './tunnelHelpers.js';
|
|
4
|
+
test('normalizeTunnelPath falls back to root for malformed paths', () => {
|
|
5
|
+
assert.equal(normalizeTunnelPath('/api/health'), '/api/health');
|
|
6
|
+
assert.equal(normalizeTunnelPath('//evil'), '/');
|
|
7
|
+
});
|
|
8
|
+
test('resolveTunnelHostHeader appends port when missing', () => {
|
|
9
|
+
assert.equal(resolveTunnelHostHeader(3000, 'localhost'), 'localhost:3000');
|
|
10
|
+
assert.equal(resolveTunnelHostHeader(3000, 'localhost:4000'), 'localhost:4000');
|
|
11
|
+
});
|
|
12
|
+
test('decodeTunnelBody skips get requests and decodes post payloads', () => {
|
|
13
|
+
assert.equal(decodeTunnelBody({ requestId: '1', method: 'GET', path: '/', headers: {}, port: 3000, body: 'aGk=' }), undefined);
|
|
14
|
+
assert.equal(decodeTunnelBody({ requestId: '1', method: 'POST', path: '/', headers: {}, port: 3000, body: Buffer.from('hi').toString('base64') })?.toString('utf-8'), 'hi');
|
|
15
|
+
});
|
|
16
|
+
test('filterTunnelRequestHeaders strips hop-by-hop headers and rewrites local origins', () => {
|
|
17
|
+
const headers = filterTunnelRequestHeaders({
|
|
18
|
+
Host: 'example.com',
|
|
19
|
+
Connection: 'keep-alive',
|
|
20
|
+
Origin: 'http://localhost:8080',
|
|
21
|
+
Referer: 'http://127.0.0.1:8080/app',
|
|
22
|
+
Accept: 'application/json',
|
|
23
|
+
}, '127.0.0.1', 3000, 'localhost:3000');
|
|
24
|
+
assert.deepEqual(headers, {
|
|
25
|
+
Origin: 'http://127.0.0.1:3000',
|
|
26
|
+
Referer: 'http://127.0.0.1:3000/app',
|
|
27
|
+
Accept: 'application/json',
|
|
28
|
+
host: 'localhost:3000',
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
test('rewriteTunnelResponseHeaders strips local redirect origins and cookie domain', () => {
|
|
32
|
+
const headers = rewriteTunnelResponseHeaders({
|
|
33
|
+
location: 'http://127.0.0.1:3000/login?next=%2F',
|
|
34
|
+
'set-cookie': 'sid=abc; Domain=localhost; Path=/; Secure',
|
|
35
|
+
'content-length': '10',
|
|
36
|
+
}, '127.0.0.1', 3000, 'localhost:3000');
|
|
37
|
+
assert.deepEqual(headers, {
|
|
38
|
+
location: '/login?next=%2F',
|
|
39
|
+
'set-cookie': 'sid=abc; Path=/',
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=tunnelHelpers.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnelHelpers.test.js","sourceRoot":"","sources":["../../src/services/tunnelHelpers.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,mBAAmB,EACnB,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAE5B,IAAI,CAAC,4DAA4D,EAAE,GAAG,EAAE;IACtE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;IAChE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC3E,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+DAA+D,EAAE,GAAG,EAAE;IACzE,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;IAC/H,MAAM,CAAC,KAAK,CACV,gBAAgB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EACvJ,IAAI,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iFAAiF,EAAE,GAAG,EAAE;IAC3F,MAAM,OAAO,GAAG,0BAA0B,CACxC;QACE,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE,uBAAuB;QAC/B,OAAO,EAAE,2BAA2B;QACpC,MAAM,EAAE,kBAAkB;KAC3B,EACD,WAAW,EACX,IAAI,EACJ,gBAAgB,CACjB,CAAC;IAEF,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE;QACxB,MAAM,EAAE,uBAAuB;QAC/B,OAAO,EAAE,2BAA2B;QACpC,MAAM,EAAE,kBAAkB;QAC1B,IAAI,EAAE,gBAAgB;KACvB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8EAA8E,EAAE,GAAG,EAAE;IACxF,MAAM,OAAO,GAAG,4BAA4B,CAC1C;QACE,QAAQ,EAAE,sCAAsC;QAChD,YAAY,EAAE,2CAA2C;QACzD,gBAAgB,EAAE,IAAI;KACvB,EACD,WAAW,EACX,IAAI,EACJ,gBAAgB,CACjB,CAAC;IAEF,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE;QACxB,QAAQ,EAAE,iBAAiB;QAC3B,YAAY,EAAE,iBAAiB;KAChC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,37 +1,81 @@
|
|
|
1
|
+
import http from 'node:http';
|
|
1
2
|
import { log } from '../core/logger.js';
|
|
3
|
+
import { decodeTunnelBody, DEFAULT_TUNNEL_HOST, filterTunnelRequestHeaders, normalizeTunnelPath, resolveTunnelHostHeader, rewriteTunnelResponseHeaders, } from './tunnelHelpers.js';
|
|
4
|
+
const MAX_TUNNEL_BODY_BYTES = Number(process.env.KUMO_TUNNEL_BODY_BYTES ?? 10 * 1024 * 1024);
|
|
5
|
+
const MAX_TUNNEL_RESPONSE_BYTES = Number(process.env.KUMO_TUNNEL_RESPONSE_BYTES ?? 10 * 1024 * 1024);
|
|
6
|
+
const TUNNEL_TIMEOUT_MS = Number(process.env.KUMO_TUNNEL_TIMEOUT_MS ?? 30000);
|
|
7
|
+
const allowedPorts = new Set((process.env.KUMO_ALLOWED_TUNNEL_PORTS ?? '')
|
|
8
|
+
.split(',')
|
|
9
|
+
.map((port) => Number(port.trim()))
|
|
10
|
+
.filter((port) => Number.isInteger(port) && port > 0 && port <= 65535));
|
|
11
|
+
function tunnelError(requestId, status, message) {
|
|
12
|
+
return { type: 'tunnel_response', requestId, status, headers: {}, body: Buffer.from(message).toString('base64') };
|
|
13
|
+
}
|
|
14
|
+
async function proxyHttpRequest(input) {
|
|
15
|
+
return await new Promise((resolve, reject) => {
|
|
16
|
+
const req = http.request({
|
|
17
|
+
protocol: 'http:',
|
|
18
|
+
hostname: input.hostname,
|
|
19
|
+
port: input.port,
|
|
20
|
+
method: input.method,
|
|
21
|
+
path: input.path,
|
|
22
|
+
headers: input.headers,
|
|
23
|
+
}, (res) => {
|
|
24
|
+
const status = res.statusCode ?? 502;
|
|
25
|
+
const headers = {};
|
|
26
|
+
for (const [k, v] of Object.entries(res.headers)) {
|
|
27
|
+
if (v == null)
|
|
28
|
+
continue;
|
|
29
|
+
headers[k] = Array.isArray(v) ? v.join(',') : String(v);
|
|
30
|
+
}
|
|
31
|
+
const chunks = [];
|
|
32
|
+
let total = 0;
|
|
33
|
+
res.on('data', (chunk) => {
|
|
34
|
+
total += chunk.length;
|
|
35
|
+
if (total > MAX_TUNNEL_RESPONSE_BYTES) {
|
|
36
|
+
req.destroy(new Error('response body too large'));
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
chunks.push(chunk);
|
|
40
|
+
});
|
|
41
|
+
res.on('end', () => resolve({ status, headers, body: Buffer.concat(chunks) }));
|
|
42
|
+
res.on('error', reject);
|
|
43
|
+
});
|
|
44
|
+
req.setTimeout(TUNNEL_TIMEOUT_MS, () => req.destroy(new Error('timeout')));
|
|
45
|
+
req.on('error', reject);
|
|
46
|
+
if (input.body)
|
|
47
|
+
req.write(input.body);
|
|
48
|
+
req.end();
|
|
49
|
+
});
|
|
50
|
+
}
|
|
2
51
|
// proxy a http request from the server through this cli to a local service
|
|
3
52
|
export async function handleTunnelRequest(req) {
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}));
|
|
53
|
+
const port = Number(req.port);
|
|
54
|
+
if (!Number.isInteger(port) || port < 1 || port > 65535)
|
|
55
|
+
return tunnelError(req.requestId, 400, 'invalid port');
|
|
56
|
+
if (allowedPorts.size > 0 && !allowedPorts.has(port))
|
|
57
|
+
return tunnelError(req.requestId, 403, 'port not allowed');
|
|
58
|
+
const safePath = normalizeTunnelPath(req.path);
|
|
59
|
+
const targetHost = DEFAULT_TUNNEL_HOST;
|
|
60
|
+
const url = `http://${targetHost}:${port}${safePath}`;
|
|
61
|
+
const hostHeader = resolveTunnelHostHeader(port, req.host);
|
|
62
|
+
const body = decodeTunnelBody(req);
|
|
63
|
+
if (body && body.length > MAX_TUNNEL_BODY_BYTES)
|
|
64
|
+
return tunnelError(req.requestId, 413, 'request body too large');
|
|
65
|
+
const filteredHeaders = filterTunnelRequestHeaders(req.headers, targetHost, port, hostHeader);
|
|
18
66
|
log(`[tunnel] ${req.method} ${url}`);
|
|
19
67
|
try {
|
|
20
|
-
const res = await
|
|
68
|
+
const res = await proxyHttpRequest({
|
|
69
|
+
hostname: targetHost,
|
|
70
|
+
port,
|
|
71
|
+
path: safePath,
|
|
21
72
|
method: req.method,
|
|
22
73
|
headers: filteredHeaders,
|
|
23
|
-
body
|
|
24
|
-
redirect: 'manual',
|
|
74
|
+
body,
|
|
25
75
|
});
|
|
26
|
-
const buf =
|
|
76
|
+
const buf = res.body;
|
|
27
77
|
log(`[tunnel] response ${res.status} ${url} (${buf.length} bytes)`);
|
|
28
|
-
const respHeaders =
|
|
29
|
-
const remoteOrigin = `http://${targetHost}:${req.port}`;
|
|
30
|
-
if (respHeaders['location'])
|
|
31
|
-
respHeaders['location'] = respHeaders['location'].replace(remoteOrigin, '');
|
|
32
|
-
if (respHeaders['set-cookie']) {
|
|
33
|
-
respHeaders['set-cookie'] = respHeaders['set-cookie'].replace(/;\s*domain=[^;]*/gi, '').replace(/;\s*secure/gi, '');
|
|
34
|
-
}
|
|
78
|
+
const respHeaders = rewriteTunnelResponseHeaders(res.headers, targetHost, port, hostHeader);
|
|
35
79
|
return { type: 'tunnel_response', requestId: req.requestId, status: res.status, headers: respHeaders, body: buf.toString('base64') };
|
|
36
80
|
}
|
|
37
81
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnelService.js","sourceRoot":"","sources":["../../src/services/tunnelService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"tunnelService.js","sourceRoot":"","sources":["../../src/services/tunnelService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import test from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import http from 'node:http';
|
|
4
|
+
import { handleTunnelRequest } from './tunnelService.js';
|
|
5
|
+
test('preserves browser client hint headers through tunnel proxy', async () => {
|
|
6
|
+
const seenHeaders = await new Promise((resolve, reject) => {
|
|
7
|
+
const server = http.createServer((req, res) => {
|
|
8
|
+
resolve(req.headers);
|
|
9
|
+
res.end('ok');
|
|
10
|
+
server.close();
|
|
11
|
+
});
|
|
12
|
+
server.on('error', reject);
|
|
13
|
+
server.listen(0, '127.0.0.1', async () => {
|
|
14
|
+
const address = server.address();
|
|
15
|
+
if (!address || typeof address === 'string')
|
|
16
|
+
return reject(new Error('server address unavailable'));
|
|
17
|
+
const response = await handleTunnelRequest({
|
|
18
|
+
requestId: 'req-1',
|
|
19
|
+
method: 'GET',
|
|
20
|
+
path: '/',
|
|
21
|
+
port: address.port,
|
|
22
|
+
headers: {
|
|
23
|
+
'user-agent': 'Mozilla/5.0 Chrome/120.0.0.0',
|
|
24
|
+
'sec-ch-ua': '"Chromium";v="120"',
|
|
25
|
+
'sec-ch-ua-mobile': '?0',
|
|
26
|
+
'sec-ch-ua-platform': '"Windows"',
|
|
27
|
+
'upgrade-insecure-requests': '1',
|
|
28
|
+
connection: 'keep-alive',
|
|
29
|
+
host: 'provider.ecologynet.local:3000',
|
|
30
|
+
},
|
|
31
|
+
});
|
|
32
|
+
assert.equal(response.status, 200);
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
assert.equal(seenHeaders['user-agent'], 'Mozilla/5.0 Chrome/120.0.0.0');
|
|
36
|
+
assert.equal(seenHeaders['sec-ch-ua'], '"Chromium";v="120"');
|
|
37
|
+
assert.equal(seenHeaders['sec-ch-ua-mobile'], '?0');
|
|
38
|
+
assert.equal(seenHeaders['sec-ch-ua-platform'], '"Windows"');
|
|
39
|
+
assert.equal(seenHeaders['upgrade-insecure-requests'], '1');
|
|
40
|
+
assert.equal(seenHeaders.connection, 'keep-alive');
|
|
41
|
+
assert.notEqual(seenHeaders.host, 'provider.ecologynet.local:3000');
|
|
42
|
+
});
|
|
43
|
+
test('replaces non-browser user agents for browser-gated local apps', async () => {
|
|
44
|
+
const seenHeaders = await new Promise((resolve, reject) => {
|
|
45
|
+
const server = http.createServer((req, res) => {
|
|
46
|
+
resolve(req.headers);
|
|
47
|
+
res.end('ok');
|
|
48
|
+
server.close();
|
|
49
|
+
});
|
|
50
|
+
server.on('error', reject);
|
|
51
|
+
server.listen(0, '127.0.0.1', async () => {
|
|
52
|
+
const address = server.address();
|
|
53
|
+
if (!address || typeof address === 'string')
|
|
54
|
+
return reject(new Error('server address unavailable'));
|
|
55
|
+
const response = await handleTunnelRequest({
|
|
56
|
+
requestId: 'req-2',
|
|
57
|
+
method: 'GET',
|
|
58
|
+
path: '/',
|
|
59
|
+
port: address.port,
|
|
60
|
+
headers: { 'user-agent': 'Dart/3.0 (dart:io)' },
|
|
61
|
+
});
|
|
62
|
+
assert.equal(response.status, 200);
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
assert.match(seenHeaders['user-agent'] ?? '', /Chrome\/120/);
|
|
66
|
+
});
|
|
67
|
+
test('modernizes old browser user agents for Rails allow_browser modern gate', async () => {
|
|
68
|
+
const seenHeaders = await new Promise((resolve, reject) => {
|
|
69
|
+
const server = http.createServer((req, res) => {
|
|
70
|
+
resolve(req.headers);
|
|
71
|
+
res.end('ok');
|
|
72
|
+
server.close();
|
|
73
|
+
});
|
|
74
|
+
server.on('error', reject);
|
|
75
|
+
server.listen(0, '127.0.0.1', async () => {
|
|
76
|
+
const address = server.address();
|
|
77
|
+
if (!address || typeof address === 'string')
|
|
78
|
+
return reject(new Error('server address unavailable'));
|
|
79
|
+
const response = await handleTunnelRequest({
|
|
80
|
+
requestId: 'req-3',
|
|
81
|
+
method: 'GET',
|
|
82
|
+
path: '/',
|
|
83
|
+
port: address.port,
|
|
84
|
+
headers: { 'user-agent': 'Mozilla/5.0 AppleWebKit/537.36 Chrome/119.0.0.0 Safari/537.36' },
|
|
85
|
+
});
|
|
86
|
+
assert.equal(response.status, 200);
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
assert.equal(seenHeaders['user-agent'], 'Mozilla/5.0 AppleWebKit/537.36 Chrome/120.0.0.0 Safari/537.36');
|
|
90
|
+
});
|
|
91
|
+
//# sourceMappingURL=tunnelService.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnelService.test.js","sourceRoot":"","sources":["../../src/services/tunnelService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { log } from '../core/logger.js';
|
|
2
|
+
import { domainForType, unwrapDomainEnvelope, wrapDomainEnvelope } from './webrtcTypes.js';
|
|
3
|
+
const routedDomains = new Set(['prompt', 'session', 'transcript', 'file']);
|
|
4
|
+
export class CliWebRtcTransport {
|
|
5
|
+
terminals;
|
|
6
|
+
send;
|
|
7
|
+
createPeerConnection;
|
|
8
|
+
hasPermission;
|
|
9
|
+
routeMessage;
|
|
10
|
+
peers = new Map();
|
|
11
|
+
channels = new Map();
|
|
12
|
+
terminalToSession = new Map();
|
|
13
|
+
constructor(terminals, send, createPeerConnection, hasPermission = () => true, routeMessage) {
|
|
14
|
+
this.terminals = terminals;
|
|
15
|
+
this.send = send;
|
|
16
|
+
this.createPeerConnection = createPeerConnection;
|
|
17
|
+
this.hasPermission = hasPermission;
|
|
18
|
+
this.routeMessage = routeMessage;
|
|
19
|
+
}
|
|
20
|
+
setMessageRouter(routeMessage) { this.routeMessage = routeMessage; }
|
|
21
|
+
async handleSignal(msg) {
|
|
22
|
+
if (!msg.sessionId)
|
|
23
|
+
return;
|
|
24
|
+
if (msg.signalType === 'offer') {
|
|
25
|
+
await this.acceptOffer(msg.sessionId, msg.payload);
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
if (msg.signalType === 'ice') {
|
|
29
|
+
const peer = this.peers.get(msg.sessionId);
|
|
30
|
+
if (peer && msg.payload)
|
|
31
|
+
await peer.addIceCandidate(msg.payload);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
attachTerminal(terminalId, sessionId) {
|
|
35
|
+
this.terminalToSession.set(terminalId, sessionId);
|
|
36
|
+
}
|
|
37
|
+
sendTerminalOutput(terminalId, data) {
|
|
38
|
+
const sessionId = this.terminalToSession.get(terminalId);
|
|
39
|
+
if (!sessionId)
|
|
40
|
+
return false;
|
|
41
|
+
return this.sendEnvelope(sessionId, { type: 'terminal_output', terminalId, data });
|
|
42
|
+
}
|
|
43
|
+
sendTerminalClosed(terminalId, exitCode) {
|
|
44
|
+
const sessionId = this.terminalToSession.get(terminalId);
|
|
45
|
+
this.terminalToSession.delete(terminalId);
|
|
46
|
+
if (!sessionId)
|
|
47
|
+
return false;
|
|
48
|
+
return this.sendEnvelope(sessionId, { type: 'terminal_closed', terminalId, exitCode });
|
|
49
|
+
}
|
|
50
|
+
sendMessage(sessionId, payload) {
|
|
51
|
+
return this.sendEnvelope(sessionId, payload);
|
|
52
|
+
}
|
|
53
|
+
close(sessionId) {
|
|
54
|
+
const ids = sessionId ? [sessionId] : Array.from(this.peers.keys());
|
|
55
|
+
for (const id of ids) {
|
|
56
|
+
try {
|
|
57
|
+
this.channels.get(id)?.close();
|
|
58
|
+
}
|
|
59
|
+
catch { }
|
|
60
|
+
try {
|
|
61
|
+
this.peers.get(id)?.close();
|
|
62
|
+
}
|
|
63
|
+
catch { }
|
|
64
|
+
this.channels.delete(id);
|
|
65
|
+
this.peers.delete(id);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
async acceptOffer(sessionId, offer) {
|
|
69
|
+
if (!this.hasPermission(sessionId)) {
|
|
70
|
+
this.sendState(sessionId, 'permission_denied');
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
this.close(sessionId);
|
|
74
|
+
const peer = this.createPeerConnection();
|
|
75
|
+
this.peers.set(sessionId, peer);
|
|
76
|
+
peer.onicecandidate = (event) => {
|
|
77
|
+
if (event.candidate)
|
|
78
|
+
this.send({ type: 'transport_signal', sessionId, signalType: 'ice', payload: event.candidate });
|
|
79
|
+
};
|
|
80
|
+
peer.ondatachannel = (event) => this.attachChannel(sessionId, event.channel);
|
|
81
|
+
peer.onconnectionstatechange = () => this.sendState(sessionId, peer.connectionState ?? 'unknown');
|
|
82
|
+
peer.oniceconnectionstatechange = () => this.sendState(sessionId, peer.iceConnectionState ?? 'unknown');
|
|
83
|
+
await peer.setRemoteDescription(offer);
|
|
84
|
+
const answer = await peer.createAnswer();
|
|
85
|
+
await peer.setLocalDescription(answer);
|
|
86
|
+
this.send({ type: 'transport_signal', sessionId, signalType: 'answer', payload: peer.localDescription ?? answer });
|
|
87
|
+
}
|
|
88
|
+
attachChannel(sessionId, channel) {
|
|
89
|
+
this.channels.set(sessionId, channel);
|
|
90
|
+
channel.onopen = () => this.sendState(sessionId, 'datachannel_open');
|
|
91
|
+
channel.onclose = () => this.sendState(sessionId, 'datachannel_closed');
|
|
92
|
+
channel.onerror = (event) => log(`[webrtc] datachannel error session=${sessionId}: ${String(event)}`);
|
|
93
|
+
channel.onmessage = (event) => this.handleChannelMessage(sessionId, event.data);
|
|
94
|
+
}
|
|
95
|
+
handleChannelMessage(sessionId, raw) {
|
|
96
|
+
let msg;
|
|
97
|
+
try {
|
|
98
|
+
msg = JSON.parse(String(raw));
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
const payload = unwrapDomainEnvelope(msg);
|
|
104
|
+
if (!payload)
|
|
105
|
+
return;
|
|
106
|
+
if (!this.hasPermission(sessionId)) {
|
|
107
|
+
this.sendState(sessionId, 'permission_denied');
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
if (routedDomains.has(domainForType(payload.type))) {
|
|
111
|
+
this.routeMessage?.(sessionId, { ...payload, transportSessionId: sessionId });
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
if (payload.type === 'terminal_create') {
|
|
115
|
+
const terminalId = this.terminals.create(payload.cols ?? 120, payload.rows ?? 30, payload.cwd);
|
|
116
|
+
this.attachTerminal(terminalId, sessionId);
|
|
117
|
+
this.sendEnvelope(sessionId, { type: 'terminal_created', terminalId });
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
if (payload.type === 'heartbeat' || payload.type === 'terminal_created' || payload.type === 'terminal_output' || payload.type === 'terminal_closed')
|
|
121
|
+
return;
|
|
122
|
+
if (!this.isSessionTerminal(sessionId, payload.terminalId))
|
|
123
|
+
return;
|
|
124
|
+
if (payload.type === 'terminal_input')
|
|
125
|
+
this.terminals.write(payload.terminalId, payload.data);
|
|
126
|
+
if (payload.type === 'terminal_resize')
|
|
127
|
+
this.terminals.resize(payload.terminalId, payload.cols, payload.rows);
|
|
128
|
+
if (payload.type === 'terminal_close')
|
|
129
|
+
this.terminals.close(payload.terminalId);
|
|
130
|
+
}
|
|
131
|
+
isSessionTerminal(sessionId, terminalId) {
|
|
132
|
+
return typeof terminalId === 'string' && this.terminalToSession.get(terminalId) === sessionId;
|
|
133
|
+
}
|
|
134
|
+
sendEnvelope(sessionId, payload) {
|
|
135
|
+
const channel = this.channels.get(sessionId);
|
|
136
|
+
if (!channel || channel.readyState !== 'open')
|
|
137
|
+
return false;
|
|
138
|
+
channel.send(JSON.stringify(wrapDomainEnvelope(payload)));
|
|
139
|
+
return true;
|
|
140
|
+
}
|
|
141
|
+
sendState(sessionId, state) {
|
|
142
|
+
this.send({ type: 'transport_signal', sessionId, signalType: 'state', payload: { state, at: Date.now() } });
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
//# sourceMappingURL=webrtcTransport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webrtcTransport.js","sourceRoot":"","sources":["../../src/transport/webrtcTransport.ts"],"names":[],"mappings":"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"}
|