@ottocode/ai-sdk 0.1.4 → 0.1.5

package/src/payment.ts

@@ -1,171 +1,211 @@
-import { Buffer } from 'node:buffer';
 import bs58 from 'bs58';
 import { createPaymentHeader } from 'x402/client';
 import { svm } from 'x402/shared';
 import type { PaymentRequirements } from 'x402/types';
 import type { WalletContext } from './auth.ts';
 import type {
-  ExactPaymentRequirement,
-  PaymentPayload,
-  PaymentCallbacks,
+	ExactPaymentRequirement,
+	PaymentPayload,
+	PaymentCallbacks,
+	LegacySigner,
 } from './types.ts';
-import { buildWalletHeaders } from './auth.ts';
 
 function simplifyPaymentError(errMsg: string): string {
-  const lower = errMsg.toLowerCase();
-  if (lower.includes('insufficient') || lower.includes('not enough') || lower.includes('balance'))
-    return 'Insufficient USDC balance';
-  if (lower.includes('simulation') || lower.includes('compute unit'))
-    return 'Transaction simulation failed';
-  if (lower.includes('blockhash') || lower.includes('expired'))
-    return 'Transaction expired, please retry';
-  if (lower.includes('timeout') || lower.includes('timed out'))
-    return 'Transaction timed out';
-  if (lower.includes('rejected') || lower.includes('cancelled'))
-    return 'Transaction rejected';
-  if (lower.includes('network') || lower.includes('connection'))
-    return 'Network error';
-  const short = (errMsg.split('.')[0] ?? errMsg).slice(0, 80);
-  return short.length < errMsg.length ? `${short}...` : errMsg;
+	const lower = errMsg.toLowerCase();
+	if (
+		lower.includes('insufficient') ||
+		lower.includes('not enough') ||
+		lower.includes('balance')
+	)
+		return 'Insufficient USDC balance';
+	if (lower.includes('simulation') || lower.includes('compute unit'))
+		return 'Transaction simulation failed';
+	if (lower.includes('blockhash') || lower.includes('expired'))
+		return 'Transaction expired, please retry';
+	if (lower.includes('timeout') || lower.includes('timed out'))
+		return 'Transaction timed out';
+	if (lower.includes('rejected') || lower.includes('cancelled'))
+		return 'Transaction rejected';
+	if (lower.includes('network') || lower.includes('connection'))
+		return 'Network error';
+	const short = (errMsg.split('.')[0] ?? errMsg).slice(0, 80);
+	return short.length < errMsg.length ? `${short}...` : errMsg;
 }
 
 export function pickPaymentRequirement(
-  payload: unknown,
+	payload: unknown,
 ): ExactPaymentRequirement | null {
-  const acceptsValue =
-    typeof payload === 'object' && payload !== null
-      ? (payload as { accepts?: unknown }).accepts
-      : undefined;
-  const accepts = Array.isArray(acceptsValue)
-    ? (acceptsValue as ExactPaymentRequirement[])
-    : [];
-  return accepts.find((opt) => opt && opt.scheme === 'exact') ?? null;
+	const acceptsValue =
+		typeof payload === 'object' && payload !== null
+			? (payload as { accepts?: unknown }).accepts
+			: undefined;
+	const accepts = Array.isArray(acceptsValue)
+		? (acceptsValue as ExactPaymentRequirement[])
+		: [];
+	return accepts.find((opt) => opt && opt.scheme === 'exact') ?? null;
+}
+
+function isLegacySigner(signer: unknown): signer is LegacySigner {
+	return (
+		typeof signer === 'object' &&
+		signer !== null &&
+		'secretKey' in signer &&
+		signer.secretKey instanceof Uint8Array &&
+		'publicKey' in signer &&
+		typeof (signer as LegacySigner).publicKey?.toBase58 === 'function'
+	);
+}
+
+async function resolvePaymentSigner(wallet: WalletContext) {
+	if (wallet.transactionSigner) {
+		if (isLegacySigner(wallet.transactionSigner)) {
+			const privateKeyBase58 = bs58.encode(wallet.transactionSigner.secretKey);
+			return svm.createSignerFromBase58(privateKeyBase58);
+		}
+		return wallet.transactionSigner as Exclude<
+			typeof wallet.transactionSigner,
+			LegacySigner
+		>;
+	}
+	if (wallet.keypair) {
+		const privateKeyBase58 = bs58.encode(wallet.keypair.secretKey);
+		return svm.createSignerFromBase58(privateKeyBase58);
+	}
+	throw new Error(
+		'Setu: payments require either a privateKey or signer.signTransaction.',
+	);
 }
 
 export async function createPaymentPayload(
-  requirement: ExactPaymentRequirement,
-  wallet: WalletContext,
-  rpcURL: string,
+	requirement: ExactPaymentRequirement,
+	wallet: WalletContext,
+	rpcURL: string,
 ): Promise<PaymentPayload> {
-  const privateKeyBase58 = bs58.encode(wallet.keypair.secretKey);
-  const signer = await svm.createSignerFromBase58(privateKeyBase58);
-  const header = await createPaymentHeader(
-    signer,
-    1,
-    requirement as PaymentRequirements,
-    { svmConfig: { rpcUrl: rpcURL } },
-  );
-  const decoded = JSON.parse(
-    Buffer.from(header, 'base64').toString('utf-8'),
-  ) as { payload: { transaction: string } };
+	const signer = await resolvePaymentSigner(wallet);
+	const header = await createPaymentHeader(
+		signer,
+		1,
+		requirement as PaymentRequirements,
+		{ svmConfig: { rpcUrl: rpcURL } },
+	);
+	const decoded = JSON.parse(atob(header)) as {
+		payload: { transaction: string };
+	};
 
-  return {
-    x402Version: 1,
-    scheme: 'exact',
-    network: requirement.network,
-    payload: { transaction: decoded.payload.transaction },
-  };
+	return {
+		x402Version: 1,
+		scheme: 'exact',
+		network: requirement.network,
+		payload: { transaction: decoded.payload.transaction },
+	};
 }
 
 interface PaymentResponse {
-  amount_usd?: number | string;
-  new_balance?: number | string;
-  amount?: number;
-  balance?: number;
-  transaction?: string;
+	amount_usd?: number | string;
+	new_balance?: number | string;
+	amount?: number;
+	balance?: number;
+	transaction?: string;
 }
 
 export async function processSinglePayment(args: {
-  requirement: ExactPaymentRequirement;
-  wallet: WalletContext;
-  rpcURL: string;
-  baseURL: string;
-  baseFetch: typeof fetch;
-  callbacks: PaymentCallbacks;
+	requirement: ExactPaymentRequirement;
+	wallet: WalletContext;
+	rpcURL: string;
+	baseURL: string;
+	baseFetch: typeof fetch;
+	callbacks: PaymentCallbacks;
 }): Promise<{ attempts: number; balance?: number | string }> {
-  args.callbacks.onPaymentSigning?.();
+	args.callbacks.onPaymentSigning?.();
 
-  let paymentPayload: PaymentPayload;
-  try {
-    paymentPayload = await createPaymentPayload(
-      args.requirement,
-      args.wallet,
-      args.rpcURL,
-    );
-  } catch (err) {
-    const errMsg = err instanceof Error ? err.message : String(err);
-    const userMsg = `Payment failed: ${simplifyPaymentError(errMsg)}`;
-    args.callbacks.onPaymentError?.(userMsg);
-    throw new Error(`Setu: ${userMsg}`);
-  }
+	let paymentPayload: PaymentPayload;
+	try {
+		paymentPayload = await createPaymentPayload(
+			args.requirement,
+			args.wallet,
+			args.rpcURL,
+		);
+	} catch (err) {
+		const errMsg = err instanceof Error ? err.message : String(err);
+		const userMsg = `Payment failed: ${simplifyPaymentError(errMsg)}`;
+		args.callbacks.onPaymentError?.(userMsg);
+		throw new Error(`Setu: ${userMsg}`);
+	}
 
-  const walletHeaders = buildWalletHeaders(args.wallet);
-  const response = await args.baseFetch(`${args.baseURL}/v1/topup`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json', ...walletHeaders },
-    body: JSON.stringify({
-      paymentPayload,
-      paymentRequirement: args.requirement,
-    }),
-  });
+	const walletHeaders = await args.wallet.buildHeaders();
+	const response = await args.baseFetch(`${args.baseURL}/v1/topup`, {
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json', ...walletHeaders },
+		body: JSON.stringify({
+			paymentPayload,
+			paymentRequirement: args.requirement,
+		}),
+	});
 
