tapimo 0.2.0 → 0.4.0
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 +36 -8
- package/dist/ApiKey.d.ts +1 -0
- package/dist/ApiKey.d.ts.map +1 -1
- package/dist/ApiKey.js +5 -2
- package/dist/ApiKey.js.map +1 -1
- package/dist/ApiKeys.d.ts +28 -1
- package/dist/ApiKeys.d.ts.map +1 -1
- package/dist/ApiKeys.js +34 -1
- package/dist/ApiKeys.js.map +1 -1
- package/dist/App.d.ts +7532 -4850
- package/dist/App.d.ts.map +1 -1
- package/dist/App.js +11 -3
- package/dist/App.js.map +1 -1
- package/dist/Scope.d.ts +11 -2
- package/dist/Scope.d.ts.map +1 -1
- package/dist/Scope.js +14 -3
- package/dist/Scope.js.map +1 -1
- package/dist/admin/App.d.ts +63 -53
- package/dist/admin/App.d.ts.map +1 -1
- package/dist/admin/apps/api-keys.d.ts +7 -0
- package/dist/admin/apps/api-keys.d.ts.map +1 -1
- package/dist/admin/apps/scopes.d.ts +8 -0
- package/dist/admin/apps/scopes.d.ts.map +1 -1
- package/dist/admin/apps/scopes.js +3 -0
- package/dist/admin/apps/scopes.js.map +1 -1
- package/dist/admin/apps/verified-tokens.d.ts +57 -57
- package/dist/admin/ui.generated.d.ts +1 -1
- package/dist/admin/ui.generated.js +13 -13
- package/dist/admin/ui.generated.js.map +1 -1
- package/dist/analytics/Analytics.d.ts +151 -0
- package/dist/analytics/Analytics.d.ts.map +1 -0
- package/dist/analytics/Analytics.js +212 -0
- package/dist/analytics/Analytics.js.map +1 -0
- package/dist/analytics/tables/requestEvents.d.ts +215 -0
- package/dist/analytics/tables/requestEvents.d.ts.map +1 -0
- package/dist/analytics/tables/requestEvents.js +264 -0
- package/dist/analytics/tables/requestEvents.js.map +1 -0
- package/dist/apps/data/App.d.ts +1049 -624
- package/dist/apps/data/App.d.ts.map +1 -1
- package/dist/apps/data/App.js +36 -0
- package/dist/apps/data/App.js.map +1 -1
- package/dist/apps/data/FundingRouteProviders.d.ts +54 -0
- package/dist/apps/data/FundingRouteProviders.d.ts.map +1 -0
- package/dist/apps/data/FundingRouteProviders.js +355 -0
- package/dist/apps/data/FundingRouteProviders.js.map +1 -0
- package/dist/apps/data/index.d.ts +1 -0
- package/dist/apps/data/index.d.ts.map +1 -1
- package/dist/apps/data/index.js +1 -0
- package/dist/apps/data/index.js.map +1 -1
- package/dist/apps/data/routes/balances.d.ts +45 -45
- package/dist/apps/data/routes/coingecko.d.ts +176 -176
- package/dist/apps/data/routes/exchanges.d.ts +455 -455
- package/dist/apps/data/routes/fee-amm.d.ts +101 -101
- package/dist/apps/data/routes/funding.d.ts +843 -0
- package/dist/apps/data/routes/funding.d.ts.map +1 -0
- package/dist/apps/data/routes/funding.js +443 -0
- package/dist/apps/data/routes/funding.js.map +1 -0
- package/dist/apps/data/routes/indexer.d.ts +5 -5
- package/dist/apps/data/routes/receipts.d.ts.map +1 -1
- package/dist/apps/data/routes/receipts.js +2 -8
- package/dist/apps/data/routes/receipts.js.map +1 -1
- package/dist/apps/data/routes/rpc.d.ts +29 -36
- package/dist/apps/data/routes/rpc.d.ts.map +1 -1
- package/dist/apps/data/routes/rpc.js +29 -1
- package/dist/apps/data/routes/rpc.js.map +1 -1
- package/dist/apps/data/routes/tokenlist.d.ts +36 -36
- package/dist/apps/data/routes/transfers.d.ts +56 -56
- package/dist/apps/data/routes/verified-tokens.d.ts +36 -36
- package/dist/apps/data/routes/webhooks.d.ts +45 -45
- package/dist/apps/data/routes/webhooks.d.ts.map +1 -1
- package/dist/apps/data/routes/webhooks.js +8 -8
- package/dist/apps/data/routes/webhooks.js.map +1 -1
- package/dist/apps/docs/App.d.ts +5 -3
- package/dist/apps/docs/App.d.ts.map +1 -1
- package/dist/apps/docs/App.js +28 -96
- package/dist/apps/docs/App.js.map +1 -1
- package/dist/apps/docs/reference.d.ts +21 -0
- package/dist/apps/docs/reference.d.ts.map +1 -0
- package/dist/apps/docs/reference.js +112 -0
- package/dist/apps/docs/reference.js.map +1 -0
- package/dist/apps/index.d.ts +3 -2
- package/dist/apps/index.d.ts.map +1 -1
- package/dist/apps/index.js +3 -2
- package/dist/apps/index.js.map +1 -1
- package/dist/apps/{platform → management}/App.d.ts +3015 -738
- package/dist/apps/management/App.d.ts.map +1 -0
- package/dist/apps/{platform → management}/App.js +20 -10
- package/dist/apps/management/App.js.map +1 -0
- package/dist/apps/management/Billing.d.ts +279 -0
- package/dist/apps/management/Billing.d.ts.map +1 -0
- package/dist/apps/management/Billing.js +477 -0
- package/dist/apps/management/Billing.js.map +1 -0
- package/dist/apps/management/index.d.ts +3 -0
- package/dist/apps/management/index.d.ts.map +1 -0
- package/dist/apps/management/index.js +3 -0
- package/dist/apps/management/index.js.map +1 -0
- package/dist/apps/{platform → management}/routes/api-keys.d.ts +341 -49
- package/dist/apps/management/routes/api-keys.d.ts.map +1 -0
- package/dist/apps/{platform → management}/routes/api-keys.js +116 -14
- package/dist/apps/management/routes/api-keys.js.map +1 -0
- package/dist/apps/management/routes/billing.d.ts +1520 -0
- package/dist/apps/management/routes/billing.d.ts.map +1 -0
- package/dist/apps/management/routes/billing.js +795 -0
- package/dist/apps/management/routes/billing.js.map +1 -0
- package/dist/apps/{platform → management}/routes/invitations.d.ts +202 -84
- package/dist/apps/management/routes/invitations.d.ts.map +1 -0
- package/dist/apps/{platform → management}/routes/invitations.js +59 -1
- package/dist/apps/management/routes/invitations.js.map +1 -0
- package/dist/apps/{platform → management}/routes/me.d.ts +17 -17
- package/dist/apps/management/routes/me.d.ts.map +1 -0
- package/dist/apps/management/routes/me.js.map +1 -0
- package/dist/apps/management/routes/members.d.ts.map +1 -0
- package/dist/apps/management/routes/members.js.map +1 -0
- package/dist/apps/{platform → management}/routes/orgs.d.ts +50 -36
- package/dist/apps/management/routes/orgs.d.ts.map +1 -0
- package/dist/apps/{platform → management}/routes/orgs.js +14 -3
- package/dist/apps/management/routes/orgs.js.map +1 -0
- package/dist/apps/{platform → management}/routes/projects.d.ts +97 -97
- package/dist/apps/{platform → management}/routes/projects.d.ts.map +1 -1
- package/dist/apps/management/routes/projects.js.map +1 -0
- package/dist/apps/management/routes/scopes.d.ts +107 -0
- package/dist/apps/management/routes/scopes.d.ts.map +1 -0
- package/dist/apps/management/routes/scopes.js +66 -0
- package/dist/apps/management/routes/scopes.js.map +1 -0
- package/dist/apps/management/routes/usage.d.ts +588 -0
- package/dist/apps/management/routes/usage.d.ts.map +1 -0
- package/dist/apps/management/routes/usage.js +391 -0
- package/dist/apps/management/routes/usage.js.map +1 -0
- package/dist/apps/mcp.d.ts +76 -0
- package/dist/apps/mcp.d.ts.map +1 -0
- package/dist/apps/mcp.js +188 -0
- package/dist/apps/mcp.js.map +1 -0
- package/dist/apps/relay/App.d.ts +4 -1
- package/dist/apps/relay/App.d.ts.map +1 -1
- package/dist/apps/relay/App.js +118 -10
- package/dist/apps/relay/App.js.map +1 -1
- package/dist/apps/relay/Sponsorships.d.ts.map +1 -1
- package/dist/apps/relay/Sponsorships.js +2 -1
- package/dist/apps/relay/Sponsorships.js.map +1 -1
- package/dist/cli/Cli.d.ts +8 -1
- package/dist/cli/Cli.d.ts.map +1 -1
- package/dist/cli/Cli.js +11 -3
- package/dist/cli/Cli.js.map +1 -1
- package/dist/cli/commands/admin.d.ts +4 -0
- package/dist/cli/commands/admin.d.ts.map +1 -1
- package/dist/cli/commands/admin.js +80 -1
- package/dist/cli/commands/admin.js.map +1 -1
- package/dist/db/Db.d.ts +7 -0
- package/dist/db/Db.d.ts.map +1 -1
- package/dist/db/Db.js +126 -0
- package/dist/db/Db.js.map +1 -1
- package/dist/db/Schema.d.ts +79 -0
- package/dist/db/Schema.d.ts.map +1 -1
- package/dist/db/Schema.js +88 -2
- package/dist/db/Schema.js.map +1 -1
- package/dist/db/tables/billingSettings.d.ts +55 -0
- package/dist/db/tables/billingSettings.d.ts.map +1 -0
- package/dist/db/tables/billingSettings.js +70 -0
- package/dist/db/tables/billingSettings.js.map +1 -0
- package/dist/db/tables/invitations.js +2 -2
- package/dist/db/tables/invitations.js.map +1 -1
- package/dist/db/tables/organizations.d.ts +6 -2
- package/dist/db/tables/organizations.d.ts.map +1 -1
- package/dist/db/tables/organizations.js +10 -4
- package/dist/db/tables/organizations.js.map +1 -1
- package/dist/db/tables/projects.js +2 -2
- package/dist/db/tables/projects.js.map +1 -1
- package/dist/db/tables/requestUsage.d.ts +121 -0
- package/dist/db/tables/requestUsage.d.ts.map +1 -0
- package/dist/db/tables/requestUsage.js +150 -0
- package/dist/db/tables/requestUsage.js.map +1 -0
- package/dist/db/tables/sponsoredTransactions.d.ts +119 -0
- package/dist/db/tables/sponsoredTransactions.d.ts.map +1 -1
- package/dist/db/tables/sponsoredTransactions.js +155 -2
- package/dist/db/tables/sponsoredTransactions.js.map +1 -1
- package/dist/db/tables/stripeCustomers.d.ts +81 -0
- package/dist/db/tables/stripeCustomers.d.ts.map +1 -0
- package/dist/db/tables/stripeCustomers.js +120 -0
- package/dist/db/tables/stripeCustomers.js.map +1 -0
- package/dist/db/tables/users.js +2 -2
- package/dist/db/tables/users.js.map +1 -1
- package/dist/handlers/internal/sponsorship.d.ts +5 -2
- package/dist/handlers/internal/sponsorship.d.ts.map +1 -1
- package/dist/handlers/internal/sponsorship.js +19 -5
- package/dist/handlers/internal/sponsorship.js.map +1 -1
- package/dist/handlers/internal/utils.d.ts +10 -3
- package/dist/handlers/internal/utils.d.ts.map +1 -1
- package/dist/handlers/internal/utils.js +14 -6
- package/dist/handlers/internal/utils.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/internal/Auth.d.ts +18 -4
- package/dist/internal/Auth.d.ts.map +1 -1
- package/dist/internal/Auth.js +149 -77
- package/dist/internal/Auth.js.map +1 -1
- package/dist/internal/Cache.d.ts.map +1 -1
- package/dist/internal/Cache.js +4 -1
- package/dist/internal/Cache.js.map +1 -1
- package/dist/internal/EdgeCache.d.ts +10 -0
- package/dist/internal/EdgeCache.d.ts.map +1 -1
- package/dist/internal/EdgeCache.js +39 -8
- package/dist/internal/EdgeCache.js.map +1 -1
- package/dist/internal/Fees.d.ts +27 -0
- package/dist/internal/Fees.d.ts.map +1 -0
- package/dist/internal/Fees.js +48 -0
- package/dist/internal/Fees.js.map +1 -0
- package/dist/internal/FundingRoutes.d.ts +915 -0
- package/dist/internal/FundingRoutes.d.ts.map +1 -0
- package/dist/internal/FundingRoutes.js +625 -0
- package/dist/internal/FundingRoutes.js.map +1 -0
- package/dist/internal/Id.d.ts +15 -0
- package/dist/internal/Id.d.ts.map +1 -0
- package/dist/internal/Id.js +22 -0
- package/dist/internal/Id.js.map +1 -0
- package/dist/internal/Log.d.ts +2 -0
- package/dist/internal/Log.d.ts.map +1 -1
- package/dist/internal/Log.js +3 -0
- package/dist/internal/Log.js.map +1 -1
- package/dist/internal/OpenApi.d.ts +10 -1
- package/dist/internal/OpenApi.d.ts.map +1 -1
- package/dist/internal/OpenApi.js +8 -1
- package/dist/internal/OpenApi.js.map +1 -1
- package/dist/internal/RateLimit.d.ts +25 -0
- package/dist/internal/RateLimit.d.ts.map +1 -1
- package/dist/internal/RateLimit.js +51 -0
- package/dist/internal/RateLimit.js.map +1 -1
- package/dist/internal/Response.d.ts +1 -1
- package/dist/internal/Response.d.ts.map +1 -1
- package/dist/internal/Schema.d.ts +8 -0
- package/dist/internal/Schema.d.ts.map +1 -1
- package/dist/internal/Schema.js +7 -0
- package/dist/internal/Schema.js.map +1 -1
- package/dist/internal/Webhooks.d.ts.map +1 -1
- package/dist/internal/Webhooks.js +3 -3
- package/dist/internal/Webhooks.js.map +1 -1
- package/package.json +8 -7
- package/src/ApiKey.ts +9 -2
- package/src/ApiKeys.test.ts +51 -0
- package/src/ApiKeys.ts +50 -1
- package/src/App.test.ts +33 -86718
- package/src/App.ts +26 -8
- package/src/Client.test-d.ts +353 -2
- package/src/Scope.ts +16 -3
- package/src/admin/apps/scopes.test.ts +6 -0
- package/src/admin/apps/scopes.ts +3 -0
- package/src/admin/ui/src/components/Page.tsx +2 -3
- package/src/admin/ui/src/routes/__root.tsx +2 -2
- package/src/admin/ui/src/routes/api-keys.tsx +2 -2
- package/src/admin/ui.generated.ts +13 -13
- package/src/analytics/Analytics.test.ts +527 -0
- package/src/analytics/Analytics.ts +318 -0
- package/src/analytics/tables/requestEvents.ts +523 -0
- package/src/apps/composition.test.ts +26 -13
- package/src/apps/data/App.test.ts +72 -0
- package/src/apps/data/App.ts +37 -0
- package/src/apps/data/FundingRouteProviders.test.ts +281 -0
- package/src/apps/data/FundingRouteProviders.ts +459 -0
- package/src/apps/data/index.ts +1 -0
- package/src/apps/data/routes/funding.test.ts +314 -0
- package/src/apps/data/routes/funding.ts +698 -0
- package/src/apps/data/routes/receipts.ts +2 -9
- package/src/apps/data/routes/rpc.test.ts +78 -2
- package/src/apps/data/routes/rpc.ts +31 -1
- package/src/apps/data/routes/webhooks.test.ts +1 -1
- package/src/apps/data/routes/webhooks.ts +11 -8
- package/src/apps/docs/App.ts +30 -101
- package/src/apps/docs/reference.ts +132 -0
- package/src/apps/index.ts +3 -2
- package/src/apps/{platform → management}/App.ts +56 -17
- package/src/apps/management/Billing.test.ts +530 -0
- package/src/apps/management/Billing.ts +682 -0
- package/src/apps/management/index.ts +2 -0
- package/src/apps/{platform → management}/routes/api-keys.test.ts +172 -9
- package/src/apps/{platform → management}/routes/api-keys.ts +137 -21
- package/src/apps/management/routes/billing.test.ts +1100 -0
- package/src/apps/management/routes/billing.ts +966 -0
- package/src/apps/{platform → management}/routes/invitations.test.ts +55 -7
- package/src/apps/{platform → management}/routes/invitations.ts +69 -1
- package/src/apps/management/routes/me.test.ts +351 -0
- package/src/apps/{platform → management}/routes/orgs.ts +26 -4
- package/src/apps/management/routes/scopes.test.ts +29 -0
- package/src/apps/management/routes/scopes.ts +85 -0
- package/src/apps/management/routes/usage.test.ts +422 -0
- package/src/apps/management/routes/usage.ts +527 -0
- package/src/apps/mcp.test.ts +206 -0
- package/src/apps/mcp.ts +250 -0
- package/src/apps/relay/App.test.ts +457 -8
- package/src/apps/relay/App.ts +120 -12
- package/src/apps/relay/Sponsorships.test.ts +1 -1
- package/src/apps/relay/Sponsorships.ts +2 -1
- package/src/cli/Cli.test.ts +25 -2
- package/src/cli/Cli.ts +17 -2
- package/src/cli/commands/admin.test.ts +83 -0
- package/src/cli/commands/admin.ts +89 -1
- package/src/db/Db.ts +137 -0
- package/src/db/Schema.ts +104 -2
- package/src/db/tables/billingSettings.test.ts +87 -0
- package/src/db/tables/billingSettings.ts +108 -0
- package/src/db/tables/invitations.ts +2 -2
- package/src/db/tables/organizations.test.ts +1 -1
- package/src/db/tables/organizations.ts +15 -5
- package/src/db/tables/projects.ts +2 -2
- package/src/db/tables/requestUsage.ts +231 -0
- package/src/db/tables/sponsoredTransactions.test.ts +108 -1
- package/src/db/tables/sponsoredTransactions.ts +230 -2
- package/src/db/tables/stripeCustomers.test.ts +109 -0
- package/src/db/tables/stripeCustomers.ts +162 -0
- package/src/db/tables/users.ts +2 -2
- package/src/handlers/internal/sponsorship.ts +34 -7
- package/src/handlers/internal/utils.ts +19 -7
- package/src/index.ts +1 -0
- package/src/internal/Auth.test.ts +175 -25
- package/src/internal/Auth.ts +176 -87
- package/src/internal/Cache.ts +5 -1
- package/src/internal/EdgeCache.test.ts +27 -4
- package/src/internal/EdgeCache.ts +47 -9
- package/src/internal/Fees.test.ts +32 -0
- package/src/internal/Fees.ts +51 -0
- package/src/internal/FundingRoutes.test.ts +213 -0
- package/src/internal/FundingRoutes.ts +898 -0
- package/src/internal/Id.test.ts +17 -0
- package/src/internal/Id.ts +24 -0
- package/src/internal/Log.test.ts +1 -0
- package/src/internal/Log.ts +5 -0
- package/src/internal/OpenApi.ts +12 -1
- package/src/internal/RateLimit.test.ts +84 -0
- package/src/internal/RateLimit.ts +70 -0
- package/src/internal/Response.ts +1 -1
- package/src/internal/Schema.ts +8 -0
- package/src/internal/Webhooks.test.ts +3 -3
- package/src/internal/Webhooks.ts +3 -3
- package/dist/apps/platform/App.d.ts.map +0 -1
- package/dist/apps/platform/App.js.map +0 -1
- package/dist/apps/platform/index.d.ts +0 -2
- package/dist/apps/platform/index.d.ts.map +0 -1
- package/dist/apps/platform/index.js +0 -2
- package/dist/apps/platform/index.js.map +0 -1
- package/dist/apps/platform/routes/api-keys.d.ts.map +0 -1
- package/dist/apps/platform/routes/api-keys.js.map +0 -1
- package/dist/apps/platform/routes/invitations.d.ts.map +0 -1
- package/dist/apps/platform/routes/invitations.js.map +0 -1
- package/dist/apps/platform/routes/me.d.ts.map +0 -1
- package/dist/apps/platform/routes/me.js.map +0 -1
- package/dist/apps/platform/routes/members.d.ts.map +0 -1
- package/dist/apps/platform/routes/members.js.map +0 -1
- package/dist/apps/platform/routes/orgs.d.ts.map +0 -1
- package/dist/apps/platform/routes/orgs.js.map +0 -1
- package/dist/apps/platform/routes/projects.js.map +0 -1
- package/src/apps/platform/index.ts +0 -1
- package/src/apps/platform/routes/me.test.ts +0 -121
- /package/dist/apps/{platform → management}/routes/me.js +0 -0
- /package/dist/apps/{platform → management}/routes/members.d.ts +0 -0
- /package/dist/apps/{platform → management}/routes/members.js +0 -0
- /package/dist/apps/{platform → management}/routes/projects.js +0 -0
- /package/src/apps/{platform → management}/routes/me.ts +0 -0
- /package/src/apps/{platform → management}/routes/members.test.ts +0 -0
- /package/src/apps/{platform → management}/routes/members.ts +0 -0
- /package/src/apps/{platform → management}/routes/orgs.test.ts +0 -0
- /package/src/apps/{platform → management}/routes/projects.test.ts +0 -0
- /package/src/apps/{platform → management}/routes/projects.ts +0 -0
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { Cli as incur_Cli, z } from 'incur'
|
|
2
|
+
|
|
3
|
+
import * as TestApp from '../../test/App.js'
|
|
4
|
+
import * as Runtime from '../../test/runtime.js'
|
|
5
|
+
import { mcp } from './mcp.js'
|
|
6
|
+
|
|
7
|
+
const origin = 'https://api.tempo-api.test'
|
|
8
|
+
|
|
9
|
+
/** API key with read-only webhook scope, used to prove header forwarding. */
|
|
10
|
+
const reader = {
|
|
11
|
+
id: 'key_reader',
|
|
12
|
+
orgId: 'org_test',
|
|
13
|
+
scopes: ['webhooks:read'],
|
|
14
|
+
token: 'secret_reader',
|
|
15
|
+
} satisfies TestApp.kvStore.Key
|
|
16
|
+
|
|
17
|
+
/** Composes a test app with the MCP group mounted, dispatching in-process. */
|
|
18
|
+
function createHost(
|
|
19
|
+
options: {
|
|
20
|
+
app?: ReturnType<typeof TestApp.create> | undefined
|
|
21
|
+
docs?: mcp.Options['docs'] | undefined
|
|
22
|
+
} = {},
|
|
23
|
+
) {
|
|
24
|
+
const app = options.app ?? TestApp.create()
|
|
25
|
+
const host = mcp({ docs: options.docs ?? false, fetch: (request) => app.fetch(request) })
|
|
26
|
+
return { app, host }
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** Stub remote docs MCP server: an in-process incur CLI serving `/mcp`. */
|
|
30
|
+
function docsStub() {
|
|
31
|
+
const remote = incur_Cli.create('docs-remote', { version: '1.0.0' }).command('search', {
|
|
32
|
+
description: 'Search docs',
|
|
33
|
+
options: z.object({ query: z.string().describe('Search query') }),
|
|
34
|
+
run: (context) => ({ hits: [context.options.query] }),
|
|
35
|
+
})
|
|
36
|
+
return { fetch: (request: Request) => remote.fetch(request), url: 'http://docs.local/mcp' }
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Anything serving `/mcp`: the group host, or a composed app it is mounted into. */
|
|
40
|
+
type Host = { fetch: (request: Request) => Response | Promise<Response> }
|
|
41
|
+
|
|
42
|
+
async function request(host: Host, body: unknown, headers: Record<string, string> = {}) {
|
|
43
|
+
const response = await host.fetch(
|
|
44
|
+
new Request(new URL('/mcp', origin), {
|
|
45
|
+
body: JSON.stringify(body),
|
|
46
|
+
headers: {
|
|
47
|
+
accept: 'application/json, text/event-stream',
|
|
48
|
+
'content-type': 'application/json',
|
|
49
|
+
...headers,
|
|
50
|
+
},
|
|
51
|
+
method: 'POST',
|
|
52
|
+
}),
|
|
53
|
+
)
|
|
54
|
+
expect(response.status).toBe(200)
|
|
55
|
+
return (await response.json()) as { result: any }
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
function initialize(host: Host) {
|
|
59
|
+
return request(host, {
|
|
60
|
+
id: 1,
|
|
61
|
+
jsonrpc: '2.0',
|
|
62
|
+
method: 'initialize',
|
|
63
|
+
params: {
|
|
64
|
+
capabilities: {},
|
|
65
|
+
clientInfo: { name: 'test-client', version: '1.0.0' },
|
|
66
|
+
protocolVersion: '2025-03-26',
|
|
67
|
+
},
|
|
68
|
+
})
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
async function toolsList(host: Host) {
|
|
72
|
+
const body = await request(host, { id: 2, jsonrpc: '2.0', method: 'tools/list', params: {} })
|
|
73
|
+
return (body.result.tools as { name: string }[]).map((tool) => tool.name)
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
async function toolsCall(
|
|
77
|
+
host: Host,
|
|
78
|
+
name: string,
|
|
79
|
+
args: Record<string, unknown>,
|
|
80
|
+
headers: Record<string, string> = {},
|
|
81
|
+
) {
|
|
82
|
+
const body = await request(
|
|
83
|
+
host,
|
|
84
|
+
{ id: 3, jsonrpc: '2.0', method: 'tools/call', params: { arguments: args, name } },
|
|
85
|
+
headers,
|
|
86
|
+
)
|
|
87
|
+
return body.result as {
|
|
88
|
+
content: { text: string; type: string }[]
|
|
89
|
+
isError?: boolean
|
|
90
|
+
structuredContent?: Record<string, unknown>
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/** Parses a tool result: structured content when present, else the JSON text item. */
|
|
95
|
+
function resultJson(result: Awaited<ReturnType<typeof toolsCall>>) {
|
|
96
|
+
return result.structuredContent ?? JSON.parse(result.content[0]!.text)
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
test('scopes tools to the data domain', async () => {
|
|
100
|
+
const { app, host } = createHost({ docs: docsStub() })
|
|
101
|
+
|
|
102
|
+
// The domain filter must drop paths that actually exist in the spec.
|
|
103
|
+
const spec = (await (await app.fetch(new Request(new URL('/openapi.json', origin)))).json()) as {
|
|
104
|
+
paths: Record<string, unknown>
|
|
105
|
+
}
|
|
106
|
+
expect(Object.keys(spec.paths).some((path) => path.startsWith('/gecko/'))).toBe(true)
|
|
107
|
+
expect(Object.keys(spec.paths).some((path) => path.startsWith('/v1/auth/'))).toBe(true)
|
|
108
|
+
expect(Object.keys(spec.paths).some((path) => path.startsWith('/v1/orgs'))).toBe(true)
|
|
109
|
+
|
|
110
|
+
await initialize(host)
|
|
111
|
+
const tools = await toolsList(host)
|
|
112
|
+
|
|
113
|
+
expect(tools).toContain('v1_tokens_get')
|
|
114
|
+
expect(tools).toContain('docs_search')
|
|
115
|
+
// RPC is part of the data domain tag group.
|
|
116
|
+
expect(tools.some((name) => name.startsWith('rpc'))).toBe(true)
|
|
117
|
+
// Out of domain: CoinGecko mirrors, session auth, management, relay.
|
|
118
|
+
expect(tools.some((name) => name.startsWith('gecko_'))).toBe(false)
|
|
119
|
+
expect(tools.some((name) => name.startsWith('v1_auth_'))).toBe(false)
|
|
120
|
+
expect(tools.some((name) => name.startsWith('v1_orgs'))).toBe(false)
|
|
121
|
+
expect(tools.some((name) => name.startsWith('v1_me'))).toBe(false)
|
|
122
|
+
})
|
|
123
|
+
|
|
124
|
+
test('executes generated tools against the composed app', async () => {
|
|
125
|
+
// Verified tokens are database-backed, so seed the default chain.
|
|
126
|
+
const db = TestApp.database()
|
|
127
|
+
await TestApp.verifiedSeed(db, Runtime.get().chainId)
|
|
128
|
+
const { host } = createHost({ app: TestApp.create({ db }) })
|
|
129
|
+
|
|
130
|
+
await initialize(host)
|
|
131
|
+
const result = await toolsCall(host, 'v1_tokens_get', { verified: true })
|
|
132
|
+
|
|
133
|
+
expect(result.isError).toBeFalsy()
|
|
134
|
+
const body = resultJson(result) as { data: { verified: boolean }[]; nextCursor: unknown }
|
|
135
|
+
expect(body.data.length).toBeGreaterThan(0)
|
|
136
|
+
expect(body.data.every((token) => token.verified === true)).toBe(true)
|
|
137
|
+
})
|
|
138
|
+
|
|
139
|
+
test('forwards the caller Authorization header to authenticated tools', async () => {
|
|
140
|
+
const { host } = createHost({ app: TestApp.create({ auth: { keys: [reader] } }) })
|
|
141
|
+
await initialize(host)
|
|
142
|
+
|
|
143
|
+
const denied = await toolsCall(host, 'v1_webhooks_get', {})
|
|
144
|
+
expect(denied.isError).toBe(true)
|
|
145
|
+
|
|
146
|
+
const allowed = await toolsCall(
|
|
147
|
+
host,
|
|
148
|
+
'v1_webhooks_get',
|
|
149
|
+
{},
|
|
150
|
+
{ authorization: `Bearer ${reader.token}` },
|
|
151
|
+
)
|
|
152
|
+
expect(allowed.isError).toBeFalsy()
|
|
153
|
+
expect(resultJson(allowed)).toMatchObject({ data: [] })
|
|
154
|
+
})
|
|
155
|
+
|
|
156
|
+
test('proxies docs tool calls to the remote MCP source', async () => {
|
|
157
|
+
const { host } = createHost({ docs: docsStub() })
|
|
158
|
+
await initialize(host)
|
|
159
|
+
|
|
160
|
+
const result = await toolsCall(host, 'docs_search', { query: 'fees' })
|
|
161
|
+
|
|
162
|
+
expect(result.isError).toBeFalsy()
|
|
163
|
+
expect(resultJson(result)).toMatchObject({ hits: ['fees'] })
|
|
164
|
+
})
|
|
165
|
+
|
|
166
|
+
test('documents POST /mcp and keeps it open under auth enforcement', async () => {
|
|
167
|
+
// Worker-style composition: the group mounted into the app it dispatches to.
|
|
168
|
+
const app = TestApp.create()
|
|
169
|
+
app.route('/', mcp({ docs: false, fetch: (request) => app.fetch(request) }))
|
|
170
|
+
|
|
171
|
+
const spec = (await (await app.fetch(new Request(new URL('/openapi.json', origin)))).json()) as {
|
|
172
|
+
paths: Record<string, { post?: { operationId?: string; security?: unknown; tags?: string[] } }>
|
|
173
|
+
'x-tagGroups': { name: string; tags: string[] }[]
|
|
174
|
+
}
|
|
175
|
+
const operation = spec.paths['/mcp']?.post
|
|
176
|
+
expect(operation?.operationId).toBe('mcpRequest')
|
|
177
|
+
expect(operation?.tags).toEqual(['MCP'])
|
|
178
|
+
// Anonymous and any-valid-key access; no required scopes.
|
|
179
|
+
expect(operation?.security).toEqual([{ apiKey: [] }, { bearerAuth: [] }, {}])
|
|
180
|
+
|
|
181
|
+
// Surfaces under `Data API` in the reference, but the tool filter excludes the `MCP` tag.
|
|
182
|
+
const groups = Object.fromEntries(spec['x-tagGroups'].map((group) => [group.name, group.tags]))
|
|
183
|
+
expect(groups['MCP']).toBeUndefined()
|
|
184
|
+
expect(groups['Data API']).toContain('MCP')
|
|
185
|
+
|
|
186
|
+
// Documenting the route makes it auth-enforced; the public lane keeps it
|
|
187
|
+
// anonymously reachable, and the endpoint never surfaces itself as a tool.
|
|
188
|
+
await initialize(app)
|
|
189
|
+
const tools = await toolsList(app)
|
|
190
|
+
expect(tools.length).toBeGreaterThan(0)
|
|
191
|
+
expect(tools.some((name) => name.startsWith('mcp'))).toBe(false)
|
|
192
|
+
|
|
193
|
+
// A presented-but-invalid key is rejected at the transport.
|
|
194
|
+
const rejected = await app.fetch(
|
|
195
|
+
new Request(new URL('/mcp', origin), {
|
|
196
|
+
body: JSON.stringify({ id: 1, jsonrpc: '2.0', method: 'tools/list', params: {} }),
|
|
197
|
+
headers: {
|
|
198
|
+
accept: 'application/json, text/event-stream',
|
|
199
|
+
authorization: 'Bearer not-a-key',
|
|
200
|
+
'content-type': 'application/json',
|
|
201
|
+
},
|
|
202
|
+
method: 'POST',
|
|
203
|
+
}),
|
|
204
|
+
)
|
|
205
|
+
expect(rejected.status).toBe(401)
|
|
206
|
+
})
|
package/src/apps/mcp.ts
ADDED
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
import { type Context, Hono } from 'hono'
|
|
2
|
+
import { Cli as incur_Cli, type Openapi } from 'incur'
|
|
3
|
+
import * as z from 'zod/mini'
|
|
4
|
+
|
|
5
|
+
import type * as App from '../App.js'
|
|
6
|
+
import * as Auth from '../internal/Auth.js'
|
|
7
|
+
import * as OpenApi from '../internal/OpenApi.js'
|
|
8
|
+
import * as Metadata from './metadata.js'
|
|
9
|
+
|
|
10
|
+
/** Document tag group whose operations surface as MCP tools (the data domain). */
|
|
11
|
+
const tagGroup = 'Data API'
|
|
12
|
+
|
|
13
|
+
/** Tags inside the group hidden from MCP: partner-shaped CoinGecko mirrors and the MCP endpoint itself. */
|
|
14
|
+
const excludedTags = ['CoinGecko', 'MCP']
|
|
15
|
+
|
|
16
|
+
/** Usage guidance surfaced to MCP clients on initialize. */
|
|
17
|
+
const instructions =
|
|
18
|
+
"Tools mirror the Tempo API's data domain. Authenticated tools accept a Tempo API key: send it as an `Authorization: Bearer` header on the HTTP request, or pass the `authorization` tool input per call. List endpoints paginate via `cursor`/`nextCursor`. `docs_*` tools search the Tempo documentation."
|
|
19
|
+
|
|
20
|
+
/** Zod schemas owned by the MCP endpoint's OpenAPI description. */
|
|
21
|
+
export namespace schema {
|
|
22
|
+
/** JSON-RPC request identifier. */
|
|
23
|
+
export const Id = z
|
|
24
|
+
.union([z.string(), z.number(), z.null()])
|
|
25
|
+
.check(z.describe('Client-supplied JSON-RPC request id used to match responses to requests.'))
|
|
26
|
+
|
|
27
|
+
/** JSON-RPC error payload. */
|
|
28
|
+
export const Error = z
|
|
29
|
+
.object({
|
|
30
|
+
code: z
|
|
31
|
+
.number()
|
|
32
|
+
.check(z.int(), z.describe('Numeric JSON-RPC error code returned by the MCP server.')),
|
|
33
|
+
data: z
|
|
34
|
+
.optional(z.unknown())
|
|
35
|
+
.check(z.describe('Optional extra error details returned by the MCP server.')),
|
|
36
|
+
message: z.string().check(z.describe('Human-readable JSON-RPC error message.')),
|
|
37
|
+
})
|
|
38
|
+
.check(z.describe('JSON-RPC error object returned when a message fails.'))
|
|
39
|
+
|
|
40
|
+
/** MCP JSON-RPC response payload. */
|
|
41
|
+
export const Response = z
|
|
42
|
+
.object({
|
|
43
|
+
error: z
|
|
44
|
+
.optional(Error)
|
|
45
|
+
.check(z.describe('JSON-RPC error object returned when a message fails.')),
|
|
46
|
+
id: z
|
|
47
|
+
.optional(Id)
|
|
48
|
+
.check(
|
|
49
|
+
z.describe('Client-supplied JSON-RPC request id used to match responses to requests.'),
|
|
50
|
+
),
|
|
51
|
+
jsonrpc: z.literal('2.0').check(z.describe('JSON-RPC protocol version; MCP uses `2.0`.')),
|
|
52
|
+
result: z.optional(z.unknown()).check(z.describe('Result returned by the MCP method.')),
|
|
53
|
+
})
|
|
54
|
+
.check(z.describe('One MCP JSON-RPC response returned by the server.'))
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* The MCP route group: a stateless streamable-HTTP MCP server at `/mcp` whose
|
|
59
|
+
* tools mirror the API's data domain (scoped via the OpenAPI document's
|
|
60
|
+
* `Data API` tag group), plus the remote Tempo docs tools. Mount alongside
|
|
61
|
+
* the other route groups:
|
|
62
|
+
*
|
|
63
|
+
* ```ts
|
|
64
|
+
* App.create(options).route('/', mcp({ fetch: (request) => getApp().fetch(request) }))
|
|
65
|
+
* ```
|
|
66
|
+
*/
|
|
67
|
+
export function mcp(options: mcp.Options) {
|
|
68
|
+
const { docs = 'https://mcp.tempo.xyz/mcp', fetch, name = 'tapimo', version = '0.0.0' } = options
|
|
69
|
+
|
|
70
|
+
// One incur instance per caller origin: the OpenAPI document is parsed once,
|
|
71
|
+
// and generated commands rebase onto the origin so tool results embed real
|
|
72
|
+
// absolute URLs (e.g. token asset URIs).
|
|
73
|
+
const clis = new Map<string, ReturnType<typeof build>>()
|
|
74
|
+
|
|
75
|
+
function resolve(origin: string) {
|
|
76
|
+
let cli = clis.get(origin)
|
|
77
|
+
if (!cli) {
|
|
78
|
+
cli = build(origin)
|
|
79
|
+
clis.set(origin, cli)
|
|
80
|
+
// A failed build (spec fetch or docs resolution) retries next request.
|
|
81
|
+
cli.catch(() => clis.delete(origin))
|
|
82
|
+
}
|
|
83
|
+
return cli
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
async function build(origin: string) {
|
|
87
|
+
const response = await fetch(new Request(new URL('/openapi.json', origin)))
|
|
88
|
+
if (!response.ok) throw new Error(`openapi.json request failed: ${response.status}`)
|
|
89
|
+
const document = (await response.json()) as Document
|
|
90
|
+
const cli = incur_Cli.create(name, {
|
|
91
|
+
description: 'Tempo API',
|
|
92
|
+
// Generated commands build requests against `http://localhost`; rebase
|
|
93
|
+
// them onto the caller origin and dispatch in-process.
|
|
94
|
+
fetch: (request) => {
|
|
95
|
+
const url = new URL(request.url)
|
|
96
|
+
return fetch(new Request(new URL(url.pathname + url.search, origin), request))
|
|
97
|
+
},
|
|
98
|
+
mcp: { instructions },
|
|
99
|
+
openapi: scope(document),
|
|
100
|
+
openapiConfig: { forwardHeaders: ['authorization'], mode: 'namespace' },
|
|
101
|
+
version,
|
|
102
|
+
})
|
|
103
|
+
if (docs !== false)
|
|
104
|
+
cli.command('docs', { description: 'Search the Tempo documentation.', mcp: docs })
|
|
105
|
+
return cli
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
async function handler(c: Context<App.Environment>) {
|
|
109
|
+
const cli = await resolve(new URL(c.req.url).origin)
|
|
110
|
+
// incur routes on the first path segment; pin the path to `/mcp` so a
|
|
111
|
+
// mount prefix never leaks into its router.
|
|
112
|
+
return cli.fetch(new Request(new URL('/mcp', c.req.url), c.req.raw))
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// The documented POST carries the auth policy (described routes are
|
|
116
|
+
// default-closed); other methods fall through to the bare route and incur's 405.
|
|
117
|
+
const app = new Hono<App.Environment>()
|
|
118
|
+
.post(
|
|
119
|
+
'/mcp',
|
|
120
|
+
Auth.policy({ apiKey: { scopes: [] }, public: true }),
|
|
121
|
+
OpenApi.describeRoute({
|
|
122
|
+
description:
|
|
123
|
+
"A stateless streamable-HTTP MCP server: send JSON-RPC 2.0 messages as `POST` with `Accept: application/json, text/event-stream`. Tools mirror the API's data domain, plus `docs_*` documentation search. Anonymous requests use the public quota; send `Authorization: Bearer <api key>` for protected tools.",
|
|
124
|
+
operationId: 'mcpRequest',
|
|
125
|
+
// The JSON-RPC request envelope is protocol-owned (like `/rpc`), so the
|
|
126
|
+
// body documents an example rather than a schema.
|
|
127
|
+
requestBody: {
|
|
128
|
+
content: {
|
|
129
|
+
'application/json': {
|
|
130
|
+
example: { jsonrpc: '2.0', id: 1, method: 'tools/list', params: {} },
|
|
131
|
+
},
|
|
132
|
+
},
|
|
133
|
+
required: true,
|
|
134
|
+
},
|
|
135
|
+
responses: {
|
|
136
|
+
200: {
|
|
137
|
+
content: {
|
|
138
|
+
'application/json': {
|
|
139
|
+
example: {
|
|
140
|
+
jsonrpc: '2.0',
|
|
141
|
+
id: 1,
|
|
142
|
+
result: { tools: [{ name: 'v1_tokens_get', description: 'List tokens' }] },
|
|
143
|
+
},
|
|
144
|
+
schema: OpenApi.resolver(schema.Response),
|
|
145
|
+
},
|
|
146
|
+
},
|
|
147
|
+
description: 'JSON-RPC response returned by the MCP server.',
|
|
148
|
+
headers: { ...OpenApi.successHeaders },
|
|
149
|
+
},
|
|
150
|
+
202: {
|
|
151
|
+
description:
|
|
152
|
+
'The message was a notification or client response; there is nothing to return.',
|
|
153
|
+
},
|
|
154
|
+
400: {
|
|
155
|
+
content: { 'application/json': { schema: OpenApi.resolver(schema.Response) } },
|
|
156
|
+
description:
|
|
157
|
+
'Malformed or invalid MCP message, returned as a JSON-RPC error response rather than the standard error envelope. A malformed API key returns the standard `400` envelope instead.',
|
|
158
|
+
},
|
|
159
|
+
401: OpenApi.standardError(
|
|
160
|
+
401,
|
|
161
|
+
'The presented API key is invalid. Anonymous requests are allowed under the public quota.',
|
|
162
|
+
['api_key_invalid'],
|
|
163
|
+
),
|
|
164
|
+
406: {
|
|
165
|
+
content: { 'application/json': { schema: OpenApi.resolver(schema.Response) } },
|
|
166
|
+
description:
|
|
167
|
+
'The `Accept` header must include both `application/json` and `text/event-stream`. Returned as a JSON-RPC error response.',
|
|
168
|
+
},
|
|
169
|
+
429: OpenApi.standardError(429, 'Rate limit exceeded.'),
|
|
170
|
+
500: OpenApi.standardError(500, 'Internal server error.'),
|
|
171
|
+
},
|
|
172
|
+
summary: 'Call MCP',
|
|
173
|
+
tags: ['MCP'],
|
|
174
|
+
}),
|
|
175
|
+
handler,
|
|
176
|
+
)
|
|
177
|
+
.all('/mcp', handler)
|
|
178
|
+
return Metadata.attach(app, openapi)
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/** The OpenAPI metadata this group owns: the MCP endpoint's tag, surfaced under the `Data API` group. */
|
|
182
|
+
const openapi = {
|
|
183
|
+
tags: [
|
|
184
|
+
{
|
|
185
|
+
name: 'MCP',
|
|
186
|
+
description:
|
|
187
|
+
'A hosted Model Context Protocol server: the data domain and Tempo docs exposed as tools.',
|
|
188
|
+
},
|
|
189
|
+
],
|
|
190
|
+
'x-tagGroups': [{ name: tagGroup, tags: ['MCP'] }],
|
|
191
|
+
} satisfies App.create.Metadata
|
|
192
|
+
|
|
193
|
+
/** The slice of the OpenAPI document the domain filter reads. */
|
|
194
|
+
type Document = Openapi.OpenAPISpec & {
|
|
195
|
+
paths: Record<string, Record<string, unknown>>
|
|
196
|
+
'x-tagGroups'?: readonly { name: string; tags: readonly string[] }[] | undefined
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
/** HTTP methods that carry operations in an OpenAPI path item. */
|
|
200
|
+
const methods: readonly string[] = ['delete', 'get', 'head', 'options', 'patch', 'post', 'put', 'trace'] // prettier-ignore
|
|
201
|
+
|
|
202
|
+
/**
|
|
203
|
+
* Narrows the document to the data domain: operations tagged inside the
|
|
204
|
+
* `Data API` tag group, minus excluded tags. Management, relay, and session
|
|
205
|
+
* operations never surface as tools.
|
|
206
|
+
*/
|
|
207
|
+
function scope(document: Document): Openapi.OpenAPISpec {
|
|
208
|
+
const group = document['x-tagGroups']?.find((entry) => entry.name === tagGroup)
|
|
209
|
+
if (!group) throw new Error(`openapi.json is missing the "${tagGroup}" tag group`)
|
|
210
|
+
const tags = new Set(group.tags.filter((tag) => !excludedTags.includes(tag)))
|
|
211
|
+
const paths: Document['paths'] = {}
|
|
212
|
+
for (const [path, item] of Object.entries(document.paths)) {
|
|
213
|
+
// Keep in-domain operations; non-method keys (parameters, summary) ride along.
|
|
214
|
+
const entries = Object.entries(item).filter(([method, operation]) => {
|
|
215
|
+
if (!methods.includes(method)) return true
|
|
216
|
+
const tags_operation = (operation as { tags?: readonly string[] | undefined }).tags
|
|
217
|
+
return tags_operation?.some((tag) => tags.has(tag)) ?? false
|
|
218
|
+
})
|
|
219
|
+
if (entries.some(([method]) => methods.includes(method)))
|
|
220
|
+
paths[path] = Object.fromEntries(entries)
|
|
221
|
+
}
|
|
222
|
+
return { ...document, paths }
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
export declare namespace mcp {
|
|
226
|
+
/** Options for the MCP route group. */
|
|
227
|
+
type Options = {
|
|
228
|
+
/** Remote docs MCP source mounted as the `docs` tool group, or `false` to omit it. @default 'https://mcp.tempo.xyz/mcp' */
|
|
229
|
+
docs?: Source | false | undefined
|
|
230
|
+
/** In-process fetch handler for the composed app (e.g. `(request) => app.fetch(request)`). */
|
|
231
|
+
fetch: (request: Request) => Response | Promise<Response>
|
|
232
|
+
/** MCP server name. @default 'tapimo' */
|
|
233
|
+
name?: string | undefined
|
|
234
|
+
/** MCP server version. @default '0.0.0' */
|
|
235
|
+
version?: string | undefined
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
/** A remote streamable-HTTP MCP server endpoint. */
|
|
239
|
+
type Source =
|
|
240
|
+
| string
|
|
241
|
+
| URL
|
|
242
|
+
| {
|
|
243
|
+
/** Fetch handler used for MCP requests. Defaults to `globalThis.fetch`. */
|
|
244
|
+
fetch?: ((request: Request) => Response | Promise<Response>) | undefined
|
|
245
|
+
/** Headers merged into every MCP request. */
|
|
246
|
+
headers?: Record<string, string> | undefined
|
|
247
|
+
/** Streamable-HTTP MCP endpoint URL. */
|
|
248
|
+
url: string | URL
|
|
249
|
+
}
|
|
250
|
+
}
|