opentool 0.7.7 → 0.7.9

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import { I as InternalToolDefinition, T as ToolResponse } from './validate-BrOwtVYW.js';
-export { B as BuildConfig, i as BuildMetadata, H as HTTP_METHODS, d as HttpHandlerDefinition, c as HttpMethod, M as McpConfig, h as Metadata, P as PaymentConfig, S as ServerConfig, e as Tool, b as ToolContent, f as ToolMetadataOverrides, g as generateMetadata, a as generateMetadataCommand, l as loadAndValidateTools, v as validateCommand } from './validate-BrOwtVYW.js';
+import { I as InternalToolDefinition, T as ToolResponse } from './validate-BBjyq5nS.js';
+export { B as BuildConfig, k as BuildMetadata, H as HTTP_METHODS, f as HttpHandlerDefinition, e as HttpMethod, h as McpConfig, M as Metadata, P as PaymentConfig, S as ServerConfig, i as Tool, d as ToolContent, j as ToolMetadataOverrides, b as generateMetadata, g as generateMetadataCommand, l as loadAndValidateTools, v as validateCommand } from './validate-BBjyq5nS.js';
+import { z, ZodSchema } from 'zod';
 export { CurrencySpec, DEFAULT_FACILITATOR, DefineX402PaymentConfig, EIP3009Authorization, PAYMENT_HEADERS, RequireX402PaymentOptions, RequireX402PaymentOutcome, RequireX402PaymentSuccess, SUPPORTED_CURRENCIES, X402BrowserClient, X402BrowserClientConfig, X402Client, X402ClientConfig, X402FacilitatorConfig, X402PayRequest, X402PayResult, X402Payment, X402PaymentContext, X402PaymentDefinition, X402PaymentRequiredError, X402VerificationResult, defineX402Payment, getX402PaymentContext, payX402, payX402WithWallet, requireX402Payment, withX402Payment } from './x402/index.js';
 export { ChainMetadata, ChainReference, ChainTokenMap, DEFAULT_CHAIN, DEFAULT_TOKENS, Hex, HexAddress, RpcProviderOptions, RpcUrlResolver, TokenMetadata, TurnkeyOptions, TurnkeySignWith, WalletBaseContext, WalletContext, WalletFullContext, WalletOptions, WalletOptionsBase, WalletPrivateKeyOptions, WalletProviderType, WalletReadonlyContext, WalletReadonlyOptions, WalletRegistry, WalletSendTransactionParams, WalletSignerContext, WalletTransferParams, WalletTurnkeyOptions, chains, getRpcUrl, registry, tokens, wallet, walletToolkit } from './wallets/index.js';
 export { AIAbortError, AIClientConfig, AIError, AIFetchError, AIRequestMetadata, AIResponseError, ChatCompletionChoice, ChatCompletionLogProbs, ChatCompletionResponse, ChatCompletionUsage, ChatMessage, ChatMessageContentPart, ChatMessageContentPartImageUrl, ChatMessageContentPartText, ChatMessageRole, DEFAULT_BASE_URL, DEFAULT_MODEL, DEFAULT_TIMEOUT_MS, FunctionToolDefinition, GenerateTextOptions, GenerateTextResult, GenerationParameters, JsonSchema, ResolvedAIClientConfig, ResponseErrorDetails, StreamTextOptions, StreamTextResult, StreamingEventHandlers, ToolChoice, ToolDefinition, ToolExecutionPolicy, WEBSEARCH_TOOL_DEFINITION, WEBSEARCH_TOOL_NAME, WebSearchOptions, createAIClient, ensureTextContent, flattenMessageContent, generateText, getModelConfig, isStreamingSupported, isToolCallingSupported, listModels, normalizeModelName, resolveConfig, resolveToolset, streamText } from './ai/index.js';
-import { ZodSchema } from 'zod';
 import 'viem';
 import 'viem/accounts';
 
