airlock-bot 0.2.36 → 0.2.38
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 +34 -7
- package/dist/activity/stream.d.ts +29 -0
- package/dist/activity/stream.d.ts.map +1 -0
- package/dist/activity/stream.js +36 -0
- package/dist/activity/stream.js.map +1 -0
- package/dist/airlock/context.d.ts +12 -0
- package/dist/airlock/context.d.ts.map +1 -0
- package/dist/airlock/context.js +32 -0
- package/dist/airlock/context.js.map +1 -0
- package/dist/airlock/tools.d.ts +7 -0
- package/dist/airlock/tools.d.ts.map +1 -0
- package/dist/airlock/tools.js +13 -0
- package/dist/airlock/tools.js.map +1 -0
- package/dist/allowlist/engine.d.ts +12 -0
- package/dist/allowlist/engine.d.ts.map +1 -1
- package/dist/allowlist/engine.js +40 -15
- package/dist/allowlist/engine.js.map +1 -1
- package/dist/audit/api.d.ts +2 -0
- package/dist/audit/api.d.ts.map +1 -1
- package/dist/audit/api.js.map +1 -1
- package/dist/audit/db.d.ts +16 -0
- package/dist/audit/db.d.ts.map +1 -1
- package/dist/audit/db.js +73 -0
- package/dist/audit/db.js.map +1 -1
- package/dist/audit/logger.d.ts +8 -1
- package/dist/audit/logger.d.ts.map +1 -1
- package/dist/audit/logger.js +21 -0
- package/dist/audit/logger.js.map +1 -1
- package/dist/backend/airlock-adapter.d.ts +22 -0
- package/dist/backend/airlock-adapter.d.ts.map +1 -0
- package/dist/backend/airlock-adapter.js +136 -0
- package/dist/backend/airlock-adapter.js.map +1 -0
- package/dist/backend/factory.d.ts +5 -1
- package/dist/backend/factory.d.ts.map +1 -1
- package/dist/backend/factory.js +5 -5
- package/dist/backend/factory.js.map +1 -1
- package/dist/backend/mcp-adapter.d.ts.map +1 -1
- package/dist/backend/mcp-adapter.js +28 -4
- package/dist/backend/mcp-adapter.js.map +1 -1
- package/dist/backend/openapi/adapter.d.ts.map +1 -1
- package/dist/backend/openapi/adapter.js +33 -13
- package/dist/backend/openapi/adapter.js.map +1 -1
- package/dist/config/loader.d.ts +12 -1
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +799 -23
- package/dist/config/loader.js.map +1 -1
- package/dist/config/profiles.d.ts +46 -8
- package/dist/config/profiles.d.ts.map +1 -1
- package/dist/config/profiles.js +367 -23
- package/dist/config/profiles.js.map +1 -1
- package/dist/config/schema.d.ts +3542 -174
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +292 -63
- package/dist/config/schema.js.map +1 -1
- package/dist/configure-web/cli.d.ts +13 -0
- package/dist/configure-web/cli.d.ts.map +1 -1
- package/dist/configure-web/cli.js +570 -80
- package/dist/configure-web/cli.js.map +1 -1
- package/dist/gateway.d.ts +16 -1
- package/dist/gateway.d.ts.map +1 -1
- package/dist/gateway.js +263 -57
- package/dist/gateway.js.map +1 -1
- package/dist/hitl/api.d.ts +2 -0
- package/dist/hitl/api.d.ts.map +1 -1
- package/dist/hitl/api.js +8 -0
- package/dist/hitl/api.js.map +1 -1
- package/dist/hitl/approval-dashboard.d.ts +5 -9
- package/dist/hitl/approval-dashboard.d.ts.map +1 -1
- package/dist/hitl/approval-dashboard.js +8 -55
- package/dist/hitl/approval-dashboard.js.map +1 -1
- package/dist/hitl/approval-stream.d.ts +34 -0
- package/dist/hitl/approval-stream.d.ts.map +1 -0
- package/dist/hitl/approval-stream.js +111 -0
- package/dist/hitl/approval-stream.js.map +1 -0
- package/dist/hitl/engine.d.ts +16 -7
- package/dist/hitl/engine.d.ts.map +1 -1
- package/dist/hitl/engine.js +109 -35
- package/dist/hitl/engine.js.map +1 -1
- package/dist/hitl/formatter.d.ts.map +1 -1
- package/dist/hitl/formatter.js +2 -0
- package/dist/hitl/formatter.js.map +1 -1
- package/dist/hitl/provider-factory.d.ts +8 -2
- package/dist/hitl/provider-factory.d.ts.map +1 -1
- package/dist/hitl/provider-factory.js +23 -2
- package/dist/hitl/provider-factory.js.map +1 -1
- package/dist/hitl/providers/composite.d.ts +9 -0
- package/dist/hitl/providers/composite.d.ts.map +1 -1
- package/dist/hitl/providers/composite.js +14 -0
- package/dist/hitl/providers/composite.js.map +1 -1
- package/dist/hitl/providers/dashboard.d.ts +12 -2
- package/dist/hitl/providers/dashboard.d.ts.map +1 -1
- package/dist/hitl/providers/dashboard.js +11 -5
- package/dist/hitl/providers/dashboard.js.map +1 -1
- package/dist/hitl/providers/ios.d.ts +23 -0
- package/dist/hitl/providers/ios.d.ts.map +1 -0
- package/dist/hitl/providers/ios.js +183 -0
- package/dist/hitl/providers/ios.js.map +1 -0
- package/dist/hitl/providers/macos.d.ts.map +1 -1
- package/dist/hitl/providers/macos.js +8 -4
- package/dist/hitl/providers/macos.js.map +1 -1
- package/dist/hitl/providers/openclaw.js +2 -2
- package/dist/hitl/providers/openclaw.js.map +1 -1
- package/dist/hitl/providers/stdio.js +2 -2
- package/dist/hitl/providers/stdio.js.map +1 -1
- package/dist/hitl/providers/telegram.js +2 -2
- package/dist/hitl/providers/telegram.js.map +1 -1
- package/dist/hitl/providers/tui.d.ts.map +1 -1
- package/dist/hitl/providers/tui.js +8 -2
- package/dist/hitl/providers/tui.js.map +1 -1
- package/dist/hitl/providers/types.d.ts +14 -0
- package/dist/hitl/providers/types.d.ts.map +1 -1
- package/dist/hook/api.d.ts +2 -0
- package/dist/hook/api.d.ts.map +1 -1
- package/dist/hook/api.js.map +1 -1
- package/dist/hook/normalizer.js +2 -2
- package/dist/hook/normalizer.js.map +1 -1
- package/dist/index.js +28 -1
- package/dist/index.js.map +1 -1
- package/dist/introspect/cli.d.ts +31 -0
- package/dist/introspect/cli.d.ts.map +1 -0
- package/dist/introspect/cli.js +756 -0
- package/dist/introspect/cli.js.map +1 -0
- package/dist/middleware/chain-builder.d.ts +1 -1
- package/dist/middleware/chain-builder.d.ts.map +1 -1
- package/dist/middleware/chain-builder.js +8 -4
- package/dist/middleware/chain-builder.js.map +1 -1
- package/dist/middleware/core/allowlist.d.ts.map +1 -1
- package/dist/middleware/core/allowlist.js +14 -0
- package/dist/middleware/core/allowlist.js.map +1 -1
- package/dist/middleware/core/arg-policy.d.ts +13 -0
- package/dist/middleware/core/arg-policy.d.ts.map +1 -0
- package/dist/middleware/core/arg-policy.js +201 -0
- package/dist/middleware/core/arg-policy.js.map +1 -0
- package/dist/middleware/core/exec-policy.d.ts.map +1 -1
- package/dist/middleware/core/exec-policy.js +16 -1
- package/dist/middleware/core/exec-policy.js.map +1 -1
- package/dist/middleware/core/execute.d.ts.map +1 -1
- package/dist/middleware/core/execute.js +6 -2
- package/dist/middleware/core/execute.js.map +1 -1
- package/dist/middleware/core/hitl-gate.d.ts.map +1 -1
- package/dist/middleware/core/hitl-gate.js +15 -4
- package/dist/middleware/core/hitl-gate.js.map +1 -1
- package/dist/middleware/core/schema-validator.d.ts.map +1 -1
- package/dist/middleware/core/schema-validator.js +7 -3
- package/dist/middleware/core/schema-validator.js.map +1 -1
- package/dist/middleware/post/canary-token-injector.d.ts +4 -1
- package/dist/middleware/post/canary-token-injector.d.ts.map +1 -1
- package/dist/middleware/post/canary-token-injector.js +5 -1
- package/dist/middleware/post/canary-token-injector.js.map +1 -1
- package/dist/middleware/post/untrusted-envelope.d.ts.map +1 -1
- package/dist/middleware/post/untrusted-envelope.js +7 -1
- package/dist/middleware/post/untrusted-envelope.js.map +1 -1
- package/dist/mobile/api.d.ts +20 -0
- package/dist/mobile/api.d.ts.map +1 -0
- package/dist/mobile/api.js +255 -0
- package/dist/mobile/api.js.map +1 -0
- package/dist/mobile/apns.d.ts +68 -0
- package/dist/mobile/apns.d.ts.map +1 -0
- package/dist/mobile/apns.js +321 -0
- package/dist/mobile/apns.js.map +1 -0
- package/dist/pool/http-client.d.ts +3 -1
- package/dist/pool/http-client.d.ts.map +1 -1
- package/dist/pool/http-client.js +5 -2
- package/dist/pool/http-client.js.map +1 -1
- package/dist/pool/oauth-provider.d.ts +2 -0
- package/dist/pool/oauth-provider.d.ts.map +1 -1
- package/dist/pool/oauth-provider.js +23 -4
- package/dist/pool/oauth-provider.js.map +1 -1
- package/dist/pool/pool.d.ts +2 -1
- package/dist/pool/pool.d.ts.map +1 -1
- package/dist/pool/pool.js +2 -2
- package/dist/pool/pool.js.map +1 -1
- package/dist/pool/sse-client.d.ts +3 -1
- package/dist/pool/sse-client.d.ts.map +1 -1
- package/dist/pool/sse-client.js +5 -2
- package/dist/pool/sse-client.js.map +1 -1
- package/dist/pool/stdio-client.d.ts +3 -1
- package/dist/pool/stdio-client.d.ts.map +1 -1
- package/dist/pool/stdio-client.js +5 -2
- package/dist/pool/stdio-client.js.map +1 -1
- package/dist/registry/airlock-policy.d.ts +3 -0
- package/dist/registry/airlock-policy.d.ts.map +1 -0
- package/dist/registry/airlock-policy.js +50 -0
- package/dist/registry/airlock-policy.js.map +1 -0
- package/dist/registry/registry.d.ts +2 -0
- package/dist/registry/registry.d.ts.map +1 -1
- package/dist/registry/registry.js +19 -13
- package/dist/registry/registry.js.map +1 -1
- package/dist/security/blocked-hosts.d.ts +2 -0
- package/dist/security/blocked-hosts.d.ts.map +1 -1
- package/dist/security/blocked-hosts.js +61 -7
- package/dist/security/blocked-hosts.js.map +1 -1
- package/dist/security/request.d.ts +2 -0
- package/dist/security/request.d.ts.map +1 -1
- package/dist/security/request.js +6 -2
- package/dist/security/request.js.map +1 -1
- package/dist/security/secrets.d.ts +12 -0
- package/dist/security/secrets.d.ts.map +1 -0
- package/dist/security/secrets.js +138 -0
- package/dist/security/secrets.js.map +1 -0
- package/dist/setup-openclaw/cli.js +1 -1
- package/dist/stdio-mode.d.ts.map +1 -1
- package/dist/stdio-mode.js +125 -24
- package/dist/stdio-mode.js.map +1 -1
- package/dist/tools/api.d.ts +4 -1
- package/dist/tools/api.d.ts.map +1 -1
- package/dist/tools/api.js +58 -7
- package/dist/tools/api.js.map +1 -1
- package/dist/tools/exec.d.ts +2 -1
- package/dist/tools/exec.d.ts.map +1 -1
- package/dist/tools/exec.js +4 -3
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/http.d.ts.map +1 -1
- package/dist/tools/http.js +4 -7
- package/dist/tools/http.js.map +1 -1
- package/dist/transport/agent-server.d.ts +4 -0
- package/dist/transport/agent-server.d.ts.map +1 -1
- package/dist/transport/agent-server.js +23 -11
- package/dist/transport/agent-server.js.map +1 -1
- package/dist/transport/http-server.d.ts +2 -0
- package/dist/transport/http-server.d.ts.map +1 -1
- package/dist/transport/http-server.js +10 -6
- package/dist/transport/http-server.js.map +1 -1
- package/dist/transport/sse-server.d.ts +2 -0
- package/dist/transport/sse-server.d.ts.map +1 -1
- package/dist/transport/sse-server.js +10 -6
- package/dist/transport/sse-server.js.map +1 -1
- package/dist/transport/stdio-server.d.ts.map +1 -1
- package/dist/transport/stdio-server.js +4 -0
- package/dist/transport/stdio-server.js.map +1 -1
- package/dist/util/id.d.ts +1 -1
- package/dist/util/id.d.ts.map +1 -1
- package/dist/util/id.js +3 -3
- package/dist/util/id.js.map +1 -1
- package/examples/claude-code-setup.md +0 -2
- package/examples/docker-compose.yaml +4 -3
- package/examples/docker-gateway.yaml +8 -3
- package/examples/gateway.yaml +8 -5
- package/examples/profiles.yaml +4 -4
- package/extensions/openclaw/index.ts +9 -6
- package/extensions/openclaw/openclaw.plugin.json +5 -5
- package/package.json +3 -1
- package/schema.json +658 -8
|
@@ -0,0 +1,321 @@
|
|
|
1
|
+
import { createSign } from 'crypto';
|
|
2
|
+
import { readFileSync } from 'fs';
|
|
3
|
+
import { connect, constants } from 'http2';
|
|
4
|
+
const JWT_TTL_MS = 50 * 60 * 1000;
|
|
5
|
+
export class ApnsClient {
|
|
6
|
+
config;
|
|
7
|
+
privateKey;
|
|
8
|
+
cachedJwt;
|
|
9
|
+
constructor(config) {
|
|
10
|
+
this.config = config;
|
|
11
|
+
this.privateKey = readFileSync(config.keyPath, 'utf8');
|
|
12
|
+
}
|
|
13
|
+
async sendApproval(deviceToken, approval) {
|
|
14
|
+
const authority = this.config.production
|
|
15
|
+
? 'https://api.push.apple.com'
|
|
16
|
+
: 'https://api.sandbox.push.apple.com';
|
|
17
|
+
const session = connect(authority);
|
|
18
|
+
try {
|
|
19
|
+
return await this.sendWithSession(session, deviceToken, approval);
|
|
20
|
+
}
|
|
21
|
+
finally {
|
|
22
|
+
session.close();
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
async sendBadge(deviceToken, badgeCount) {
|
|
26
|
+
const authority = this.config.production
|
|
27
|
+
? 'https://api.push.apple.com'
|
|
28
|
+
: 'https://api.sandbox.push.apple.com';
|
|
29
|
+
const session = connect(authority);
|
|
30
|
+
try {
|
|
31
|
+
return await this.sendBadgeWithSession(session, deviceToken, badgeCount);
|
|
32
|
+
}
|
|
33
|
+
finally {
|
|
34
|
+
session.close();
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
async sendApprovalStatus(deviceToken, status) {
|
|
38
|
+
const authority = this.config.production
|
|
39
|
+
? 'https://api.push.apple.com'
|
|
40
|
+
: 'https://api.sandbox.push.apple.com';
|
|
41
|
+
const session = connect(authority);
|
|
42
|
+
try {
|
|
43
|
+
return await this.sendApprovalStatusWithSession(session, deviceToken, status);
|
|
44
|
+
}
|
|
45
|
+
finally {
|
|
46
|
+
session.close();
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
async sendActivity(deviceToken, activity) {
|
|
50
|
+
const authority = this.config.production
|
|
51
|
+
? 'https://api.push.apple.com'
|
|
52
|
+
: 'https://api.sandbox.push.apple.com';
|
|
53
|
+
const session = connect(authority);
|
|
54
|
+
try {
|
|
55
|
+
return await this.sendActivityWithSession(session, deviceToken, activity);
|
|
56
|
+
}
|
|
57
|
+
finally {
|
|
58
|
+
session.close();
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
sendWithSession(session, deviceToken, approval) {
|
|
62
|
+
return new Promise((resolve, reject) => {
|
|
63
|
+
const badgeCount = normalizeBadgeCount(approval.badgeCount);
|
|
64
|
+
const payload = JSON.stringify({
|
|
65
|
+
aps: {
|
|
66
|
+
alert: {
|
|
67
|
+
title: approvalAlertTitle(approval),
|
|
68
|
+
body: approval.body,
|
|
69
|
+
},
|
|
70
|
+
category: 'AIRLOCK_APPROVAL',
|
|
71
|
+
sound: 'default',
|
|
72
|
+
'thread-id': 'airlock-approvals',
|
|
73
|
+
'summary-arg': approval.tool,
|
|
74
|
+
...(badgeCount !== undefined ? { badge: badgeCount } : {}),
|
|
75
|
+
...(this.config.interruptionLevel
|
|
76
|
+
? { 'interruption-level': this.config.interruptionLevel }
|
|
77
|
+
: {}),
|
|
78
|
+
},
|
|
79
|
+
approval_id: approval.id,
|
|
80
|
+
code: approval.code,
|
|
81
|
+
tool: approval.tool,
|
|
82
|
+
agent_id: approval.agentId,
|
|
83
|
+
...(approval.context ? { airlock: { approval: approval.context } } : {}),
|
|
84
|
+
});
|
|
85
|
+
const request = session.request({
|
|
86
|
+
[constants.HTTP2_HEADER_METHOD]: 'POST',
|
|
87
|
+
[constants.HTTP2_HEADER_PATH]: `/3/device/${deviceToken}`,
|
|
88
|
+
authorization: `bearer ${this.jwt()}`,
|
|
89
|
+
'apns-topic': this.config.bundleId,
|
|
90
|
+
'apns-push-type': 'alert',
|
|
91
|
+
'apns-priority': '10',
|
|
92
|
+
'apns-collapse-id': approval.id,
|
|
93
|
+
'apns-expiration': String(approval.timeoutMs > 0 ? Math.floor((Date.now() + approval.timeoutMs) / 1000) : 0),
|
|
94
|
+
});
|
|
95
|
+
let status = 0;
|
|
96
|
+
let responseBody = '';
|
|
97
|
+
request.setEncoding('utf8');
|
|
98
|
+
request.on('response', (headers) => {
|
|
99
|
+
const rawStatus = headers[constants.HTTP2_HEADER_STATUS];
|
|
100
|
+
status = typeof rawStatus === 'number' ? rawStatus : Number(rawStatus ?? 0);
|
|
101
|
+
});
|
|
102
|
+
request.on('data', (chunk) => {
|
|
103
|
+
responseBody += chunk;
|
|
104
|
+
});
|
|
105
|
+
request.on('error', reject);
|
|
106
|
+
request.on('end', () => {
|
|
107
|
+
if (status >= 200 && status < 300) {
|
|
108
|
+
resolve({ ok: true, status });
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
let reason;
|
|
112
|
+
try {
|
|
113
|
+
const parsed = JSON.parse(responseBody);
|
|
114
|
+
reason = parsed.reason;
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
reason = responseBody || undefined;
|
|
118
|
+
}
|
|
119
|
+
resolve({ ok: false, status, ...(reason ? { reason } : {}) });
|
|
120
|
+
});
|
|
121
|
+
request.end(payload);
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
sendActivityWithSession(session, deviceToken, activity) {
|
|
125
|
+
return new Promise((resolve, reject) => {
|
|
126
|
+
const payload = JSON.stringify({
|
|
127
|
+
aps: {
|
|
128
|
+
alert: {
|
|
129
|
+
title: activity.title || 'Airlock notification',
|
|
130
|
+
body: activity.body || '',
|
|
131
|
+
},
|
|
132
|
+
category: 'AIRLOCK_ACTIVITY',
|
|
133
|
+
sound: 'default',
|
|
134
|
+
'thread-id': 'airlock-activity',
|
|
135
|
+
'summary-arg': activity.agentId || 'Airlock',
|
|
136
|
+
...(this.config.interruptionLevel
|
|
137
|
+
? { 'interruption-level': this.config.interruptionLevel }
|
|
138
|
+
: {}),
|
|
139
|
+
},
|
|
140
|
+
event: 'activity',
|
|
141
|
+
activity_id: activity.id,
|
|
142
|
+
kind: activity.kind,
|
|
143
|
+
agent_id: activity.agentId,
|
|
144
|
+
severity: activity.severity,
|
|
145
|
+
created_at: activity.createdAt,
|
|
146
|
+
});
|
|
147
|
+
const request = session.request({
|
|
148
|
+
[constants.HTTP2_HEADER_METHOD]: 'POST',
|
|
149
|
+
[constants.HTTP2_HEADER_PATH]: `/3/device/${deviceToken}`,
|
|
150
|
+
authorization: `bearer ${this.jwt()}`,
|
|
151
|
+
'apns-topic': this.config.bundleId,
|
|
152
|
+
'apns-push-type': 'alert',
|
|
153
|
+
'apns-priority': '10',
|
|
154
|
+
'apns-collapse-id': activity.id,
|
|
155
|
+
'apns-expiration': '0',
|
|
156
|
+
});
|
|
157
|
+
let status = 0;
|
|
158
|
+
let responseBody = '';
|
|
159
|
+
request.setEncoding('utf8');
|
|
160
|
+
request.on('response', (headers) => {
|
|
161
|
+
const rawStatus = headers[constants.HTTP2_HEADER_STATUS];
|
|
162
|
+
status = typeof rawStatus === 'number' ? rawStatus : Number(rawStatus ?? 0);
|
|
163
|
+
});
|
|
164
|
+
request.on('data', (chunk) => {
|
|
165
|
+
responseBody += chunk;
|
|
166
|
+
});
|
|
167
|
+
request.on('error', reject);
|
|
168
|
+
request.on('end', () => {
|
|
169
|
+
if (status >= 200 && status < 300) {
|
|
170
|
+
resolve({ ok: true, status });
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
let reason;
|
|
174
|
+
try {
|
|
175
|
+
const parsed = JSON.parse(responseBody);
|
|
176
|
+
reason = parsed.reason;
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
reason = responseBody || undefined;
|
|
180
|
+
}
|
|
181
|
+
resolve({ ok: false, status, ...(reason ? { reason } : {}) });
|
|
182
|
+
});
|
|
183
|
+
request.end(payload);
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
sendBadgeWithSession(session, deviceToken, badgeCount) {
|
|
187
|
+
return new Promise((resolve, reject) => {
|
|
188
|
+
const payload = JSON.stringify({
|
|
189
|
+
aps: {
|
|
190
|
+
badge: normalizeBadgeCount(badgeCount) ?? 0,
|
|
191
|
+
},
|
|
192
|
+
});
|
|
193
|
+
const request = session.request({
|
|
194
|
+
[constants.HTTP2_HEADER_METHOD]: 'POST',
|
|
195
|
+
[constants.HTTP2_HEADER_PATH]: `/3/device/${deviceToken}`,
|
|
196
|
+
authorization: `bearer ${this.jwt()}`,
|
|
197
|
+
'apns-topic': this.config.bundleId,
|
|
198
|
+
'apns-push-type': 'alert',
|
|
199
|
+
'apns-priority': '10',
|
|
200
|
+
'apns-expiration': '0',
|
|
201
|
+
});
|
|
202
|
+
let status = 0;
|
|
203
|
+
let responseBody = '';
|
|
204
|
+
request.setEncoding('utf8');
|
|
205
|
+
request.on('response', (headers) => {
|
|
206
|
+
const rawStatus = headers[constants.HTTP2_HEADER_STATUS];
|
|
207
|
+
status = typeof rawStatus === 'number' ? rawStatus : Number(rawStatus ?? 0);
|
|
208
|
+
});
|
|
209
|
+
request.on('data', (chunk) => {
|
|
210
|
+
responseBody += chunk;
|
|
211
|
+
});
|
|
212
|
+
request.on('error', reject);
|
|
213
|
+
request.on('end', () => {
|
|
214
|
+
if (status >= 200 && status < 300) {
|
|
215
|
+
resolve({ ok: true, status });
|
|
216
|
+
return;
|
|
217
|
+
}
|
|
218
|
+
let reason;
|
|
219
|
+
try {
|
|
220
|
+
const parsed = JSON.parse(responseBody);
|
|
221
|
+
reason = parsed.reason;
|
|
222
|
+
}
|
|
223
|
+
catch {
|
|
224
|
+
reason = responseBody || undefined;
|
|
225
|
+
}
|
|
226
|
+
resolve({ ok: false, status, ...(reason ? { reason } : {}) });
|
|
227
|
+
});
|
|
228
|
+
request.end(payload);
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
sendApprovalStatusWithSession(session, deviceToken, status) {
|
|
232
|
+
return new Promise((resolve, reject) => {
|
|
233
|
+
const payload = JSON.stringify({
|
|
234
|
+
aps: {
|
|
235
|
+
'content-available': 1,
|
|
236
|
+
badge: normalizeBadgeCount(status.badgeCount) ?? 0,
|
|
237
|
+
},
|
|
238
|
+
event: 'approval_resolved',
|
|
239
|
+
approval_id: status.id,
|
|
240
|
+
code: status.code,
|
|
241
|
+
result: status.result,
|
|
242
|
+
});
|
|
243
|
+
const request = session.request({
|
|
244
|
+
[constants.HTTP2_HEADER_METHOD]: 'POST',
|
|
245
|
+
[constants.HTTP2_HEADER_PATH]: `/3/device/${deviceToken}`,
|
|
246
|
+
authorization: `bearer ${this.jwt()}`,
|
|
247
|
+
'apns-topic': this.config.bundleId,
|
|
248
|
+
'apns-push-type': 'background',
|
|
249
|
+
'apns-priority': '5',
|
|
250
|
+
'apns-collapse-id': `resolved-${status.id}`,
|
|
251
|
+
'apns-expiration': '0',
|
|
252
|
+
});
|
|
253
|
+
let responseStatus = 0;
|
|
254
|
+
let responseBody = '';
|
|
255
|
+
request.setEncoding('utf8');
|
|
256
|
+
request.on('response', (headers) => {
|
|
257
|
+
const rawStatus = headers[constants.HTTP2_HEADER_STATUS];
|
|
258
|
+
responseStatus = typeof rawStatus === 'number' ? rawStatus : Number(rawStatus ?? 0);
|
|
259
|
+
});
|
|
260
|
+
request.on('data', (chunk) => {
|
|
261
|
+
responseBody += chunk;
|
|
262
|
+
});
|
|
263
|
+
request.on('error', reject);
|
|
264
|
+
request.on('end', () => {
|
|
265
|
+
if (responseStatus >= 200 && responseStatus < 300) {
|
|
266
|
+
resolve({ ok: true, status: responseStatus });
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
let reason;
|
|
270
|
+
try {
|
|
271
|
+
const parsed = JSON.parse(responseBody);
|
|
272
|
+
reason = parsed.reason;
|
|
273
|
+
}
|
|
274
|
+
catch {
|
|
275
|
+
reason = responseBody || undefined;
|
|
276
|
+
}
|
|
277
|
+
resolve({ ok: false, status: responseStatus, ...(reason ? { reason } : {}) });
|
|
278
|
+
});
|
|
279
|
+
request.end(payload);
|
|
280
|
+
});
|
|
281
|
+
}
|
|
282
|
+
jwt() {
|
|
283
|
+
const now = Date.now();
|
|
284
|
+
if (this.cachedJwt && now - this.cachedJwt.createdAt < JWT_TTL_MS) {
|
|
285
|
+
return this.cachedJwt.token;
|
|
286
|
+
}
|
|
287
|
+
const header = base64UrlJson({ alg: 'ES256', kid: this.config.keyId });
|
|
288
|
+
const claims = base64UrlJson({
|
|
289
|
+
iss: this.config.teamId,
|
|
290
|
+
iat: Math.floor(now / 1000),
|
|
291
|
+
});
|
|
292
|
+
const signingInput = `${header}.${claims}`;
|
|
293
|
+
const signer = createSign('SHA256');
|
|
294
|
+
signer.update(signingInput);
|
|
295
|
+
signer.end();
|
|
296
|
+
const signature = signer
|
|
297
|
+
.sign({ key: this.privateKey, dsaEncoding: 'ieee-p1363' })
|
|
298
|
+
.toString('base64url');
|
|
299
|
+
const token = `${signingInput}.${signature}`;
|
|
300
|
+
this.cachedJwt = { token, createdAt: now };
|
|
301
|
+
return token;
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
function base64UrlJson(value) {
|
|
305
|
+
return Buffer.from(JSON.stringify(value)).toString('base64url');
|
|
306
|
+
}
|
|
307
|
+
function normalizeBadgeCount(value) {
|
|
308
|
+
if (value === undefined || !Number.isFinite(value))
|
|
309
|
+
return undefined;
|
|
310
|
+
return Math.max(0, Math.floor(value));
|
|
311
|
+
}
|
|
312
|
+
function approvalAlertTitle(approval) {
|
|
313
|
+
if (approval.tool === 'airlock/ask_user') {
|
|
314
|
+
const question = approval.context?.args.find((arg) => ['question', 'title', 'message'].includes(arg.key))?.value;
|
|
315
|
+
const trimmed = question?.trim();
|
|
316
|
+
if (trimmed)
|
|
317
|
+
return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;
|
|
318
|
+
}
|
|
319
|
+
return `${approval.agentId}: ${approval.tool}`;
|
|
320
|
+
}
|
|
321
|
+
//# sourceMappingURL=apns.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apns.js","sourceRoot":"","sources":["../../src/mobile/apns.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
2
|
+
type McpRequestMeta = Record<string, unknown>;
|
|
2
3
|
export declare class HttpMcpClient {
|
|
3
4
|
private id;
|
|
4
5
|
private url;
|
|
@@ -26,7 +27,7 @@ export declare class HttpMcpClient {
|
|
|
26
27
|
*/
|
|
27
28
|
private runOAuthFlow;
|
|
28
29
|
listTools(): Promise<Tool[]>;
|
|
29
|
-
callTool(name: string, args: Record<string, unknown
|
|
30
|
+
callTool(name: string, args: Record<string, unknown>, requestMeta?: McpRequestMeta): Promise<unknown>;
|
|
30
31
|
getServerInfo(): {
|
|
31
32
|
name: string;
|
|
32
33
|
version: string;
|
|
@@ -36,4 +37,5 @@ export declare class HttpMcpClient {
|
|
|
36
37
|
private withSessionRetry;
|
|
37
38
|
stop(): Promise<void>;
|
|
38
39
|
}
|
|
40
|
+
export {};
|
|
39
41
|
//# sourceMappingURL=http-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/pool/http-client.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/pool/http-client.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAO/D,KAAK,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AA8B9C,qBAAa,aAAa;IAatB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,gBAAgB,CAAC;IAnB3B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,aAAa,CAAC,CAAoB;IAC1C,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,cAAc,CAAyB;IAE/C,OAAO,CAAC,YAAY,CAAS;gBAGnB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAA,EAChC,KAAK,UAAQ,EACb,iBAAiB,SAAQ,EACzB,QAAQ,CAAC,EAAE,MAAM,YAAA,EACjB,YAAY,CAAC,EAAE,MAAM,YAAA,EACrB,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAanC,OAAO,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IAIvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6E9B;;;OAGG;YACW,YAAY;IAcpB,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAQ5B,QAAQ,CACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,CAAC,EAAE,cAAc,GAC3B,OAAO,CAAC,OAAO,CAAC;IAUnB,aAAa,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAI9D,OAAO,IAAI,OAAO;IAIlB,OAAO,CAAC,WAAW;YAML,gBAAgB;IAsBxB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAS5B"}
|
package/dist/pool/http-client.js
CHANGED
|
@@ -147,11 +147,14 @@ export class HttpMcpClient {
|
|
|
147
147
|
return result.tools;
|
|
148
148
|
});
|
|
149
149
|
}
|
|
150
|
-
async callTool(name, args) {
|
|
150
|
+
async callTool(name, args, requestMeta) {
|
|
151
151
|
return this.withSessionRetry('callTool', async () => {
|
|
152
152
|
if (!this.client || !this.ready)
|
|
153
153
|
throw new Error(`MCP ${this.id} not connected`);
|
|
154
|
-
|
|
154
|
+
const request = requestMeta
|
|
155
|
+
? { name, arguments: args, _meta: requestMeta }
|
|
156
|
+
: { name, arguments: args };
|
|
157
|
+
return this.client.callTool(request);
|
|
155
158
|
});
|
|
156
159
|
}
|
|
157
160
|
getServerInfo() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/pool/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAE7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,GAAG,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/pool/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAE7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,GAAG,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;AAIvC,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAC7D,MAAM,sBAAsB,GAAG,aAAa,CAAC,MAAM,CAAC;AAEpD,sEAAsE;AACtE,SAAS,aAAa,CAAC,GAAY;IACjC,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7D,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,OAAO,yBAAyB,IAAI,IAAI,cAAc,EAAE,CAAC;IAC3D,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,GAAG,EAAE,WAAW,EAAE,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACxF,OAAO,kDAAkD,CAAC;IAC5D,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;QAAE,OAAO,oBAAoB,CAAC;IAC9D,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAY;IACzC,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACrC,OAAO,CACL,UAAU,CAAC,QAAQ,CAAC,8BAA8B,CAAC;QACnD,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC;QACzC,UAAU,CAAC,QAAQ,CAAC,+BAA+B,CAAC;QACpD,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CACzC,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,aAAa;IAad;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAnBF,MAAM,CAAU;IAChB,SAAS,CAAiC;IAC1C,aAAa,CAAqB;IAClC,gBAAgB,GAAG,CAAC,CAAC;IACrB,OAAO,GAAG,KAAK,CAAC;IAChB,KAAK,GAAG,KAAK,CAAC;IACd,cAAc,CAAkB;IAChC,cAAc,GAAG,IAAI,GAAG,EAAc,CAAC;IAEvC,YAAY,GAAG,KAAK,CAAC;IAE7B,YACU,EAAU,EACV,GAAW,EACX,OAAgC,EAChC,QAAQ,KAAK,EACb,oBAAoB,KAAK,EACzB,QAAiB,EACjB,YAAqB,EACrB,gBAAyB;QAPzB,OAAE,GAAF,EAAE,CAAQ;QACV,QAAG,GAAH,GAAG,CAAQ;QACX,YAAO,GAAP,OAAO,CAAyB;QAChC,UAAK,GAAL,KAAK,CAAQ;QACb,sBAAiB,GAAjB,iBAAiB,CAAQ;QACzB,aAAQ,GAAR,QAAQ,CAAS;QACjB,iBAAY,GAAZ,YAAY,CAAS;QACrB,qBAAgB,GAAhB,gBAAgB,CAAS;QAEjC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,aAAa,GAAG,IAAI,iBAAiB,CACxC,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,CAAC,EAAc;QACpB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,gFAAgF;QAChF,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,2CAA2C,CAAC,CAAC;YACxE,OAAO;QACT,CAAC;QAED,4EAA4E;QAC5E,8EAA8E;QAC9E,gFAAgF;QAChF,+EAA+E;QAC/E,0EAA0E;QAC1E,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAClC,CAAC;QAED,MAAM,aAAa,GAAmE,EAAE,CAAC;QAEzF,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,aAAa,CAAC,WAAW,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QACxD,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,6BAA6B,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,CAAC;QAErF,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,GAAG,EAAE;YAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACxC,IAAI,IAAI,CAAC,gBAAgB,IAAI,sBAAsB,EAAE,CAAC;oBACpD,GAAG,CAAC,KAAK,CACP,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EACf,iDAAiD,EACjD,sBAAsB,CACvB,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvF,GAAG,CAAC,IAAI,CACN,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,EACtD,qCAAqC,CACtC,CAAC;gBACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;oBACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;oBAChC,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAChC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,2BAA2B,CAAC,CACpF,CAAC;gBACJ,CAAC,EAAE,KAAK,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,2BAA2B,CAAC,CAAC;YACtE,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,iBAAiB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC3D,kEAAkE;gBAClE,mEAAmE;gBACnE,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1C,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,EAAE,mBAAmB,CAAC,CACjF,CAAC;gBACF,OAAO;YACT,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,yBAAyB,CAAC,CAAC;YAClF,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,wDAAwD,CAAC,CAAC;YACpF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAc,CAAC,eAAe,EAAE,CAAC;YACzD,MAAM,IAAI,CAAC,SAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,mEAAmE;QACnE,oEAAoE;QACpE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;YACnD,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;YACjF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC7C,OAAO,MAAM,CAAC,KAAK,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,IAA6B,EAC7B,WAA4B;QAE5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YAClD,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;YACjF,MAAM,OAAO,GAAG,WAAW;gBACzB,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE;gBAC/C,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IACzC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,WAAW;QACjB,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACrC,EAAE,EAAE,CAAC;QACP,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAI,SAAiB,EAAE,EAAoB;QACvE,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC;gBAAE,MAAM,GAAG,CAAC;YAC3C,GAAG,CAAC,IAAI,CACN,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,EACtD,wCAAwC,CACzC,CAAC;YACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;YACpC,IAAI,YAAY;gBAAE,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;YACnD,MAAM,YAAY;gBAChB,EAAE,KAAK,EAAE;iBACR,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAClB,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,EAAE,uBAAuB,CAAC,CACrF,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO,EAAE,EAAE,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,kBAAkB,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;CACF"}
|
|
@@ -15,6 +15,7 @@ export declare class FileOAuthProvider implements OAuthClientProvider {
|
|
|
15
15
|
private callbackServer?;
|
|
16
16
|
private authCodeResolve?;
|
|
17
17
|
private browserOpenedAt;
|
|
18
|
+
private expectedState?;
|
|
18
19
|
constructor(serverId: string, callbackPort: number, preregisteredClientId?: string | undefined, preregisteredClientSecret?: string | undefined, relayCallbackUrl?: string | undefined);
|
|
19
20
|
get redirectUrl(): string;
|
|
20
21
|
get clientMetadata(): OAuthClientMetadata;
|
|
@@ -32,6 +33,7 @@ export declare class FileOAuthProvider implements OAuthClientProvider {
|
|
|
32
33
|
*/
|
|
33
34
|
waitForAuthCode(): Promise<string>;
|
|
34
35
|
stopCallbackServer(): void;
|
|
36
|
+
private isExpectedState;
|
|
35
37
|
private load;
|
|
36
38
|
private save;
|
|
37
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/pool/oauth-provider.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,WAAW,EACZ,MAAM,0CAA0C,CAAC;AAWlD;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;
|
|
1
|
+
{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/pool/oauth-provider.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,WAAW,EACZ,MAAM,0CAA0C,CAAC;AAWlD;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IASzD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB,CAAC;IAC9B,OAAO,CAAC,yBAAyB,CAAC;IAClC,OAAO,CAAC,gBAAgB,CAAC;IAZ3B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,eAAe,CAAC,CAAyB;IACjD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,aAAa,CAAC,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,qBAAqB,CAAC,EAAE,MAAM,YAAA,EAC9B,yBAAyB,CAAC,EAAE,MAAM,YAAA,EAClC,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAOnC,IAAI,WAAW,IAAI,MAAM,CAKxB;IAED,IAAI,cAAc,IAAI,mBAAmB,CAQxC;IAEK,iBAAiB,IAAI,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IA8BpE,qBAAqB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtE,MAAM,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAK1C,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnE,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB1C,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAKrC;;;OAGG;IACH,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IA0DlC,kBAAkB,IAAI,IAAI;IAK1B,OAAO,CAAC,eAAe;YAMT,IAAI;YASJ,IAAI;CAOnB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { readFile, writeFile, mkdir } from 'fs/promises';
|
|
1
|
+
import { chmod, readFile, writeFile, mkdir } from 'fs/promises';
|
|
2
2
|
import { join } from 'path';
|
|
3
3
|
import { execFile } from 'child_process';
|
|
4
4
|
import { createServer } from 'http';
|
|
@@ -19,6 +19,7 @@ export class FileOAuthProvider {
|
|
|
19
19
|
callbackServer;
|
|
20
20
|
authCodeResolve;
|
|
21
21
|
browserOpenedAt = 0;
|
|
22
|
+
expectedState;
|
|
22
23
|
constructor(serverId, callbackPort, preregisteredClientId, preregisteredClientSecret, relayCallbackUrl) {
|
|
23
24
|
this.serverId = serverId;
|
|
24
25
|
this.callbackPort = callbackPort;
|
|
@@ -101,8 +102,9 @@ export class FileOAuthProvider {
|
|
|
101
102
|
this.browserOpenedAt = now;
|
|
102
103
|
// When using an HTTPS relay, wrap the state parameter with the local port
|
|
103
104
|
// so the relay can redirect back to localhost after the OAuth provider responds.
|
|
105
|
+
const originalState = url.searchParams.get('state') ?? '';
|
|
106
|
+
this.expectedState = originalState;
|
|
104
107
|
if (this.relayCallbackUrl) {
|
|
105
|
-
const originalState = url.searchParams.get('state') ?? '';
|
|
106
108
|
url.searchParams.set('state', `${this.callbackPort}.${originalState}`);
|
|
107
109
|
}
|
|
108
110
|
log.info({ serverId: this.serverId, url: url.toString() }, 'Opening browser for OAuth authorization');
|
|
@@ -134,6 +136,7 @@ export class FileOAuthProvider {
|
|
|
134
136
|
}
|
|
135
137
|
const code = url.searchParams.get('code');
|
|
136
138
|
const error = url.searchParams.get('error');
|
|
139
|
+
const state = url.searchParams.get('state');
|
|
137
140
|
if (error) {
|
|
138
141
|
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
139
142
|
res.end('<html><body><h2>Authorization failed</h2><p>You can close this tab.</p></body></html>');
|
|
@@ -142,6 +145,13 @@ export class FileOAuthProvider {
|
|
|
142
145
|
return;
|
|
143
146
|
}
|
|
144
147
|
if (code) {
|
|
148
|
+
if (!this.isExpectedState(state)) {
|
|
149
|
+
res.writeHead(400, { 'Content-Type': 'text/html' });
|
|
150
|
+
res.end('<html><body><h2>Authorization failed</h2><p>OAuth state mismatch.</p></body></html>');
|
|
151
|
+
this.stopCallbackServer();
|
|
152
|
+
reject(new Error('OAuth state mismatch'));
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
145
155
|
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
146
156
|
res.end('<html><body><h2>Authorized!</h2><p>You can close this tab.</p></body></html>');
|
|
147
157
|
this.stopCallbackServer();
|
|
@@ -164,6 +174,13 @@ export class FileOAuthProvider {
|
|
|
164
174
|
this.callbackServer?.close();
|
|
165
175
|
this.callbackServer = undefined;
|
|
166
176
|
}
|
|
177
|
+
isExpectedState(state) {
|
|
178
|
+
if (this.expectedState === undefined)
|
|
179
|
+
return true;
|
|
180
|
+
if (state === this.expectedState)
|
|
181
|
+
return true;
|
|
182
|
+
return this.relayCallbackUrl !== undefined && state === `${this.callbackPort}.${this.expectedState}`;
|
|
183
|
+
}
|
|
167
184
|
async load() {
|
|
168
185
|
try {
|
|
169
186
|
const data = await readFile(this.storePath, 'utf-8');
|
|
@@ -175,8 +192,10 @@ export class FileOAuthProvider {
|
|
|
175
192
|
}
|
|
176
193
|
async save() {
|
|
177
194
|
const dir = join(this.storePath, '..');
|
|
178
|
-
await mkdir(dir, { recursive: true });
|
|
179
|
-
await
|
|
195
|
+
await mkdir(dir, { recursive: true, mode: 0o700 });
|
|
196
|
+
await chmod(dir, 0o700).catch(() => { });
|
|
197
|
+
await writeFile(this.storePath, JSON.stringify(this.data, null, 2), { mode: 0o600 });
|
|
198
|
+
await chmod(this.storePath, 0o600).catch(() => { });
|
|
180
199
|
}
|
|
181
200
|
}
|
|
182
201
|
//# sourceMappingURL=oauth-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../src/pool/oauth-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../src/pool/oauth-provider.ts"],"names":[],"mappings":"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"}
|
package/dist/pool/pool.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { McpServerConfig } from '../config/schema.js';
|
|
2
2
|
import type { Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
3
|
+
type McpRequestMeta = Record<string, unknown>;
|
|
3
4
|
export type HealthStatus = 'ok' | 'degraded' | 'down';
|
|
4
5
|
interface ClientPoolOptions {
|
|
5
6
|
stdioStderr?: 'inherit' | 'ignore' | 'pipe';
|
|
@@ -21,7 +22,7 @@ export declare class ClientPool {
|
|
|
21
22
|
private createClient;
|
|
22
23
|
listTools(mcpId: string): Promise<Tool[]>;
|
|
23
24
|
isReady(mcpId: string): boolean;
|
|
24
|
-
callTool(mcpId: string, toolName: string, args: Record<string, unknown
|
|
25
|
+
callTool(mcpId: string, toolName: string, args: Record<string, unknown>, requestMeta?: McpRequestMeta): Promise<unknown>;
|
|
25
26
|
reload(newMcps: Record<string, McpServerConfig>): Promise<void>;
|
|
26
27
|
healthCheck(): Record<string, HealthStatus>;
|
|
27
28
|
getServerInfo(mcpId: string): {
|
package/dist/pool/pool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/pool/pool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAM/D,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAEtD,UAAU,iBAAiB;IACzB,WAAW,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,qBAAa,UAAU;IAMnB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO,CAAC;IANlB,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,WAAW,CAAC,CAAiB;IACrC,OAAO,CAAC,cAAc,CAAC,CAAuB;gBAGpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACrC,OAAO,CAAC,EAAE,iBAAiB,YAAA;IAGrC,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAIvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAMnB,aAAa;IAmB3B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,YAAY;IAoBd,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAM/C,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIzB,QAAQ,
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/pool/pool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAM/D,KAAK,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC9C,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAEtD,UAAU,iBAAiB;IACzB,WAAW,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,qBAAa,UAAU;IAMnB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO,CAAC;IANlB,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,WAAW,CAAC,CAAiB;IACrC,OAAO,CAAC,cAAc,CAAC,CAAuB;gBAGpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACrC,OAAO,CAAC,EAAE,iBAAiB,YAAA;IAGrC,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAIvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAMnB,aAAa;IAmB3B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,YAAY;IAoBd,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAM/C,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIzB,QAAQ,CACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,CAAC,EAAE,cAAc,GAC3B,OAAO,CAAC,OAAO,CAAC;IAOb,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAQ3C,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAI3E,SAAS,IAAI,MAAM,EAAE;IAIrB,OAAO,CAAC,gBAAgB;IAYxB,oEAAoE;IACpE,gBAAgB,IAAI,IAAI;IAQlB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,qEAAqE;IACrE,SAAS,IAAI,IAAI;CAOlB"}
|
package/dist/pool/pool.js
CHANGED
|
@@ -67,13 +67,13 @@ export class ClientPool {
|
|
|
67
67
|
isReady(mcpId) {
|
|
68
68
|
return this.clients.get(mcpId)?.isReady() ?? false;
|
|
69
69
|
}
|
|
70
|
-
async callTool(mcpId, toolName, args) {
|
|
70
|
+
async callTool(mcpId, toolName, args, requestMeta) {
|
|
71
71
|
const client = this.clients.get(mcpId);
|
|
72
72
|
if (!client)
|
|
73
73
|
throw new Error(`Unknown MCP: ${mcpId}`);
|
|
74
74
|
if (!client.isReady())
|
|
75
75
|
throw new Error(`MCP ${mcpId} is not connected`);
|
|
76
|
-
return client.callTool(toolName, args);
|
|
76
|
+
return client.callTool(toolName, args, requestMeta);
|
|
77
77
|
}
|
|
78
78
|
async reload(newMcps) {
|
|
79
79
|
const oldIds = new Set(this.clients.keys());
|
package/dist/pool/pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/pool/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/pool/pool.ts"],"names":[],"mappings":"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"}
|