opc-agent 4.1.0 → 4.1.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/.github/ISSUE_TEMPLATE/bug_report.md +20 -20
- package/.github/ISSUE_TEMPLATE/feature_request.md +14 -14
- package/.github/PULL_REQUEST_TEMPLATE.md +13 -13
- package/CHANGELOG.md +48 -48
- package/CONTRIBUTING.md +36 -36
- package/README.zh-CN.md +497 -497
- package/dist/channels/wechat.js +6 -6
- package/dist/deploy/index.js +56 -56
- package/dist/studio/server.js +30 -1
- package/dist/studio-ui/index.html +230 -10
- package/dist/ui/components.js +105 -105
- package/examples/README.md +22 -22
- package/examples/basic-agent.ts +90 -90
- package/examples/brain-integration.ts +71 -71
- package/examples/multi-channel.ts +74 -74
- package/fix-sidebar.mjs +188 -188
- package/install.ps1 +154 -154
- package/install.sh +164 -164
- package/package.json +1 -1
- package/scripts/install.ps1 +31 -31
- package/scripts/install.sh +40 -40
- package/serve-studio.js +13 -13
- package/serve-test.js +25 -25
- package/src/channels/dingtalk.ts +46 -46
- package/src/channels/email.ts +351 -351
- package/src/channels/feishu.ts +349 -349
- package/src/channels/googlechat.ts +42 -42
- package/src/channels/imessage.ts +31 -31
- package/src/channels/irc.ts +82 -82
- package/src/channels/line.ts +32 -32
- package/src/channels/matrix.ts +33 -33
- package/src/channels/mattermost.ts +57 -57
- package/src/channels/msteams.ts +32 -32
- package/src/channels/nostr.ts +32 -32
- package/src/channels/qq.ts +33 -33
- package/src/channels/signal.ts +32 -32
- package/src/channels/sms.ts +33 -33
- package/src/channels/telegram.ts +616 -616
- package/src/channels/twitch.ts +65 -65
- package/src/channels/voice-call.ts +100 -100
- package/src/channels/websocket.ts +399 -399
- package/src/channels/wechat.ts +329 -329
- package/src/channels/whatsapp.ts +32 -32
- package/src/cli/chat.ts +99 -99
- package/src/cli/setup.ts +314 -314
- package/src/core/agent.ts +476 -476
- package/src/core/api-server.ts +277 -277
- package/src/core/audio.ts +98 -98
- package/src/core/collaboration.ts +275 -275
- package/src/core/context-discovery.ts +85 -85
- package/src/core/context-refs.ts +140 -140
- package/src/core/gateway.ts +106 -106
- package/src/core/heartbeat.ts +51 -51
- package/src/core/hooks.ts +105 -105
- package/src/core/ide-bridge.ts +133 -133
- package/src/core/node-network.ts +86 -86
- package/src/core/profiles.ts +122 -122
- package/src/core/scheduler.ts +187 -187
- package/src/core/session-manager.ts +137 -137
- package/src/core/subagent.ts +98 -98
- package/src/core/vision.ts +180 -180
- package/src/core/workflow-graph.ts +365 -365
- package/src/daemon.ts +96 -96
- package/src/deploy/index.ts +255 -255
- package/src/doctor.ts +156 -156
- package/src/eval/index.ts +211 -211
- package/src/eval/suites/basic.json +16 -16
- package/src/eval/suites/memory.json +12 -12
- package/src/eval/suites/safety.json +14 -14
- package/src/hub/brain-seed.ts +54 -54
- package/src/hub/client.ts +60 -60
- package/src/mcp/servers/calculator-mcp.ts +65 -65
- package/src/mcp/servers/crypto-mcp.ts +73 -73
- package/src/mcp/servers/database-mcp.ts +72 -72
- package/src/mcp/servers/datetime-mcp.ts +69 -69
- package/src/mcp/servers/filesystem.ts +66 -66
- package/src/mcp/servers/github-mcp.ts +58 -58
- package/src/mcp/servers/index.ts +63 -63
- package/src/mcp/servers/json-mcp.ts +102 -102
- package/src/mcp/servers/memory-mcp.ts +56 -56
- package/src/mcp/servers/regex-mcp.ts +53 -53
- package/src/mcp/servers/web-mcp.ts +49 -49
- package/src/memory/context-compressor.ts +189 -189
- package/src/memory/seed-loader.ts +212 -212
- package/src/memory/user-profiler.ts +215 -215
- package/src/plugins/content-filter.ts +23 -23
- package/src/plugins/logger.ts +18 -18
- package/src/plugins/rate-limiter.ts +38 -38
- package/src/protocols/a2a/client.ts +132 -132
- package/src/protocols/a2a/index.ts +8 -8
- package/src/protocols/a2a/server.ts +333 -333
- package/src/protocols/a2a/types.ts +88 -88
- package/src/protocols/a2a/utils.ts +50 -50
- package/src/protocols/agui/client.ts +83 -83
- package/src/protocols/agui/index.ts +4 -4
- package/src/protocols/agui/server.ts +218 -218
- package/src/protocols/agui/types.ts +153 -153
- package/src/protocols/index.ts +2 -2
- package/src/protocols/mcp/agent-tools.ts +134 -134
- package/src/protocols/mcp/index.ts +8 -8
- package/src/protocols/mcp/server.ts +262 -262
- package/src/protocols/mcp/types.ts +69 -69
- package/src/providers/index.ts +632 -632
- package/src/publish/index.ts +376 -376
- package/src/scheduler/cron-engine.ts +191 -191
- package/src/scheduler/index.ts +2 -2
- package/src/schema/oad.ts +217 -217
- package/src/security/approval.ts +131 -131
- package/src/security/approvals.ts +143 -143
- package/src/security/elevated.ts +105 -105
- package/src/security/guardrails.ts +248 -248
- package/src/security/index.ts +9 -9
- package/src/security/keys.ts +87 -87
- package/src/security/secrets.ts +129 -129
- package/src/skills/builtin/index.ts +408 -408
- package/src/skills/marketplace.ts +113 -113
- package/src/skills/types.ts +42 -42
- package/src/studio/server.ts +31 -1
- package/src/studio/templates-data.ts +178 -178
- package/src/studio-ui/index.html +230 -10
- package/src/telemetry/index.ts +324 -324
- package/src/tools/builtin/browser.ts +299 -299
- package/src/tools/builtin/datetime.ts +41 -41
- package/src/tools/builtin/file.ts +107 -107
- package/src/tools/builtin/home-assistant.ts +116 -116
- package/src/tools/builtin/rl-tools.ts +243 -243
- package/src/tools/builtin/shell.ts +43 -43
- package/src/tools/builtin/vision.ts +64 -64
- package/src/tools/builtin/web-search.ts +126 -126
- package/src/tools/builtin/web.ts +35 -35
- package/src/tools/document-processor.ts +213 -213
- package/src/tools/image-generator.ts +150 -150
- package/src/tools/integrations/calendar.ts +73 -73
- package/src/tools/integrations/code-exec.ts +39 -39
- package/src/tools/integrations/csv-analyzer.ts +92 -92
- package/src/tools/integrations/database.ts +44 -44
- package/src/tools/integrations/email-send.ts +76 -76
- package/src/tools/integrations/git-tool.ts +42 -42
- package/src/tools/integrations/github-tool.ts +76 -76
- package/src/tools/integrations/image-gen.ts +56 -56
- package/src/tools/integrations/index.ts +92 -92
- package/src/tools/integrations/jira.ts +83 -83
- package/src/tools/integrations/notion.ts +71 -71
- package/src/tools/integrations/npm-tool.ts +48 -48
- package/src/tools/integrations/pdf-reader.ts +58 -58
- package/src/tools/integrations/slack.ts +65 -65
- package/src/tools/integrations/summarizer.ts +49 -49
- package/src/tools/integrations/translator.ts +48 -48
- package/src/tools/integrations/trello.ts +60 -60
- package/src/tools/integrations/vector-search.ts +42 -42
- package/src/tools/integrations/web-scraper.ts +47 -47
- package/src/tools/integrations/web-search.ts +58 -58
- package/src/tools/integrations/webhook.ts +38 -38
- package/src/tools/mcp-client.ts +131 -131
- package/src/tools/web-scraper.ts +179 -179
- package/src/tools/web-search.ts +180 -180
- package/src/ui/components.ts +127 -127
- package/srv-out.txt +1 -1
- package/templates/ecommerce-assistant/README.md +45 -45
- package/templates/ecommerce-assistant/oad.yaml +47 -47
- package/templates/tech-support/README.md +43 -43
- package/templates/tech-support/oad.yaml +45 -45
- package/test-agent/Dockerfile +9 -9
- package/test-agent/README.md +50 -50
- package/test-agent/agent.yaml +23 -23
- package/test-agent/docker-compose.yml +11 -11
- package/test-agent/oad.yaml +31 -31
- package/test-agent/package-lock.json +1492 -1492
- package/test-agent/package.json +17 -17
- package/test-agent/src/index.ts +24 -24
- package/test-agent/src/skills/echo.ts +15 -15
- package/test-agent/tsconfig.json +24 -24
- package/test-full.js +43 -43
- package/test-sidebar.js +22 -22
- package/test-studio3.js +75 -75
- package/test-studio4.js +41 -41
- package/tests/a2a-protocol.test.ts +285 -285
- package/tests/agui-protocol.test.ts +246 -246
- package/tests/api-server.test.ts +148 -148
- package/tests/approvals.test.ts +89 -89
- package/tests/audio.test.ts +40 -40
- package/tests/brain-seed-extended.test.ts +490 -490
- package/tests/brain-seed.test.ts +239 -239
- package/tests/browser.test.ts +179 -179
- package/tests/channels/discord.test.ts +79 -79
- package/tests/channels/email.test.ts +148 -148
- package/tests/channels/feishu.test.ts +123 -123
- package/tests/channels/telegram.test.ts +129 -129
- package/tests/channels/websocket.test.ts +53 -53
- package/tests/channels/wechat.test.ts +170 -170
- package/tests/channels-extra.test.ts +45 -45
- package/tests/chat-cli.test.ts +160 -160
- package/tests/cli.test.ts +46 -46
- package/tests/context-compressor.test.ts +172 -172
- package/tests/context-refs.test.ts +121 -121
- package/tests/cron-engine.test.ts +101 -101
- package/tests/daemon.test.ts +135 -135
- package/tests/deepbrain-wire.test.ts +234 -234
- package/tests/deploy-and-dag.test.ts +196 -196
- package/tests/doctor.test.ts +38 -38
- package/tests/document-processor.test.ts +69 -69
- package/tests/e2e-nocode.test.ts +442 -442
- package/tests/elevated.test.ts +69 -69
- package/tests/eval.test.ts +173 -173
- package/tests/gateway.test.ts +63 -63
- package/tests/guardrails.test.ts +177 -177
- package/tests/home-assistant.test.ts +40 -40
- package/tests/hooks.test.ts +79 -79
- package/tests/ide-bridge.test.ts +38 -38
- package/tests/image-generator.test.ts +84 -84
- package/tests/init-role.test.ts +124 -124
- package/tests/integrations.test.ts +249 -249
- package/tests/mcp-client.test.ts +92 -92
- package/tests/mcp-server.test.ts +178 -178
- package/tests/mcp-servers.test.ts +260 -260
- package/tests/node-network.test.ts +74 -74
- package/tests/plugin-a2a-enhanced.test.ts +230 -230
- package/tests/profiles.test.ts +61 -61
- package/tests/publish.test.ts +231 -231
- package/tests/rl-tools.test.ts +93 -93
- package/tests/sandbox-manager.test.ts +46 -46
- package/tests/scheduler.test.ts +200 -200
- package/tests/secrets.test.ts +107 -107
- package/tests/security-enhanced.test.ts +233 -233
- package/tests/settings-api.test.ts +148 -148
- package/tests/setup.test.ts +73 -73
- package/tests/subagent.test.ts +193 -193
- package/tests/telegram-discord.test.ts +60 -60
- package/tests/telemetry.test.ts +186 -186
- package/tests/user-profiler.test.ts +169 -169
- package/tests/v090-features.test.ts +254 -254
- package/tests/vision.test.ts +61 -61
- package/tests/voice-call.test.ts +47 -47
- package/tests/voice-enhanced.test.ts +169 -169
- package/tests/voice-interaction.test.ts +38 -38
- package/tests/web-search.test.ts +155 -155
- package/tests/workflow-graph.test.ts +279 -279
- package/tutorial/customer-service-agent/README.md +612 -612
- package/tutorial/customer-service-agent/SOUL.md +26 -26
- package/tutorial/customer-service-agent/agent.yaml +63 -63
- package/tutorial/customer-service-agent/package.json +19 -19
- package/tutorial/customer-service-agent/src/index.ts +69 -69
- package/tutorial/customer-service-agent/src/skills/faq.ts +27 -27
- package/tutorial/customer-service-agent/src/skills/ticket.ts +22 -22
- package/tutorial/customer-service-agent/tsconfig.json +14 -14
package/src/channels/email.ts
CHANGED
|
@@ -1,351 +1,351 @@
|
|
|
1
|
-
import { BaseChannel } from './index';
|
|
2
|
-
import type { Message } from '../core/types';
|
|
3
|
-
import * as http from 'http';
|
|
4
|
-
import * as net from 'net';
|
|
5
|
-
import * as tls from 'tls';
|
|
6
|
-
import * as crypto from 'crypto';
|
|
7
|
-
|
|
8
|
-
/**
|
|
9
|
-
* Email Channel — v1.0.0
|
|
10
|
-
*
|
|
11
|
-
* Supports two modes:
|
|
12
|
-
* - webhook: Receives emails via HTTP POST (works with email forwarding services)
|
|
13
|
-
* - imap: TODO - Full IMAP polling (complex, requires raw socket IMAP protocol)
|
|
14
|
-
*
|
|
15
|
-
* Sends via SMTP with STARTTLS support using Node.js built-in tls module.
|
|
16
|
-
* No external dependencies (no nodemailer).
|
|
17
|
-
*/
|
|
18
|
-
|
|
19
|
-
export interface EmailChannelConfig {
|
|
20
|
-
/** Mode: 'webhook' (recommended) or 'imap' (TODO) */
|
|
21
|
-
mode?: 'webhook' | 'imap';
|
|
22
|
-
smtp?: {
|
|
23
|
-
host: string;
|
|
24
|
-
port: number;
|
|
25
|
-
user: string;
|
|
26
|
-
pass: string;
|
|
27
|
-
from?: string;
|
|
28
|
-
};
|
|
29
|
-
imap?: {
|
|
30
|
-
host: string;
|
|
31
|
-
port: number;
|
|
32
|
-
user: string;
|
|
33
|
-
password: string;
|
|
34
|
-
tls?: boolean;
|
|
35
|
-
mailbox?: string;
|
|
36
|
-
pollInterval?: number;
|
|
37
|
-
};
|
|
38
|
-
/** Webhook server port (default: 8082) */
|
|
39
|
-
webhookPort?: number;
|
|
40
|
-
/** Filter: only process emails from these addresses */
|
|
41
|
-
filters?: {
|
|
42
|
-
from?: string[];
|
|
43
|
-
subject?: string[];
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
export interface EmailMessage {
|
|
48
|
-
messageId: string;
|
|
49
|
-
from: string;
|
|
50
|
-
to: string[];
|
|
51
|
-
cc?: string[];
|
|
52
|
-
subject: string;
|
|
53
|
-
body: string;
|
|
54
|
-
html?: string;
|
|
55
|
-
date: Date;
|
|
56
|
-
inReplyTo?: string;
|
|
57
|
-
references?: string[];
|
|
58
|
-
threadId?: string;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
export class EmailChannel extends BaseChannel {
|
|
62
|
-
type = 'email';
|
|
63
|
-
private config: EmailChannelConfig;
|
|
64
|
-
private server: http.Server | null = null;
|
|
65
|
-
private processedIds: Set<string> = new Set();
|
|
66
|
-
|
|
67
|
-
constructor(config: EmailChannelConfig) {
|
|
68
|
-
super();
|
|
69
|
-
this.config = config;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
async start(): Promise<void> {
|
|
73
|
-
const mode = this.config.mode ?? 'webhook';
|
|
74
|
-
if (mode === 'webhook') {
|
|
75
|
-
await this.startWebhook();
|
|
76
|
-
} else {
|
|
77
|
-
console.warn('[EmailChannel] IMAP mode is not yet implemented. Use webhook mode.');
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
async stop(): Promise<void> {
|
|
82
|
-
return new Promise((resolve, reject) => {
|
|
83
|
-
if (!this.server) return resolve();
|
|
84
|
-
this.server.close((err) => (err ? reject(err) : resolve()));
|
|
85
|
-
this.server = null;
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
/** Start webhook HTTP server */
|
|
90
|
-
private async startWebhook(): Promise<void> {
|
|
91
|
-
const port = this.config.webhookPort ?? 8082;
|
|
92
|
-
|
|
93
|
-
this.server = http.createServer(async (req, res) => {
|
|
94
|
-
if (req.method === 'GET' && req.url === '/health') {
|
|
95
|
-
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
96
|
-
res.end(JSON.stringify({ status: 'ok', channel: 'email', mode: 'webhook' }));
|
|
97
|
-
return;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
if (req.method === 'POST' && (req.url === '/email/incoming' || req.url === '/')) {
|
|
101
|
-
try {
|
|
102
|
-
const body = await this.readBody(req);
|
|
103
|
-
const parsed = JSON.parse(body);
|
|
104
|
-
const email = EmailChannel.parseWebhookPayload(parsed);
|
|
105
|
-
|
|
106
|
-
if (!email) {
|
|
107
|
-
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
108
|
-
res.end(JSON.stringify({ error: 'Invalid email payload' }));
|
|
109
|
-
return;
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
// Deduplicate
|
|
113
|
-
if (this.processedIds.has(email.messageId)) {
|
|
114
|
-
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
115
|
-
res.end(JSON.stringify({ ok: true, duplicate: true }));
|
|
116
|
-
return;
|
|
117
|
-
}
|
|
118
|
-
this.processedIds.add(email.messageId);
|
|
119
|
-
if (this.processedIds.size > 5000) {
|
|
120
|
-
const arr = [...this.processedIds];
|
|
121
|
-
this.processedIds = new Set(arr.slice(-2500));
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
// Apply filters
|
|
125
|
-
if (!this.matchesFilters(email)) {
|
|
126
|
-
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
127
|
-
res.end(JSON.stringify({ ok: true, filtered: true }));
|
|
128
|
-
return;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
132
|
-
res.end(JSON.stringify({ ok: true }));
|
|
133
|
-
|
|
134
|
-
// Process async
|
|
135
|
-
if (this.handler) {
|
|
136
|
-
const msg = this.emailToMessage(email);
|
|
137
|
-
try {
|
|
138
|
-
const reply = await this.handler(msg);
|
|
139
|
-
if (this.config.smtp) {
|
|
140
|
-
await this.sendEmail(
|
|
141
|
-
email.from,
|
|
142
|
-
`Re: ${email.subject}`,
|
|
143
|
-
reply.content,
|
|
144
|
-
email.messageId
|
|
145
|
-
);
|
|
146
|
-
}
|
|
147
|
-
} catch (err) {
|
|
148
|
-
console.error('[EmailChannel] Handler error:', err);
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
} catch (err) {
|
|
152
|
-
console.error('[EmailChannel] Webhook error:', err);
|
|
153
|
-
res.writeHead(500, { 'Content-Type': 'application/json' });
|
|
154
|
-
res.end(JSON.stringify({ error: 'Internal error' }));
|
|
155
|
-
}
|
|
156
|
-
return;
|
|
157
|
-
}
|
|
158
|
-
|
|
159
|
-
res.writeHead(404);
|
|
160
|
-
res.end('Not Found');
|
|
161
|
-
});
|
|
162
|
-
|
|
163
|
-
return new Promise((resolve) => {
|
|
164
|
-
this.server!.listen(port, () => {
|
|
165
|
-
console.log(`[EmailChannel] Webhook listening on port ${port}`);
|
|
166
|
-
resolve();
|
|
167
|
-
});
|
|
168
|
-
});
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
/** Parse webhook payload into EmailMessage */
|
|
172
|
-
static parseWebhookPayload(payload: any): EmailMessage | null {
|
|
173
|
-
// Support common email webhook formats (SendGrid, Mailgun, generic)
|
|
174
|
-
const from = payload.from ?? payload.sender ?? payload.envelope?.from;
|
|
175
|
-
const subject = payload.subject ?? '(no subject)';
|
|
176
|
-
const body = payload.body ?? payload.text ?? payload['body-plain'] ?? payload.content ?? '';
|
|
177
|
-
const to = payload.to ?? payload.recipient ?? payload.envelope?.to;
|
|
178
|
-
|
|
179
|
-
if (!from) return null;
|
|
180
|
-
|
|
181
|
-
return {
|
|
182
|
-
messageId: payload.messageId ?? payload['Message-Id'] ?? payload.id ?? `email-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`,
|
|
183
|
-
from: typeof from === 'string' ? from : String(from),
|
|
184
|
-
to: Array.isArray(to) ? to : (typeof to === 'string' ? [to] : []),
|
|
185
|
-
cc: payload.cc ? (Array.isArray(payload.cc) ? payload.cc : [payload.cc]) : undefined,
|
|
186
|
-
subject,
|
|
187
|
-
body,
|
|
188
|
-
html: payload.html ?? payload['body-html'],
|
|
189
|
-
date: payload.date ? new Date(payload.date) : new Date(),
|
|
190
|
-
inReplyTo: payload.inReplyTo ?? payload['In-Reply-To'],
|
|
191
|
-
references: payload.references ? (Array.isArray(payload.references) ? payload.references : [payload.references]) : undefined,
|
|
192
|
-
threadId: payload.threadId,
|
|
193
|
-
};
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
/** Convert email to internal Message */
|
|
197
|
-
private emailToMessage(email: EmailMessage): Message {
|
|
198
|
-
return {
|
|
199
|
-
id: email.messageId,
|
|
200
|
-
role: 'user',
|
|
201
|
-
content: email.body,
|
|
202
|
-
timestamp: email.date.getTime(),
|
|
203
|
-
metadata: {
|
|
204
|
-
channel: 'email',
|
|
205
|
-
from: email.from,
|
|
206
|
-
to: email.to,
|
|
207
|
-
subject: email.subject,
|
|
208
|
-
threadId: email.threadId ?? email.messageId,
|
|
209
|
-
inReplyTo: email.inReplyTo,
|
|
210
|
-
},
|
|
211
|
-
};
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
/** Check if email matches configured filters */
|
|
215
|
-
matchesFilters(email: EmailMessage): boolean {
|
|
216
|
-
if (!this.config.filters) return true;
|
|
217
|
-
|
|
218
|
-
if (this.config.filters.from?.length) {
|
|
219
|
-
const fromMatch = this.config.filters.from.some((f) =>
|
|
220
|
-
email.from.toLowerCase().includes(f.toLowerCase())
|
|
221
|
-
);
|
|
222
|
-
if (!fromMatch) return false;
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
if (this.config.filters.subject?.length) {
|
|
226
|
-
const subjectMatch = this.config.filters.subject.some((s) =>
|
|
227
|
-
email.subject.toLowerCase().includes(s.toLowerCase())
|
|
228
|
-
);
|
|
229
|
-
if (!subjectMatch) return false;
|
|
230
|
-
}
|
|
231
|
-
|
|
232
|
-
return true;
|
|
233
|
-
}
|
|
234
|
-
|
|
235
|
-
/** Send email via SMTP with STARTTLS */
|
|
236
|
-
async sendEmail(to: string, subject: string, body: string, inReplyTo?: string): Promise<void> {
|
|
237
|
-
const smtp = this.config.smtp;
|
|
238
|
-
if (!smtp) throw new Error('[EmailChannel] SMTP not configured');
|
|
239
|
-
|
|
240
|
-
const from = smtp.from ?? smtp.user;
|
|
241
|
-
const messageId = `<${crypto.randomBytes(16).toString('hex')}@opc-agent>`;
|
|
242
|
-
|
|
243
|
-
let headers = `From: ${from}\r\n`;
|
|
244
|
-
headers += `To: ${to}\r\n`;
|
|
245
|
-
headers += `Subject: ${subject}\r\n`;
|
|
246
|
-
headers += `Message-ID: ${messageId}\r\n`;
|
|
247
|
-
headers += `Date: ${new Date().toUTCString()}\r\n`;
|
|
248
|
-
if (inReplyTo) {
|
|
249
|
-
headers += `In-Reply-To: ${inReplyTo}\r\n`;
|
|
250
|
-
headers += `References: ${inReplyTo}\r\n`;
|
|
251
|
-
}
|
|
252
|
-
headers += `MIME-Version: 1.0\r\n`;
|
|
253
|
-
headers += `Content-Type: text/plain; charset=UTF-8\r\n`;
|
|
254
|
-
headers += `\r\n`;
|
|
255
|
-
headers += body;
|
|
256
|
-
|
|
257
|
-
await this.smtpSend(smtp.host, smtp.port, smtp.user, smtp.pass, from, to, headers);
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
/** Raw SMTP send with STARTTLS */
|
|
261
|
-
private smtpSend(
|
|
262
|
-
host: string, port: number,
|
|
263
|
-
user: string, pass: string,
|
|
264
|
-
from: string, to: string,
|
|
265
|
-
message: string
|
|
266
|
-
): Promise<void> {
|
|
267
|
-
return new Promise((resolve, reject) => {
|
|
268
|
-
let socket: net.Socket | tls.TLSSocket = net.createConnection(port, host);
|
|
269
|
-
let upgraded = false;
|
|
270
|
-
let step = 0;
|
|
271
|
-
|
|
272
|
-
const commands = [
|
|
273
|
-
`EHLO opc-agent\r\n`,
|
|
274
|
-
`STARTTLS\r\n`,
|
|
275
|
-
// After TLS upgrade:
|
|
276
|
-
`EHLO opc-agent\r\n`,
|
|
277
|
-
`AUTH LOGIN\r\n`,
|
|
278
|
-
`${Buffer.from(user).toString('base64')}\r\n`,
|
|
279
|
-
`${Buffer.from(pass).toString('base64')}\r\n`,
|
|
280
|
-
`MAIL FROM:<${from}>\r\n`,
|
|
281
|
-
`RCPT TO:<${to}>\r\n`,
|
|
282
|
-
`DATA\r\n`,
|
|
283
|
-
`${message}\r\n.\r\n`,
|
|
284
|
-
`QUIT\r\n`,
|
|
285
|
-
];
|
|
286
|
-
|
|
287
|
-
const sendNext = () => {
|
|
288
|
-
if (step < commands.length) {
|
|
289
|
-
socket.write(commands[step]);
|
|
290
|
-
step++;
|
|
291
|
-
}
|
|
292
|
-
};
|
|
293
|
-
|
|
294
|
-
socket.on('data', (data: Buffer) => {
|
|
295
|
-
const response = data.toString();
|
|
296
|
-
const code = parseInt(response.substring(0, 3), 10);
|
|
297
|
-
|
|
298
|
-
if (code >= 400) {
|
|
299
|
-
socket.destroy();
|
|
300
|
-
reject(new Error(`SMTP error: ${response.trim()}`));
|
|
301
|
-
return;
|
|
302
|
-
}
|
|
303
|
-
|
|
304
|
-
// After STARTTLS response (220), upgrade to TLS
|
|
305
|
-
if (step === 2 && !upgraded && response.startsWith('220')) {
|
|
306
|
-
upgraded = true;
|
|
307
|
-
const tlsSocket = tls.connect({ socket, host, servername: host }, () => {
|
|
308
|
-
socket = tlsSocket;
|
|
309
|
-
sendNext(); // EHLO again after TLS
|
|
310
|
-
});
|
|
311
|
-
tlsSocket.on('data', (d: Buffer) => {
|
|
312
|
-
const resp = d.toString();
|
|
313
|
-
const c = parseInt(resp.substring(0, 3), 10);
|
|
314
|
-
if (c >= 400) {
|
|
315
|
-
tlsSocket.destroy();
|
|
316
|
-
reject(new Error(`SMTP error: ${resp.trim()}`));
|
|
317
|
-
return;
|
|
318
|
-
}
|
|
319
|
-
if (step === commands.length && resp.startsWith('221')) {
|
|
320
|
-
tlsSocket.destroy();
|
|
321
|
-
resolve();
|
|
322
|
-
return;
|
|
323
|
-
}
|
|
324
|
-
sendNext();
|
|
325
|
-
});
|
|
326
|
-
tlsSocket.on('error', reject);
|
|
327
|
-
return;
|
|
328
|
-
}
|
|
329
|
-
|
|
330
|
-
sendNext();
|
|
331
|
-
});
|
|
332
|
-
|
|
333
|
-
socket.on('error', reject);
|
|
334
|
-
socket.on('timeout', () => {
|
|
335
|
-
socket.destroy();
|
|
336
|
-
reject(new Error('SMTP connection timeout'));
|
|
337
|
-
});
|
|
338
|
-
socket.setTimeout(30000);
|
|
339
|
-
});
|
|
340
|
-
}
|
|
341
|
-
|
|
342
|
-
/** Read request body */
|
|
343
|
-
private readBody(req: http.IncomingMessage): Promise<string> {
|
|
344
|
-
return new Promise((resolve, reject) => {
|
|
345
|
-
const chunks: Buffer[] = [];
|
|
346
|
-
req.on('data', (chunk: Buffer) => chunks.push(chunk));
|
|
347
|
-
req.on('end', () => resolve(Buffer.concat(chunks).toString('utf-8')));
|
|
348
|
-
req.on('error', reject);
|
|
349
|
-
});
|
|
350
|
-
}
|
|
351
|
-
}
|
|
1
|
+
import { BaseChannel } from './index';
|
|
2
|
+
import type { Message } from '../core/types';
|
|
3
|
+
import * as http from 'http';
|
|
4
|
+
import * as net from 'net';
|
|
5
|
+
import * as tls from 'tls';
|
|
6
|
+
import * as crypto from 'crypto';
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Email Channel — v1.0.0
|
|
10
|
+
*
|
|
11
|
+
* Supports two modes:
|
|
12
|
+
* - webhook: Receives emails via HTTP POST (works with email forwarding services)
|
|
13
|
+
* - imap: TODO - Full IMAP polling (complex, requires raw socket IMAP protocol)
|
|
14
|
+
*
|
|
15
|
+
* Sends via SMTP with STARTTLS support using Node.js built-in tls module.
|
|
16
|
+
* No external dependencies (no nodemailer).
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
export interface EmailChannelConfig {
|
|
20
|
+
/** Mode: 'webhook' (recommended) or 'imap' (TODO) */
|
|
21
|
+
mode?: 'webhook' | 'imap';
|
|
22
|
+
smtp?: {
|
|
23
|
+
host: string;
|
|
24
|
+
port: number;
|
|
25
|
+
user: string;
|
|
26
|
+
pass: string;
|
|
27
|
+
from?: string;
|
|
28
|
+
};
|
|
29
|
+
imap?: {
|
|
30
|
+
host: string;
|
|
31
|
+
port: number;
|
|
32
|
+
user: string;
|
|
33
|
+
password: string;
|
|
34
|
+
tls?: boolean;
|
|
35
|
+
mailbox?: string;
|
|
36
|
+
pollInterval?: number;
|
|
37
|
+
};
|
|
38
|
+
/** Webhook server port (default: 8082) */
|
|
39
|
+
webhookPort?: number;
|
|
40
|
+
/** Filter: only process emails from these addresses */
|
|
41
|
+
filters?: {
|
|
42
|
+
from?: string[];
|
|
43
|
+
subject?: string[];
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export interface EmailMessage {
|
|
48
|
+
messageId: string;
|
|
49
|
+
from: string;
|
|
50
|
+
to: string[];
|
|
51
|
+
cc?: string[];
|
|
52
|
+
subject: string;
|
|
53
|
+
body: string;
|
|
54
|
+
html?: string;
|
|
55
|
+
date: Date;
|
|
56
|
+
inReplyTo?: string;
|
|
57
|
+
references?: string[];
|
|
58
|
+
threadId?: string;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export class EmailChannel extends BaseChannel {
|
|
62
|
+
type = 'email';
|
|
63
|
+
private config: EmailChannelConfig;
|
|
64
|
+
private server: http.Server | null = null;
|
|
65
|
+
private processedIds: Set<string> = new Set();
|
|
66
|
+
|
|
67
|
+
constructor(config: EmailChannelConfig) {
|
|
68
|
+
super();
|
|
69
|
+
this.config = config;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
async start(): Promise<void> {
|
|
73
|
+
const mode = this.config.mode ?? 'webhook';
|
|
74
|
+
if (mode === 'webhook') {
|
|
75
|
+
await this.startWebhook();
|
|
76
|
+
} else {
|
|
77
|
+
console.warn('[EmailChannel] IMAP mode is not yet implemented. Use webhook mode.');
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
async stop(): Promise<void> {
|
|
82
|
+
return new Promise((resolve, reject) => {
|
|
83
|
+
if (!this.server) return resolve();
|
|
84
|
+
this.server.close((err) => (err ? reject(err) : resolve()));
|
|
85
|
+
this.server = null;
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/** Start webhook HTTP server */
|
|
90
|
+
private async startWebhook(): Promise<void> {
|
|
91
|
+
const port = this.config.webhookPort ?? 8082;
|
|
92
|
+
|
|
93
|
+
this.server = http.createServer(async (req, res) => {
|
|
94
|
+
if (req.method === 'GET' && req.url === '/health') {
|
|
95
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
96
|
+
res.end(JSON.stringify({ status: 'ok', channel: 'email', mode: 'webhook' }));
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
if (req.method === 'POST' && (req.url === '/email/incoming' || req.url === '/')) {
|
|
101
|
+
try {
|
|
102
|
+
const body = await this.readBody(req);
|
|
103
|
+
const parsed = JSON.parse(body);
|
|
104
|
+
const email = EmailChannel.parseWebhookPayload(parsed);
|
|
105
|
+
|
|
106
|
+
if (!email) {
|
|
107
|
+
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
108
|
+
res.end(JSON.stringify({ error: 'Invalid email payload' }));
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
// Deduplicate
|
|
113
|
+
if (this.processedIds.has(email.messageId)) {
|
|
114
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
115
|
+
res.end(JSON.stringify({ ok: true, duplicate: true }));
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
this.processedIds.add(email.messageId);
|
|
119
|
+
if (this.processedIds.size > 5000) {
|
|
120
|
+
const arr = [...this.processedIds];
|
|
121
|
+
this.processedIds = new Set(arr.slice(-2500));
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
// Apply filters
|
|
125
|
+
if (!this.matchesFilters(email)) {
|
|
126
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
127
|
+
res.end(JSON.stringify({ ok: true, filtered: true }));
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
132
|
+
res.end(JSON.stringify({ ok: true }));
|
|
133
|
+
|
|
134
|
+
// Process async
|
|
135
|
+
if (this.handler) {
|
|
136
|
+
const msg = this.emailToMessage(email);
|
|
137
|
+
try {
|
|
138
|
+
const reply = await this.handler(msg);
|
|
139
|
+
if (this.config.smtp) {
|
|
140
|
+
await this.sendEmail(
|
|
141
|
+
email.from,
|
|
142
|
+
`Re: ${email.subject}`,
|
|
143
|
+
reply.content,
|
|
144
|
+
email.messageId
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
} catch (err) {
|
|
148
|
+
console.error('[EmailChannel] Handler error:', err);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
} catch (err) {
|
|
152
|
+
console.error('[EmailChannel] Webhook error:', err);
|
|
153
|
+
res.writeHead(500, { 'Content-Type': 'application/json' });
|
|
154
|
+
res.end(JSON.stringify({ error: 'Internal error' }));
|
|
155
|
+
}
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
res.writeHead(404);
|
|
160
|
+
res.end('Not Found');
|
|
161
|
+
});
|
|
162
|
+
|
|
163
|
+
return new Promise((resolve) => {
|
|
164
|
+
this.server!.listen(port, () => {
|
|
165
|
+
console.log(`[EmailChannel] Webhook listening on port ${port}`);
|
|
166
|
+
resolve();
|
|
167
|
+
});
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/** Parse webhook payload into EmailMessage */
|
|
172
|
+
static parseWebhookPayload(payload: any): EmailMessage | null {
|
|
173
|
+
// Support common email webhook formats (SendGrid, Mailgun, generic)
|
|
174
|
+
const from = payload.from ?? payload.sender ?? payload.envelope?.from;
|
|
175
|
+
const subject = payload.subject ?? '(no subject)';
|
|
176
|
+
const body = payload.body ?? payload.text ?? payload['body-plain'] ?? payload.content ?? '';
|
|
177
|
+
const to = payload.to ?? payload.recipient ?? payload.envelope?.to;
|
|
178
|
+
|
|
179
|
+
if (!from) return null;
|
|
180
|
+
|
|
181
|
+
return {
|
|
182
|
+
messageId: payload.messageId ?? payload['Message-Id'] ?? payload.id ?? `email-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`,
|
|
183
|
+
from: typeof from === 'string' ? from : String(from),
|
|
184
|
+
to: Array.isArray(to) ? to : (typeof to === 'string' ? [to] : []),
|
|
185
|
+
cc: payload.cc ? (Array.isArray(payload.cc) ? payload.cc : [payload.cc]) : undefined,
|
|
186
|
+
subject,
|
|
187
|
+
body,
|
|
188
|
+
html: payload.html ?? payload['body-html'],
|
|
189
|
+
date: payload.date ? new Date(payload.date) : new Date(),
|
|
190
|
+
inReplyTo: payload.inReplyTo ?? payload['In-Reply-To'],
|
|
191
|
+
references: payload.references ? (Array.isArray(payload.references) ? payload.references : [payload.references]) : undefined,
|
|
192
|
+
threadId: payload.threadId,
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/** Convert email to internal Message */
|
|
197
|
+
private emailToMessage(email: EmailMessage): Message {
|
|
198
|
+
return {
|
|
199
|
+
id: email.messageId,
|
|
200
|
+
role: 'user',
|
|
201
|
+
content: email.body,
|
|
202
|
+
timestamp: email.date.getTime(),
|
|
203
|
+
metadata: {
|
|
204
|
+
channel: 'email',
|
|
205
|
+
from: email.from,
|
|
206
|
+
to: email.to,
|
|
207
|
+
subject: email.subject,
|
|
208
|
+
threadId: email.threadId ?? email.messageId,
|
|
209
|
+
inReplyTo: email.inReplyTo,
|
|
210
|
+
},
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
/** Check if email matches configured filters */
|
|
215
|
+
matchesFilters(email: EmailMessage): boolean {
|
|
216
|
+
if (!this.config.filters) return true;
|
|
217
|
+
|
|
218
|
+
if (this.config.filters.from?.length) {
|
|
219
|
+
const fromMatch = this.config.filters.from.some((f) =>
|
|
220
|
+
email.from.toLowerCase().includes(f.toLowerCase())
|
|
221
|
+
);
|
|
222
|
+
if (!fromMatch) return false;
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
if (this.config.filters.subject?.length) {
|
|
226
|
+
const subjectMatch = this.config.filters.subject.some((s) =>
|
|
227
|
+
email.subject.toLowerCase().includes(s.toLowerCase())
|
|
228
|
+
);
|
|
229
|
+
if (!subjectMatch) return false;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
return true;
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
/** Send email via SMTP with STARTTLS */
|
|
236
|
+
async sendEmail(to: string, subject: string, body: string, inReplyTo?: string): Promise<void> {
|
|
237
|
+
const smtp = this.config.smtp;
|
|
238
|
+
if (!smtp) throw new Error('[EmailChannel] SMTP not configured');
|
|
239
|
+
|
|
240
|
+
const from = smtp.from ?? smtp.user;
|
|
241
|
+
const messageId = `<${crypto.randomBytes(16).toString('hex')}@opc-agent>`;
|
|
242
|
+
|
|
243
|
+
let headers = `From: ${from}\r\n`;
|
|
244
|
+
headers += `To: ${to}\r\n`;
|
|
245
|
+
headers += `Subject: ${subject}\r\n`;
|
|
246
|
+
headers += `Message-ID: ${messageId}\r\n`;
|
|
247
|
+
headers += `Date: ${new Date().toUTCString()}\r\n`;
|
|
248
|
+
if (inReplyTo) {
|
|
249
|
+
headers += `In-Reply-To: ${inReplyTo}\r\n`;
|
|
250
|
+
headers += `References: ${inReplyTo}\r\n`;
|
|
251
|
+
}
|
|
252
|
+
headers += `MIME-Version: 1.0\r\n`;
|
|
253
|
+
headers += `Content-Type: text/plain; charset=UTF-8\r\n`;
|
|
254
|
+
headers += `\r\n`;
|
|
255
|
+
headers += body;
|
|
256
|
+
|
|
257
|
+
await this.smtpSend(smtp.host, smtp.port, smtp.user, smtp.pass, from, to, headers);
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
/** Raw SMTP send with STARTTLS */
|
|
261
|
+
private smtpSend(
|
|
262
|
+
host: string, port: number,
|
|
263
|
+
user: string, pass: string,
|
|
264
|
+
from: string, to: string,
|
|
265
|
+
message: string
|
|
266
|
+
): Promise<void> {
|
|
267
|
+
return new Promise((resolve, reject) => {
|
|
268
|
+
let socket: net.Socket | tls.TLSSocket = net.createConnection(port, host);
|
|
269
|
+
let upgraded = false;
|
|
270
|
+
let step = 0;
|
|
271
|
+
|
|
272
|
+
const commands = [
|
|
273
|
+
`EHLO opc-agent\r\n`,
|
|
274
|
+
`STARTTLS\r\n`,
|
|
275
|
+
// After TLS upgrade:
|
|
276
|
+
`EHLO opc-agent\r\n`,
|
|
277
|
+
`AUTH LOGIN\r\n`,
|
|
278
|
+
`${Buffer.from(user).toString('base64')}\r\n`,
|
|
279
|
+
`${Buffer.from(pass).toString('base64')}\r\n`,
|
|
280
|
+
`MAIL FROM:<${from}>\r\n`,
|
|
281
|
+
`RCPT TO:<${to}>\r\n`,
|
|
282
|
+
`DATA\r\n`,
|
|
283
|
+
`${message}\r\n.\r\n`,
|
|
284
|
+
`QUIT\r\n`,
|
|
285
|
+
];
|
|
286
|
+
|
|
287
|
+
const sendNext = () => {
|
|
288
|
+
if (step < commands.length) {
|
|
289
|
+
socket.write(commands[step]);
|
|
290
|
+
step++;
|
|
291
|
+
}
|
|
292
|
+
};
|
|
293
|
+
|
|
294
|
+
socket.on('data', (data: Buffer) => {
|
|
295
|
+
const response = data.toString();
|
|
296
|
+
const code = parseInt(response.substring(0, 3), 10);
|
|
297
|
+
|
|
298
|
+
if (code >= 400) {
|
|
299
|
+
socket.destroy();
|
|
300
|
+
reject(new Error(`SMTP error: ${response.trim()}`));
|
|
301
|
+
return;
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
// After STARTTLS response (220), upgrade to TLS
|
|
305
|
+
if (step === 2 && !upgraded && response.startsWith('220')) {
|
|
306
|
+
upgraded = true;
|
|
307
|
+
const tlsSocket = tls.connect({ socket, host, servername: host }, () => {
|
|
308
|
+
socket = tlsSocket;
|
|
309
|
+
sendNext(); // EHLO again after TLS
|
|
310
|
+
});
|
|
311
|
+
tlsSocket.on('data', (d: Buffer) => {
|
|
312
|
+
const resp = d.toString();
|
|
313
|
+
const c = parseInt(resp.substring(0, 3), 10);
|
|
314
|
+
if (c >= 400) {
|
|
315
|
+
tlsSocket.destroy();
|
|
316
|
+
reject(new Error(`SMTP error: ${resp.trim()}`));
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
319
|
+
if (step === commands.length && resp.startsWith('221')) {
|
|
320
|
+
tlsSocket.destroy();
|
|
321
|
+
resolve();
|
|
322
|
+
return;
|
|
323
|
+
}
|
|
324
|
+
sendNext();
|
|
325
|
+
});
|
|
326
|
+
tlsSocket.on('error', reject);
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
sendNext();
|
|
331
|
+
});
|
|
332
|
+
|
|
333
|
+
socket.on('error', reject);
|
|
334
|
+
socket.on('timeout', () => {
|
|
335
|
+
socket.destroy();
|
|
336
|
+
reject(new Error('SMTP connection timeout'));
|
|
337
|
+
});
|
|
338
|
+
socket.setTimeout(30000);
|
|
339
|
+
});
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
/** Read request body */
|
|
343
|
+
private readBody(req: http.IncomingMessage): Promise<string> {
|
|
344
|
+
return new Promise((resolve, reject) => {
|
|
345
|
+
const chunks: Buffer[] = [];
|
|
346
|
+
req.on('data', (chunk: Buffer) => chunks.push(chunk));
|
|
347
|
+
req.on('end', () => resolve(Buffer.concat(chunks).toString('utf-8')));
|
|
348
|
+
req.on('error', reject);
|
|
349
|
+
});
|
|
350
|
+
}
|
|
351
|
+
}
|