@@ -18,6 +18,39 @@ declare function createDevServer(tools: InternalToolDefinition[]): Server;
 declare function createStdioServer(tools?: InternalToolDefinition[]): Promise<void>;
 declare function resolveRuntimePath(value: string): string;
 
+type CronSpec = {
+    cron: string;
+    enabled?: boolean;
+};
+type ToolProfileGET = {
+    description: string;
+    schedule: CronSpec;
+    fixedAmount?: string;
+    tokenSymbol?: string;
+    limits?: {
+        concurrency?: number;
+        dailyCap?: number;
+    };
+};
+type ToolProfilePOST = {
+    description?: string;
+};
+type GetHandler = (req: Request) => Promise<Response> | Response;
+type PostHandler = (req: Request) => Promise<Response> | Response;
+type ToolModuleGET = {
+    profile: ToolProfileGET;
+    GET: GetHandler;
+    POST?: never;
+    schema?: never;
+};
+type ToolModulePOST<B = unknown> = {
+    profile?: ToolProfilePOST;
+    POST: PostHandler;
+    schema: z.ZodType<B>;
+    GET?: never;
+};
+type ToolModule = ToolModuleGET | ToolModulePOST<any>;
+
 interface CreateMcpAdapterOptions {
     name: string;
     schema?: ZodSchema;
@@ -30,4 +63,4 @@ interface CreateMcpAdapterOptions {
 declare function createMcpAdapter(options: CreateMcpAdapterOptions): (rawArguments: unknown) => Promise<ToolResponse>;
 declare function responseToToolResponse(response: Response): Promise<ToolResponse>;
 
-export { InternalToolDefinition, ToolResponse, createDevServer, createMcpAdapter, createStdioServer, resolveRuntimePath, responseToToolResponse };
+export { type CronSpec, type GetHandler, InternalToolDefinition, type PostHandler, type ToolModule, type ToolModuleGET, type ToolModulePOST, type ToolProfileGET, type ToolProfilePOST, ToolResponse, createDevServer, createMcpAdapter, createStdioServer, resolveRuntimePath, responseToToolResponse };

package/dist/index.js

@@ -132,6 +132,7 @@ function extractX402Attempt(request) {
 }
 async function verifyX402Payment(attempt, definition, options = {}) {
   const fetchImpl = options.fetchImpl ?? fetch;
+  const timeout = options.timeout ?? 25e3;
   const facilitator = definition.facilitator;
   const verifierUrl = new URL(
     facilitator.verifyPath ?? "/verify",
@@ -147,13 +148,18 @@ async function verifyX402Payment(attempt, definition, options = {}) {
     };
     console.log("[x402] Calling facilitator /verify", {
       url: verifierUrl,
-      bodyPreview: JSON.stringify(verifyBody).substring(0, 200)
-    });
-    const verifyResponse = await fetchImpl(verifierUrl, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(verifyBody)
+      fullBody: JSON.stringify(verifyBody, null, 2)
     });
+    const verifyResponse = await Promise.race([
+      fetchImpl(verifierUrl, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(verifyBody)
+      }),
+      new Promise(
+        (_, reject) => setTimeout(() => reject(new Error(`Verification timeout after ${timeout}ms`)), timeout)
+      )
+    ]);
     console.log("[x402] Facilitator /verify response", { status: verifyResponse.status });
     if (!verifyResponse.ok) {
       const errorText = await verifyResponse.text().catch(() => "");
@@ -183,27 +189,39 @@ async function verifyX402Payment(attempt, definition, options = {}) {
         ensureTrailingSlash(facilitator.url)
       ).toString();
       try {
-        console.log("[x402] Calling facilitator /settle", { url: settleUrl });
-        const settleResponse = await fetchImpl(settleUrl, {
-          method: "POST",
-          headers,
-          body: JSON.stringify({
-            x402Version: attempt.payload.x402Version,
-            paymentPayload: attempt.payload,
-            paymentRequirements: requirement
-          })
+        const settleBody = {
+          x402Version: attempt.payload.x402Version,
+          paymentPayload: attempt.payload,
+          paymentRequirements: requirement
+        };
+        console.log("[x402] Calling facilitator /settle", {
+          url: settleUrl,
+          bodyPreview: JSON.stringify(settleBody).substring(0, 300)
         });
+        const settleResponse = await Promise.race([
+          fetchImpl(settleUrl, {
+            method: "POST",
+            headers,
+            body: JSON.stringify(settleBody)
+          }),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error(`Settlement timeout after ${timeout}ms`)), timeout)
+          )
+        ]);
         console.log("[x402] Facilitator /settle response", { status: settleResponse.status });
         if (!settleResponse.ok) {
+          const errorText = await settleResponse.text().catch(() => "");
+          console.error("[x402] Facilitator /settle error", { status: settleResponse.status, body: errorText });
           return {
             success: false,
             failure: {
-              reason: `Facilitator settlement failed: ${settleResponse.status}`,
+              reason: `Facilitator settlement failed: ${settleResponse.status}${errorText ? ` - ${errorText}` : ""}`,
               code: "settlement_failed"
             }
           };
         }
         const settlePayload = await settleResponse.json();
+        console.log("[x402] Facilitator /settle success", { txHash: settlePayload.txHash });
         if (settlePayload.txHash) {
           responseHeaders[HEADER_PAYMENT_RESPONSE] = JSON.stringify({
             settled: true,
@@ -211,6 +229,7 @@ async function verifyX402Payment(attempt, definition, options = {}) {
           });
         }
       } catch (error) {
+        console.error("[x402] Settlement exception", { error: error instanceof Error ? error.message : String(error) });
         return {
           success: false,
           failure: {
@@ -2718,6 +2737,12 @@ async function loadAndValidateTools(toolsDir, options = {}) {
   if (fs2.existsSync(tempDir)) {
     fs2.rmSync(tempDir, { recursive: true, force: true });
   }
+  const kebabCase = /^[a-z0-9]+(?:-[a-z0-9]+)*\.[a-z]+$/;
+  for (const f of files) {
+    if (!kebabCase.test(f)) {
+      throw new Error(`Tool filename must be kebab-case: ${f}`);
+    }
+  }
   const entryPoints = files.map((file) => path5.join(toolsDir, file));
   const { outDir, cleanup } = await transpileWithEsbuild({
     entryPoints,
@@ -2742,6 +2767,30 @@ async function loadAndValidateTools(toolsDir, options = {}) {
       const inputSchemaRaw = schema ? toJsonSchema(toolName, schema) : void 0;
       const inputSchema = normalizeInputSchema2(inputSchemaRaw);
       const httpHandlersRaw = collectHttpHandlers2(toolModule, file);
+      const hasGET = typeof toolModule.GET === "function";
+      const hasPOST = typeof toolModule.POST === "function";
+      const otherMethods = HTTP_METHODS2.filter((m) => m !== "GET" && m !== "POST").filter(
+        (m) => typeof toolModule[m] === "function"
+      );
+      if (otherMethods.length > 0) {
+        throw new Error(
+          `${file} must not export ${otherMethods.join(", ")}. Only one of GET or POST is allowed.`
+        );
+      }
+      if (hasGET === hasPOST) {
+        throw new Error(`${file}: export exactly one of GET or POST`);
+      }
+      if (hasGET) {
+        const schedule = toolModule?.profile?.schedule;
+        if (!schedule || typeof schedule?.cron !== "string" || schedule.cron.trim().length === 0) {
+          throw new Error(`${file}: GET tools require profile.schedule { cron }`);
+        }
+      }
+      if (hasPOST) {
+        if (!schema) {
+          throw new Error(`${file}: POST tools must export a Zod schema as 'schema'`);
+        }
+      }
       const httpHandlers = [...httpHandlersRaw];
       if (httpHandlers.length === 0) {
         throw new Error(