@grovina/brian 0.2.9 → 0.2.11
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/channels/slack-tools.js +16 -5
- package/dist/channels/slack-tools.js.map +1 -1
- package/dist/channels/slack.js +35 -2
- package/dist/channels/slack.js.map +1 -1
- package/dist/channels/telegram-tools.js +16 -5
- package/dist/channels/telegram-tools.js.map +1 -1
- package/dist/channels/telegram.js +75 -5
- package/dist/channels/telegram.js.map +1 -1
- package/dist/downloads/resolve.js +12 -5
- package/dist/downloads/resolve.js.map +1 -1
- package/dist/start.js +1 -1
- package/dist/start.js.map +1 -1
- package/dist/tools/web.js +6 -7
- package/dist/tools/web.js.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/web/url-policy.js +4 -100
- package/dist/web/url-policy.js.map +1 -1
- package/package.json +1 -1
|
@@ -13,7 +13,14 @@ export function slackTools(router) {
|
|
|
13
13
|
parameters: {
|
|
14
14
|
type: 'object',
|
|
15
15
|
properties: {
|
|
16
|
-
text: {
|
|
16
|
+
text: {
|
|
17
|
+
type: 'string',
|
|
18
|
+
description: 'Message text, or caption when image_path is set. Use empty string for image-only.',
|
|
19
|
+
},
|
|
20
|
+
image_path: {
|
|
21
|
+
type: 'string',
|
|
22
|
+
description: 'Optional absolute path to an image under Brian state downloads (same paths as [image: …] in updates). Sends as a Slack file share.',
|
|
23
|
+
},
|
|
17
24
|
source_event_id: {
|
|
18
25
|
type: 'string',
|
|
19
26
|
description: 'Inbound Slack event id to reply to (keeps thread)',
|
|
@@ -23,16 +30,20 @@ export function slackTools(router) {
|
|
|
23
30
|
description: 'Slack channel id for a new message (e.g. C…)',
|
|
24
31
|
},
|
|
25
32
|
},
|
|
26
|
-
required: ['text'],
|
|
27
33
|
},
|
|
28
34
|
},
|
|
29
35
|
async execute(input) {
|
|
30
|
-
const { text, source_event_id, channel } = input;
|
|
36
|
+
const { text, image_path, source_event_id, channel } = input;
|
|
31
37
|
const hasSourceEvent = typeof source_event_id === 'string' && source_event_id.trim().length > 0;
|
|
32
38
|
const hasChannel = typeof channel === 'string' && channel.trim().length > 0;
|
|
33
39
|
if (hasSourceEvent === hasChannel) {
|
|
34
40
|
throw new Error('Provide exactly one of source_event_id or channel');
|
|
35
41
|
}
|
|
42
|
+
const textBody = typeof text === 'string' ? text : '';
|
|
43
|
+
const imagePath = typeof image_path === 'string' && image_path.trim().length > 0 ? image_path.trim() : undefined;
|
|
44
|
+
if (!textBody.trim() && !imagePath) {
|
|
45
|
+
throw new Error('Provide non-empty text and/or image_path');
|
|
46
|
+
}
|
|
36
47
|
if (hasSourceEvent) {
|
|
37
48
|
const route = router.getByEventId(source_event_id);
|
|
38
49
|
if (!route) {
|
|
@@ -41,13 +52,13 @@ export function slackTools(router) {
|
|
|
41
52
|
if (route.message.channel !== 'slack') {
|
|
42
53
|
throw new Error(`source_event_id is not from Slack: ${source_event_id}`);
|
|
43
54
|
}
|
|
44
|
-
await route.adapter.sendReply(route.message,
|
|
55
|
+
await route.adapter.sendReply(route.message, textBody, imagePath);
|
|
45
56
|
return 'Sent';
|
|
46
57
|
}
|
|
47
58
|
if (!slackAdapter.sendToConversation) {
|
|
48
59
|
throw new Error('Slack channel is not configured');
|
|
49
60
|
}
|
|
50
|
-
await slackAdapter.sendToConversation(channel,
|
|
61
|
+
await slackAdapter.sendToConversation(channel, textBody, imagePath);
|
|
51
62
|
return 'Sent';
|
|
52
63
|
},
|
|
53
64
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack-tools.js","sourceRoot":"","sources":["../../src/channels/slack-tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,eAAe,CAAU,CAAC;AAExF,MAAM,UAAU,UAAU,CAAC,MAAqB;IAC9C,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,MAAM,KAAK,GAAW;QACpB;YACE,IAAI,EAAE,YAAY;YAClB,UAAU,EAAE;gBACV,IAAI,EAAE,YAAY;gBAClB,WAAW,EACT,4GAA4G;gBAC9G,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACV,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"slack-tools.js","sourceRoot":"","sources":["../../src/channels/slack-tools.ts"],"names":[],"mappings":"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"}
|
package/dist/channels/slack.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import fs from 'fs/promises';
|
|
2
|
+
import path from 'path';
|
|
1
3
|
import { WebClient } from '@slack/web-api';
|
|
4
|
+
import { assertDownloadsFilePath } from '../downloads/resolve.js';
|
|
2
5
|
import { saveDownloadsImage } from '../downloads/save.js';
|
|
3
6
|
export class SlackChannelAdapter {
|
|
4
7
|
client;
|
|
@@ -81,18 +84,48 @@ export class SlackChannelAdapter {
|
|
|
81
84
|
throw new Error(`Slack file download HTTP ${res.status}`);
|
|
82
85
|
return Buffer.from(await res.arrayBuffer());
|
|
83
86
|
}
|
|
84
|
-
async sendReply(message, text) {
|
|
87
|
+
async sendReply(message, text, imagePath) {
|
|
85
88
|
const eventId = message.replyContext?.eventId;
|
|
86
89
|
const route = eventId ? this.events.get(eventId) : null;
|
|
87
90
|
const channel = route?.channelId ?? message.replyContext?.channelId ?? message.conversationId;
|
|
88
91
|
const threadTs = route?.threadTs || message.replyContext?.threadTs || undefined;
|
|
92
|
+
if (imagePath) {
|
|
93
|
+
const abs = await assertDownloadsFilePath(this.stateDir, imagePath);
|
|
94
|
+
const file = await fs.readFile(abs);
|
|
95
|
+
const filename = path.basename(abs);
|
|
96
|
+
const base = {
|
|
97
|
+
channel_id: channel,
|
|
98
|
+
file,
|
|
99
|
+
filename,
|
|
100
|
+
initial_comment: text.trim() ? text : undefined,
|
|
101
|
+
};
|
|
102
|
+
if (threadTs) {
|
|
103
|
+
await this.client.filesUploadV2({ ...base, thread_ts: threadTs });
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
await this.client.filesUploadV2(base);
|
|
107
|
+
}
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
89
110
|
await this.client.chat.postMessage({
|
|
90
111
|
channel,
|
|
91
112
|
text,
|
|
92
113
|
thread_ts: threadTs || undefined,
|
|
93
114
|
});
|
|
94
115
|
}
|
|
95
|
-
async sendToConversation(conversationId, text) {
|
|
116
|
+
async sendToConversation(conversationId, text, imagePath) {
|
|
117
|
+
if (imagePath) {
|
|
118
|
+
const abs = await assertDownloadsFilePath(this.stateDir, imagePath);
|
|
119
|
+
const file = await fs.readFile(abs);
|
|
120
|
+
const filename = path.basename(abs);
|
|
121
|
+
await this.client.filesUploadV2({
|
|
122
|
+
channel_id: conversationId,
|
|
123
|
+
file,
|
|
124
|
+
filename,
|
|
125
|
+
initial_comment: text.trim() ? text : undefined,
|
|
126
|
+
});
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
96
129
|
await this.client.chat.postMessage({
|
|
97
130
|
channel: conversationId,
|
|
98
131
|
text,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack.js","sourceRoot":"","sources":["../../src/channels/slack.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"slack.js","sourceRoot":"","sources":["../../src/channels/slack.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,14 @@ export function telegramTools(router) {
|
|
|
13
13
|
parameters: {
|
|
14
14
|
type: 'object',
|
|
15
15
|
properties: {
|
|
16
|
-
text: {
|
|
16
|
+
text: {
|
|
17
|
+
type: 'string',
|
|
18
|
+
description: 'Message text, or photo caption when image_path is set. Use empty string for image-only.',
|
|
19
|
+
},
|
|
20
|
+
image_path: {
|
|
21
|
+
type: 'string',
|
|
22
|
+
description: 'Optional absolute path to an image under Brian state downloads (same paths as [image: …] in updates). Sends as sendPhoto.',
|
|
23
|
+
},
|
|
17
24
|
source_event_id: {
|
|
18
25
|
type: 'string',
|
|
19
26
|
description: 'Inbound Telegram event id to reply to',
|
|
@@ -23,11 +30,10 @@ export function telegramTools(router) {
|
|
|
23
30
|
description: 'Target Telegram chat id for direct send',
|
|
24
31
|
},
|
|
25
32
|
},
|
|
26
|
-
required: ['text'],
|
|
27
33
|
},
|
|
28
34
|
},
|
|
29
35
|
async execute(input) {
|
|
30
|
-
const { text, source_event_id, chat_id } = input;
|
|
36
|
+
const { text, image_path, source_event_id, chat_id } = input;
|
|
31
37
|
const hasSourceEvent = typeof source_event_id === 'string' && source_event_id.trim().length > 0;
|
|
32
38
|
const hasChatId = typeof chat_id === 'string' && chat_id.trim().length > 0;
|
|
33
39
|
if (hasSourceEvent === hasChatId) {
|
|
@@ -36,6 +42,11 @@ export function telegramTools(router) {
|
|
|
36
42
|
if (!telegramAdapter.sendToConversation) {
|
|
37
43
|
throw new Error('Telegram channel is not configured');
|
|
38
44
|
}
|
|
45
|
+
const textBody = typeof text === 'string' ? text : '';
|
|
46
|
+
const imagePath = typeof image_path === 'string' && image_path.trim().length > 0 ? image_path.trim() : undefined;
|
|
47
|
+
if (!textBody.trim() && !imagePath) {
|
|
48
|
+
throw new Error('Provide non-empty text and/or image_path');
|
|
49
|
+
}
|
|
39
50
|
if (hasSourceEvent) {
|
|
40
51
|
const route = router.getByEventId(source_event_id);
|
|
41
52
|
if (!route) {
|
|
@@ -44,10 +55,10 @@ export function telegramTools(router) {
|
|
|
44
55
|
if (route.message.channel !== 'telegram') {
|
|
45
56
|
throw new Error(`source_event_id is not from Telegram: ${source_event_id}`);
|
|
46
57
|
}
|
|
47
|
-
await route.adapter.sendReply(route.message,
|
|
58
|
+
await route.adapter.sendReply(route.message, textBody, imagePath);
|
|
48
59
|
return 'Sent';
|
|
49
60
|
}
|
|
50
|
-
await telegramAdapter.sendToConversation(chat_id,
|
|
61
|
+
await telegramAdapter.sendToConversation(chat_id, textBody, imagePath);
|
|
51
62
|
return 'Sent';
|
|
52
63
|
},
|
|
53
64
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telegram-tools.js","sourceRoot":"","sources":["../../src/channels/telegram-tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,eAAe,EAAE,kBAAkB,CAAU,CAAC;AAElF,MAAM,UAAU,aAAa,CAAC,MAAqB;IACjD,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,CAAC,eAAe;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,KAAK,GAAW;QACpB;YACE,IAAI,EAAE,eAAe;YACrB,UAAU,EAAE;gBACV,IAAI,EAAE,eAAe;gBACrB,WAAW,EACT,iIAAiI;gBACnI,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACV,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"telegram-tools.js","sourceRoot":"","sources":["../../src/channels/telegram-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import fs from 'fs/promises';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { assertDownloadsFilePath } from '../downloads/resolve.js';
|
|
1
4
|
import { saveDownloadsAudio, saveDownloadsImage } from '../downloads/save.js';
|
|
2
5
|
import { transcodeVoiceForModelIfNeeded } from '../media/transcode-voice.js';
|
|
3
6
|
const IMAGE_DOC_PREFIX = 'image/';
|
|
@@ -123,14 +126,32 @@ export class TelegramChannelAdapter {
|
|
|
123
126
|
throw new Error(`Telegram file download HTTP ${res.status}`);
|
|
124
127
|
return Buffer.from(await res.arrayBuffer());
|
|
125
128
|
}
|
|
126
|
-
async sendReply(message, text) {
|
|
129
|
+
async sendReply(message, text, imagePath) {
|
|
127
130
|
const chatId = message.replyContext?.chatId ?? message.conversationId;
|
|
131
|
+
const replyTo = message.replyContext?.messageId
|
|
132
|
+
? Number(message.replyContext.messageId)
|
|
133
|
+
: undefined;
|
|
134
|
+
if (imagePath) {
|
|
135
|
+
const payload = await this.sendPhotoMultipart({
|
|
136
|
+
chatId,
|
|
137
|
+
imagePath,
|
|
138
|
+
caption: text,
|
|
139
|
+
replyToMessageId: replyTo,
|
|
140
|
+
});
|
|
141
|
+
if (!payload.ok) {
|
|
142
|
+
throw new Error(payload.description ?? 'Telegram sendReply (photo) failed');
|
|
143
|
+
}
|
|
144
|
+
this.recordHistory(chatId, {
|
|
145
|
+
ts: this.toIsoTimestamp(payload.result?.date),
|
|
146
|
+
userId: 'bot',
|
|
147
|
+
text: text.trim() ? text : `[photo: ${path.basename(imagePath)}]`,
|
|
148
|
+
});
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
128
151
|
const payload = await this.request('sendMessage', {
|
|
129
152
|
chat_id: chatId,
|
|
130
153
|
text,
|
|
131
|
-
reply_to_message_id:
|
|
132
|
-
? Number(message.replyContext.messageId)
|
|
133
|
-
: undefined,
|
|
154
|
+
reply_to_message_id: replyTo,
|
|
134
155
|
});
|
|
135
156
|
if (!payload.ok) {
|
|
136
157
|
throw new Error(payload.description ?? 'Telegram sendReply failed');
|
|
@@ -141,7 +162,23 @@ export class TelegramChannelAdapter {
|
|
|
141
162
|
text,
|
|
142
163
|
});
|
|
143
164
|
}
|
|
144
|
-
async sendToConversation(conversationId, text) {
|
|
165
|
+
async sendToConversation(conversationId, text, imagePath) {
|
|
166
|
+
if (imagePath) {
|
|
167
|
+
const payload = await this.sendPhotoMultipart({
|
|
168
|
+
chatId: conversationId,
|
|
169
|
+
imagePath,
|
|
170
|
+
caption: text,
|
|
171
|
+
});
|
|
172
|
+
if (!payload.ok) {
|
|
173
|
+
throw new Error(payload.description ?? 'Telegram sendToConversation (photo) failed');
|
|
174
|
+
}
|
|
175
|
+
this.recordHistory(conversationId, {
|
|
176
|
+
ts: this.toIsoTimestamp(payload.result?.date),
|
|
177
|
+
userId: 'bot',
|
|
178
|
+
text: text.trim() ? text : `[photo: ${path.basename(imagePath)}]`,
|
|
179
|
+
});
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
145
182
|
const payload = await this.request('sendMessage', {
|
|
146
183
|
chat_id: conversationId,
|
|
147
184
|
text,
|
|
@@ -161,6 +198,39 @@ export class TelegramChannelAdapter {
|
|
|
161
198
|
return [];
|
|
162
199
|
return entries.slice(Math.max(0, entries.length - Math.max(1, limit)));
|
|
163
200
|
}
|
|
201
|
+
mimeForImageFilename(filename) {
|
|
202
|
+
const ext = path.extname(filename).toLowerCase();
|
|
203
|
+
if (ext === '.png')
|
|
204
|
+
return 'image/png';
|
|
205
|
+
if (ext === '.gif')
|
|
206
|
+
return 'image/gif';
|
|
207
|
+
if (ext === '.webp')
|
|
208
|
+
return 'image/webp';
|
|
209
|
+
return 'image/jpeg';
|
|
210
|
+
}
|
|
211
|
+
async sendPhotoMultipart(input) {
|
|
212
|
+
const abs = await assertDownloadsFilePath(this.stateDir, input.imagePath);
|
|
213
|
+
const buffer = await fs.readFile(abs);
|
|
214
|
+
const base = path.basename(abs);
|
|
215
|
+
const mime = this.mimeForImageFilename(base);
|
|
216
|
+
const form = new FormData();
|
|
217
|
+
form.append('chat_id', input.chatId);
|
|
218
|
+
form.append('photo', new Blob([new Uint8Array(buffer)], { type: mime }), base);
|
|
219
|
+
if (input.caption.trim()) {
|
|
220
|
+
form.append('caption', input.caption);
|
|
221
|
+
}
|
|
222
|
+
if (input.replyToMessageId !== undefined) {
|
|
223
|
+
form.append('reply_to_message_id', String(input.replyToMessageId));
|
|
224
|
+
}
|
|
225
|
+
const response = await fetch(this.url('sendPhoto'), {
|
|
226
|
+
method: 'POST',
|
|
227
|
+
body: form,
|
|
228
|
+
});
|
|
229
|
+
if (!response.ok) {
|
|
230
|
+
throw new Error(`Telegram API sendPhoto failed with HTTP ${response.status}`);
|
|
231
|
+
}
|
|
232
|
+
return (await response.json());
|
|
233
|
+
}
|
|
164
234
|
url(method) {
|
|
165
235
|
return `https://api.telegram.org/bot${this.token}/${method}`;
|
|
166
236
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telegram.js","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"telegram.js","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,28 @@
|
|
|
1
1
|
import fs from 'fs/promises';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { downloadsRoot } from './save.js';
|
|
4
|
-
|
|
5
|
-
* Ensures the path is a real file under stateDir/downloads (after resolving symlinks).
|
|
6
|
-
*/
|
|
7
|
-
export async function assertDownloadsImagePath(stateDir, userPath) {
|
|
4
|
+
async function assertPathUnderDownloads(stateDir, userPath, scopeHint) {
|
|
8
5
|
const trimmed = userPath.trim();
|
|
9
6
|
const resolved = path.resolve(trimmed);
|
|
10
7
|
const root = downloadsRoot(stateDir);
|
|
11
8
|
const rootWithSep = root.endsWith(path.sep) ? root : root + path.sep;
|
|
12
9
|
const real = await fs.realpath(resolved).catch(() => resolved);
|
|
13
10
|
if (real !== root && !real.startsWith(rootWithSep)) {
|
|
14
|
-
throw new Error(
|
|
11
|
+
throw new Error(`Path must be under Brian state downloads (${scopeHint}).`);
|
|
15
12
|
}
|
|
16
13
|
const st = await fs.stat(real);
|
|
17
14
|
if (!st.isFile())
|
|
18
15
|
throw new Error('Not a file.');
|
|
19
16
|
return real;
|
|
20
17
|
}
|
|
18
|
+
/**
|
|
19
|
+
* Ensures the path is a real file under stateDir/downloads (after resolving symlinks).
|
|
20
|
+
*/
|
|
21
|
+
export async function assertDownloadsImagePath(stateDir, userPath) {
|
|
22
|
+
return assertPathUnderDownloads(stateDir, userPath, 'use the absolute path from [image: …] in updates');
|
|
23
|
+
}
|
|
24
|
+
/** Any regular file under downloads (e.g. outbound images from channel send tools). */
|
|
25
|
+
export async function assertDownloadsFilePath(stateDir, userPath) {
|
|
26
|
+
return assertPathUnderDownloads(stateDir, userPath, 'same directory as inbound [image: …] paths');
|
|
27
|
+
}
|
|
21
28
|
//# sourceMappingURL=resolve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/downloads/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/downloads/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,KAAK,UAAU,wBAAwB,CACrC,QAAgB,EAChB,QAAgB,EAChB,SAAiB;IAEjB,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;IACrE,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC/D,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CACb,6CAA6C,SAAS,IAAI,CAC3D,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,QAAgB,EAAE,QAAgB;IAC/E,OAAO,wBAAwB,CAC7B,QAAQ,EACR,QAAQ,EACR,kDAAkD,CACnD,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,QAAgB,EAAE,QAAgB;IAC9E,OAAO,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,4CAA4C,CAAC,CAAC;AACpG,CAAC"}
|
package/dist/start.js
CHANGED
|
@@ -171,7 +171,7 @@ async function main() {
|
|
|
171
171
|
if (webModule) {
|
|
172
172
|
ensurePlaywrightChromium();
|
|
173
173
|
}
|
|
174
|
-
const webTooling = webModule ? createWebTools(
|
|
174
|
+
const webTooling = webModule ? createWebTools() : null;
|
|
175
175
|
if (webTooling) {
|
|
176
176
|
disposeWeb = webTooling.dispose;
|
|
177
177
|
log('module: web');
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/web.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PlaywrightSession } from '../web/playwright-session.js';
|
|
2
|
-
import { assertUrlAllowed
|
|
2
|
+
import { assertUrlAllowed } from '../web/url-policy.js';
|
|
3
3
|
const SNAPSHOT_MAX_CHARS = 12_000;
|
|
4
4
|
const FETCH_MAX_BYTES = 256_000;
|
|
5
5
|
const FETCH_TIMEOUT_MS = 30_000;
|
|
@@ -66,15 +66,14 @@ async function buildAccessibilitySnapshot(page) {
|
|
|
66
66
|
});
|
|
67
67
|
return lines.length > 0 ? lines.join('\n') : '(no interactive elements)';
|
|
68
68
|
}
|
|
69
|
-
export function createWebTools(
|
|
70
|
-
const policy = webPolicyFromModuleConfig(module.config);
|
|
69
|
+
export function createWebTools() {
|
|
71
70
|
const session = new PlaywrightSession();
|
|
72
71
|
const tools = [
|
|
73
72
|
{
|
|
74
73
|
name: 'web_navigate',
|
|
75
74
|
definition: {
|
|
76
75
|
name: 'web_navigate',
|
|
77
|
-
description: 'Open a URL in the headless browser. Clears snapshot refs; call web_snapshot after.
|
|
76
|
+
description: 'Open a URL in the headless browser. Clears snapshot refs; call web_snapshot after. HTTP and HTTPS are allowed.',
|
|
78
77
|
parameters: {
|
|
79
78
|
type: 'object',
|
|
80
79
|
properties: {
|
|
@@ -85,7 +84,7 @@ export function createWebTools(module) {
|
|
|
85
84
|
},
|
|
86
85
|
async execute(input) {
|
|
87
86
|
const { url } = input;
|
|
88
|
-
const blocked = assertUrlAllowed(url
|
|
87
|
+
const blocked = assertUrlAllowed(url);
|
|
89
88
|
if (blocked)
|
|
90
89
|
return blocked;
|
|
91
90
|
try {
|
|
@@ -190,7 +189,7 @@ export function createWebTools(module) {
|
|
|
190
189
|
maxResultChars: SNAPSHOT_MAX_CHARS,
|
|
191
190
|
definition: {
|
|
192
191
|
name: 'web_fetch',
|
|
193
|
-
description: 'HTTP GET a URL and return response body as text (no JavaScript). Same URL rules as web_navigate.',
|
|
192
|
+
description: 'HTTP GET a URL and return response body as text (no JavaScript). Same URL rules as web_navigate (HTTP/HTTPS).',
|
|
194
193
|
parameters: {
|
|
195
194
|
type: 'object',
|
|
196
195
|
properties: {
|
|
@@ -201,7 +200,7 @@ export function createWebTools(module) {
|
|
|
201
200
|
},
|
|
202
201
|
async execute(input) {
|
|
203
202
|
const { url } = input;
|
|
204
|
-
const blocked = assertUrlAllowed(url
|
|
203
|
+
const blocked = assertUrlAllowed(url);
|
|
205
204
|
if (blocked)
|
|
206
205
|
return blocked;
|
|
207
206
|
const ac = new AbortController();
|
package/dist/tools/web.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/tools/web.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/tools/web.ts"],"names":[],"mappings":"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"}
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/web/url-policy.js
CHANGED
|
@@ -1,75 +1,8 @@
|
|
|
1
|
-
function parseHostAllowlist(raw) {
|
|
2
|
-
return raw
|
|
3
|
-
.split(',')
|
|
4
|
-
.map((s) => s.trim().toLowerCase())
|
|
5
|
-
.filter(Boolean);
|
|
6
|
-
}
|
|
7
|
-
export function webPolicyFromModuleConfig(config) {
|
|
8
|
-
const allowRaw = typeof config.hostAllowlist === 'string' ? config.hostAllowlist : '';
|
|
9
|
-
const localhostRaw = typeof config.allowLocalhostHttp === 'string' ? config.allowLocalhostHttp.trim().toLowerCase() : 'false';
|
|
10
|
-
return {
|
|
11
|
-
hostAllowlist: parseHostAllowlist(allowRaw),
|
|
12
|
-
allowLocalhostHttp: localhostRaw === 'true' || localhostRaw === '1' || localhostRaw === 'yes',
|
|
13
|
-
};
|
|
14
|
-
}
|
|
15
|
-
function isPrivateIPv4(parts) {
|
|
16
|
-
const [a, b] = parts;
|
|
17
|
-
if (a === 10)
|
|
18
|
-
return true;
|
|
19
|
-
if (a === 127)
|
|
20
|
-
return true;
|
|
21
|
-
if (a === 0)
|
|
22
|
-
return true;
|
|
23
|
-
if (a === 169 && b === 254)
|
|
24
|
-
return true;
|
|
25
|
-
if (a === 172 && b >= 16 && b <= 31)
|
|
26
|
-
return true;
|
|
27
|
-
if (a === 192 && b === 168)
|
|
28
|
-
return true;
|
|
29
|
-
return false;
|
|
30
|
-
}
|
|
31
|
-
function ipv4HostBlocked(host) {
|
|
32
|
-
const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(host);
|
|
33
|
-
if (!m)
|
|
34
|
-
return false;
|
|
35
|
-
const parts = [1, 2, 3, 4].map((i) => Number(m[i]));
|
|
36
|
-
if (parts.some((n) => n > 255))
|
|
37
|
-
return true;
|
|
38
|
-
return isPrivateIPv4(parts);
|
|
39
|
-
}
|
|
40
|
-
function ipv6HostBlocked(host) {
|
|
41
|
-
const h = host.replace(/^\[|\]$/g, '').toLowerCase();
|
|
42
|
-
if (h === '::1')
|
|
43
|
-
return true;
|
|
44
|
-
if (h.startsWith('fc') || h.startsWith('fd'))
|
|
45
|
-
return true;
|
|
46
|
-
if (h.startsWith('fe80:'))
|
|
47
|
-
return true;
|
|
48
|
-
return false;
|
|
49
|
-
}
|
|
50
|
-
function hostMatchesAllowlist(hostname, rules) {
|
|
51
|
-
const h = hostname.toLowerCase();
|
|
52
|
-
for (const rule of rules) {
|
|
53
|
-
if (rule.startsWith('*.')) {
|
|
54
|
-
const suffix = rule.slice(2);
|
|
55
|
-
if (h === suffix || h.endsWith(`.${suffix}`))
|
|
56
|
-
return true;
|
|
57
|
-
}
|
|
58
|
-
else if (h === rule) {
|
|
59
|
-
return true;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
return false;
|
|
63
|
-
}
|
|
64
|
-
const BLOCKED_HOSTNAMES = new Set([
|
|
65
|
-
'metadata.google.internal',
|
|
66
|
-
'metadata',
|
|
67
|
-
'gce.internal',
|
|
68
|
-
]);
|
|
69
1
|
/**
|
|
70
|
-
*
|
|
2
|
+
* Minimal URL guard for web tools. Network reach (allowlists, private ranges, etc.)
|
|
3
|
+
* is expected to be enforced by the deployment / VM if needed.
|
|
71
4
|
*/
|
|
72
|
-
export function assertUrlAllowed(urlString
|
|
5
|
+
export function assertUrlAllowed(urlString) {
|
|
73
6
|
let url;
|
|
74
7
|
try {
|
|
75
8
|
url = new URL(urlString);
|
|
@@ -80,38 +13,9 @@ export function assertUrlAllowed(urlString, policy) {
|
|
|
80
13
|
if (url.username || url.password)
|
|
81
14
|
return 'URLs with embedded credentials are not allowed.';
|
|
82
15
|
const protocol = url.protocol.toLowerCase();
|
|
83
|
-
|
|
84
|
-
if (BLOCKED_HOSTNAMES.has(hostname))
|
|
85
|
-
return `Host "${hostname}" is blocked.`;
|
|
86
|
-
const loopback = hostname === 'localhost' ||
|
|
87
|
-
hostname === '127.0.0.1' ||
|
|
88
|
-
hostname === '::1' ||
|
|
89
|
-
hostname === '[::1]';
|
|
90
|
-
if (protocol === 'https:') {
|
|
91
|
-
// continue
|
|
92
|
-
}
|
|
93
|
-
else if (protocol === 'http:') {
|
|
94
|
-
if (!policy.allowLocalhostHttp || !loopback) {
|
|
95
|
-
return policy.allowLocalhostHttp
|
|
96
|
-
? 'HTTP is only allowed for localhost / 127.0.0.1 / ::1 when enabled in the Web module.'
|
|
97
|
-
: 'Only HTTPS is allowed. Enable "Allow HTTP to localhost" for local HTTP.';
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
16
|
+
if (protocol !== 'https:' && protocol !== 'http:') {
|
|
101
17
|
return `Protocol "${url.protocol}" is not allowed.`;
|
|
102
18
|
}
|
|
103
|
-
const skipPrivateCheck = policy.allowLocalhostHttp && loopback;
|
|
104
|
-
if (!skipPrivateCheck) {
|
|
105
|
-
if (hostname.includes(':')) {
|
|
106
|
-
if (ipv6HostBlocked(hostname))
|
|
107
|
-
return 'IPv6 address is not allowed.';
|
|
108
|
-
}
|
|
109
|
-
else if (ipv4HostBlocked(hostname))
|
|
110
|
-
return 'Private or local IPv4 addresses are not allowed.';
|
|
111
|
-
}
|
|
112
|
-
if (policy.hostAllowlist.length > 0 && !hostMatchesAllowlist(hostname, policy.hostAllowlist)) {
|
|
113
|
-
return `Host "${hostname}" is not in the Web module allowlist.`;
|
|
114
|
-
}
|
|
115
19
|
return null;
|
|
116
20
|
}
|
|
117
21
|
//# sourceMappingURL=url-policy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-policy.js","sourceRoot":"","sources":["../../src/web/url-policy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"url-policy.js","sourceRoot":"","sources":["../../src/web/url-policy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ;QAAE,OAAO,iDAAiD,CAAC;IAE3F,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC5C,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QAClD,OAAO,aAAa,GAAG,CAAC,QAAQ,mBAAmB,CAAC;IACtD,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|