@0xmaxma/claude-gateway 1.8.0 → 1.8.2
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/agent/model-catalog.d.ts +2 -2
- package/dist/agent/model-catalog.d.ts.map +1 -1
- package/dist/agent/model-catalog.js +74 -34
- package/dist/agent/model-catalog.js.map +1 -1
- package/dist/agent/runner.d.ts.map +1 -1
- package/dist/agent/runner.js +26 -8
- package/dist/agent/runner.js.map +1 -1
- package/dist/cli/command-names.d.ts +69 -12
- package/dist/cli/command-names.d.ts.map +1 -1
- package/dist/cli/command-names.js +125 -4
- package/dist/cli/command-names.js.map +1 -1
- package/dist/cron/manager.d.ts +2 -0
- package/dist/cron/manager.d.ts.map +1 -1
- package/dist/cron/manager.js +63 -28
- package/dist/cron/manager.js.map +1 -1
- package/dist/entry.js +1 -3
- package/dist/entry.js.map +1 -1
- package/dist/index.js +1 -3
- package/dist/index.js.map +1 -1
- package/dist/session/process.d.ts +14 -5
- package/dist/session/process.d.ts.map +1 -1
- package/dist/session/process.js +155 -26
- package/dist/session/process.js.map +1 -1
- package/mcp/tools/cron/module.ts +4 -4
- package/mcp/tools/telegram/module.ts +29 -6
- package/mcp/tools/telegram/receiver-server.ts +146 -25
- package/mcp/tools/telegram/typing.ts +1 -1
- package/package.json +1 -1
|
@@ -20,7 +20,7 @@ import type { ModelConfig } from '../types';
|
|
|
20
20
|
export declare const DEFAULT_CONTEXT_WINDOW = 200000;
|
|
21
21
|
/** Reset module state. Tests only — each case needs a clean cache. */
|
|
22
22
|
export declare function resetModelCatalogCache(): void;
|
|
23
|
-
/** Tests only — the settings file is read once per
|
|
23
|
+
/** Tests only — the settings file is otherwise re-read at most once per {@link CATALOG_TTL_MS}. */
|
|
24
24
|
export declare function resetSettingsEnvCache(): void;
|
|
25
25
|
/**
|
|
26
26
|
* Where to fetch the catalog from. `MODELS_BASE_URL` lets a deployment point
|
|
@@ -28,7 +28,7 @@ export declare function resetSettingsEnvCache(): void;
|
|
|
28
28
|
* the same `ANTHROPIC_BASE_URL` the session process already uses. Empty means
|
|
29
29
|
* "not configured", which is the signal to stay on the static list.
|
|
30
30
|
*/
|
|
31
|
-
export declare function catalogBaseUrl(): string;
|
|
31
|
+
export declare function catalogBaseUrl(now?: number): string;
|
|
32
32
|
/**
|
|
33
33
|
* https is required for a public catalog host — the bearer token rides every
|
|
34
34
|
* call. http is tolerated only for a local/internal hop, where cleartext never
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../../src/agent/model-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AA4B5C,mFAAmF;AACnF,eAAO,MAAM,sBAAsB,SAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../../src/agent/model-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AA4B5C,mFAAmF;AACnF,eAAO,MAAM,sBAAsB,SAAU,CAAC;AAc9C,sEAAsE;AACtE,wBAAgB,sBAAsB,IAAI,IAAI,CAK7C;AA+BD,mGAAmG;AACnG,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAmB,GAAG,MAAM,CAM/D;AAWD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CA0BpD;AAID;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GAAG,IAAI,CAkE9F;AAID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,WAAW,EAAE,EACvB,GAAG,GAAE,MAAmB,GACvB,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAqD/B"}
|
|
@@ -57,20 +57,31 @@ exports.DEFAULT_CONTEXT_WINDOW = 200000;
|
|
|
57
57
|
let cache = null;
|
|
58
58
|
/** In-flight fetch, so N concurrent callers make one request, not N. */
|
|
59
59
|
let inFlight = null;
|
|
60
|
+
let inFlightKey = null;
|
|
60
61
|
let warnedInsecureUrl = false;
|
|
61
62
|
/** Reset module state. Tests only — each case needs a clean cache. */
|
|
62
63
|
function resetModelCatalogCache() {
|
|
63
64
|
cache = null;
|
|
64
65
|
inFlight = null;
|
|
66
|
+
inFlightKey = null;
|
|
65
67
|
warnedInsecureUrl = false;
|
|
66
68
|
}
|
|
67
|
-
// ── configuration ───────────────────────────────────────────────────────────
|
|
68
69
|
// Parsed `env` block of the Claude Code CLI config. The CLI applies that block
|
|
69
70
|
// internally rather than to the OS environment, so a value set only there is
|
|
70
71
|
// invisible to `process.env` and has to be read from the file.
|
|
72
|
+
//
|
|
73
|
+
// This gateway is a long-lived daemon (spawned once, runs for days), while
|
|
74
|
+
// settings.json is edited live by whoever is testing a different
|
|
75
|
+
// ANTHROPIC_BASE_URL/token — a one-time read here used to mean the daemon
|
|
76
|
+
// silently kept using whatever the file said at its own startup, forever,
|
|
77
|
+
// with no way to notice the file had changed short of a full process
|
|
78
|
+
// restart. Give this the same TTL treatment `fetchModelCatalog` already
|
|
79
|
+
// gives the catalog response itself, so an edit is picked up within a
|
|
80
|
+
// minute instead of never.
|
|
71
81
|
let settingsEnvCache;
|
|
72
|
-
|
|
73
|
-
|
|
82
|
+
let settingsEnvFetchedAt = 0;
|
|
83
|
+
function settingsEnv(key, now = Date.now()) {
|
|
84
|
+
if (settingsEnvCache === undefined || now - settingsEnvFetchedAt >= CATALOG_TTL_MS) {
|
|
74
85
|
try {
|
|
75
86
|
const dir = process.env.CLAUDE_CONFIG_DIR || path_1.default.join(os_1.default.homedir(), '.claude');
|
|
76
87
|
settingsEnvCache = JSON.parse(fs_1.default.readFileSync(path_1.default.join(dir, 'settings.json'), 'utf8'))?.env ?? null;
|
|
@@ -78,13 +89,15 @@ function settingsEnv(key) {
|
|
|
78
89
|
catch {
|
|
79
90
|
settingsEnvCache = null;
|
|
80
91
|
}
|
|
92
|
+
settingsEnvFetchedAt = now;
|
|
81
93
|
}
|
|
82
94
|
const v = settingsEnvCache?.[key];
|
|
83
95
|
return typeof v === 'string' ? v : '';
|
|
84
96
|
}
|
|
85
|
-
/** Tests only — the settings file is read once per
|
|
97
|
+
/** Tests only — the settings file is otherwise re-read at most once per {@link CATALOG_TTL_MS}. */
|
|
86
98
|
function resetSettingsEnvCache() {
|
|
87
99
|
settingsEnvCache = undefined;
|
|
100
|
+
settingsEnvFetchedAt = 0;
|
|
88
101
|
}
|
|
89
102
|
/**
|
|
90
103
|
* Where to fetch the catalog from. `MODELS_BASE_URL` lets a deployment point
|
|
@@ -92,17 +105,17 @@ function resetSettingsEnvCache() {
|
|
|
92
105
|
* the same `ANTHROPIC_BASE_URL` the session process already uses. Empty means
|
|
93
106
|
* "not configured", which is the signal to stay on the static list.
|
|
94
107
|
*/
|
|
95
|
-
function catalogBaseUrl() {
|
|
108
|
+
function catalogBaseUrl(now = Date.now()) {
|
|
96
109
|
const raw = process.env.MODELS_BASE_URL ||
|
|
97
110
|
process.env.ANTHROPIC_BASE_URL ||
|
|
98
|
-
settingsEnv('ANTHROPIC_BASE_URL');
|
|
111
|
+
settingsEnv('ANTHROPIC_BASE_URL', now);
|
|
99
112
|
return raw.replace(/\/+$/, '');
|
|
100
113
|
}
|
|
101
|
-
function catalogAuthToken() {
|
|
114
|
+
function catalogAuthToken(now) {
|
|
102
115
|
return (process.env.MODELS_API_KEY ||
|
|
103
116
|
process.env.ANTHROPIC_AUTH_TOKEN ||
|
|
104
|
-
settingsEnv('ANTHROPIC_AUTH_TOKEN') ||
|
|
105
|
-
settingsEnv('CLAUDE_CODE_OAUTH_TOKEN'));
|
|
117
|
+
settingsEnv('ANTHROPIC_AUTH_TOKEN', now) ||
|
|
118
|
+
settingsEnv('CLAUDE_CODE_OAUTH_TOKEN', now));
|
|
106
119
|
}
|
|
107
120
|
/**
|
|
108
121
|
* https is required for a public catalog host — the bearer token rides every
|
|
@@ -154,21 +167,35 @@ function baseUrlIsSecure(raw) {
|
|
|
154
167
|
* live model that lost those fields would silently report against 200k.
|
|
155
168
|
*/
|
|
156
169
|
function parseModelCatalog(body, fallback) {
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
170
|
+
const rows = Array.isArray(body)
|
|
171
|
+
? body
|
|
172
|
+
: (typeof body === 'object' && body !== null
|
|
173
|
+
? (body.data
|
|
174
|
+
?? body.models)
|
|
175
|
+
: null);
|
|
161
176
|
if (!Array.isArray(rows))
|
|
162
177
|
return null;
|
|
163
|
-
const known = new Map(fallback.map((m) => [m.id, m]));
|
|
164
178
|
const seen = new Set();
|
|
179
|
+
// Config is authoritative: retain every curated entry, including local [1m]
|
|
180
|
+
// variants, before adding upstream-only rows. Preserve first duplicate/order.
|
|
165
181
|
const models = [];
|
|
182
|
+
for (const m of fallback) {
|
|
183
|
+
if (seen.has(m.id))
|
|
184
|
+
continue;
|
|
185
|
+
seen.add(m.id);
|
|
186
|
+
models.push(m);
|
|
187
|
+
}
|
|
188
|
+
let usableCount = 0;
|
|
166
189
|
for (const row of rows) {
|
|
167
190
|
if (typeof row !== 'object' || row === null)
|
|
168
191
|
continue;
|
|
169
192
|
const r = row;
|
|
170
|
-
|
|
171
|
-
|
|
193
|
+
// Prefer a non-empty trimmed `id`; older proxies use `model_id` instead.
|
|
194
|
+
// Do not let a blank/whitespace `id` mask a usable fallback field.
|
|
195
|
+
const primaryId = typeof r.id === 'string' ? r.id.trim() : '';
|
|
196
|
+
const fallbackId = typeof r.model_id === 'string' ? r.model_id.trim() : '';
|
|
197
|
+
const id = primaryId || fallbackId;
|
|
198
|
+
if (!id)
|
|
172
199
|
continue;
|
|
173
200
|
// A proxy that fronts image generation alongside chat may serve one
|
|
174
201
|
// catalog for both — the image tool asks for its half with
|
|
@@ -180,28 +207,34 @@ function parseModelCatalog(body, fallback) {
|
|
|
180
207
|
// sent because this repo has no way to know the proxy's chat kind value,
|
|
181
208
|
// and guessing one risks an empty catalog on every deployment.
|
|
182
209
|
const kind = [r.kind, r.type].find((v) => typeof v === 'string' && v.trim());
|
|
183
|
-
if (typeof kind === 'string' && NON_CHAT_KINDS.has(kind.toLowerCase()))
|
|
210
|
+
if (typeof kind === 'string' && NON_CHAT_KINDS.has(kind.trim().toLowerCase()))
|
|
211
|
+
continue;
|
|
212
|
+
usableCount++;
|
|
213
|
+
if (seen.has(id))
|
|
184
214
|
continue;
|
|
185
215
|
seen.add(id);
|
|
186
|
-
const
|
|
187
|
-
const
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
216
|
+
const label = [r.display_name, r.label, r.name].find((v) => typeof v === 'string' && v.trim()) ?? id;
|
|
217
|
+
const ctx = [r.context_window, r.contextWindow].find((v) => typeof v === 'number' && Number.isFinite(v) && v > 0);
|
|
218
|
+
const multiplierValue = typeof r.multiplier === 'number' && Number.isFinite(r.multiplier)
|
|
219
|
+
? r.multiplier
|
|
220
|
+
: r.token_multiplier;
|
|
221
|
+
const multiplier = typeof multiplierValue === 'number' && Number.isFinite(multiplierValue) && multiplierValue > 0
|
|
222
|
+
? multiplierValue
|
|
223
|
+
: undefined;
|
|
191
224
|
models.push({
|
|
192
225
|
id,
|
|
193
226
|
label: String(label),
|
|
194
227
|
// A live-only model has no curated alias. Falling back to the id keeps
|
|
195
228
|
// `/model <alias>` working for it rather than leaving the field empty.
|
|
196
|
-
alias: (typeof r.alias === 'string' && r.alias.trim()) ||
|
|
197
|
-
contextWindow: ctx ??
|
|
229
|
+
alias: (typeof r.alias === 'string' && r.alias.trim()) || id,
|
|
230
|
+
contextWindow: ctx ?? exports.DEFAULT_CONTEXT_WINDOW,
|
|
198
231
|
...(multiplier === undefined ? {} : { multiplier }),
|
|
199
232
|
});
|
|
200
233
|
}
|
|
201
234
|
// An empty catalog is treated as a failed fetch, not as "this deployment has
|
|
202
235
|
// no models": an empty picker is strictly worse than a stale one, and an
|
|
203
236
|
// upstream returning [] is far more likely to be broken than correct.
|
|
204
|
-
return
|
|
237
|
+
return usableCount > 0 ? models : null;
|
|
205
238
|
}
|
|
206
239
|
// ── fetch ───────────────────────────────────────────────────────────────────
|
|
207
240
|
/**
|
|
@@ -213,14 +246,15 @@ function parseModelCatalog(body, fallback) {
|
|
|
213
246
|
* request.
|
|
214
247
|
*/
|
|
215
248
|
async function fetchModelCatalog(fallback, now = Date.now()) {
|
|
216
|
-
|
|
249
|
+
const base = catalogBaseUrl(now);
|
|
250
|
+
const key = `${base}${JSON.stringify(fallback)}`;
|
|
251
|
+
if (cache && cache.key === key && now - cache.fetchedAt < CATALOG_TTL_MS)
|
|
217
252
|
return cache.models;
|
|
218
|
-
if (inFlight)
|
|
253
|
+
if (inFlight && inFlightKey === key)
|
|
219
254
|
return inFlight;
|
|
220
255
|
// A catalog that is merely stale is still better than the static list, but
|
|
221
256
|
// only while a fetch is actually failing — a successful one below replaces it.
|
|
222
|
-
const stale = cache && now - cache.fetchedAt < CATALOG_STALE_MS ? cache.models : null;
|
|
223
|
-
const base = catalogBaseUrl();
|
|
257
|
+
const stale = cache && cache.key === key && now - cache.fetchedAt < CATALOG_STALE_MS ? cache.models : null;
|
|
224
258
|
if (!base)
|
|
225
259
|
return null; // standalone deployment — static list is the catalog
|
|
226
260
|
if (!baseUrlIsSecure(base)) {
|
|
@@ -231,10 +265,12 @@ async function fetchModelCatalog(fallback, now = Date.now()) {
|
|
|
231
265
|
}
|
|
232
266
|
return null;
|
|
233
267
|
}
|
|
234
|
-
|
|
268
|
+
inFlightKey = key;
|
|
269
|
+
let request;
|
|
270
|
+
request = (async () => {
|
|
235
271
|
try {
|
|
236
272
|
const headers = { 'Content-Type': 'application/json' };
|
|
237
|
-
const token = catalogAuthToken();
|
|
273
|
+
const token = catalogAuthToken(now);
|
|
238
274
|
if (token)
|
|
239
275
|
headers['Authorization'] = `Bearer ${token}`;
|
|
240
276
|
const res = await fetch(`${base}/v1/models`, {
|
|
@@ -249,16 +285,20 @@ async function fetchModelCatalog(fallback, now = Date.now()) {
|
|
|
249
285
|
// clock the TTL check above read. Caching a failure would pin the
|
|
250
286
|
// fallback for a full TTL after one blip.
|
|
251
287
|
if (parsed)
|
|
252
|
-
cache = { models: parsed, fetchedAt: now };
|
|
288
|
+
cache = { models: parsed, fetchedAt: now, key };
|
|
253
289
|
return parsed ?? stale;
|
|
254
290
|
}
|
|
255
291
|
catch {
|
|
256
292
|
return stale; // unreachable, timed out, or unparseable
|
|
257
293
|
}
|
|
258
294
|
finally {
|
|
259
|
-
inFlight
|
|
295
|
+
if (inFlight === request) {
|
|
296
|
+
inFlight = null;
|
|
297
|
+
inFlightKey = null;
|
|
298
|
+
}
|
|
260
299
|
}
|
|
261
300
|
})();
|
|
262
|
-
|
|
301
|
+
inFlight = request;
|
|
302
|
+
return request;
|
|
263
303
|
}
|
|
264
304
|
//# sourceMappingURL=model-catalog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../../src/agent/model-catalog.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;
|
|
1
|
+
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../../src/agent/model-catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/runner.js
CHANGED
|
@@ -691,7 +691,14 @@ class AgentRunner extends events_1.EventEmitter {
|
|
|
691
691
|
// it — fetchModelCatalog is bounded and never rejects.
|
|
692
692
|
void this.availableModels()
|
|
693
693
|
.then((availableModels) => {
|
|
694
|
-
|
|
694
|
+
const configuredIds = new Set((this.gatewayConfig.gateway.models ?? exports.DEFAULT_MODELS).map(m => m.id));
|
|
695
|
+
const configured = availableModels.filter(m => configuredIds.has(m.id));
|
|
696
|
+
const live = availableModels.filter(m => !configuredIds.has(m.id));
|
|
697
|
+
respond({
|
|
698
|
+
models: availableModels.map(m => ({ id: m.id, label: m.label })),
|
|
699
|
+
configuredModels: configured.map(m => ({ id: m.id, label: m.label })),
|
|
700
|
+
liveModels: live.map(m => ({ id: m.id, label: m.label })),
|
|
701
|
+
});
|
|
695
702
|
})
|
|
696
703
|
// Without this the request would hang and the picker with it: the
|
|
697
704
|
// receiver is blocked on this response. Every other async branch in
|
|
@@ -1926,12 +1933,22 @@ class AgentRunner extends events_1.EventEmitter {
|
|
|
1926
1933
|
*/
|
|
1927
1934
|
async handleCommandModels(chatId) {
|
|
1928
1935
|
const models = await this.availableModels();
|
|
1936
|
+
const configuredIds = new Set((this.gatewayConfig.gateway.models ?? exports.DEFAULT_MODELS).map(m => m.id));
|
|
1937
|
+
const configured = models.filter(m => configuredIds.has(m.id));
|
|
1938
|
+
const live = models.filter(m => !configuredIds.has(m.id));
|
|
1929
1939
|
const current = this.agentConfig.claude.model;
|
|
1930
|
-
const lines = [`Current model: ${current}`, ''];
|
|
1931
|
-
for (const m of
|
|
1940
|
+
const lines = [`Current model: ${current}`, '', 'Configured models'];
|
|
1941
|
+
for (const m of configured) {
|
|
1932
1942
|
const marker = m.id === current ? '✅ ' : '• ';
|
|
1933
1943
|
lines.push(`${marker}${m.label} — \`${m.id}\``);
|
|
1934
1944
|
}
|
|
1945
|
+
if (live.length) {
|
|
1946
|
+
lines.push('', 'More models (live)');
|
|
1947
|
+
for (const m of live) {
|
|
1948
|
+
const marker = m.id === current ? '✅ ' : '• ';
|
|
1949
|
+
lines.push(`${marker}${m.label} — \`${m.id}\``);
|
|
1950
|
+
}
|
|
1951
|
+
}
|
|
1935
1952
|
lines.push('', 'Switch with /model <id or alias>');
|
|
1936
1953
|
this.writeAutoForward(chatId, lines.join('\n'));
|
|
1937
1954
|
}
|
|
@@ -2327,9 +2344,9 @@ class AgentRunner extends events_1.EventEmitter {
|
|
|
2327
2344
|
// bystander (mirrors the image-size-threshold path).
|
|
2328
2345
|
// - hasLikelyOutstandingBackgroundWork(): regardless of which tier
|
|
2329
2346
|
// called restartOrDefer — even today's aggressive default — a
|
|
2330
|
-
// session that dispatched a background Agent/Workflow
|
|
2331
|
-
// then ended its OWN turn looks idle here, but
|
|
2332
|
-
//
|
|
2347
|
+
// session that dispatched a background Agent/Workflow/Monitor
|
|
2348
|
+
// tool_use and then ended its OWN turn looks idle here, but that
|
|
2349
|
+
// dispatch may still be doing real work. SIGKILLing it now would
|
|
2333
2350
|
// silently destroy that in-flight work with no notification or
|
|
2334
2351
|
// recovery (the incident this guards against: a CLAUDE.md-triggered
|
|
2335
2352
|
// restart killed a session mid-way through 3 dispatched code-review
|
|
@@ -2534,8 +2551,9 @@ class AgentRunner extends events_1.EventEmitter {
|
|
|
2534
2551
|
startIdleCleaner() {
|
|
2535
2552
|
this.idleCleanerTimer = setInterval(async () => {
|
|
2536
2553
|
for (const [id, proc] of this.sessions) {
|
|
2537
|
-
// A parent that just dispatched Agent/Workflow work is CLI-idle
|
|
2538
|
-
//
|
|
2554
|
+
// A parent that just dispatched Agent/Workflow/Monitor work is CLI-idle
|
|
2555
|
+
// but that dispatch may still need this session to receive its
|
|
2556
|
+
// eventual task notification.
|
|
2539
2557
|
if (proc.hasLikelyOutstandingBackgroundWork())
|
|
2540
2558
|
continue;
|
|
2541
2559
|
if (proc.isIdle(this.idleTimeoutMs)) {
|