-  const rawBody = await response.text().catch(() => '');
-  if (!response.ok) {
-    if (response.status === 400 && rawBody.toLowerCase().includes('already processed')) {
-      return { attempts: 1 };
-    }
-    args.callbacks.onPaymentError?.(`Topup failed: ${response.status}`);
-    throw new Error(`Setu topup failed (${response.status}): ${rawBody}`);
-  }
+	const rawBody = await response.text().catch(() => '');
+	if (!response.ok) {
+		if (
+			response.status === 400 &&
+			rawBody.toLowerCase().includes('already processed')
+		) {
+			return { attempts: 1 };
+		}
+		args.callbacks.onPaymentError?.(`Topup failed: ${response.status}`);
+		throw new Error(`Setu topup failed (${response.status}): ${rawBody}`);
+	}
 
-  let parsed: PaymentResponse | undefined;
-  try {
-    parsed = rawBody ? (JSON.parse(rawBody) as PaymentResponse) : undefined;
-  } catch {
-    parsed = undefined;
-  }
+	let parsed: PaymentResponse | undefined;
+	try {
+		parsed = rawBody ? (JSON.parse(rawBody) as PaymentResponse) : undefined;
+	} catch {
+		parsed = undefined;
+	}
 
-  if (parsed) {
-    const amountUsd =
-      typeof parsed.amount_usd === 'string'
-        ? parseFloat(parsed.amount_usd)
-        : (parsed.amount_usd ?? parsed.amount ?? 0);
-    const newBalance =
-      typeof parsed.new_balance === 'string'
-        ? parseFloat(parsed.new_balance)
-        : (parsed.new_balance ?? parsed.balance ?? 0);
-    args.callbacks.onPaymentComplete?.({
-      amountUsd,
-      newBalance,
-      transactionId: parsed.transaction,
-    });
-    return { attempts: 1, balance: newBalance };
-  }
-  return { attempts: 1 };
+	if (parsed) {
+		const amountUsd =
+			typeof parsed.amount_usd === 'string'
+				? parseFloat(parsed.amount_usd)
+				: (parsed.amount_usd ?? parsed.amount ?? 0);
+		const newBalance =
+			typeof parsed.new_balance === 'string'
+				? parseFloat(parsed.new_balance)
+				: (parsed.new_balance ?? parsed.balance ?? 0);
+		args.callbacks.onPaymentComplete?.({
+			amountUsd,
+			newBalance,
+			transactionId: parsed.transaction,
+		});
+		return { attempts: 1, balance: newBalance };
+	}
+	return { attempts: 1 };
 }
 
 export async function handlePayment(args: {
-  requirement: ExactPaymentRequirement;
-  wallet: WalletContext;
-  rpcURL: string;
-  baseURL: string;
-  baseFetch: typeof fetch;
-  maxAttempts: number;
-  callbacks: PaymentCallbacks;
+	requirement: ExactPaymentRequirement;
+	wallet: WalletContext;
+	rpcURL: string;
+	baseURL: string;
+	baseFetch: typeof fetch;
+	maxAttempts: number;
+	callbacks: PaymentCallbacks;
 }): Promise<{ attemptsUsed: number }> {
-  let attempts = 0;
-  while (attempts < args.maxAttempts) {
-    const result = await processSinglePayment(args);
-    attempts += result.attempts;
-    const balanceValue =
-      typeof result.balance === 'number'
-        ? result.balance
-        : result.balance != null
-          ? Number(result.balance)
-          : undefined;
-    if (balanceValue == null || Number.isNaN(balanceValue) || balanceValue >= 0) {
-      return { attemptsUsed: attempts };
-    }
-  }
-  throw new Error(`Setu: payment failed after ${attempts} additional top-ups.`);
+	let attempts = 0;
+	while (attempts < args.maxAttempts) {
+		const result = await processSinglePayment(args);
+		attempts += result.attempts;
+		const balanceValue =
+			typeof result.balance === 'number'
+				? result.balance
+				: result.balance != null
+					? Number(result.balance)
+					: undefined;
+		if (
+			balanceValue == null ||
+			Number.isNaN(balanceValue) ||
+			balanceValue >= 0
+		) {
+			return { attemptsUsed: attempts };
+		}
+	}
+	throw new Error(`Setu: payment failed after ${attempts} additional top-ups.`);
 }

