@ottocode/ai-sdk 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ottocode/ai-sdk",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",

package/src/auth.ts

@@ -1,15 +1,14 @@
 import { Keypair } from '@solana/web3.js';
 import bs58 from 'bs58';
 import nacl from 'tweetnacl';
-import type { SetuAuth, LegacySigner } from './types.ts';
-import type { TransactionSigner } from '@solana/kit';
+import type { SetuAuth } from './types.ts';
 
 export interface WalletContext {
 	walletAddress: string;
 	buildHeaders: () => Promise<Record<string, string>> | Record<string, string>;
 	keypair?: Keypair;
 	privateKeyBytes?: Uint8Array;
-	transactionSigner?: TransactionSigner | LegacySigner;
+	signTransaction?: (transaction: Uint8Array) => Promise<Uint8Array>;
 }
 
 export function createWalletContext(auth: SetuAuth): WalletContext {
@@ -21,7 +20,7 @@ export function createWalletContext(auth: SetuAuth): WalletContext {
 		} = auth.signer;
 		return {
 			walletAddress,
-			transactionSigner: signTransaction,
+			signTransaction,
 			buildHeaders: async () => {
 				const nonce = Date.now().toString();
 				const signature = await customSignNonce(nonce);

package/src/fetch.ts

@@ -4,6 +4,7 @@ import type {
 	PaymentOptions,
 	CacheOptions,
 	BalanceUpdate,
+	FetchFunction,
 } from './types.ts';
 import { pickPaymentRequirement, handlePayment } from './payment.ts';
 import { addAnthropicCacheControl } from './cache.ts';
@@ -80,34 +81,41 @@ function wrapResponseWithBalanceSniffing(
 	}
 
 	if (!response.body) return response;
+	if (typeof TransformStream === 'undefined') return response;
+	if (typeof response.body.pipeThrough !== 'function') return response;
 
 	const onBalanceUpdate = callbacks.onBalanceUpdate;
 	let partial = '';
 	const decoder = new TextDecoder();
-	const transform = new TransformStream<Uint8Array, Uint8Array>({
-		transform(chunk, controller) {
-			controller.enqueue(chunk);
-			partial += decoder.decode(chunk, { stream: true });
-			let nlIndex = partial.indexOf('\n');
-			while (nlIndex !== -1) {
-				const line = partial.slice(0, nlIndex);
-				partial = partial.slice(nlIndex + 1);
-				tryParseSetuComment(line, onBalanceUpdate);
-				nlIndex = partial.indexOf('\n');
-			}
-		},
-		flush() {
-			if (partial.trim()) {
-				tryParseSetuComment(partial, onBalanceUpdate);
-			}
-		},
-	});
 
-	return new Response(response.body.pipeThrough(transform), {
-		status: response.status,
-		statusText: response.statusText,
-		headers: response.headers,
-	});
+	try {
+		const transform = new TransformStream<Uint8Array, Uint8Array>({
+			transform(chunk, controller) {
+				controller.enqueue(chunk);
+				partial += decoder.decode(chunk, { stream: true });
+				let nlIndex = partial.indexOf('\n');
+				while (nlIndex !== -1) {
+					const line = partial.slice(0, nlIndex);
+					partial = partial.slice(nlIndex + 1);
+					tryParseSetuComment(line, onBalanceUpdate);
+					nlIndex = partial.indexOf('\n');
+				}
+			},
+			flush() {
+				if (partial.trim()) {
+					tryParseSetuComment(partial, onBalanceUpdate);
+				}
+			},
+		});
+
+		return new Response(response.body.pipeThrough(transform), {
+			status: response.status,
+			statusText: response.statusText,
+			headers: response.headers,
+		});
+	} catch {
+		return response;
+	}
 }
 
 async function getWalletUsdcBalance(
@@ -154,6 +162,7 @@ async function getWalletUsdcBalance(
 export interface CreateSetuFetchOptions {
 	wallet: WalletContext;
 	baseURL: string;
+	fetch?: FetchFunction;
 	rpcURL?: string;
 	callbacks?: PaymentCallbacks;
 	cache?: CacheOptions;
@@ -164,6 +173,7 @@ export function createSetuFetch(options: CreateSetuFetchOptions) {
 	const {
 		wallet,
 		baseURL,
+		fetch: customFetch,
 		rpcURL = DEFAULT_RPC_URL,
 		callbacks = {},
 		cache,
@@ -175,7 +185,7 @@ export function createSetuFetch(options: CreateSetuFetchOptions) {
 		payment?.maxPaymentAttempts ?? DEFAULT_MAX_PAYMENT_ATTEMPTS;
 	const topupApprovalMode = payment?.topupApprovalMode ?? 'auto';
 	const autoPayThresholdUsd = payment?.autoPayThresholdUsd ?? 0;
-	const baseFetch = globalThis.fetch.bind(globalThis);
+	const baseFetch = customFetch ?? globalThis.fetch.bind(globalThis);
 
 	return async (
 		input: Parameters<typeof fetch>[0],

package/src/index.ts

@@ -5,7 +5,6 @@ export type {
 	SetuConfig,
 	SetuAuth,
 	ExternalSigner,
-	LegacySigner,
 	ProviderId,
 	ProviderApiFormat,
 	ProviderConfig,

package/src/payment.ts

@@ -7,8 +7,16 @@ import type {
 	ExactPaymentRequirement,
 	PaymentPayload,
 	PaymentCallbacks,
-	LegacySigner,
+	FetchFunction,
 } from './types.ts';
+import {
+	address,
+	getTransactionEncoder,
+	getTransactionDecoder,
+	type Transaction,
+	type TransactionWithLifetime,
+	type TransactionWithinSizeLimit,
+} from '@solana/kit';
 
 function simplifyPaymentError(errMsg: string): string {
 	const lower = errMsg.toLowerCase();
@@ -45,27 +53,43 @@ export function pickPaymentRequirement(
 	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'
-	);
+function wrapCallbackAsSigner(
+	walletAddress: string,
+	callback: (transaction: Uint8Array) => Promise<Uint8Array>,
+) {
+	const encoder = getTransactionEncoder();
+	const decoder = getTransactionDecoder();
+	return {
+		address: address(walletAddress),
+		modifyAndSignTransactions: async (
+			transactions: readonly (
+				| Transaction
+				| (Transaction & TransactionWithLifetime)
+			)[],
+		): Promise<
+			readonly (Transaction &
+				TransactionWithinSizeLimit &
+				TransactionWithLifetime)[]
+		> => {
+			const results = [];
+			for (const tx of transactions) {
+				const bytes = new Uint8Array(encoder.encode(tx));
+				const signedBytes = await callback(bytes);
+				const signed = decoder.decode(signedBytes);
+				results.push(
+					signed as Transaction &
+						TransactionWithinSizeLimit &
+						TransactionWithLifetime,
+				);
+			}
+			return results;
+		},
+	};
 }
 
 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.signTransaction) {
+		return wrapCallbackAsSigner(wallet.walletAddress, wallet.signTransaction);
 	}
 	if (wallet.keypair) {
 		const privateKeyBase58 = bs58.encode(wallet.keypair.secretKey);
@@ -113,7 +137,7 @@ export async function processSinglePayment(args: {
 	wallet: WalletContext;
 	rpcURL: string;
 	baseURL: string;
-	baseFetch: typeof fetch;
+	baseFetch: FetchFunction;
 	callbacks: PaymentCallbacks;
 }): Promise<{ attempts: number; balance?: number | string }> {
 	args.callbacks.onPaymentSigning?.();
@@ -185,7 +209,7 @@ export async function handlePayment(args: {
 	wallet: WalletContext;
 	rpcURL: string;
 	baseURL: string;
-	baseFetch: typeof fetch;
+	baseFetch: FetchFunction;
 	maxAttempts: number;
 	callbacks: PaymentCallbacks;
 }): Promise<{ attemptsUsed: number }> {

package/src/setu.ts

@@ -62,6 +62,7 @@ export function createSetu(config: SetuConfig): SetuInstance {
 	const setuFetch = createSetuFetch({
 		wallet,
 		baseURL,
+		fetch: config.fetch,
 		rpcURL: config.rpcURL,
 		callbacks: config.callbacks,
 		cache: config.cache,

package/src/types.ts

@@ -1,5 +1,4 @@
 import type { LanguageModelV3Middleware } from '@ai-sdk/provider';
-import type { TransactionSigner } from '@solana/kit';
 
 export type ProviderId =
 	| 'openai'
@@ -28,15 +27,10 @@ export interface ProviderConfig {
 	modelPrefix?: string;
 }
 
-export interface LegacySigner {
-	publicKey: { toBase58(): string };
-	secretKey: Uint8Array;
-}
-
 export interface ExternalSigner {
 	walletAddress: string;
 	signNonce: (nonce: string) => Promise<string> | string;
-	signTransaction?: TransactionSigner | LegacySigner;
+	signTransaction?: (transaction: Uint8Array) => Promise<Uint8Array>;
 }
 
 export interface SetuAuth {
@@ -97,6 +91,7 @@ export interface PaymentOptions {
 export interface SetuConfig {
 	auth: SetuAuth;
 	baseURL?: string;
+	fetch?: FetchFunction;
 	rpcURL?: string;
 	providers?: ProviderConfig[];
 	modelMap?: Record<string, ProviderId>;