package/src/providers/factory.ts

@@ -7,64 +7,64 @@ import type { LanguageModelV3Middleware } from '@ai-sdk/provider';
 import type { ProviderApiFormat, ProviderId, FetchFunction } from '../types.ts';
 
 export function createModel(
-  modelId: string,
-  apiFormat: ProviderApiFormat,
-  providerId: ProviderId,
-  baseURL: string,
-  customFetch: FetchFunction,
-  middleware?: LanguageModelV3Middleware | LanguageModelV3Middleware[],
+	modelId: string,
+	apiFormat: ProviderApiFormat,
+	providerId: ProviderId,
+	baseURL: string,
+	customFetch: FetchFunction,
+	middleware?: LanguageModelV3Middleware | LanguageModelV3Middleware[],
 ) {
-  const fetchFn = customFetch as unknown as typeof globalThis.fetch;
+	const fetchFn = customFetch as unknown as typeof globalThis.fetch;
 
-  let model;
+	let model:
+		| ReturnType<ReturnType<typeof createOpenAI>['responses']>
+		| ReturnType<ReturnType<typeof createAnthropic>>;
 
-  switch (apiFormat) {
-    case 'anthropic-messages': {
-      const provider = createAnthropic({
-        baseURL,
-        apiKey: 'setu-wallet-auth',
-        fetch: fetchFn,
-      });
-      model = provider(modelId);
-      break;
-    }
+	switch (apiFormat) {
+		case 'anthropic-messages': {
+			const provider = createAnthropic({
+				baseURL,
+				apiKey: 'setu-wallet-auth',
+				fetch: fetchFn,
+			});
+			model = provider(modelId);
+			break;
+		}
 
-    case 'google-native': {
-      const provider = createGoogleGenerativeAI({
-        baseURL,
-        apiKey: 'setu-wallet-auth',
-        fetch: fetchFn,
-      });
-      model = provider(modelId);
-      break;
-    }
+		case 'google-native': {
+			const provider = createGoogleGenerativeAI({
+				baseURL,
+				apiKey: 'setu-wallet-auth',
+				fetch: fetchFn,
+			});
+			model = provider(modelId);
+			break;
+		}
 
-    case 'openai-chat': {
-      const provider = createOpenAICompatible({
-        name: `setu-${providerId}`,
-        baseURL,
-        headers: { Authorization: 'Bearer setu-wallet-auth' },
-        fetch: fetchFn,
-      });
-      model = provider(modelId);
-      break;
-    }
+		case 'openai-chat': {
+			const provider = createOpenAICompatible({
+				name: `setu-${providerId}`,
+				baseURL,
+				headers: { Authorization: 'Bearer setu-wallet-auth' },
+				fetch: fetchFn,
+			});
+			model = provider(modelId);
+			break;
+		}
+		default: {
+			const provider = createOpenAI({
+				baseURL,
+				apiKey: 'setu-wallet-auth',
+				fetch: fetchFn,
+			});
+			model = provider.responses(modelId);
+			break;
+		}
+	}
 
-    case 'openai-responses':
-    default: {
-      const provider = createOpenAI({
-        baseURL,
-        apiKey: 'setu-wallet-auth',
-        fetch: fetchFn,
-      });
-      model = provider.responses(modelId);
-      break;
-    }
-  }
+	if (middleware) {
+		return wrapLanguageModel({ model, middleware });
+	}
 
-  if (middleware) {
-    return wrapLanguageModel({ model, middleware });
-  }
-
-  return model;
+	return model;
 }

package/src/providers/registry.ts

@@ -1,105 +1,70 @@
-import type { ProviderId, ProviderConfig, ProviderApiFormat } from '../types.ts';
+import type {
+	ProviderId,
+	ProviderConfig,
+	ProviderApiFormat,
+} from '../types.ts';
+import { setuCatalog } from '../catalog.ts';
 
-const BUILTIN_PROVIDERS: ProviderConfig[] = [
-  {
-    id: 'openai',
-    apiFormat: 'openai-responses',
-    modelPrefix: 'gpt-',
-  },
-  {
-    id: 'openai',
-    apiFormat: 'openai-responses',
-    modelPrefix: 'o1',
-  },
-  {
-    id: 'openai',
-    apiFormat: 'openai-responses',
-    modelPrefix: 'o3',
-  },
-  {
-    id: 'openai',
-    apiFormat: 'openai-responses',
-    modelPrefix: 'o4',
-  },
-  {
-    id: 'openai',
-    apiFormat: 'openai-responses',
-    modelPrefix: 'codex-',
-  },
-  {
-    id: 'anthropic',
-    apiFormat: 'anthropic-messages',
-    modelPrefix: 'claude-',
-  },
-  {
-    id: 'google',
-    apiFormat: 'google-native',
-    modelPrefix: 'gemini-',
-  },
-  {
-    id: 'moonshot',
-    apiFormat: 'openai-chat',
-    modelPrefix: 'kimi-',
-  },
-  {
-    id: 'minimax',
-    apiFormat: 'anthropic-messages',
-    modelPrefix: 'MiniMax-',
-  },
-  {
-    id: 'zai',
-    apiFormat: 'openai-chat',
-    modelPrefix: 'glm-',
-  },
-  {
-    id: 'zai',
-    apiFormat: 'openai-chat',
-    modelPrefix: 'z1-',
-  },
-];
+const OWNER_API_FORMAT: Record<string, ProviderApiFormat> = {
+	openai: 'openai-responses',
+	anthropic: 'anthropic-messages',
+	google: 'google-native',
+	minimax: 'anthropic-messages',
+	moonshot: 'openai-chat',
+	zai: 'openai-chat',
+};
 
 export class ProviderRegistry {
-  private configs: ProviderConfig[];
-  private modelMap: Record<string, ProviderId>;
+	private configs: ProviderConfig[];
+	private modelMap: Record<string, ProviderId>;
 
-  constructor(
-    customProviders?: ProviderConfig[],
-    modelMap?: Record<string, ProviderId>,
-  ) {
-    this.configs = [...BUILTIN_PROVIDERS, ...(customProviders ?? [])];
-    this.modelMap = modelMap ?? {};
-  }
+	constructor(
+		customProviders?: ProviderConfig[],
+		modelMap?: Record<string, ProviderId>,
+	) {
+		this.configs = [...(customProviders ?? [])];
+		this.modelMap = modelMap ?? {};
+	}
 
-  resolve(modelId: string): { providerId: ProviderId; apiFormat: ProviderApiFormat } | null {
-    if (this.modelMap[modelId]) {
-      const providerId = this.modelMap[modelId];
-      const config = this.configs.find((c) => c.id === providerId);
-      return {
-        providerId,
-        apiFormat: config?.apiFormat ?? 'openai-chat',
-      };
-    }
+	resolve(
+		modelId: string,
+	): { providerId: ProviderId; apiFormat: ProviderApiFormat } | null {
+		if (this.modelMap[modelId]) {
+			const providerId = this.modelMap[modelId];
+			const config = this.configs.find((c) => c.id === providerId);
+			return {
+				providerId,
+				apiFormat: config?.apiFormat ?? 'openai-chat',
+			};
+		}
 
-    for (const config of this.configs) {
-      if (config.models?.includes(modelId)) {
-        return { providerId: config.id, apiFormat: config.apiFormat };
-      }
-    }
+		for (const config of this.configs) {
+			if (config.models?.includes(modelId)) {
+				return { providerId: config.id, apiFormat: config.apiFormat };
+			}
+		}
 
-    for (const config of this.configs) {
-      if (config.modelPrefix && modelId.startsWith(config.modelPrefix)) {
-        return { providerId: config.id, apiFormat: config.apiFormat };
-      }
-    }
+		for (const config of this.configs) {
+			if (config.modelPrefix && modelId.startsWith(config.modelPrefix)) {
+				return { providerId: config.id, apiFormat: config.apiFormat };
+			}
+		}
 
-    return null;
-  }
+		const entry = setuCatalog.models.find((m) => m.id === modelId);
+		if (entry) {
+			const providerId = entry.owned_by as ProviderId;
+			const apiFormat = OWNER_API_FORMAT[providerId] ?? 'openai-chat';
+			return { providerId, apiFormat };
+		}
 
-  register(config: ProviderConfig): void {
-    this.configs.push(config);
-  }
+		return null;
+	}
 
-  mapModel(modelId: string, providerId: ProviderId): void {
-    this.modelMap[modelId] = providerId;
-  }
+	register(config: ProviderConfig): void {
+		this.configs.push(config);
+	}
+
+	mapModel(modelId: string, providerId: ProviderId): void {
+		this.modelMap[modelId] = providerId;
+	}
 }